X-Git-Url: https://gerrit.onap.org/r/gitweb?p=demo.git;a=blobdiff_plain;f=heat%2FvFW_CNF_CDS%2Ftemplates%2Fcba%2FTemplates%2Fvfw-template.vtl;h=c85af2096f6f8b9cd0b0bd14cf26a210ba9033e2;hp=a321aa44d08f631fd9a18033045ebc968018b512;hb=be3024dfe9b6c06419c6f4a5f724a01b7e0ab103;hpb=42ecc70c1f5a05c4de5dda414a7964398552b47d

diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl b/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl
index a321aa44..c85af209 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vfw-template.vtl
@@ -1,298 +1,263 @@
 {
-  "resource-accumulator-resolved-data": [
-    {
-      "param-name": "service-instance-id",
-      "param-value": "${service-instance-id}"
-    },
-
-    {
-      "param-name": "vnf_name",
-      "param-value": "${vnf_name}"
-    },
-    {
-      "param-name": "vnf_model_customization_uuid",
-      "param-value": "${vnf-model-customization-uuid}"
-    },
-    {
-      "param-name": "vf-module-model-invariant-uuid",
-      "param-value": "${vf-module-model-invariant-uuid}"
-    },
-    {
-      "param-name": "vf-module-model-version",
-      "param-value": "${vf-module-model-version}"
-    },
-    {
-      "param-name": "vf_module_id",
-      "param-value": "${vf-module-id}"
-    },
-    {
-      "param-name": "vf_module_type",
-      "param-value": "${vf-module-type}"
-    },
-    {
-      "param-name": "vf_module_customization_uuid",
-      "param-value": "${vf-module-model-customization-uuid}"
-    },
-    {
-      "param-name": "vfc_customization_uuid",
-      "param-value": "${vfccustomizationuuid}"
-    },
-    {
-      "param-name": "aic-cloud-region",
-      "param-value": "${aic-cloud-region}"
-    },
-    {
-      "param-name": "vnfc-model-customization-uuid",
-      "param-value": "${vfccustomizationuuid}"
-    },
-    {
-      "param-name": "vnfc-model-invariant-uuid",
-      "param-value": "${vnfc-model-invariant-uuid}"
-    },
-    {
-      "param-name": "vnfc-model-version",
-      "param-value": "${vnfc-model-version}"
-    },
-    {
-      "param-name": "nfc-naming-code",
-      "param-value": "${nfc-naming-code}"
-    },
-    {
-      "param-name": "vfw_image_name",
-      "param-value": "${vfw_image_name}"
-    },
-    {
-      "param-name": "vfw_flavor_name",
-      "param-value": "${vfw_flavor_name}"
-    },
-    {
-      "param-name": "public_net_id",
-      "param-value": "${public_net_id}"
-    },
-    {
-      "param-name": "pub_key",
-      "param-value": "${pub_key}"
-    },
-	{
-      "param-name": "int_private1_net_cidr",
-      "param-value": "${int_private1_net_cidr}"
-    },
-	{
-      "param-name": "int_private2_net_cidr",
-      "param-value": "${int_private2_net_cidr}"
-    },
-    {
-      "param-name": "onap_private_net_id",
-      "param-value": "${onap_private_net_id}"
-    },
-    {
-      "param-name": "onap_private_subnet_id",
-      "param-value": "${onap_private_subnet_id}"
-    },
-	{
-      "param-name": "onap_private_net_cidr",
-      "param-value": "${onap_private_net_cidr}"
-    },
-	{
-      "param-name": "vfw_int_private1_ip_0",
-      "param-value": "${vfw_int_private1_ip_0}"
-    },
-	{
-      "param-name": "vfw_int_private2_ip_0",
-      "param-value": "${vfw_int_private2_ip_0}"
-    },
-	{
-      "param-name": "vpg_int_private1_ip_0",
-      "param-value": "${vpg_int_private1_ip_0}"
-    },
-	{
-      "param-name": "vfw_int_private2_floating_ip",
-      "param-value": "${vfw_int_private2_floating_ip}"
-    },
-    {
-      "param-name": "dcae_collector_ip",
-      "param-value": "$(dcae_collector_ip)"
-    },
-	{
-      "param-name": "dcae_collector_port",
-      "param-value": "$(dcae_collector_port)"
-    },
-	{
-      "param-name": "demo_artifacts_version",
-      "param-value": "${demo_artifacts_version}}"
-    },
-	{
-      "param-name": "install_script_version",
-      "param-value": "${install_script_version}"
-    },
-    {
-      "param-name": "key_name",
-      "param-value": "${vnf_name}_key_name"
-    },
-    {
-      "param-name": "cloud_env",
-      "param-value": "$(cloud_env)"
-    },
-	{
-      "param-name": "sec_group",
-      "param-value": "${sec_group}"
-    },
-	{
-      "param-name": "nexus_artifact_repo",
-      "param-value": "${nexus_artifact_repo}"
-    },
-    {
-      "param-name": "k8s-rb-profile-name",
-      "param-value": "${k8s-rb-profile-name}"
-    },
-    {
-      "param-name": "k8s-rb-profile-namespace",
-      "param-value": "${k8s-rb-profile-namespace}"
-    },
-    {
-      "param-name": "int_private1_net_id",
-      "param-value": "${int_private1_net_id}"
-    },
-    {
-      "param-name": "int_private2_net_id",
-      "param-value": "${int_private2_net_id}"
-    }
-  ],
-  "capability-data": [
-    {
-      "capability-name": "generate-name",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "resource-name",
-              "param-value": "vfw_name_0"
-            },
-            {
-              "param-name": "resource-value",
-              "param-value": "${vfw_name_0}"
-            },
-            {
-              "param-name": "external-key",
-              "param-value": "${vf-module-id}_vfw_name_0"
-            },
-            {
-              "param-name": "policy-instance-name",
-              "param-value": "${vf-naming-policy}"
-            },
-            {
-              "param-name": "naming-type",
-              "param-value": "VNFC"
-            },
-            {
-              "param-name": "VNF_NAME",
-              "param-value": "${vnf_name}"
-            },
-            {
-              "param-name": "NFC_NAMING_CODE",
-              "param-value": "${nfc-naming-code}"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vfw_name_0",
-              "resource-value": "${vfw_name_0}"
-            }
-          ]
-        },
-        {
-          "payload": [
-            {
-              "param-name": "resource-name",
-              "param-value": "vf-module-name"
-            },
-            {
-              "param-name": "resource-value",
-              "param-value": "${vf-module-name}"
-            },
-            {
-              "param-name": "external-key",
-              "param-value": "${vf-module-id}_vf-module-name"
-            },
-            {
-              "param-name": "policy-instance-name",
-              "param-value": "${vf-naming-policy}"
-            },
-            {
-              "param-name": "naming-type",
-              "param-value": "VF-MODULE"
-            },
-            {
-              "param-name": "VNF_NAME",
-              "param-value": "${vnf_name}"
-            },
-            {
-              "param-name": "VF_MODULE_LABEL",
-              "param-value": "${vf-module-label}"
-            },
-            {
-              "param-name": "VF_MODULE_TYPE",
-              "param-value": "${vf-module-type}"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vf-module-name",
-              "resource-value": "${vf-module-name}"
-            }
-          ]
-        }
-      ]
-    },
-    {
-      "capability-name": "netbox-ip-assign",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "service-instance-id",
-              "param-value": "${service-instance-id}"
-            },
-            {
-              "param-name": "prefix-id",
-              "param-value": "${management-prefix-id}"
-            },
-            {
-              "param-name": "vf_module_id",
-              "param-value": "${vf-module-id}"
-            },
-            {
-              "param-name": "external_key",
-              "param-value": "${vf-module-id}-vfw_onap_private_ip_0"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "vfw_onap_private_ip_0",
-              "resource-value": "${vfw_onap_private_ip_0}"
-            }
-          ]
+    "capability-data": [
+        {
+            "capability-name": "generate-name",
+            "key-mapping": [
+                {
+                    "output-key-mapping": [
+                        {
+                            "resource-name": "vf_module_name",
+                            "resource-value": "${vf-module-name}"
+                        }
+                    ],
+                    "payload": [
+                        {
+                            "param-name": "resource-name",
+                            "param-value": "vf_module_name"
+                        },
+                        {
+                            "param-name": "resource-value",
+                            "param-value": "${vf-module-name}"
+                        },
+                        {
+                            "param-name": "external-key",
+                            "param-value": "${vf-module-id}_vf-module-name"
+                        },
+                        {
+                            "param-name": "policy-instance-name",
+                            "param-value": "${vf-naming-policy}"
+                        },
+                        {
+                            "param-name": "naming-type",
+                            "param-value": "VF-MODULE"
+                        },
+                        {
+                            "param-name": "VNF_NAME",
+                            "param-value": "${vnf_name}"
+                        },
+                        {
+                            "param-name": "VF_MODULE_LABEL",
+                            "param-value": "${vf-module-label}"
+                        },
+                        {
+                            "param-name": "VF_MODULE_TYPE",
+                            "param-value": "${vf-module-type}"
+                        }
+                    ]
+                }
+            ]
+        },
+        {
+            "capability-name": "netbox-ip-assign",
+            "key-mapping": [
+                {
+                    "output-key-mapping": [
+                        {
+                            "resource-name": "vfw_onap_private_ip_0",
+                            "resource-value": "${vfw_onap_private_ip_0}"
+                        }
+                    ],
+                    "payload": [
+                        {
+                            "param-name": "service-instance-id",
+                            "param-value": "${service-instance-id}"
+                        },
+                        {
+                            "param-name": "prefix-id",
+                            "param-value": "${management-prefix-id}"
+                        },
+                        {
+                            "param-name": "vf_module_id",
+                            "param-value": "${vf-module-id}"
+                        },
+                        {
+                            "param-name": "external_key",
+                            "param-value": "${vf-module-id}-vfw_onap_private_ip_0"
+                        }
+                    ]
+                }
+            ]
+        },
+        {
+            "capability-name": "aai-vf-module-put",
+            "key-mapping": [
+                {
+                    "output-key-mapping": [
+                        {
+                            "resource-name": "aai-vf-module-put",
+                            "resource-value": "${status}"
+                        }
+                    ],
+                    "payload": [
+                        {
+                            "param-name": "vf-module",
+                            "param-value": "vf-module"
+                        }
+                    ]
+                }
+            ]
         }
-      ]
-    },
-    {
-      "capability-name": "aai-vf-module-put",
-      "key-mapping": [
-        {
-          "payload": [
-            {
-              "param-name": "vf-module",
-              "param-value": "vf-module"
-            }
-          ],
-          "output-key-mapping": [
-            {
-              "resource-name": "aai-vf-module-put",
-              "resource-value": "${status}"
-            }
-          ]
+    ],
+    "resource-accumulator-resolved-data": [
+        {
+            "param-name": "service-instance-id",
+            "param-value": "${service-instance-id}"
+        },
+        {
+            "param-name": "vnf_name",
+            "param-value": "${vnf_name}"
+        },
+        {
+            "param-name": "vnf_model_customization_uuid",
+            "param-value": "${vnf-model-customization-uuid}"
+        },
+        {
+            "param-name": "vf-module-model-invariant-uuid",
+            "param-value": "${vf-module-model-invariant-uuid}"
+        },
+        {
+            "param-name": "vf-module-model-version",
+            "param-value": "${vf-module-model-version}"
+        },
+        {
+            "param-name": "vf_module_id",
+            "param-value": "${vf-module-id}"
+        },
+        {
+            "param-name": "vf_module_type",
+            "param-value": "${vf-module-type}"
+        },
+        {
+            "param-name": "vf_module_customization_uuid",
+            "param-value": "${vf-module-model-customization-uuid}"
+        },
+        {
+            "param-name": "vfc_customization_uuid",
+            "param-value": "${vfccustomizationuuid}"
+        },
+        {
+            "param-name": "aic-cloud-region",
+            "param-value": "${aic-cloud-region}"
+        },
+        {
+            "param-name": "vnfc-model-customization-uuid",
+            "param-value": "${vfccustomizationuuid}"
+        },
+        {
+            "param-name": "vnfc-model-invariant-uuid",
+            "param-value": "${vnfc-model-invariant-uuid}"
+        },
+        {
+            "param-name": "vnfc-model-version",
+            "param-value": "${vnfc-model-version}"
+        },
+        {
+            "param-name": "nfc-naming-code",
+            "param-value": "${nfc-naming-code}"
+        },
+        {
+            "param-name": "vfw_image_name",
+            "param-value": "${vfw_image_name}"
+        },
+        {
+            "param-name": "vfw_flavor_name",
+            "param-value": "${vfw_flavor_name}"
+        },
+        {
+            "param-name": "public_net_id",
+            "param-value": "${public_net_id}"
+        },
+        {
+            "param-name": "pub_key",
+            "param-value": "${pub_key}"
+        },
+        {
+            "param-name": "int_private1_net_cidr",
+            "param-value": "${int_private1_net_cidr}"
+        },
+        {
+            "param-name": "int_private2_net_cidr",
+            "param-value": "${int_private2_net_cidr}"
+        },
+        {
+            "param-name": "onap_private_subnet_id",
+            "param-value": "${onap_private_subnet_id}"
+        },
+        {
+            "param-name": "onap_private_net_cidr",
+            "param-value": "${onap_private_net_cidr}"
+        },
+        {
+            "param-name": "vfw_int_private1_ip_0",
+            "param-value": "${vfw_int_private1_ip_0}"
+        },
+        {
+            "param-name": "vfw_int_private2_ip_0",
+            "param-value": "${vfw_int_private2_ip_0}"
+        },
+        {
+            "param-name": "vpg_int_private1_ip_0",
+            "param-value": "${vpg_int_private1_ip_0}"
+        },
+        {
+            "param-name": "vfw_int_private2_floating_ip",
+            "param-value": "${vfw_int_private2_floating_ip}"
+        },
+        {
+            "param-name": "dcae_collector_ip",
+            "param-value": "${dcae_collector_ip}"
+        },
+        {
+            "param-name": "dcae_collector_port",
+            "param-value": "${dcae_collector_port}"
+        },
+        {
+            "param-name": "demo_artifacts_version",
+            "param-value": "${demo_artifacts_version}}"
+        },
+        {
+            "param-name": "install_script_version",
+            "param-value": "${install_script_version}"
+        },
+        {
+            "param-name": "key_name",
+            "param-value": "${vnf_name}_key_name"
+        },
+        {
+            "param-name": "cloud_env",
+            "param-value": "${cloud_env}"
+        },
+        {
+            "param-name": "sec_group",
+            "param-value": "${sec_group}"
+        },
+        {
+            "param-name": "nexus_artifact_repo",
+            "param-value": "${nexus_artifact_repo}"
+        },
+        {
+            "param-name": "k8s-rb-profile-name",
+            "param-value": "${k8s-rb-profile-name}"
+        },
+        {
+            "param-name": "k8s-rb-profile-namespace",
+            "param-value": "${k8s-rb-profile-namespace}"
+        },
+        {
+            "param-name": "onap_private_net_id",
+            "param-value": "${vnf-id}-management-network"
+        },
+        {
+            "param-name": "int_private2_net_id",
+            "param-value": "${vnf-id}-protected-network"
+        },
+        {
+            "param-name": "int_private1_net_id",
+            "param-value": "${vnf-id}-unprotected-network"
+        },
+        {
+            "param-name": "vfw_name_0",
+            "param-value": "vfw-${vf-module-id}"
         }
-      ]
-    }
-  ]
+    ]
 }