Assign image keyname and pubkey at vnf level

Change-Id: I7eb4b47a9440e277a510864f2bb52323e464da5a
Issue-ID: CCSDK-621
Signed-off-by: Alexis de Talhouët <adetalhouet89@gmail.com>
(cherry picked from commit f39904fbe580301b896ad598e85a135d11c8944b)

6 files changed, 362 insertions, 48 deletions

diff --git a/ms/controllerblueprints/application/load/blueprints/vFW/Definitions/vFW_spinup.json b/ms/controllerblueprints/application/load/blueprints/vFW/Definitions/vFW_spinup.json
index 3cfa6f77..d5416c0e 100644
--- a/ms/controllerblueprints/application/load/blueprints/vFW/Definitions/vFW_spinup.json
+++ b/ms/controllerblueprints/application/load/blueprints/vFW/Definitions/vFW_spinup.json
@@ -221,7 +221,8 @@
                     
                   ],
                   "version": 0
-                },{
+                },
+                {
                   "name": "onap_private_net_id",
                   "property": {
                     "description": "",
@@ -270,6 +271,80 @@
                   "version": 0
                 },
                 {
+                  "name": "key_name",
+                  "property": {
+                    "description": "",
+                    "required": false,
+                    "type": "string",
+                    "status": "",
+                    "constraints": [
+                      {
+                        
+                      }
+                    ],
+                    "entry_schema": {
+                      "type": ""
+                    }
+                  },
+                  "input-param": false,
+                  "dictionary-name": "key_name",
+                  "dictionary-source": "input",
+                  "dependencies": [
+                    
+                  ],
+                  "version": 0
+                },
+                {
+                  "name": "image_name",
+                  "property": {
+                    "description": "",
+                    "required": false,
+                    "type": "string",
+                    "status": "",
+                    "constraints": [
+                      {
+                        
+                      }
+                    ],
+                    "entry_schema": {
+                      "type": ""
+                    },
+                    "default": "Ubuntu 14.04 LTS Generic"
+                  },
+                  "input-param": false,
+                  "dictionary-name": "image_name",
+                  "dictionary-source": "input",
+                  "dependencies": [
+                    
+                  ],
+                  "version": 0
+                },
+                {
+                  "name": "pub_key",
+                  "property": {
+                    "description": "",
+                    "required": false,
+                    "type": "string",
+                    "status": "",
+                    "constraints": [
+                      {
+                        
+                      }
+                    ],
+                    "entry_schema": {
+                      "type": ""
+                    },
+                    "default": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh"
+                  },
+                  "input-param": false,
+                  "dictionary-name": "pub_key",
+                  "dictionary-source": "input",
+                  "dependencies": [
+                    
+                  ],
+                  "version": 0
+                },
+                {
                   "name": "vnf_name",
                   "property": {
                     "description": "",
@@ -890,6 +965,81 @@
                   "version": 0
                 },
                 {
+                  "name": "image_name",
+                  "property": {
+                    "description": "",
+                    "required": false,
+                    "type": "string",
+                    "status": "",
+                    "constraints": [
+                      {
+                        
+                      }
+                    ],
+                    "entry_schema": {
+                      "type": ""
+                    }
+                  },
+                  "input-param": false,
+                  "dictionary-name": "image_name",
+                  "dictionary-source": "mdsal",
+                  "dependencies": [
+                    "service-instance-id",
+                    "vnf-id"
+                  ],
+                  "version": 0
+                },
+                {
+                  "name": "key_name",
+                  "property": {
+                    "description": "",
+                    "required": false,
+                    "type": "string",
+                    "status": "",
+                    "constraints": [
+                      {
+                        
+                      }
+                    ],
+                    "entry_schema": {
+                      "type": ""
+                    }
+                  },
+                  "input-param": false,
+                  "dictionary-name": "key_name",
+                  "dictionary-source": "mdsal",
+                  "dependencies": [
+                    "service-instance-id",
+                    "vnf-id"
+                  ],
+                  "version": 0
+                },
+                {
+                  "name": "pub_key",
+                  "property": {
+                    "description": "",
+                    "required": false,
+                    "type": "string",
+                    "status": "",
+                    "constraints": [
+                      {
+                        
+                      }
+                    ],
+                    "entry_schema": {
+                      "type": ""
+                    }
+                  },
+                  "input-param": false,
+                  "dictionary-name": "pub_key",
+                  "dictionary-source": "mdsal",
+                  "dependencies": [
+                    "service-instance-id",
+                    "vnf-id"
+                  ],
+                  "version": 0
+                },
+                {
                   "name": "onap_private_net_id",
                   "property": {
                     "description": "",
@@ -909,8 +1059,8 @@
                   "dictionary-name": "onap_private_net_id",
                   "dictionary-source": "mdsal",
                   "dependencies": [
-                      "service-instance-id",
-                      "vnf-id"
+                    "service-instance-id",
+                    "vnf-id"
                   ],
                   "version": 0
                 },
@@ -934,8 +1084,8 @@
                   "dictionary-name": "onap_private_subnet_id",
                   "dictionary-source": "mdsal",
                   "dependencies": [
-                      "service-instance-id",
-                      "vnf-id"
+                    "service-instance-id",
+                    "vnf-id"
                   ],
                   "version": 0
                 },
@@ -1610,6 +1760,81 @@
                   "version": 0
                 },
                 {
+                  "name": "image_name",
+                  "property": {
+                    "description": "",
+                    "required": false,
+                    "type": "string",
+                    "status": "",
+                    "constraints": [
+                      {
+                        
+                      }
+                    ],
+                    "entry_schema": {
+                      "type": ""
+                    }
+                  },
+                  "input-param": false,
+                  "dictionary-name": "image_name",
+                  "dictionary-source": "mdsal",
+                  "dependencies": [
+                    "service-instance-id",
+                    "vnf-id"
+                  ],
+                  "version": 0
+                },
+                {
+                  "name": "key_name",
+                  "property": {
+                    "description": "",
+                    "required": false,
+                    "type": "string",
+                    "status": "",
+                    "constraints": [
+                      {
+                        
+                      }
+                    ],
+                    "entry_schema": {
+                      "type": ""
+                    }
+                  },
+                  "input-param": false,
+                  "dictionary-name": "key_name",
+                  "dictionary-source": "mdsal",
+                  "dependencies": [
+                    "service-instance-id",
+                    "vnf-id"
+                  ],
+                  "version": 0
+                },
+                {
+                  "name": "pub_key",
+                  "property": {
+                    "description": "",
+                    "required": false,
+                    "type": "string",
+                    "status": "",
+                    "constraints": [
+                      {
+                        
+                      }
+                    ],
+                    "entry_schema": {
+                      "type": ""
+                    }
+                  },
+                  "input-param": false,
+                  "dictionary-name": "pub_key",
+                  "dictionary-source": "mdsal",
+                  "dependencies": [
+                    "service-instance-id",
+                    "vnf-id"
+                  ],
+                  "version": 0
+                },
+                {
                   "name": "onap_private_net_id",
                   "property": {
                     "description": "",
@@ -1629,8 +1854,8 @@
                   "dictionary-name": "onap_private_net_id",
                   "dictionary-source": "mdsal",
                   "dependencies": [
-                      "service-instance-id",
-                      "vnf-id"
+                    "service-instance-id",
+                    "vnf-id"
                   ],
                   "version": 0
                 },
@@ -1654,8 +1879,8 @@
                   "dictionary-name": "onap_private_subnet_id",
                   "dictionary-source": "mdsal",
                   "dependencies": [
-                      "service-instance-id",
-                      "vnf-id"
+                    "service-instance-id",
+                    "vnf-id"
                   ],
                   "version": 0
                 },
@@ -2332,6 +2557,31 @@
                   "version": 0
                 },
                 {
+                  "name": "image_name",
+                  "property": {
+                    "description": "",
+                    "required": false,
+                    "type": "string",
+                    "status": "",
+                    "constraints": [
+                      {
+                        
+                      }
+                    ],
+                    "entry_schema": {
+                      "type": ""
+                    }
+                  },
+                  "input-param": false,
+                  "dictionary-name": "image_name",
+                  "dictionary-source": "mdsal",
+                  "dependencies": [
+                    "service-instance-id",
+                    "vnf-id"
+                  ],
+                  "version": 0
+                },
+                {
                   "name": "public_net_id",
                   "property": {
                     "description": "",
@@ -2358,6 +2608,56 @@
                   "version": 0
                 },
                 {
+                  "name": "key_name",
+                  "property": {
+                    "description": "",
+                    "required": false,
+                    "type": "string",
+                    "status": "",
+                    "constraints": [
+                      {
+                        
+                      }
+                    ],
+                    "entry_schema": {
+                      "type": ""
+                    }
+                  },
+                  "input-param": false,
+                  "dictionary-name": "key_name",
+                  "dictionary-source": "mdsal",
+                  "dependencies": [
+                    "service-instance-id",
+                    "vnf-id"
+                  ],
+                  "version": 0
+                },
+                {
+                  "name": "pub_key",
+                  "property": {
+                    "description": "",
+                    "required": false,
+                    "type": "string",
+                    "status": "",
+                    "constraints": [
+                      {
+                        
+                      }
+                    ],
+                    "entry_schema": {
+                      "type": ""
+                    }
+                  },
+                  "input-param": false,
+                  "dictionary-name": "pub_key",
+                  "dictionary-source": "mdsal",
+                  "dependencies": [
+                    "service-instance-id",
+                    "vnf-id"
+                  ],
+                  "version": 0
+                },
+                {
                   "name": "onap_private_net_id",
                   "property": {
                     "description": "",
@@ -2377,8 +2677,8 @@
                   "dictionary-name": "onap_private_net_id",
                   "dictionary-source": "mdsal",
                   "dependencies": [
-                      "service-instance-id",
-                      "vnf-id"
+                    "service-instance-id",
+                    "vnf-id"
                   ],
                   "version": 0
                 },
@@ -2402,8 +2702,8 @@
                   "dictionary-name": "onap_private_subnet_id",
                   "dictionary-source": "mdsal",
                   "dependencies": [
-                      "service-instance-id",
-                      "vnf-id"
+                    "service-instance-id",
+                    "vnf-id"
                   ],
                   "version": 0
                 },
diff --git a/ms/controllerblueprints/application/load/blueprints/vFW/Templates/base_template.vtl b/ms/controllerblueprints/application/load/blueprints/vFW/Templates/base_template.vtl
index a5a8ff02..1f8298c5 100644
--- a/ms/controllerblueprints/application/load/blueprints/vFW/Templates/base_template.vtl
+++ b/ms/controllerblueprints/application/load/blueprints/vFW/Templates/base_template.vtl
@@ -25,14 +25,6 @@
       "param-value": "${vf-module-type}"
     },
     {
-      "param-name": "key_name",
-      "param-value": "${nf-role}_key"
-    },
-    {
-      "param-name": "pub_key",
-      "param-value": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh"
-    },
-    {
       "param-name": "unprotected_private_net_id",
       "param-value": "${vnf-name}_unprotected"
     },
@@ -46,11 +38,11 @@
     },
     {
       "param-name": "protected_private_net_id",
-      "param-value": "${vnf-name}_protected_private_net_id"
+      "param-value": "${vnf-name}_protected"
     },
     {
       "param-name": "protected_private_subnet_id",
-      "param-value": "${vnf-name}_protected_private_subnet_id"
+      "param-value": "${vnf-name}_protected_sub"
     },
     {
       "param-name": "protected_private_net_cidr",
diff --git a/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vFW_vNF_Artifact.vtl b/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vFW_vNF_Artifact.vtl
index f25e9560..ca09046a 100644
--- a/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vFW_vNF_Artifact.vtl
+++ b/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vFW_vNF_Artifact.vtl
@@ -21,6 +21,14 @@
       "param-value": "${onap_private_net_id}"
     },
     {
+      "param-name": "pub_key",
+      "param-value": "${pub_key}"
+    },
+    {
+      "param-name": "image_name",
+      "param-value": "${image_name}"
+    },
+    {
       "param-name": "onap_private_subnet_id",
       "param-value": "${onap_private_net_id}_sub"
     }
@@ -149,7 +157,8 @@
               "resource-value": "${vpg_private_ip_0}"
             }
           ]
-        },{
+        },
+        {
           "payload": [
             {
               "param-name": "service-instance-id",
@@ -176,6 +185,19 @@
           ]
         }
       ]
+    },
+    {
+      "capability-name": "unresolved-composite-data",
+      "key-mapping": [
+        {
+          "output-key-mapping": [
+            {
+              "resource-name": "key_name",
+              "resource-value": "${vnf_name}_key"
+            }
+          ]
+        }
+      ]
     }
   ]
 }
\ No newline at end of file
diff --git a/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vfw.vtl b/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vfw.vtl
index 0e11b4bf..06a91d3a 100644
--- a/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vfw.vtl
+++ b/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vfw.vtl
@@ -65,10 +65,6 @@
       "param-value": "openstack"
     },
     {
-      "param-name": "key_name",
-      "param-value": "${nf-role}_key"
-    },
-    {
       "param-name": "repo_url_artifacts",
       "param-value": "https://nexus.onap.org/content/groups/staging"
     },
@@ -82,7 +78,7 @@
     },
     {
       "param-name": "image_name",
-      "param-value": "Ubuntu 14.04 LTS Generic"
+      "param-value": "${image_name}"
     },
     {
       "param-name": "flavor_name",
@@ -101,8 +97,12 @@
       "param-value": "10.0.4.1"
     },
     {
+      "param-name": "key_name",
+      "param-value": "${key_name}"
+    },
+    {
       "param-name": "pub_key",
-      "param-value": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh"
+      "param-value": "${pub_key}"
     },
     {
       "param-name": "public_net_id",
diff --git a/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vpg.vtl b/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vpg.vtl
index c69aeb5f..f7e3780a 100644
--- a/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vpg.vtl
+++ b/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vpg.vtl
@@ -65,10 +65,6 @@
       "param-value": "openstack"
     },
     {
-      "param-name": "key_name",
-      "param-value": "${nf-role}_key"
-    },
-    {
       "param-name": "repo_url_artifacts",
       "param-value": "https://nexus.onap.org/content/groups/staging"
     },
@@ -82,13 +78,21 @@
     },
     {
       "param-name": "image_name",
-      "param-value": "Ubuntu 14.04 LTS Generic"
+      "param-value": "${image_name}"
     },
     {
       "param-name": "flavor_name",
       "param-value": "m1.medium"
     },
     {
+      "param-name": "key_name",
+      "param-value": "${key_name}"
+    },
+    {
+      "param-name": "pub_key",
+      "param-value": "${pub_key}"
+    },
+    {
       "param-name": "install_script_version",
       "param-value": "1.2.1-SNAPSHOT"
     },
@@ -101,10 +105,6 @@
       "param-value": "10.0.4.1"
     },
     {
-      "param-name": "pub_key",
-      "param-value": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh"
-    },
-    {
       "param-name": "public_net_id",
       "param-value": "${public_net_id}"
     },
diff --git a/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vsn.vtl b/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vsn.vtl
index c681de5f..727427a6 100644
--- a/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vsn.vtl
+++ b/ms/controllerblueprints/application/load/blueprints/vFW/Templates/vsn.vtl
@@ -65,10 +65,6 @@
       "param-value": "openstack"
     },
     {
-      "param-name": "key_name",
-      "param-value": "${nf-role}_key"
-    },
-    {
       "param-name": "repo_url_artifacts",
       "param-value": "https://nexus.onap.org/content/groups/staging"
     },
@@ -82,7 +78,7 @@
     },
     {
       "param-name": "image_name",
-      "param-value": "Ubuntu 14.04 LTS Generic"
+      "param-value": "${image_name}"
     },
     {
       "param-name": "flavor_name",
@@ -93,6 +89,14 @@
       "param-value": "1.2.1-SNAPSHOT"
     },
     {
+      "param-name": "key_name",
+      "param-value": "${key_name}"
+    },
+    {
+      "param-name": "pub_key",
+      "param-value": "${pub_key}"
+    },
+    {
       "param-name": "demo_artifacts_version",
       "param-value": "1.2.1-SNAPSHOT"
     },
@@ -101,10 +105,6 @@
       "param-value": "10.0.4.1"
     },
     {
-      "param-name": "pub_key",
-      "param-value": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh"
-    },
-    {
       "param-name": "public_net_id",
       "param-value": "${public_net_id}"
     },