:raises ClientError: if the specified version does not match the client version
'''
fullclassname = obj.__module__ + "." + obj.__class__.__name__
- message = 'the following commands or options are only supported with the option "--sol005": {}'.format(what)
+ message = 'The following commands or options are only supported with the option "--sol005": {}'.format(what)
if version == 'v1':
- message = 'the following commands or options are not supported when using option "--sol005": {}'.format(what)
+ message = 'The following commands or options are not supported when using option "--sol005": {}'.format(what)
if fullclassname != 'osmclient.{}.client.Client'.format(version):
raise ClientException(message)
return
['ns instance name',
'id',
'operational status',
- 'config status'])
+ 'config status',
+ 'detailed status'])
for ns in resp:
fullclassname = ctx.obj.__module__ + "." + ctx.obj.__class__.__name__
if fullclassname == 'osmclient.sol005.client.Client':
nsr_id = nsr['ns-instance-config-ref']
opstatus = nsr['operational-status'] if 'operational-status' in nsr else 'Not found'
configstatus = nsr['config-status'] if 'config-status' in nsr else 'Not found'
+ detailed_status = nsr['detailed-status'] if 'detailed-status' in nsr else 'Not found'
if configstatus == "config_not_needed":
configstatus = "configured (no charms)"
table.add_row(
[nsr_name,
nsr_id,
opstatus,
- configstatus])
+ configstatus,
+ detailed_status])
table.align = 'l'
print(table)
@click.pass_context
def vnf_list(ctx):
''' list all VNF instances'''
- resp = ctx.obj.vnf.list()
+ try:
+ check_client_version(ctx.obj, ctx.command.name, 'v1')
+ resp = ctx.obj.vnf.list()
+ except ClientException as inst:
+ print(inst.message)
+ exit(1)
table = PrettyTable(
['vnf name',
'id',
table.align = 'l'
print(table)
+@cli.command(name='ns-op-list')
+@click.argument('name')
+@click.pass_context
+def ns_op_list(ctx, name):
+ '''shows the history of operations over a NS instance
+
+ NAME: name or ID of the NS instance
+ '''
+ try:
+ check_client_version(ctx.obj, ctx.command.name)
+ resp = ctx.obj.ns.list_op(name)
+ except ClientException as inst:
+ print(inst.message)
+ exit(1)
+
+ table = PrettyTable(['id', 'operation', 'status'])
+ for op in resp:
+ table.add_row([op['id'], op['lcmOperationType'],
+ op['operationState']])
+ table.align = 'l'
+ print(table)
####################
# SHOW operations
table.align = 'l'
print(table)
+@cli.command(name='ns-op-show', short_help='shows the info of an operation')
+@click.argument('id')
+@click.option('--filter', default=None)
+@click.pass_context
+def ns_op_show(ctx, id, filter):
+ '''shows the detailed info of an operation
+
+ ID: operation identifier
+ '''
+ try:
+ check_client_version(ctx.obj, ctx.command.name)
+ op_info = ctx.obj.ns.get_op(id)
+ except ClientException as inst:
+ print(inst.message)
+ exit(1)
+
+ table = PrettyTable(['field', 'value'])
+ for k, v in op_info.items():
+ if filter is None or filter in k:
+ table.add_row([k, json.dumps(v, indent=2)])
+ table.align = 'l'
+ print(table)
+
####################
# CREATE operations
help='comma separated list of keys to inject to vnfs')
@click.option('--config',
default=None,
- help='ns specific yaml configuration')
+ help='ns specific yaml configuration:\nvnf: [member-vnf-index: TEXT, vim_account: TEXT]\n'
+ 'vld: [name: TEXT, vim-network-name: TEXT or DICT with vim_account, vim_net entries]')
@click.pass_context
def ns_create(ctx,
nsd_name,
config):
'''creates a new NS instance'''
try:
- if config:
- check_client_version(ctx.obj, '--config', 'v1')
+ # if config:
+ # check_client_version(ctx.obj, '--config', 'v1')
ctx.obj.ns.create(
nsd_name,
ns_name,
'''
try:
resp = ctx.obj.vim.get(name)
+ if 'vim_password' in resp:
+ resp['vim_password']='********'
+ except ClientException as inst:
+ print(inst.message)
+ exit(1)
+
+ table = PrettyTable(['key', 'attribute'])
+ for k, v in resp.items():
+ table.add_row([k, json.dumps(v, indent=2)])
+ table.align = 'l'
+ print(table)
+
+
+####################
+# SDN controller operations
+####################
+
+@cli.command(name='sdnc-create')
+@click.option('--name',
+ prompt=True,
+ help='Name to create sdn controller')
+@click.option('--type',
+ prompt=True,
+ help='SDN controller type')
+@click.option('--sdn_controller_version',
+ help='SDN controller username')
+@click.option('--ip_address',
+ prompt=True,
+ help='SDN controller IP address')
+@click.option('--port',
+ prompt=True,
+ help='SDN controller port')
+@click.option('--switch_dpid',
+ prompt=True,
+ help='Switch DPID (Openflow Datapath ID)')
+@click.option('--user',
+ help='SDN controller username')
+@click.option('--password',
+ hide_input=True,
+ confirmation_prompt=True,
+ help='SDN controller password')
+#@click.option('--description',
+# default='no description',
+# help='human readable description')
+@click.pass_context
+def sdnc_create(ctx,
+ name,
+ type,
+ sdn_controller_version,
+ ip_address,
+ port,
+ switch_dpid,
+ user,
+ password):
+ '''creates a new SDN controller
+ '''
+ sdncontroller = {}
+ sdncontroller['name'] = name
+ sdncontroller['type'] = type
+ sdncontroller['ip'] = ip_address
+ sdncontroller['port'] = int(port)
+ sdncontroller['dpid'] = switch_dpid
+ if sdn_controller_version:
+ sdncontroller['version'] = sdn_controller_version
+ if user:
+ sdncontroller['user'] = user
+ if password:
+ sdncontroller['password'] = password
+# sdncontroller['description'] = description
+ try:
+ check_client_version(ctx.obj, ctx.command.name)
+ ctx.obj.sdnc.create(name, sdncontroller)
+ except ClientException as inst:
+ print(inst.message)
+
+
+@cli.command(name='sdnc-update', short_help='updates an SDN controller')
+@click.argument('name')
+@click.option('--newname', help='New name for the SDN controller')
+@click.option('--type', help='SDN controller type')
+@click.option('--sdn_controller_version', help='SDN controller username')
+@click.option('--ip_address', help='SDN controller IP address')
+@click.option('--port', help='SDN controller port')
+@click.option('--switch_dpid', help='Switch DPID (Openflow Datapath ID)')
+@click.option('--user', help='SDN controller username')
+@click.option('--password', help='SDN controller password')
+#@click.option('--description', default=None, help='human readable description')
+@click.pass_context
+def sdnc_update(ctx,
+ name,
+ newname,
+ type,
+ sdn_controller_version,
+ ip_address,
+ port,
+ switch_dpid,
+ user,
+ password):
+ '''updates an SDN controller
+
+ NAME: name or ID of the SDN controller
+ '''
+ sdncontroller = {}
+ if newname: sdncontroller['name'] = newname
+ if type: sdncontroller['type'] = type
+ if ip_address: sdncontroller['ip'] = ip_address
+ if port: sdncontroller['port'] = int(port)
+ if switch_dpid: sdncontroller['dpid'] = switch_dpid
+# sdncontroller['description'] = description
+ if sdn_controller_version is not None:
+ if sdn_controller_version=="":
+ sdncontroller['version'] = None
+ else:
+ sdncontroller['version'] = sdn_controller_version
+ if user is not None:
+ if user=="":
+ sdncontroller['user'] = None
+ else:
+ sdncontroller['user'] = user
+ if password is not None:
+ if password=="":
+ sdncontroller['password'] = None
+ else:
+ sdncontroller['password'] = user
+ try:
+ check_client_version(ctx.obj, ctx.command.name)
+ ctx.obj.sdnc.update(name, sdncontroller)
+ except ClientException as inst:
+ print(inst.message)
+ exit(1)
+
+
+@cli.command(name='sdnc-delete')
+@click.argument('name')
+@click.pass_context
+def sdnc_delete(ctx, name):
+ '''deletes an SDN controller
+
+ NAME: name or ID of the SDN controller to be deleted
+ '''
+ try:
+ check_client_version(ctx.obj, ctx.command.name)
+ ctx.obj.sdnc.delete(name)
+ except ClientException as inst:
+ print(inst.message)
+ exit(1)
+
+
+@cli.command(name='sdnc-list')
+@click.option('--filter', default=None,
+ help='restricts the list to the SDN controllers matching the filter')
+@click.pass_context
+def sdnc_list(ctx, filter):
+ '''list all SDN controllers'''
+ try:
+ check_client_version(ctx.obj, ctx.command.name)
+ resp = ctx.obj.sdnc.list(filter)
+ except ClientException as inst:
+ print(inst.message)
+ exit(1)
+ table = PrettyTable(['name', 'id'])
+ for sdnc in resp:
+ table.add_row([sdnc['name'], sdnc['_id']])
+ table.align = 'l'
+ print(table)
+
+
+@cli.command(name='sdnc-show')
+@click.argument('name')
+@click.pass_context
+def sdnc_show(ctx, name):
+ '''shows the details of an SDN controller
+
+ NAME: name or ID of the SDN controller
+ '''
+ try:
+ check_client_version(ctx.obj, ctx.command.name)
+ resp = ctx.obj.sdnc.get(name)
except ClientException as inst:
print(inst.message)
exit(1)
print(table)
+@cli.command(name='ns-action')
+@click.argument('ns_name')
+@click.option('--vnf_name', default=None)
+@click.option('--action_name', prompt=True)
+@click.option('--params', prompt=True)
+@click.pass_context
+def ns_action(ctx,
+ ns_name,
+ vnf_name,
+ action_name,
+ params):
+ '''executes an action/primitive over a NS instance
+
+ NS_NAME: name or ID of the NS instance
+ '''
+ try:
+ check_client_version(ctx.obj, ctx.command.name)
+ op_data={}
+ if vnf_name:
+ op_data['vnf_member_index'] = vnf_name
+ op_data['primitive'] = action_name
+ op_data['primitive_params'] = yaml.load(params)
+ ctx.obj.ns.exec_op(ns_name, op_name='action', op_data=op_data)
+
+ except ClientException as inst:
+ print(inst.message)
+ exit(1)
+
+
if __name__ == '__main__':
cli()