Merge "Add support for aai node"

5 files changed, 110 insertions, 1 deletions

diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base_template.vtl b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base_template.vtl
index 1f8298c5f..271c50738 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base_template.vtl
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/base_template.vtl
@@ -52,5 +52,26 @@
       "param-name": "vf_module_name",
       "param-value": "${vnf-name}_base"
     }
+  ],
+  "capability-data": [
+    {
+      "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}"
+            }
+          ]
+        }
+      ]
+    }
   ]
 }
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vFW_vNF_Artifact.vtl b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vFW_vNF_Artifact.vtl
index ca09046aa..0faf09ca6 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vFW_vNF_Artifact.vtl
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vFW_vNF_Artifact.vtl
@@ -198,6 +198,25 @@
           ]
         }
       ]
+    },
+    {
+      "capability-name": "aai-vnf-put",
+      "key-mapping": [
+        {
+          "payload": [
+            {
+              "param-name": "generic-vnf",
+              "param-value": "generic-vnf"
+            }
+          ],
+          "output-key-mapping": [
+            {
+              "resource-name": "aai-vnf-put",
+              "resource-value": "${status}"
+            }
+          ]
+        }
+      ]
     }
   ]
 }
\ No newline at end of file
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw.vtl b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw.vtl
index 06a91d3a1..6864a36fe 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw.vtl
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vfw.vtl
@@ -18,7 +18,7 @@
     },
     {
       "param-name": "vf_module_id",
-      "param-value": "${vnf-id}"
+      "param-value": "${vf-module-id}"
     },
     {
       "param-name": "vf_module_type",
@@ -283,6 +283,29 @@
       ]
     },
     {
+      "capability-name": "aai-vf-module-put",
+      "key-mapping": [
+        {
+          "payload": [
+            {
+              "param-name": "vf-module",
+              "param-value": "vf-module"
+            },
+            {
+              "param-name": "vnfc",
+              "param-value": "vnfc"
+            }
+          ],
+          "output-key-mapping": [
+            {
+              "resource-name": "aai-vf-module-put",
+              "resource-value": "${status}"
+            }
+          ]
+        }
+      ]
+    },
+    {
       "capability-name": "unresolved-composite-data",
       "key-mapping": [
         {
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpg.vtl b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpg.vtl
index f7e3780a3..2ff6596ee 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpg.vtl
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vpg.vtl
@@ -291,6 +291,29 @@
       ]
     },
     {
+      "capability-name": "aai-vf-module-put",
+      "key-mapping": [
+        {
+          "payload": [
+            {
+              "param-name": "vf-module",
+              "param-value": "vf-module"
+            },
+            {
+              "param-name": "vnfc",
+              "param-value": "vnfc"
+            }
+          ],
+          "output-key-mapping": [
+            {
+              "resource-name": "aai-vf-module-put",
+              "resource-value": "${status}"
+            }
+          ]
+        }
+      ]
+    },
+    {
       "capability-name": "unresolved-composite-data",
       "key-mapping": [
         {
diff --git a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn.vtl b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn.vtl
index 727427a63..11fcea9fd 100644
--- a/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn.vtl
+++ b/components/model-catalog/blueprint-model/service-blueprint/vFW/Templates/vsn.vtl
@@ -279,6 +279,29 @@
       ]
     },
     {
+      "capability-name": "aai-vf-module-put",
+      "key-mapping": [
+        {
+          "payload": [
+            {
+              "param-name": "vf-module",
+              "param-value": "vf-module"
+            },
+            {
+              "param-name": "vnfc",
+              "param-value": "vnfc"
+            }
+          ],
+          "output-key-mapping": [
+            {
+              "resource-name": "aai-vf-module-put",
+              "resource-value": "${status}"
+            }
+          ]
+        }
+      ]
+    },
+    {
       "capability-name": "unresolved-composite-data",
       "key-mapping": [
         {