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_vG.json | 61 ++++++++++++++++++-------------
 1 file changed, 35 insertions(+), 26 deletions(-)

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

diff --git a/test/policy-local-files/vnfPolicy_vG.json b/test/policy-local-files/vnfPolicy_vG.json
index b047686..786ffc2 100644
--- a/test/policy-local-files/vnfPolicy_vG.json
+++ b/test/policy-local-files/vnfPolicy_vG.json
@@ -1,29 +1,38 @@
 {
-    "service": "vnfPolicy",
-    "policyName": "OSDF_DUBLIN.vnfPolicy_vG",
-    "description": "vnfPolicy",
-    "templateVersion": "OpenSource.version.1",
-    "version": "test1",
-    "priority": "6",
-    "riskType": "test",
-    "riskLevel": "3",
-    "guard": "False",
-    "content": {
-        "identity": "vnf_vG",
-        "policyScope": ["vCPE", "US", "INTERNATIONAL", "ip", "vG"],
-        "policyType": "vnfPolicy",
-        "resources": ["vG"],
-        "applicableResources": "any",
-	    "vnfProperties": [
-            {
-                "inventoryProvider": "aai",
-                "serviceType": "",
-                "inventoryType": "cloud",
-                "customerId": "",
-                "orchestrationStatus": "",
-                "equipmentRole": ""
-
-            }
-        ]
+  "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": ""
+        }
+      ]
     }
+  }
 }
-- 
cgit 1.2.3-korg