X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FvFW_CNF_CDS%2Ftemplates%2Fcba%2FTemplates%2Fvpkg-template.vtl;h=6f0461bbd42635da98e6a2419a5c560f5f702489;hb=a1ffe0ce52a4efa1ed56474417aa525d60518a5b;hp=55ad79061b161489ae218ac5a7b9eb3999ef2af6;hpb=3c887a297e506f393df2a56e748fc398bcbc4b1a;p=demo.git

diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-template.vtl b/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-template.vtl
index 55ad7906..6f0461bb 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-template.vtl
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vpkg-template.vtl
@@ -1,5 +1,36 @@
 {
     "capability-data": [
+        {
+            "capability-name": "netbox-ip-assign",
+            "key-mapping": [
+                {
+                    "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"
+                        }
+                    ]
+                }
+            ]
+        },
         {
             "capability-name": "generate-name",
             "key-mapping": [
@@ -50,13 +81,7 @@
                     "output-key-mapping": [
                         {
                             "resource-name": "aai-vf-module-put",
-                            "resource-value": "${status}"
-                        }
-                    ],
-                    "payload": [
-                        {
-                            "param-name": "vf-module",
-                            "param-value": "vf-module"
+                            "resource-value": ""
                         }
                     ]
                 }
@@ -77,134 +102,16 @@
         }
     ],
     "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}"
-        },
+##RB name
         {
             "param-name": "vf-module-model-invariant-uuid",
             "param-value": "${vf-module-model-invariant-uuid}"
         },
+##RB version
         {
             "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": "vpg_image_name",
-            "param-value": "${vpg_image_name}"
-        },
-        {
-            "param-name": "vpg_flavor_name",
-            "param-value": "${vpg_flavor_name}"
-        },
-        {
-            "param-name": "public_net_id",
-            "param-value": "${public_net_id}"
-        },
-        {
-            "param-name": "int_private1_net_cidr",
-            "param-value": "${int_private1_net_cidr}"
-        },
-        {
-            "param-name": "onap_private_net_cidr",
-            "param-value": "${onap_private_net_cidr}"
-        },
-        {
-            "param-name": "int_private2_net_cidr",
-            "param-value": "${int_private2_net_cidr}"
-        },
-        {
-            "param-name": "vfw_int_private1_ip_0",
-            "param-value": "${vfw_int_private1_ip_0}"
-        },
-        {
-            "param-name": "vpg_int_private1_ip_0",
-            "param-value": "${vpg_int_private1_ip_0}"
-        },
-        {
-            "param-name": "vsn_int_private2_ip_0",
-            "param-value": "${vsn_int_private2_ip_0}"
-        },
-        {
-            "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": "vpg_onap_private_ip_0",
-            "param-value": "${vpg_onap_private_ip_0}"
-        },
         {
             "param-name": "k8s-rb-profile-name",
             "param-value": "${k8s-rb-profile-name}"