X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=heat%2FvFW_CNF_CDS%2Ftemplates%2Fcba%2FTemplates%2Fvnf-template.vtl;h=9e23665f1d14118534ee4a69a2b53aef1eb8462a;hb=3a3e9fcdd1141928473b5f793e224204eafe8f1b;hp=e050c97702e53eb2584d839ab9b032e68418c063;hpb=be3024dfe9b6c06419c6f4a5f724a01b7e0ab103;p=demo.git

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 e050c977..9e23665f 100644
--- a/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-template.vtl
+++ b/heat/vFW_CNF_CDS/templates/cba/Templates/vnf-template.vtl
@@ -94,32 +94,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 +146,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": [
                         {
@@ -227,8 +175,8 @@
                 {
                     "output-key-mapping": [
                         {
-                            "resource-name": "vpg_onap_private_ip_0",
-                            "resource-value": "${vpg_onap_private_ip_0}"
+                            "resource-name": "vpg_int_private1_ip_0",
+                            "resource-value": "${vpg_int_private1_ip_0}"
                         }
                     ],
                     "payload": [
@@ -238,7 +186,7 @@
                         },
                         {
                             "param-name": "prefix-id",
-                            "param-value": "${management-prefix-id}"
+                            "param-value": "${private1-prefix-id}"
                         },
                         {
                             "param-name": "vnf-id",
@@ -246,33 +194,32 @@
                         },
                         {
                             "param-name": "external_key",
-                            "param-value": "${vnf-id}-vpg_onap_private_ip_0"
+                            "param-value": "${vnf-id}-vpg_int_private1_ip_0"
                         }
                     ]
-                },
+                }
+            ]
+        },
+        {
+            "capability-name": "unresolved-composite-data",
+            "key-mapping": [
                 {
                     "output-key-mapping": [
                         {
-                            "resource-name": "vpg_int_private1_ip_0",
-                            "resource-value": "${vpg_int_private1_ip_0}"
-                        }
-                    ],
-                    "payload": [
-                        {
-                            "param-name": "service-instance-id",
-                            "param-value": "${service-instance-id}"
+                            "resource-name": "int_private2_net_id",
+                            "resource-value": "${vnf_name}-protected-network"
                         },
                         {
-                            "param-name": "prefix-id",
-                            "param-value": "${private1-prefix-id}"
+                            "resource-name": "int_private1_net_id",
+                            "resource-value": "${vnf_name}-unprotected-network"
                         },
                         {
-                            "param-name": "vnf-id",
-                            "param-value": "${vnf-id}"
+                            "resource-name": "onap_private_net_id",
+                            "resource-value": "${vnf_name}-management-network"
                         },
                         {
-                            "param-name": "external_key",
-                            "param-value": "${vnf-id}-vpg_int_private1_ip_0"
+                            "resource-name": "net_attachment_definition",
+                            "resource-value": "${vnf_name}-ovn-nat"
                         }
                     ]
                 }
@@ -280,33 +227,17 @@
         }
     ],
     "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": "vf-naming-policy",
             "param-value": "${vf-naming-policy}"
         },
         {
-            "param-name": "image_name",
-            "param-value": "${image_name}"
-        },
-        {
-            "param-name": "flavor_name",
-            "param-value": "${flavor_name}"
+            "param-name": "dcae_collector_ip",
+            "param-value": "${dcae_collector_ip}"
         },
         {
-            "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",
@@ -323,38 +254,6 @@
         {
             "param-name": "demo_artifacts_version",
             "param-value": "${demo_artifacts_version}"
-        },
-        {
-            "param-name": "install_script_version",
-            "param-value": "${install_script_version}"
-        },
-        {
-            "param-name": "net_attachment_definition",
-            "param-value": "${vnf-id}-ovn-nat"
-        },
-        {
-            "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}"
         }
     ]
 }