[vFW CNF CDS] vf_module and vnf name generation improvment in CBA

[demo.git] / heat / vFW_CNF_CDS / templates / cba / Templates / vnf-template.vtl

diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-template.vtl b/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-template.vtl
index 3e235e2..5a96320 100644 (file)
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-template.vtl
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-template.vtl
@@ -1,44 +1,5 @@
 {
     "capability-data": [
-        {
-            "capability-name": "generate-name",
-            "key-mapping": [
-                {
-                    "output-key-mapping": [
-                        {
-                            "resource-name": "vnf_name",
-                            "resource-value": "${vnf_name}"
-                        }
-                    ],
-                    "payload": [
-                        {
-                            "param-name": "resource-name",
-                            "param-value": "vnf_name"
-                        },
-                        {
-                            "param-name": "resource-value",
-                            "param-value": "${vnf_name}"
-                        },
-                        {
-                            "param-name": "external-key",
-                            "param-value": "${vnf-id}_vnf_name"
-                        },
-                        {
-                            "param-name": "policy-instance-name",
-                            "param-value": "${vf-naming-policy}"
-                        },
-                        {
-                            "param-name": "naming-type",
-                            "param-value": "VNF"
-                        },
-                        {
-                            "param-name": "AIC_CLOUD_REGION",
-                            "param-value": "${aic-cloud-region}"
-                        }
-                    ]
-                }
-            ]
-        },
         {
             "capability-name": "netbox-ip-assign",
             "key-mapping": [
@@ -94,32 +55,6 @@
                         }
                     ]
                 },
-                {
-                    "output-key-mapping": [
-                        {
-                            "resource-name": "onap_private_gw_ip",
-                            "resource-value": "${onap_private_gw_ip}"
-                        }
-                    ],
-                    "payload": [
-                        {
-                            "param-name": "service-instance-id",
-                            "param-value": "${service-instance-id}"
-                        },
-                        {
-                            "param-name": "prefix-id",
-                            "param-value": "${management-prefix-id}"
-                        },
-                        {
-                            "param-name": "vnf-id",
-                            "param-value": "${vnf-id}"
-                        },
-                        {
-                            "param-name": "external_key",
-                            "param-value": "${vnf-id}-onap_private_gw_ip"
-                        }
-                    ]
-                },
                 {
                     "output-key-mapping": [
                         {
@@ -172,32 +107,6 @@
                         }
                     ]
                 },
-                {
-                    "output-key-mapping": [
-                        {
-                            "resource-name": "vfw_int_private2_floating_ip",
-                            "resource-value": "${vfw_int_private2_floating_ip}"
-                        }
-                    ],
-                    "payload": [
-                        {
-                            "param-name": "service-instance-id",
-                            "param-value": "${service-instance-id}"
-                        },
-                        {
-                            "param-name": "prefix-id",
-                            "param-value": "${private1-prefix-id}"
-                        },
-                        {
-                            "param-name": "vnf-id",
-                            "param-value": "${vnf-id}"
-                        },
-                        {
-                            "param-name": "external_key",
-                            "param-value": "${vnf-id}-vfw_int_private2_floating_ip"
-                        }
-                    ]
-                },
                 {
                     "output-key-mapping": [
                         {
@@ -224,32 +133,6 @@
                         }
                     ]
                 },
-                {
-                    "output-key-mapping": [
-                        {
-                            "resource-name": "vpg_onap_private_ip_0",
-                            "resource-value": "${vpg_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": "vnf-id",
-                            "param-value": "${vnf-id}"
-                        },
-                        {
-                            "param-name": "external_key",
-                            "param-value": "${vnf-id}-vpg_onap_private_ip_0"
-                        }
-                    ]
-                },
                 {
                     "output-key-mapping": [
                         {
@@ -306,32 +189,20 @@
     ],
     "resource-accumulator-resolved-data": [
         {
-            "param-name": "service-instance-id",
-            "param-value": "${service-instance-id}"
-        },
-        {
-            "param-name": "vnf-model-customization-uuid",
-            "param-value": "${vnf-model-customization-uuid}"
-        },
-        {
-            "param-name": "aic-cloud-region",
-            "param-value": "${aic-cloud-region}"
+            "param-name": "vnf_name",
+            "param-value": "${vnf_name}"
         },
         {
             "param-name": "vf-naming-policy",
             "param-value": "${vf-naming-policy}"
         },
         {
-            "param-name": "image_name",
-            "param-value": "${image_name}"
+            "param-name": "dcae_collector_ip",
+            "param-value": "${dcae_collector_ip}"
         },
         {
-            "param-name": "flavor_name",
-            "param-value": "${flavor_name}"
-        },
-        {
-            "param-name": "public_net_id",
-            "param-value": "${public_net_id}"
+            "param-name": "dcae_collector_port",
+            "param-value": "${dcae_collector_port}"
         },
         {
             "param-name": "int_private1_net_cidr",
@@ -349,33 +220,13 @@
             "param-name": "demo_artifacts_version",
             "param-value": "${demo_artifacts_version}"
         },
-        {
-            "param-name": "install_script_version",
-            "param-value": "${install_script_version}"
-        },
-        {
-            "param-name": "pub_key",
-            "param-value": "${pub_key}"
-        },
-        {
-            "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": "k8s-rb-profile-k8s-version",
+            "param-value": "${k8s-rb-profile-k8s-version}"
         }
     ]
 }