summaryrefslogtreecommitdiffstats
path: root/app/test/scan/test_data/scanner.py
diff options
context:
space:
mode:
authoryayogev <yaronyogev@gmail.com>2018-02-27 17:00:05 +0200
committeryayogev <yaronyogev@gmail.com>2018-02-27 17:00:05 +0200
commit648a394f7a318443dfd82f790f83a79616c26905 (patch)
tree719508e9d99771c3de056a9c2914d461c35fb967 /app/test/scan/test_data/scanner.py
parent100add41cfe2b987524b190c1c92771a3c4f1d5f (diff)
US3541 merge various fixes to OPNFV branch
timestamp of last commit tt was merged: 26-Jan-2018 16:25. Change-Id: I7b0bf7885d7d0badb81c794a52c480b905d78459 Signed-off-by: yayogev <yaronyogev@gmail.com>
Diffstat (limited to 'app/test/scan/test_data/scanner.py')
-rw-r--r--app/test/scan/test_data/scanner.py63
1 files changed, 35 insertions, 28 deletions
diff --git a/app/test/scan/test_data/scanner.py b/app/test/scan/test_data/scanner.py
index 500021d..ed2129f 100644
--- a/app/test/scan/test_data/scanner.py
+++ b/app/test/scan/test_data/scanner.py
@@ -10,7 +10,6 @@
import queue
from discover.fetchers.folder_fetcher import FolderFetcher
-
SCANNER_TYPE_FOR_ENV = "ScanEnvironment"
METADATA = {
@@ -64,7 +63,8 @@ TYPES_TO_FETCH = [
},
{
"type": "network_services_folder",
- "fetcher": FolderFetcher("network_services", "network", "Network vServices")
+ "fetcher": FolderFetcher("network_services", "network",
+ "Network vServices")
}
]
@@ -162,9 +162,6 @@ TYPES_TO_FETCHES_FOR_SCAN_AGGREGATE = [{
"fetcher": "DbFetchAggregateHosts"
}]
-
-
-
# id = 'RegionOne-aggregates'
# obj = self.inv.get_by_id(self.env, id)
obj = {'id': 'Mirantis-Liberty-Nvn'}
@@ -172,7 +169,6 @@ id_field = 'id'
child_id = '',
child_type = ''
-
child_data = [
{
'id_path': '/Mirantis-Liberty-Nvn/Mirantis-Liberty-Nvn-regions',
@@ -191,15 +187,23 @@ child_data = [
]
PARENT = {
- "environment" : "Mirantis-Liberty-Xiaocong",
- "id" : "node-6.cisco.com-vservices-dhcps",
- "name" : "node-6.cisco.com-vservices-dhcps",
- "object_name" : "DHCP servers",
- "parent_id" : "node-6.cisco.com-vservices",
- "parent_type" : "vservices_folder",
- "show_in_tree" : True,
- "text" : "DHCP servers",
- "type" : "vservice_dhcps_folder"
+ "environment": "Mirantis-Liberty-Xiaocong",
+ "id": "node-6.cisco.com-vservices-dhcps",
+ "id_path": "/Mirantis-Liberty-Xiaocong/Mirantis-Liberty-Xiaocong-regions"
+ "/RegionOne/RegionOne-availability_zones"
+ "/internal/node-6.cisco.com"
+ "/node-6.cisco.com-vservices/node-6.cisco.com-vservices-dhcps",
+ "name": "node-6.cisco.com-vservices-dhcps",
+ "name_path": "/Mirantis-Liberty-Xiaocong/Regions"
+ "/RegionOne/Availability Zones"
+ "/internal/node-6.cisco.com"
+ "/vServices/DHCP servers",
+ "object_name": "DHCP servers",
+ "parent_id": "node-6.cisco.com-vservices",
+ "parent_type": "vservices_folder",
+ "show_in_tree": True,
+ "text": "DHCP servers",
+ "type": "vservice_dhcps_folder"
}
PARENT_WITHOUT_ID = {
@@ -285,7 +289,6 @@ DB_RESULTS_WITHOUT_MASTER_PARENT_IN_DB = [
}
]
-
DICTIONARY_DB_RESULTS = {
"name": "Mirantis-Liberty-Xiaocong-regions",
"parent_type": "environment",
@@ -296,18 +299,22 @@ DICTIONARY_DB_RESULTS = {
}
MASTER_PARENT = {
- "create_object" : True,
- "environment" : "Mirantis-Liberty-Xiaocong",
- "id" : "node-6.cisco.com-vservices",
- "id_path" : "/Mirantis-Liberty/Mirantis-Liberty-regions/RegionOne/RegionOne-availability_zones/internal/node-6.cisco.com/node-6.cisco.com-vservices",
- "name" : "Vservices",
- "name_path" : "/Mirantis-Liberty/Regions/RegionOne/Availability Zones/internal/node-6.cisco.com/Vservices",
- "object_name" : "Vservices",
- "parent_id" : "node-6.cisco.com",
- "parent_type" : "host",
- "show_in_tree" : True,
- "text" : "Vservices",
- "type" : "vservices_folder"
+ "create_object": True,
+ "environment": "Mirantis-Liberty-Xiaocong",
+ "id": "node-6.cisco.com-vservices",
+ "id_path": "/Mirantis-Liberty/Mirantis-Liberty-regions"
+ "/RegionOne/RegionOne-availability_zones"
+ "/internal/node-6.cisco.com/node-6.cisco.com-vservices",
+ "name": "Vservices",
+ "name_path": "/Mirantis-Liberty/Regions"
+ "/RegionOne/Availability Zones"
+ "/internal/node-6.cisco.com/Vservices",
+ "object_name": "Vservices",
+ "parent_id": "node-6.cisco.com",
+ "parent_type": "host",
+ "show_in_tree": True,
+ "text": "Vservices",
+ "type": "vservices_folder"
}
CONFIGURATIONS_WITHOUT_MECHANISM_DRIVERS = {