X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fsol005%2Fsdncontroller.py;h=5b85ef46a36d91f2fefcaafcfed32cdb2631c006;hb=refs%2Fchanges%2F38%2F8738%2F9;hp=29b8f6897b2281420c0aa4c32361bdf2a50e56ae;hpb=1b6c5b581dc29170b0bc81f909a41a322760de9a;p=osm%2Fosmclient.git diff --git a/osmclient/sol005/sdncontroller.py b/osmclient/sol005/sdncontroller.py index 29b8f68..5b85ef4 100644 --- a/osmclient/sol005/sdncontroller.py +++ b/osmclient/sol005/sdncontroller.py @@ -19,80 +19,161 @@ OSM SDN controller API handling """ from osmclient.common import utils +from osmclient.common import wait as WaitForStatus from osmclient.common.exceptions import ClientException from osmclient.common.exceptions import NotFound -import yaml import json +import logging +import yaml class SdnController(object): def __init__(self, http=None, client=None): self._http = http self._client = client + self._logger = logging.getLogger('osmclient') self._apiName = '/admin' self._apiVersion = '/v1' self._apiResource = '/sdns' self._apiBase = '{}{}{}'.format(self._apiName, self._apiVersion, self._apiResource) - def create(self, name, sdn_controller): + + # SDNC '--wait' option + def _wait(self, id, wait_time, deleteFlag=False): + self._logger.debug("") + 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 + if isinstance(wait_time, bool): + wait_time = WaitForStatus.TIMEOUT_SDNC_OPERATION + WaitForStatus.wait_for_status( + 'SDNC', + str(id), + wait_time, + apiUrlStatus, + self._http.get2_cmd, + deleteFlag=deleteFlag) + + def _get_id_for_wait(self, name): + """Returns id of name, or the id itself if given as argument + """ + self._logger.debug("") + for sdnc in self.list(): + 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): + self._logger.debug("") + if 'config' in sdn_controller and isinstance(sdn_controller["config"], str): + sdn_controller["config"] = yaml.safe_load(sdn_controller["config"]) + self._client.get_token() http_code, resp = self._http.post_cmd(endpoint=self._apiBase, postfields_dict=sdn_controller) + #print('HTTP CODE: {}'.format(http_code)) + #print('RESP: {}'.format(resp)) + #if http_code in (200, 201, 202, 204): if resp: resp = json.loads(resp) - #print 'RESP: {}'.format(resp) if not resp or 'id' not in resp: - raise ClientException('failed to create SDN controller: '.format( + raise ClientException('unexpected response from server - {}'.format( resp)) - else: - print resp['id'] + if wait: + # Wait for status for SDNC instance creation + self._wait(resp.get('id'), wait) + print(resp['id']) + #else: + # msg = "" + # if resp: + # try: + # msg = json.loads(resp) + # except ValueError: + # msg = resp + # raise ClientException("failed to create SDN controller {} - {}".format(name, msg)) - def update(self, name, sdn_controller): + def update(self, name, sdn_controller, wait=False): + self._logger.debug("") + if 'config' in sdn_controller and isinstance(sdn_controller["config"], str): + sdn_controller["config"] = yaml.safe_load(sdn_controller["config"]) + self._client.get_token() sdnc = self.get(name) + sdnc_id_for_wait = self._get_id_for_wait(name) http_code, resp = self._http.patch_cmd(endpoint='{}/{}'.format(self._apiBase,sdnc['_id']), - postfields_dict=sdn_controller) - if resp: - resp = json.loads(resp) - #print 'RESP: {}'.format(resp) - if not resp or 'id' not in resp: - raise ClientException('failed to update SDN controller: '.format( - resp)) - else: - print resp['id'] + postfields_dict=sdn_controller) + # print('HTTP CODE: {}'.format(http_code)) + # print('RESP: {}'.format(resp)) + #if http_code in (200, 201, 202, 204): + if wait: + # 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, wait) + # else: + # pass + #else: + # msg = "" + # if resp: + # try: + # msg = json.loads(resp) + # except ValueError: + # msg = resp + # raise ClientException("failed to update SDN controller {} - {}".format(name, msg)) - def delete(self, name, force=False): + def delete(self, name, force=False, wait=False): + self._logger.debug("") + self._client.get_token() sdn_controller = self.get(name) + sdnc_id_for_wait = self._get_id_for_wait(name) querystring = '' if force: querystring = '?FORCE=True' http_code, resp = self._http.delete_cmd('{}/{}{}'.format(self._apiBase, - sdn_controller['_id'], querystring)) - if resp: - resp = json.loads(resp) - #print 'RESP: {}'.format(resp) + sdn_controller['_id'], querystring)) + # print('HTTP CODE: {}'.format(http_code)) + # print('RESP: {}'.format(resp)) if http_code == 202: - print 'Deletion in progress' + if wait: + # Wait for status for SDNC instance deletion + self._wait(sdnc_id_for_wait, wait, deleteFlag=True) + else: + print('Deletion in progress') elif http_code == 204: - print 'Deleted' - elif 'result' in resp: - print 'Deleted' + print('Deleted') + elif resp and 'result' in resp: + print('Deleted') else: - raise ClientException("failed to delete vim {} - {}".format(name, resp)) + msg = resp or "" + # if resp: + # try: + # msg = json.loads(resp) + # except ValueError: + # msg = resp + raise ClientException("failed to delete SDN controller {} - {}".format(name, msg)) def list(self, filter=None): """Returns a list of SDN controllers """ + self._logger.debug("") + self._client.get_token() filter_string = '' if filter: filter_string = '?{}'.format(filter) - resp = self._http.get_cmd('{}{}'.format(self._apiBase,filter_string)) - #print 'RESP: {}'.format(resp) + _, resp = self._http.get2_cmd('{}{}'.format(self._apiBase,filter_string)) + #print('RESP: {}'.format(resp)) if resp: - return resp + return json.loads(resp) return list() def get(self, name): """Returns an SDN controller based on name or id """ + self._logger.debug("") + self._client.get_token() if utils.validate_uuid4(name): for sdnc in self.list(): if name == sdnc['_id']: @@ -103,4 +184,3 @@ class SdnController(object): return sdnc raise NotFound("SDN controller {} not found".format(name)) -