X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fsol005%2Fns.py;h=387bcd573bbf89c1f6a74504d7bd2b8d1d3a64a7;hb=5b342f49c7a37323a79b11e51e745c5a1a8f2439;hp=90bf8db8dea4f72aef8115b5c2fd9207febbfa73;hpb=c2f12869b821fbb5d68a8443d5e330382218b646;p=osm%2Fosmclient.git

diff --git a/osmclient/sol005/ns.py b/osmclient/sol005/ns.py
index 90bf8db..387bcd5 100644
--- a/osmclient/sol005/ns.py
+++ b/osmclient/sol005/ns.py
@@ -124,16 +124,10 @@ class Ns(object):
         #ns['userdata']['key2']='value2'
 
         if ssh_keys is not None:
-            # ssh_keys is comma separate list
-            # ssh_keys_format = []
-            # for key in ssh_keys.split(','):
-            #     ssh_keys_format.append({'key-pair-ref': key})
-            #
-            # ns['ssh-authorized-key'] = ssh_keys_format
-            ns['ssh-authorized-key'] = []
+            ns['ssh_keys'] = []
             for pubkeyfile in ssh_keys.split(','):
                 with open(pubkeyfile, 'r') as f:
-                    ns['ssh-authorized-key'].append(f.read())
+                    ns['ssh_keys'].append(f.read())
         if config:
             ns_config = yaml.load(config)
             if "vim-network-name" in ns_config:
@@ -174,7 +168,7 @@ class Ns(object):
                 if not resp or 'id' not in resp:
                     raise ClientException('unexpected response from server - {} '.format(
                                       resp))
-                print(resp['id'])
+                return resp['id']
             else:
                 msg = ""
                 if resp:
@@ -374,3 +368,12 @@ class Ns(object):
                     exc.message)
             raise ClientException(message)
 
+    def get_field(self, ns_name, field):
+        nsr = self.get(ns_name)
+        if nsr is None:
+            raise NotFound("failed to retrieve ns {}".format(ns_name))
+
+        if field in nsr:
+            return nsr[field]
+
+        raise NotFound("failed to find {} in ns {}".format(field, ns_name))