X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=rwlaunchpad%2Fplugins%2Frwnsm%2Frift%2Ftasklets%2Frwnsmtasklet%2Fopenmano_nsm.py;h=1537b3d999b231d1fd64fa2285121c2ad725ce8b;hb=8c799681ac1cf3383807d6eb404f56b71f938aba;hp=bdd5b321058d1681165c9739b3521afb583e9772;hpb=4e6cebcf2f15e9c9370d5af6b725629a70ac9b1a;p=osm%2FSO.git diff --git a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py index bdd5b321..1537b3d9 100644 --- a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py +++ b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py @@ -309,8 +309,9 @@ class OpenmanoNsr(object): user = {} user["name"] = user_entry.name user["key-pairs"] = list() - for ssh_key in user_entry.key_pair: - user["key-pairs"].append(ssh_key.key) + for ssh_key in user_entry.ssh_authorized_key: + if ssh_key.key_pair_ref in self._key_pairs: + user["key-pairs"].append(self._key_pairs[ssh_key.key_pair_ref].key) users.append(user) for user_entry in self._nsd_msg.user: @@ -390,8 +391,7 @@ class OpenmanoNsr(object): if ip_profile: openmano_instance_create["networks"][vld_msg.name]['ip-profile'] = ip_profile - - return yaml.safe_dump(openmano_instance_create, default_flow_style=False) + return yaml.safe_dump(openmano_instance_create, default_flow_style=False,width=1000) @asyncio.coroutine def add_vlr(self, vlr):