arno/gns3-server
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-server synced 2025-01-12 17:10:55 +00:00
Code Issues Releases Wiki Activity

Fix Exception when opening project that contains an IOU node

Browse Source 
Fix #636
This commit is contained in:
Julien Duponchelle 2016-08-23 22:38:44 +02:00
parent 147bb8758a
commit 9231b8e991
No known key found for this signature in database
GPG Key ID: CE8B29639E07F5E8
3 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -218,7 +218,6 @@ class IOUVM(BaseNode):
"l1_keepalives": self._l1_keepalives, "l1_keepalives": self._l1_keepalives,
"startup_config": self.relative_startup_config_file, "startup_config": self.relative_startup_config_file,
"private_config": self.relative_private_config_file, "private_config": self.relative_private_config_file,
"iourc_path": self.iourc_path,
"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}

4
gns3server/schemas/iou.py
View File

@ -199,10 +199,6 @@ IOU_OBJECT_SCHEMA = {
"description": "Use default IOU values", "description": "Use default IOU values",
"type": ["boolean", "null"] "type": ["boolean", "null"]
}, },
"iourc_path": {
"description": "Path of the iourc file used by remote servers",
"type": ["string", "null"]
},
"startup_config_content": { "startup_config_content": {
"description": "Startup-config of IOU", "description": "Startup-config of IOU",
"type": ["string", "null"] "type": ["string", "null"]

6
tests/handlers/api/compute/test_iou.py
View File

@ -98,8 +98,6 @@ def test_iou_create_with_params(http_compute, project, base_params):
with open(startup_config_file(project, response.json)) as f: with open(startup_config_file(project, response.json)) as f:
assert f.read() == "hostname test" assert f.read() == "hostname test"
assert "iourc" in response.json["iourc_path"]
def test_iou_create_startup_config_already_exist(http_compute, project, base_params): def test_iou_create_startup_config_already_exist(http_compute, project, base_params):
"""We don't erase a startup-config if already exist at project creation""" """We don't erase a startup-config if already exist at project creation"""
@ -153,8 +151,6 @@ def test_iou_start_with_iourc(http_compute, vm, tmpdir):
response = http_compute.get("/projects/{project_id}/iou/nodes/{node_id}".format(project_id=vm["project_id"], node_id=vm["node_id"])) response = http_compute.get("/projects/{project_id}/iou/nodes/{node_id}".format(project_id=vm["project_id"], node_id=vm["node_id"]))
assert response.status == 200 assert response.status == 200
with open(response.json["iourc_path"]) as f:
assert f.read() == "test"
def test_iou_stop(http_compute, vm): def test_iou_stop(http_compute, vm):
@ -205,8 +201,6 @@ def test_iou_update(http_compute, vm, tmpdir, free_console_port, project):
with open(startup_config_file(project, response.json)) as f: with open(startup_config_file(project, response.json)) as f:
assert f.read() == "hostname test" assert f.read() == "hostname test"
assert "iourc" in response.json["iourc_path"]
def test_iou_nio_create_udp(http_compute, vm): def test_iou_nio_create_udp(http_compute, vm):
response = http_compute.post("/projects/{project_id}/iou/nodes/{node_id}/adapters/1/ports/0/nio".format(project_id=vm["project_id"], node_id=vm["node_id"]), {"type": "nio_udp", response = http_compute.post("/projects/{project_id}/iou/nodes/{node_id}/adapters/1/ports/0/nio".format(project_id=vm["project_id"], node_id=vm["node_id"]), {"type": "nio_udp",