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/QueryPolicy_vCPE.json | 53 ++++++++++++++++++---------
 1 file changed, 35 insertions(+), 18 deletions(-)

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

diff --git a/test/policy-local-files/QueryPolicy_vCPE.json b/test/policy-local-files/QueryPolicy_vCPE.json
index 5097964..1a8d205 100644
--- a/test/policy-local-files/QueryPolicy_vCPE.json
+++ b/test/policy-local-files/QueryPolicy_vCPE.json
@@ -1,21 +1,38 @@
 {
-  "service": "queryPolicy",
-  "policyName": "OSDF_DUBLIN.QueryPolicy_vCPE",
-  "description": "Query policy for vCPE",
-  "templateVersion": "OpenSource.version.1",
-  "version": "test1",
-  "priority": "3",
-  "riskType": "test",
-  "riskLevel": "2",
-  "guard": "False",
-  "content": {
-    "queryProperties": [
-      {"attribute":"customerLatitude", "attribute_location": "customerLatitude"},
-      {"attribute":"customerLongitude", "attribute_location": "customerLongitude"}
-    ],
-    "policyScope": ["vCPE", "US", "INTERNATIONAL", "ip", "vGMuxInfra", "vG"],
-    "policyType": "request_param_query",
-    "serviceName": "vCPE",
-    "identity": "vCPE_Query_Policy"
+  "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"
+        }
+      ]
+    }
   }
 }
-- 
cgit 1.2.3-korg