"""
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
self._apiBase = '{}{}{}'.format(self._apiName,
self._apiVersion, self._apiResource)
+ # NSI '--wait' option
+ def _wait(self, id, deleteFlag=False):
+ # Endpoint to get operation status
+ apiUrlStatus = '{}{}{}'.format(self._apiName, self._apiVersion, '/nsi_lcm_op_occs')
+ # Wait for status for NSI instance creation/update/deletion
+ WaitForStatus.wait_for_status(
+ 'NSI',
+ str(id),
+ WaitForStatus.TIMEOUT_NSI_OPERATION,
+ apiUrlStatus,
+ self._http.get2_cmd,
+ deleteFlag=deleteFlag)
+
def list(self, filter=None):
"""Returns a list of NSI
"""
break
resp = self._http.get_cmd('{}/{}'.format(self._apiBase, nsi_id))
#resp = self._http.get_cmd('{}/{}/nsd_content'.format(self._apiBase, nsi_id))
- #print yaml.safe_dump(resp)
+ #print(yaml.safe_dump(resp))
if resp:
return resp
raise NotFound("nsi {} not found".format(name))
- def delete(self, name, force=False):
+ def delete(self, name, force=False, wait=False):
nsi = self.get(name)
querystring = ''
if force:
querystring = '?FORCE=True'
http_code, resp = self._http.delete_cmd('{}/{}{}'.format(self._apiBase,
nsi['_id'], querystring))
- #print 'HTTP CODE: {}'.format(http_code)
- #print 'RESP: {}'.format(resp)
+ # print('HTTP CODE: {}'.format(http_code))
+ # print('RESP: {}'.format(resp))
if http_code == 202:
- print('Deletion in progress')
+ if wait and resp:
+ resp = json.loads(resp)
+ # Wait for status for NSI instance deletion
+ # For the 'delete' operation, '_id' is used
+ self._wait(resp.get('_id'), deleteFlag=True)
+ else:
+ print('Deletion in progress')
elif http_code == 204:
print('Deleted')
else:
def create(self, nst_name, nsi_name, account, config=None,
ssh_keys=None, description='default description',
- admin_status='ENABLED'):
+ admin_status='ENABLED', wait=False):
nst = self._client.nst.get(nst_name)
with open(pubkeyfile, 'r') as f:
nsi['ssh_keys'].append(f.read())
if config:
- nsi_config = yaml.load(config)
+ nsi_config = yaml.safe_load(config)
if "netslice-vld" in nsi_config:
for vld in nsi_config["netslice-vld"]:
if vld.get("vim-network-name"):
vnf["vimAccountId"] = get_vim_account_id(vnf.pop("vim_account"))
nsi["netslice-subnet"] = nsi_config["netslice-subnet"]
- #print yaml.safe_dump(nsi)
+ if "additionalParamsForNsi" in nsi_config:
+ nsi["additionalParamsForNsi"] = nsi_config.pop("additionalParamsForNsi")
+ if not isinstance(nsi["additionalParamsForNsi"], dict):
+ raise ValueError("Error at --config 'additionalParamsForNsi' must be a dictionary")
+ if "additionalParamsForSubnet" in nsi_config:
+ nsi["additionalParamsForSubnet"] = nsi_config.pop("additionalParamsForSubnet")
+ if not isinstance(nsi["additionalParamsForSubnet"], list):
+ raise ValueError("Error at --config 'additionalParamsForSubnet' must be a list")
+ for additional_param_subnet in nsi["additionalParamsForSubnet"]:
+ if not isinstance(additional_param_subnet, dict):
+ raise ValueError("Error at --config 'additionalParamsForSubnet' items must be dictionaries")
+ if not additional_param_subnet.get("id"):
+ raise ValueError("Error at --config 'additionalParamsForSubnet' items must contain subnet 'id'")
+ if not additional_param_subnet.get("additionalParamsForNs") and\
+ not additional_param_subnet.get("additionalParamsForVnf"):
+ raise ValueError("Error at --config 'additionalParamsForSubnet' items must contain "
+ "'additionalParamsForNs' and/or 'additionalParamsForVnf'")
+
+ # print(yaml.safe_dump(nsi))
try:
self._apiResource = '/netslice_instances_content'
self._apiBase = '{}{}{}'.format(self._apiName,
self._http.set_http_header(http_header)
http_code, resp = self._http.post_cmd(endpoint=self._apiBase,
postfields_dict=nsi)
- #print 'HTTP CODE: {}'.format(http_code)
- #print 'RESP: {}'.format(resp)
+ #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))
+ if wait:
+ # Wait for status for NSI instance creation
+ self._wait(resp.get('nsilcmop_id'))
print(resp['id'])
else:
msg = ""
filter_string = ''
if filter:
filter_string = '&{}'.format(filter)
- http_code, resp = self._http.get2_cmd('{}?nsiInstanceId={}'.format(
+ http_code, resp = self._http.get2_cmd('{}?netsliceInstanceId={}'.format(
self._apiBase, nsi['_id'],
filter_string) )
- #print 'HTTP CODE: {}'.format(http_code)
- #print 'RESP: {}'.format(resp)
+ #print('HTTP CODE: {}'.format(http_code))
+ #print('RESP: {}'.format(resp))
if http_code == 200:
if resp:
resp = json.loads(resp)
self._apiBase = '{}{}{}'.format(self._apiName,
self._apiVersion, self._apiResource)
http_code, resp = self._http.get2_cmd('{}/{}'.format(self._apiBase, operationId))
- #print 'HTTP CODE: {}'.format(http_code)
- #print 'RESP: {}'.format(resp)
+ #print('HTTP CODE: {}'.format(http_code))
+ #print('RESP: {}'.format(resp))
if http_code == 200:
if resp:
resp = json.loads(resp)
self._apiBase = '{}{}{}'.format(self._apiName,
self._apiVersion, self._apiResource)
endpoint = '{}/{}/{}'.format(self._apiBase, nsi['_id'], op_name)
- #print 'OP_NAME: {}'.format(op_name)
- #print 'OP_DATA: {}'.format(json.dumps(op_data))
+ #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)
- #print 'HTTP CODE: {}'.format(http_code)
- #print 'RESP: {}'.format(resp)
+ #print('HTTP CODE: {}'.format(http_code))
+ #print('RESP: {}'.format(resp))
if http_code in (200, 201, 202, 204):
if resp:
resp = json.loads(resp)
projects / osm / osmclient.git / blobdiff