Revert "RIFT-14721: Added update mode for RO account, also enabled unit tests for...

[osm/SO.git] / rwlaunchpad / plugins / rwnsm / rift / tasklets / rwnsmtasklet / openmano_nsm.py

diff --git a/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py b/rwlaunchpad/plugins/rwnsm/rift/tasklets/rwnsmtasklet/openmano_nsm.py
index bdd5b32..1537b3d 100644 (file)
--- 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):