projects
/
osm
/
osmclient.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Add get_field method"
[osm/osmclient.git]
/
osmclient
/
sol005
/
ns.py
diff --git
a/osmclient/sol005/ns.py
b/osmclient/sol005/ns.py
index
90bf8db
..
387bcd5
100644
(file)
--- 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:
#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:
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:
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))
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:
else:
msg = ""
if resp:
@@
-374,3
+368,12
@@
class Ns(object):
exc.message)
raise ClientException(message)
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))