summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--config/common_config.yaml6
-rw-r--r--test/conductor/test_conductor_calls.py4
-rw-r--r--test/conductor/test_conductor_translation.py2
-rw-r--r--test/placement-tests/policy_response2_old_format.json182
-rw-r--r--test/placement-tests/policy_response_old_format.json182
-rw-r--r--test/placement-tests/test_by_scope_old_format.yaml (renamed from test/placement-tests/test_by_scope_org.yaml)0
-rw-r--r--test/policy-local-files/Affinity_vCPE_1.json48
-rw-r--r--test/policy-local-files/Affinity_vFW_TD.json (renamed from test/policy-local-files/new_policies/Affinity_vFW_TD.json)0
-rw-r--r--test/policy-local-files/Attribute_vNS_1.json90
-rw-r--r--test/policy-local-files/Capacity_vGMuxInfra.json48
-rw-r--r--test/policy-local-files/Capacity_vG_1.json48
-rw-r--r--test/policy-local-files/Distance_vGMuxInfra_1.json50
-rw-r--r--test/policy-local-files/Distance_vG_1.json50
-rw-r--r--test/policy-local-files/Placement_Optimization_1.json44
-rw-r--r--test/policy-local-files/QueryPolicy_vCPE.json53
-rw-r--r--test/policy-local-files/QueryPolicy_vCPE_2.json73
-rw-r--r--test/policy-local-files/QueryPolicy_vFW_TD.json73
-rw-r--r--test/policy-local-files/hpa_policy_vGMuxInfra_1.json106
-rw-r--r--test/policy-local-files/hpa_policy_vG_1.json101
-rw-r--r--test/policy-local-files/meta-valid-policies-old.txt (renamed from test/policy-local-files/meta-valid-policies-org.txt)0
-rw-r--r--test/policy-local-files/meta-valid-policies.txt4
-rw-r--r--test/policy-local-files/new_policies/Affinity_vCPE_1.json33
-rw-r--r--test/policy-local-files/new_policies/Attribute_vNS_1.json51
-rw-r--r--test/policy-local-files/new_policies/Capacity_vGMuxInfra.json32
-rw-r--r--test/policy-local-files/new_policies/Capacity_vG_1.json32
-rw-r--r--test/policy-local-files/new_policies/Distance_vGMuxInfra_1.json36
-rw-r--r--test/policy-local-files/new_policies/Distance_vG_1.json36
-rw-r--r--test/policy-local-files/new_policies/QueryPolicy_vCPE.json38
-rw-r--r--test/policy-local-files/new_policies/QueryPolicy_vCPE_2.json55
-rw-r--r--test/policy-local-files/new_policies/QueryPolicy_vFW_TD.json47
-rw-r--r--test/policy-local-files/new_policies/meta-valid-policies.txt17
-rw-r--r--test/policy-local-files/new_policies/subscriber_policy_vCPE.json32
-rw-r--r--test/policy-local-files/new_policies/vnfPolicy_vFW_TD.json47
-rw-r--r--test/policy-local-files/new_policies/vnfPolicy_vG.json38
-rw-r--r--test/policy-local-files/new_policies/vnfPolicy_vGMuxInfra.json38
-rw-r--r--test/policy-local-files/new_policies/vnfPolicy_vPGN_TD.json52
-rw-r--r--test/policy-local-files/old-policies/Affinity_vCPE_1.json21
-rw-r--r--test/policy-local-files/old-policies/Attribute_vNS_1.json49
-rw-r--r--test/policy-local-files/old-policies/Capacity_vFW_1.json (renamed from test/policy-local-files/Capacity_vFW_1.json)0
-rw-r--r--test/policy-local-files/old-policies/Capacity_vGMuxInfra.json22
-rw-r--r--test/policy-local-files/old-policies/Capacity_vG_1.json22
-rw-r--r--test/policy-local-files/old-policies/Distance_vFW_1.json (renamed from test/policy-local-files/Distance_vFW_1.json)0
-rw-r--r--test/policy-local-files/old-policies/Distance_vGMuxInfra_1.json22
-rw-r--r--test/policy-local-files/old-policies/Distance_vG_1.json22
-rw-r--r--test/policy-local-files/old-policies/Placement_Optimization_1.json (renamed from test/policy-local-files/new_policies/Placement_Optimization_1.json)44
-rw-r--r--test/policy-local-files/old-policies/QueryPolicy_vCPE.json21
-rw-r--r--test/policy-local-files/old-policies/QueryPolicy_vCPE_2.json24
-rw-r--r--test/policy-local-files/old-policies/QueryPolicy_vFW.json (renamed from test/policy-local-files/QueryPolicy_vFW.json)0
-rw-r--r--test/policy-local-files/old-policies/QueryPolicy_vFW_TD.json32
-rw-r--r--test/policy-local-files/old-policies/affinity_vFW_TD.json (renamed from test/policy-local-files/affinity_vFW_TD.json)0
-rw-r--r--test/policy-local-files/old-policies/hpa_policy_vFW_1.json (renamed from test/policy-local-files/hpa_policy_vFW_1.json)0
-rw-r--r--test/policy-local-files/old-policies/hpa_policy_vGMuxInfra_1.json (renamed from test/policy-local-files/new_policies/hpa_policy_vGMuxInfra_1.json)106
-rw-r--r--test/policy-local-files/old-policies/hpa_policy_vG_1.json (renamed from test/policy-local-files/new_policies/hpa_policy_vG_1.json)101
-rw-r--r--test/policy-local-files/old-policies/subscriber_policy_vCPE.json22
-rw-r--r--test/policy-local-files/old-policies/subscriber_policy_vFW.json (renamed from test/policy-local-files/subscriber_policy_vFW.json)0
-rw-r--r--test/policy-local-files/old-policies/vnfPolicy_vFW.json (renamed from test/policy-local-files/vnfPolicy_vFW.json)0
-rw-r--r--test/policy-local-files/old-policies/vnfPolicy_vFW_TD.json44
-rw-r--r--test/policy-local-files/old-policies/vnfPolicy_vG.json29
-rw-r--r--test/policy-local-files/old-policies/vnfPolicy_vGMuxInfra.json28
-rw-r--r--test/policy-local-files/old-policies/vnfPolicy_vPGN_TD.json51
-rw-r--r--test/policy-local-files/subscriber_policy_vCPE.json48
-rw-r--r--test/policy-local-files/vnfPolicy_vFW_TD.json85
-rw-r--r--test/policy-local-files/vnfPolicy_vG.json61
-rw-r--r--test/policy-local-files/vnfPolicy_vGMuxInfra.json60
-rw-r--r--test/policy-local-files/vnfPolicy_vPGN_TD.json93
-rw-r--r--test/test_ConductorApiBuilder.py2
-rw-r--r--test/test_PolicyCalls.py2
-rw-r--r--test/test_get_opt_query_data.py4
68 files changed, 1557 insertions, 1206 deletions
diff --git a/config/common_config.yaml b/config/common_config.yaml
index cf75e2a..d9ecc18 100644
--- a/config/common_config.yaml
+++ b/config/common_config.yaml
@@ -11,7 +11,7 @@ osdf_temp: # special configuration required for "workarounds" or testing
local_policies:
global_disabled: True
local_placement_policies_enabled: True
- placement_policy_dir_vcpe: "./test/policy-local-files/new_policies/"
+ placement_policy_dir_vcpe: "./test/policy-local-files/"
placement_policy_files_vcpe: # workaroud for policy platform glitches (or "work-arounds" for other components)
- Affinity_vCPE_1.json
- Attribute_vNS_1.json
@@ -25,7 +25,7 @@ osdf_temp: # special configuration required for "workarounds" or testing
- QueryPolicy_vCPE.json
- vnfPolicy_vG.json
- vnfPolicy_vGMuxInfra.json
- placement_policy_dir_vfw: "./test/policy-local-files/new_policies/"
+ placement_policy_dir_vfw: "./test/policy-local-files/"
placement_policy_files_vfw: # workaroud for policy platform glitches (or "work-arounds" for other components)
#- Capacity_vFW_1.json
- Distance_vFW_1.json
@@ -33,7 +33,7 @@ osdf_temp: # special configuration required for "workarounds" or testing
- Placement_Optimization_1.json
- QueryPolicy_vFW.json
- vnfPolicy_vFW.json
- placement_policy_dir_vfw_td: "./test/policy-local-files/new_policies/"
+ placement_policy_dir_vfw_td: "./test/policy-local-files/"
placement_policy_files_vfw_td:
- vnfPolicy_vFW_TD.json
- vnfPolicy_vPGN_TD.json
diff --git a/test/conductor/test_conductor_calls.py b/test/conductor/test_conductor_calls.py
index d811e63..52e0367 100644
--- a/test/conductor/test_conductor_calls.py
+++ b/test/conductor/test_conductor_calls.py
@@ -40,12 +40,12 @@ class TestConductorCalls(unittest.TestCase):
def test_request(self):
req_json = json_from_file("./test/placement-tests/request.json")
- policies = pol.get_local_policies("test/policy-local-files/new_policies/", self.lp)
+ policies = pol.get_local_policies("test/policy-local-files/", self.lp)
conductor.request(req_json, self.osdf_config, policies)
def test_request_vfmod(self):
req_json = json_from_file("./test/placement-tests/request_vfmod.json")
- policies = pol.get_local_policies("test/policy-local-files/new_policies/", self.lp)
+ policies = pol.get_local_policies("test/policy-local-files/", self.lp)
conductor.request(req_json, self.osdf_config, policies)
diff --git a/test/conductor/test_conductor_translation.py b/test/conductor/test_conductor_translation.py
index cc9dc1c..3481b88 100644
--- a/test/conductor/test_conductor_translation.py
+++ b/test/conductor/test_conductor_translation.py
@@ -28,7 +28,7 @@ class TestConductorTranslation(unittest.TestCase):
self.main_dir = ""
self.conductor_api_template = self.main_dir + "osdf/templates/conductor_interface.json"
self.local_config_file = self.main_dir + "config/common_config.yaml"
- policy_data_path = self.main_dir + "test/policy-local-files/new_policies"
+ policy_data_path = self.main_dir + "test/policy-local-files"
valid_policies_list_file = policy_data_path + '/' + 'meta-valid-policies.txt'
valid_policies_files = local_policies.get_policy_names_from_file(valid_policies_list_file)
diff --git a/test/placement-tests/policy_response2_old_format.json b/test/placement-tests/policy_response2_old_format.json
new file mode 100644
index 0000000..2cd6dcb
--- /dev/null
+++ b/test/placement-tests/policy_response2_old_format.json
@@ -0,0 +1,182 @@
+[
+ {
+ "policyConfigMessage": "Config Retrieved! ",
+ "policyConfigStatus": "CONFIG_RETRIEVED",
+ "type": "JSON",
+ "config": "{\"service\":\"SubscriberPolicy\",\"policyName\":\"oofBeijing.SubscriberPolicy_v1\",\"description\":\"Subscriber Policy\",\"templateVersion\":\"0.0.1\",\"version\":\"oofBeijing\",\"priority\":\"1\",\"riskType\":\"test\",\"riskLevel\":\"3\",\"guard\":\"False\",\"content\":{\"identity\":\"subscriber\",\"policyScope\":[\"vCPE\",\"PVT Homing\",\"SubscriberPolicy\",\"subscriber_x\",\"subscriber_y\"],\"properties\":{\"subscriberName\":[\"subscriber_x\",\"subscriber_y\"],\"subscriberRole\":[\"PVT Homing\"],\"provStatus\":[\"CAPPED\"]},\"policyType\":\"SubscriberPolicy\"}}",
+ "policyName": "oofBeijing.Config_MS_SubscriberPolicy_v1.1.xml",
+ "policyVersion": "1",
+ "matchingConditions": {
+ "ECOMPName": "SNIRO-Placement",
+ "ONAPName": "SNIRO-Placement",
+ "ConfigName": "",
+ "service": "SubscriberPolicy",
+ "uuid": "",
+ "Location": ""
+ },
+ "responseAttributes": { },
+ "property": null
+ },
+ {
+ "policyConfigMessage": "Config Retrieved! ",
+ "policyConfigStatus": "CONFIG_RETRIEVED",
+ "type": "JSON",
+ "config": "{\"service\":\"hpaPolicy\",\"policyName\":\"oofBeijing.hpaPolicy_vGMuxInfra\",\"description\":\"HPA policy for vGMuxInfra\",\"templateVersion\":\"0.0.1\",\"version\":\"1.0\",\"priority\":\"3\",\"riskType\":\"test\",\"riskLevel\":\"2\",\"guard\":\"False\",\"content\":{\"resources\":\"vGMuxInfra\",\"identity\":\"hpaPolicy_vGMuxInfra\",\"policyScope\":[\"vCPE\",\"PVT Homing\",\"US\",\"INTERNATIONAL\",\"ip\",\"vGMuxInfra\"],\"policyType\":\"hpaPolicy\",\"flavorFeatures\":[{\"flavorLabel\":\"flavor_label_vm_01\",\"flavorProperties\":[{\"hpa-feature\":\"cpuTopology\",\"mandatory\":\"True\",\"architecture\":\"generic\",\"hpa-feature-attributes\":[{\"hpa-attribute-key\":\"numCpuSockets\",\"hpa-attribute-value\":\"2\",\"operator\":\">=\",\"unit\":\"\"},{\"hpa-attribute-key\":\"numCpuSockets\",\"hpa-attribute-value\":\"4\",\"operator\":\"<=\",\"unit\":\"\"},{\"hpa-attribute-key\":\"numCpuCores\",\"hpa-attribute-value\":\"2\",\"operator\":\">=\",\"unit\":\"\"},{\"hpa-attribute-key\":\"numCpuCores\",\"hpa-attribute-value\":\"4\",\"operator\":\"<=\",\"unit\":\"\"},{\"hpa-attribute-key\":\"numCpuThreads\",\"hpa-attribute-value\":\"4\",\"operator\":\">=\",\"unit\":\"\"},{\"hpa-attribute-key\":\"numCpuThreads\",\"hpa-attribute-value\":\"8\",\"operator\":\"<=\",\"unit\":\"\"}]},{\"hpa-feature\":\"basicCapabilities\",\"mandatory\":\"True\",\"architecture\":\"generic\",\"hpa-feature-attributes\":[{\"hpa-attribute-key\":\"numVirtualCpu\",\"hpa-attribute-value\":\"6\",\"operator\":\"=\",\"unit\":\"\"},{\"hpa-attribute-key\":\"virtualMemSize\",\"hpa-attribute-value\":\"6\",\"operator\":\"=\",\"unit\":\"GB\"}]},{\"hpa-feature\":\"ovsDpdk\",\"mandatory\":\"False\",\"score\":\"3\",\"architecture\":\"generic\",\"hpa-feature-attributes\":[{\"hpa-attribute-key\":\"dataProcessingAccelerationLibrary\",\"hpa-attribute-value\":\"ovsDpdk_version\",\"operator\":\"=\",\"unit\":\"\"}]},{\"hpa-feature\":\"cpuInstructionSetExtensions\",\"mandatory\":\"True\",\"architecture\":\"INTEL-64\",\"hpa-feature-attributes\":[{\"hpa-attribute-key\":\"instructionSetExtensions\",\"hpa-attribute-value\":[\"<CPUINST>\",\"<CPUINST>\"],\"operator\":\"ALL\",\"unit\":\"\"}]}]},{\"flavorLabel\":\"flavor_label_vm_02\",\"flavorProperties\":[{\"hpa-feature\":\"cpuPinningy\",\"mandatory\":\"True\",\"architecture\":\"generic\",\"hpa-feature-attributes\":[{\"hpa-attribute-key\":\"logicalCpuThreadPinningPolicy\",\"hpa-attribute-value\":\"<CPUTHREADPOLICY>\",\"operator\":\"=\",\"unit\":\"\"},{\"hpa-attribute-key\":\"logicalCpuPinningPolicy\",\"hpa-attribute-value\":\"<CPUPOLICY>\",\"operator\":\"=\",\"unit\":\"\"}]},{\"hpa-feature\":\"basicCapabilities\",\"mandatory\":\"True\",\"architecture\":\"generic\",\"hpa-feature-attributes\":[{\"hpa-attribute-key\":\"numVirtualCpu\",\"hpa-attribute-value\":\"6\",\"operator\":\"=\",\"unit\":\"\"},{\"hpa-attribute-key\":\"virtualMemSize\",\"hpa-attribute-value\":\"6\",\"operator\":\"=\",\"unit\":\"GB\"}]},{\"hpa-feature\":\"localStorage\",\"mandatory\":\"False\",\"score\":\"5\",\"architecture\":\"generic\",\"hpa-feature-attributes\":[{\"hpa-attribute-key\":\"diskSize\",\"hpa-attribute-value\":\"2\",\"operator\":\"=\",\"unit\":\"GB\"},{\"hpa-attribute-key\":\"ephemeralDiskSize\",\"hpa-attribute-value\":\"2\",\"operator\":\"=\",\"unit\":\"GB\"},{\"hpa-attribute-key\":\"swapMemSize\",\"hpa-attribute-value\":\"16\",\"operator\":\"=\",\"unit\":\"MB\"}]},{\"hpa-feature\":\"pcie\",\"mandatory\":\"True\",\"architecture\":\"generic\",\"hpa-feature-attributes\":[{\"hpa-attribute-key\":\"pciCount\",\"hpa-attribute-value\":\"2\",\"operator\":\"=\",\"unit\":\"\"},{\"hpa-attribute-key\":\"pciVendorId\",\"hpa-attribute-value\":\"8086\",\"operator\":\"=\",\"unit\":\"\"},{\"hpa-attribute-key\":\"pciDeviceId\",\"hpa-attribute-value\":\"2\",\"operator\":\"=\",\"unit\":\"\"},{\"hpa-attribute-key\":\"functionType\",\"hpa-attribute-value\":\"<PCITYPEVALUE>\",\"operator\":\"=\",\"unit\":\"\"}]}]},{\"flavorLabel\":\"flavor_label_vm_03\",\"flavorProperties\":[{\"hpa-feature\":\"numa\",\"mandatory\":\"False\",\"score\":\"5\",\"architecture\":\"generic\",\"hpa-feature-attributes\":[{\"hpa-attribute-key\":\"numaNodes\",\"hpa-attribute-value\":\"2\",\"operator\":\"=\",\"unit\":\"\"},{\"hpa-attribute-key\":\"numaCpu-0\",\"hpa-attribute-value\":\"2\",\"operator\":\"=\",\"unit\":\"\"},{\"hpa-attribute-key\":\"numaMem-0\",\"hpa-attribute-value\":\"2048\",\"operator\":\"=\",\"unit\":\"MB\"},{\"hpa-attribute-key\":\"numaCpu-1\",\"hpa-attribute-value\":\"4\",\"operator\":\"=\",\"unit\":\"\"},{\"hpa-attribute-key\":\"numaMem-1\",\"value\":\"4096\",\"operator\":\"=\",\"unit\":\"MB\"}]},{\"hpa-feature\":\"basicCapabilities\",\"mandatory\":\"True\",\"architecture\":\"generic\",\"hpa-feature-attributes\":[{\"hpa-attribute-key\":\"numVirtualCpu\",\"hpa-attribute-value\":\"6\",\"operator\":\"=\",\"unit\":\"\"},{\"hpa-attribute-key\":\"virtualMemSize\",\"hpa-attribute-value\":\"6\",\"operator\":\"=\",\"unit\":\"GB\"}]},{\"hpa-feature\":\"hugePages\",\"mandatory\":\"False\",\"score\":\"7\",\"architecture\":\"generic\",\"hpa-feature-attributes\":[{\"hpa-attribute-key\":\"memoryPageSize\",\"hpa-attribute-value\":\"<MEMORYPAGESIZE>\",\"operator\":\"=\",\"unit\":\"\"}]}]}]}}",
+ "policyName": "oofBeijing.Config_MS_hpaPolicy_vGMuxInfra.1.xml",
+ "policyVersion": "1",
+ "matchingConditions": {
+ "ECOMPName": "SNIRO-Placement",
+ "ONAPName": "SNIRO-Placement",
+ "ConfigName": "",
+ "service": "hpaPolicy",
+ "uuid": "",
+ "Location": ""
+ },
+ "responseAttributes": { },
+ "property": null
+ },
+ {
+ "policyConfigMessage": "Config Retrieved! ",
+ "policyConfigStatus": "CONFIG_RETRIEVED",
+ "type": "JSON",
+ "config": "{\"service\":\"VnfPolicy\",\"policyName\":\"oofBeijing.vnfPolicy_vG\",\"description\":\"vnfPolicy\",\"templateVersion\":\"1702.03\",\"version\":\"oofBeijing\",\"priority\":\"6\",\"riskType\":\"test\",\"riskLevel\":\"3\",\"guard\":\"False\",\"content\":{\"identity\":\"vnf_vG\",\"policyScope\":[\"vCPE\",\"INTERNATIONAL\",\"ip\",\"vG\"],\"policyType\":\"vnf_policy\",\"resources\":[\"vG\"],\"applicableResources\":\"any\",\"vnfProperties\":[{\"inventoryProvider\":\"aai\",\"serviceType\":\"\",\"inventoryType\":\"cloud\",\"customerId\":\"\"},{\"inventoryProvider\":\"multicloud\",\"serviceType\":\"HNGATEWAY\",\"inventoryType\":\"service\",\"customerId\":\"21014aa2-526b-11e6-beb8-9e71128cae77\"}]}}",
+ "policyName": "oofBeijing.Config_MS_vnfPolicy_vG.1.xml",
+ "policyVersion": "1",
+ "matchingConditions": {
+ "ECOMPName": "SNIRO-Placement",
+ "ONAPName": "SNIRO-Placement",
+ "ConfigName": "",
+ "service": "VnfPolicy",
+ "uuid": "",
+ "Location": ""
+ },
+ "responseAttributes": { },
+ "property": null
+ },
+ {
+ "policyConfigMessage": "Config Retrieved! ",
+ "policyConfigStatus": "CONFIG_RETRIEVED",
+ "type": "JSON",
+ "config": "{\"service\":\"VnfPolicy\",\"policyName\":\"oofBeijing.vnfPolicy_vGMuxInfra\",\"description\":\"vnfPolicy\",\"templateVersion\":\"1702.03\",\"version\":\"oofBeijing\",\"priority\":\"6\",\"riskType\":\"test\",\"riskLevel\":\"3\",\"guard\":\"False\",\"content\":{\"identity\":\"vnf_vGMuxInfra\",\"policyScope\":[\"vCPE\",\"INTERNATIONAL\",\"ip\",\"vGMuxInfra\"],\"policyType\":\"vnf_policy\",\"resources\":[\"vGMuxInfra\"],\"applicableResources\":\"any\",\"vnfProperties\":[{\"inventoryProvider\":\"aai\",\"serviceType\":\"\",\"inventoryType\":\"cloud\",\"customerId\":\"\"},{\"inventoryProvider\":\"multicloud\",\"serviceType\":\"HNGATEWAY\",\"inventoryType\":\"service\",\"customerId\":\"21014aa2-526b-11e6-beb8-9e71128cae77\"}]}}",
+ "policyName": "oofBeijing.Config_MS_vnfPolicy_vGMuxInfra.1.xml",
+ "policyVersion": "1",
+ "matchingConditions": {
+ "ECOMPName": "SNIRO-Placement",
+ "ONAPName": "SNIRO-Placement",
+ "ConfigName": "",
+ "service": "VnfPolicy",
+ "uuid": "",
+ "Location": ""
+ },
+ "responseAttributes": { },
+ "property": null
+ },
+ {
+ "policyConfigMessage": "Config Retrieved! ",
+ "policyConfigStatus": "CONFIG_RETRIEVED",
+ "type": "JSON",
+ "config": "{\"service\":\"distancePolicy\",\"policyName\":\"oofBeijing.distancePolicy_vG\",\"description\":\"Distance Policy for vG\",\"templateVersion\":\"0.0.1\",\"version\":\"oofBeijing\",\"priority\":\"3\",\"riskType\":\"test\",\"riskLevel\":\"2\",\"guard\":\"False\",\"content\":{\"distanceProperties\":{\"locationInfo\":\"customer_location\",\"distance\":{\"value\":\"1500\",\"operator\":\"<\",\"unit\":\"km\"}},\"identity\":\"distance-vG\",\"resources\":[\"vG\"],\"policyScope\":[\"vCPE\",\"US\",\"INTERNATIONAL\",\"ip\",\"vG\"],\"policyType\":\"distancePolicy\",\"applicableResources\":\"any\"}}",
+ "policyName": "oofBeijing.Config_MS_distancePolicy_vG.1.xml",
+ "policyVersion": "1",
+ "matchingConditions": {
+ "ECOMPName": "SNIRO-Placement",
+ "ONAPName": "SNIRO-Placement",
+ "ConfigName": "",
+ "service": "distancePolicy",
+ "uuid": "",
+ "Location": ""
+ },
+ "responseAttributes": { },
+ "property": null
+ },
+ {
+ "policyConfigMessage": "Config Retrieved! ",
+ "policyConfigStatus": "CONFIG_RETRIEVED",
+ "type": "JSON",
+ "config": "{\"service\": \"capacityPolicy\", \"policyName\": \"oofBeijing.capacityPolicy_vG\", \"description\": \"Capacity policy for vG\", \"templateVersion\": \"1702.03\", \"version\": \"oofBeijing\", \"priority\": \"5\", \"riskType\": \"test\", \"riskLevel\": \"2\", \"guard\": \"False\", \"content\": {\"identity\": \"capacity_vG\", \"policyScope\": [\"VCPE\",\"US\", \"INTERNATIONAL\", \"ip\", \"vG\", \"vim_fit\"], \"resources\": [\"vG\"], \"capacityProperty\": {\"controller\": \"multicloud\", \"request\": \"{\\\"vCPU\\\": 10, \\\"Memory\\\": {\\\"quantity\\\": {\\\"get_param\\\": \\\"REQUIRED_MEM\\\"}, \\\"unit\\\": \\\"GB\\\"}, \\\"Storage\\\": {\\\"quantity\\\": {\\\"get_param\\\": \\\"REQUIRED_DISK\\\", \\\"unit\\\": \\\"GB\\\"}}}\"}, \"policyType\": \"vim_fit\", \"applicableResources\": \"any\"}}",
+ "policyName": "oofBeijing.Config_MS_capacityPolicy_vG.1.xml",
+ "policyVersion": "1",
+ "matchingConditions": {
+ "ECOMPName": "SNIRO-Placement",
+ "ONAPName": "SNIRO-Placement",
+ "ConfigName": "",
+ "service": "capacityPolicy",
+ "uuid": "",
+ "Location": ""
+ },
+ "responseAttributes": { },
+ "property": null
+ },
+ {
+ "policyConfigMessage": "Config Retrieved! ",
+ "policyConfigStatus": "CONFIG_RETRIEVED",
+ "type": "JSON",
+ "config": "{\"service\": \"optimizationQueryPolicy\", \"policyName\": \"oofBeijing.queryPolicy_vCPE\", \"description\": \"Optimization query policy for vCPE\", \"templateVersion\": \"0.0.1\", \"version\": \"oofBeijing\", \"priority\": \"3\", \"riskType\": \"test\", \"riskLevel\": \"2\", \"guard\": \"False\", \"content\": {\"queryProperties\": [{\"attribute\": \"locationId\", \"attribute_location\": \"customerLocation\", \"value\": \"\"}, {\"attribute\": \"id\", \"attribute_location\": \"vpnInfo.vpnId\", \"value\": \"\"}, {\"attribute\": \"upstreamBW\", \"attribute_location\": \"vpnInfo.upstreamBW\", \"value\": \"\"}, {\"attribute\": \"customerLatitude\", \"attribute_location\": \"customerLatitude\", \"value\": 32.89748}, {\"attribute\": \"customerLongitude\", \"attribute_location\": \"customerLongitude\", \"value\": -97.040443}], \"policyScope\": [\"vCPE\",\"US\", \"INTERNATIONAL\", \"ip\", \"vGMuxInfra\", \"vG\", \"optimizationQueryPolicy\"], \"policyType\": \"optimizationQueryPolicy\"}}",
+ "policyName": "oofBeijing.Config_MS_queryPolicy_vCPE.1.xml",
+ "policyVersion": "1",
+ "matchingConditions": {
+ "ECOMPName": "SNIRO-Placement",
+ "ONAPName": "SNIRO-Placement",
+ "ConfigName": "",
+ "service": "optimizationQueryPolicy",
+ "uuid": "",
+ "Location": ""
+ },
+ "responseAttributes": { },
+ "property": null
+ },
+ {
+ "policyConfigMessage": "Config Retrieved! ",
+ "policyConfigStatus": "CONFIG_RETRIEVED",
+ "type": "JSON",
+ "config": "{\"service\":\"PlacementOptimizationPolicy\",\"policyName\":\"oofBeijing.PlacementOptimizationPolicy_vGMuxInfra\",\"description\":\"Placement Optimization Policy for vGMuxInfra\",\"templateVersion\":\"1702.03\",\"version\":\"oofBeijing\",\"priority\":\"5\",\"riskType\":\"test\",\"riskLevel\":\"3\",\"guard\":\"False\",\"content\":{\"objectiveParameter\":{\"parameterAttributes\":[{\"resource\":[\"vGMuxInfra\"],\"customerLocationInfo\":\"customer_loc\",\"parameter\":\"distance\",\"weight\":\"1\",\"operator\":\"product\"},{\"resource\":[\"vG\"],\"customerLocationInfo\":\"customer_loc\",\"parameter\":\"distance\",\"weight\":\"1\",\"operator\":\"product\"}],\"operator\":\"sum\"},\"identity\":\"optimization\",\"policyScope\":[\"vCPE\",\"US\",\"INTERNATIONAL\",\"ip\",\"vGMuxInfra\",\"vG\"],\"policyType\":\"placementOptimization\",\"objective\":\"minimize\"}}",
+ "policyName": "oofBeijing.Config_MS_PlacementOptimizationPolicy_vGMuxInfra.1.xml",
+ "policyVersion": "1",
+ "matchingConditions": {
+ "ECOMPName": "SNIRO-Placement",
+ "ONAPName": "SNIRO-Placement",
+ "ConfigName": "",
+ "service": "PlacementOptimizationPolicy",
+ "uuid": "",
+ "Location": ""
+ },
+ "responseAttributes": { },
+ "property": null
+ },
+ {
+ "policyConfigMessage": "Config Retrieved! ",
+ "policyConfigStatus": "CONFIG_RETRIEVED",
+ "type": "JSON",
+ "config": "{\"service\":\"distancePolicy\",\"policyName\":\"oofBeijing.distancePolicy_vGMuxInfra\",\"description\":\"Distance Policy for vGMuxInfra\",\"templateVersion\":\"0.0.1\",\"version\":\"oofBeijing\",\"priority\":\"3\",\"riskType\":\"test\",\"riskLevel\":\"2\",\"guard\":\"False\",\"content\":{\"distanceProperties\":{\"locationInfo\":\"customer_location\",\"distance\":{\"value\":\"500\",\"operator\":\"<\",\"unit\":\"km\"}},\"identity\":\"distance-vGMuxInfra\",\"resources\":[\"vGMuxInfra\"],\"policyScope\":[\"vCPE\",\"US\",\"INTERNATIONAL\",\"ip\",\"vGMuxInfra\"],\"policyType\":\"distancePolicy\",\"applicableResources\":\"any\"}}",
+ "policyName": "oofBeijing.Config_MS_distancePolicy_vGMuxInfra.1.xml",
+ "policyVersion": "1",
+ "matchingConditions": {
+ "ECOMPName": "SNIRO-Placement",
+ "ONAPName": "SNIRO-Placement",
+ "ConfigName": "",
+ "service": "distancePolicy",
+ "uuid": "",
+ "Location": ""
+ },
+ "responseAttributes": { },
+ "property": null
+ },
+ {
+ "policyConfigMessage": "Config Retrieved! ",
+ "policyConfigStatus": "CONFIG_RETRIEVED",
+ "type": "JSON",
+ "config": "{\"service\": \"capacityPolicy\", \"policyName\": \"oofBeijing.capacityPolicy_vGMuxInfra\", \"description\": \"Capacity policy for vGMuxInfra\", \"templateVersion\": \"1702.03\", \"version\": \"oofBeijing\", \"priority\": \"5\", \"riskType\": \"test\", \"riskLevel\": \"2\", \"guard\": \"False\", \"content\": {\"identity\": \"capacity_vGMuxInfra\", \"policyScope\": [\"VCPE\",\"US\", \"INTERNATIONAL\", \"ip\", \"vGMuxInfra\", \"vim_fit\"], \"resources\": [\"vGMuxInfra\"], \"capacityProperty\": {\"controller\": \"multicloud\", \"request\": \"{\\\"vCPU\\\": 10, \\\"Memory\\\": {\\\"quantity\\\": {\\\"get_param\\\": \\\"REQUIRED_MEM\\\"}, \\\"unit\\\": \\\"GB\\\"}, \\\"Storage\\\": {\\\"quantity\\\": {\\\"get_param\\\": \\\"REQUIRED_DISK\\\", \\\"unit\\\": \\\"GB\\\"}}}\"}, \"policyType\": \"vim_fit\", \"applicableResources\": \"any\"}}",
+ "policyName": "oofBeijing.Config_MS_capacityPolicy_vGMuxInfra.1.xml",
+ "policyVersion": "1",
+ "matchingConditions": {
+ "ECOMPName": "SNIRO-Placement",
+ "ONAPName": "SNIRO-Placement",
+ "ConfigName": "",
+ "service": "capacityPolicy",
+ "uuid": "",
+ "Location": ""
+ },
+ "responseAttributes": { },
+ "property": null
+ }
+] \ No newline at end of file
diff --git a/test/placement-tests/policy_response_old_format.json b/test/placement-tests/policy_response_old_format.json
new file mode 100644
index 0000000..8de8537
--- /dev/null
+++ b/test/placement-tests/policy_response_old_format.json
@@ -0,0 +1,182 @@
+[
+ {
+ "policyConfigMessage": "Config Retrieved! ",
+ "policyConfigStatus": "CONFIG_RETRIEVED",
+ "type": "JSON",
+ "config": "{\"service\":\"SubscriberPolicy\",\"policyName\":\"oofBeijing.SubscriberPolicy_v1\",\"description\":\"Subscriber Policy\",\"templateVersion\":\"0.0.1\",\"version\":\"oofBeijing\",\"priority\":\"1\",\"riskType\":\"test\",\"riskLevel\":\"3\",\"guard\":\"False\",\"content\":{\"identity\":\"subscriber\",\"policyScope\":[\"vcpe\",\"PVT Homing\",\"subscriberpolicy\",\"subscriber_x\",\"subscriber_y\"],\"properties\":{\"subscriberName\":[\"subscriber_x\",\"subscriber_y\"],\"subscriberRole\":[\"PVT Homing\"],\"provStatus\":[\"CAPPED\"]},\"policyType\":\"SubscriberPolicy\"}}",
+ "policyName": "oofBeijing.Config_MS_SubscriberPolicy_v1.1.xml",
+ "policyVersion": "1",
+ "matchingConditions": {
+ "ECOMPName": "SNIRO-Placement",
+ "ONAPName": "SNIRO-Placement",
+ "ConfigName": "",
+ "service": "SubscriberPolicy",
+ "uuid": "",
+ "Location": ""
+ },
+ "responseAttributes": { },
+ "property": null
+ },
+ {
+ "policyConfigMessage": "Config Retrieved! ",
+ "policyConfigStatus": "CONFIG_RETRIEVED",
+ "type": "JSON",
+ "config": "{\"service\":\"hpaPolicy\",\"policyName\":\"oofBeijing.hpaPolicy_vGMuxInfra\",\"description\":\"HPA policy for vGMuxInfra\",\"templateVersion\":\"0.0.1\",\"version\":\"1.0\",\"priority\":\"3\",\"riskType\":\"test\",\"riskLevel\":\"2\",\"guard\":\"False\",\"content\":{\"resources\":\"vGMuxInfra\",\"identity\":\"hpaPolicy_vGMuxInfra\",\"policyScope\":[\"vcpe\",\"PVT Homing\",\"us\",\"international\",\"ip\",\"vGMuxInfra\"],\"policyType\":\"hpaPolicy\",\"flavorFeatures\":[{\"flavorLabel\":\"flavor_label_vm_01\",\"flavorProperties\":[{\"hpa-feature\":\"cpuTopology\",\"mandatory\":\"True\",\"architecture\":\"generic\",\"hpa-feature-attributes\":[{\"hpa-attribute-key\":\"numCpusockets\",\"hpa-attribute-value\":\"2\",\"operator\":\">=\",\"unit\":\"\"},{\"hpa-attribute-key\":\"numCpusockets\",\"hpa-attribute-value\":\"4\",\"operator\":\"<=\",\"unit\":\"\"},{\"hpa-attribute-key\":\"numCpuCores\",\"hpa-attribute-value\":\"2\",\"operator\":\">=\",\"unit\":\"\"},{\"hpa-attribute-key\":\"numCpuCores\",\"hpa-attribute-value\":\"4\",\"operator\":\"<=\",\"unit\":\"\"},{\"hpa-attribute-key\":\"numCpuThreads\",\"hpa-attribute-value\":\"4\",\"operator\":\">=\",\"unit\":\"\"},{\"hpa-attribute-key\":\"numCpuThreads\",\"hpa-attribute-value\":\"8\",\"operator\":\"<=\",\"unit\":\"\"}]},{\"hpa-feature\":\"basicCapabilities\",\"mandatory\":\"True\",\"architecture\":\"generic\",\"hpa-feature-attributes\":[{\"hpa-attribute-key\":\"numVirtualCpu\",\"hpa-attribute-value\":\"6\",\"operator\":\"=\",\"unit\":\"\"},{\"hpa-attribute-key\":\"virtualMemSize\",\"hpa-attribute-value\":\"6\",\"operator\":\"=\",\"unit\":\"GB\"}]},{\"hpa-feature\":\"ovsDpdk\",\"mandatory\":\"False\",\"score\":\"3\",\"architecture\":\"generic\",\"hpa-feature-attributes\":[{\"hpa-attribute-key\":\"dataProcessingAccelerationLibrary\",\"hpa-attribute-value\":\"ovsDpdk_version\",\"operator\":\"=\",\"unit\":\"\"}]},{\"hpa-feature\":\"cpuInstructionSetExtensions\",\"mandatory\":\"True\",\"architecture\":\"INTEL-64\",\"hpa-feature-attributes\":[{\"hpa-attribute-key\":\"instructionSetExtensions\",\"hpa-attribute-value\":[\"<CPUINST>\",\"<CPUINST>\"],\"operator\":\"ALL\",\"unit\":\"\"}]}]},{\"flavorLabel\":\"flavor_label_vm_02\",\"flavorProperties\":[{\"hpa-feature\":\"cpuPinningy\",\"mandatory\":\"True\",\"architecture\":\"generic\",\"hpa-feature-attributes\":[{\"hpa-attribute-key\":\"logicalCpuThreadPinningPolicy\",\"hpa-attribute-value\":\"<CPUTHREADPOLICY>\",\"operator\":\"=\",\"unit\":\"\"},{\"hpa-attribute-key\":\"logicalCpuPinningPolicy\",\"hpa-attribute-value\":\"<CPUPOLICY>\",\"operator\":\"=\",\"unit\":\"\"}]},{\"hpa-feature\":\"basicCapabilities\",\"mandatory\":\"True\",\"architecture\":\"generic\",\"hpa-feature-attributes\":[{\"hpa-attribute-key\":\"numVirtualCpu\",\"hpa-attribute-value\":\"6\",\"operator\":\"=\",\"unit\":\"\"},{\"hpa-attribute-key\":\"virtualMemSize\",\"hpa-attribute-value\":\"6\",\"operator\":\"=\",\"unit\":\"GB\"}]},{\"hpa-feature\":\"localStorage\",\"mandatory\":\"False\",\"score\":\"5\",\"architecture\":\"generic\",\"hpa-feature-attributes\":[{\"hpa-attribute-key\":\"diskSize\",\"hpa-attribute-value\":\"2\",\"operator\":\"=\",\"unit\":\"GB\"},{\"hpa-attribute-key\":\"ephemeralDiskSize\",\"hpa-attribute-value\":\"2\",\"operator\":\"=\",\"unit\":\"GB\"},{\"hpa-attribute-key\":\"swapMemSize\",\"hpa-attribute-value\":\"16\",\"operator\":\"=\",\"unit\":\"MB\"}]},{\"hpa-feature\":\"pcie\",\"mandatory\":\"True\",\"architecture\":\"generic\",\"hpa-feature-attributes\":[{\"hpa-attribute-key\":\"pciCount\",\"hpa-attribute-value\":\"2\",\"operator\":\"=\",\"unit\":\"\"},{\"hpa-attribute-key\":\"pciVendorId\",\"hpa-attribute-value\":\"8086\",\"operator\":\"=\",\"unit\":\"\"},{\"hpa-attribute-key\":\"pciDeviceId\",\"hpa-attribute-value\":\"2\",\"operator\":\"=\",\"unit\":\"\"},{\"hpa-attribute-key\":\"functionType\",\"hpa-attribute-value\":\"<PCITYPEVALUE>\",\"operator\":\"=\",\"unit\":\"\"}]}]},{\"flavorLabel\":\"flavor_label_vm_03\",\"flavorProperties\":[{\"hpa-feature\":\"numa\",\"mandatory\":\"False\",\"score\":\"5\",\"architecture\":\"generic\",\"hpa-feature-attributes\":[{\"hpa-attribute-key\":\"numaNodes\",\"hpa-attribute-value\":\"2\",\"operator\":\"=\",\"unit\":\"\"},{\"hpa-attribute-key\":\"numaCpu-0\",\"hpa-attribute-value\":\"2\",\"operator\":\"=\",\"unit\":\"\"},{\"hpa-attribute-key\":\"numaMem-0\",\"hpa-attribute-value\":\"2048\",\"operator\":\"=\",\"unit\":\"MB\"},{\"hpa-attribute-key\":\"numaCpu-1\",\"hpa-attribute-value\":\"4\",\"operator\":\"=\",\"unit\":\"\"},{\"hpa-attribute-key\":\"numaMem-1\",\"value\":\"4096\",\"operator\":\"=\",\"unit\":\"MB\"}]},{\"hpa-feature\":\"basicCapabilities\",\"mandatory\":\"True\",\"architecture\":\"generic\",\"hpa-feature-attributes\":[{\"hpa-attribute-key\":\"numVirtualCpu\",\"hpa-attribute-value\":\"6\",\"operator\":\"=\",\"unit\":\"\"},{\"hpa-attribute-key\":\"virtualMemSize\",\"hpa-attribute-value\":\"6\",\"operator\":\"=\",\"unit\":\"GB\"}]},{\"hpa-feature\":\"hugePages\",\"mandatory\":\"False\",\"score\":\"7\",\"architecture\":\"generic\",\"hpa-feature-attributes\":[{\"hpa-attribute-key\":\"memoryPageSize\",\"hpa-attribute-value\":\"<MEMORYPAGESIZE>\",\"operator\":\"=\",\"unit\":\"\"}]}]}]}}",
+ "policyName": "oofBeijing.Config_MS_hpaPolicy_vGMuxInfra.1.xml",
+ "policyVersion": "1",
+ "matchingConditions": {
+ "ECOMPName": "SNIRO-Placement",
+ "ONAPName": "SNIRO-Placement",
+ "ConfigName": "",
+ "service": "hpaPolicy",
+ "uuid": "",
+ "Location": ""
+ },
+ "responseAttributes": { },
+ "property": null
+ },
+ {
+ "policyConfigMessage": "Config Retrieved! ",
+ "policyConfigStatus": "CONFIG_RETRIEVED",
+ "type": "JSON",
+ "config": "{\"service\":\"VnfPolicy\",\"policyName\":\"oofBeijing.vnfPolicy_vG\",\"description\":\"vnfPolicy\",\"templateVersion\":\"1702.03\",\"version\":\"oofBeijing\",\"priority\":\"6\",\"riskType\":\"test\",\"riskLevel\":\"3\",\"guard\":\"False\",\"content\":{\"identity\":\"vnf_vG\",\"policyScope\":[\"vcpe\",\"PVT Homing\",\"international\",\"ip\",\"vG\"],\"policyType\":\"vnf_policy\",\"resources\":[\"vG\"],\"applicableResources\":\"any\",\"vnfProperties\":[{\"inventoryProvider\":\"aai\",\"serviceType\":\"\",\"inventoryType\":\"cloud\",\"customerId\":\"\"},{\"inventoryProvider\":\"multicloud\",\"serviceType\":\"HNGATEWAY\",\"inventoryType\":\"service\",\"customerId\":\"21014aa2-526b-11e6-beb8-9e71128cae77\"}]}}",
+ "policyName": "oofBeijing.Config_MS_vnfPolicy_vG.1.xml",
+ "policyVersion": "1",
+ "matchingConditions": {
+ "ECOMPName": "SNIRO-Placement",
+ "ONAPName": "SNIRO-Placement",
+ "ConfigName": "",
+ "service": "VnfPolicy",
+ "uuid": "",
+ "Location": ""
+ },
+ "responseAttributes": { },
+ "property": null
+ },
+ {
+ "policyConfigMessage": "Config Retrieved! ",
+ "policyConfigStatus": "CONFIG_RETRIEVED",
+ "type": "JSON",
+ "config": "{\"service\":\"VnfPolicy\",\"policyName\":\"oofBeijing.vnfPolicy_vGMuxInfra\",\"description\":\"vnfPolicy\",\"templateVersion\":\"1702.03\",\"version\":\"oofBeijing\",\"priority\":\"6\",\"riskType\":\"test\",\"riskLevel\":\"3\",\"guard\":\"False\",\"content\":{\"identity\":\"vnf_vGMuxInfra\",\"policyScope\":[\"vcpe\",\"PVT Homing\",\"international\",\"ip\",\"vGMuxInfra\"],\"policyType\":\"vnf_policy\",\"resources\":[\"vGMuxInfra\"],\"applicableResources\":\"any\",\"vnfProperties\":[{\"inventoryProvider\":\"aai\",\"serviceType\":\"\",\"inventoryType\":\"cloud\",\"customerId\":\"\"},{\"inventoryProvider\":\"multicloud\",\"serviceType\":\"HNGATEWAY\",\"inventoryType\":\"service\",\"customerId\":\"21014aa2-526b-11e6-beb8-9e71128cae77\"}]}}",
+ "policyName": "oofBeijing.Config_MS_vnfPolicy_vGMuxInfra.1.xml",
+ "policyVersion": "1",
+ "matchingConditions": {
+ "ECOMPName": "SNIRO-Placement",
+ "ONAPName": "SNIRO-Placement",
+ "ConfigName": "",
+ "service": "VnfPolicy",
+ "uuid": "",
+ "Location": ""
+ },
+ "responseAttributes": { },
+ "property": null
+ },
+ {
+ "policyConfigMessage": "Config Retrieved! ",
+ "policyConfigStatus": "CONFIG_RETRIEVED",
+ "type": "JSON",
+ "config": "{\"service\":\"distancePolicy\",\"policyName\":\"oofBeijing.distancePolicy_vG\",\"description\":\"Distance Policy for vG\",\"templateVersion\":\"0.0.1\",\"version\":\"oofBeijing\",\"priority\":\"3\",\"riskType\":\"test\",\"riskLevel\":\"2\",\"guard\":\"False\",\"content\":{\"distanceProperties\":{\"locationInfo\":\"customer_location\",\"distance\":{\"value\":\"1500\",\"operator\":\"<\",\"unit\":\"km\"}},\"identity\":\"distance-vG\",\"resources\":[\"vG\"],\"policyScope\":[\"vcpe\",\"PVT Homing\",\"us\",\"international\",\"ip\",\"vG\"],\"policyType\":\"distancePolicy\",\"applicableResources\":\"any\"}}",
+ "policyName": "oofBeijing.Config_MS_distancePolicy_vG.1.xml",
+ "policyVersion": "1",
+ "matchingConditions": {
+ "ECOMPName": "SNIRO-Placement",
+ "ONAPName": "SNIRO-Placement",
+ "ConfigName": "",
+ "service": "distancePolicy",
+ "uuid": "",
+ "Location": ""
+ },
+ "responseAttributes": { },
+ "property": null
+ },
+ {
+ "policyConfigMessage": "Config Retrieved! ",
+ "policyConfigStatus": "CONFIG_RETRIEVED",
+ "type": "JSON",
+ "config": "{\"service\": \"capacityPolicy\", \"policyName\": \"oofBeijing.capacityPolicy_vG\", \"description\": \"Capacity policy for vG\", \"templateVersion\": \"1702.03\", \"version\": \"oofBeijing\", \"priority\": \"5\", \"riskType\": \"test\", \"riskLevel\": \"2\", \"guard\": \"False\", \"content\": {\"identity\": \"capacity_vG\", \"policyScope\": [\"vcpe\", \"PVT Homing\",\"us\", \"international\", \"ip\", \"vG\", \"vim_fit\"], \"resources\": [\"vG\"], \"capacityProperty\": {\"controller\": \"multicloud\", \"request\": \"{\\\"vCPU\\\": 10, \\\"Memory\\\": {\\\"quantity\\\": {\\\"get_param\\\": \\\"REQUIRED_MEM\\\"}, \\\"unit\\\": \\\"GB\\\"}, \\\"Storage\\\": {\\\"quantity\\\": {\\\"get_param\\\": \\\"REQUIRED_DISK\\\", \\\"unit\\\": \\\"GB\\\"}}}\"}, \"policyType\": \"vim_fit\", \"applicableResources\": \"any\"}}",
+ "policyName": "oofBeijing.Config_MS_capacityPolicy_vG.1.xml",
+ "policyVersion": "1",
+ "matchingConditions": {
+ "ECOMPName": "SNIRO-Placement",
+ "ONAPName": "SNIRO-Placement",
+ "ConfigName": "",
+ "service": "capacityPolicy",
+ "uuid": "",
+ "Location": ""
+ },
+ "responseAttributes": { },
+ "property": null
+ },
+ {
+ "policyConfigMessage": "Config Retrieved! ",
+ "policyConfigStatus": "CONFIG_RETRIEVED",
+ "type": "JSON",
+ "config": "{\"service\": \"optimizationQueryPolicy\", \"policyName\": \"oofBeijing.queryPolicy_vcpe\", \"description\": \"Optimization query policy for vcpe\", \"templateVersion\": \"0.0.1\", \"version\": \"oofBeijing\", \"priority\": \"3\", \"riskType\": \"test\", \"riskLevel\": \"2\", \"guard\": \"False\", \"content\": {\"queryProperties\": [{\"attribute\": \"locationId\", \"attribute_location\": \"customerLocation\", \"value\": \"\"}, {\"attribute\": \"id\", \"attribute_location\": \"vpnInfo.vpnId\", \"value\": \"\"}, {\"attribute\": \"upstreamBW\", \"attribute_location\": \"vpnInfo.upstreamBW\", \"value\": \"\"}, {\"attribute\": \"customerLatitude\", \"attribute_location\": \"customerLatitude\", \"value\": 32.89748}, {\"attribute\": \"customerLongitude\", \"attribute_location\": \"customerLongitude\", \"value\": -97.040443}], \"policyScope\": [\"vcpe\", \"PVT Homing\",\"us\", \"international\", \"ip\", \"vGMuxInfra\", \"vG\", \"optimizationQueryPolicy\"], \"policyType\": \"optimizationQueryPolicy\"}}",
+ "policyName": "oofBeijing.Config_MS_queryPolicy_vcpe.1.xml",
+ "policyVersion": "1",
+ "matchingConditions": {
+ "ECOMPName": "SNIRO-Placement",
+ "ONAPName": "SNIRO-Placement",
+ "ConfigName": "",
+ "service": "optimizationQueryPolicy",
+ "uuid": "",
+ "Location": ""
+ },
+ "responseAttributes": { },
+ "property": null
+ },
+ {
+ "policyConfigMessage": "Config Retrieved! ",
+ "policyConfigStatus": "CONFIG_RETRIEVED",
+ "type": "JSON",
+ "config": "{\"service\":\"PlacementOptimizationPolicy\",\"policyName\":\"oofBeijing.PlacementOptimizationPolicy_vGMuxInfra\",\"description\":\"Placement Optimization Policy for vGMuxInfra\",\"templateVersion\":\"1702.03\",\"version\":\"oofBeijing\",\"priority\":\"5\",\"riskType\":\"test\",\"riskLevel\":\"3\",\"guard\":\"False\",\"content\":{\"objectiveParameter\":{\"parameterAttributes\":[{\"resource\":[\"vGMuxInfra\"],\"customerLocationInfo\":\"customer_loc\",\"parameter\":\"distance\",\"weight\":\"1\",\"operator\":\"product\"},{\"resource\":[\"vG\"],\"customerLocationInfo\":\"customer_loc\",\"parameter\":\"distance\",\"weight\":\"1\",\"operator\":\"product\"}],\"operator\":\"sum\"},\"identity\":\"optimization\",\"policyScope\":[\"vcpe\",\"PVT Homing\",\"us\",\"international\",\"ip\",\"vGMuxInfra\",\"vG\"],\"policyType\":\"placementOptimization\",\"objective\":\"minimize\"}}",
+ "policyName": "oofBeijing.Config_MS_PlacementOptimizationPolicy_vGMuxInfra.1.xml",
+ "policyVersion": "1",
+ "matchingConditions": {
+ "ECOMPName": "SNIRO-Placement",
+ "ONAPName": "SNIRO-Placement",
+ "ConfigName": "",
+ "service": "PlacementOptimizationPolicy",
+ "uuid": "",
+ "Location": ""
+ },
+ "responseAttributes": { },
+ "property": null
+ },
+ {
+ "policyConfigMessage": "Config Retrieved! ",
+ "policyConfigStatus": "CONFIG_RETRIEVED",
+ "type": "JSON",
+ "config": "{\"service\":\"distancePolicy\",\"policyName\":\"oofBeijing.distancePolicy_vGMuxInfra\",\"description\":\"Distance Policy for vGMuxInfra\",\"templateVersion\":\"0.0.1\",\"version\":\"oofBeijing\",\"priority\":\"3\",\"riskType\":\"test\",\"riskLevel\":\"2\",\"guard\":\"False\",\"content\":{\"distanceProperties\":{\"locationInfo\":\"customer_location\",\"distance\":{\"value\":\"500\",\"operator\":\"<\",\"unit\":\"km\"}},\"identity\":\"distance-vGMuxInfra\",\"resources\":[\"vGMuxInfra\"],\"policyScope\":[\"vcpe\",\"PVT Homing\",\"us\",\"international\",\"ip\",\"vGMuxInfra\"],\"policyType\":\"distancePolicy\",\"applicableResources\":\"any\"}}",
+ "policyName": "oofBeijing.Config_MS_distancePolicy_vGMuxInfra.1.xml",
+ "policyVersion": "1",
+ "matchingConditions": {
+ "ECOMPName": "SNIRO-Placement",
+ "ONAPName": "SNIRO-Placement",
+ "ConfigName": "",
+ "service": "distancePolicy",
+ "uuid": "",
+ "Location": ""
+ },
+ "responseAttributes": { },
+ "property": null
+ },
+ {
+ "policyConfigMessage": "Config Retrieved! ",
+ "policyConfigStatus": "CONFIG_RETRIEVED",
+ "type": "JSON",
+ "config": "{\"service\": \"capacityPolicy\", \"policyName\": \"oofBeijing.capacityPolicy_vGMuxInfra\", \"description\": \"Capacity policy for vGMuxInfra\", \"templateVersion\": \"1702.03\", \"version\": \"oofBeijing\", \"priority\": \"5\", \"riskType\": \"test\", \"riskLevel\": \"2\", \"guard\": \"False\", \"content\": {\"identity\": \"capacity_vGMuxInfra\", \"policyScope\": [\"vcpe\", \"PVT Homing\",\"us\", \"international\", \"ip\", \"vGMuxInfra\", \"vim_fit\"], \"resources\": [\"vGMuxInfra\"], \"capacityProperty\": {\"controller\": \"multicloud\", \"request\": \"{\\\"vCPU\\\": 10, \\\"Memory\\\": {\\\"quantity\\\": {\\\"get_param\\\": \\\"REQUIRED_MEM\\\"}, \\\"unit\\\": \\\"GB\\\"}, \\\"Storage\\\": {\\\"quantity\\\": {\\\"get_param\\\": \\\"REQUIRED_DISK\\\", \\\"unit\\\": \\\"GB\\\"}}}\"}, \"policyType\": \"vim_fit\", \"applicableResources\": \"any\"}}",
+ "policyName": "oofBeijing.Config_MS_capacityPolicy_vGMuxInfra.1.xml",
+ "policyVersion": "1",
+ "matchingConditions": {
+ "ECOMPName": "SNIRO-Placement",
+ "ONAPName": "SNIRO-Placement",
+ "ConfigName": "",
+ "service": "capacityPolicy",
+ "uuid": "",
+ "Location": ""
+ },
+ "responseAttributes": { },
+ "property": null
+ }
+] \ No newline at end of file
diff --git a/test/placement-tests/test_by_scope_org.yaml b/test/placement-tests/test_by_scope_old_format.yaml
index 2cdd4e4..2cdd4e4 100644
--- a/test/placement-tests/test_by_scope_org.yaml
+++ b/test/placement-tests/test_by_scope_old_format.yaml
diff --git a/test/policy-local-files/Affinity_vCPE_1.json b/test/policy-local-files/Affinity_vCPE_1.json
index 2953589..4f111eb 100644
--- a/test/policy-local-files/Affinity_vCPE_1.json
+++ b/test/policy-local-files/Affinity_vCPE_1.json
@@ -1,21 +1,33 @@
{
- "service": "affinityPolicy",
- "policyName": "OSDF_DUBLIN.Affinity_vCPE_1",
- "description": "Zone policy for vCPE",
- "templateVersion": "OpenSource.version.1",
- "version": "test1",
- "priority": "3",
- "riskType": "test",
- "riskLevel": "2",
- "guard": "False",
- "content": {
- "identity": "affinity_vCPE",
- "policyScope": ["vCPE", "US", "INTERNATIONAL", "ip", "vGMuxInfra", "vG"],
- "affinityProperty": {
- "qualifier": "same",
- "category": "complex"
- },
- "policyType": "zone",
- "resources": ["vGMuxInfra", "vG"]
+ "OSDF_FRANKFURT.Affinity_vCPE_1": {
+ "type": "onap.policies.optimization.AffinityPolicy",
+ "version": "1.0.0",
+ "type_version": "1.0.0",
+ "metadata": {
+ "policy-id": "OSDF_FRANKFURT.Affinity_vCPE_1",
+ "policy-version": 1
+ },
+ "properties": {
+ "scope": [
+ "OSDF_FRANKFURT"
+ ],
+ "services": [
+ "vCPE"
+ ],
+ "resources": [
+ "vG",
+ "vGMuxInfra"
+ ],
+ "geography": [
+ "US",
+ "INTERNATIONAL"
+ ],
+ "identity": "affinity_vCPE",
+ "applicableResources": "any",
+ "affinityProperties": {
+ "qualifier": "same",
+ "category": "complex"
+ }
}
+ }
}
diff --git a/test/policy-local-files/new_policies/Affinity_vFW_TD.json b/test/policy-local-files/Affinity_vFW_TD.json
index 53bb31b..53bb31b 100644
--- a/test/policy-local-files/new_policies/Affinity_vFW_TD.json
+++ b/test/policy-local-files/Affinity_vFW_TD.json
diff --git a/test/policy-local-files/Attribute_vNS_1.json b/test/policy-local-files/Attribute_vNS_1.json
index e4766db..35b3c74 100644
--- a/test/policy-local-files/Attribute_vNS_1.json
+++ b/test/policy-local-files/Attribute_vNS_1.json
@@ -1,48 +1,50 @@
{
- "service": "attributePolicy",
- "policyName": "OSDF_FRANKFURT.AttributePolicy_vNS_1",
- "description": "Attribute Policy for Network Slicing (NS)",
- "templateVersion": "OpenSource.version.1",
- "version": "OpenSource.version.1",
- "priority": "1",
- "riskType": "test",
- "riskLevel": "3",
- "guard": "False",
- "content": {
- "identity": "attribute-vNS",
- "policyScope": [
- "vNS",
- "us",
- "international",
- "ip"
- ],
- "policyType": "attribute",
- "resources": [
- "vNS",
- ""
- ],
- "attributeProperties": {
- "cloudRegion": {
- "serviceRequests": [
- "",
- ""
- ],
- "cloudRequests": [
- "",
- ""
- ]
- },
- "networkRoles": {
- "all": [
- "",
- ""
- ]
- },
- "complex": {
- "any": [
- "",
- ""
- ]
+ "OSDF_FRANKFURT.Attribute_vNS_1": {
+ "type": "onap.policies.optimization.AttributePolicy",
+ "version": "1.0.0",
+ "type_version": "1.0.0",
+ "metadata": {
+ "policy-id": "OSDF_FRANKFURT.Attribute_vNS_1",
+ "policy-version": 1
+ },
+ "properties": {
+ "scope": [
+ "OSDF_FRANKFURT"
+ ],
+ "services": [
+ "vNS"
+ ],
+ "resources": [
+ "vNS"
+ ],
+ "geography": [
+ "US",
+ "INTERNATIONAL"
+ ],
+ "identity": "attribute-vNS",
+ "attributeProperties": {
+ "cloudRegion": {
+ "serviceRequests": [
+ "",
+ ""
+ ],
+ "cloudRequests": [
+ "",
+ ""
+ ]
+ },
+ "networkRoles": {
+ "all": [
+ "",
+ ""
+ ]
+ },
+ "complex": {
+ "any": [
+ "",
+ ""
+ ]
+ }
}
}
}
diff --git a/test/policy-local-files/Capacity_vGMuxInfra.json b/test/policy-local-files/Capacity_vGMuxInfra.json
index 010cf3f..1d6d26d 100644
--- a/test/policy-local-files/Capacity_vGMuxInfra.json
+++ b/test/policy-local-files/Capacity_vGMuxInfra.json
@@ -1,22 +1,32 @@
{
- "service": "vim_fit",
- "policyName": "OSDF_DUBLIN.Capacity_vGMuxInfra",
- "description": "Capacity policy for vGMuxInfra",
- "templateVersion": "OpenSource.version.1",
- "version": "test1",
- "priority": "5",
- "riskType": "test",
- "riskLevel": "2",
- "guard": "False",
- "content": {
- "identity": "capacity_vGMuxInfra",
- "policyScope": ["VCPE", "US", "INTERNATIONAL", "ip", "vGMuxInfra"],
- "resources": ["vGMuxInfra"],
- "capacityProperty": {
- "controller": "multicloud",
- "request": "{\"vCPU\": 10, \"Memory\": {\"quantity\": {\"get_param\": \"REQUIRED_MEM\"}, \"unit\": \"GB\"}, \"Storage\": {\"quantity\": {\"get_param\": \"REQUIRED_DISK\"}, \"unit\": \"GB\"}}"
- },
- "policyType": "vim_fit",
- "applicableResources": "any"
+ "OSDF_FRANKFURT.Capacity_vGMuxInfra": {
+ "type": "onap.policies.optimization.Vim_fit",
+ "version": "1.0.0",
+ "type_version": "1.0.0",
+ "metadata": {
+ "policy-id": "OSDF_FRANKFURT.Capacity_vGMuxInfra",
+ "policy-version": 1
+ },
+ "properties": {
+ "scope": [
+ "OSDF_FRANKFURT"
+ ],
+ "services": [
+ "vCPE"
+ ],
+ "resources": [
+ "vGMuxInfra"
+ ],
+ "geography": [
+ "US",
+ "INTERNATIONAL"
+ ],
+ "identity": "capacity_vGMuxInfra",
+ "applicableResources": "any",
+ "capacityProperty": {
+ "controller": "multicloud",
+ "request": "{\"vCPU\": 10, \"Memory\": {\"quantity\": {\"get_param\": \"REQUIRED_MEM\"}, \"unit\": \"GB\"}, \"Storage\": {\"quantity\": {\"get_param\": \"REQUIRED_DISK\"}, \"unit\": \"GB\"}}"
+ }
}
+ }
}
diff --git a/test/policy-local-files/Capacity_vG_1.json b/test/policy-local-files/Capacity_vG_1.json
index fedcc4f..f07e7bc 100644
--- a/test/policy-local-files/Capacity_vG_1.json
+++ b/test/policy-local-files/Capacity_vG_1.json
@@ -1,22 +1,32 @@
{
- "service": "vim_fit",
- "policyName": "OSDF_DUBLIN.Capacity_vG_1",
- "description": "Capacity policy for vG",
- "templateVersion": "OpenSource.version.1",
- "version": "test1",
- "priority": "5",
- "riskType": "test",
- "riskLevel": "2",
- "guard": "False",
- "content": {
- "identity": "capacity_vG",
- "policyScope": ["VCPE", "US", "INTERNATIONAL", "ip", "vG"],
- "resources": ["vG"],
- "capacityProperty": {
- "controller": "multicloud",
- "request": "{\"vCPU\": 10, \"Memory\": {\"quantity\": {\"get_param\": \"REQUIRED_MEM\"}, \"unit\": \"GB\"}, \"Storage\": {\"quantity\": {\"get_param\": \"REQUIRED_DISK\"}, \"unit\": \"GB\"}}"
- },
- "policyType": "vim_fit",
- "applicableResources": "any"
+ "OSDF_FRANKFURT.Capacity_vG_1": {
+ "type": "onap.policies.optimization.Vim_fit",
+ "version": "1.0.0",
+ "type_version": "1.0.0",
+ "metadata": {
+ "policy-id": "OSDF_FRANKFURT.Capacity_vG_1",
+ "policy-version": 1
+ },
+ "properties": {
+ "scope": [
+ "OSDF_FRANKFURT"
+ ],
+ "services": [
+ "vCPE"
+ ],
+ "resources": [
+ "vG"
+ ],
+ "geography": [
+ "US",
+ "INTERNATIONAL"
+ ],
+ "identity": "capacity_vG",
+ "applicableResources": "any",
+ "capacityProperty": {
+ "controller": "multicloud",
+ "request": "{\"vCPU\": 10, \"Memory\": {\"quantity\": {\"get_param\": \"REQUIRED_MEM\"}, \"unit\": \"GB\"}, \"Storage\": {\"quantity\": {\"get_param\": \"REQUIRED_DISK\"}, \"unit\": \"GB\"}}"
+ }
}
+ }
}
diff --git a/test/policy-local-files/Distance_vGMuxInfra_1.json b/test/policy-local-files/Distance_vGMuxInfra_1.json
index e3ba83c..7de102e 100644
--- a/test/policy-local-files/Distance_vGMuxInfra_1.json
+++ b/test/policy-local-files/Distance_vGMuxInfra_1.json
@@ -1,22 +1,36 @@
{
- "service": "distancePolicy",
- "policyName": "OSDF_DUBLIN.Distance_vGMuxInfra",
- "description": "Distance Policy for vGMuxInfra",
- "templateVersion": "OpenSource.version.1",
- "version": "test1",
- "priority": "3",
- "riskType": "test",
- "riskLevel": "2",
- "guard": "False",
- "content": {
- "distanceProperties": {
- "locationInfo": "customer_loc",
- "distance": { "value": "500", "operator": "<", "unit": "km" }
+ "OSDF_FRANKFURT.Distance_vGMuxInfra": {
+ "type": "onap.policies.optimization.DistancePolicy",
+ "version": "1.0.0",
+ "type_version": "1.0.0",
+ "metadata": {
+ "policy-id": "OSDF_FRANKFURT.Distance_vGMuxInfra",
+ "policy-version": 1
},
- "identity": "distance-vGMuxInfra",
- "resources": ["vGMuxInfra"],
- "policyScope": ["vCPE", "US", "INTERNATIONAL", "ip", "vGMuxInfra"],
- "policyType": "distance_to_location",
- "applicableResources": "any"
+ "properties": {
+ "scope": [
+ "OSDF_FRANKFURT"
+ ],
+ "services": [
+ "vCPE"
+ ],
+ "resources": [
+ "vGMuxInfra"
+ ],
+ "geography": [
+ "US",
+ "INTERNATIONAL"
+ ],
+ "identity": "distance-vGMuxInfra",
+ "applicableResources": "any",
+ "distanceProperties": {
+ "locationInfo": "customer_loc",
+ "distance": {
+ "value": "500",
+ "operator": "<",
+ "unit": "km"
+ }
+ }
+ }
}
}
diff --git a/test/policy-local-files/Distance_vG_1.json b/test/policy-local-files/Distance_vG_1.json
index c498c7a..dcb45b2 100644
--- a/test/policy-local-files/Distance_vG_1.json
+++ b/test/policy-local-files/Distance_vG_1.json
@@ -1,22 +1,36 @@
{
- "service": "distancePolicy",
- "policyName": "OSDF_DUBLIN.Distance_vG_1",
- "description": "Distance Policy for vG",
- "templateVersion": "OpenSource.version.1",
- "version": "test1",
- "priority": "3",
- "riskType": "test",
- "riskLevel": "2",
- "guard": "False",
- "content": {
- "distanceProperties": {
- "locationInfo": "customer_loc",
- "distance": { "value": "1500", "operator": "<", "unit": "km" }
+ "OSDF_FRANKFURT.Distance_vG_1": {
+ "type": "onap.policies.optimization.DistancePolicy",
+ "version": "1.0.0",
+ "type_version": "1.0.0",
+ "metadata": {
+ "policy-id": "OSDF_FRANKFURT.Distance_vG_1",
+ "policy-version": 1
},
- "identity": "distance-vG",
- "resources": ["vG"],
- "policyScope": ["vCPE", "US", "INTERNATIONAL", "ip", "vG"],
- "policyType": "distance_to_location",
- "applicableResources": "any"
+ "properties": {
+ "scope": [
+ "OSDF_FRANKFURT"
+ ],
+ "services": [
+ "vCPE"
+ ],
+ "resources": [
+ "vG"
+ ],
+ "geography": [
+ "US",
+ "INTERNATIONAL"
+ ],
+ "identity": "distance-vG",
+ "applicableResources": "any",
+ "distanceProperties": {
+ "locationInfo": "customer_loc",
+ "distance": {
+ "value": "1500",
+ "operator": "<",
+ "unit": "km"
+ }
+ }
+ }
}
}
diff --git a/test/policy-local-files/Placement_Optimization_1.json b/test/policy-local-files/Placement_Optimization_1.json
index 9b062b0..b3efa64 100644
--- a/test/policy-local-files/Placement_Optimization_1.json
+++ b/test/policy-local-files/Placement_Optimization_1.json
@@ -1,15 +1,30 @@
{
- "service": "optimizationPolicy",
- "policyName": "OSDF_DUBLIN.Placement_Optimization_1",
- "description": "Placement Optimization Policy for vGMuxInfra",
- "templateVersion": "OpenSource.version.1",
- "version": "test1",
- "priority": "5",
- "riskType": "test",
- "riskLevel": "3",
- "guard": "False",
- "content": {
- "objectiveParameter": {
+ "OSDF_FRANKFURT.Placement_optimization_1": {
+ "type": "onap.policies.optimization.OptimizationPolicy",
+ "version": "1.0.0",
+ "type_version": "1.0.0",
+ "metadata": {
+ "policy-id": "OSDF_FRANKFURT.Placement_optimization_1",
+ "policy-version": 1
+ },
+ "properties": {
+ "scope": [
+ "OSDF_FRANKFURT"
+ ],
+ "services": [
+ "vCPE"
+ ],
+ "resources": [
+ "vG",
+ "vGMuxInfra"
+ ],
+ "geography": [
+ "US",
+ "INTERNATIONAL"
+ ],
+ "identity": "optimization",
+ "objective": "minimize",
+ "objectiveParameter": {
"parameterAttributes": [
{
"resources": ["vGMuxInfra"],
@@ -46,10 +61,7 @@
}
],
"operator": "sum"
- },
- "identity": "optimization",
- "policyScope": ["vCPE", "US", "INTERNATIONAL", "ip", "vGMuxInfra", "vG"],
- "policyType": "placement_optimization",
- "objective": "minimize"
+ }
}
+ }
}
diff --git a/test/policy-local-files/QueryPolicy_vCPE.json b/test/policy-local-files/QueryPolicy_vCPE.json
index 5097964..1a8d205 100644
--- a/test/policy-local-files/QueryPolicy_vCPE.json
+++ b/test/policy-local-files/QueryPolicy_vCPE.json
@@ -1,21 +1,38 @@
{
- "service": "queryPolicy",
- "policyName": "OSDF_DUBLIN.QueryPolicy_vCPE",
- "description": "Query policy for vCPE",
- "templateVersion": "OpenSource.version.1",
- "version": "test1",
- "priority": "3",
- "riskType": "test",
- "riskLevel": "2",
- "guard": "False",
- "content": {
- "queryProperties": [
- {"attribute":"customerLatitude", "attribute_location": "customerLatitude"},
- {"attribute":"customerLongitude", "attribute_location": "customerLongitude"}
- ],
- "policyScope": ["vCPE", "US", "INTERNATIONAL", "ip", "vGMuxInfra", "vG"],
- "policyType": "request_param_query",
- "serviceName": "vCPE",
- "identity": "vCPE_Query_Policy"
+ "OSDF_FRANKFURT.queryPolicy_vCPE": {
+ "type": "onap.policies.optimization.QueryPolicy",
+ "version": "1.0.0",
+ "type_version": "1.0.0",
+ "metadata": {
+ "policy-id": "OSDF_FRANKFURT.queryPolicy_vCPE",
+ "policy-version": 1
+ },
+ "properties": {
+ "scope": [
+ "OSDF_FRANKFURT"
+ ],
+ "services": [
+ "vCPE"
+ ],
+ "resources": [
+ "vGMuxInfra",
+ "vG"
+ ],
+ "geography": [
+ "US",
+ "INTERNATIONAL"
+ ],
+ "identity": "vCPE_Query_Policy",
+ "queryProperties": [
+ {
+ "attribute": "customerLatitude",
+ "attribute_location": "customerLatitude"
+ },
+ {
+ "attribute": "customerLongitude",
+ "attribute_location": "customerLongitude"
+ }
+ ]
+ }
}
}
diff --git a/test/policy-local-files/QueryPolicy_vCPE_2.json b/test/policy-local-files/QueryPolicy_vCPE_2.json
index e398f39..7a4d227 100644
--- a/test/policy-local-files/QueryPolicy_vCPE_2.json
+++ b/test/policy-local-files/QueryPolicy_vCPE_2.json
@@ -1,24 +1,55 @@
{
- "service": "queryPolicy",
- "policyName": "OSDF_DUBLIN.queryPolicy_vCPE",
- "description": "Query policy for vCPE",
- "templateVersion": "OpenSource.version.1",
- "version": "test1",
- "priority": "3",
- "riskType": "test",
- "riskLevel": "2",
- "guard": "False",
- "content": {
- "queryProperties": [
- {"attribute":"locationId", "attribute_location": "customerLocation", "value": ""},
- {"attribute":"id", "attribute_location": "vpnInfo.vpnId", "value": ""},
- {"attribute":"upstreamBW", "attribute_location": "vpnInfo.upstreamBW", "value": ""},
- {"attribute":"customerLatitude", "attribute_location": "customerLatitude", "value": 1.1},
- {"attribute":"customerLongitude", "attribute_location": "customerLongitude", "value": 2.2}
- ],
- "serviceName": "vCPE",
- "policyScope": ["vCPE", "US", "INTERNATIONAL", "ip", "vGMuxInfra", "vG"],
- "policyType": "request_param_query",
- "identity": "vCPE_Query_Policy"
+ "OSDF_FRANKFURT.queryPolicy_vCPE": {
+ "type": "onap.policies.optimization.QueryPolicy",
+ "version": "1.0.0",
+ "type_version": "1.0.0",
+ "metadata": {
+ "policy-id": "OSDF_FRANKFURT.queryPolicy_vCPE",
+ "policy-version": 1
+ },
+ "properties": {
+ "scope": [
+ "OSDF_FRANKFURT"
+ ],
+ "services": [
+ "vCPE"
+ ],
+ "resources": [
+ "vGMuxInfra",
+ "vG"
+ ],
+ "geography": [
+ "US",
+ "INTERNATIONAL"
+ ],
+ "identity": "vCPE_Query_Policy",
+ "queryProperties": [
+ {
+ "attribute": "locationId",
+ "attribute_location": "customerLocation",
+ "value": ""
+ },
+ {
+ "attribute": "id",
+ "attribute_location": "vpnInfo.vpnId",
+ "value": ""
+ },
+ {
+ "attribute": "upstreamBW",
+ "attribute_location": "vpnInfo.upstreamBW",
+ "value": ""
+ },
+ {
+ "attribute": "customerLatitude",
+ "attribute_location": "customerLatitude",
+ "value": 1.1
+ },
+ {
+ "attribute": "customerLongitude",
+ "attribute_location": "customerLongitude",
+ "value": 2.2
+ }
+ ]
+ }
}
}
diff --git a/test/policy-local-files/QueryPolicy_vFW_TD.json b/test/policy-local-files/QueryPolicy_vFW_TD.json
index 8866635..1a6eb21 100644
--- a/test/policy-local-files/QueryPolicy_vFW_TD.json
+++ b/test/policy-local-files/QueryPolicy_vFW_TD.json
@@ -1,32 +1,47 @@
{
- "service": "queryPolicy",
- "policyName": "OSDF_DUBLIN.QueryPolicy_vFW_TD",
- "description": "Query policy for vFW TD",
- "templateVersion": "OpenSource.version.1",
- "version": "oofDublin",
- "priority": "3",
- "riskType": "test",
- "riskLevel": "2",
- "guard": "False",
- "content": {
- "queryProperties": [
- {"attribute":"customerLatitude", "attribute_location": "customerLatitude", "value": 1.1},
- {"attribute":"customerLongitude", "attribute_location": "customerLongitude", "value": 2.2},
- {"attribute":"chosen_region", "attribute_location": "chosenRegion"},
- {"attribute":"chosen_customer_id", "attribute_location": "chosenCustomerId"}
- ],
- "policyScope": [
- "td",
- "us",
- "vFW-SINK",
- "vPGN"
- ],
- "policyType": "request_param_query",
- "serviceName": "vFW_TD",
- "identity": "vFW_TD_Query_Policy",
- "resources": [
- "vFW-SINK",
- "vPGN"
- ]
+ "OSDF_FRANKFURT.queryPolicy_vFW_TD": {
+ "type": "onap.policies.optimization.QueryPolicy",
+ "version": "1.0.0",
+ "type_version": "1.0.0",
+ "metadata": {
+ "policy-id": "OSDF_FRANKFURT.queryPolicy_vFW_TD",
+ "policy-version": 1
+ },
+ "properties": {
+ "scope": [
+ "OSDF_FRANKFURT"
+ ],
+ "services": [
+ "vFW_TD"
+ ],
+ "resources": [
+ "vFW-SINK",
+ "vPGN"
+ ],
+ "geography": [
+ "US"
+ ],
+ "identity": "vFW_TD_Query_Policy",
+ "queryProperties": [
+ {
+ "attribute": "chosen_region",
+ "attribute_location": "chosenRegion"
+ },
+ {
+ "attribute": "chosen_customer_id",
+ "attribute_location": "chosenCustomerId"
+ },
+ {
+ "attribute": "customerLatitude",
+ "attribute_location": "customerLatitude",
+ "value": 1.1
+ },
+ {
+ "attribute": "customerLongitude",
+ "attribute_location": "customerLongitude",
+ "value": 2.2
+ }
+ ]
+ }
}
}
diff --git a/test/policy-local-files/hpa_policy_vGMuxInfra_1.json b/test/policy-local-files/hpa_policy_vGMuxInfra_1.json
index 690f5dc..c233c5f 100644
--- a/test/policy-local-files/hpa_policy_vGMuxInfra_1.json
+++ b/test/policy-local-files/hpa_policy_vGMuxInfra_1.json
@@ -1,18 +1,27 @@
{
- "service": "hpaPolicy",
- "policyName": "OSDF_DUBLIN.hpa_policy_vGMuxInfra_1",
- "description": "HPA policy for vGMuxInfra",
- "templateVersion": "OpenSource.version.1",
- "version": "test1",
- "priority": "3",
- "riskType": "test",
- "riskLevel": "2",
- "guard": "False",
- "content": {
- "resources": ["vGMuxInfra"],
+ "OSDF_FRANKFURT.hpa_policy_vGMuxInfra_1": {
+ "type": "onap.policies.optimization.HpaPolicy",
+ "version": "1.0.0",
+ "type_version": "1.0.0",
+ "metadata": {
+ "policy-id": "OSDF_FRANKFURT.hpa_policy_vGMuxInfra_1",
+ "policy-version": 1
+ },
+ "properties": {
+ "scope": [
+ "OSDF_FRANKFURT"
+ ],
+ "services": [
+ "vCPE"
+ ],
+ "resources": [
+ "vGMuxInfra"
+ ],
+ "geography": [
+ "US",
+ "INTERNATIONAL"
+ ],
"identity": "hpa-vGMuxInfra",
- "policyScope": ["vCPE", "US", "INTERNATIONAL", "ip", "vGMuxInfra"],
- "policyType": "hpa",
"flavorFeatures": [
{
"id": "vgmux_1",
@@ -28,8 +37,8 @@
]
}
],
- "flavorProperties":[
- {
+ "flavorProperties": [
+ {
"hpa-feature" : "cpuTopology",
"mandatory" : "True",
"architecture": "generic",
@@ -43,33 +52,64 @@
{"hpa-attribute-key":"numCpuThreads", "hpa-attribute-value": "8", "operator":"<=", "unit": ""}
]
},
- {
- "hpa-feature" : "basicCapabilities",
- "mandatory" : "True",
+ {
+ "hpa-feature": "basicCapabilities",
+ "mandatory": true,
"architecture": "generic",
"directives": [],
"hpa-feature-attributes": [
- {"hpa-attribute-key": "numVirtualCpu", "hpa-attribute-value": "6", "operator": "=", "unit": ""},
- {"hpa-attribute-key": "virtualMemSize", "hpa-attribute-value":"6", "operator": "=", "unit": "GB"}
+ {
+ "hpa-attribute-key": "numVirtualCpu",
+ "hpa-attribute-value": 6,
+ "operator": [
+ "="
+ ],
+ "unit": ""
+ },
+ {
+ "hpa-attribute-key": "virtualMemSize",
+ "hpa-attribute-value": 6,
+ "operator": [
+ "="
+ ],
+ "unit": ""
+ }
]
},
{
- "hpa-feature" : "ovsDpdk",
- "mandatory" : "False",
- "score" : "3",
+ "hpa-feature": "ovsDpdk",
+ "mandatory": false,
+ "score": 3,
"architecture": "generic",
"directives": [],
"hpa-feature-attributes": [
- {"hpa-attribute-key":"dataProcessingAccelerationLibrary", "hpa-attribute-value":"ovsDpdk_version", "operator": "=", "unit":""}
+ {
+ "hpa-attribute-key": "dataProcessingAccelerationLibrary",
+ "hpa-attribute-value": "ovsDpdk_version",
+ "operator": [
+ "="
+ ],
+ "unit": ""
+ }
]
},
{
- "hpa-feature" : "cpuInstructionSetExtensions",
- "mandatory" : "True",
+ "hpa-feature": "cpuInstructionSetExtensions",
+ "mandatory": true,
"architecture": "INTEL-64",
"directives": [],
"hpa-feature-attributes": [
- {"hpa-attribute-key":"instructionSetExtensions", "hpa-attribute-value":["<CPUINST>", "<CPUINST>"], "operator": "ALL", "unit":""}
+ {
+ "hpa-attribute-key": "instructionSetExtensions",
+ "hpa-attribute-value": [
+ "<CPUINST>",
+ "<CPUINST>"
+ ],
+ "operator": [
+ "ALL"
+ ],
+ "unit": ""
+ }
]
}
]
@@ -99,7 +139,7 @@
{"hpa-attribute-key":"logicalCpuPinningPolicy", "hpa-attribute-value": "<CPUPOLICY>","operator": "=", "unit":""}
]
},
- {
+ {
"hpa-feature" : "basicCapabilities",
"mandatory" : "True",
"architecture": "generic",
@@ -122,18 +162,17 @@
]
},
{
- "hpa-feature" : "pcie",
+ "hpa-feature" : "pciePassthrough",
"mandatory" : "True",
"architecture": "generic",
"directives": [],
"hpa-feature-attributes": [
{"hpa-attribute-key": "pciCount", "hpa-attribute-value": "2", "operator": "=", "unit": ""},
{"hpa-attribute-key": "pciVendorId", "hpa-attribute-value":"8086", "operator": "=", "unit": ""},
- {"hpa-attribute-key": "pciDeviceId", "hpa-attribute-value": "2", "operator": "=", "unit": ""},
- {"hpa-attribute-key": "functionType", "hpa-attribute-value": "<PCITYPEVALUE>","operator": "=", "unit": ""}
+ {"hpa-attribute-key": "pciDeviceId", "hpa-attribute-value": "2", "operator": "=", "unit": ""}
]
}
- ]
+]
},
{
"id": "vgmux_3",
@@ -163,7 +202,7 @@
{"hpa-attribute-key": "numaCpu-1", "hpa-attribute-value":"4", "operator": "=", "unit": ""},
{"hpa-attribute-key": "numaMem-1", "value": "4096", "operator": "=", "unit": "MB"}
]
- },
+},
{
"hpa-feature" : "basicCapabilities",
"mandatory" : "True",
@@ -188,4 +227,5 @@
}
]
}
+ }
}
diff --git a/test/policy-local-files/hpa_policy_vG_1.json b/test/policy-local-files/hpa_policy_vG_1.json
index b29c67d..4f9a7b4 100644
--- a/test/policy-local-files/hpa_policy_vG_1.json
+++ b/test/policy-local-files/hpa_policy_vG_1.json
@@ -1,18 +1,27 @@
{
- "service": "hpaPolicy",
- "policyName": "OSDF_DUBLIN.hpa_policy_vG_1",
- "description": "HPA policy for vG",
- "templateVersion": "OpenSource.version.1",
- "version": "test1",
- "priority": "3",
- "riskType": "test",
- "riskLevel": "2",
- "guard": "False",
- "content": {
- "resources": ["vG"],
+ "OSDF_FRANKFURT.hpa_policy_vG_1": {
+ "type": "onap.policies.optimization.HpaPolicy",
+ "version": "1.0.0",
+ "type_version": "1.0.0",
+ "metadata": {
+ "policy-id": "OSDF_FRANKFURT.hpa_policy_vG_1",
+ "policy-version": 1
+ },
+ "properties": {
+ "scope": [
+ "OSDF_FRANKFURT"
+ ],
+ "services": [
+ "vCPE"
+ ],
+ "resources": [
+ "vG"
+ ],
+ "geography": [
+ "US",
+ "INTERNATIONAL"
+ ],
"identity": "hpa-vG",
- "policyScope": ["vCPE", "US", "INTERNATIONAL", "ip", "vG"],
- "policyType": "hpa",
"flavorFeatures": [
{
"id": "vg_1",
@@ -28,8 +37,8 @@
]
}
],
- "flavorProperties":[
- {
+ "flavorProperties": [
+ {
"hpa-feature" : "cpuTopology",
"mandatory" : "True",
"architecture": "generic",
@@ -43,33 +52,64 @@
{"hpa-attribute-key":"numCpuThreads", "hpa-attribute-value": "8", "operator":"<=", "unit": ""}
]
},
- {
- "hpa-feature" : "basicCapabilities",
- "mandatory" : "True",
+ {
+ "hpa-feature": "basicCapabilities",
+ "mandatory": true,
"architecture": "generic",
"directives": [],
"hpa-feature-attributes": [
- {"hpa-attribute-key": "numVirtualCpu", "hpa-attribute-value": "6", "operator": "=", "unit": ""},
- {"hpa-attribute-key": "virtualMemSize", "hpa-attribute-value":"6", "operator": "=", "unit": "GB"}
+ {
+ "hpa-attribute-key": "numVirtualCpu",
+ "hpa-attribute-value": 6,
+ "operator": [
+ "="
+ ],
+ "unit": ""
+ },
+ {
+ "hpa-attribute-key": "virtualMemSize",
+ "hpa-attribute-value": 6,
+ "operator": [
+ "="
+ ],
+ "unit": ""
+ }
]
},
{
- "hpa-feature" : "ovsDpdk",
- "mandatory" : "False",
- "score" : "3",
+ "hpa-feature": "ovsDpdk",
+ "mandatory": false,
+ "score": 3,
"architecture": "generic",
"directives": [],
"hpa-feature-attributes": [
- {"hpa-attribute-key":"dataProcessingAccelerationLibrary", "hpa-attribute-value":"ovsDpdk_version", "operator": "=", "unit":""}
+ {
+ "hpa-attribute-key": "dataProcessingAccelerationLibrary",
+ "hpa-attribute-value": "ovsDpdk_version",
+ "operator": [
+ "="
+ ],
+ "unit": ""
+ }
]
},
{
- "hpa-feature" : "cpuInstructionSetExtensions",
- "mandatory" : "True",
+ "hpa-feature": "cpuInstructionSetExtensions",
+ "mandatory": true,
"architecture": "INTEL-64",
"directives": [],
"hpa-feature-attributes": [
- {"hpa-attribute-key":"instructionSetExtensions", "hpa-attribute-value":["<CPUINST>", "<CPUINST>"], "operator": "ALL", "unit":""}
+ {
+ "hpa-attribute-key": "instructionSetExtensions",
+ "hpa-attribute-value": [
+ "<CPUINST>",
+ "<CPUINST>"
+ ],
+ "operator": [
+ "ALL"
+ ],
+ "unit": ""
+ }
]
}
]
@@ -99,7 +139,7 @@
{"hpa-attribute-key":"logicalCpuPinningPolicy", "hpa-attribute-value": "<CPUPOLICY>","operator": "=", "unit":""}
]
},
- {
+ {
"hpa-feature" : "basicCapabilities",
"mandatory" : "True",
"architecture": "generic",
@@ -132,7 +172,7 @@
{"hpa-attribute-key": "pciDeviceId", "hpa-attribute-value": "2", "operator": "=", "unit": ""}
]
}
- ]
+]
},
{
"id": "vg_3",
@@ -162,7 +202,7 @@
{"hpa-attribute-key": "numaCpu-1", "hpa-attribute-value":"4", "operator": "=", "unit": ""},
{"hpa-attribute-key": "numaMem-1", "value": "4096", "operator": "=", "unit": "MB"}
]
- },
+},
{
"hpa-feature" : "basicCapabilities",
"mandatory" : "True",
@@ -187,4 +227,5 @@
}
]
}
+ }
}
diff --git a/test/policy-local-files/meta-valid-policies-org.txt b/test/policy-local-files/meta-valid-policies-old.txt
index 99e3e88..99e3e88 100644
--- a/test/policy-local-files/meta-valid-policies-org.txt
+++ b/test/policy-local-files/meta-valid-policies-old.txt
diff --git a/test/policy-local-files/meta-valid-policies.txt b/test/policy-local-files/meta-valid-policies.txt
index 53f113f..5f969bf 100644
--- a/test/policy-local-files/meta-valid-policies.txt
+++ b/test/policy-local-files/meta-valid-policies.txt
@@ -11,3 +11,7 @@ hpa_policy_vG_1.json
vnfPolicy_vG.json
vnfPolicy_vGMuxInfra.json
QueryPolicy_vFW_TD.json
+vnfPolicy_vFW_TD.json
+vnfPolicy_vPGN_TD.json
+Affinity_vFW_TD.json
+Attribute_vNS_1.json \ No newline at end of file
diff --git a/test/policy-local-files/new_policies/Affinity_vCPE_1.json b/test/policy-local-files/new_policies/Affinity_vCPE_1.json
deleted file mode 100644
index 4f111eb..0000000
--- a/test/policy-local-files/new_policies/Affinity_vCPE_1.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
- "OSDF_FRANKFURT.Affinity_vCPE_1": {
- "type": "onap.policies.optimization.AffinityPolicy",
- "version": "1.0.0",
- "type_version": "1.0.0",
- "metadata": {
- "policy-id": "OSDF_FRANKFURT.Affinity_vCPE_1",
- "policy-version": 1
- },
- "properties": {
- "scope": [
- "OSDF_FRANKFURT"
- ],
- "services": [
- "vCPE"
- ],
- "resources": [
- "vG",
- "vGMuxInfra"
- ],
- "geography": [
- "US",
- "INTERNATIONAL"
- ],
- "identity": "affinity_vCPE",
- "applicableResources": "any",
- "affinityProperties": {
- "qualifier": "same",
- "category": "complex"
- }
- }
- }
-}
diff --git a/test/policy-local-files/new_policies/Attribute_vNS_1.json b/test/policy-local-files/new_policies/Attribute_vNS_1.json
deleted file mode 100644
index 35b3c74..0000000
--- a/test/policy-local-files/new_policies/Attribute_vNS_1.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
- "OSDF_FRANKFURT.Attribute_vNS_1": {
- "type": "onap.policies.optimization.AttributePolicy",
- "version": "1.0.0",
- "type_version": "1.0.0",
- "metadata": {
- "policy-id": "OSDF_FRANKFURT.Attribute_vNS_1",
- "policy-version": 1
- },
- "properties": {
- "scope": [
- "OSDF_FRANKFURT"
- ],
- "services": [
- "vNS"
- ],
- "resources": [
- "vNS"
- ],
- "geography": [
- "US",
- "INTERNATIONAL"
- ],
- "identity": "attribute-vNS",
- "attributeProperties": {
- "cloudRegion": {
- "serviceRequests": [
- "",
- ""
- ],
- "cloudRequests": [
- "",
- ""
- ]
- },
- "networkRoles": {
- "all": [
- "",
- ""
- ]
- },
- "complex": {
- "any": [
- "",
- ""
- ]
- }
- }
- }
- }
-} \ No newline at end of file
diff --git a/test/policy-local-files/new_policies/Capacity_vGMuxInfra.json b/test/policy-local-files/new_policies/Capacity_vGMuxInfra.json
deleted file mode 100644
index 1d6d26d..0000000
--- a/test/policy-local-files/new_policies/Capacity_vGMuxInfra.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- "OSDF_FRANKFURT.Capacity_vGMuxInfra": {
- "type": "onap.policies.optimization.Vim_fit",
- "version": "1.0.0",
- "type_version": "1.0.0",
- "metadata": {
- "policy-id": "OSDF_FRANKFURT.Capacity_vGMuxInfra",
- "policy-version": 1
- },
- "properties": {
- "scope": [
- "OSDF_FRANKFURT"
- ],
- "services": [
- "vCPE"
- ],
- "resources": [
- "vGMuxInfra"
- ],
- "geography": [
- "US",
- "INTERNATIONAL"
- ],
- "identity": "capacity_vGMuxInfra",
- "applicableResources": "any",
- "capacityProperty": {
- "controller": "multicloud",
- "request": "{\"vCPU\": 10, \"Memory\": {\"quantity\": {\"get_param\": \"REQUIRED_MEM\"}, \"unit\": \"GB\"}, \"Storage\": {\"quantity\": {\"get_param\": \"REQUIRED_DISK\"}, \"unit\": \"GB\"}}"
- }
- }
- }
-}
diff --git a/test/policy-local-files/new_policies/Capacity_vG_1.json b/test/policy-local-files/new_policies/Capacity_vG_1.json
deleted file mode 100644
index f07e7bc..0000000
--- a/test/policy-local-files/new_policies/Capacity_vG_1.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- "OSDF_FRANKFURT.Capacity_vG_1": {
- "type": "onap.policies.optimization.Vim_fit",
- "version": "1.0.0",
- "type_version": "1.0.0",
- "metadata": {
- "policy-id": "OSDF_FRANKFURT.Capacity_vG_1",
- "policy-version": 1
- },
- "properties": {
- "scope": [
- "OSDF_FRANKFURT"
- ],
- "services": [
- "vCPE"
- ],
- "resources": [
- "vG"
- ],
- "geography": [
- "US",
- "INTERNATIONAL"
- ],
- "identity": "capacity_vG",
- "applicableResources": "any",
- "capacityProperty": {
- "controller": "multicloud",
- "request": "{\"vCPU\": 10, \"Memory\": {\"quantity\": {\"get_param\": \"REQUIRED_MEM\"}, \"unit\": \"GB\"}, \"Storage\": {\"quantity\": {\"get_param\": \"REQUIRED_DISK\"}, \"unit\": \"GB\"}}"
- }
- }
- }
-}
diff --git a/test/policy-local-files/new_policies/Distance_vGMuxInfra_1.json b/test/policy-local-files/new_policies/Distance_vGMuxInfra_1.json
deleted file mode 100644
index 7de102e..0000000
--- a/test/policy-local-files/new_policies/Distance_vGMuxInfra_1.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
- "OSDF_FRANKFURT.Distance_vGMuxInfra": {
- "type": "onap.policies.optimization.DistancePolicy",
- "version": "1.0.0",
- "type_version": "1.0.0",
- "metadata": {
- "policy-id": "OSDF_FRANKFURT.Distance_vGMuxInfra",
- "policy-version": 1
- },
- "properties": {
- "scope": [
- "OSDF_FRANKFURT"
- ],
- "services": [
- "vCPE"
- ],
- "resources": [
- "vGMuxInfra"
- ],
- "geography": [
- "US",
- "INTERNATIONAL"
- ],
- "identity": "distance-vGMuxInfra",
- "applicableResources": "any",
- "distanceProperties": {
- "locationInfo": "customer_loc",
- "distance": {
- "value": "500",
- "operator": "<",
- "unit": "km"
- }
- }
- }
- }
-}
diff --git a/test/policy-local-files/new_policies/Distance_vG_1.json b/test/policy-local-files/new_policies/Distance_vG_1.json
deleted file mode 100644
index dcb45b2..0000000
--- a/test/policy-local-files/new_policies/Distance_vG_1.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
- "OSDF_FRANKFURT.Distance_vG_1": {
- "type": "onap.policies.optimization.DistancePolicy",
- "version": "1.0.0",
- "type_version": "1.0.0",
- "metadata": {
- "policy-id": "OSDF_FRANKFURT.Distance_vG_1",
- "policy-version": 1
- },
- "properties": {
- "scope": [
- "OSDF_FRANKFURT"
- ],
- "services": [
- "vCPE"
- ],
- "resources": [
- "vG"
- ],
- "geography": [
- "US",
- "INTERNATIONAL"
- ],
- "identity": "distance-vG",
- "applicableResources": "any",
- "distanceProperties": {
- "locationInfo": "customer_loc",
- "distance": {
- "value": "1500",
- "operator": "<",
- "unit": "km"
- }
- }
- }
- }
-}
diff --git a/test/policy-local-files/new_policies/QueryPolicy_vCPE.json b/test/policy-local-files/new_policies/QueryPolicy_vCPE.json
deleted file mode 100644
index 1a8d205..0000000
--- a/test/policy-local-files/new_policies/QueryPolicy_vCPE.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "OSDF_FRANKFURT.queryPolicy_vCPE": {
- "type": "onap.policies.optimization.QueryPolicy",
- "version": "1.0.0",
- "type_version": "1.0.0",
- "metadata": {
- "policy-id": "OSDF_FRANKFURT.queryPolicy_vCPE",
- "policy-version": 1
- },
- "properties": {
- "scope": [
- "OSDF_FRANKFURT"
- ],
- "services": [
- "vCPE"
- ],
- "resources": [
- "vGMuxInfra",
- "vG"
- ],
- "geography": [
- "US",
- "INTERNATIONAL"
- ],
- "identity": "vCPE_Query_Policy",
- "queryProperties": [
- {
- "attribute": "customerLatitude",
- "attribute_location": "customerLatitude"
- },
- {
- "attribute": "customerLongitude",
- "attribute_location": "customerLongitude"
- }
- ]
- }
- }
-}
diff --git a/test/policy-local-files/new_policies/QueryPolicy_vCPE_2.json b/test/policy-local-files/new_policies/QueryPolicy_vCPE_2.json
deleted file mode 100644
index 7a4d227..0000000
--- a/test/policy-local-files/new_policies/QueryPolicy_vCPE_2.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
- "OSDF_FRANKFURT.queryPolicy_vCPE": {
- "type": "onap.policies.optimization.QueryPolicy",
- "version": "1.0.0",
- "type_version": "1.0.0",
- "metadata": {
- "policy-id": "OSDF_FRANKFURT.queryPolicy_vCPE",
- "policy-version": 1
- },
- "properties": {
- "scope": [
- "OSDF_FRANKFURT"
- ],
- "services": [
- "vCPE"
- ],
- "resources": [
- "vGMuxInfra",
- "vG"
- ],
- "geography": [
- "US",
- "INTERNATIONAL"
- ],
- "identity": "vCPE_Query_Policy",
- "queryProperties": [
- {
- "attribute": "locationId",
- "attribute_location": "customerLocation",
- "value": ""
- },
- {
- "attribute": "id",
- "attribute_location": "vpnInfo.vpnId",
- "value": ""
- },
- {
- "attribute": "upstreamBW",
- "attribute_location": "vpnInfo.upstreamBW",
- "value": ""
- },
- {
- "attribute": "customerLatitude",
- "attribute_location": "customerLatitude",
- "value": 1.1
- },
- {
- "attribute": "customerLongitude",
- "attribute_location": "customerLongitude",
- "value": 2.2
- }
- ]
- }
- }
-}
diff --git a/test/policy-local-files/new_policies/QueryPolicy_vFW_TD.json b/test/policy-local-files/new_policies/QueryPolicy_vFW_TD.json
deleted file mode 100644
index 1a6eb21..0000000
--- a/test/policy-local-files/new_policies/QueryPolicy_vFW_TD.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
- "OSDF_FRANKFURT.queryPolicy_vFW_TD": {
- "type": "onap.policies.optimization.QueryPolicy",
- "version": "1.0.0",
- "type_version": "1.0.0",
- "metadata": {
- "policy-id": "OSDF_FRANKFURT.queryPolicy_vFW_TD",
- "policy-version": 1
- },
- "properties": {
- "scope": [
- "OSDF_FRANKFURT"
- ],
- "services": [
- "vFW_TD"
- ],
- "resources": [
- "vFW-SINK",
- "vPGN"
- ],
- "geography": [
- "US"
- ],
- "identity": "vFW_TD_Query_Policy",
- "queryProperties": [
- {
- "attribute": "chosen_region",
- "attribute_location": "chosenRegion"
- },
- {
- "attribute": "chosen_customer_id",
- "attribute_location": "chosenCustomerId"
- },
- {
- "attribute": "customerLatitude",
- "attribute_location": "customerLatitude",
- "value": 1.1
- },
- {
- "attribute": "customerLongitude",
- "attribute_location": "customerLongitude",
- "value": 2.2
- }
- ]
- }
- }
-}
diff --git a/test/policy-local-files/new_policies/meta-valid-policies.txt b/test/policy-local-files/new_policies/meta-valid-policies.txt
deleted file mode 100644
index 5f969bf..0000000
--- a/test/policy-local-files/new_policies/meta-valid-policies.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Affinity_vCPE_1.json
-Capacity_vGMuxInfra.json
-Capacity_vG_1.json
-Distance_vGMuxInfra_1.json
-Distance_vG_1.json
-Placement_Optimization_1.json
-QueryPolicy_vCPE.json
-QueryPolicy_vCPE_2.json
-hpa_policy_vGMuxInfra_1.json
-hpa_policy_vG_1.json
-vnfPolicy_vG.json
-vnfPolicy_vGMuxInfra.json
-QueryPolicy_vFW_TD.json
-vnfPolicy_vFW_TD.json
-vnfPolicy_vPGN_TD.json
-Affinity_vFW_TD.json
-Attribute_vNS_1.json \ No newline at end of file
diff --git a/test/policy-local-files/new_policies/subscriber_policy_vCPE.json b/test/policy-local-files/new_policies/subscriber_policy_vCPE.json
deleted file mode 100644
index 305ce58..0000000
--- a/test/policy-local-files/new_policies/subscriber_policy_vCPE.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
- "OSDF_FRANKFURT.SubscriberPolicy_v1": {
- "type": "onap.policies.optimization.SubscriberPolicy",
- "version": "1.0.0",
- "type_version": "1.0.0",
- "metadata": {
- "policy-id": "OSDF_FRANKFURT.SubscriberPolicy_v1",
- "policy-version": 1
- },
- "properties": {
- "scope": [
- "OSDF_FRANKFURT"
- ],
- "services": [
- "vCPE"
- ],
- "identity": "subscriber_vCPE",
- "properties": {
- "subscriberName": [
- "subscriber_x",
- "subscriber_y"
- ],
- "subscriberRole": [
- "PVT Homing"
- ],
- "provStatus": [
- "CAPPED"
- ]
- }
- }
- }
-}
diff --git a/test/policy-local-files/new_policies/vnfPolicy_vFW_TD.json b/test/policy-local-files/new_policies/vnfPolicy_vFW_TD.json
deleted file mode 100644
index 387ed56..0000000
--- a/test/policy-local-files/new_policies/vnfPolicy_vFW_TD.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
- "OSDF_FRANKFURT.vnfPolicy_vFW_TD": {
- "type": "onap.policies.optimization.VnfPolicy",
- "version": "1.0.0",
- "type_version": "1.0.0",
- "metadata": {
- "policy-id": "OSDF_FRANKFURT.vnfPolicy_vFW_TD",
- "policy-version": 1
- },
- "properties": {
- "scope": [
- "OSDF_FRANKFURT",
- "TD"
- ],
- "resources": [
- "vFW-SINK"
- ],
- "geography": [
- "US"
- ],
- "identity": "vnf_vFW_TD",
- "applicableResources": "any",
- "vnfProperties": [{
- "inventoryProvider": "aai",
- "serviceType": "",
- "inventoryType": "vfmodule",
- "customerId": {
- "get_param": "chosen_customer_id"
- },
- "equipmentRole": "",
- "attributes": {
- "orchestrationStatus": ["active"],
- "provStatus": "ACTIVE",
- "cloudRegionId": {
- "get_param": "chosen_region"
- },
- "service_instance_id": {
- "get_param": "service_id"
- }
- },
- "passthroughAttributes": {
- "td-role": "destination"
- }
- }]
- }
- }
-}
diff --git a/test/policy-local-files/new_policies/vnfPolicy_vG.json b/test/policy-local-files/new_policies/vnfPolicy_vG.json
deleted file mode 100644
index 786ffc2..0000000
--- a/test/policy-local-files/new_policies/vnfPolicy_vG.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "OSDF_FRANKFURT.vnfPolicy_vG": {
- "type": "onap.policies.optimization.VnfPolicy",
- "version": "1.0.0",
- "type_version": "1.0.0",
- "metadata": {
- "policy-id": "OSDF_FRANKFURT.vnfPolicy_vG",
- "policy-version": 1
- },
- "properties": {
- "scope": [
- "OSDF_FRANKFURT"
- ],
- "services": [
- "vCPE"
- ],
- "resources": [
- "vG"
- ],
- "geography": [
- "US",
- "INTERNATIONAL"
- ],
- "identity": "vnf_vG",
- "applicableResources": "any",
- "vnfProperties": [
- {
- "inventoryProvider": "aai",
- "serviceType": "",
- "inventoryType": "cloud",
- "customerId": "",
- "orchestrationStatus": "",
- "equipmentRole": ""
- }
- ]
- }
- }
-}
diff --git a/test/policy-local-files/new_policies/vnfPolicy_vGMuxInfra.json b/test/policy-local-files/new_policies/vnfPolicy_vGMuxInfra.json
deleted file mode 100644
index deb34fd..0000000
--- a/test/policy-local-files/new_policies/vnfPolicy_vGMuxInfra.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
- "OSDF_FRANKFURT.vnfPolicy_vGMuxInfra": {
- "type": "onap.policies.optimization.VnfPolicy",
- "version": "1.0.0",
- "type_version": "1.0.0",
- "metadata": {
- "policy-id": "OSDF_FRANKFURT.vnfPolicy_vGMuxInfra",
- "policy-version": 1
- },
- "properties": {
- "scope": [
- "OSDF_FRANKFURT"
- ],
- "services": [
- "vCPE"
- ],
- "resources": [
- "vGMuxInfra"
- ],
- "geography": [
- "US",
- "INTERNATIONAL"
- ],
- "identity": "vnf_vGMuxInfra",
- "applicableResources": "any",
- "vnfProperties": [
- {
- "inventoryProvider": "aai",
- "serviceType": "vGMuxInfra-xx",
- "inventoryType": "service",
- "customerId": "SDN-ETHERNET-INTERNET",
- "orchestrationStatus": "",
- "equipmentRole": ""
- }
- ]
- }
- }
-}
diff --git a/test/policy-local-files/new_policies/vnfPolicy_vPGN_TD.json b/test/policy-local-files/new_policies/vnfPolicy_vPGN_TD.json
deleted file mode 100644
index c441156..0000000
--- a/test/policy-local-files/new_policies/vnfPolicy_vPGN_TD.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
- "OSDF_FRANKFURT.vnfPolicy_vPGN_TD": {
- "type": "onap.policies.optimization.VnfPolicy",
- "version": "1.0.0",
- "type_version": "1.0.0",
- "metadata": {
- "policy-id": "OSDF_FRANKFURT.vnfPolicy_vPGN_TD",
- "policy-version": 1
- },
- "properties": {
- "scope": [
- "OSDF_FRANKFURT",
- "TD"
- ],
- "resources": [
- "vPGN"
- ],
- "geography": [
- "US"
- ],
- "identity": "vnf_vPGN_TD",
- "applicableResources": "any",
- "vnfProperties": [
- {
- "inventoryProvider": "aai",
- "serviceType": "",
- "inventoryType": "vfmodule",
- "customerId": {
- "get_param": "chosen_customer_id"
- },
- "equipmentRole": "",
- "unique": "False",
- "attributes": {
- "orchestrationStatus": [
- "active"
- ],
- "provStatus": "ACTIVE",
- "cloudRegionId": {
- "get_param": "chosen_region"
- },
- "service_instance_id": {
- "get_param": "service_id"
- }
- },
- "passthroughAttributes": {
- "td-role": "anchor"
- }
- }
- ]
- }
- }
-}
diff --git a/test/policy-local-files/old-policies/Affinity_vCPE_1.json b/test/policy-local-files/old-policies/Affinity_vCPE_1.json
new file mode 100644
index 0000000..2953589
--- /dev/null
+++ b/test/policy-local-files/old-policies/Affinity_vCPE_1.json
@@ -0,0 +1,21 @@
+{
+ "service": "affinityPolicy",
+ "policyName": "OSDF_DUBLIN.Affinity_vCPE_1",
+ "description": "Zone policy for vCPE",
+ "templateVersion": "OpenSource.version.1",
+ "version": "test1",
+ "priority": "3",
+ "riskType": "test",
+ "riskLevel": "2",
+ "guard": "False",
+ "content": {
+ "identity": "affinity_vCPE",
+ "policyScope": ["vCPE", "US", "INTERNATIONAL", "ip", "vGMuxInfra", "vG"],
+ "affinityProperty": {
+ "qualifier": "same",
+ "category": "complex"
+ },
+ "policyType": "zone",
+ "resources": ["vGMuxInfra", "vG"]
+ }
+}
diff --git a/test/policy-local-files/old-policies/Attribute_vNS_1.json b/test/policy-local-files/old-policies/Attribute_vNS_1.json
new file mode 100644
index 0000000..e4766db
--- /dev/null
+++ b/test/policy-local-files/old-policies/Attribute_vNS_1.json
@@ -0,0 +1,49 @@
+{
+ "service": "attributePolicy",
+ "policyName": "OSDF_FRANKFURT.AttributePolicy_vNS_1",
+ "description": "Attribute Policy for Network Slicing (NS)",
+ "templateVersion": "OpenSource.version.1",
+ "version": "OpenSource.version.1",
+ "priority": "1",
+ "riskType": "test",
+ "riskLevel": "3",
+ "guard": "False",
+ "content": {
+ "identity": "attribute-vNS",
+ "policyScope": [
+ "vNS",
+ "us",
+ "international",
+ "ip"
+ ],
+ "policyType": "attribute",
+ "resources": [
+ "vNS",
+ ""
+ ],
+ "attributeProperties": {
+ "cloudRegion": {
+ "serviceRequests": [
+ "",
+ ""
+ ],
+ "cloudRequests": [
+ "",
+ ""
+ ]
+ },
+ "networkRoles": {
+ "all": [
+ "",
+ ""
+ ]
+ },
+ "complex": {
+ "any": [
+ "",
+ ""
+ ]
+ }
+ }
+ }
+} \ No newline at end of file
diff --git a/test/policy-local-files/Capacity_vFW_1.json b/test/policy-local-files/old-policies/Capacity_vFW_1.json
index d5e80ab..d5e80ab 100644
--- a/test/policy-local-files/Capacity_vFW_1.json
+++ b/test/policy-local-files/old-policies/Capacity_vFW_1.json
diff --git a/test/policy-local-files/old-policies/Capacity_vGMuxInfra.json b/test/policy-local-files/old-policies/Capacity_vGMuxInfra.json
new file mode 100644
index 0000000..010cf3f
--- /dev/null
+++ b/test/policy-local-files/old-policies/Capacity_vGMuxInfra.json
@@ -0,0 +1,22 @@
+{
+ "service": "vim_fit",
+ "policyName": "OSDF_DUBLIN.Capacity_vGMuxInfra",
+ "description": "Capacity policy for vGMuxInfra",
+ "templateVersion": "OpenSource.version.1",
+ "version": "test1",
+ "priority": "5",
+ "riskType": "test",
+ "riskLevel": "2",
+ "guard": "False",
+ "content": {
+ "identity": "capacity_vGMuxInfra",
+ "policyScope": ["VCPE", "US", "INTERNATIONAL", "ip", "vGMuxInfra"],
+ "resources": ["vGMuxInfra"],
+ "capacityProperty": {
+ "controller": "multicloud",
+ "request": "{\"vCPU\": 10, \"Memory\": {\"quantity\": {\"get_param\": \"REQUIRED_MEM\"}, \"unit\": \"GB\"}, \"Storage\": {\"quantity\": {\"get_param\": \"REQUIRED_DISK\"}, \"unit\": \"GB\"}}"
+ },
+ "policyType": "vim_fit",
+ "applicableResources": "any"
+ }
+}
diff --git a/test/policy-local-files/old-policies/Capacity_vG_1.json b/test/policy-local-files/old-policies/Capacity_vG_1.json
new file mode 100644
index 0000000..fedcc4f
--- /dev/null
+++ b/test/policy-local-files/old-policies/Capacity_vG_1.json
@@ -0,0 +1,22 @@
+{
+ "service": "vim_fit",
+ "policyName": "OSDF_DUBLIN.Capacity_vG_1",
+ "description": "Capacity policy for vG",
+ "templateVersion": "OpenSource.version.1",
+ "version": "test1",
+ "priority": "5",
+ "riskType": "test",
+ "riskLevel": "2",
+ "guard": "False",
+ "content": {
+ "identity": "capacity_vG",
+ "policyScope": ["VCPE", "US", "INTERNATIONAL", "ip", "vG"],
+ "resources": ["vG"],
+ "capacityProperty": {
+ "controller": "multicloud",
+ "request": "{\"vCPU\": 10, \"Memory\": {\"quantity\": {\"get_param\": \"REQUIRED_MEM\"}, \"unit\": \"GB\"}, \"Storage\": {\"quantity\": {\"get_param\": \"REQUIRED_DISK\"}, \"unit\": \"GB\"}}"
+ },
+ "policyType": "vim_fit",
+ "applicableResources": "any"
+ }
+}
diff --git a/test/policy-local-files/Distance_vFW_1.json b/test/policy-local-files/old-policies/Distance_vFW_1.json
index 80e08d9..80e08d9 100644
--- a/test/policy-local-files/Distance_vFW_1.json
+++ b/test/policy-local-files/old-policies/Distance_vFW_1.json
diff --git a/test/policy-local-files/old-policies/Distance_vGMuxInfra_1.json b/test/policy-local-files/old-policies/Distance_vGMuxInfra_1.json
new file mode 100644
index 0000000..e3ba83c
--- /dev/null
+++ b/test/policy-local-files/old-policies/Distance_vGMuxInfra_1.json
@@ -0,0 +1,22 @@
+{
+ "service": "distancePolicy",
+ "policyName": "OSDF_DUBLIN.Distance_vGMuxInfra",
+ "description": "Distance Policy for vGMuxInfra",
+ "templateVersion": "OpenSource.version.1",
+ "version": "test1",
+ "priority": "3",
+ "riskType": "test",
+ "riskLevel": "2",
+ "guard": "False",
+ "content": {
+ "distanceProperties": {
+ "locationInfo": "customer_loc",
+ "distance": { "value": "500", "operator": "<", "unit": "km" }
+ },
+ "identity": "distance-vGMuxInfra",
+ "resources": ["vGMuxInfra"],
+ "policyScope": ["vCPE", "US", "INTERNATIONAL", "ip", "vGMuxInfra"],
+ "policyType": "distance_to_location",
+ "applicableResources": "any"
+ }
+}
diff --git a/test/policy-local-files/old-policies/Distance_vG_1.json b/test/policy-local-files/old-policies/Distance_vG_1.json
new file mode 100644
index 0000000..c498c7a
--- /dev/null
+++ b/test/policy-local-files/old-policies/Distance_vG_1.json
@@ -0,0 +1,22 @@
+{
+ "service": "distancePolicy",
+ "policyName": "OSDF_DUBLIN.Distance_vG_1",
+ "description": "Distance Policy for vG",
+ "templateVersion": "OpenSource.version.1",
+ "version": "test1",
+ "priority": "3",
+ "riskType": "test",
+ "riskLevel": "2",
+ "guard": "False",
+ "content": {
+ "distanceProperties": {
+ "locationInfo": "customer_loc",
+ "distance": { "value": "1500", "operator": "<", "unit": "km" }
+ },
+ "identity": "distance-vG",
+ "resources": ["vG"],
+ "policyScope": ["vCPE", "US", "INTERNATIONAL", "ip", "vG"],
+ "policyType": "distance_to_location",
+ "applicableResources": "any"
+ }
+}
diff --git a/test/policy-local-files/new_policies/Placement_Optimization_1.json b/test/policy-local-files/old-policies/Placement_Optimization_1.json
index b3efa64..9b062b0 100644
--- a/test/policy-local-files/new_policies/Placement_Optimization_1.json
+++ b/test/policy-local-files/old-policies/Placement_Optimization_1.json
@@ -1,30 +1,15 @@
{
- "OSDF_FRANKFURT.Placement_optimization_1": {
- "type": "onap.policies.optimization.OptimizationPolicy",
- "version": "1.0.0",
- "type_version": "1.0.0",
- "metadata": {
- "policy-id": "OSDF_FRANKFURT.Placement_optimization_1",
- "policy-version": 1
- },
- "properties": {
- "scope": [
- "OSDF_FRANKFURT"
- ],
- "services": [
- "vCPE"
- ],
- "resources": [
- "vG",
- "vGMuxInfra"
- ],
- "geography": [
- "US",
- "INTERNATIONAL"
- ],
- "identity": "optimization",
- "objective": "minimize",
- "objectiveParameter": {
+ "service": "optimizationPolicy",
+ "policyName": "OSDF_DUBLIN.Placement_Optimization_1",
+ "description": "Placement Optimization Policy for vGMuxInfra",
+ "templateVersion": "OpenSource.version.1",
+ "version": "test1",
+ "priority": "5",
+ "riskType": "test",
+ "riskLevel": "3",
+ "guard": "False",
+ "content": {
+ "objectiveParameter": {
"parameterAttributes": [
{
"resources": ["vGMuxInfra"],
@@ -61,7 +46,10 @@
}
],
"operator": "sum"
- }
+ },
+ "identity": "optimization",
+ "policyScope": ["vCPE", "US", "INTERNATIONAL", "ip", "vGMuxInfra", "vG"],
+ "policyType": "placement_optimization",
+ "objective": "minimize"
}
- }
}
diff --git a/test/policy-local-files/old-policies/QueryPolicy_vCPE.json b/test/policy-local-files/old-policies/QueryPolicy_vCPE.json
new file mode 100644
index 0000000..5097964
--- /dev/null
+++ b/test/policy-local-files/old-policies/QueryPolicy_vCPE.json
@@ -0,0 +1,21 @@
+{
+ "service": "queryPolicy",
+ "policyName": "OSDF_DUBLIN.QueryPolicy_vCPE",
+ "description": "Query policy for vCPE",
+ "templateVersion": "OpenSource.version.1",
+ "version": "test1",
+ "priority": "3",
+ "riskType": "test",
+ "riskLevel": "2",
+ "guard": "False",
+ "content": {
+ "queryProperties": [
+ {"attribute":"customerLatitude", "attribute_location": "customerLatitude"},
+ {"attribute":"customerLongitude", "attribute_location": "customerLongitude"}
+ ],
+ "policyScope": ["vCPE", "US", "INTERNATIONAL", "ip", "vGMuxInfra", "vG"],
+ "policyType": "request_param_query",
+ "serviceName": "vCPE",
+ "identity": "vCPE_Query_Policy"
+ }
+}
diff --git a/test/policy-local-files/old-policies/QueryPolicy_vCPE_2.json b/test/policy-local-files/old-policies/QueryPolicy_vCPE_2.json
new file mode 100644
index 0000000..e398f39
--- /dev/null
+++ b/test/policy-local-files/old-policies/QueryPolicy_vCPE_2.json
@@ -0,0 +1,24 @@
+{
+ "service": "queryPolicy",
+ "policyName": "OSDF_DUBLIN.queryPolicy_vCPE",
+ "description": "Query policy for vCPE",
+ "templateVersion": "OpenSource.version.1",
+ "version": "test1",
+ "priority": "3",
+ "riskType": "test",
+ "riskLevel": "2",
+ "guard": "False",
+ "content": {
+ "queryProperties": [
+ {"attribute":"locationId", "attribute_location": "customerLocation", "value": ""},
+ {"attribute":"id", "attribute_location": "vpnInfo.vpnId", "value": ""},
+ {"attribute":"upstreamBW", "attribute_location": "vpnInfo.upstreamBW", "value": ""},
+ {"attribute":"customerLatitude", "attribute_location": "customerLatitude", "value": 1.1},
+ {"attribute":"customerLongitude", "attribute_location": "customerLongitude", "value": 2.2}
+ ],
+ "serviceName": "vCPE",
+ "policyScope": ["vCPE", "US", "INTERNATIONAL", "ip", "vGMuxInfra", "vG"],
+ "policyType": "request_param_query",
+ "identity": "vCPE_Query_Policy"
+ }
+}
diff --git a/test/policy-local-files/QueryPolicy_vFW.json b/test/policy-local-files/old-policies/QueryPolicy_vFW.json
index 932074b..932074b 100644
--- a/test/policy-local-files/QueryPolicy_vFW.json
+++ b/test/policy-local-files/old-policies/QueryPolicy_vFW.json
diff --git a/test/policy-local-files/old-policies/QueryPolicy_vFW_TD.json b/test/policy-local-files/old-policies/QueryPolicy_vFW_TD.json
new file mode 100644
index 0000000..8866635
--- /dev/null
+++ b/test/policy-local-files/old-policies/QueryPolicy_vFW_TD.json
@@ -0,0 +1,32 @@
+{
+ "service": "queryPolicy",
+ "policyName": "OSDF_DUBLIN.QueryPolicy_vFW_TD",
+ "description": "Query policy for vFW TD",
+ "templateVersion": "OpenSource.version.1",
+ "version": "oofDublin",
+ "priority": "3",
+ "riskType": "test",
+ "riskLevel": "2",
+ "guard": "False",
+ "content": {
+ "queryProperties": [
+ {"attribute":"customerLatitude", "attribute_location": "customerLatitude", "value": 1.1},
+ {"attribute":"customerLongitude", "attribute_location": "customerLongitude", "value": 2.2},
+ {"attribute":"chosen_region", "attribute_location": "chosenRegion"},
+ {"attribute":"chosen_customer_id", "attribute_location": "chosenCustomerId"}
+ ],
+ "policyScope": [
+ "td",
+ "us",
+ "vFW-SINK",
+ "vPGN"
+ ],
+ "policyType": "request_param_query",
+ "serviceName": "vFW_TD",
+ "identity": "vFW_TD_Query_Policy",
+ "resources": [
+ "vFW-SINK",
+ "vPGN"
+ ]
+ }
+}
diff --git a/test/policy-local-files/affinity_vFW_TD.json b/test/policy-local-files/old-policies/affinity_vFW_TD.json
index 2df2d50..2df2d50 100644
--- a/test/policy-local-files/affinity_vFW_TD.json
+++ b/test/policy-local-files/old-policies/affinity_vFW_TD.json
diff --git a/test/policy-local-files/hpa_policy_vFW_1.json b/test/policy-local-files/old-policies/hpa_policy_vFW_1.json
index a60ad47..a60ad47 100644
--- a/test/policy-local-files/hpa_policy_vFW_1.json
+++ b/test/policy-local-files/old-policies/hpa_policy_vFW_1.json
diff --git a/test/policy-local-files/new_policies/hpa_policy_vGMuxInfra_1.json b/test/policy-local-files/old-policies/hpa_policy_vGMuxInfra_1.json
index c233c5f..690f5dc 100644
--- a/test/policy-local-files/new_policies/hpa_policy_vGMuxInfra_1.json
+++ b/test/policy-local-files/old-policies/hpa_policy_vGMuxInfra_1.json
@@ -1,27 +1,18 @@
{
- "OSDF_FRANKFURT.hpa_policy_vGMuxInfra_1": {
- "type": "onap.policies.optimization.HpaPolicy",
- "version": "1.0.0",
- "type_version": "1.0.0",
- "metadata": {
- "policy-id": "OSDF_FRANKFURT.hpa_policy_vGMuxInfra_1",
- "policy-version": 1
- },
- "properties": {
- "scope": [
- "OSDF_FRANKFURT"
- ],
- "services": [
- "vCPE"
- ],
- "resources": [
- "vGMuxInfra"
- ],
- "geography": [
- "US",
- "INTERNATIONAL"
- ],
+ "service": "hpaPolicy",
+ "policyName": "OSDF_DUBLIN.hpa_policy_vGMuxInfra_1",
+ "description": "HPA policy for vGMuxInfra",
+ "templateVersion": "OpenSource.version.1",
+ "version": "test1",
+ "priority": "3",
+ "riskType": "test",
+ "riskLevel": "2",
+ "guard": "False",
+ "content": {
+ "resources": ["vGMuxInfra"],
"identity": "hpa-vGMuxInfra",
+ "policyScope": ["vCPE", "US", "INTERNATIONAL", "ip", "vGMuxInfra"],
+ "policyType": "hpa",
"flavorFeatures": [
{
"id": "vgmux_1",
@@ -37,8 +28,8 @@
]
}
],
- "flavorProperties": [
- {
+ "flavorProperties":[
+ {
"hpa-feature" : "cpuTopology",
"mandatory" : "True",
"architecture": "generic",
@@ -52,64 +43,33 @@
{"hpa-attribute-key":"numCpuThreads", "hpa-attribute-value": "8", "operator":"<=", "unit": ""}
]
},
- {
- "hpa-feature": "basicCapabilities",
- "mandatory": true,
+ {
+ "hpa-feature" : "basicCapabilities",
+ "mandatory" : "True",
"architecture": "generic",
"directives": [],
"hpa-feature-attributes": [
- {
- "hpa-attribute-key": "numVirtualCpu",
- "hpa-attribute-value": 6,
- "operator": [
- "="
- ],
- "unit": ""
- },
- {
- "hpa-attribute-key": "virtualMemSize",
- "hpa-attribute-value": 6,
- "operator": [
- "="
- ],
- "unit": ""
- }
+ {"hpa-attribute-key": "numVirtualCpu", "hpa-attribute-value": "6", "operator": "=", "unit": ""},
+ {"hpa-attribute-key": "virtualMemSize", "hpa-attribute-value":"6", "operator": "=", "unit": "GB"}
]
},
{
- "hpa-feature": "ovsDpdk",
- "mandatory": false,
- "score": 3,
+ "hpa-feature" : "ovsDpdk",
+ "mandatory" : "False",
+ "score" : "3",
"architecture": "generic",
"directives": [],
"hpa-feature-attributes": [
- {
- "hpa-attribute-key": "dataProcessingAccelerationLibrary",
- "hpa-attribute-value": "ovsDpdk_version",
- "operator": [
- "="
- ],
- "unit": ""
- }
+ {"hpa-attribute-key":"dataProcessingAccelerationLibrary", "hpa-attribute-value":"ovsDpdk_version", "operator": "=", "unit":""}
]
},
{
- "hpa-feature": "cpuInstructionSetExtensions",
- "mandatory": true,
+ "hpa-feature" : "cpuInstructionSetExtensions",
+ "mandatory" : "True",
"architecture": "INTEL-64",
"directives": [],
"hpa-feature-attributes": [
- {
- "hpa-attribute-key": "instructionSetExtensions",
- "hpa-attribute-value": [
- "<CPUINST>",
- "<CPUINST>"
- ],
- "operator": [
- "ALL"
- ],
- "unit": ""
- }
+ {"hpa-attribute-key":"instructionSetExtensions", "hpa-attribute-value":["<CPUINST>", "<CPUINST>"], "operator": "ALL", "unit":""}
]
}
]
@@ -139,7 +99,7 @@
{"hpa-attribute-key":"logicalCpuPinningPolicy", "hpa-attribute-value": "<CPUPOLICY>","operator": "=", "unit":""}
]
},
- {
+ {
"hpa-feature" : "basicCapabilities",
"mandatory" : "True",
"architecture": "generic",
@@ -162,17 +122,18 @@
]
},
{
- "hpa-feature" : "pciePassthrough",
+ "hpa-feature" : "pcie",
"mandatory" : "True",
"architecture": "generic",
"directives": [],
"hpa-feature-attributes": [
{"hpa-attribute-key": "pciCount", "hpa-attribute-value": "2", "operator": "=", "unit": ""},
{"hpa-attribute-key": "pciVendorId", "hpa-attribute-value":"8086", "operator": "=", "unit": ""},
- {"hpa-attribute-key": "pciDeviceId", "hpa-attribute-value": "2", "operator": "=", "unit": ""}
+ {"hpa-attribute-key": "pciDeviceId", "hpa-attribute-value": "2", "operator": "=", "unit": ""},
+ {"hpa-attribute-key": "functionType", "hpa-attribute-value": "<PCITYPEVALUE>","operator": "=", "unit": ""}
]
}
-]
+ ]
},
{
"id": "vgmux_3",
@@ -202,7 +163,7 @@
{"hpa-attribute-key": "numaCpu-1", "hpa-attribute-value":"4", "operator": "=", "unit": ""},
{"hpa-attribute-key": "numaMem-1", "value": "4096", "operator": "=", "unit": "MB"}
]
-},
+ },
{
"hpa-feature" : "basicCapabilities",
"mandatory" : "True",
@@ -227,5 +188,4 @@
}
]
}
- }
}
diff --git a/test/policy-local-files/new_policies/hpa_policy_vG_1.json b/test/policy-local-files/old-policies/hpa_policy_vG_1.json
index 4f9a7b4..b29c67d 100644
--- a/test/policy-local-files/new_policies/hpa_policy_vG_1.json
+++ b/test/policy-local-files/old-policies/hpa_policy_vG_1.json
@@ -1,27 +1,18 @@
{
- "OSDF_FRANKFURT.hpa_policy_vG_1": {
- "type": "onap.policies.optimization.HpaPolicy",
- "version": "1.0.0",
- "type_version": "1.0.0",
- "metadata": {
- "policy-id": "OSDF_FRANKFURT.hpa_policy_vG_1",
- "policy-version": 1
- },
- "properties": {
- "scope": [
- "OSDF_FRANKFURT"
- ],
- "services": [
- "vCPE"
- ],
- "resources": [
- "vG"
- ],
- "geography": [
- "US",
- "INTERNATIONAL"
- ],
+ "service": "hpaPolicy",
+ "policyName": "OSDF_DUBLIN.hpa_policy_vG_1",
+ "description": "HPA policy for vG",
+ "templateVersion": "OpenSource.version.1",
+ "version": "test1",
+ "priority": "3",
+ "riskType": "test",
+ "riskLevel": "2",
+ "guard": "False",
+ "content": {
+ "resources": ["vG"],
"identity": "hpa-vG",
+ "policyScope": ["vCPE", "US", "INTERNATIONAL", "ip", "vG"],
+ "policyType": "hpa",
"flavorFeatures": [
{
"id": "vg_1",
@@ -37,8 +28,8 @@
]
}
],
- "flavorProperties": [
- {
+ "flavorProperties":[
+ {
"hpa-feature" : "cpuTopology",
"mandatory" : "True",
"architecture": "generic",
@@ -52,64 +43,33 @@
{"hpa-attribute-key":"numCpuThreads", "hpa-attribute-value": "8", "operator":"<=", "unit": ""}
]
},
- {
- "hpa-feature": "basicCapabilities",
- "mandatory": true,
+ {
+ "hpa-feature" : "basicCapabilities",
+ "mandatory" : "True",
"architecture": "generic",
"directives": [],
"hpa-feature-attributes": [
- {
- "hpa-attribute-key": "numVirtualCpu",
- "hpa-attribute-value": 6,
- "operator": [
- "="
- ],
- "unit": ""
- },
- {
- "hpa-attribute-key": "virtualMemSize",
- "hpa-attribute-value": 6,
- "operator": [
- "="
- ],
- "unit": ""
- }
+ {"hpa-attribute-key": "numVirtualCpu", "hpa-attribute-value": "6", "operator": "=", "unit": ""},
+ {"hpa-attribute-key": "virtualMemSize", "hpa-attribute-value":"6", "operator": "=", "unit": "GB"}
]
},
{
- "hpa-feature": "ovsDpdk",
- "mandatory": false,
- "score": 3,
+ "hpa-feature" : "ovsDpdk",
+ "mandatory" : "False",
+ "score" : "3",
"architecture": "generic",
"directives": [],
"hpa-feature-attributes": [
- {
- "hpa-attribute-key": "dataProcessingAccelerationLibrary",
- "hpa-attribute-value": "ovsDpdk_version",
- "operator": [
- "="
- ],
- "unit": ""
- }
+ {"hpa-attribute-key":"dataProcessingAccelerationLibrary", "hpa-attribute-value":"ovsDpdk_version", "operator": "=", "unit":""}
]
},
{
- "hpa-feature": "cpuInstructionSetExtensions",
- "mandatory": true,
+ "hpa-feature" : "cpuInstructionSetExtensions",
+ "mandatory" : "True",
"architecture": "INTEL-64",
"directives": [],
"hpa-feature-attributes": [
- {
- "hpa-attribute-key": "instructionSetExtensions",
- "hpa-attribute-value": [
- "<CPUINST>",
- "<CPUINST>"
- ],
- "operator": [
- "ALL"
- ],
- "unit": ""
- }
+ {"hpa-attribute-key":"instructionSetExtensions", "hpa-attribute-value":["<CPUINST>", "<CPUINST>"], "operator": "ALL", "unit":""}
]
}
]
@@ -139,7 +99,7 @@
{"hpa-attribute-key":"logicalCpuPinningPolicy", "hpa-attribute-value": "<CPUPOLICY>","operator": "=", "unit":""}
]
},
- {
+ {
"hpa-feature" : "basicCapabilities",
"mandatory" : "True",
"architecture": "generic",
@@ -172,7 +132,7 @@
{"hpa-attribute-key": "pciDeviceId", "hpa-attribute-value": "2", "operator": "=", "unit": ""}
]
}
-]
+ ]
},
{
"id": "vg_3",
@@ -202,7 +162,7 @@
{"hpa-attribute-key": "numaCpu-1", "hpa-attribute-value":"4", "operator": "=", "unit": ""},
{"hpa-attribute-key": "numaMem-1", "value": "4096", "operator": "=", "unit": "MB"}
]
-},
+ },
{
"hpa-feature" : "basicCapabilities",
"mandatory" : "True",
@@ -227,5 +187,4 @@
}
]
}
- }
}
diff --git a/test/policy-local-files/old-policies/subscriber_policy_vCPE.json b/test/policy-local-files/old-policies/subscriber_policy_vCPE.json
new file mode 100644
index 0000000..9359c20
--- /dev/null
+++ b/test/policy-local-files/old-policies/subscriber_policy_vCPE.json
@@ -0,0 +1,22 @@
+{
+ "service": "subscriberPolicy",
+ "policyName": "OSDF_DUBLIN.SubscriberPolicy_v1",
+ "description": "Subscriber Policy for vCPE",
+ "templateVersion": "OpenSource.version.1",
+ "version": "test1",
+ "priority": "1",
+ "riskType": "test",
+ "riskLevel": "3",
+ "guard": "False",
+ "content": {
+ "identity": "subscriber_vCPE",
+ "policyScope": ["vCPE", "subscriber_x", "subscriber_y", "subscriberPolicy"],
+ "properties": {
+ "subscriberName": ["subscriber_x", "subscriber_y"],
+ "subscriberRole": ["PVT Homing"],
+ "provStatus": ["CAPPED"]
+ },
+ "policyType": "subscriberPolicy",
+ "serviceName": "vCPE"
+ }
+}
diff --git a/test/policy-local-files/subscriber_policy_vFW.json b/test/policy-local-files/old-policies/subscriber_policy_vFW.json
index 299da04..299da04 100644
--- a/test/policy-local-files/subscriber_policy_vFW.json
+++ b/test/policy-local-files/old-policies/subscriber_policy_vFW.json
diff --git a/test/policy-local-files/vnfPolicy_vFW.json b/test/policy-local-files/old-policies/vnfPolicy_vFW.json
index 0b7d9a2..0b7d9a2 100644
--- a/test/policy-local-files/vnfPolicy_vFW.json
+++ b/test/policy-local-files/old-policies/vnfPolicy_vFW.json
diff --git a/test/policy-local-files/old-policies/vnfPolicy_vFW_TD.json b/test/policy-local-files/old-policies/vnfPolicy_vFW_TD.json
new file mode 100644
index 0000000..a471a77
--- /dev/null
+++ b/test/policy-local-files/old-policies/vnfPolicy_vFW_TD.json
@@ -0,0 +1,44 @@
+{
+ "service": "vnfPolicy",
+ "policyName": "OSDF_DUBLIN.vnfPolicy_vFW_TD",
+ "description": "vnfPolicy",
+ "templateVersion": "OpenSource.version.1",
+ "version": "oofDublin",
+ "priority": "6",
+ "riskType": "test",
+ "riskLevel": "3",
+ "guard": "False",
+ "content": {
+ "identity": "vnf_vFW_TD",
+ "policyScope": [
+ "td",
+ "us",
+ "vFW-SINK"
+ ],
+ "policyType": "vnfPolicy",
+ "resources": ["vFW-SINK"],
+ "applicableResources": "any",
+ "vnfProperties": [{
+ "inventoryProvider": "aai",
+ "serviceType": "",
+ "inventoryType": "vfmodule",
+ "customerId": {
+ "get_param": "chosen_customer_id"
+ },
+ "equipmentRole": "",
+ "attributes": {
+ "orchestrationStatus": ["active"],
+ "provStatus": "ACTIVE",
+ "cloudRegionId": {
+ "get_param": "chosen_region"
+ },
+ "service_instance_id": {
+ "get_param": "service_id"
+ }
+ },
+ "passthroughAttributes": {
+ "td-role": "destination"
+ }
+ }]
+ }
+}
diff --git a/test/policy-local-files/old-policies/vnfPolicy_vG.json b/test/policy-local-files/old-policies/vnfPolicy_vG.json
new file mode 100644
index 0000000..b047686
--- /dev/null
+++ b/test/policy-local-files/old-policies/vnfPolicy_vG.json
@@ -0,0 +1,29 @@
+{
+ "service": "vnfPolicy",
+ "policyName": "OSDF_DUBLIN.vnfPolicy_vG",
+ "description": "vnfPolicy",
+ "templateVersion": "OpenSource.version.1",
+ "version": "test1",
+ "priority": "6",
+ "riskType": "test",
+ "riskLevel": "3",
+ "guard": "False",
+ "content": {
+ "identity": "vnf_vG",
+ "policyScope": ["vCPE", "US", "INTERNATIONAL", "ip", "vG"],
+ "policyType": "vnfPolicy",
+ "resources": ["vG"],
+ "applicableResources": "any",
+ "vnfProperties": [
+ {
+ "inventoryProvider": "aai",
+ "serviceType": "",
+ "inventoryType": "cloud",
+ "customerId": "",
+ "orchestrationStatus": "",
+ "equipmentRole": ""
+
+ }
+ ]
+ }
+}
diff --git a/test/policy-local-files/old-policies/vnfPolicy_vGMuxInfra.json b/test/policy-local-files/old-policies/vnfPolicy_vGMuxInfra.json
new file mode 100644
index 0000000..45d67f6
--- /dev/null
+++ b/test/policy-local-files/old-policies/vnfPolicy_vGMuxInfra.json
@@ -0,0 +1,28 @@
+{
+ "service": "vnfPolicy",
+ "policyName": "OSDF_DUBLIN.vnfPolicy_vGMuxInfra",
+ "description": "vnfPolicy",
+ "templateVersion": "OpenSource.version.1",
+ "version": "test1",
+ "priority": "6",
+ "riskType": "test",
+ "riskLevel": "3",
+ "guard": "False",
+ "content": {
+ "identity": "vnf_vGMuxInfra",
+ "policyScope": ["vCPE", "US", "INTERNATIONAL", "ip", "vGMuxInfra"],
+ "policyType": "vnfPolicy",
+ "resources": ["vGMuxInfra"],
+ "applicableResources": "any",
+ "vnfProperties": [
+ {
+ "inventoryProvider": "aai",
+ "serviceType": "vGMuxInfra-xx",
+ "inventoryType": "service",
+ "customerId": "SDN-ETHERNET-INTERNET",
+ "orchestrationStatus": "",
+ "equipmentRole": ""
+ }
+ ]
+ }
+}
diff --git a/test/policy-local-files/old-policies/vnfPolicy_vPGN_TD.json b/test/policy-local-files/old-policies/vnfPolicy_vPGN_TD.json
new file mode 100644
index 0000000..2e79f2f
--- /dev/null
+++ b/test/policy-local-files/old-policies/vnfPolicy_vPGN_TD.json
@@ -0,0 +1,51 @@
+{
+ "service": "vnfPolicy",
+ "policyName": "OSDF_DUBLIN.vnfPolicy_vPGN_TD",
+ "description": "vnfPolicy",
+ "templateVersion": "OpenSource.version.1",
+ "version": "oofDublin",
+ "priority": "6",
+ "riskType": "test",
+ "riskLevel": "3",
+ "guard": "False",
+ "content": {
+ "identity": "vnf_vPGN_TD",
+ "policyScope": [
+ "td",
+ "us",
+ "vPGN"
+ ],
+ "policyType": "vnfPolicy",
+ "resources": [
+ "vPGN"
+ ],
+ "applicableResources": "any",
+ "vnfProperties": [
+ {
+ "inventoryProvider": "aai",
+ "serviceType": "",
+ "inventoryType": "vfmodule",
+ "customerId": {
+ "get_param": "chosen_customer_id"
+ },
+ "equipmentRole": "",
+ "unique": "False",
+ "attributes": {
+ "orchestrationStatus": [
+ "active"
+ ],
+ "provStatus": "ACTIVE",
+ "cloudRegionId": {
+ "get_param": "chosen_region"
+ },
+ "service_instance_id": {
+ "get_param": "service_id"
+ }
+ },
+ "passthroughAttributes": {
+ "td-role": "anchor"
+ }
+ }
+ ]
+ }
+} \ No newline at end of file
diff --git a/test/policy-local-files/subscriber_policy_vCPE.json b/test/policy-local-files/subscriber_policy_vCPE.json
index 9359c20..305ce58 100644
--- a/test/policy-local-files/subscriber_policy_vCPE.json
+++ b/test/policy-local-files/subscriber_policy_vCPE.json
@@ -1,22 +1,32 @@
{
- "service": "subscriberPolicy",
- "policyName": "OSDF_DUBLIN.SubscriberPolicy_v1",
- "description": "Subscriber Policy for vCPE",
- "templateVersion": "OpenSource.version.1",
- "version": "test1",
- "priority": "1",
- "riskType": "test",
- "riskLevel": "3",
- "guard": "False",
- "content": {
- "identity": "subscriber_vCPE",
- "policyScope": ["vCPE", "subscriber_x", "subscriber_y", "subscriberPolicy"],
- "properties": {
- "subscriberName": ["subscriber_x", "subscriber_y"],
- "subscriberRole": ["PVT Homing"],
- "provStatus": ["CAPPED"]
- },
- "policyType": "subscriberPolicy",
- "serviceName": "vCPE"
+ "OSDF_FRANKFURT.SubscriberPolicy_v1": {
+ "type": "onap.policies.optimization.SubscriberPolicy",
+ "version": "1.0.0",
+ "type_version": "1.0.0",
+ "metadata": {
+ "policy-id": "OSDF_FRANKFURT.SubscriberPolicy_v1",
+ "policy-version": 1
+ },
+ "properties": {
+ "scope": [
+ "OSDF_FRANKFURT"
+ ],
+ "services": [
+ "vCPE"
+ ],
+ "identity": "subscriber_vCPE",
+ "properties": {
+ "subscriberName": [
+ "subscriber_x",
+ "subscriber_y"
+ ],
+ "subscriberRole": [
+ "PVT Homing"
+ ],
+ "provStatus": [
+ "CAPPED"
+ ]
+ }
}
+ }
}
diff --git a/test/policy-local-files/vnfPolicy_vFW_TD.json b/test/policy-local-files/vnfPolicy_vFW_TD.json
index a471a77..387ed56 100644
--- a/test/policy-local-files/vnfPolicy_vFW_TD.json
+++ b/test/policy-local-files/vnfPolicy_vFW_TD.json
@@ -1,44 +1,47 @@
{
- "service": "vnfPolicy",
- "policyName": "OSDF_DUBLIN.vnfPolicy_vFW_TD",
- "description": "vnfPolicy",
- "templateVersion": "OpenSource.version.1",
- "version": "oofDublin",
- "priority": "6",
- "riskType": "test",
- "riskLevel": "3",
- "guard": "False",
- "content": {
- "identity": "vnf_vFW_TD",
- "policyScope": [
- "td",
- "us",
- "vFW-SINK"
- ],
- "policyType": "vnfPolicy",
- "resources": ["vFW-SINK"],
- "applicableResources": "any",
- "vnfProperties": [{
- "inventoryProvider": "aai",
- "serviceType": "",
- "inventoryType": "vfmodule",
- "customerId": {
- "get_param": "chosen_customer_id"
- },
- "equipmentRole": "",
- "attributes": {
- "orchestrationStatus": ["active"],
- "provStatus": "ACTIVE",
- "cloudRegionId": {
- "get_param": "chosen_region"
- },
- "service_instance_id": {
- "get_param": "service_id"
- }
- },
- "passthroughAttributes": {
- "td-role": "destination"
- }
- }]
+ "OSDF_FRANKFURT.vnfPolicy_vFW_TD": {
+ "type": "onap.policies.optimization.VnfPolicy",
+ "version": "1.0.0",
+ "type_version": "1.0.0",
+ "metadata": {
+ "policy-id": "OSDF_FRANKFURT.vnfPolicy_vFW_TD",
+ "policy-version": 1
+ },
+ "properties": {
+ "scope": [
+ "OSDF_FRANKFURT",
+ "TD"
+ ],
+ "resources": [
+ "vFW-SINK"
+ ],
+ "geography": [
+ "US"
+ ],
+ "identity": "vnf_vFW_TD",
+ "applicableResources": "any",
+ "vnfProperties": [{
+ "inventoryProvider": "aai",
+ "serviceType": "",
+ "inventoryType": "vfmodule",
+ "customerId": {
+ "get_param": "chosen_customer_id"
+ },
+ "equipmentRole": "",
+ "attributes": {
+ "orchestrationStatus": ["active"],
+ "provStatus": "ACTIVE",
+ "cloudRegionId": {
+ "get_param": "chosen_region"
+ },
+ "service_instance_id": {
+ "get_param": "service_id"
+ }
+ },
+ "passthroughAttributes": {
+ "td-role": "destination"
+ }
+ }]
}
+ }
}
diff --git a/test/policy-local-files/vnfPolicy_vG.json b/test/policy-local-files/vnfPolicy_vG.json
index b047686..786ffc2 100644
--- a/test/policy-local-files/vnfPolicy_vG.json
+++ b/test/policy-local-files/vnfPolicy_vG.json
@@ -1,29 +1,38 @@
{
- "service": "vnfPolicy",
- "policyName": "OSDF_DUBLIN.vnfPolicy_vG",
- "description": "vnfPolicy",
- "templateVersion": "OpenSource.version.1",
- "version": "test1",
- "priority": "6",
- "riskType": "test",
- "riskLevel": "3",
- "guard": "False",
- "content": {
- "identity": "vnf_vG",
- "policyScope": ["vCPE", "US", "INTERNATIONAL", "ip", "vG"],
- "policyType": "vnfPolicy",
- "resources": ["vG"],
- "applicableResources": "any",
- "vnfProperties": [
- {
- "inventoryProvider": "aai",
- "serviceType": "",
- "inventoryType": "cloud",
- "customerId": "",
- "orchestrationStatus": "",
- "equipmentRole": ""
-
- }
- ]
+ "OSDF_FRANKFURT.vnfPolicy_vG": {
+ "type": "onap.policies.optimization.VnfPolicy",
+ "version": "1.0.0",
+ "type_version": "1.0.0",
+ "metadata": {
+ "policy-id": "OSDF_FRANKFURT.vnfPolicy_vG",
+ "policy-version": 1
+ },
+ "properties": {
+ "scope": [
+ "OSDF_FRANKFURT"
+ ],
+ "services": [
+ "vCPE"
+ ],
+ "resources": [
+ "vG"
+ ],
+ "geography": [
+ "US",
+ "INTERNATIONAL"
+ ],
+ "identity": "vnf_vG",
+ "applicableResources": "any",
+ "vnfProperties": [
+ {
+ "inventoryProvider": "aai",
+ "serviceType": "",
+ "inventoryType": "cloud",
+ "customerId": "",
+ "orchestrationStatus": "",
+ "equipmentRole": ""
+ }
+ ]
}
+ }
}
diff --git a/test/policy-local-files/vnfPolicy_vGMuxInfra.json b/test/policy-local-files/vnfPolicy_vGMuxInfra.json
index 45d67f6..deb34fd 100644
--- a/test/policy-local-files/vnfPolicy_vGMuxInfra.json
+++ b/test/policy-local-files/vnfPolicy_vGMuxInfra.json
@@ -1,28 +1,38 @@
{
- "service": "vnfPolicy",
- "policyName": "OSDF_DUBLIN.vnfPolicy_vGMuxInfra",
- "description": "vnfPolicy",
- "templateVersion": "OpenSource.version.1",
- "version": "test1",
- "priority": "6",
- "riskType": "test",
- "riskLevel": "3",
- "guard": "False",
- "content": {
- "identity": "vnf_vGMuxInfra",
- "policyScope": ["vCPE", "US", "INTERNATIONAL", "ip", "vGMuxInfra"],
- "policyType": "vnfPolicy",
- "resources": ["vGMuxInfra"],
- "applicableResources": "any",
- "vnfProperties": [
- {
- "inventoryProvider": "aai",
- "serviceType": "vGMuxInfra-xx",
- "inventoryType": "service",
- "customerId": "SDN-ETHERNET-INTERNET",
- "orchestrationStatus": "",
- "equipmentRole": ""
- }
- ]
+ "OSDF_FRANKFURT.vnfPolicy_vGMuxInfra": {
+ "type": "onap.policies.optimization.VnfPolicy",
+ "version": "1.0.0",
+ "type_version": "1.0.0",
+ "metadata": {
+ "policy-id": "OSDF_FRANKFURT.vnfPolicy_vGMuxInfra",
+ "policy-version": 1
+ },
+ "properties": {
+ "scope": [
+ "OSDF_FRANKFURT"
+ ],
+ "services": [
+ "vCPE"
+ ],
+ "resources": [
+ "vGMuxInfra"
+ ],
+ "geography": [
+ "US",
+ "INTERNATIONAL"
+ ],
+ "identity": "vnf_vGMuxInfra",
+ "applicableResources": "any",
+ "vnfProperties": [
+ {
+ "inventoryProvider": "aai",
+ "serviceType": "vGMuxInfra-xx",
+ "inventoryType": "service",
+ "customerId": "SDN-ETHERNET-INTERNET",
+ "orchestrationStatus": "",
+ "equipmentRole": ""
+ }
+ ]
}
+ }
}
diff --git a/test/policy-local-files/vnfPolicy_vPGN_TD.json b/test/policy-local-files/vnfPolicy_vPGN_TD.json
index 2e79f2f..c441156 100644
--- a/test/policy-local-files/vnfPolicy_vPGN_TD.json
+++ b/test/policy-local-files/vnfPolicy_vPGN_TD.json
@@ -1,51 +1,52 @@
{
- "service": "vnfPolicy",
- "policyName": "OSDF_DUBLIN.vnfPolicy_vPGN_TD",
- "description": "vnfPolicy",
- "templateVersion": "OpenSource.version.1",
- "version": "oofDublin",
- "priority": "6",
- "riskType": "test",
- "riskLevel": "3",
- "guard": "False",
- "content": {
- "identity": "vnf_vPGN_TD",
- "policyScope": [
- "td",
- "us",
- "vPGN"
- ],
- "policyType": "vnfPolicy",
- "resources": [
- "vPGN"
- ],
- "applicableResources": "any",
- "vnfProperties": [
- {
- "inventoryProvider": "aai",
- "serviceType": "",
- "inventoryType": "vfmodule",
- "customerId": {
- "get_param": "chosen_customer_id"
- },
- "equipmentRole": "",
- "unique": "False",
- "attributes": {
- "orchestrationStatus": [
- "active"
- ],
- "provStatus": "ACTIVE",
- "cloudRegionId": {
- "get_param": "chosen_region"
+ "OSDF_FRANKFURT.vnfPolicy_vPGN_TD": {
+ "type": "onap.policies.optimization.VnfPolicy",
+ "version": "1.0.0",
+ "type_version": "1.0.0",
+ "metadata": {
+ "policy-id": "OSDF_FRANKFURT.vnfPolicy_vPGN_TD",
+ "policy-version": 1
+ },
+ "properties": {
+ "scope": [
+ "OSDF_FRANKFURT",
+ "TD"
+ ],
+ "resources": [
+ "vPGN"
+ ],
+ "geography": [
+ "US"
+ ],
+ "identity": "vnf_vPGN_TD",
+ "applicableResources": "any",
+ "vnfProperties": [
+ {
+ "inventoryProvider": "aai",
+ "serviceType": "",
+ "inventoryType": "vfmodule",
+ "customerId": {
+ "get_param": "chosen_customer_id"
},
- "service_instance_id": {
- "get_param": "service_id"
+ "equipmentRole": "",
+ "unique": "False",
+ "attributes": {
+ "orchestrationStatus": [
+ "active"
+ ],
+ "provStatus": "ACTIVE",
+ "cloudRegionId": {
+ "get_param": "chosen_region"
+ },
+ "service_instance_id": {
+ "get_param": "service_id"
+ }
+ },
+ "passthroughAttributes": {
+ "td-role": "anchor"
}
- },
- "passthroughAttributes": {
- "td-role": "anchor"
}
- }
- ]
+ ]
+ }
}
-} \ No newline at end of file
+}
diff --git a/test/test_ConductorApiBuilder.py b/test/test_ConductorApiBuilder.py
index 1be0a4b..07cb3bb 100644
--- a/test/test_ConductorApiBuilder.py
+++ b/test/test_ConductorApiBuilder.py
@@ -30,7 +30,7 @@ class TestConductorApiBuilder(unittest.TestCase):
self.main_dir = ""
self.conductor_api_template = self.main_dir + "apps/placement/templates/conductor_interface.json"
self.local_config_file = self.main_dir + "config/common_config.yaml"
- policy_data_path = self.main_dir + "test/policy-local-files/new_policies" # "test/policy-local-files"
+ policy_data_path = self.main_dir + "test/policy-local-files" # "test/policy-local-files"
valid_policies_list_file = policy_data_path + '/' + 'meta-valid-policies.txt'
valid_policies_files = local_policies.get_policy_names_from_file(valid_policies_list_file)
diff --git a/test/test_PolicyCalls.py b/test/test_PolicyCalls.py
index 4358eeb..0b17081 100644
--- a/test/test_PolicyCalls.py
+++ b/test/test_PolicyCalls.py
@@ -33,7 +33,7 @@ class TestPolicyCalls(unittest.TestCase):
def setUp(self):
main_dir = ""
parameter_data_file = main_dir + "test/placement-tests/request.json"
- policy_data_path = main_dir + "test/policy-local-files/new_policies/"
+ policy_data_path = main_dir + "test/policy-local-files/"
local_config_file = main_dir + "config/common_config.yaml"
valid_policies_list_file = policy_data_path + '/' + 'meta-valid-policies.txt'
diff --git a/test/test_get_opt_query_data.py b/test/test_get_opt_query_data.py
index 06dfbf9..a7a4d88 100644
--- a/test/test_get_opt_query_data.py
+++ b/test/test_get_opt_query_data.py
@@ -25,7 +25,7 @@ class TestGetOptQueryData(unittest.TestCase):
def test_get_opt_query_data(self):
main_dir = ""
parameter_data_file = main_dir + "test/placement-tests/request.json"
- policy_data_path = main_dir + "test/policy-local-files/new_policies/"
+ policy_data_path = main_dir + "test/policy-local-files/"
query_policy_data_file = ["QueryPolicy_vCPE.json"]
request_json = json.loads(open(parameter_data_file).read())
@@ -37,7 +37,7 @@ class TestGetOptQueryData(unittest.TestCase):
def test_get_opt_query_data_vfmod(self):
main_dir = ""
parameter_data_file = main_dir + "test/placement-tests/request_vfmod.json"
- policy_data_path = main_dir + "test/policy-local-files/new_policies/"
+ policy_data_path = main_dir + "test/policy-local-files/"
query_policy_data_file = ["QueryPolicy_vFW_TD.json"]
request_json = json.loads(open(parameter_data_file).read())