Improvements to the OSDF changes for new PEF APIs

[optf/osdf.git] / test / policy-local-files / old-policies / hpa_policy_vGMuxInfra_1.json

diff --git a/test/policy-local-files/new_policies/hpa_policy_vGMuxInfra_1.json b/test/policy-local-files/old-policies/hpa_policy_vGMuxInfra_1.json
similarity index 75%
rename from test/policy-local-files/new_policies/hpa_policy_vGMuxInfra_1.json
rename to test/policy-local-files/old-policies/hpa_policy_vGMuxInfra_1.json
index c233c5f..690f5dc 100644 (file)
--- a/test/policy-local-files/new_policies/hpa_policy_vGMuxInfra_1.json
+++ b/test/policy-local-files/old-policies/hpa_policy_vGMuxInfra_1.json
@@ -1,27 +1,18 @@
 {
-  "OSDF_FRANKFURT.hpa_policy_vGMuxInfra_1": {
-    "type": "onap.policies.optimization.HpaPolicy",
-    "version": "1.0.0",
-    "type_version": "1.0.0",
-    "metadata": {
-      "policy-id": "OSDF_FRANKFURT.hpa_policy_vGMuxInfra_1",
-      "policy-version": 1
-    },
-    "properties": {
-      "scope": [
-        "OSDF_FRANKFURT" 
-      ],
-      "services": [
-        "vCPE"
-      ],
-      "resources": [
-        "vGMuxInfra"
-      ],
-      "geography": [
-        "US",
-        "INTERNATIONAL"
-      ],
+    "service": "hpaPolicy",
+    "policyName": "OSDF_DUBLIN.hpa_policy_vGMuxInfra_1",
+    "description": "HPA policy for vGMuxInfra",
+    "templateVersion": "OpenSource.version.1",
+    "version": "test1",
+    "priority": "3",
+    "riskType": "test",
+    "riskLevel": "2",
+    "guard": "False",
+    "content": {
+      "resources": ["vGMuxInfra"],
       "identity": "hpa-vGMuxInfra",
+      "policyScope": ["vCPE", "US", "INTERNATIONAL", "ip", "vGMuxInfra"],
+      "policyType": "hpa",
       "flavorFeatures": [
         {
           "id": "vgmux_1",
@@ -37,8 +28,8 @@
               ]
             }
           ],
-          "flavorProperties": [
-           {  
+          "flavorProperties":[
+            {
               "hpa-feature" : "cpuTopology",
               "mandatory" : "True",
               "architecture": "generic",
@@ -52,64 +43,33 @@
                 {"hpa-attribute-key":"numCpuThreads", "hpa-attribute-value": "8", "operator":"<=", "unit": ""}
               ]
             },
-           {
-              "hpa-feature": "basicCapabilities",
-              "mandatory": true,
+            {
+              "hpa-feature" : "basicCapabilities",
+              "mandatory" : "True",
               "architecture": "generic",
               "directives": [],
               "hpa-feature-attributes": [
-                {
-                  "hpa-attribute-key": "numVirtualCpu",
-                  "hpa-attribute-value": 6,
-                  "operator": [
-                    "="
-                  ],
-                  "unit": ""
-                },
-                {
-                  "hpa-attribute-key": "virtualMemSize",
-                  "hpa-attribute-value": 6,
-                  "operator": [
-                    "="
-                  ],
-                  "unit": ""
-                }
+                {"hpa-attribute-key": "numVirtualCpu", "hpa-attribute-value": "6", "operator": "=", "unit": ""},
+                {"hpa-attribute-key": "virtualMemSize", "hpa-attribute-value":"6", "operator": "=", "unit": "GB"}
               ]
             },
             {
-              "hpa-feature": "ovsDpdk",
-              "mandatory": false,
-              "score": 3,
+              "hpa-feature" : "ovsDpdk",
+              "mandatory" : "False",
+              "score" : "3",
               "architecture": "generic",
               "directives": [],
               "hpa-feature-attributes": [
-                {
-                  "hpa-attribute-key": "dataProcessingAccelerationLibrary",
-                  "hpa-attribute-value": "ovsDpdk_version",
-                  "operator": [
-                    "="
-                  ],
-                  "unit": ""
-                }
+                 {"hpa-attribute-key":"dataProcessingAccelerationLibrary", "hpa-attribute-value":"ovsDpdk_version", "operator": "=", "unit":""}
               ]
             },
             {
-              "hpa-feature": "cpuInstructionSetExtensions",
-              "mandatory": true,
+              "hpa-feature" : "cpuInstructionSetExtensions",
+              "mandatory" : "True",
               "architecture": "INTEL-64",
               "directives": [],
               "hpa-feature-attributes": [
-                {
-                  "hpa-attribute-key": "instructionSetExtensions",
-                  "hpa-attribute-value": [
-                    "<CPUINST>",
-                    "<CPUINST>"
-                  ],
-                  "operator": [
-                    "ALL"
-                  ],
-                  "unit": ""
-                }
+                {"hpa-attribute-key":"instructionSetExtensions", "hpa-attribute-value":["<CPUINST>", "<CPUINST>"], "operator": "ALL", "unit":""}
               ]
             }
           ]
@@ -139,7 +99,7 @@
                 {"hpa-attribute-key":"logicalCpuPinningPolicy", "hpa-attribute-value": "<CPUPOLICY>","operator": "=", "unit":""}
               ]
             },
- {
+            {
               "hpa-feature" : "basicCapabilities",
               "mandatory" : "True",
               "architecture": "generic",
@@ -162,17 +122,18 @@
               ]
             },
             {
-              "hpa-feature" : "pciePassthrough",
+              "hpa-feature" : "pcie",
               "mandatory" : "True",
               "architecture": "generic",
               "directives": [],
               "hpa-feature-attributes": [
                 {"hpa-attribute-key": "pciCount", "hpa-attribute-value": "2", "operator": "=", "unit": ""},
                 {"hpa-attribute-key": "pciVendorId", "hpa-attribute-value":"8086", "operator": "=", "unit": ""},
-                {"hpa-attribute-key": "pciDeviceId", "hpa-attribute-value": "2", "operator": "=", "unit": ""}
+                {"hpa-attribute-key": "pciDeviceId", "hpa-attribute-value": "2", "operator": "=", "unit": ""},
+                {"hpa-attribute-key": "functionType", "hpa-attribute-value": "<PCITYPEVALUE>","operator": "=", "unit": ""}
               ]
             }
-]
+          ]
         },
         {
           "id": "vgmux_3",
@@ -202,7 +163,7 @@
                 {"hpa-attribute-key": "numaCpu-1", "hpa-attribute-value":"4", "operator": "=", "unit": ""},
                 {"hpa-attribute-key": "numaMem-1", "value": "4096", "operator": "=", "unit": "MB"}
               ]
-},
+            },
             {
               "hpa-feature" : "basicCapabilities",
               "mandatory" : "True",
@@ -227,5 +188,4 @@
         }
       ]
     }
-  }
 }