def list(self, filter=None):
"""Returns a list of NS
"""
+ self._client.get_token()
filter_string = ''
if filter:
filter_string = '?{}'.format(filter)
def get(self, name):
"""Returns an NS based on name or id
"""
+ self._client.get_token()
if utils.validate_uuid4(name):
for ns in self.list():
if name == ns['_id']:
raise NotFound("ns {} not found".format(name))
def get_individual(self, name):
+ self._client.get_token()
ns_id = name
if not utils.validate_uuid4(name):
for ns in self.list():
def create(self, nsd_name, nsr_name, account, config=None,
ssh_keys=None, description='default description',
admin_status='ENABLED', wait=False):
-
+ self._client.get_token()
nsd = self._client.nsd.get(nsd_name)
vim_account_id = {}
with open(pubkeyfile, 'r') as f:
ns['ssh_keys'].append(f.read())
if config:
- ns_config = yaml.load(config)
+ ns_config = yaml.safe_load(config)
if "vim-network-name" in ns_config:
ns_config["vld"] = ns_config.pop("vim-network-name")
if "vld" in ns_config:
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'")
if "wim_account" in ns_config:
wim_account = ns_config.pop("wim_account")
if wim_account is not None:
message="failed to create ns: {} nsd: {}\nerror:\n{}".format(
nsr_name,
nsd_name,
- exc.message)
+ str(exc))
raise ClientException(message)
def list_op(self, name, filter=None):
except ClientException as exc:
message="failed to get operation list of NS {}:\nerror:\n{}".format(
name,
- exc.message)
+ str(exc))
raise ClientException(message)
def get_op(self, operationId):
"""Returns the status of an operation
"""
+ self._client.get_token()
try:
self._apiResource = '/ns_lcm_op_occs'
self._apiBase = '{}{}{}'.format(self._apiName,
except ClientException as exc:
message="failed to get status of operation {}:\nerror:\n{}".format(
operationId,
- exc.message)
+ str(exc))
raise ClientException(message)
- def exec_op(self, name, op_name, op_data=None, wait=False):
+ def exec_op(self, name, op_name, op_data=None, wait=False, ):
"""Executes an operation on a NS
"""
- ns = self.get(name)
try:
+ ns = self.get(name)
self._apiResource = '/ns_instances'
self._apiBase = '{}{}{}'.format(self._apiName,
self._apiVersion, self._apiResource)
# Wait for status for NS instance action
# For the 'action' operation, 'id' is used
self._wait(resp.get('id'))
- print(resp['id'])
+ return resp['id']
else:
msg = ""
if resp:
except ClientException as exc:
message="failed to exec operation {}:\nerror:\n{}".format(
name,
- exc.message)
+ str(exc))
raise ClientException(message)
def scale_vnf(self, ns_name, vnf_name, scaling_group, scale_in, scale_out, wait=False):
"""Scales a VNF by adding/removing VDUs
"""
+ self._client.get_token()
try:
op_data={}
op_data["scaleType"] = "SCALE_VNF"
"member-vnf-index": vnf_name,
"scaling-group-descriptor": scaling_group,
}
- self.exec_op(ns_name, op_name='scale', op_data=op_data, wait=wait)
+ op_id = self.exec_op(ns_name, op_name='scale', op_data=op_data, wait=wait)
+ print(str(op_id))
except ClientException as exc:
message="failed to scale vnf {} of ns {}:\nerror:\n{}".format(
- vnf_name, ns_name, exc.message)
+ vnf_name, ns_name, str(exc))
raise ClientException(message)
def create_alarm(self, alarm):
+ self._client.get_token()
data = {}
data["create_alarm_request"] = {}
data["create_alarm_request"]["alarm_create_request"] = alarm
except ClientException as exc:
message="failed to create alarm: alarm {}\n{}".format(
alarm,
- exc.message)
+ str(exc))
raise ClientException(message)
def delete_alarm(self, name):
+ self._client.get_token()
data = {}
data["delete_alarm_request"] = {}
data["delete_alarm_request"]["alarm_delete_request"] = {}
except ClientException as exc:
message="failed to delete alarm: alarm {}\n{}".format(
name,
- exc.message)
+ str(exc))
raise ClientException(message)
def export_metric(self, metric):
+ self._client.get_token()
data = {}
data["read_metric_data_request"] = metric
try:
except ClientException as exc:
message="failed to export metric: metric {}\n{}".format(
metric,
- exc.message)
+ str(exc))
raise ClientException(message)
def get_field(self, ns_name, field):