Merge pull request #1092 from GNS3/fix_vpcs_name

Fix the initial startup for VPCS is not used

tests/controller/test_controller.py

@@ -483,6 +483,7 @@ def test_load_base_files(controller, config, tmpdir):
 def test_appliance_templates(controller, async_run):
     controller.load_appliances()
     assert len(controller.appliance_templates) > 0
+    assert "Alpine Linux" in [c.__json__()["name"] for c in controller.appliance_templates.values()]
 
 
 def test_load_appliances(controller):
@@ -498,6 +499,11 @@ def test_load_appliances(controller):
     controller.load_appliances()
     assert "Test" in [appliance.name for appliance in controller.appliances.values()]
     assert "Cloud" in [appliance.name for appliance in controller.appliances.values()]
+    assert "VPCS" in [appliance.name for appliance in controller.appliances.values()]
+
+    for appliance in controller.appliances.values():
+        if appliance.name == "VPCS":
+            assert appliance._data["properties"] == {"base_script_file": "vpcs_base_config.txt"}
 
     # UUID should not change when you run again the function
     for appliance in controller.appliances.values():

tests/controller/test_project.py

@@ -193,7 +193,10 @@ def test_add_node_from_appliance(async_run, controller):
         "server": "local",
         "name": "Test",
         "default_name_format": "{name}-{0}",
-        "node_type": "vpcs"
+        "node_type": "vpcs",
+        "properties": {
+            "a": 1
+        }
 
     })
     controller._computes["local"] = compute
@@ -211,11 +214,22 @@ def test_add_node_from_appliance(async_run, controller):
     })
     compute.post.assert_any_call('/projects/{}/vpcs/nodes'.format(project.id),
                                  data={'node_id': node.id,
-                                       'name': 'Test-1'},
+                                       'name': 'Test-1',
+                                       'a': 1,
+                                       },
                                  timeout=120)
     assert compute in project._project_created_on_compute
     controller.notification.emit.assert_any_call("node.created", node.__json__())
 
+    # Make sure we can call twice the node creation
+    node = async_run(project.add_node_from_appliance("fakeid", x=13, y=12))
+    compute.post.assert_any_call('/projects/{}/vpcs/nodes'.format(project.id),
+                                 data={'node_id': node.id,
+                                       'name': 'Test-2',
+                                       'a': 1
+                                       },
+                                 timeout=120)
+
 
 def test_delete_node(async_run, controller):
     """