From: tierno <alfonso.tiernosepulveda@telefonica.com>
Date: Wed, 17 Jan 2018 17:31:28 +0000 (+0100)
Subject: Inject ssh-pub-key only to those neededs vnfs
X-Git-Tag: v3.0.3~11
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=f1c8e226b03b82af0cc47108fad96c3751ce03a7;p=osm%2FRO.git

Inject ssh-pub-key only to those neededs vnfs

Change-Id: I955b2dd12bda8865d7f8cc168a4e5af61c687427
Signed-off-by: tierno <alfonso.tiernosepulveda@telefonica.com>
---

diff --git a/openmanod b/openmanod
index 5bff6513..a078e9f3 100755
--- a/openmanod
+++ b/openmanod
@@ -48,7 +48,7 @@ import osm_ro
 
 __author__ = "Alfonso Tierno, Gerardo Garcia, Pablo Montes"
 __date__ = "$26-aug-2014 11:09:29$"
-__version__ = "0.5.48-r558"
+__version__ = "0.5.49-r559"
 version_date = "Jan 2018"
 database_version = 27      # expected database schema version
 
diff --git a/osm_ro/nfvo.py b/osm_ro/nfvo.py
index 0a357816..ccec6ce5 100644
--- a/osm_ro/nfvo.py
+++ b/osm_ro/nfvo.py
@@ -2791,10 +2791,6 @@ def create_instance(mydb, tenant_id, instance_dict):
 
         # 0.1 parse cloud-config parameters
         cloud_config = unify_cloud_config(instance_dict.get("cloud-config"), scenarioDict.get("cloud-config"))
-        # We add the RO key to cloud_config
-        if tenant[0].get('RO_pub_key'):
-            RO_key = {"key-pairs": [tenant[0]['RO_pub_key']]}
-            cloud_config = unify_cloud_config(cloud_config, RO_key)
 
         # 0.2 merge instance information into scenario
         # Ideally, the operation should be as simple as: update(scenarioDict,instance_dict)
@@ -3021,6 +3017,10 @@ def create_instance(mydb, tenant_id, instance_dict):
         # myvim.new_vminstance(self,vimURI,tenant_id,name,description,image_id,flavor_id,net_dict)
         sce_vnf_list = sorted(scenarioDict['vnfs'], key=lambda k: k['name']) 
         for sce_vnf in sce_vnf_list:
+            ssh_access = None
+            if sce_vnf.get('mgmt_access'):
+                mgmt_access = yaml.load(sce_vnf['mgmt_access'])
+                ssh_access = mgmt_access['config-access']['ssh-access']
             vnf_availability_zones = []
             for vm in sce_vnf['vms']:
                 vm_av = vm.get('availability_zone')
@@ -3170,10 +3170,15 @@ def create_instance(mydb, tenant_id, instance_dict):
                 # print "networks", yaml.safe_dump(myVMDict['networks'], indent=4, default_flow_style=False)
                 # print "interfaces", yaml.safe_dump(vm['interfaces'], indent=4, default_flow_style=False)
                 # print ">>>>>>>>>>>>>>>>>>>>>>>>>>>"
+
+                # We add the RO key to cloud_config if vnf will need ssh access
+                cloud_config_vm = cloud_config
+                if ssh_access and ssh_access['required'] and ssh_access['default-user'] and tenant[0].get('RO_pub_key'):
+                    RO_key = {"key-pairs": [tenant[0]['RO_pub_key']]}
+                    cloud_config_vm = unify_cloud_config(cloud_config_vm, RO_key)
                 if vm.get("boot_data"):
-                    cloud_config_vm = unify_cloud_config(vm["boot_data"], cloud_config)
-                else:
-                    cloud_config_vm = cloud_config
+                    cloud_config_vm = unify_cloud_config(vm["boot_data"], cloud_config_vm)
+
                 if myVMDict.get('availability_zone'):
                     av_index = vnf_availability_zones.index(myVMDict['availability_zone'])
                 else: