"""
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)
+ # NS '--wait' option
+ def _wait(self, id, deleteFlag=False):
+ # Endpoint to get operation status
+ apiUrlStatus = '{}{}{}'.format(self._apiName, self._apiVersion, '/ns_lcm_op_occs')
+ # Wait for status for NS instance creation/update/deletion
+ WaitForStatus.wait_for_status(
+ 'NS',
+ str(id),
+ WaitForStatus.TIMEOUT_NS_OPERATION,
+ apiUrlStatus,
+ self._http.get2_cmd,
+ deleteFlag=deleteFlag)
+
def list(self, filter=None):
"""Returns a list of NS
"""
return resp
raise NotFound("ns {} not found".format(name))
- def delete(self, name, force=False):
+ def delete(self, name, force=False, wait=False):
ns = self.get(name)
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)
+ ns['_id'], querystring))
+ # 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)
+ # 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:
msg = resp
raise ClientException("failed to delete ns {} - {}".format(name, msg))
- def create(self, nsd_name, nsr_name, account, wim_account=None, config=None,
+ def create(self, nsd_name, nsr_name, account, config=None,
ssh_keys=None, description='default description',
- admin_status='ENABLED'):
+ admin_status='ENABLED', wait=False):
nsd = self._client.nsd.get(nsd_name)
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 not additional_param_vnf.get("additionalParams"):
raise ValueError("Error at --config 'additionalParamsForVnf' items must contain "
"'additionalParams'")
+ if "wim_account" in ns_config:
+ wim_account = ns_config.pop("wim_account")
+ if wim_account is not None:
+ ns['wimAccountId'] = get_wim_account_id(wim_account)
# print yaml.safe_dump(ns)
try:
self._http.set_http_header(http_header)
http_code, resp = self._http.post_cmd(endpoint=self._apiBase,
postfields_dict=ns)
- #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 NS instance creation
+ self._wait(resp.get('nslcmop_id'))
return resp['id']
else:
msg = ""
exc.message)
raise ClientException(message)
- def exec_op(self, name, op_name, op_data=None):
+ def exec_op(self, name, op_name, op_data=None, wait=False):
"""Executes an operation on a NS
"""
ns = self.get(name)
if not resp or 'id' not in resp:
raise ClientException('unexpected response from server - {}'.format(
resp))
+ if wait:
+ # Wait for status for NS instance action
+ # For the 'action' operation, 'id' is used
+ self._wait(resp.get('id'))
print(resp['id'])
else:
msg = ""
exc.message)
raise ClientException(message)
- def scale_vnf(self, ns_name, vnf_name, scaling_group, scale_in, scale_out):
+ def scale_vnf(self, ns_name, vnf_name, scaling_group, scale_in, scale_out, wait=False):
"""Scales a VNF by adding/removing VDUs
"""
try:
"member-vnf-index": vnf_name,
"scaling-group-descriptor": scaling_group,
}
- self.exec_op(ns_name, op_name='scale', op_data=op_data)
+ self.exec_op(ns_name, op_name='scale', op_data=op_data, wait=wait)
except ClientException as exc:
message="failed to scale vnf {} of ns {}:\nerror:\n{}".format(
vnf_name, ns_name, exc.message)
def get_field(self, ns_name, field):
nsr = self.get(ns_name)
+ print(yaml.safe_dump(nsr))
if nsr is None:
raise NotFound("failed to retrieve ns {}".format(ns_name))