X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fsol005%2Fns.py;h=58be4e478abc9b91a75b0cf0efa6e8cb454f7123;hb=c93a8268481243eefb9eed58c4e36cf89567a06f;hp=ebb779c67583da9b33cc7506197ec56a72db06f7;hpb=98213d0b29e9a26d113eaced1e0975a1d2ce833c;p=osm%2Fosmclient.git diff --git a/osmclient/sol005/ns.py b/osmclient/sol005/ns.py index ebb779c..58be4e4 100644 --- a/osmclient/sol005/ns.py +++ b/osmclient/sol005/ns.py @@ -74,18 +74,27 @@ class Ns(object): return resp raise NotFound("ns {} not found".format(name)) - def delete(self, name): + def delete(self, name, force=False): ns = self.get(name) - http_code, resp = self._http.delete_cmd('{}/{}'.format(self._apiBase,ns['_id'])) - if resp: - resp = json.loads(resp) + querystring = '' + if force: + querystring = '?FORCE=True' + http_code, resp = self._http.delete_cmd('{}/{}{}'.format(self._apiBase, + ns['_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: - raise ClientException("failed to delete ns {}: {}".format(name, resp)) + msg = "" + if resp: + try: + msg = json.loads(resp) + except ValueError: + msg = resp + raise ClientException("failed to delete ns {} - {}".format(name, msg)) def create(self, nsd_name, nsr_name, account, config=None, ssh_keys=None, description='default description', @@ -115,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: @@ -134,7 +137,7 @@ class Ns(object): if vld.get("vim-network-name"): if isinstance(vld["vim-network-name"], dict): vim_network_name_dict = {} - for vim_account, vim_net in vld["vim-network-name"].items(): + for vim_account, vim_net in list(vld["vim-network-name"].items()): vim_network_name_dict[get_vim_account_id(vim_account)] = vim_net vld["vim-network-name"] = vim_network_name_dict ns["vld"] = ns_config["vld"] @@ -150,16 +153,30 @@ class Ns(object): self._apiResource = '/ns_instances_content' self._apiBase = '{}{}{}'.format(self._apiName, self._apiVersion, self._apiResource) + 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) http_code, resp = self._http.post_cmd(endpoint=self._apiBase, postfields_dict=ns) - if resp: - resp = json.loads(resp) + #print 'HTTP CODE: {}'.format(http_code) #print 'RESP: {}'.format(resp) - if not resp or 'id' not in resp: - raise ClientException('unexpected response from server: '.format( + 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: - print resp['id'] + msg = "" + if resp: + try: + msg = json.loads(resp) + except ValueError: + msg = resp + raise ClientException(msg) except ClientException as exc: message="failed to create ns: {} nsd: {}\nerror:\n{}".format( nsr_name, @@ -178,15 +195,26 @@ class Ns(object): filter_string = '' if filter: filter_string = '&{}'.format(filter) - http_code, resp = self._http.get2_cmd('{}?nsInstanceId={}'.format(self._apiBase, ns['_id'], - filter_string) ) - resp = json.loads(resp) + http_code, resp = self._http.get2_cmd('{}?nsInstanceId={}'.format( + self._apiBase, ns['_id'], + filter_string) ) + #print 'HTTP CODE: {}'.format(http_code) #print 'RESP: {}'.format(resp) if http_code == 200: - return resp + if resp: + resp = json.loads(resp) + return resp + else: + raise ClientException('unexpected response from server') else: - raise ClientException('{}'.format(resp['detail'])) - + msg = "" + if resp: + try: + resp = json.loads(resp) + msg = resp['detail'] + except ValueError: + msg = resp + raise ClientException(msg) except ClientException as exc: message="failed to get operation list of NS {}:\nerror:\n{}".format( name, @@ -201,12 +229,23 @@ class Ns(object): self._apiBase = '{}{}{}'.format(self._apiName, self._apiVersion, self._apiResource) http_code, resp = self._http.get2_cmd('{}/{}'.format(self._apiBase, operationId)) - resp = json.loads(resp) + #print 'HTTP CODE: {}'.format(http_code) #print 'RESP: {}'.format(resp) if http_code == 200: - return resp + if resp: + resp = json.loads(resp) + return resp + else: + raise ClientException('unexpected response from server') else: - raise ClientException("{}".format(resp['detail'])) + msg = "" + if resp: + try: + resp = json.loads(resp) + msg = resp['detail'] + except ValueError: + msg = resp + raise ClientException(msg) except ClientException as exc: message="failed to get status of operation {}:\nerror:\n{}".format( operationId, @@ -225,14 +264,23 @@ class Ns(object): #print 'OP_NAME: {}'.format(op_name) #print 'OP_DATA: {}'.format(json.dumps(op_data)) http_code, resp = self._http.post_cmd(endpoint=endpoint, postfields_dict=op_data) - if resp: - resp = json.loads(resp) + #print 'HTTP CODE: {}'.format(http_code) #print 'RESP: {}'.format(resp) - if not resp or 'id' not in resp: - raise ClientException('unexpected response from server: '.format( + 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: - print resp['id'] + msg = "" + if resp: + try: + msg = json.loads(resp) + except ValueError: + msg = resp + raise ClientException(msg) except ClientException as exc: message="failed to exec operation {}:\nerror:\n{}".format( name, @@ -246,15 +294,22 @@ class Ns(object): try: http_code, resp = self._http.post_cmd(endpoint='/test/message/alarm_request', postfields_dict=data) + #print 'HTTP CODE: {}'.format(http_code) + #print 'RESP: {}'.format(resp) if http_code in (200, 201, 202, 204): #resp = json.loads(resp) - #print 'RESP: {}'.format(resp) - print 'Alarm created' + print('Alarm created') else: - raise ClientException('unexpected response from server: code: {}, resp: {}'.format( - http_code, resp)) + msg = "" + if resp: + try: + msg = json.loads(resp) + except ValueError: + msg = resp + raise ClientException('error: code: {}, resp: {}'.format( + http_code, msg)) except ClientException as exc: - message="failed to create alarm: alarm {}\nerror:\n{}".format( + message="failed to create alarm: alarm {}\n{}".format( alarm, exc.message) raise ClientException(message) @@ -267,16 +322,23 @@ class Ns(object): try: http_code, resp = self._http.post_cmd(endpoint='/test/message/alarm_request', postfields_dict=data) + #print 'HTTP CODE: {}'.format(http_code) + #print 'RESP: {}'.format(resp) if http_code in (200, 201, 202, 204): #resp = json.loads(resp) - #print 'RESP: {}'.format(resp) - print 'Alarm deleted' + print('Alarm deleted') else: - raise ClientException('unexpected response from server: code: {}, resp: {}'.format( - http_code, resp)) + msg = "" + if resp: + try: + msg = json.loads(resp) + except ValueError: + msg = resp + raise ClientException('error: code: {}, resp: {}'.format( + http_code, msg)) except ClientException as exc: - message="failed to delete alarm: alarm {}\nerror:\n{}".format( - alarm, + message="failed to delete alarm: alarm {}\n{}".format( + name, exc.message) raise ClientException(message) @@ -286,15 +348,22 @@ class Ns(object): try: http_code, resp = self._http.post_cmd(endpoint='/test/message/metric_request', postfields_dict=data) + #print 'HTTP CODE: {}'.format(http_code) + #print 'RESP: {}'.format(resp) if http_code in (200, 201, 202, 204): #resp = json.loads(resp) - #print 'RESP: {}'.format(resp) return 'Metric exported' else: - raise ClientException('unexpected response from server: code: {}, resp: {}'.format( - http_code, resp)) + msg = "" + if resp: + try: + msg = json.loads(resp) + except ValueError: + msg = resp + raise ClientException('error: code: {}, resp: {}'.format( + http_code, msg)) except ClientException as exc: - message="failed to export metric: metric {}\nerror:\n{}".format( + message="failed to export metric: metric {}\n{}".format( metric, exc.message) raise ClientException(message)