mirror of
https://github.com/GNS3/gns3-server.git
synced 2026-11-21 05:35:15 +02:00
Reorganize how appliance creation is validated against JSON schemas.
This allows for clearer error messages when validation fails.
This commit is contained in:
1 parent
71fcf855b4
commit
499ab9844a
19 files changed
+1524
-1325
No files matched your search
@@ -213,14 +213,10 @@ def test_add_node_from_appliance(async_run, controller):
|
||||
project = Project(controller=controller, name="Test")
|
||||
controller._notification = MagicMock()
|
||||
appliance = Appliance(str(uuid.uuid4()), {
|
||||
"server": "local",
|
||||
"compute_id": "local",
|
||||
"name": "Test",
|
||||
"default_name_format": "{name}-{0}",
|
||||
"appliance_type": "vpcs",
|
||||
"builtin": False,
|
||||
"properties": {
|
||||
"a": 1
|
||||
}
|
||||
})
|
||||
controller._appliances[appliance.id] = appliance
|
||||
controller._computes["local"] = compute
|
||||
@@ -230,30 +226,15 @@ def test_add_node_from_appliance(async_run, controller):
|
||||
compute.post = AsyncioMagicMock(return_value=response)
|
||||
|
||||
node = async_run(project.add_node_from_appliance(appliance.id, x=23, y=12))
|
||||
|
||||
compute.post.assert_any_call('/projects', data={
|
||||
"name": project._name,
|
||||
"project_id": project._id,
|
||||
"path": project._path
|
||||
})
|
||||
compute.post.assert_any_call('/projects/{}/vpcs/nodes'.format(project.id),
|
||||
data={'node_id': node.id,
|
||||
'name': 'Test-1',
|
||||
'a': 1,
|
||||
},
|
||||
timeout=1200)
|
||||
|
||||
assert compute in project._project_created_on_compute
|
||||
controller.notification.project_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(appliance.id, 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=1200)
|
||||
|
||||
|
||||
def test_delete_node(async_run, controller):
|
||||
"""
|
||||
|
||||
Reference in new issue
Block a user