Merge "Updates to address new HPA policies"

26 files changed, 149 insertions, 717 deletions

diff --git a/test/policy-local-files/Affinity_vCPE_1.json b/test/policy-local-files/Affinity_vCPE_1.json
index c42e9d8..4a3e086 100644
--- a/test/policy-local-files/Affinity_vCPE_1.json
+++ b/test/policy-local-files/Affinity_vCPE_1.json
@@ -15,7 +15,8 @@
             "qualifier": "different",
             "category": "complex"
         },
-        "policyType": "affinityPolicy",
-        "resources": ["vGMuxInfra", "vG"]
+        "policyType": "zone",
+        "resources": ["vGMuxInfra", "vG"],
+        "applicableResources": "all"
     }
-}
+}
\ No newline at end of file
diff --git a/test/policy-local-files/Capacity_vGMuxInfra.json b/test/policy-local-files/Capacity_vGMuxInfra.json
index 9eec54d..06896c3 100644
--- a/test/policy-local-files/Capacity_vGMuxInfra.json
+++ b/test/policy-local-files/Capacity_vGMuxInfra.json
@@ -10,12 +10,13 @@
     "guard": "False",
     "content": {
         "identity": "capacity_vGMuxInfra",
-        "policyScope": ["VCPE", "US", "INTERNATIONAL", "ip", "vGMuxInfra"],
-	"resources": ["vGMuxInfra"],
+        "policyScope": ["VCPE", "US", "INTERNATIONAL", "ip", "vGMuxInfra", "vim_fit"],
+	    "resources": ["vGMuxInfra"],
         "capacityProperty": {
-            "cpu": {"value": 2, "operator": ">"},
-            "memory": {"value": 4, "operator": ">", "unit": "Gb"}
+            "controller": "multicloud",
+            "request": "{\"vCPU\": 10, \"Memory\": {\"quantity\": {\"get_param\": \"REQUIRED_MEM\"}, \"unit\": \"GB\"}, \"Storage\": {\"quantity\": {\"get_param\": \"REQUIRED_DISK\", \"unit\": \"GB\"}}}"
         },
-        "policyType": "capacityPolicy"
+        "policyType": "vim_fit",
+        "applicableResources": "any"
     }
 }
diff --git a/test/policy-local-files/Capacity_vG_1.json b/test/policy-local-files/Capacity_vG_1.json
index d5644a8..851ea49 100644
--- a/test/policy-local-files/Capacity_vG_1.json
+++ b/test/policy-local-files/Capacity_vG_1.json
@@ -1,7 +1,7 @@
 {
     "service": "capacityPolicy",
-    "policyName": "oofBeijing.capacityPolicy_vGMuxInfra",
-    "description": "Capacity policy for vGMuxInfra",
+    "policyName": "oofBeijing.capacityPolicy_vG",
+    "description": "Capacity policy for vG",
     "templateVersion": "1702.03",
     "version": "oofBeijing",
     "priority": "5",
@@ -9,13 +9,14 @@
     "riskLevel": "2",
     "guard": "False",
     "content": {
-        "identity": "capacity_vGMuxInfra",
-        "policyScope": ["VCPE", "US", "INTERNATIONAL", "ip", "vG"],
-	"resources": ["vG"],
+        "identity": "capacity_vG",
+        "policyScope": ["VCPE", "US", "INTERNATIONAL", "ip", "vG", "vim_fit"],
+	    "resources": ["vG"],
         "capacityProperty": {
-            "cpu": {"value": 2, "operator": ">"},
-            "memory": {"value": 4, "operator": ">", "unit": "Gb"}
+            "controller": "multicloud",
+            "request": "{\"vCPU\": 10, \"Memory\": {\"quantity\": {\"get_param\": \"REQUIRED_MEM\"}, \"unit\": \"GB\"}, \"Storage\": {\"quantity\": {\"get_param\": \"REQUIRED_DISK\", \"unit\": \"GB\"}}}"
         },
-        "policyType": "capacityPolicy"
+        "policyType": "vim_fit",
+        "applicableResources": "any"
     }
 }
diff --git a/test/policy-local-files/Distance_vGMuxInfra_1.json b/test/policy-local-files/Distance_vGMuxInfra_1.json
index a835ef1..992e9ec 100644
--- a/test/policy-local-files/Distance_vGMuxInfra_1.json
+++ b/test/policy-local-files/Distance_vGMuxInfra_1.json
@@ -15,7 +15,8 @@
     },
     "identity": "distance-vGMuxInfra",
     "resources": ["vGMuxInfra"],
-    "policyScope": ["vCPE", "US", "INTERNATIONAL", "ip", "vGMuxInfra"],
-    "policyType": "distancePolicy"
+    "policyScope": ["vCPE", "US", "INTERNATIONAL", "ip", "vGMuxInfra", "distancePolicy"],
+    "policyType": "distance_to_location",
+    "applicableResources": "any"
   }
 }
diff --git a/test/policy-local-files/Distance_vG_1.json b/test/policy-local-files/Distance_vG_1.json
index 1af021a..07baabd 100644
--- a/test/policy-local-files/Distance_vG_1.json
+++ b/test/policy-local-files/Distance_vG_1.json
@@ -15,7 +15,8 @@
     },
     "identity": "distance-vG",
     "resources": ["vG"],
-    "policyScope": ["vCPE", "US", "INTERNATIONAL", "ip", "vG"],
-    "policyType": "distancePolicy"
+    "policyScope": ["vCPE", "US", "INTERNATIONAL", "ip", "vG", "distancePolicy"],
+    "policyType": "distance_to_location",
+    "applicableResources": "any"
   }
 }
diff --git a/test/policy-local-files/Min_Guarantee_vGMuxInfra_1.json b/test/policy-local-files/Min_Guarantee_vGMuxInfra_1.json
deleted file mode 100644
index 654c548..0000000
--- a/test/policy-local-files/Min_Guarantee_vGMuxInfra_1.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-    "service": "minGuaranteePolicy",
-    "policyName": "oofBeijing.minGuaranee_vGMuxInfra",
-    "description": "Min guarantee policy for vGMuxInfra",
-    "templateVersion": "1702.03",
-    "version": "oofBeijing",
-    "priority": "5",
-    "riskType": "test",
-    "riskLevel": "2",
-    "guard": "False",
-    "content": {
-        "identity": "minGuarantee_vGMuxInfra",
-        "policyScope": ["vCPE", "US", "INTERNATIONAL", "ip", "vGMuxInfra"],
-        "minGuaranteeProperty": {
-            "cpu": {"value": "true", "operator": "="},
-            "memory": {"value": "false", "operator": "="}
-        },
-        "policyType": "minGuaraneePolicy",
-        "resourceInstanceType": ["vGMuxInfra"]
-    }
-}
diff --git a/test/policy-local-files/Placement_Optimization_1.json b/test/policy-local-files/Placement_Optimization_1.json
index 5748c99..6d09b82 100644
--- a/test/policy-local-files/Placement_Optimization_1.json
+++ b/test/policy-local-files/Placement_Optimization_1.json
@@ -12,14 +12,14 @@
         "objectiveParameter": {
             "parameterAttributes": [
                 {
-                    "resource": ["vGMuxInfra"],
+                    "resources": ["vGMuxInfra"],
                     "customerLocationInfo": "customer_loc",
                     "parameter": "distance",
                     "weight": "1",
                     "operator": "product"
                 },
                 {
-                    "resource": ["vG"],
+                    "resources": ["vG"],
                     "customerLocationInfo": "customer_loc",
                     "parameter": "distance",
                     "weight": "1",
@@ -29,7 +29,7 @@
             "operator": "sum"
         },
         "identity": "optimization",
-        "policyScope": ["vCPE", "US", "INTERNATIONAL", "ip", "vGMuxInfra", "vG"],
+        "policyScope": ["vCPE", "US", "INTERNATIONAL", "ip", "vGMuxInfra", "vG", "placementOptimization"],
         "policyType": "placementOptimization",
         "objective": "minimize"
     }
diff --git a/test/policy-local-files/QueryPolicy_vCPE.json b/test/policy-local-files/QueryPolicy_vCPE.json
index 4ed83f9..03c457e 100644
--- a/test/policy-local-files/QueryPolicy_vCPE.json
+++ b/test/policy-local-files/QueryPolicy_vCPE.json
@@ -10,11 +10,14 @@
   "guard": "False",
   "content": {
     "queryProperties": [
-      {"attribute":"locationId", "value": "orderInfo.customerLocation"},
-      {"attribute":"id", "value": "orderInfo.vpnInfo"},
-      {"attribute":"upstreamBW", "value": "orderInfo.vpnInfo"}
+      {"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"],
-    "type": "optimizationQueryPolicy"
+    "serviceName": "vCPE",
+    "policyScope": ["vCPE", "US", "INTERNATIONAL", "ip", "vGMuxInfra", "vG", "optimizationQueryPolicy"],
+    "policyType": "optimizationQueryPolicy"
   }
 }
diff --git a/test/policy-local-files/has_policies_r2/Affinity_vCPE_1.json b/test/policy-local-files/has_policies_r2/Affinity_vCPE_1.json
deleted file mode 100644
index 9a9de6b..0000000
--- a/test/policy-local-files/has_policies_r2/Affinity_vCPE_1.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-    "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",
-                "value": "orderInfo.customerLocation"
-            },
-            {
-                "attribute": "id",
-                "value": "orderInfo.vpnInfo"
-            },
-            {
-                "attribute": "upstreamBW",
-                "value": "orderInfo.vpnInfo"
-            }
-        ],
-        "policyScope": [
-            "vCPE",
-            "US",
-            "INTERNATIONAL",
-            "ip",
-            "vGMuxInfra",
-            "vG",
-            "optimizationQueryPolicy"
-        ],
-        "policyType": "optimizationQueryPolicy"
-    }
-}
diff --git a/test/policy-local-files/has_policies_r2/Capacity_vGMuxInfra.json b/test/policy-local-files/has_policies_r2/Capacity_vGMuxInfra.json
deleted file mode 100644
index 06896c3..0000000
--- a/test/policy-local-files/has_policies_r2/Capacity_vGMuxInfra.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "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"
-    }
-}
diff --git a/test/policy-local-files/has_policies_r2/Capacity_vG_1.json b/test/policy-local-files/has_policies_r2/Capacity_vG_1.json
deleted file mode 100644
index 851ea49..0000000
--- a/test/policy-local-files/has_policies_r2/Capacity_vG_1.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "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"
-    }
-}
diff --git a/test/policy-local-files/has_policies_r2/Distance_vGMuxInfra_1.json b/test/policy-local-files/has_policies_r2/Distance_vGMuxInfra_1.json
deleted file mode 100644
index ee7d89e..0000000
--- a/test/policy-local-files/has_policies_r2/Distance_vGMuxInfra_1.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "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", "distancePolicy"],
-    "policyType": "distancePolicy",
-    "applicableResources": "any"
-  }
-}
diff --git a/test/policy-local-files/has_policies_r2/Distance_vG_1.json b/test/policy-local-files/has_policies_r2/Distance_vG_1.json
deleted file mode 100644
index 953dcc3..0000000
--- a/test/policy-local-files/has_policies_r2/Distance_vG_1.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "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", "distancePolicy"],
-    "policyType": "distancePolicy",
-    "applicableResources": "any"
-  }
-}
diff --git a/test/policy-local-files/has_policies_r2/Min_Guarantee_vGMuxInfra_1.json b/test/policy-local-files/has_policies_r2/Min_Guarantee_vGMuxInfra_1.json
deleted file mode 100644
index b8f958d..0000000
--- a/test/policy-local-files/has_policies_r2/Min_Guarantee_vGMuxInfra_1.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-    "service": "minGuaranteePolicy",
-    "policyName": "oofBeijing.minGuaranee_vGMuxInfra",
-    "description": "Min guarantee policy for vGMuxInfra",
-    "templateVersion": "1702.03",
-    "version": "oofBeijing",
-    "priority": "5",
-    "riskType": "test",
-    "riskLevel": "2",
-    "guard": "False",
-    "content": {
-        "identity": "minGuarantee_vGMuxInfra",
-        "policyScope": ["vCPE", "US", "INTERNATIONAL", "ip", "vGMuxInfra", "minGuaranteePolicy"],
-        "minGuaranteeProperty": {
-            "cpu": "true",
-            "memory": "false",
-        },
-        "policyType": "minGuaranteePolicy",
-        "resources": ["vGMuxInfra"],
-		"applicableResources": "any"
-    }
-}
\ No newline at end of file
diff --git a/test/policy-local-files/has_policies_r2/Placement_Optimization_1.json b/test/policy-local-files/has_policies_r2/Placement_Optimization_1.json
deleted file mode 100644
index f8b0a6f..0000000
--- a/test/policy-local-files/has_policies_r2/Placement_Optimization_1.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-    "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", "placementOptimization"],
-        "policyType": "placementOptimization",
-        "objective": "minimize"
-    }
-}
diff --git a/test/policy-local-files/has_policies_r2/QueryPolicy_vCPE.json b/test/policy-local-files/has_policies_r2/QueryPolicy_vCPE.json
deleted file mode 100644
index 508d7d6..0000000
--- a/test/policy-local-files/has_policies_r2/QueryPolicy_vCPE.json
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "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"
-  }
-}
diff --git a/test/policy-local-files/has_policies_r2/hpa_policy_vGMuxInfra_1.json b/test/policy-local-files/has_policies_r2/hpa_policy_vGMuxInfra_1.json
deleted file mode 100644
index 7b68578..0000000
--- a/test/policy-local-files/has_policies_r2/hpa_policy_vGMuxInfra_1.json
+++ /dev/null
@@ -1,144 +0,0 @@
-{
-    "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", "US", "INTERNATIONAL", "ip", "vGMuxInfra", "hpaPolicy"],
-      "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": ""}
-              ]
-            }
-          ]
-        }
-      ]
-    }
-}
diff --git a/test/policy-local-files/has_policies_r2/hpa_policy_vG_1.json b/test/policy-local-files/has_policies_r2/hpa_policy_vG_1.json
deleted file mode 100644
index 95f9247..0000000
--- a/test/policy-local-files/has_policies_r2/hpa_policy_vG_1.json
+++ /dev/null
@@ -1,144 +0,0 @@
-{
-    "service": "hpaPolicy",
-    "policyName": "oofBeijing.hpaPolicy_vG",
-    "description": "HPA policy for vG",
-    "templateVersion": "0.0.1",
-    "version": "1.0",
-    "priority": "3",
-    "riskType": "test",
-    "riskLevel": "2",
-    "guard": "False",
-    "content": {
-      "resources": "vG",
-      "identity": "hpaPolicy_vG",
-      "policyScope": ["vCPE", "US", "INTERNATIONAL", "ip", "vG", "hpaPolicy"],
-      "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": ""}
-              ]
-            }
-          ]
-        }
-      ]
-    }
-}
diff --git a/test/policy-local-files/has_policies_r2/vnfPolicy_vG.json b/test/policy-local-files/has_policies_r2/vnfPolicy_vG.json
deleted file mode 100644
index a5694a3..0000000
--- a/test/policy-local-files/has_policies_r2/vnfPolicy_vG.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "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", "vnf_policy"],
-        "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"
-            }
-        ]
-    }
-}
diff --git a/test/policy-local-files/has_policies_r2/vnfPolicy_vGMuxInfra.json b/test/policy-local-files/has_policies_r2/vnfPolicy_vGMuxInfra.json
deleted file mode 100644
index 682fb62..0000000
--- a/test/policy-local-files/has_policies_r2/vnfPolicy_vGMuxInfra.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-    "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", "vnf_policy"],
-        "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"
-            }
-        ]
-    }
-}
diff --git a/test/policy-local-files/hpa_policy_vGMuxInfra_1.json b/test/policy-local-files/hpa_policy_vGMuxInfra_1.json
index bf09532..7b68578 100644
--- a/test/policy-local-files/hpa_policy_vGMuxInfra_1.json
+++ b/test/policy-local-files/hpa_policy_vGMuxInfra_1.json
@@ -11,49 +11,49 @@
     "content": {
       "resources": "vGMuxInfra",
       "identity": "hpaPolicy_vGMuxInfra",
-      "policyScope": ["vCPE", "US", "INTERNATIONAL", "ip", "vGMuxInfra"],
+      "policyScope": ["vCPE", "US", "INTERNATIONAL", "ip", "vGMuxInfra", "hpaPolicy"],
       "policyType": "hpaPolicy",
       "flavorFeatures": [
         {
           "flavorLabel": "flavor_label_vm_01",
           "flavorProperties":[
             {
-              "hpa_feature" : "cpuTopology",
+              "hpa-feature" : "cpuTopology",
               "mandatory" : "True",
               "architecture": "generic",
-              "featureAttributes": [
-                {"attribute":"numCpuSockets", "values": "2","operator": ">=", "unit": ""},
-                {"attribute":"numCpuSockets", "values": "4","operator": "<=", "unit": ""},
-                {"attribute":"numCpuCores", "value": "2", "operator":">=", "unit": ""},
-                {"attribute":"numCpuCores", "value": "4", "operator":"<=", "unit": ""},
-                {"attribute":"numCpuThreads", "value": "4", "operator":">=", "unit": ""},
-                {"attribute":"numCpuThreads", "value": "8", "operator":"<=", "unit": ""}
+              "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",
+              "hpa-feature" : "basicCapabilities",
               "mandatory" : "True",
               "architecture": "generic",
-              "featureAttributes": [
-                {"attribute": "numVirtualCpu", "value": "6", "operator": "=", "unit": ""},
-                {"attribute": "virtualMemSize", "value":"6", "operator": "=", "unit": "GB"}
+              "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",
+              "hpa-feature" : "ovsDpdk",
               "mandatory" : "False",
               "score" : "3",
               "architecture": "generic",
-              "featureAttributes": [
-                 {"attribute":"dataProcessingAccelerationLibrary", "value":"ovsDpdk_version", "operator": "=", "unit":""}
+              "hpa-feature-attributes": [
+                 {"hpa-attribute-key":"dataProcessingAccelerationLibrary", "hpa-attribute-value":"ovsDpdk_version", "operator": "=", "unit":""}
               ]
             },
             {
-              "hpa_feature" : "cpuInstructionSetExtensions",
+              "hpa-feature" : "cpuInstructionSetExtensions",
               "mandatory" : "True",
               "architecture": "INTEL-64",
-              "featureAttributes": [
-                {"attribute":"instructionSetExtensions", "value":["<CPUINST>", "<CPUINST>"], "operator": "ALL", "unit":""}
+              "hpa-feature-attributes": [
+                {"hpa-attribute-key":"instructionSetExtensions", "hpa-attribute-value":["<CPUINST>", "<CPUINST>"], "operator": "ALL", "unit":""}
               ]
             }
           ]
@@ -62,43 +62,43 @@
           "flavorLabel": "flavor_label_vm_02",
           "flavorProperties":[
             {
-              "hpa_feature" : "cpuPinningy",
+              "hpa-feature" : "cpuPinningy",
               "mandatory" : "True",
               "architecture": "generic",
-              "featureAttributes": [
-                {"attribute":"logicalCpuThreadPinningPolicy", "value":"<CPUTHREADPOLICY>", "operator": "=", "unit":""},
-                {"attribute":"logicalCpuPinningPolicy", "value": "<CPUPOLICY>","operator": "=", "unit":""}
+              "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",
+              "hpa-feature" : "basicCapabilities",
               "mandatory" : "True",
               "architecture": "generic",
-              "featureAttributes": [
-                {"attribute": "numVirtualCpu", "value": "6", "operator": "=", "unit": ""},
-                {"attribute": "virtualMemSize", "value":"6", "operator": "=", "unit": "GB"}
+              "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",
+              "hpa-feature" : "localStorage",
               "mandatory" : "False",
               "score" : "5",
               "architecture": "generic",
-              "featureAttributes": [
-                {"attribute": "diskSize", "value": "2", "operator": "=", "unit": "GB"},  
-                {"attribute": "ephemeralDiskSize", "value": "2", "operator": "=", "unit": "GB"},
-                {"attribute": "swapMemSize", "value":"16", "operator": "=", "unit": "MB"}
+              "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",
+              "hpa-feature" : "pcie",
               "mandatory" : "True",
               "architecture": "generic",
-              "featureAttributes": [
-                {"attribute": "pciCount", "value": "2", "operator": "=", "unit": ""},
-                {"attribute": "pciVendorId", "value":"8086", "operator": "=", "unit": ""},
-                {"attribute": "pciDeviceId", "value": "2", "operator": "=", "unit": ""},
-                {"attribute": "functionType", "value": "<PCITYPEVALUE>","operator": "=", "unit": ""}
+              "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": ""}
               ]
             }
           ]
@@ -107,34 +107,34 @@
           "flavorLabel": "flavor_label_vm_03",
           "flavorProperties":[
             {
-              "hpa_feature" : "numa",
+              "hpa-feature" : "numa",
               "mandatory" : "False",
               "score" : "5",
               "architecture": "generic",
-              "featureAttributes": [
-                {"attribute": "numaNodes", "value": "2", "operator": "=", "unit": ""},
-                {"attribute": "numaCpu-0", "values":"2", "operator": "=", "unit": ""},
-                {"attribute": "numaMem-0", "value": "2048", "operator": "=", "unit": "MB"},
-                {"attribute": "numaCpu-1", "values":"4", "operator": "=", "unit": ""},
-                {"attribute": "numaMem-1", "value": "4096", "operator": "=", "unit": "MB"}
+              "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",
+              "hpa-feature" : "basicCapabilities",
               "mandatory" : "True",
               "architecture": "generic",
-              "featureAttributes": [
-                {"attribute": "numVirtualCpu", "value": "6", "operator": "=", "unit": ""},
-                {"attribute": "virtualMemSize", "value":"6", "operator": "=", "unit": "GB"}
+              "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",
+              "hpa-feature" : "hugePages",
               "mandatory" : "False",
               "score" : "7",
               "architecture": "generic",
-              "featureAttributes": [
-                 {"attribute": "memoryPageSize", "value": "<MEMORYPAGESIZE>", "operator": "=", "unit": ""}
+              "hpa-feature-attributes": [
+                 {"hpa-attribute-key": "memoryPageSize", "hpa-attribute-value": "<MEMORYPAGESIZE>", "operator": "=", "unit": ""}
               ]
             }
           ]
diff --git a/test/policy-local-files/hpa_policy_vG_1.json b/test/policy-local-files/hpa_policy_vG_1.json
index 98d8cea..95f9247 100644
--- a/test/policy-local-files/hpa_policy_vG_1.json
+++ b/test/policy-local-files/hpa_policy_vG_1.json
@@ -11,49 +11,49 @@
     "content": {
       "resources": "vG",
       "identity": "hpaPolicy_vG",
-      "policyScope": ["vCPE", "US", "INTERNATIONAL", "ip", "vG"],
+      "policyScope": ["vCPE", "US", "INTERNATIONAL", "ip", "vG", "hpaPolicy"],
       "policyType": "hpaPolicy",
       "flavorFeatures": [
         {
           "flavorLabel": "flavor_label_vm_01",
           "flavorProperties":[
             {
-              "hpa_feature" : "cpuTopology",
+              "hpa-feature" : "cpuTopology",
               "mandatory" : "True",
               "architecture": "generic",
-              "featureAttributes": [
-                {"attribute":"numCpuSockets", "values": "2","operator": ">=", "unit": ""},
-                {"attribute":"numCpuSockets", "values": "4","operator": "<=", "unit": ""},
-                {"attribute":"numCpuCores", "value": "2", "operator":">=", "unit": ""},
-                {"attribute":"numCpuCores", "value": "4", "operator":"<=", "unit": ""},
-                {"attribute":"numCpuThreads", "value": "4", "operator":">=", "unit": ""},
-                {"attribute":"numCpuThreads", "value": "8", "operator":"<=", "unit": ""}
+              "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",
+              "hpa-feature" : "basicCapabilities",
               "mandatory" : "True",
               "architecture": "generic",
-              "featureAttributes": [
-                {"attribute": "numVirtualCpu", "value": "6", "operator": "=", "unit": ""},
-                {"attribute": "virtualMemSize", "value":"6", "operator": "=", "unit": "GB"}
+              "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",
+              "hpa-feature" : "ovsDpdk",
               "mandatory" : "False",
               "score" : "3",
               "architecture": "generic",
-              "featureAttributes": [
-                 {"attribute":"dataProcessingAccelerationLibrary", "value":"ovsDpdk_version", "operator": "=", "unit":""}
+              "hpa-feature-attributes": [
+                 {"hpa-attribute-key":"dataProcessingAccelerationLibrary", "hpa-attribute-value":"ovsDpdk_version", "operator": "=", "unit":""}
               ]
             },
             {
-              "hpa_feature" : "cpuInstructionSetExtensions",
+              "hpa-feature" : "cpuInstructionSetExtensions",
               "mandatory" : "True",
               "architecture": "INTEL-64",
-              "featureAttributes": [
-                {"attribute":"instructionSetExtensions", "value":["<CPUINST>", "<CPUINST>"], "operator": "ALL", "unit":""}
+              "hpa-feature-attributes": [
+                {"hpa-attribute-key":"instructionSetExtensions", "hpa-attribute-value":["<CPUINST>", "<CPUINST>"], "operator": "ALL", "unit":""}
               ]
             }
           ]
@@ -62,43 +62,43 @@
           "flavorLabel": "flavor_label_vm_02",
           "flavorProperties":[
             {
-              "hpa_feature" : "cpuPinningy",
+              "hpa-feature" : "cpuPinningy",
               "mandatory" : "True",
               "architecture": "generic",
-              "featureAttributes": [
-                {"attribute":"logicalCpuThreadPinningPolicy", "value":"<CPUTHREADPOLICY>", "operator": "=", "unit":""},
-                {"attribute":"logicalCpuPinningPolicy", "value": "<CPUPOLICY>","operator": "=", "unit":""}
+              "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",
+              "hpa-feature" : "basicCapabilities",
               "mandatory" : "True",
               "architecture": "generic",
-              "featureAttributes": [
-                {"attribute": "numVirtualCpu", "value": "6", "operator": "=", "unit": ""},
-                {"attribute": "virtualMemSize", "value":"6", "operator": "=", "unit": "GB"}
+              "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",
+              "hpa-feature" : "localStorage",
               "mandatory" : "False",
               "score" : "5",
               "architecture": "generic",
-              "featureAttributes": [
-                {"attribute": "diskSize", "value": "2", "operator": "=", "unit": "GB"},  
-                {"attribute": "ephemeralDiskSize", "value": "2", "operator": "=", "unit": "GB"},
-                {"attribute": "swapMemSize", "value":"16", "operator": "=", "unit": "MB"}
+              "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",
+              "hpa-feature" : "pcie",
               "mandatory" : "True",
               "architecture": "generic",
-              "featureAttributes": [
-                {"attribute": "pciCount", "value": "2", "operator": "=", "unit": ""},
-                {"attribute": "pciVendorId", "value":"8086", "operator": "=", "unit": ""},
-                {"attribute": "pciDeviceId", "value": "2", "operator": "=", "unit": ""},
-                {"attribute": "functionType", "value": "<PCITYPEVALUE>","operator": "=", "unit": ""}
+              "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": ""}
               ]
             }
           ]
@@ -107,34 +107,34 @@
           "flavorLabel": "flavor_label_vm_03",
           "flavorProperties":[
             {
-              "hpa_feature" : "numa",
+              "hpa-feature" : "numa",
               "mandatory" : "False",
               "score" : "5",
               "architecture": "generic",
-              "featureAttributes": [
-                {"attribute": "numaNodes", "value": "2", "operator": "=", "unit": ""},
-                {"attribute": "numaCpu-0", "values":"2", "operator": "=", "unit": ""},
-                {"attribute": "numaMem-0", "value": "2048", "operator": "=", "unit": "MB"},
-                {"attribute": "numaCpu-1", "values":"4", "operator": "=", "unit": ""},
-                {"attribute": "numaMem-1", "value": "4096", "operator": "=", "unit": "MB"}
+              "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",
+              "hpa-feature" : "basicCapabilities",
               "mandatory" : "True",
               "architecture": "generic",
-              "featureAttributes": [
-                {"attribute": "numVirtualCpu", "value": "6", "operator": "=", "unit": ""},
-                {"attribute": "virtualMemSize", "value":"6", "operator": "=", "unit": "GB"}
+              "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",
+              "hpa-feature" : "hugePages",
               "mandatory" : "False",
               "score" : "7",
               "architecture": "generic",
-              "featureAttributes": [
-                 {"attribute": "memoryPageSize", "value": "<MEMORYPAGESIZE>", "operator": "=", "unit": ""}
+              "hpa-feature-attributes": [
+                 {"hpa-attribute-key": "memoryPageSize", "hpa-attribute-value": "<MEMORYPAGESIZE>", "operator": "=", "unit": ""}
               ]
             }
           ]
diff --git a/test/policy-local-files/meta-valid-policies.txt b/test/policy-local-files/meta-valid-policies.txt
index a0ce3fe..7fc72ea 100644
--- a/test/policy-local-files/meta-valid-policies.txt
+++ b/test/policy-local-files/meta-valid-policies.txt
@@ -3,7 +3,6 @@ Capacity_vGMuxInfra.json
 Capacity_vG_1.json
 Distance_vGMuxInfra_1.json
 Distance_vG_1.json
-Min_Guarantee_vGMuxInfra_1.json
 Placement_Optimization_1.json
 QueryPolicy_vCPE.json
 hpa_policy_vGMuxInfra_1.json
diff --git a/test/policy-local-files/has_policies_r2/subscriber_policy.json b/test/policy-local-files/subscriber_policy.json
index f237f79..f1b818c 100644
--- a/test/policy-local-files/has_policies_r2/subscriber_policy.json
+++ b/test/policy-local-files/subscriber_policy.json
@@ -16,6 +16,7 @@
                 "subscriberRole": ["PVT Homing"],
                 "provStatus": ["CAPPED"]
         },
-        "policyType": "subscriberPolicy"
+        "policyType": "subscriberPolicy",
+        "serviceName": "vCPE"
     }
 }
\ No newline at end of file
diff --git a/test/policy-local-files/vnfPolicy_vG.json b/test/policy-local-files/vnfPolicy_vG.json
index ead038c..c77cdc7 100644
--- a/test/policy-local-files/vnfPolicy_vG.json
+++ b/test/policy-local-files/vnfPolicy_vG.json
@@ -10,10 +10,11 @@
     "guard": "False",
     "content": {
         "identity": "vnf_vG",
-        "policyScope": ["vCPE", "INTERNATIONAL", "ip", "vG"],
-        "policyType": "vnf_policy",
+        "policyScope": ["vCPE", "INTERNATIONAL", "ip", "vG", "vnf_policy"],
+        "policyType": "vnfPolicy",
         "resources": ["vG"],
-	"vnfProperties": [
+        "applicableResources": "any",
+	    "vnfProperties": [
             {
                 "inventoryProvider": "aai",
                 "serviceType": "",
diff --git a/test/policy-local-files/vnfPolicy_vGMuxInfra.json b/test/policy-local-files/vnfPolicy_vGMuxInfra.json
index 787563b..3971519 100644
--- a/test/policy-local-files/vnfPolicy_vGMuxInfra.json
+++ b/test/policy-local-files/vnfPolicy_vGMuxInfra.json
@@ -10,9 +10,10 @@
     "guard": "False",
     "content": {
         "identity": "vnf_vGMuxInfra",
-        "policyScope": ["vCPE", "INTERNATIONAL", "ip", "vGMuxInfra"],
-        "policyType": "vnf_policy",
+        "policyScope": ["vCPE", "INTERNATIONAL", "ip", "vGMuxInfra", "vnf_policy"],
+        "policyType": "vnfPolicy",
         "resources": ["vGMuxInfra"],
+        "applicableResources": "any",
 	"vnfProperties": [
             {
                 "inventoryProvider": "aai",