X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FvFW_CNF_CDS%2Ftemplates%2Fcba%2FTemplates%2Fvsn-template.vtl;h=61ba0935a9a03ee503cb8109448f3a250de1bf02;hb=06bf0ac45889ffe00fc6e27e68ffa15c2f519e6f;hp=f71379c2816cbd8f95cc5e0c681bdf995cd3c72d;hpb=3c887a297e506f393df2a56e748fc398bcbc4b1a;p=demo.git

diff --git a/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-template.vtl b/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-template.vtl
index f71379c2..61ba0935 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-template.vtl
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vsn-template.vtl
@@ -11,6 +11,10 @@
                         }
                     ],
                     "payload": [
+                        {
+                            "param-name": "VF_MODULE_TYPE",
+                            "param-value": "vfmt"
+                        },
                         {
                             "param-name": "resource-name",
                             "param-value": "vf_module_name"
@@ -81,13 +85,7 @@
                     "output-key-mapping": [
                         {
                             "resource-name": "aai-vf-module-put",
-                            "resource-value": "${status}"
-                        }
-                    ],
-                    "payload": [
-                        {
-                            "param-name": "vf-module",
-                            "param-value": "vf-module"
+                            "resource-value": ""
                         }
                     ]
                 }
@@ -100,7 +98,7 @@
                     "output-key-mapping": [
                         {
                             "resource-name": "vsn_name_0",
-                            "resource-value": "${vf_module_name}"
+                            "resource-value": "${k8s-rb-instance-release-name}"
                         }
                     ]
                 }
@@ -108,125 +106,45 @@
         }
     ],
     "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}"
         },
+##Release name
         {
-            "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": "k8s-rb-instance-release-name",
+            "param-value": "${k8s-rb-instance-release-name}"
         },
+##Profile name
         {
-            "param-name": "vsn_image_name",
-            "param-value": "${vsn_image_name}"
-        },
-        {
-            "param-name": "vsn_flavor_name",
-            "param-value": "${vsn_flavor_name}"
-        },
-        {
-            "param-name": "public_net_id",
-            "param-value": "${public_net_id}"
-        },
-        {
-            "param-name": "int_private2_net_cidr",
-            "param-value": "${int_private2_net_cidr}"
-        },
-        {
-            "param-name": "onap_private_net_cidr",
-            "param-value": "${onap_private_net_cidr}"
-        },
-        {
-            "param-name": "vfw_int_private2_ip_0",
-            "param-value": "${vfw_int_private2_ip_0}"
-        },
-        {
-            "param-name": "vsn_int_private2_ip_0",
-            "param-value": "${vsn_int_private2_ip_0}"
-        },
-        {
-            "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": "openstack"
-        },
-        {
-            "param-name": "sec_group",
-            "param-value": "${sec_group}"
+            "param-name": "k8s-rb-profile-name",
+            "param-value": "${k8s-rb-profile-name}"
         },
         {
-            "param-name": "nexus_artifact_repo",
-            "param-value": "${nexus_artifact_repo}"
+            "param-name": "k8s-rb-config-template-name",
+            "param-value": "${k8s-rb-config-template-name}"
         },
         {
-            "param-name": "k8s-rb-profile-name",
-            "param-value": "${k8s-rb-profile-name}"
+            "param-name": "k8s-rb-config-template-source",
+            "param-value": "${k8s-rb-config-template-source}"
         },
         {
-            "param-name": "k8s-rb-profile-namespace",
-            "param-value": "${k8s-rb-profile-namespace}"
+            "param-name": "k8s-rb-config-name",
+            "param-value": "${k8s-rb-config-name}"
         },
         {
-            "param-name": "int_private2_gw_ip",
-            "param-value": "${int_private2_gw_ip}"
+            "param-name": "k8s-rb-config-value-source",
+            "param-value": "${k8s-rb-config-value-source}"
         }
     ]
 }