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 --- .../test_data/event_payload_instance_add.py | 2 +- .../test_data/event_payload_instance_delete.py | 2 +- .../test_data/event_payload_instance_update.py | 9 ++- .../test_data/event_payload_interface_add.py | 2 +- .../test_data/event_payload_interface_delete.py | 2 +- .../test_data/event_payload_network_add.py | 22 +++++++ .../test_data/event_payload_network_delete.py | 5 +- .../test_data/event_payload_network_update.py | 8 ++- .../test_data/event_payload_port_add.py | 15 ++++- .../test_data/event_payload_port_delete.py | 8 +-- .../test_data/event_payload_port_update.py | 2 +- .../test_data/event_payload_router_add.py | 2 +- .../test_data/event_payload_router_delete.py | 3 +- .../test_data/event_payload_router_update.py | 4 +- .../test_data/event_payload_subnet_add.py | 71 +++++++++++++++++++++- .../test_data/event_payload_subnet_delete.py | 35 ++++++++++- .../test_data/event_payload_subnet_update.py | 23 ++++++- app/test/event_based_scan/test_data/test_config.py | 14 +++++ 18 files changed, 206 insertions(+), 23 deletions(-) create mode 100644 app/test/event_based_scan/test_data/test_config.py (limited to 'app/test/event_based_scan/test_data') diff --git a/app/test/event_based_scan/test_data/event_payload_instance_add.py b/app/test/event_based_scan/test_data/event_payload_instance_add.py index 316444a..d7b39a5 100644 --- a/app/test/event_based_scan/test_data/event_payload_instance_add.py +++ b/app/test/event_based_scan/test_data/event_payload_instance_add.py @@ -7,7 +7,7 @@ # which accompanies this distribution, and is available at # # http://www.apache.org/licenses/LICENSE-2.0 # ############################################################################### -from test.event_based_scan.config.test_config import ENV_CONFIG +from test.event_based_scan.test_data.test_config import ENV_CONFIG EVENT_PAYLOAD_INSTANCE_ADD = { 'publisher_id': 'compute.node-251.cisco.com', '_context_resource_uuid': None, diff --git a/app/test/event_based_scan/test_data/event_payload_instance_delete.py b/app/test/event_based_scan/test_data/event_payload_instance_delete.py index a94de63..a1f6665 100644 --- a/app/test/event_based_scan/test_data/event_payload_instance_delete.py +++ b/app/test/event_based_scan/test_data/event_payload_instance_delete.py @@ -7,7 +7,7 @@ # which accompanies this distribution, and is available at # # http://www.apache.org/licenses/LICENSE-2.0 # ############################################################################### -from test.event_based_scan.config.test_config import ENV_CONFIG +from test.event_based_scan.test_data.test_config import ENV_CONFIG EVENT_PAYLOAD_INSTANCE_DELETE = { diff --git a/app/test/event_based_scan/test_data/event_payload_instance_update.py b/app/test/event_based_scan/test_data/event_payload_instance_update.py index 8b4f1af..30c4fe1 100644 --- a/app/test/event_based_scan/test_data/event_payload_instance_update.py +++ b/app/test/event_based_scan/test_data/event_payload_instance_update.py @@ -7,7 +7,7 @@ # which accompanies this distribution, and is available at # # http://www.apache.org/licenses/LICENSE-2.0 # ############################################################################### -from test.event_based_scan.config.test_config import ENV_CONFIG +from test.event_based_scan.test_data.test_config import ENV_CONFIG EVENT_PAYLOAD_INSTANCE_UPDATE = { @@ -97,3 +97,10 @@ INSTANCE_DOCUMENT = { 'id_path': '/'+ENV_CONFIG+'/'+ENV_CONFIG+'-regions/RegionOne/RegionOne-availability_zones/calipso-zone' + '/node-223.cisco.com/node-223.cisco.com-instances/27a87908-bc1b-45cc-9238-09ad1ae686a7', 'show_in_tree': True} + + +UPDATED_INSTANCE_FIELDS = { + 'name': 'test8', + 'object_name': 'test8', + 'name_path': '/'+ENV_CONFIG+'/Regions/RegionOne/Availability Zones' + + '/calipso-zone/node-223.cisco.com/Instances/test8'} \ No newline at end of file diff --git a/app/test/event_based_scan/test_data/event_payload_interface_add.py b/app/test/event_based_scan/test_data/event_payload_interface_add.py index 263b010..8a06be3 100644 --- a/app/test/event_based_scan/test_data/event_payload_interface_add.py +++ b/app/test/event_based_scan/test_data/event_payload_interface_add.py @@ -7,7 +7,7 @@ # which accompanies this distribution, and is available at # # http://www.apache.org/licenses/LICENSE-2.0 # ############################################################################### -from test.event_based_scan.config.test_config import ENV_CONFIG +from test.event_based_scan.test_data.test_config import ENV_CONFIG EVENT_PAYLOAD_INTERFACE_ADD = { '_context_timestamp': '2016-10-26 21:52:18.893134', '_context_project_name': 'calipso-project', diff --git a/app/test/event_based_scan/test_data/event_payload_interface_delete.py b/app/test/event_based_scan/test_data/event_payload_interface_delete.py index 5dbed2c..ee311b5 100644 --- a/app/test/event_based_scan/test_data/event_payload_interface_delete.py +++ b/app/test/event_based_scan/test_data/event_payload_interface_delete.py @@ -7,7 +7,7 @@ # which accompanies this distribution, and is available at # # http://www.apache.org/licenses/LICENSE-2.0 # ############################################################################### -from test.event_based_scan.config.test_config import ENV_CONFIG +from test.event_based_scan.test_data.test_config import ENV_CONFIG EVENT_PAYLOAD_INTERFACE_DELETE = { 'message_id': 'da190e5f-127d-4e85-a813-bbdbbb35a2d0', '_context_tenant': '75c0eb79ff4a42b0ae4973c8375ddf40', diff --git a/app/test/event_based_scan/test_data/event_payload_network_add.py b/app/test/event_based_scan/test_data/event_payload_network_add.py index 9630965..badbcac 100644 --- a/app/test/event_based_scan/test_data/event_payload_network_add.py +++ b/app/test/event_based_scan/test_data/event_payload_network_add.py @@ -30,3 +30,25 @@ EVENT_PAYLOAD_NETWORK_ADD = { 'tenant_id': '75c0eb79ff4a42b0ae4973c8375ddf40', 'mtu': 1400, 'subnets': [], 'status': 'ACTIVE', 'provider:segmentation_id': 8, 'port_security_enabled': True, 'name': 'calipso-network-add', 'admin_state_up': True}}} + +NETWORK_DOCUMENT = {'provider:physical_network': None, + 'router:external': False, + 'shared': False, + 'id': 'a8226605-40d0-4111-93bd-11ffa5b2d1d7', + 'provider:network_type': 'vxlan', + 'tenant_id': '75c0eb79ff4a42b0ae4973c8375ddf40', + 'mtu': 1400, 'subnets': {}, 'status': 'ACTIVE', + 'provider:segmentation_id': 8, + 'port_security_enabled': True, + 'name': 'calipso-network-add', + 'admin_state_up': True, 'environment': 'test-env', + 'type': 'network', + 'id_path': '/test-env/test-env-projects/75c0eb79ff4a42b0ae4973c8375ddf40/75c0eb79ff4a42b0ae4973c8375ddf40-networks/a8226605-40d0-4111-93bd-11ffa5b2d1d7', + 'cidrs': [], 'subnet_ids': [], + 'last_scanned': '2016-09-30 17:45:02.125633', + 'name_path': '/test-env/Projects/calipso-project/Networks/calipso-network-add', + 'network': 'a8226605-40d0-4111-93bd-11ffa5b2d1d7', + 'object_name': 'calipso-network-add', + 'parent_id': '75c0eb79ff4a42b0ae4973c8375ddf40-networks', + 'parent_text': 'Networks', 'parent_type': 'networks_folder', + 'project': 'calipso-project', 'show_in_tree': True} diff --git a/app/test/event_based_scan/test_data/event_payload_network_delete.py b/app/test/event_based_scan/test_data/event_payload_network_delete.py index 6884dd6..935e14b 100644 --- a/app/test/event_based_scan/test_data/event_payload_network_delete.py +++ b/app/test/event_based_scan/test_data/event_payload_network_delete.py @@ -7,7 +7,7 @@ # which accompanies this distribution, and is available at # # http://www.apache.org/licenses/LICENSE-2.0 # ############################################################################### -from test.event_based_scan.config.test_config import ENV_CONFIG +from test.event_based_scan.test_data.test_config import ENV_CONFIG EVENT_PAYLOAD_NETWORK_DELETE = { @@ -29,12 +29,13 @@ EVENT_PAYLOAD_NETWORK_DELETE = { '_context_user': '13baa553aae44adca6615e711fd2f6d9', 'publisher_id': 'network.node-6.cisco.com'} -EVENT_PAYLOAD_NETWORK = { +NETWORK_DOCUMENT = { "admin_state_up" : True, "cidrs" : [ "172.16.9.0/24" ], "environment" : ENV_CONFIG, + "_id": '583c0c69c5f6980fec665422', "id" : '0bb0ba6c-6863-4121-ac89-93f81a9da2b0', "id_path" : '/%s/%s-projects/' % (ENV_CONFIG, ENV_CONFIG) +'75c0eb79ff4a42b0ae4973c8375ddf40/75c0eb79ff4a42b' + '0ae4973c8375ddf40-networks/0bb0ba6c-6863-4121-ac89-93f81a9da2b0' , diff --git a/app/test/event_based_scan/test_data/event_payload_network_update.py b/app/test/event_based_scan/test_data/event_payload_network_update.py index 3485cd1..ae5d01d 100644 --- a/app/test/event_based_scan/test_data/event_payload_network_update.py +++ b/app/test/event_based_scan/test_data/event_payload_network_update.py @@ -7,7 +7,7 @@ # which accompanies this distribution, and is available at # # http://www.apache.org/licenses/LICENSE-2.0 # ############################################################################### -from test.event_based_scan.config.test_config import ENV_CONFIG +from test.event_based_scan.test_data.test_config import ENV_CONFIG EVENT_PAYLOAD_NETWORK_UPDATE = { '_context_user_id': '13baa553aae44adca6615e711fd2f6d9', '_context_user': '13baa553aae44adca6615e711fd2f6d9', @@ -62,4 +62,8 @@ NETWORK_DOCUMENT = { "subnets" : {}, "tenant_id" : "75c0eb79ff4a42b0ae4973c8375ddf40", "type" : "network" -} \ No newline at end of file +} + +UPDATED_NETWORK_FIELDS = {'name': '24', + 'name_path': '/{}/Projects/calipso-project/Networks/24'.format(ENV_CONFIG), + 'object_name': '24'} diff --git a/app/test/event_based_scan/test_data/event_payload_port_add.py b/app/test/event_based_scan/test_data/event_payload_port_add.py index 92f6d2f..f3d585c 100644 --- a/app/test/event_based_scan/test_data/event_payload_port_add.py +++ b/app/test/event_based_scan/test_data/event_payload_port_add.py @@ -7,7 +7,7 @@ # which accompanies this distribution, and is available at # # http://www.apache.org/licenses/LICENSE-2.0 # ############################################################################### -from test.event_based_scan.config.test_config import ENV_CONFIG +from test.event_based_scan.test_data.test_config import ENV_CONFIG EVENT_PAYLOAD_PORT_INSTANCE_ADD = { '_context_user_id': '73638a2687534f9794cd8057ba860637', 'payload': { @@ -312,3 +312,16 @@ VNIC_DOCS = [{ "show_in_tree": True, "vnic_type": "instance_vnic" }] + +PORTS_FOLDER = {'parent_id': '55550a69-24eb-47f5-a458-3aa086cc71c2', + 'create_object': True, + 'text': 'Ports', + 'show_in_tree': True, + 'id_path': 'test-env/test-env-projects/a83c8b0d2df24170a7c54f09f824230e/a83c8b0d2df24170a7c54f09f824230e-networks/55550a69-24eb-47f5-a458-3aa086cc71c2/55550a69-24eb-47f5-a458-3aa086cc71c2-ports/', + 'name_path': '/test-env/Projects/a83c8b0d2df24170a7c54f09f824230e/Networks/please_connect/Ports', + 'environment': ENV_CONFIG, + 'id': '55550a69-24eb-47f5-a458-3aa086cc71c2-ports', + 'name': 'Ports', 'parent_type': 'network', + 'type': 'ports_folder', 'object_name': 'Ports'} + +PORT_DOC = {'id': '1233445-75b6-4c05-9480-4bc648845c6f'} \ No newline at end of file diff --git a/app/test/event_based_scan/test_data/event_payload_port_delete.py b/app/test/event_based_scan/test_data/event_payload_port_delete.py index afbba32..d0b10c4 100644 --- a/app/test/event_based_scan/test_data/event_payload_port_delete.py +++ b/app/test/event_based_scan/test_data/event_payload_port_delete.py @@ -7,7 +7,7 @@ # which accompanies this distribution, and is available at # # http://www.apache.org/licenses/LICENSE-2.0 # ############################################################################### -from test.event_based_scan.config.test_config import ENV_CONFIG +from test.event_based_scan.test_data.test_config import ENV_CONFIG EVENT_PAYLOAD_PORT_DELETE = { '_context_tenant': '75c0eb79ff4a42b0ae4973c8375ddf40', '_context_tenant_name': 'calipso-project', @@ -88,7 +88,7 @@ PORT_DOC = { "type": "port" } -VNIC_DOCS = [{ +VNIC_DOC = { "IP Address": "172.16.10.2", "IPv6 Address": "fe80::f816:3eff:fe96:5066/64", "cidr": "172.16.10.0/25", @@ -100,6 +100,7 @@ VNIC_DOCS = [{ "environment": ENV_CONFIG, "host": "node-251.cisco.com", "id": "tapca33c645-5b", + '_id': '5970b9aa797ffad322bc9b84', "id_path": "/" + ENV_CONFIG + "/" + ENV_CONFIG + "-regions/RegionOne/RegionOne-availability_zones/internal" + "/node-251.cisco.com/node-251.cisco.com-vservices/node-251.cisco.com-vservices-dhcps/qdhcp-911fe57e-" + "1ddd-4151-9dc7-6b578ab357b1/qdhcp-911fe57e-1ddd-4151-9dc7-6b578ab357b1-vnics/tapca33c645-5b", @@ -117,11 +118,10 @@ VNIC_DOCS = [{ "show_in_tree": True, "type": "vnic", "vnic_type": "vservice_vnic" -}] +} INSTANCE_DOC = { "environment": ENV_CONFIG, - "id": "b2bda4bf-1259-4d60-99ab-85ab4d5014a8", "type": "instance", "uuid": "b2bda4bf-1259-4d60-99ab-85ab4d5014a8", "network": [ diff --git a/app/test/event_based_scan/test_data/event_payload_port_update.py b/app/test/event_based_scan/test_data/event_payload_port_update.py index 90befbf..94e046b 100644 --- a/app/test/event_based_scan/test_data/event_payload_port_update.py +++ b/app/test/event_based_scan/test_data/event_payload_port_update.py @@ -7,7 +7,7 @@ # which accompanies this distribution, and is available at # # http://www.apache.org/licenses/LICENSE-2.0 # ############################################################################### -from test.event_based_scan.config.test_config import ENV_CONFIG +from test.event_based_scan.test_data.test_config import ENV_CONFIG EVENT_PAYLOAD_PORT_UPDATE = { '_context_timestamp': '2016-10-25 21:27:05.591848', '_context_user_name': 'admin', diff --git a/app/test/event_based_scan/test_data/event_payload_router_add.py b/app/test/event_based_scan/test_data/event_payload_router_add.py index 153538d..6fe0f88 100644 --- a/app/test/event_based_scan/test_data/event_payload_router_add.py +++ b/app/test/event_based_scan/test_data/event_payload_router_add.py @@ -9,7 +9,7 @@ ############################################################################### import datetime -from test.event_based_scan.config.test_config import ENV_CONFIG +from test.event_based_scan.test_data.test_config import ENV_CONFIG EVENT_PAYLOAD_ROUTER_ADD = { '_context_show_deleted': False, '_context_domain': None, diff --git a/app/test/event_based_scan/test_data/event_payload_router_delete.py b/app/test/event_based_scan/test_data/event_payload_router_delete.py index 8ab8cc3..b650a76 100644 --- a/app/test/event_based_scan/test_data/event_payload_router_delete.py +++ b/app/test/event_based_scan/test_data/event_payload_router_delete.py @@ -7,7 +7,7 @@ # which accompanies this distribution, and is available at # # http://www.apache.org/licenses/LICENSE-2.0 # ############################################################################### -from test.event_based_scan.config.test_config import ENV_CONFIG +from test.event_based_scan.test_data.test_config import ENV_CONFIG EVENT_PAYLOAD_ROUTER_DELETE = { '_context_request_id': 'req-8b2dd9ba-5faa-4471-94c3-fb41781eef8d', '_unique_id': 'c7417f771ee74bb19036b06e685c93dc', @@ -33,6 +33,7 @@ ROUTER_DOCUMENT = { "environment": ENV_CONFIG, "gw_port_id": None, "host": "node-6.cisco.com", + "_id": "593fc4c6797ffad322bc5329", "id": "node-6.cisco.com-qrouter-bde87a5a-7968-4f3b-952c-e87681a96078", "id_path": "/" + ENV_CONFIG + "/" + ENV_CONFIG + "-regions/RegionOne/RegionOne-availability_zones/internal" + "/node-6.cisco.com/node-6.cisco.com-vservices/node-6.cisco.com-vservices-routers/qrouter-bde87a5a" + diff --git a/app/test/event_based_scan/test_data/event_payload_router_update.py b/app/test/event_based_scan/test_data/event_payload_router_update.py index b0a917e..7dd0b70 100644 --- a/app/test/event_based_scan/test_data/event_payload_router_update.py +++ b/app/test/event_based_scan/test_data/event_payload_router_update.py @@ -7,7 +7,7 @@ # which accompanies this distribution, and is available at # # http://www.apache.org/licenses/LICENSE-2.0 # ############################################################################### -from test.event_based_scan.config.test_config import ENV_CONFIG +from test.event_based_scan.test_data.test_config import ENV_CONFIG EVENT_PAYLOAD_ROUTER_UPDATE = { '_context_request_id': 'req-da45908c-0765-4f8a-9fac-79246901de41', '_unique_id': '80723cc09a4748c6b13214dcb867719e', @@ -122,7 +122,7 @@ EVENT_PAYLOAD_ROUTER_DEL_GATEWAY = { 'tenant_id': '75c0eb79ff4a42b0ae4973c8375ddf40', 'status': 'ACTIVE'}}, '_context_request_id': 'req-d7e73189-4709-4234-8b4c-fb6b4dc2017b'} -PORTS = { +PORT = { "admin_state_up": True, "allowed_address_pairs": [ diff --git a/app/test/event_based_scan/test_data/event_payload_subnet_add.py b/app/test/event_based_scan/test_data/event_payload_subnet_add.py index 7167f4c..6e1caea 100644 --- a/app/test/event_based_scan/test_data/event_payload_subnet_add.py +++ b/app/test/event_based_scan/test_data/event_payload_subnet_add.py @@ -9,7 +9,7 @@ ############################################################################### import datetime -from test.event_based_scan.config.test_config import ENV_CONFIG +from test.event_based_scan.test_data.test_config import ENV_CONFIG NETWORK_DOC = {'port_security_enabled': True, 'status': 'ACTIVE', 'subnet_ids': [], 'parent_type': 'networks_folder', 'parent_id': '75c0eb79ff4a42b0ae4973c8375ddf40-networks', 'parent_text': 'Networks', 'subnets': {}, @@ -122,3 +122,72 @@ EVENT_PAYLOAD_REGION = { 'show_in_tree': True, 'id_path': '/' + ENV_CONFIG + '/' + ENV_CONFIG + '-regions/RegionOne', 'type': 'region'}} + + +HOST_DOC = { + "environment": ENV_CONFIG, + "host": "node-6.cisco.com", + "host_type": [ + "Controller", + "Network" + ], + "id": "node-6.cisco.com", + "id_path": "/" + ENV_CONFIG + "/" + ENV_CONFIG + "-regions/RegionOne/RegionOne-availability_zones" + + "/internal/node-6.cisco.com", + "name": "node-6.cisco.com", + "name_path": "/" + ENV_CONFIG + "/Regions/RegionOne/Availability Zones/internal/node-6.cisco.com", + "object_name": "node-6.cisco.com", + "parent_id": "internal", + "parent_type": "availability_zone", + "show_in_tree": True, + "type": "host", + "zone": "internal" +} + +PORT_DOC = { + "admin_state_up": True, + "device_id": "c57216ca-c1c4-430d-a045-32851ca879e3", + "device_owner": "compute:nova", + "dns_assignment": [ + { + "hostname": "host-172-16-10-1", + "ip_address": "172.16.10.1", + "fqdn": "host-172-16-10-1.openstacklocal." + } + ], + "dns_name": "", + "environment": ENV_CONFIG, + "extra_dhcp_opts": [ + + ], + "fixed_ips": [ + { + "ip_address": "172.16.10.1", + "subnet_id": "6f6ef3b5-76c9-4f70-81e5-f3cc196db025" + } + ], + "id": "2233445-55b6-4c05-9480-4bc648845c6f", + "id_path": ENV_CONFIG + "/" + ENV_CONFIG + "-projects/75c0eb79ff4a42b0ae4973c8375ddf40/75c0eb79ff4a42b0ae4973c837" + + "5ddf40-networks/1bb0ba6c-6863-4121-ac89-93f81a9da2b0/1bb0ba6c-6863-4121-ac89-93f81a9da2b0-ports" + + "/2233445-55b6-4c05-9480-4bc648845c6f", + "last_scanned": 0, + "mac_address": "fa:16:3e:13:b2:aa", + "master_parent_id": "1bb0ba6c-6863-4121-ac89-93f81a9da2b0", + "master_parent_type": "network", + "name": "fa:16:3e:13:b2:aa", + "name_path": "/" + ENV_CONFIG + "/Projects/calipso-project/Networks/test_interface/Ports/" + + "2233445-55b6-4c05-9480-4bc648845c6f", + "network_id": "1bb0ba6c-6863-4121-ac89-93f81a9da2b0", + "object_name": "2233445-55b6-4c05-9480-4bc648845c6f", + "parent_id": "1bb0ba6c-6863-4121-ac89-93f81a9da2b0-ports", + "parent_text": "Ports", + "parent_type": "ports_folder", + "port_security_enabled": False, + "project": "calipso-project", + "security_groups": [ + + ], + "status": "DOWN", + "tenant_id": "75c0eb79ff4a42b0ae4973c8375ddf40", + "type": "port" +} \ No newline at end of file diff --git a/app/test/event_based_scan/test_data/event_payload_subnet_delete.py b/app/test/event_based_scan/test_data/event_payload_subnet_delete.py index 55a785d..51598cd 100644 --- a/app/test/event_based_scan/test_data/event_payload_subnet_delete.py +++ b/app/test/event_based_scan/test_data/event_payload_subnet_delete.py @@ -7,7 +7,7 @@ # which accompanies this distribution, and is available at # # http://www.apache.org/licenses/LICENSE-2.0 # ############################################################################### -from test.event_based_scan.config.test_config import ENV_CONFIG +from test.event_based_scan.test_data.test_config import ENV_CONFIG EVENT_PAYLOAD_SUBNET_DELETE = { 'payload': {'subnet_id': '88442b4a-e62d-4d72-9d18-b8d6973eb3da'}, @@ -33,7 +33,7 @@ EVENT_PAYLOAD_SUBNET_DELETE = { '_context_project_id': '75c0eb79ff4a42b0ae4973c8375ddf40'} -EVENT_PAYLOAD_NETWORK = { +NETWORK_DOC = { "admin_state_up": True, "cidrs": [ "172.16.10.0/25" @@ -93,3 +93,34 @@ EVENT_PAYLOAD_NETWORK = { "tenant_id": "75c0eb79ff4a42b0ae4973c8375ddf40", "type": "network" } + +VNIC_DOC = { + "IP Address": "172.16.10.2", + "IPv6 Address": "fe80::f816:3eff:fe96:5066/64", + "cidr": "172.16.10.0/25", + "data": "Link encap:Ethernet HWaddr fa:16:3e:96:50:66\ninet addr:172.16.10.2 Bcast:172.16.10.127 " + + "Mask:255.255.255.128\ninet6 addr: fe80::f816:3eff:fe96:5066/64 Scope:Link\nUP BROADCAST RUNNING " + + "MULTICAST MTU:1450 Metric:1\nRX packets:17 errors:0 dropped:2 overruns:0 frame:0\nTX packets:8 " + + "errors:0 dropped:0 overruns:0 carrier:0\ncollisions:0 txqueuelen:0\nRX bytes:1593 " + + "(1.5 KB) TX bytes:648 (648.0 B)\n", + "environment": ENV_CONFIG, + "host": "node-6.cisco.com", + "id": "tapca33c645-5b", + '_id': '5970b9aa797ffad322bc9b84', + "id_path": "/" + ENV_CONFIG + "/" + ENV_CONFIG + "-regions/RegionOne/RegionOne-availability_zones/internal" + + "/node-6.cisco.com/node-6.cisco.com-vservices/node-6.cisco.com-vservices-dhcps/qdhcp-121c727b-6376-4a86-a5a8-793dfe7a8ef4/qdhcp-121c727b-6376-4a86-a5a8-793dfe7a8ef4-vnics/tapca33c645-5b", + "last_scanned": 0, + "mac_address": "fa:16:3e:13:b2:aa", + "name": "tapca33c645-5b", + "name_path": "/"+ENV_CONFIG+"/Regions/RegionOne/Availability Zones/internal/node-6.cisco.com/" + + "Vservices/DHCP servers/dhcp-test_interface/vNICs/tapca33c645-5b", + "netmask": "255.255.255.128", + "network": "121c727b-6376-4a86-a5a8-793dfe7a8ef4", + "object_name": "tapca33c645-5b", + "parent_id": "qdhcp-121c727b-6376-4a86-a5a8-793dfe7a8ef4-vnics", + "parent_text": "vNICs", + "parent_type": "vnics_folder", + "show_in_tree": True, + "type": "vnic", + "vnic_type": "vservice_vnic" +} \ No newline at end of file diff --git a/app/test/event_based_scan/test_data/event_payload_subnet_update.py b/app/test/event_based_scan/test_data/event_payload_subnet_update.py index 5f547c5..c326dcd 100644 --- a/app/test/event_based_scan/test_data/event_payload_subnet_update.py +++ b/app/test/event_based_scan/test_data/event_payload_subnet_update.py @@ -7,7 +7,7 @@ # which accompanies this distribution, and is available at # # http://www.apache.org/licenses/LICENSE-2.0 # ############################################################################### -from test.event_based_scan.config.test_config import ENV_CONFIG +from test.event_based_scan.test_data.test_config import ENV_CONFIG NETWORK_DOC = { 'port_security_enabled': True, 'status': 'ACTIVE', @@ -74,3 +74,24 @@ EVENT_PAYLOAD_SUBNET_UPDATE_1 = { '_context_auth_token': 'gAAAAABYDp0ZacwkUNIRvtiS-3qjLQFZKbkOtTmvuoKX9yM8yCIvl-eZmMC_SPjwPAMJcd8qckE77lLpQSx0l'+ 'WB67mT5jQA-tmp8bcz26kXXr8KlGCicxxjkYTYkJQhC9w8BbGc36CpbRBzIKlOrPtPXUYZrUmPgInQqCNA-eD'+ 'eMyJ-AiA1zmNSZK3R43YIJtnDYieLQvX2P'} + + +HOST_DOC = { + "environment": ENV_CONFIG, + "host": "node-6.cisco.com", + "host_type": [ + "Controller", + "Network" + ], + "id": "node-6.cisco.com", + "id_path": "/" + ENV_CONFIG + "/" + ENV_CONFIG + "-regions/RegionOne/RegionOne-availability_zones" + + "/internal/node-6.cisco.com", + "name": "node-6.cisco.com", + "name_path": "/" + ENV_CONFIG + "/Regions/RegionOne/Availability Zones/internal/node-6.cisco.com", + "object_name": "node-6.cisco.com", + "parent_id": "internal", + "parent_type": "availability_zone", + "show_in_tree": True, + "type": "host", + "zone": "internal" +} \ No newline at end of file diff --git a/app/test/event_based_scan/test_data/test_config.py b/app/test/event_based_scan/test_data/test_config.py new file mode 100644 index 0000000..6237a94 --- /dev/null +++ b/app/test/event_based_scan/test_data/test_config.py @@ -0,0 +1,14 @@ +############################################################################### +# Copyright (c) 2017 Koren Lev (Cisco Systems), Yaron Yogev (Cisco Systems) # +# and others # +# # +# All rights reserved. This program and the accompanying materials # +# are made available under the terms of the Apache License, Version 2.0 # +# which accompanies this distribution, and is available at # +# http://www.apache.org/licenses/LICENSE-2.0 # +############################################################################### +# local config info for test. + +ENV_CONFIG = 'test-env' + +COLLECTION_CONFIG = 'test-collection' -- cgit 1.2.3-korg