Improvements to the OSDF changes for new PEF APIs

Improvements to the OSDF changes for new PEF APIs

Issue-ID: OPTFRA-723
Change-Id: Ie425bb302361489f4b5a47fbc7225fdc8060e9c3
Signed-off-by: Chayal, Avteet (ac229e) <ac229e@att.com>

19 files changed, 0 insertions, 1144 deletions

diff --git a/test/policy-local-files/new_policies/Affinity_vCPE_1.json b/test/policy-local-files/new_policies/Affinity_vCPE_1.json
deleted file mode 100644
index 4f111eb..0000000
--- a/test/policy-local-files/new_policies/Affinity_vCPE_1.json
+++ /dev/null
@@ -1,33 +0,0 @@
-{
-  "OSDF_FRANKFURT.Affinity_vCPE_1": {
-    "type": "onap.policies.optimization.AffinityPolicy",
-    "version": "1.0.0",
-    "type_version": "1.0.0",
-    "metadata": {
-      "policy-id": "OSDF_FRANKFURT.Affinity_vCPE_1",
-      "policy-version": 1
-    },
-    "properties": {
-      "scope": [
-        "OSDF_FRANKFURT"
-      ],
-      "services": [
-        "vCPE"
-      ],
-      "resources": [
-        "vG",
-        "vGMuxInfra"
-      ],
-      "geography": [
-        "US",
-        "INTERNATIONAL"
-      ],
-      "identity": "affinity_vCPE",
-      "applicableResources": "any",
-      "affinityProperties": {
-        "qualifier": "same",
-        "category": "complex"
-      }
-    }
-  }
-}
diff --git a/test/policy-local-files/new_policies/Affinity_vFW_TD.json b/test/policy-local-files/new_policies/Affinity_vFW_TD.json
deleted file mode 100644
index 53bb31b..0000000
--- a/test/policy-local-files/new_policies/Affinity_vFW_TD.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-  "OSDF_FRANKFURT.Affinity_vFW_TD": {
-    "type": "onap.policies.optimization.AffinityPolicy",
-    "version": "1.0.0",
-    "type_version": "1.0.0",
-    "metadata": {
-      "policy-id": "OSDF_FRANKFURT.Affinity_vFW_TD",
-      "policy-version": 1
-    },
-    "properties": {
-      "scope": [
-        "OSDF_FRANKFURT",
-        "TD"
-      ],
-      "resources": [
-        "vFW-SINK",
-        "vPGN"
-      ],
-      "geography": [
-        "US",
-        "INTERNATIONAL"
-      ],
-      "identity": "affinity_vFW_TD",
-      "applicableResources": "any",
-      "affinityProperties": {
-        "qualifier": "same",
-        "category": "region"
-      }
-    }
-  }
-}
diff --git a/test/policy-local-files/new_policies/Attribute_vNS_1.json b/test/policy-local-files/new_policies/Attribute_vNS_1.json
deleted file mode 100644
index 35b3c74..0000000
--- a/test/policy-local-files/new_policies/Attribute_vNS_1.json
+++ /dev/null
@@ -1,51 +0,0 @@
-{
-  "OSDF_FRANKFURT.Attribute_vNS_1": {
-    "type": "onap.policies.optimization.AttributePolicy",
-    "version": "1.0.0",
-    "type_version": "1.0.0",
-    "metadata": {
-      "policy-id": "OSDF_FRANKFURT.Attribute_vNS_1",
-      "policy-version": 1
-    },
-    "properties": {
-      "scope": [
-        "OSDF_FRANKFURT"
-      ],
-      "services": [
-        "vNS"
-      ],
-      "resources": [
-        "vNS"
-      ],
-      "geography": [
-        "US",
-        "INTERNATIONAL"
-      ],
-      "identity": "attribute-vNS",
-      "attributeProperties": {
-        "cloudRegion": {
-          "serviceRequests": [
-            "",
-            ""
-          ],
-          "cloudRequests": [
-            "",
-            ""
-          ]
-        },
-        "networkRoles": {
-          "all": [
-            "",
-            ""
-          ]
-        },
-        "complex": {
-          "any": [
-            "",
-            ""
-          ]
-        }
-      }
-    }
-  }
-}
\ No newline at end of file
diff --git a/test/policy-local-files/new_policies/Capacity_vGMuxInfra.json b/test/policy-local-files/new_policies/Capacity_vGMuxInfra.json
deleted file mode 100644
index 1d6d26d..0000000
--- a/test/policy-local-files/new_policies/Capacity_vGMuxInfra.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "OSDF_FRANKFURT.Capacity_vGMuxInfra": {
-    "type": "onap.policies.optimization.Vim_fit",
-    "version": "1.0.0",
-    "type_version": "1.0.0",
-    "metadata": {
-      "policy-id": "OSDF_FRANKFURT.Capacity_vGMuxInfra",
-      "policy-version": 1
-    },
-    "properties": {
-      "scope": [
-        "OSDF_FRANKFURT"
-      ],
-      "services": [
-        "vCPE"
-      ],
-      "resources": [
-        "vGMuxInfra"
-      ],
-      "geography": [
-        "US",
-        "INTERNATIONAL"
-      ],
-      "identity": "capacity_vGMuxInfra",
-      "applicableResources": "any",
-      "capacityProperty": {
-        "controller": "multicloud",
-        "request": "{\"vCPU\": 10, \"Memory\": {\"quantity\": {\"get_param\": \"REQUIRED_MEM\"}, \"unit\": \"GB\"}, \"Storage\": {\"quantity\": {\"get_param\": \"REQUIRED_DISK\"}, \"unit\": \"GB\"}}"
-      }
-    }
-  }
-}
diff --git a/test/policy-local-files/new_policies/Capacity_vG_1.json b/test/policy-local-files/new_policies/Capacity_vG_1.json
deleted file mode 100644
index f07e7bc..0000000
--- a/test/policy-local-files/new_policies/Capacity_vG_1.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "OSDF_FRANKFURT.Capacity_vG_1": {
-    "type": "onap.policies.optimization.Vim_fit",
-    "version": "1.0.0",
-    "type_version": "1.0.0",
-    "metadata": {
-      "policy-id": "OSDF_FRANKFURT.Capacity_vG_1",
-      "policy-version": 1
-    },
-    "properties": {
-      "scope": [
-        "OSDF_FRANKFURT"
-      ],
-      "services": [
-        "vCPE"
-      ],
-      "resources": [
-        "vG"
-      ],
-      "geography": [
-        "US",
-        "INTERNATIONAL"
-      ],
-      "identity": "capacity_vG",
-      "applicableResources": "any",
-      "capacityProperty": {
-        "controller": "multicloud",
-        "request": "{\"vCPU\": 10, \"Memory\": {\"quantity\": {\"get_param\": \"REQUIRED_MEM\"}, \"unit\": \"GB\"}, \"Storage\": {\"quantity\": {\"get_param\": \"REQUIRED_DISK\"}, \"unit\": \"GB\"}}"
-      }
-    }
-  }
-}
diff --git a/test/policy-local-files/new_policies/Distance_vGMuxInfra_1.json b/test/policy-local-files/new_policies/Distance_vGMuxInfra_1.json
deleted file mode 100644
index 7de102e..0000000
--- a/test/policy-local-files/new_policies/Distance_vGMuxInfra_1.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "OSDF_FRANKFURT.Distance_vGMuxInfra": {
-    "type": "onap.policies.optimization.DistancePolicy",
-    "version": "1.0.0",
-    "type_version": "1.0.0",
-    "metadata": {
-      "policy-id": "OSDF_FRANKFURT.Distance_vGMuxInfra",
-      "policy-version": 1
-    },
-    "properties": {
-      "scope": [ 
-        "OSDF_FRANKFURT"
-      ],
-      "services": [
-        "vCPE"
-      ],
-      "resources": [
-        "vGMuxInfra"
-      ],
-      "geography": [
-        "US",
-        "INTERNATIONAL"
-      ],
-      "identity": "distance-vGMuxInfra",
-      "applicableResources": "any",
-      "distanceProperties": {
-        "locationInfo": "customer_loc",
-        "distance": {
-          "value": "500",
-          "operator": "<",
-          "unit": "km"
-        }
-      }
-    }
-  }
-}
diff --git a/test/policy-local-files/new_policies/Distance_vG_1.json b/test/policy-local-files/new_policies/Distance_vG_1.json
deleted file mode 100644
index dcb45b2..0000000
--- a/test/policy-local-files/new_policies/Distance_vG_1.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-  "OSDF_FRANKFURT.Distance_vG_1": {
-    "type": "onap.policies.optimization.DistancePolicy",
-    "version": "1.0.0",
-    "type_version": "1.0.0",
-    "metadata": {
-      "policy-id": "OSDF_FRANKFURT.Distance_vG_1",
-      "policy-version": 1
-    },
-    "properties": {
-      "scope": [
-        "OSDF_FRANKFURT" 
-      ],
-      "services": [
-        "vCPE"
-      ],
-      "resources": [
-        "vG"
-      ],
-      "geography": [
-        "US",
-        "INTERNATIONAL"
-      ],
-      "identity": "distance-vG",
-      "applicableResources": "any",
-      "distanceProperties": {
-        "locationInfo": "customer_loc",
-        "distance": {
-          "value": "1500",
-          "operator": "<",
-          "unit": "km"
-        }
-      }
-    }
-  }
-}
diff --git a/test/policy-local-files/new_policies/Placement_Optimization_1.json b/test/policy-local-files/new_policies/Placement_Optimization_1.json
deleted file mode 100644
index b3efa64..0000000
--- a/test/policy-local-files/new_policies/Placement_Optimization_1.json
+++ /dev/null
@@ -1,67 +0,0 @@
-{
-  "OSDF_FRANKFURT.Placement_optimization_1": {
-    "type": "onap.policies.optimization.OptimizationPolicy",
-    "version": "1.0.0",
-    "type_version": "1.0.0",
-    "metadata": {
-      "policy-id": "OSDF_FRANKFURT.Placement_optimization_1",
-      "policy-version": 1
-    },
-    "properties": {
-      "scope": [
-        "OSDF_FRANKFURT"
-      ],
-      "services": [
-        "vCPE"
-      ],
-      "resources": [
-        "vG",
-        "vGMuxInfra"
-      ],
-      "geography": [
-        "US",
-        "INTERNATIONAL"
-      ],
-      "identity": "optimization",
-      "objective": "minimize",
-      "objectiveParameter": {
-            "parameterAttributes": [
-                {
-                    "resources": ["vGMuxInfra"],
-                    "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"
-        }
-    }
-  }
-}
diff --git a/test/policy-local-files/new_policies/QueryPolicy_vCPE.json b/test/policy-local-files/new_policies/QueryPolicy_vCPE.json
deleted file mode 100644
index 1a8d205..0000000
--- a/test/policy-local-files/new_policies/QueryPolicy_vCPE.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "OSDF_FRANKFURT.queryPolicy_vCPE": {
-    "type": "onap.policies.optimization.QueryPolicy",
-    "version": "1.0.0",
-    "type_version": "1.0.0",
-    "metadata": {
-      "policy-id": "OSDF_FRANKFURT.queryPolicy_vCPE",
-      "policy-version": 1
-    },
-    "properties": {
-      "scope": [
-        "OSDF_FRANKFURT"
-      ],
-      "services": [
-        "vCPE"
-      ],
-      "resources": [
-        "vGMuxInfra",
-        "vG"
-      ],
-      "geography": [
-        "US",
-        "INTERNATIONAL"
-      ],
-      "identity": "vCPE_Query_Policy",
-      "queryProperties": [
-        {
-          "attribute": "customerLatitude",
-          "attribute_location": "customerLatitude"
-        },
-        {
-          "attribute": "customerLongitude",
-          "attribute_location": "customerLongitude"
-        }
-      ]
-    }
-  }
-}
diff --git a/test/policy-local-files/new_policies/QueryPolicy_vCPE_2.json b/test/policy-local-files/new_policies/QueryPolicy_vCPE_2.json
deleted file mode 100644
index 7a4d227..0000000
--- a/test/policy-local-files/new_policies/QueryPolicy_vCPE_2.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
-  "OSDF_FRANKFURT.queryPolicy_vCPE": {
-    "type": "onap.policies.optimization.QueryPolicy",
-    "version": "1.0.0",
-    "type_version": "1.0.0",
-    "metadata": {
-      "policy-id": "OSDF_FRANKFURT.queryPolicy_vCPE",
-      "policy-version": 1
-    },
-    "properties": {
-      "scope": [
-        "OSDF_FRANKFURT"
-      ],
-      "services": [
-        "vCPE"
-      ],
-      "resources": [
-        "vGMuxInfra",
-        "vG"
-      ],
-      "geography": [
-        "US",
-        "INTERNATIONAL"
-      ],
-      "identity": "vCPE_Query_Policy",
-      "queryProperties": [
-        {
-          "attribute": "locationId",
-          "attribute_location": "customerLocation",
-          "value": ""
-        },
-        {
-          "attribute": "id",
-          "attribute_location": "vpnInfo.vpnId",
-          "value": ""
-        },
-        {
-          "attribute": "upstreamBW",
-          "attribute_location": "vpnInfo.upstreamBW",
-          "value": ""
-        },
-        {
-          "attribute": "customerLatitude",
-          "attribute_location": "customerLatitude",
-          "value": 1.1
-        },
-        {
-          "attribute": "customerLongitude",
-          "attribute_location": "customerLongitude",
-          "value": 2.2
-        }
-      ]
-    }
-  }
-}
diff --git a/test/policy-local-files/new_policies/QueryPolicy_vFW_TD.json b/test/policy-local-files/new_policies/QueryPolicy_vFW_TD.json
deleted file mode 100644
index 1a6eb21..0000000
--- a/test/policy-local-files/new_policies/QueryPolicy_vFW_TD.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "OSDF_FRANKFURT.queryPolicy_vFW_TD": {
-    "type": "onap.policies.optimization.QueryPolicy",
-    "version": "1.0.0",
-    "type_version": "1.0.0",
-    "metadata": {
-      "policy-id": "OSDF_FRANKFURT.queryPolicy_vFW_TD",
-      "policy-version": 1
-    },
-    "properties": {
-      "scope": [
-        "OSDF_FRANKFURT"
-      ],
-      "services": [
-        "vFW_TD"
-      ],
-      "resources": [
-        "vFW-SINK",
-        "vPGN"
-      ],
-      "geography": [
-        "US"
-      ],
-      "identity": "vFW_TD_Query_Policy",
-      "queryProperties": [
-        {
-          "attribute": "chosen_region",
-          "attribute_location": "chosenRegion"
-        },
-        {
-          "attribute": "chosen_customer_id",
-          "attribute_location": "chosenCustomerId"
-        },
-        {
-          "attribute": "customerLatitude",
-          "attribute_location": "customerLatitude",
-          "value": 1.1
-        },
-        {
-          "attribute": "customerLongitude",
-          "attribute_location": "customerLongitude",
-          "value": 2.2
-        }
-      ]
-    }
-  }
-}
diff --git a/test/policy-local-files/new_policies/hpa_policy_vGMuxInfra_1.json b/test/policy-local-files/new_policies/hpa_policy_vGMuxInfra_1.json
deleted file mode 100644
index c233c5f..0000000
--- a/test/policy-local-files/new_policies/hpa_policy_vGMuxInfra_1.json
+++ /dev/null
@@ -1,231 +0,0 @@
-{
-  "OSDF_FRANKFURT.hpa_policy_vGMuxInfra_1": {
-    "type": "onap.policies.optimization.HpaPolicy",
-    "version": "1.0.0",
-    "type_version": "1.0.0",
-    "metadata": {
-      "policy-id": "OSDF_FRANKFURT.hpa_policy_vGMuxInfra_1",
-      "policy-version": 1
-    },
-    "properties": {
-      "scope": [
-        "OSDF_FRANKFURT" 
-      ],
-      "services": [
-        "vCPE"
-      ],
-      "resources": [
-        "vGMuxInfra"
-      ],
-      "geography": [
-        "US",
-        "INTERNATIONAL"
-      ],
-      "identity": "hpa-vGMuxInfra",
-      "flavorFeatures": [
-        {
-          "id": "vgmux_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": "vgmux_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": "vgmux_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": ""}
-              ]
-            }
-          ]
-        }
-      ]
-    }
-  }
-}
diff --git a/test/policy-local-files/new_policies/hpa_policy_vG_1.json b/test/policy-local-files/new_policies/hpa_policy_vG_1.json
deleted file mode 100644
index 4f9a7b4..0000000
--- a/test/policy-local-files/new_policies/hpa_policy_vG_1.json
+++ /dev/null
@@ -1,231 +0,0 @@
-{
-  "OSDF_FRANKFURT.hpa_policy_vG_1": {
-    "type": "onap.policies.optimization.HpaPolicy",
-    "version": "1.0.0",
-    "type_version": "1.0.0",
-    "metadata": {
-      "policy-id": "OSDF_FRANKFURT.hpa_policy_vG_1",
-      "policy-version": 1
-    },
-    "properties": {
-      "scope": [
-        "OSDF_FRANKFURT" 
-      ],
-      "services": [
-        "vCPE"
-      ],
-      "resources": [
-        "vG"
-      ],
-      "geography": [
-        "US",
-        "INTERNATIONAL"
-      ],
-      "identity": "hpa-vG",
-      "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": ""}
-              ]
-            }
-          ]
-        }
-      ]
-    }
-  }
-}
diff --git a/test/policy-local-files/new_policies/meta-valid-policies.txt b/test/policy-local-files/new_policies/meta-valid-policies.txt
deleted file mode 100644
index 5f969bf..0000000
--- a/test/policy-local-files/new_policies/meta-valid-policies.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-Affinity_vCPE_1.json
-Capacity_vGMuxInfra.json
-Capacity_vG_1.json
-Distance_vGMuxInfra_1.json
-Distance_vG_1.json
-Placement_Optimization_1.json
-QueryPolicy_vCPE.json
-QueryPolicy_vCPE_2.json
-hpa_policy_vGMuxInfra_1.json
-hpa_policy_vG_1.json
-vnfPolicy_vG.json
-vnfPolicy_vGMuxInfra.json
-QueryPolicy_vFW_TD.json
-vnfPolicy_vFW_TD.json
-vnfPolicy_vPGN_TD.json
-Affinity_vFW_TD.json
-Attribute_vNS_1.json
\ No newline at end of file
diff --git a/test/policy-local-files/new_policies/subscriber_policy_vCPE.json b/test/policy-local-files/new_policies/subscriber_policy_vCPE.json
deleted file mode 100644
index 305ce58..0000000
--- a/test/policy-local-files/new_policies/subscriber_policy_vCPE.json
+++ /dev/null
@@ -1,32 +0,0 @@
-{
-  "OSDF_FRANKFURT.SubscriberPolicy_v1": {
-    "type": "onap.policies.optimization.SubscriberPolicy",
-    "version": "1.0.0",
-    "type_version": "1.0.0",
-    "metadata": {
-      "policy-id": "OSDF_FRANKFURT.SubscriberPolicy_v1",
-      "policy-version": 1
-    },
-    "properties": {
-      "scope": [
-        "OSDF_FRANKFURT"
-      ],
-      "services": [
-        "vCPE"
-      ],
-      "identity": "subscriber_vCPE",
-      "properties": {
-        "subscriberName": [
-          "subscriber_x",
-          "subscriber_y"
-        ],
-        "subscriberRole": [
-          "PVT Homing"
-        ],
-        "provStatus": [
-          "CAPPED"
-        ]
-      }
-    }
-  }
-}
diff --git a/test/policy-local-files/new_policies/vnfPolicy_vFW_TD.json b/test/policy-local-files/new_policies/vnfPolicy_vFW_TD.json
deleted file mode 100644
index 387ed56..0000000
--- a/test/policy-local-files/new_policies/vnfPolicy_vFW_TD.json
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  "OSDF_FRANKFURT.vnfPolicy_vFW_TD": {
-    "type": "onap.policies.optimization.VnfPolicy",
-    "version": "1.0.0",
-    "type_version": "1.0.0",
-    "metadata": {
-      "policy-id": "OSDF_FRANKFURT.vnfPolicy_vFW_TD",
-      "policy-version": 1
-    },
-    "properties": {
-      "scope": [
-        "OSDF_FRANKFURT",
-        "TD"
-      ],
-      "resources": [
-        "vFW-SINK"
-      ],
-      "geography": [
-        "US"
-      ],
-      "identity": "vnf_vFW_TD",
-      "applicableResources": "any",
-      "vnfProperties": [{
-          "inventoryProvider": "aai",
-          "serviceType": "",
-          "inventoryType": "vfmodule",
-          "customerId": {
-              "get_param": "chosen_customer_id"
-          },
-          "equipmentRole": "",
-          "attributes": {
-              "orchestrationStatus": ["active"],
-              "provStatus": "ACTIVE",
-              "cloudRegionId": {
-                  "get_param": "chosen_region"
-              },
-              "service_instance_id": {
-                  "get_param": "service_id"
-              }
-          },
-          "passthroughAttributes": {
-              "td-role": "destination"
-          }
-      }]
-    }
-  }
-}
diff --git a/test/policy-local-files/new_policies/vnfPolicy_vG.json b/test/policy-local-files/new_policies/vnfPolicy_vG.json
deleted file mode 100644
index 786ffc2..0000000
--- a/test/policy-local-files/new_policies/vnfPolicy_vG.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "OSDF_FRANKFURT.vnfPolicy_vG": {
-    "type": "onap.policies.optimization.VnfPolicy",
-    "version": "1.0.0",
-    "type_version": "1.0.0",
-    "metadata": {
-      "policy-id": "OSDF_FRANKFURT.vnfPolicy_vG",
-      "policy-version": 1
-    },
-    "properties": {
-      "scope": [
-        "OSDF_FRANKFURT"
-      ],
-      "services": [
-        "vCPE"
-      ],
-      "resources": [
-        "vG"
-      ],
-      "geography": [
-        "US",
-        "INTERNATIONAL"
-      ],
-      "identity": "vnf_vG",
-      "applicableResources": "any",
-      "vnfProperties": [
-        {
-          "inventoryProvider": "aai",
-          "serviceType": "",
-          "inventoryType": "cloud",
-          "customerId": "",
-          "orchestrationStatus": "",
-          "equipmentRole": ""
-        }
-      ]
-    }
-  }
-}
diff --git a/test/policy-local-files/new_policies/vnfPolicy_vGMuxInfra.json b/test/policy-local-files/new_policies/vnfPolicy_vGMuxInfra.json
deleted file mode 100644
index deb34fd..0000000
--- a/test/policy-local-files/new_policies/vnfPolicy_vGMuxInfra.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "OSDF_FRANKFURT.vnfPolicy_vGMuxInfra": {
-    "type": "onap.policies.optimization.VnfPolicy",
-    "version": "1.0.0",
-    "type_version": "1.0.0",
-    "metadata": {
-      "policy-id": "OSDF_FRANKFURT.vnfPolicy_vGMuxInfra",
-      "policy-version": 1
-    },
-    "properties": {
-      "scope": [
-        "OSDF_FRANKFURT"
-      ],
-      "services": [
-        "vCPE"
-      ],
-      "resources": [
-        "vGMuxInfra"
-      ],
-      "geography": [
-        "US",
-        "INTERNATIONAL"
-      ],
-      "identity": "vnf_vGMuxInfra",
-      "applicableResources": "any",
-      "vnfProperties": [
-        {
-          "inventoryProvider": "aai",
-          "serviceType": "vGMuxInfra-xx",
-          "inventoryType": "service",
-          "customerId": "SDN-ETHERNET-INTERNET",
-          "orchestrationStatus": "",
-          "equipmentRole": ""
-        }
-      ]
-    }
-  }
-}
diff --git a/test/policy-local-files/new_policies/vnfPolicy_vPGN_TD.json b/test/policy-local-files/new_policies/vnfPolicy_vPGN_TD.json
deleted file mode 100644
index c441156..0000000
--- a/test/policy-local-files/new_policies/vnfPolicy_vPGN_TD.json
+++ /dev/null
@@ -1,52 +0,0 @@
-{
-  "OSDF_FRANKFURT.vnfPolicy_vPGN_TD": {
-    "type": "onap.policies.optimization.VnfPolicy",
-    "version": "1.0.0",
-    "type_version": "1.0.0",
-    "metadata": {
-      "policy-id": "OSDF_FRANKFURT.vnfPolicy_vPGN_TD",
-      "policy-version": 1
-    },
-    "properties": {
-      "scope": [
-        "OSDF_FRANKFURT",
-        "TD"
-      ],
-      "resources": [
-        "vPGN"
-      ],
-      "geography": [
-        "US"
-      ],
-      "identity": "vnf_vPGN_TD",
-      "applicableResources": "any",
-      "vnfProperties": [
-        {
-          "inventoryProvider": "aai",
-          "serviceType": "",
-          "inventoryType": "vfmodule",
-          "customerId": {
-            "get_param": "chosen_customer_id"
-          },
-          "equipmentRole": "",
-          "unique": "False",
-          "attributes": {
-            "orchestrationStatus": [
-              "active"
-            ],
-            "provStatus": "ACTIVE",
-            "cloudRegionId": {
-              "get_param": "chosen_region"
-            },
-            "service_instance_id": {
-              "get_param": "service_id"
-            }
-          },
-          "passthroughAttributes": {
-            "td-role": "anchor"
-          }
-        }
-      ]
-    }
-  }
-}