X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fsol005%2Fpdud.py;h=df5bad1a8c279617fe287435f5a93aa7a1040b10;hb=8fdbc7b94c475febecf9896d9ea1e715f82c3daa;hp=22ca8bc58afca2aa05ebe950ed9a9bfd2fc224e3;hpb=93012adc64eb063b27bc030c9d6734d1db782cbd;p=osm%2Fosmclient.git diff --git a/osmclient/sol005/pdud.py b/osmclient/sol005/pdud.py index 22ca8bc..df5bad1 100644 --- a/osmclient/sol005/pdud.py +++ b/osmclient/sol005/pdud.py @@ -22,106 +22,121 @@ from osmclient.common.exceptions import NotFound from osmclient.common.exceptions import ClientException from osmclient.common import utils import json +import logging class Pdu(object): - def __init__(self, http=None, client=None): self._http = http self._client = client - self._apiName = '/pdu' - self._apiVersion = '/v1' - self._apiResource = '/pdu_descriptors' - self._apiBase = '{}{}{}'.format(self._apiName, - self._apiVersion, self._apiResource) + self._logger = logging.getLogger("osmclient") + self._apiName = "/pdu" + self._apiVersion = "/v1" + self._apiResource = "/pdu_descriptors" + self._apiBase = "{}{}{}".format( + self._apiName, self._apiVersion, self._apiResource + ) def list(self, filter=None): + self._logger.debug("") self._client.get_token() - filter_string = '' + filter_string = "" if filter: - filter_string = '?{}'.format(filter) - resp = self._http.get_cmd('{}{}'.format(self._apiBase,filter_string)) + filter_string = "?{}".format(filter) + _, resp = self._http.get2_cmd("{}{}".format(self._apiBase, filter_string)) if resp: - return resp + return json.loads(resp) return list() def get(self, name): + self._logger.debug("") self._client.get_token() if utils.validate_uuid4(name): for pdud in self.list(): - if name == pdud['_id']: + if name == pdud["_id"]: return pdud else: for pdud in self.list(): - if 'name' in pdud and name == pdud['name']: + if "name" in pdud and name == pdud["name"]: return pdud raise NotFound("pdud {} not found".format(name)) def get_individual(self, name): + self._logger.debug("") pdud = self.get(name) # It is redundant, since the previous one already gets the whole pdudInfo # The only difference is that a different primitive is exercised - resp = self._http.get_cmd('{}/{}'.format(self._apiBase, pdud['_id'])) - #print(yaml.safe_dump(resp)) + try: + _, resp = self._http.get2_cmd("{}/{}".format(self._apiBase, pdud["_id"])) + except NotFound: + raise NotFound("pdu '{}' not found".format(name)) + # print(yaml.safe_dump(resp)) if resp: - return resp - raise NotFound("pdu {} not found".format(name)) + return json.loads(resp) + raise NotFound("pdu '{}' not found".format(name)) def delete(self, name, force=False): + self._logger.debug("") pdud = self.get(name) - querystring = '' + querystring = "" if force: - querystring = '?FORCE=True' - http_code, resp = self._http.delete_cmd('{}/{}{}'.format(self._apiBase, - pdud['_id'], querystring)) - #print('HTTP CODE: {}'.format(http_code)) - #print('RESP: {}'.format(resp)) + querystring = "?FORCE=True" + http_code, resp = self._http.delete_cmd( + "{}/{}{}".format(self._apiBase, pdud["_id"], querystring) + ) + # print('HTTP CODE: {}'.format(http_code)) + # print('RESP: {}'.format(resp)) if http_code == 202: - print('Deletion in progress') + print("Deletion in progress") elif http_code == 204: - print('Deleted') + print("Deleted") else: - msg = "" - if resp: - try: - msg = json.loads(resp) - except ValueError: - msg = resp + msg = resp or "" + # if resp: + # try: + # msg = json.loads(resp) + # except ValueError: + # msg = resp raise ClientException("failed to delete pdu {} - {}".format(name, msg)) def create(self, pdu, update_endpoint=None): + self._logger.debug("") self._client.get_token() - headers= self._client._headers - headers['Content-Type'] = 'application/yaml' - http_header = ['{}: {}'.format(key,val) - for (key,val) in list(headers.items())] + headers = self._client._headers + headers["Content-Type"] = "application/yaml" + http_header = [ + "{}: {}".format(key, val) for (key, val) in list(headers.items()) + ] self._http.set_http_header(http_header) if update_endpoint: - http_code, resp = self._http.put_cmd(endpoint=update_endpoint, postfields_dict=pdu) + http_code, resp = self._http.put_cmd( + endpoint=update_endpoint, postfields_dict=pdu + ) else: endpoint = self._apiBase - #endpoint = '{}{}'.format(self._apiBase,ow_string) - http_code, resp = self._http.post_cmd(endpoint=endpoint, postfields_dict=pdu) - #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 not resp or 'id' not in resp: - raise ClientException('unexpected response from server: '.format( - resp)) - print(resp['id']) - else: - msg = "Error {}".format(http_code) - if resp: - try: - msg = "{} - {}".format(msg, json.loads(resp)) - except ValueError: - msg = "{} - {}".format(msg, resp) - raise ClientException("failed to create/update pdu - {}".format(msg)) + # endpoint = '{}{}'.format(self._apiBase,ow_string) + http_code, resp = self._http.post_cmd( + endpoint=endpoint, postfields_dict=pdu + ) + # 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 not resp or "id" not in resp: + raise ClientException("unexpected response from server: {}".format(resp)) + print(resp["id"]) + # else: + # msg = "Error {}".format(http_code) + # if resp: + # try: + # msg = "{} - {}".format(msg, json.loads(resp)) + # except ValueError: + # msg = "{} - {}".format(msg, resp) + # raise ClientException("failed to create/update pdu - {}".format(msg)) def update(self, name, filename): + self._logger.debug("") pdud = self.get(name) - endpoint = '{}/{}'.format(self._apiBase, pdud['_id']) + endpoint = "{}/{}".format(self._apiBase, pdud["_id"]) self.create(filename=filename, update_endpoint=endpoint) -