[WIP]Migration to new policy api

*Change retrieval payload send to policy
*Change the configs inside common_config

Issue-ID: OPTFRA-520
Change-Id: I27a63294cdec3def7d415ed2dcb96e3606d9e21f
Signed-off-by: Ruoyu Ying <ruoyu.ying@intel.com>

1 files changed, 695 insertions, 172 deletions

diff --git a/test/placement-tests/policy_response2.json b/test/placement-tests/policy_response2.json
index 2cd6dcb..15ddbe1 100644
--- a/test/placement-tests/policy_response2.json
+++ b/test/placement-tests/policy_response2.json
@@ -1,182 +1,705 @@
-[
-  {
-    "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": ""
+{
+  "policies": {
+    "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",
+          "PVT Homing"
+        ],
+        "services": [
+          "vCPE"
+        ],
+        "identity": "subscriber_vCPE",
+        "properties": {
+          "subscriberName": [
+            "subscriber_x",
+            "subscriber_y"
+          ],
+          "subscriberRole": [
+            "PVT Homing"
+          ],
+          "provStatus": [
+            "CAPPED"
+          ]
+        }
+      }
     },
-    "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": ""
+    "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",
+          "PVT Homing"
+        ],
+        "services": [
+          "vCPE"
+        ],
+        "resources": [
+          "vG"
+        ],
+        "geography": [
+          "US",
+          "INTERNATIONAL"
+        ],
+        "identity": "vnf_vG",
+        "applicableResources": "any",
+        "vnfProperties": [
+          {
+            "inventoryProvider": "aai",
+            "serviceType": "",
+            "inventoryType": "cloud",
+            "customerId": "",
+            "orchestrationStatus": "",
+            "equipmentRole": ""
+          }
+        ]
+      }
     },
-    "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": ""
+    "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",
+          "PVT Homing"
+        ],
+        "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": ""
+          }
+        ]
+      }
     },
-    "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": ""
+    "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",
+          "PVT Homing"
+        ],
+        "services": [
+          "vCPE"
+        ],
+        "resources": [
+          "vG"
+        ],
+        "geography": [
+          "US",
+          "INTERNATIONAL"
+        ],
+        "identity": "distance-vG",
+        "applicableResources": "any",
+        "distanceProperties": {
+          "locationInfo": "customer_loc",
+          "distance": {
+            "value": "1500",
+            "operator": "<",
+            "unit": "km"
+          }
+        }
+      }
     },
-    "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": ""
+    "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",
+          "PVT Homing"
+        ],
+        "services": [
+          "vCPE"
+        ],
+        "resources": [
+          "vGMuxInfra"
+        ],
+        "geography": [
+          "US",
+          "INTERNATIONAL"
+        ],
+        "identity": "distance-vGMuxInfra",
+        "applicableResources": "any",
+        "distanceProperties": {
+          "locationInfo": "customer_loc",
+          "distance": {
+            "value": "500",
+            "operator": "<",
+            "unit": "km"
+          }
+        }
+      }
     },
-    "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": ""
+    "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",
+          "PVT Homing"
+        ],
+        "services": [
+          "vCPE"
+        ],
+        "resources": [
+          "vG",
+          "vGMuxInfra"
+        ],
+        "geography": [
+          "US",
+          "INTERNATIONAL"
+        ],
+        "identity": "optimization",
+        "objective": "minimize",
+        "objectiveParameter": {
+          "parameterAttributes": [
+            {
+              "resources": [
+                "vGMuxInfra"
+              ],
+              "customerLocationInfo": "customer_loc",
+              "parameter": "distance",
+              "weight": "1",
+              "operator": "product"
+            },
+            {
+              "resources": [
+                "vG"
+              ],
+              "customerLocationInfo": "customer_loc",
+              "parameter": "distance",
+              "weight": "1",
+              "operator": "product"
+            },
+            {
+              "resources": [
+                "vG"
+              ],
+              "parameter": "hpa_score",
+              "weight": "200",
+              "operator": "product"
+            },
+            {
+              "resources": [
+                "vFW"
+              ],
+              "customerLocationInfo": "customer_loc",
+              "parameter": "distance",
+              "weight": "100",
+              "operator": "product"
+            },
+            {
+              "resources": [
+                "vFW"
+              ],
+              "parameter": "hpa_score",
+              "weight": "200",
+              "operator": "product"
+            }
+          ],
+          "operator": "sum"
+        }
+      }
     },
-    "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": ""
+    "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",
+          "PVT Homing"
+        ],
+        "services": [
+          "vCPE"
+        ],
+        "resources": [
+          "vGMuxInfra",
+          "vG"
+        ],
+        "geography": [
+          "US",
+          "INTERNATIONAL"
+        ],
+        "identity": "vCPE_Query_Policy",
+        "queryProperties": [
+          {
+            "attribute": "customerLatitude",
+            "attribute_location": "customerLatitude"
+          },
+          {
+            "attribute": "customerLongitude",
+            "attribute_location": "customerLongitude"
+          }
+        ]
+      }
     },
-    "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": ""
+    "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",
+          "PVT Homing"
+        ],
+        "services": [
+          "vCPE"
+        ],
+        "resources": [
+          "vG"
+        ],
+        "geography": [
+          "US",
+          "INTERNATIONAL"
+        ],
+        "identity": "hpa-vG",
+        "flavorFeatures": [
+          {
+            "id": "vg_1",
+            "type": "vnfc",
+            "directives": [
+              {
+                "type": "flavor_directives",
+                "attributes": [
+                  {
+                    "attribute_name": "flavor_label_vm_01",
+                    "attribute_value": ""
+                  }
+                ]
+              }
+            ],
+            "flavorProperties": [
+              {
+                "hpa-feature": "cpuTopology",
+                "mandatory": "True",
+                "architecture": "generic",
+                "directives": [],
+                "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",
+                "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-feature": "ovsDpdk",
+                "mandatory": false,
+                "score": 3,
+                "architecture": "generic",
+                "directives": [],
+                "hpa-feature-attributes": [
+                  {
+                    "hpa-attribute-key": "dataProcessingAccelerationLibrary",
+                    "hpa-attribute-value": "ovsDpdk_version",
+                    "operator": [
+                      "="
+                    ],
+                    "unit": ""
+                  }
+                ]
+              },
+              {
+                "hpa-feature": "cpuInstructionSetExtensions",
+                "mandatory": true,
+                "architecture": "INTEL-64",
+                "directives": [],
+                "hpa-feature-attributes": [
+                  {
+                    "hpa-attribute-key": "instructionSetExtensions",
+                    "hpa-attribute-value": [
+                      "<CPUINST>",
+                      "<CPUINST>"
+                    ],
+                    "operator": [
+                      "ALL"
+                    ],
+                    "unit": ""
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "id": "vg_2",
+            "type": "vnfc",
+            "directives": [
+              {
+                "type": "flavor_directives",
+                "attributes": [
+                  {
+                    "attribute_name": "flavor_label_vm_02",
+                    "attribute_value": ""
+                  }
+                ]
+              }
+            ],
+            "flavorProperties": [
+              {
+                "hpa-feature": "cpuPinningy",
+                "mandatory": "True",
+                "architecture": "generic",
+                "directives": [],
+                "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",
+                "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-feature": "localStorage",
+                "mandatory": "False",
+                "score": "5",
+                "architecture": "generic",
+                "directives": [],
+                "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": "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": ""
+                  }
+                ]
+              }
+            ]
+          },
+          {
+            "id": "vg_3",
+            "type": "vnfc",
+            "directives": [
+              {
+                "type": "flavor_directives",
+                "attributes": [
+                  {
+                    "attribute_name": "flavor_label_vm_03",
+                    "attribute_value": ""
+                  }
+                ]
+              }
+            ],
+            "flavorProperties": [
+              {
+                "hpa-feature": "numa",
+                "mandatory": "False",
+                "score": "5",
+                "architecture": "generic",
+                "directives": [],
+                "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",
+                "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-feature": "hugePages",
+                "mandatory": "False",
+                "score": "7",
+                "architecture": "generic",
+                "directives": [],
+                "hpa-feature-attributes": [
+                  {
+                    "hpa-attribute-key": "memoryPageSize",
+                    "hpa-attribute-value": "<MEMORYPAGESIZE>",
+                    "operator": "=",
+                    "unit": ""
+                  }
+                ]
+              }
+            ]
+          }
+        ]
+      }
     },
-    "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": ""
+    "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",
+          "PVT Homing"
+        ],
+        "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\"}}"
+        }
+      }
     },
-    "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
+    "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",
+          "PVT Homing"
+        ],
+        "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\"}}"
+        }
+      }
+    }
   }
-]
\ No newline at end of file
+}
+