The server has now 2 notification streams

* A new one for controller related events (compute, appliance templates etc.)
* The existing one for project related events (links, nodes etc.)
This commit is contained in:
grossmj committed 2018-08-16 21:31:57 +07:00
1 parent dac3ba19b7
commit 7f72b90b0e
364 files changed
+12364 -9923

No files matched your search

+13 -13
View File
@@ -89,7 +89,7 @@ def test_update(controller, async_run):
assert project.name == "Hello"
async_run(project.update(name="World"))
assert project.name == "World"
controller.notification.emit.assert_any_call("project.updated", project.__json__())
controller.notification.project_emit.assert_any_call("project.updated", project.__json__())
def test_update_on_compute(controller, async_run):
@@ -173,7 +173,7 @@ def test_add_node_local(async_run, controller):
'name': 'test'},
timeout=1200)
assert compute in project._project_created_on_compute
controller.notification.emit.assert_any_call("node.created", node.__json__())
controller.notification.project_emit.assert_any_call("node.created", node.__json__())
def test_add_node_non_local(async_run, controller):
@@ -201,7 +201,7 @@ def test_add_node_non_local(async_run, controller):
'name': 'test'},
timeout=1200)
assert compute in project._project_created_on_compute
controller.notification.emit.assert_any_call("node.created", node.__json__())
controller.notification.project_emit.assert_any_call("node.created", node.__json__())
def test_add_node_from_appliance(async_run, controller):
@@ -242,7 +242,7 @@ def test_add_node_from_appliance(async_run, controller):
},
timeout=1200)
assert compute in project._project_created_on_compute
controller.notification.emit.assert_any_call("node.created", node.__json__())
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))
@@ -272,7 +272,7 @@ def test_delete_node(async_run, controller):
assert node.id not in project._nodes
compute.delete.assert_any_call('/projects/{}/vpcs/nodes/{}'.format(project.id, node.id))
controller.notification.emit.assert_any_call("node.deleted", node.__json__())
controller.notification.project_emit.assert_any_call("node.deleted", node.__json__())
def test_delete_node_delete_link(async_run, controller):
@@ -297,8 +297,8 @@ def test_delete_node_delete_link(async_run, controller):
assert link.id not in project._links
compute.delete.assert_any_call('/projects/{}/vpcs/nodes/{}'.format(project.id, node.id))
controller.notification.emit.assert_any_call("node.deleted", node.__json__())
controller.notification.emit.assert_any_call("link.deleted", link.__json__())
controller.notification.project_emit.assert_any_call("node.deleted", node.__json__())
controller.notification.project_emit.assert_any_call("link.deleted", link.__json__())
def test_get_node(async_run, controller):
@@ -355,7 +355,7 @@ def test_add_link(async_run, project, controller):
async_run(link.add_node(vm2, 4, 2))
assert mock_udp_create.called
assert len(link._nodes) == 2
controller.notification.emit.assert_any_call("link.created", link.__json__())
controller.notification.project_emit.assert_any_call("link.created", link.__json__())
def test_list_links(async_run, project):
@@ -398,16 +398,16 @@ def test_delete_link(async_run, project, controller):
assert len(project._links) == 1
controller._notification = MagicMock()
async_run(project.delete_link(link.id))
controller.notification.emit.assert_any_call("link.deleted", link.__json__())
controller.notification.project_emit.assert_any_call("link.deleted", link.__json__())
assert len(project._links) == 0
def test_add_drawing(async_run, project, controller):
controller.notification.emit = MagicMock()
controller.notification.project_emit = MagicMock()
drawing = async_run(project.add_drawing(None, svg="<svg></svg>"))
assert len(project._drawings) == 1
controller.notification.emit.assert_any_call("drawing.created", drawing.__json__())
controller.notification.project_emit.assert_any_call("drawing.created", drawing.__json__())
def test_get_drawing(async_run, project):
@@ -432,7 +432,7 @@ def test_delete_drawing(async_run, project, controller):
assert len(project._drawings) == 1
controller._notification = MagicMock()
async_run(project.delete_drawing(drawing.id))
controller.notification.emit.assert_any_call("drawing.deleted", drawing.__json__())
controller.notification.project_emit.assert_any_call("drawing.deleted", drawing.__json__())
assert len(project._drawings) == 0
@@ -498,7 +498,7 @@ def test_open_close(async_run, controller):
controller._notification = MagicMock()
async_run(project.close())
assert project.status == "closed"
controller.notification.emit.assert_any_call("project.closed", project.__json__())
controller.notification.project_emit.assert_any_call("project.closed", project.__json__())
def test_open_auto_start(async_run, controller):