X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osmclient%2Fsol005%2Fns.py;h=99fb83e905fe6633cc67f055c5f5d855afb30b0d;hb=ce093de18e01ebda56b54c36ab69074cf3761f50;hp=b1678cff3fb79b03b2407bac6e408e48946b3702;hpb=c04a7061925ef668f67355639a262e9b4f402197;p=osm%2Fosmclient.git diff --git a/osmclient/sol005/ns.py b/osmclient/sol005/ns.py index b1678cf..99fb83e 100644 --- a/osmclient/sol005/ns.py +++ b/osmclient/sol005/ns.py @@ -22,6 +22,7 @@ from osmclient.common import utils from osmclient.common.exceptions import ClientException from osmclient.common.exceptions import NotFound import yaml +import json class Ns(object): @@ -75,9 +76,11 @@ class Ns(object): def delete(self, name): ns = self.get(name) - resp = self._http.delete_cmd('{}/{}'.format(self._apiBase,ns['_id'])) - #print 'RESP: '.format(resp) - if resp is None: + http_code, resp = self._http.delete_cmd('{}/{}'.format(self._apiBase,ns['_id'])) + #print 'RESP: {}'.format(resp) + if http_code == 202: + print 'Deletion in progress' + elif http_code == 204: print 'Deleted' else: raise ClientException("failed to delete ns {}: {}".format(name, resp)) @@ -87,36 +90,64 @@ class Ns(object): admin_status='ENABLED'): nsd = self._client.nsd.get(nsd_name) - - datacenter = self._client.vim.get(account) - if datacenter is None: - raise NotFound("cannot find datacenter account {}".format(account)) + + vim_account_id = {} + + def get_vim_account_id(vim_account): + if vim_account_id.get(vim_account): + return vim_account_id[vim_account] + + vim = self._client.vim.get(vim_account) + if vim is None: + raise NotFound("cannot find vim account '{}'".format(vim_account)) + vim_account_id[vim_account] = vim['_id'] + return vim['_id'] ns = {} ns['nsdId'] = nsd['_id'] ns['nsName'] = nsr_name ns['nsDescription'] = description - ns['vimAccountId'] = datacenter['_id'] + ns['vimAccountId'] = get_vim_account_id(account) #ns['userdata'] = {} #ns['userdata']['key1']='value1' #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}) + # 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'] = ssh_keys.split(',') + if config: + ns_config = yaml.load(config) + if "vim-network-name" in ns_config: + ns_config["vld"] = ns_config.pop("vim-network-name") + if "vld" in ns_config: + for vld in ns_config["vld"]: + 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(): + 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"] + if "vnf" in ns_config: + for vnf in ns_config["vnf"]: + if vnf.get("vim_account"): + vnf["vimAccountId"] = get_vim_account_id(vnf.pop("vim_account")) - ns['ssh-authorized-key'] = ssh_keys_format + ns["vnf"] = ns_config["vnf"] #print yaml.safe_dump(ns) try: self._apiResource = '/ns_instances_content' self._apiBase = '{}{}{}'.format(self._apiName, self._apiVersion, self._apiResource) - #print resp resp = self._http.post_cmd(endpoint=self._apiBase, postfields_dict=ns) + #print 'RESP: {}'.format(resp) if not resp or 'id' not in resp: raise ClientException('unexpected response from server: '.format( resp)) @@ -129,3 +160,73 @@ class Ns(object): exc.message) raise ClientException(message) + def list_op(self, name, filter=None): + """Returns the list of operations of a NS + """ + ns = self.get(name) + try: + self._apiResource = '/ns_lcm_op_occs' + self._apiBase = '{}{}{}'.format(self._apiName, + self._apiVersion, self._apiResource) + 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.decode()) + #print 'RESP: {}'.format(resp) + if http_code == 200: + return resp + else: + raise ClientException('{}'.format(resp['detail'])) + + except ClientException as exc: + message="failed to get operation list of NS {}:\nerror:\n{}".format( + name, + exc.message) + raise ClientException(message) + + def get_op(self, operationId): + """Returns the status of an operation + """ + try: + self._apiResource = '/ns_lcm_op_occs' + self._apiBase = '{}{}{}'.format(self._apiName, + self._apiVersion, self._apiResource) + http_code, resp = self._http.get2_cmd('{}/{}'.format(self._apiBase, operationId)) + resp = json.loads(resp.decode()) + #print 'RESP: {}'.format(resp) + if http_code == 200: + return resp + else: + raise ClientException("{}".format(resp['detail'])) + except ClientException as exc: + message="failed to get status of operation {}:\nerror:\n{}".format( + operationId, + exc.message) + raise ClientException(message) + + def exec_op(self, name, op_name, op_data=None): + """Executes an operation on a NS + """ + ns = self.get(name) + try: + self._apiResource = '/ns_instances' + self._apiBase = '{}{}{}'.format(self._apiName, + self._apiVersion, self._apiResource) + endpoint = '{}/{}/{}'.format(self._apiBase, ns['_id'], op_name) + #print 'OP_NAME: {}'.format(op_name) + #print 'OP_DATA: {}'.format(json.dumps(op_data)) + resp = self._http.post_cmd(endpoint=endpoint, postfields_dict=op_data) + #print 'RESP: {}'.format(resp) + if not resp or 'id' not in resp: + raise ClientException('unexpected response from server: '.format( + resp)) + else: + print resp['id'] + except ClientException as exc: + message="failed to exec operation {}:\nerror:\n{}".format( + name, + exc.message) + raise ClientException(message) +