From 2f9d5cf583b4b5dd635f386cb9ac07435bd44cc8 Mon Sep 17 00:00:00 2001 From: Ilia Abashin Date: Fri, 25 Aug 2017 14:24:59 +0300 Subject: Heavily refactored all event based scans Restricted real mongo interaction. Still work to do, but it's a good start. Fixed a bug with old subnets not being properly deleted. Change-Id: I5f260e09f0e11a477a47cb031d397a454465123f Signed-off-by: Ilia Abashin --- app/test/event_based_scan/test_network_add.py | 32 +++++---------------------- 1 file changed, 6 insertions(+), 26 deletions(-) (limited to 'app/test/event_based_scan/test_network_add.py') diff --git a/app/test/event_based_scan/test_network_add.py b/app/test/event_based_scan/test_network_add.py index 08be9e1..943dcf4 100644 --- a/app/test/event_based_scan/test_network_add.py +++ b/app/test/event_based_scan/test_network_add.py @@ -8,7 +8,8 @@ # http://www.apache.org/licenses/LICENSE-2.0 # ############################################################################### from discover.events.event_network_add import EventNetworkAdd -from test.event_based_scan.test_data.event_payload_network_add import EVENT_PAYLOAD_NETWORK_ADD +from test.event_based_scan.test_data.event_payload_network_add \ + import EVENT_PAYLOAD_NETWORK_ADD, NETWORK_DOCUMENT from test.event_based_scan.test_event import TestEvent @@ -16,32 +17,11 @@ class TestNetworkAdd(TestEvent): def test_handle_network_add(self): self.values = EVENT_PAYLOAD_NETWORK_ADD - self.payload = self.values['payload'] - self.network = self.payload['network'] - self.network_id = self.network['id'] - self.item_ids.append(self.network_id) - network_document = self.inv.get_by_id(self.env, self.network_id) - if network_document: - self.log.info('network document existed already, deleting it first.') - self.inv.delete('inventory', {'id': self.network_id}) - - network_document = self.inv.get_by_id(self.env, self.network_id) - self.assertIsNone(network_document) - - # build network document for adding network - project_name = self.values['_context_project_name'] - project_id = self.values['_context_project_id'] - parent_id = project_id + '-networks' - network_name = self.network['name'] + self.inv.get_by_id.return_value = None # add network document - EventNetworkAdd().handle(self.env, self.values) - - # check network document - network_document = self.inv.get_by_id(self.env, self.network_id) - self.assertIsNotNone(network_document) - self.assertEqual(network_document["project"], project_name) - self.assertEqual(network_document["parent_id"], parent_id) - self.assertEqual(network_document["name"], network_name) + res = EventNetworkAdd().handle(self.env, self.values) + self.assertTrue(res.result) + self.inv.set.assert_called_with(NETWORK_DOCUMENT) -- cgit 1.2.3-korg