querystring = '?FORCE=True'
http_code, resp = self._http.delete_cmd('{}/{}{}'.format(self._apiBase,
ns['_id'], querystring))
- if resp:
- resp = json.loads(resp)
+ #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,
+ def create(self, nsd_name, nsr_name, account, wim_account=None, config=None,
ssh_keys=None, description='default description',
admin_status='ENABLED'):
nsd = self._client.nsd.get(nsd_name)
vim_account_id = {}
+ wim_account_id = {}
def get_vim_account_id(vim_account):
if vim_account_id.get(vim_account):
vim_account_id[vim_account] = vim['_id']
return vim['_id']
+ def get_wim_account_id(wim_account):
+ if not isinstance(wim_account, str):
+ return wim_account
+ if wim_account_id.get(wim_account):
+ return wim_account_id[wim_account]
+
+ wim = self._client.wim.get(wim_account)
+ if wim is None:
+ raise NotFound("cannot find wim account '{}'".format(wim_account))
+ wim_account_id[wim_account] = wim['_id']
+ return wim['_id']
+
ns = {}
ns['nsdId'] = nsd['_id']
ns['nsName'] = nsr_name
ns['nsDescription'] = description
ns['vimAccountId'] = get_vim_account_id(account)
+ if wim_account: # at this point is a string or None
+ ns['wimAccountId'] = get_wim_account_id(yaml.load(wim_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})
- #
- # 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:
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
+ if "wim_account" in vld and vld["wim_account"] is not None:
+ vld["wimAccountId"] = get_wim_account_id(vld.pop("wim_account"))
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["vnf"] = ns_config["vnf"]
- #print yaml.safe_dump(ns)
+ if "additionalParamsForNs" in ns_config:
+ ns["additionalParamsForNs"] = ns_config.pop("additionalParamsForNs")
+ if not isinstance(ns["additionalParamsForNs"], dict):
+ raise ValueError("Error at --config 'additionalParamsForNs' must be a dictionary")
+ if "additionalParamsForVnf" in ns_config:
+ ns["additionalParamsForVnf"] = ns_config.pop("additionalParamsForVnf")
+ if not isinstance(ns["additionalParamsForVnf"], list):
+ raise ValueError("Error at --config 'additionalParamsForVnf' must be a list")
+ for additional_param_vnf in ns["additionalParamsForVnf"]:
+ if not isinstance(additional_param_vnf, dict):
+ raise ValueError("Error at --config 'additionalParamsForVnf' items must be dictionaries")
+ if not additional_param_vnf.get("member-vnf-index"):
+ raise ValueError("Error at --config 'additionalParamsForVnf' items must contain "
+ "'member-vnf-index'")
+ if not additional_param_vnf.get("additionalParams"):
+ raise ValueError("Error at --config 'additionalParamsForVnf' items must contain "
+ "'additionalParams'")
+
+ # print yaml.safe_dump(ns)
try:
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))
+ return 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,
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,
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,
#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,
exc.message)
raise ClientException(message)
+ def scale_vnf(self, ns_name, vnf_name, scaling_group, scale_in, scale_out):
+ """Scales a VNF by adding/removing VDUs
+ """
+ try:
+ op_data={}
+ op_data["scaleType"] = "SCALE_VNF"
+ op_data["scaleVnfData"] = {}
+ if scale_in:
+ op_data["scaleVnfData"]["scaleVnfType"] = "SCALE_IN"
+ else:
+ op_data["scaleVnfData"]["scaleVnfType"] = "SCALE_OUT"
+ op_data["scaleVnfData"]["scaleByStepData"] = {
+ "member-vnf-index": vnf_name,
+ "scaling-group-descriptor": scaling_group,
+ }
+ self.exec_op(ns_name, op_name='scale', op_data=op_data)
+ except ClientException as exc:
+ message="failed to scale vnf {} of ns {}:\nerror:\n{}".format(
+ vnf_name, ns_name, exc.message)
+ raise ClientException(message)
+
def create_alarm(self, alarm):
data = {}
data["create_alarm_request"] = {}
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)
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)
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)
+ def get_field(self, ns_name, field):
+ nsr = self.get(ns_name)
+ if nsr is None:
+ raise NotFound("failed to retrieve ns {}".format(ns_name))
+
+ if field in nsr:
+ return nsr[field]
+
+ raise NotFound("failed to find {} in ns {}".format(field, ns_name))
projects / osm / osmclient.git / blobdiff