Improvements for new policy API

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

diff --git a/tutorials/vFWDT/policies/rules/vnfPolicy_vFW_TD.json b/tutorials/vFWDT/policies/rules/vnfPolicy_vFW_TD.json
index 240c732..71b5b2b 100644 (file)
--- a/tutorials/vFWDT/policies/rules/vnfPolicy_vFW_TD.json
+++ b/tutorials/vFWDT/policies/rules/vnfPolicy_vFW_TD.json
@@ -1,44 +1,54 @@
 {
-    "service": "vnfPolicy",
-    "policyName": "OSDF_DUBLIN.vnfPolicy_vFW_TD",
-    "description": "vnfPolicy",
-    "templateVersion": "OpenSource.version.1",
-    "version": "OpenSource.version.1",
-    "priority": "6",
-    "riskType": "test",
-    "riskLevel": "3",
-    "guard": "False",
-    "content": {
-        "identity": "vnf_vFW_TD",
-        "policyScope": [
-            "td",
-            "us",
-            "vFW-SINK"
-        ],
-        "policyType": "vnfPolicy",
-        "resources": [
-            "vFW-SINK"
-        ],
-        "applicableResources": "any",
-        "vnfProperties": [
+    "tosca_definitions_version": "tosca_simple_yaml_1_1_0",
+    "topology_template": {
+        "policies": [
             {
-                "inventoryProvider": "aai",
-                "serviceType": "",
-                "inventoryType": "vfmodule",
-                "customerId": {
-                    "get_param": "chosen_customer_id"
-                },
-                "equipmentRole": "",
-                "attributes": {
-                    "orchestrationStatus": [
-                        "active"
-                    ],
-                    "provStatus": "ACTIVE",
-                    "cloudRegionId": {
-                        "get_param": "chosen_region"
+                "OSDF_FRANKFURT.vnfPolicy_vFW_TD": {
+                    "type": "onap.policies.optimization.resource.VnfPolicy",
+                    "version": "1.0.0",
+                    "type_version": "1.0.0",
+                    "metadata": {
+                        "policy-id": "OSDF_FRANKFURT.vnfPolicy_vFW_TD",
+                        "policy-version": 1
                     },
-                    "service_instance_id": {
-                        "get_param": "service_id"
+                    "properties": {
+                        "scope": [
+                            "OSDF_FRANKFURT",
+                            "TD"
+                        ],
+                        "resources": [
+                            "vFW-SINK"
+                        ],
+                        "geography": [
+                            "US"
+                        ],
+                        "identity": "vnf_vFW_TD",
+                        "applicableResources": "any",
+                        "vnfProperties": [
+                            {
+                                "inventoryProvider": "aai",
+                                "serviceType": "",
+                                "inventoryType": "vfmodule",
+                                "customerId": {
+                                    "get_param": "chosen_customer_id"
+                                },
+                                "equipmentRole": "",
+                                "attributes": {
+                                    "orchestrationStatus": [
+                                        "Active"
+                                    ],
+                                    "cloudRegionId": {
+                                        "get_param": "chosen_region"
+                                    },
+                                    "service_instance_id": {
+                                        "get_param": "service_id"
+                                    }
+                                },
+                                "passthroughAttributes": {
+                                    "td-role": "destination"
+                                }
+                            }
+                        ]
                     }
                 }
             }