arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2024-11-24 17:28:08 +00:00
Code Issues Releases Wiki Activity

Fix passing tests

Browse Source
This commit is contained in:
ziajka 2017-06-27 11:11:07 +02:00
parent 6aa2afcf54
commit 931018b877
4 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gns3server/compute/iou/iou_vm.py
View File

@ -207,7 +207,8 @@ class IOUVM(BaseNode):
"nvram": self._nvram, "nvram": self._nvram,
"l1_keepalives": self._l1_keepalives, "l1_keepalives": self._l1_keepalives,
"use_default_iou_values": self._use_default_iou_values, "use_default_iou_values": self._use_default_iou_values,
"command_line": self.command_line} "command_line": self.command_line,
"application_id": self.application_id}
# return the relative path if the IOU image is in the images_path directory # return the relative path if the IOU image is in the images_path directory
iou_vm_info["path"] = self.manager.get_relative_image_path(self.path) iou_vm_info["path"] = self.manager.get_relative_image_path(self.path)

4
gns3server/controller/node.py
View File

@ -66,7 +66,7 @@ class Node:
self.name = name self.name = name
self._console = None self._console = None
self._console_type = None self._console_type = None
self._properties = {} self._properties = None
self._command_line = None self._command_line = None
self._node_directory = None self._node_directory = None
self._status = "stopped" self._status = "stopped"
@ -88,6 +88,8 @@ class Node:
# This properties will be recompute # This properties will be recompute
ignore_properties = ("width", "height") ignore_properties = ("width", "height")
self.properties = kwargs.pop('properties', {})
# Update node properties with additional elements # Update node properties with additional elements
for prop in kwargs: for prop in kwargs:
if prop not in ignore_properties: if prop not in ignore_properties:

1
gns3server/controller/project.py
View File

@ -354,6 +354,7 @@ class Project:
return self._nodes[node_id] return self._nodes[node_id]
if node_type == "iou" and 'application_id' not in kwargs.keys(): if node_type == "iou" and 'application_id' not in kwargs.keys():
kwargs['application_id'] = get_next_application_id(self._nodes.values()) kwargs['application_id'] = get_next_application_id(self._nodes.values())
node = Node(self, compute, name, node_id=node_id, node_type=node_type, **kwargs) node = Node(self, compute, name, node_id=node_id, node_type=node_type, **kwargs)

10
tests/controller/test_project.py
View File

@ -361,7 +361,7 @@ def test_delete_drawing(async_run, project, controller):
assert len(project._drawings) == 0 assert len(project._drawings) == 0
def test_clean_pcictures(async_run, project, controller): def test_clean_pictures(async_run, project, controller):
""" """
When a project is close old pictures should be removed When a project is close old pictures should be removed
""" """
@ -589,13 +589,13 @@ def test_add_iou_node_and_check_if_gets_application_id(project, async_run):
# tests if get_next_application_id is called # tests if get_next_application_id is called
with patch('gns3server.controller.project.get_next_application_id', return_value=222) as mocked_get_app_id: with patch('gns3server.controller.project.get_next_application_id', return_value=222) as mocked_get_app_id:
results = async_run(project.add_node( node = async_run(project.add_node(
compute, "test", None, node_type="iou", properties={"startup_config": "test.cfg"})) compute, "test", None, node_type="iou", properties={"startup_config": "test.cfg"}))
assert mocked_get_app_id.called assert mocked_get_app_id.called
assert results.properties['application_id'] == 222 assert node.properties['application_id'] == 222
# tests if we can send property and it will be used # tests if we can send property and it will be used
results = async_run(project.add_node( node = async_run(project.add_node(
compute, "test", None, node_type="iou", application_id=333, properties={"startup_config": "test.cfg"})) compute, "test", None, node_type="iou", application_id=333, properties={"startup_config": "test.cfg"}))
assert mocked_get_app_id.called assert mocked_get_app_id.called
assert results.properties['application_id'] == 333 assert node.properties['application_id'] == 333