From fa538d59b8982a48fd58f024a30a59616d43cf81 Mon Sep 17 00:00:00 2001
From: "Chayal, Avteet (ac229e)" <ac229e@att.com>
Date: Fri, 20 Mar 2020 00:32:42 -0400
Subject: 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>
---
 test/policy-local-files/vnfPolicy_vPGN_TD.json | 93 +++++++++++++-------------
 1 file changed, 47 insertions(+), 46 deletions(-)

(limited to 'test/policy-local-files/vnfPolicy_vPGN_TD.json')

diff --git a/test/policy-local-files/vnfPolicy_vPGN_TD.json b/test/policy-local-files/vnfPolicy_vPGN_TD.json
index 2e79f2f..c441156 100644
--- a/test/policy-local-files/vnfPolicy_vPGN_TD.json
+++ b/test/policy-local-files/vnfPolicy_vPGN_TD.json
@@ -1,51 +1,52 @@
 {
-  "service": "vnfPolicy",
-  "policyName": "OSDF_DUBLIN.vnfPolicy_vPGN_TD",
-  "description": "vnfPolicy",
-  "templateVersion": "OpenSource.version.1",
-  "version": "oofDublin",
-  "priority": "6",
-  "riskType": "test",
-  "riskLevel": "3",
-  "guard": "False",
-  "content": {
-    "identity": "vnf_vPGN_TD",
-    "policyScope": [
-      "td",
-      "us",
-      "vPGN"
-    ],
-    "policyType": "vnfPolicy",
-    "resources": [
-      "vPGN"
-    ],
-    "applicableResources": "any",
-    "vnfProperties": [
-      {
-        "inventoryProvider": "aai",
-        "serviceType": "",
-        "inventoryType": "vfmodule",
-        "customerId": {
-          "get_param": "chosen_customer_id"
-        },
-        "equipmentRole": "",
-        "unique": "False",
-        "attributes": {
-          "orchestrationStatus": [
-            "active"
-          ],
-          "provStatus": "ACTIVE",
-          "cloudRegionId": {
-            "get_param": "chosen_region"
+  "OSDF_FRANKFURT.vnfPolicy_vPGN_TD": {
+    "type": "onap.policies.optimization.VnfPolicy",
+    "version": "1.0.0",
+    "type_version": "1.0.0",
+    "metadata": {
+      "policy-id": "OSDF_FRANKFURT.vnfPolicy_vPGN_TD",
+      "policy-version": 1
+    },
+    "properties": {
+      "scope": [
+        "OSDF_FRANKFURT",
+        "TD"
+      ],
+      "resources": [
+        "vPGN"
+      ],
+      "geography": [
+        "US"
+      ],
+      "identity": "vnf_vPGN_TD",
+      "applicableResources": "any",
+      "vnfProperties": [
+        {
+          "inventoryProvider": "aai",
+          "serviceType": "",
+          "inventoryType": "vfmodule",
+          "customerId": {
+            "get_param": "chosen_customer_id"
           },
-          "service_instance_id": {
-            "get_param": "service_id"
+          "equipmentRole": "",
+          "unique": "False",
+          "attributes": {
+            "orchestrationStatus": [
+              "active"
+            ],
+            "provStatus": "ACTIVE",
+            "cloudRegionId": {
+              "get_param": "chosen_region"
+            },
+            "service_instance_id": {
+              "get_param": "service_id"
+            }
+          },
+          "passthroughAttributes": {
+            "td-role": "anchor"
           }
-        },
-        "passthroughAttributes": {
-          "td-role": "anchor"
         }
-      }
-    ]
+      ]
+    }
   }
-}
\ No newline at end of file
+}
-- 
cgit 1.2.3-korg