Improvements for new policy API

[demo.git] / tutorials / vFWDT / policies / rules / affinity_vFW_TD.json

diff --git a/tutorials/vFWDT/policies/rules/affinity_vFW_TD.json b/tutorials/vFWDT/policies/rules/affinity_vFW_TD.json
index 590de1c..8f953fe 100644 (file)
--- a/tutorials/vFWDT/policies/rules/affinity_vFW_TD.json
+++ b/tutorials/vFWDT/policies/rules/affinity_vFW_TD.json
@@ -1,29 +1,38 @@
 {
-    "service": "affinityPolicy",
-    "policyName": "OSDF_DUBLIN.Affinity_vFW_TD",
-    "description": "Affinity policy for vPGN Anchor and vFW destination point",
-    "templateVersion": "OpenSource.version.1",
-    "version": "OpenSource.version.1",
-    "priority": "3",
-    "riskType": "test",
-    "riskLevel": "2",
-    "guard": "False",
-    "content": {
-        "identity": "affinity_vFW_TD",
-        "policyScope": [
-            "td",
-            "us",
-            "vFW-SINK",
-            "vPGN"
-        ],
-        "affinityProperty": {
-            "qualifier": "same",
-            "category": "region"
-        },
-        "policyType": "zone",
-        "resources": [
-            "vFW-SINK",
-            "vPGN"
+    "tosca_definitions_version": "tosca_simple_yaml_1_1_0",
+    "topology_template": {
+        "policies": [
+            {
+                "OSDF_FRANKFURT.Affinity_vFW_TD": {
+                    "type": "onap.policies.optimization.resource.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"
+                        }
+                    }
+                }
+            }
         ]
     }
 }