projects
/
osm
/
osmclient.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
osm version: added client version
[osm/osmclient.git]
/
osmclient
/
sol005
/
sdncontroller.py
diff --git
a/osmclient/sol005/sdncontroller.py
b/osmclient/sol005/sdncontroller.py
index
6a6c1c1
..
4f3ced4
100644
(file)
--- a/
osmclient/sol005/sdncontroller.py
+++ b/
osmclient/sol005/sdncontroller.py
@@
-37,6
+37,7
@@
class SdnController(object):
# SDNC '--wait' option
def _wait(self, id, deleteFlag=False):
# SDNC '--wait' option
def _wait(self, id, deleteFlag=False):
+ self._client.get_token()
# Endpoint to get operation status
apiUrlStatus = '{}{}{}'.format(self._apiName, self._apiVersion, '/sdns')
# Wait for status for SDN instance creation/update/deletion
# Endpoint to get operation status
apiUrlStatus = '{}{}{}'.format(self._apiName, self._apiVersion, '/sdns')
# Wait for status for SDN instance creation/update/deletion
@@
-51,18
+52,19
@@
class SdnController(object):
def _get_id_for_wait(self, name):
# Returns id of name, or the id itself if given as argument
for sdnc in self.list():
def _get_id_for_wait(self, name):
# Returns id of name, or the id itself if given as argument
for sdnc in self.list():
- if name == sdnc['name']:
- return sdnc['_id']
- for wim in self.list():
if name == sdnc['_id']:
return sdnc['_id']
if name == sdnc['_id']:
return sdnc['_id']
+ for sdnc in self.list():
+ if name == sdnc['name']:
+ return sdnc['_id']
return ''
def create(self, name, sdn_controller, wait=False):
return ''
def create(self, name, sdn_controller, wait=False):
+ self._client.get_token()
http_code, resp = self._http.post_cmd(endpoint=self._apiBase,
postfields_dict=sdn_controller)
http_code, resp = self._http.post_cmd(endpoint=self._apiBase,
postfields_dict=sdn_controller)
- #print
'HTTP CODE: {}'.format(http_code
)
- #print
'RESP: {}'.format(resp
)
+ #print
('HTTP CODE: {}'.format(http_code)
)
+ #print
('RESP: {}'.format(resp)
)
if http_code in (200, 201, 202, 204):
if resp:
resp = json.loads(resp)
if http_code in (200, 201, 202, 204):
if resp:
resp = json.loads(resp)
@@
-83,22
+85,22
@@
class SdnController(object):
raise ClientException("failed to create SDN controller {} - {}".format(name, msg))
def update(self, name, sdn_controller, wait=False):
raise ClientException("failed to create SDN controller {} - {}".format(name, msg))
def update(self, name, sdn_controller, wait=False):
+ self._client.get_token()
sdnc = self.get(name)
sdnc_id_for_wait = self._get_id_for_wait(name)
sdnc = self.get(name)
sdnc_id_for_wait = self._get_id_for_wait(name)
- http_code, resp = self._http.p
ut
_cmd(endpoint='{}/{}'.format(self._apiBase,sdnc['_id']),
+ http_code, resp = self._http.p
atch
_cmd(endpoint='{}/{}'.format(self._apiBase,sdnc['_id']),
postfields_dict=sdn_controller)
postfields_dict=sdn_controller)
- #
print 'HTTP CODE: {}'.format(http_code
)
- #
print 'RESP: {}'.format(resp
)
+ #
print('HTTP CODE: {}'.format(http_code)
)
+ #
print('RESP: {}'.format(resp)
)
if http_code in (200, 201, 202, 204):
if http_code in (200, 201, 202, 204):
- if resp:
- resp = json.loads(resp)
- if not resp or 'id' not in resp:
- raise ClientException('unexpected response from server - {}'.format(
- resp))
if wait:
if wait:
- # Wait for status for SDNC instance update
- self._wait(sdnc_id_for_wait)
- print(resp['id'])
+ # In this case, 'resp' always returns None, so 'resp['id']' cannot be used.
+ # Use the previously obtained id instead.
+ wait_id = sdnc_id_for_wait
+ # Wait for status for VI instance update
+ self._wait(wait_id)
+ else:
+ pass
else:
msg = ""
if resp:
else:
msg = ""
if resp:
@@
-109,6
+111,7
@@
class SdnController(object):
raise ClientException("failed to update SDN controller {} - {}".format(name, msg))
def delete(self, name, force=False, wait=False):
raise ClientException("failed to update SDN controller {} - {}".format(name, msg))
def delete(self, name, force=False, wait=False):
+ self._client.get_token()
sdn_controller = self.get(name)
sdnc_id_for_wait = self._get_id_for_wait(name)
querystring = ''
sdn_controller = self.get(name)
sdnc_id_for_wait = self._get_id_for_wait(name)
querystring = ''
@@
-116,8
+119,8
@@
class SdnController(object):
querystring = '?FORCE=True'
http_code, resp = self._http.delete_cmd('{}/{}{}'.format(self._apiBase,
sdn_controller['_id'], querystring))
querystring = '?FORCE=True'
http_code, resp = self._http.delete_cmd('{}/{}{}'.format(self._apiBase,
sdn_controller['_id'], querystring))
- #print
'HTTP CODE: {}'.format(http_code
)
- #print
'RESP: {}'.format(resp
)
+ #print
('HTTP CODE: {}'.format(http_code)
)
+ #print
('RESP: {}'.format(resp)
)
if http_code == 202:
if wait:
# Wait for status for SDNC instance deletion
if http_code == 202:
if wait:
# Wait for status for SDNC instance deletion
@@
-140,11
+143,12
@@
class SdnController(object):
def list(self, filter=None):
"""Returns a list of SDN controllers
"""
def list(self, filter=None):
"""Returns a list of SDN controllers
"""
+ self._client.get_token()
filter_string = ''
if filter:
filter_string = '?{}'.format(filter)
resp = self._http.get_cmd('{}{}'.format(self._apiBase,filter_string))
filter_string = ''
if filter:
filter_string = '?{}'.format(filter)
resp = self._http.get_cmd('{}{}'.format(self._apiBase,filter_string))
- #print
'RESP: {}'.format(resp
)
+ #print
('RESP: {}'.format(resp)
)
if resp:
return resp
return list()
if resp:
return resp
return list()
@@
-152,6
+156,7
@@
class SdnController(object):
def get(self, name):
"""Returns an SDN controller based on name or id
"""
def get(self, name):
"""Returns an SDN controller based on name or id
"""
+ self._client.get_token()
if utils.validate_uuid4(name):
for sdnc in self.list():
if name == sdnc['_id']:
if utils.validate_uuid4(name):
for sdnc in self.list():
if name == sdnc['_id']: