import json
import time
import pycurl
+import os
def check_client_version(obj, what, version='sol005'):
return
-@click.group()
+CONTEXT_SETTINGS = dict(help_option_names=['-h', '--help'], max_content_width=160)
+
+@click.group(context_settings=CONTEXT_SETTINGS)
@click.option('--hostname',
default="127.0.0.1",
envvar='OSM_HOSTNAME',
help='hostname of server. ' +
'Also can set OSM_HOSTNAME in environment')
-@click.option('--sol005/--no-sol005',
- default=True,
- envvar='OSM_SOL005',
- help='Use ETSI NFV SOL005 API (default) or the previous SO API. ' +
- 'Also can set OSM_SOL005 in environment')
+#@click.option('--sol005/--no-sol005',
+# default=True,
+# envvar='OSM_SOL005',
+# help='Use ETSI NFV SOL005 API (default) or the previous SO API. ' +
+# 'Also can set OSM_SOL005 in environment')
@click.option('--user',
default=None,
envvar='OSM_USER',
- help='user (only from Release FOUR, defaults to admin). ' +
+ help='user (defaults to admin). ' +
'Also can set OSM_USER in environment')
@click.option('--password',
default=None,
envvar='OSM_PASSWORD',
- help='password (only from Release FOUR, defaults to admin). ' +
+ help='password (defaults to admin). ' +
'Also can set OSM_PASSWORD in environment')
@click.option('--project',
default=None,
envvar='OSM_PROJECT',
- help='project (only from Release FOUR, defaults to admin). ' +
+ help='project (defaults to admin). ' +
'Also can set OSM_PROJECT in environment')
-@click.option('--so-port',
- default=None,
- envvar='OSM_SO_PORT',
- help='hostname of server. ' +
- 'Also can set OSM_SO_PORT in environment')
-@click.option('--so-project',
- default=None,
- envvar='OSM_SO_PROJECT',
- help='Project Name in SO. ' +
- 'Also can set OSM_SO_PROJECT in environment')
-@click.option('--ro-hostname',
- default=None,
- envvar='OSM_RO_HOSTNAME',
- help='hostname of RO server. ' +
- 'Also can set OSM_RO_HOSTNAME in environment')
-@click.option('--ro-port',
- default=None,
- envvar='OSM_RO_PORT',
- help='hostname of RO server. ' +
- 'Also can set OSM_RO_PORT in environment')
-@click.pass_context
-def cli(ctx, hostname, sol005, user, password, project, so_port, so_project, ro_hostname, ro_port):
+#@click.option('--so-port',
+# default=None,
+# envvar='OSM_SO_PORT',
+# help='hostname of server. ' +
+# 'Also can set OSM_SO_PORT in environment')
+#@click.option('--so-project',
+# default=None,
+# envvar='OSM_SO_PROJECT',
+# help='Project Name in SO. ' +
+# 'Also can set OSM_SO_PROJECT in environment')
+#@click.option('--ro-hostname',
+# default=None,
+# envvar='OSM_RO_HOSTNAME',
+# help='hostname of RO server. ' +
+# 'Also can set OSM_RO_HOSTNAME in environment')
+#@click.option('--ro-port',
+# default=None,
+# envvar='OSM_RO_PORT',
+# help='hostname of RO server. ' +
+# 'Also can set OSM_RO_PORT in environment')
+@click.pass_context
+def cli(ctx, hostname, user, password, project):
if hostname is None:
print((
"either hostname option or OSM_HOSTNAME " +
"environment variable needs to be specified"))
exit(1)
kwargs={}
- if so_port is not None:
- kwargs['so_port']=so_port
- if so_project is not None:
- kwargs['so_project']=so_project
- if ro_hostname is not None:
- kwargs['ro_host']=ro_hostname
- if ro_port is not None:
- kwargs['ro_port']=ro_port
+# if so_port is not None:
+# kwargs['so_port']=so_port
+# if so_project is not None:
+# kwargs['so_project']=so_project
+# if ro_hostname is not None:
+# kwargs['ro_host']=ro_hostname
+# if ro_port is not None:
+# kwargs['ro_port']=ro_port
+ sol005 = os.getenv('OSM_SOL005', True)
if user is not None:
kwargs['user']=user
if password is not None:
# LIST operations
####################
-@cli.command(name='ns-list')
+@cli.command(name='ns-list', short_help='list all NS instances')
@click.option('--filter', default=None,
help='restricts the list to the NS instances matching the filter.')
@click.pass_context
resp = ctx.obj.nsd.list(filter)
else:
resp = ctx.obj.nsd.list()
- # print yaml.safe_dump(resp)
+ # print(yaml.safe_dump(resp))
table = PrettyTable(['nsd name', 'id'])
fullclassname = ctx.obj.__module__ + "." + ctx.obj.__class__.__name__
if fullclassname == 'osmclient.sol005.client.Client':
print(table)
-@cli.command(name='nsd-list')
+@cli.command(name='nsd-list', short_help='list all NS packages')
@click.option('--filter', default=None,
help='restricts the list to the NSD/NSpkg matching the filter')
@click.pass_context
nsd_list(ctx, filter)
-@cli.command(name='nspkg-list')
+@cli.command(name='nspkg-list', short_help='list all NS packages')
@click.option('--filter', default=None,
help='restricts the list to the NSD/NSpkg matching the filter')
@click.pass_context
def nsd_list2(ctx, filter):
- """list all NSD/NS pkg in the system"""
+ """list all NS packages"""
nsd_list(ctx, filter)
resp = ctx.obj.vnfd.list(filter)
else:
resp = ctx.obj.vnfd.list()
- # print yaml.safe_dump(resp)
+ # print(yaml.safe_dump(resp))
table = PrettyTable(['nfpkg name', 'id'])
fullclassname = ctx.obj.__module__ + "." + ctx.obj.__class__.__name__
if fullclassname == 'osmclient.sol005.client.Client':
print(table)
-@cli.command(name='vnfd-list')
+@cli.command(name='vnfd-list', short_help='list all xNF packages (VNF, HNF, PNF)')
@click.option('--nf_type', help='type of NF (vnf, pnf, hnf)')
@click.option('--filter', default=None,
help='restricts the list to the NF pkg matching the filter')
@click.pass_context
def vnfd_list1(ctx, nf_type, filter):
- """list all VNFD/VNF pkg in the system"""
+ """list all xNF packages (VNF, HNF, PNF)"""
vnfd_list(ctx, nf_type, filter)
-@cli.command(name='vnfpkg-list')
+@cli.command(name='vnfpkg-list', short_help='list all xNF packages (VNF, HNF, PNF)')
@click.option('--nf_type', help='type of NF (vnf, pnf, hnf)')
@click.option('--filter', default=None,
help='restricts the list to the NFpkg matching the filter')
@click.pass_context
def vnfd_list2(ctx, nf_type, filter):
- """list all VNFD/VNF pkg in the system"""
+ """list all xNF packages (VNF, HNF, PNF)"""
vnfd_list(ctx, nf_type, filter)
-@cli.command(name='nfpkg-list')
+@cli.command(name='nfpkg-list', short_help='list all xNF packages (VNF, HNF, PNF)')
@click.option('--nf_type', help='type of NF (vnf, pnf, hnf)')
@click.option('--filter', default=None,
help='restricts the list to the NFpkg matching the filter')
@click.pass_context
def nfpkg_list(ctx, nf_type, filter):
- """list all NF pkg (VNF pkg, PNF pkg, HNF pkg) in the system"""
+ """list all xNF packages (VNF, HNF, PNF)"""
try:
check_client_version(ctx.obj, ctx.command.name)
vnfd_list(ctx, nf_type, filter)
print(table)
-@cli.command(name='vnf-list')
+@cli.command(name='vnf-list', short_help='list all NF instances')
@click.option('--ns', default=None, help='NS instance id or name to restrict the NF list')
@click.option('--filter', default=None,
help='restricts the list to the NF instances matching the filter.')
vnf_list(ctx, ns, filter)
-@cli.command(name='nf-list')
+@cli.command(name='nf-list', short_help='list all NF instances')
@click.option('--ns', default=None, help='NS instance id or name to restrict the NF list')
@click.option('--filter', default=None,
help='restricts the list to the NF instances matching the filter.')
vnf_list(ctx, ns, filter)
-@cli.command(name='ns-op-list')
+@cli.command(name='ns-op-list', short_help='shows the history of operations over a NS instance')
@click.argument('name')
@click.pass_context
def ns_op_list(ctx, name):
print(table)
-@cli.command(name='nsi-list')
+@cli.command(name='nsi-list', short_help='list all Network Slice Instances (NSI)')
@click.option('--filter', default=None,
help='restricts the list to the Network Slice Instances matching the filter')
@click.pass_context
nsi_list(ctx, filter)
-@cli.command(name='netslice-instance-list')
+@cli.command(name='netslice-instance-list', short_help='list all Network Slice Instances (NSI)')
@click.option('--filter', default=None,
help='restricts the list to the Network Slice Instances matching the filter')
@click.pass_context
except ClientException as inst:
print((inst.message))
exit(1)
- # print yaml.safe_dump(resp)
+ # print(yaml.safe_dump(resp))
table = PrettyTable(['nst name', 'id'])
for nst in resp:
name = nst['name'] if 'name' in nst else '-'
print(table)
-@cli.command(name='nst-list')
+@cli.command(name='nst-list', short_help='list all Network Slice Templates (NST)')
@click.option('--filter', default=None,
help='restricts the list to the NST matching the filter')
@click.pass_context
nst_list(ctx, filter)
-@cli.command(name='netslice-template-list')
+@cli.command(name='netslice-template-list', short_help='list all Network Slice Templates (NST)')
@click.option('--filter', default=None,
help='restricts the list to the NST matching the filter')
@click.pass_context
print(table)
-@cli.command(name='nsi-op-list')
+@cli.command(name='nsi-op-list', short_help='shows the history of operations over a Network Slice Instance (NSI)')
@click.argument('name')
@click.pass_context
def nsi_op_list1(ctx, name):
nsi_op_list(ctx, name)
-@cli.command(name='netslice-instance-op-list')
+@cli.command(name='netslice-instance-op-list', short_help='shows the history of operations over a Network Slice Instance (NSI)')
@click.argument('name')
@click.pass_context
def nsi_op_list2(ctx, name):
nsi_op_list(ctx, name)
-@cli.command(name='pdu-list')
+@cli.command(name='pdu-list', short_help='list all Physical Deployment Units (PDU)')
@click.option('--filter', default=None,
help='restricts the list to the Physical Deployment Units matching the filter')
@click.pass_context
print(table)
-@cli.command(name='vnf-monitoring-show')
-@click.argument('vnf_name')
-@click.pass_context
-def vnf_monitoring_show(ctx, vnf_name):
- try:
- check_client_version(ctx.obj, ctx.command.name, 'v1')
- resp = ctx.obj.vnf.get_monitoring(vnf_name)
- except ClientException as inst:
- print((inst.message))
- exit(1)
-
- table = PrettyTable(['vnf name', 'monitoring name', 'value', 'units'])
- if resp is not None:
- for monitor in resp:
- table.add_row(
- [vnf_name,
- monitor['name'],
- monitor['value-integer'],
- monitor['units']])
- table.align = 'l'
- print(table)
-
-
-@cli.command(name='ns-monitoring-show')
-@click.argument('ns_name')
-@click.pass_context
-def ns_monitoring_show(ctx, ns_name):
- try:
- check_client_version(ctx.obj, ctx.command.name, 'v1')
- resp = ctx.obj.ns.get_monitoring(ns_name)
- except ClientException as inst:
- print((inst.message))
- exit(1)
-
- table = PrettyTable(['vnf name', 'monitoring name', 'value', 'units'])
- for key, val in list(resp.items()):
- for monitor in val:
- table.add_row(
- [key,
- monitor['name'],
- monitor['value-integer'],
- monitor['units']])
- table.align = 'l'
- print(table)
-
-
-@cli.command(name='ns-op-show', short_help='shows the info of an operation')
+#@cli.command(name='vnf-monitoring-show')
+#@click.argument('vnf_name')
+#@click.pass_context
+#def vnf_monitoring_show(ctx, vnf_name):
+# try:
+# check_client_version(ctx.obj, ctx.command.name, 'v1')
+# resp = ctx.obj.vnf.get_monitoring(vnf_name)
+# except ClientException as inst:
+# print((inst.message))
+# exit(1)
+#
+# table = PrettyTable(['vnf name', 'monitoring name', 'value', 'units'])
+# if resp is not None:
+# for monitor in resp:
+# table.add_row(
+# [vnf_name,
+# monitor['name'],
+# monitor['value-integer'],
+# monitor['units']])
+# table.align = 'l'
+# print(table)
+
+
+#@cli.command(name='ns-monitoring-show')
+#@click.argument('ns_name')
+#@click.pass_context
+#def ns_monitoring_show(ctx, ns_name):
+# try:
+# check_client_version(ctx.obj, ctx.command.name, 'v1')
+# resp = ctx.obj.ns.get_monitoring(ns_name)
+# except ClientException as inst:
+# print((inst.message))
+# exit(1)
+#
+# table = PrettyTable(['vnf name', 'monitoring name', 'value', 'units'])
+# for key, val in list(resp.items()):
+# for monitor in val:
+# table.add_row(
+# [key,
+# monitor['name'],
+# monitor['value-integer'],
+# monitor['units']])
+# table.align = 'l'
+# print(table)
+
+
+@cli.command(name='ns-op-show', short_help='shows the info of a NS 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
+ """shows the detailed info of a NS operation
ID: operation identifier
"""
@cli.command(name='nsd-create', short_help='creates a new NSD/NSpkg')
@click.argument('filename')
-@click.option('--overwrite', default=None,
- help='overwrites some fields in NSD')
+@click.option('--overwrite', 'overwrite', default=None,
+ help='overwrite deprecated, use override')
+@click.option('--override', 'overwrite', default=None,
+ help='overrides fields in descriptor, format: '
+ '"key1.key2...=value[;key3...=value;...]"')
@click.pass_context
def nsd_create1(ctx, filename, overwrite):
"""creates a new NSD/NSpkg
@cli.command(name='nspkg-create', short_help='creates a new NSD/NSpkg')
@click.argument('filename')
-@click.option('--overwrite', default=None,
- help='overwrites some fields in NSD')
+@click.option('--overwrite', 'overwrite', default=None,
+ help='overwrite deprecated, use override')
+@click.option('--override', 'overwrite', default=None,
+ help='overrides fields in descriptor, format: '
+ '"key1.key2...=value[;key3...=value;...]"')
@click.pass_context
def nsd_create2(ctx, filename, overwrite):
"""creates a new NSD/NSpkg
@cli.command(name='vnfd-create', short_help='creates a new VNFD/VNFpkg')
@click.argument('filename')
-@click.option('--overwrite', default=None,
- help='overwrites some fields in VNFD')
+@click.option('--overwrite', 'overwrite', default=None,
+ help='overwrite deprecated, use override')
+@click.option('--override', 'overwrite', default=None,
+ help='overrides fields in descriptor, format: '
+ '"key1.key2...=value[;key3...=value;...]"')
@click.pass_context
def vnfd_create1(ctx, filename, overwrite):
"""creates a new VNFD/VNFpkg
@cli.command(name='vnfpkg-create', short_help='creates a new VNFD/VNFpkg')
@click.argument('filename')
-@click.option('--overwrite', default=None,
- help='overwrites some fields in VNFD')
+@click.option('--overwrite', 'overwrite', default=None,
+ help='overwrite deprecated, use override')
+@click.option('--override', 'overwrite', default=None,
+ help='overrides fields in descriptor, format: '
+ '"key1.key2...=value[;key3...=value;...]"')
@click.pass_context
def vnfd_create2(ctx, filename, overwrite):
"""creates a new VNFD/VNFpkg
@cli.command(name='nfpkg-create', short_help='creates a new NFpkg')
@click.argument('filename')
-@click.option('--overwrite', default=None,
- help='overwrites some fields in NFD')
+@click.option('--overwrite', 'overwrite', default=None,
+ help='overwrite deprecated, use override')
+@click.option('--override', 'overwrite', default=None,
+ help='overrides fields in descriptor, format: '
+ '"key1.key2...=value[;key3...=value;...]"')
@click.pass_context
def nfpkg_create(ctx, filename, overwrite):
"""creates a new NFpkg
@cli.command(name='nst-create', short_help='creates a new Network Slice Template (NST)')
@click.argument('filename')
-@click.option('--overwrite', default=None,
- help='overwrites some fields in NST')
+@click.option('--overwrite', 'overwrite', default=None,
+ help='overwrites deprecated use override')
+@click.option('--override', 'overwrite' ,default=None,
+ help='overrides fields in descriptor, format: '
+ '"key1.key2...=value[;key3...=value;...]"')
@click.pass_context
def nst_create1(ctx, filename, overwrite):
"""creates a new Network Slice Template (NST)
@cli.command(name='netslice-template-create', short_help='creates a new Network Slice Template (NST)')
@click.argument('filename')
-@click.option('--overwrite', default=None,
- help='overwrites some fields in NST')
+@click.option('--overwrite', 'overwrite', default=None,
+ help='overwrites deprecated use override')
+@click.option('--override', 'overwrite', default=None,
+ help='overrides fields in descriptor, format: '
+ '"key1.key2...=value[;key3...=value;...]"')
@click.pass_context
def nst_create2(ctx, filename, overwrite):
"""creates a new Network Slice Template (NST)
raise ClientException('in absence of descriptor file, option "--vim_account" is mandatory (at least once)')
else:
with open(descriptor_file, 'r') as df:
- pdu = yaml.load(df.read())
+ pdu = yaml.safe_load(df.read())
if name: pdu["name"] = name
if pdu_type: pdu["type"] = pdu_type
if description: pdu["description"] = description
print((inst.message))
exit(1)
-
####################
# UPDATE operations
####################
exit(1)
-####################
+#################
# VIM operations
-####################
+#################
-@cli.command(name='vim-create')
+@cli.command(name='vim-create', short_help='creates a new VIM account')
@click.option('--name',
prompt=True,
help='Name to create datacenter')
exit(1)
-@cli.command(name='vim-delete')
+@cli.command(name='vim-delete', short_help='deletes a VIM account')
@click.argument('name')
@click.option('--force', is_flag=True, help='forces the deletion bypassing pre-conditions')
@click.option('--wait',
exit(1)
-@cli.command(name='vim-list')
-@click.option('--ro_update/--no_ro_update',
- default=False,
- help='update list from RO')
+@cli.command(name='vim-list', short_help='list all VIM accounts')
+#@click.option('--ro_update/--no_ro_update',
+# default=False,
+# help='update list from RO')
@click.option('--filter', default=None,
help='restricts the list to the VIM accounts matching the filter')
@click.pass_context
-def vim_list(ctx, ro_update, filter):
+def vim_list(ctx, filter):
"""list all VIM accounts"""
if filter:
check_client_version(ctx.obj, '--filter')
- if ro_update:
- check_client_version(ctx.obj, '--ro_update', 'v1')
+# if ro_update:
+# check_client_version(ctx.obj, '--ro_update', 'v1')
fullclassname = ctx.obj.__module__ + "." + ctx.obj.__class__.__name__
if fullclassname == 'osmclient.sol005.client.Client':
resp = ctx.obj.vim.list(filter)
- else:
- resp = ctx.obj.vim.list(ro_update)
+# else:
+# resp = ctx.obj.vim.list(ro_update)
table = PrettyTable(['vim name', 'uuid'])
for vim in resp:
table.add_row([vim['name'], vim['uuid']])
print(table)
-@cli.command(name='vim-show')
+@cli.command(name='vim-show', short_help='shows the details of a VIM account')
@click.argument('name')
@click.pass_context
def vim_show(ctx, name):
# WIM operations
####################
-@cli.command(name='wim-create')
+@cli.command(name='wim-create', short_help='creates a new WIM account')
@click.option('--name',
prompt=True,
help='Name for the WIM account')
exit(1)
-@cli.command(name='wim-delete')
+@cli.command(name='wim-delete', short_help='deletes a WIM account')
@click.argument('name')
@click.option('--force', is_flag=True, help='forces the deletion bypassing pre-conditions')
@click.option('--wait',
exit(1)
-@cli.command(name='wim-list')
+@cli.command(name='wim-list', short_help='list all WIM accounts')
@click.option('--filter', default=None,
help='restricts the list to the WIM accounts matching the filter')
@click.pass_context
exit(1)
-@cli.command(name='wim-show')
+@cli.command(name='wim-show', short_help='shows the details of a WIM account')
@click.argument('name')
@click.pass_context
def wim_show(ctx, name):
# SDN controller operations
####################
-@cli.command(name='sdnc-create')
+@cli.command(name='sdnc-create', short_help='creates a new SDN controller')
@click.option('--name',
prompt=True,
help='Name to create sdn controller')
ctx.obj.sdnc.create(name, sdncontroller, wait=wait)
except ClientException as inst:
print((inst.message))
-
+ exit(1)
@cli.command(name='sdnc-update', short_help='updates an SDN controller')
@click.argument('name')
exit(1)
-@cli.command(name='sdnc-delete')
+@cli.command(name='sdnc-delete', short_help='deletes an SDN controller')
@click.argument('name')
@click.option('--force', is_flag=True, help='forces the deletion bypassing pre-conditions')
@click.option('--wait',
exit(1)
-@cli.command(name='sdnc-list')
+@cli.command(name='sdnc-list', short_help='list all SDN controllers')
@click.option('--filter', default=None,
help='restricts the list to the SDN controllers matching the filter')
@click.pass_context
except ClientException as inst:
print((inst.message))
exit(1)
- table = PrettyTable(['name', 'id'])
+ table = PrettyTable(['sdnc name', 'id'])
for sdnc in resp:
table.add_row([sdnc['name'], sdnc['_id']])
table.align = 'l'
print(table)
-@cli.command(name='sdnc-show')
+@cli.command(name='sdnc-show', short_help='shows the details of an SDN controller')
@click.argument('name')
@click.pass_context
def sdnc_show(ctx, name):
# Project mgmt operations
####################
-@cli.command(name='project-create')
+@cli.command(name='project-create', short_help='creates a new project')
@click.argument('name')
#@click.option('--description',
# default='no description',
ctx.obj.project.create(name, project)
except ClientException as inst:
print(inst.message)
+ exit(1)
-@cli.command(name='project-delete')
+@cli.command(name='project-delete', short_help='deletes a project')
@click.argument('name')
#@click.option('--force', is_flag=True, help='forces the deletion bypassing pre-conditions')
@click.pass_context
exit(1)
-@cli.command(name='project-list')
+@cli.command(name='project-list', short_help='list all projects')
@click.option('--filter', default=None,
help='restricts the list to the projects matching the filter')
@click.pass_context
print(table)
-@cli.command(name='project-show')
+@cli.command(name='project-show', short_help='shows the details of a project')
@click.argument('name')
@click.pass_context
def project_show(ctx, name):
print(table)
+@cli.command(name='project-update', short_help='updates a project (only the name can be updated)')
+@click.argument('project')
+@click.option('--name',
+ prompt=True,
+ help='new name for the project')
+
+@click.pass_context
+def project_update(ctx, project, name):
+ """
+ Update a project name
+
+ :param ctx:
+ :param project: id or name of the project to modify
+ :param name: new name for the project
+ :return:
+ """
+
+ project_changes = {}
+ project_changes['name'] = name
+
+ try:
+ check_client_version(ctx.obj, ctx.command.name)
+ ctx.obj.project.update(project, project_changes)
+ except ClientException as inst:
+ print(inst.message)
+
+
####################
# User mgmt operations
####################
-@cli.command(name='user-create')
+@cli.command(name='user-create', short_help='creates a new user')
@click.argument('username')
@click.option('--password',
prompt=True,
confirmation_prompt=True,
help='user password')
@click.option('--projects',
- prompt="Comma separate list of projects",
+ # prompt="Comma separate list of projects",
multiple=True,
callback=lambda ctx, param, value: ''.join(value).split(',') if all(len(x)==1 for x in value) else value,
help='list of project ids that the user belongs to')
-@click.option('--project-role-mapping', 'project_role_mappings',
+@click.option('--project-role-mappings', 'project_role_mappings',
default=None, multiple=True,
help='creating user project/role(s) mapping')
@click.pass_context
user['username'] = username
user['password'] = password
user['projects'] = projects
- user['project-role-mappings'] = project_role_mappings
+ user['project_role_mappings'] = project_role_mappings
try:
check_client_version(ctx.obj, ctx.command.name)
ctx.obj.user.create(username, user)
except ClientException as inst:
print(inst.message)
+ exit(1)
-@cli.command(name='user-update')
+@cli.command(name='user-update', short_help='updates user information')
@click.argument('username')
@click.option('--password',
- prompt=True,
- hide_input=True,
- confirmation_prompt=True,
+ # prompt=True,
+ # hide_input=True,
+ # confirmation_prompt=True,
help='user password')
+@click.option('--set-username', 'set_username',
+ default=None,
+ help='change username')
@click.option('--set-project', 'set_project',
default=None, multiple=True,
help='create/replace the project,role(s) mapping for this project: \'project,role1,role2,...\'')
default=None, multiple=True,
help='removes project,role(s) mapping: \'project,role1,role2,...\'')
@click.pass_context
-def user_update(ctx, username, password, set_project, remove_project,
+def user_update(ctx, username, password, set_username, set_project, remove_project,
add_project_role, remove_project_role):
"""Update a user information
\b
USERNAME: name of the user
PASSWORD: new password
+ SET_USERNAME: new username
SET_PROJECT: creating mappings for project/role(s)
REMOVE_PROJECT: deleting mappings for project/role(s)
ADD_PROJECT_ROLE: adding mappings for project/role(s)
REMOVE_PROJECT_ROLE: removing mappings for project/role(s)
"""
user = {}
- user['username'] = username
user['password'] = password
+ user['username'] = set_username
user['set-project'] = set_project
user['remove-project'] = remove_project
user['add-project-role'] = add_project_role
ctx.obj.user.update(username, user)
except ClientException as inst:
print(inst.message)
+ exit(1)
-@cli.command(name='user-delete')
+@cli.command(name='user-delete', short_help='deletes a user')
@click.argument('name')
#@click.option('--force', is_flag=True, help='forces the deletion bypassing pre-conditions')
@click.pass_context
exit(1)
-@cli.command(name='user-list')
+@cli.command(name='user-list', short_help='list all users')
@click.option('--filter', default=None,
help='restricts the list to the users matching the filter')
@click.pass_context
print(table)
-@cli.command(name='user-show')
+@cli.command(name='user-show', short_help='shows the details of a user')
@click.argument('name')
@click.pass_context
def user_show(ctx, name):
def ns_alarm_create(ctx, name, ns, vnf, vdu, metric, severity,
threshold_value, threshold_operator, statistic):
"""creates a new alarm for a NS instance"""
- ns_instance = ctx.obj.ns.get(ns)
- alarm = {}
- alarm['alarm_name'] = name
- alarm['ns_id'] = ns_instance['_id']
- alarm['correlation_id'] = ns_instance['_id']
- alarm['vnf_member_index'] = vnf
- alarm['vdu_name'] = vdu
- alarm['metric_name'] = metric
- alarm['severity'] = severity
- alarm['threshold_value'] = int(threshold_value)
- alarm['operation'] = threshold_operator
- alarm['statistic'] = statistic
- try:
+ # TODO: Check how to validate threshold_value.
+ # Should it be an integer (1-100), percentage, or decimal (0.01-1.00)?
+ try:
+ ns_instance = ctx.obj.ns.get(ns)
+ alarm = {}
+ alarm['alarm_name'] = name
+ alarm['ns_id'] = ns_instance['_id']
+ alarm['correlation_id'] = ns_instance['_id']
+ alarm['vnf_member_index'] = vnf
+ alarm['vdu_name'] = vdu
+ alarm['metric_name'] = metric
+ alarm['severity'] = severity
+ alarm['threshold_value'] = int(threshold_value)
+ alarm['operation'] = threshold_operator
+ alarm['statistic'] = statistic
check_client_version(ctx.obj, ctx.command.name)
ctx.obj.ns.create_alarm(alarm)
except ClientException as inst:
# Performance Management operations
####################
-@cli.command(name='ns-metric-export')
+@cli.command(name='ns-metric-export', short_help='exports a metric to the internal OSM bus, which can be read by other apps')
@click.option('--ns', prompt=True, help='NS instance id or name')
@click.option('--vnf', prompt=True,
help='VNF name (VNF member index as declared in the NSD)')
@click.pass_context
def ns_metric_export(ctx, ns, vnf, vdu, metric, interval):
"""exports a metric to the internal OSM bus, which can be read by other apps"""
- ns_instance = ctx.obj.ns.get(ns)
- metric_data = {}
- metric_data['ns_id'] = ns_instance['_id']
- metric_data['correlation_id'] = ns_instance['_id']
- metric_data['vnf_member_index'] = vnf
- metric_data['vdu_name'] = vdu
- metric_data['metric_name'] = metric
- metric_data['collection_unit'] = 'WEEK'
- metric_data['collection_period'] = 1
- try:
+ # TODO: Check how to validate interval.
+ # Should it be an integer (seconds), or should a suffix (s,m,h,d,w) also be permitted?
+ try:
+ ns_instance = ctx.obj.ns.get(ns)
+ metric_data = {}
+ metric_data['ns_id'] = ns_instance['_id']
+ metric_data['correlation_id'] = ns_instance['_id']
+ metric_data['vnf_member_index'] = vnf
+ metric_data['vdu_name'] = vdu
+ metric_data['metric_name'] = metric
+ metric_data['collection_unit'] = 'WEEK'
+ metric_data['collection_period'] = 1
check_client_version(ctx.obj, ctx.command.name)
if not interval:
print('{}'.format(ctx.obj.ns.export_metric(metric_data)))
# Other operations
####################
-@cli.command(name='upload-package')
+@cli.command(name='upload-package', short_help='uploads a VNF package or NS package')
@click.argument('filename')
@click.pass_context
def upload_package(ctx, filename):
exit(1)
-@cli.command(name='ns-scaling-show')
-@click.argument('ns_name')
-@click.pass_context
-def show_ns_scaling(ctx, ns_name):
- """shows the status of a NS scaling operation
-
- NS_NAME: name of the NS instance being scaled
- """
- try:
- check_client_version(ctx.obj, ctx.command.name, 'v1')
- resp = ctx.obj.ns.list()
- except ClientException as inst:
- print((inst.message))
- exit(1)
-
- table = PrettyTable(
- ['group-name',
- 'instance-id',
- 'operational status',
- 'create-time',
- 'vnfr ids'])
-
- for ns in resp:
- if ns_name == ns['name']:
- nsopdata = ctx.obj.ns.get_opdata(ns['id'])
- scaling_records = nsopdata['nsr:nsr']['scaling-group-record']
- for record in scaling_records:
- if 'instance' in record:
- instances = record['instance']
- for inst in instances:
- table.add_row(
- [record['scaling-group-name-ref'],
- inst['instance-id'],
- inst['op-status'],
- time.strftime('%Y-%m-%d %H:%M:%S',
- time.localtime(
- inst['create-time'])),
- inst['vnfrs']])
- table.align = 'l'
- print(table)
-
-
-@cli.command(name='ns-scale')
-@click.argument('ns_name')
-@click.option('--ns_scale_group', prompt=True)
-@click.option('--index', prompt=True)
-@click.option('--wait',
- required=False,
- default=False,
- is_flag=True,
- help='do not return the control immediately, but keep it \
- until the operation is completed, or timeout')
-@click.pass_context
-def ns_scale(ctx, ns_name, ns_scale_group, index, wait):
- """scales NS
-
- NS_NAME: name of the NS instance to be scaled
- """
- try:
- check_client_version(ctx.obj, ctx.command.name, 'v1')
- ctx.obj.ns.scale(ns_name, ns_scale_group, index, wait=wait)
- except ClientException as inst:
- print((inst.message))
- exit(1)
-
-
-@cli.command(name='config-agent-list')
-@click.pass_context
-def config_agent_list(ctx):
- """list config agents"""
- try:
- check_client_version(ctx.obj, ctx.command.name, 'v1')
- except ClientException as inst:
- print((inst.message))
- exit(1)
- table = PrettyTable(['name', 'account-type', 'details'])
- for account in ctx.obj.vca.list():
- table.add_row(
- [account['name'],
- account['account-type'],
- account['juju']])
- table.align = 'l'
- print(table)
-
+#@cli.command(name='ns-scaling-show')
+#@click.argument('ns_name')
+#@click.pass_context
+#def show_ns_scaling(ctx, ns_name):
+# """shows the status of a NS scaling operation
+#
+# NS_NAME: name of the NS instance being scaled
+# """
+# try:
+# check_client_version(ctx.obj, ctx.command.name, 'v1')
+# resp = ctx.obj.ns.list()
+# except ClientException as inst:
+# print((inst.message))
+# exit(1)
+#
+# table = PrettyTable(
+# ['group-name',
+# 'instance-id',
+# 'operational status',
+# 'create-time',
+# 'vnfr ids'])
+#
+# for ns in resp:
+# if ns_name == ns['name']:
+# nsopdata = ctx.obj.ns.get_opdata(ns['id'])
+# scaling_records = nsopdata['nsr:nsr']['scaling-group-record']
+# for record in scaling_records:
+# if 'instance' in record:
+# instances = record['instance']
+# for inst in instances:
+# table.add_row(
+# [record['scaling-group-name-ref'],
+# inst['instance-id'],
+# inst['op-status'],
+# time.strftime('%Y-%m-%d %H:%M:%S',
+# time.localtime(
+# inst['create-time'])),
+# inst['vnfrs']])
+# table.align = 'l'
+# print(table)
+
+
+#@cli.command(name='ns-scale')
+#@click.argument('ns_name')
+#@click.option('--ns_scale_group', prompt=True)
+#@click.option('--index', prompt=True)
+#@click.option('--wait',
+# required=False,
+# default=False,
+# is_flag=True,
+# help='do not return the control immediately, but keep it \
+# until the operation is completed, or timeout')
+#@click.pass_context
+#def ns_scale(ctx, ns_name, ns_scale_group, index, wait):
+# """scales NS
+#
+# NS_NAME: name of the NS instance to be scaled
+# """
+# try:
+# check_client_version(ctx.obj, ctx.command.name, 'v1')
+# ctx.obj.ns.scale(ns_name, ns_scale_group, index, wait=wait)
+# except ClientException as inst:
+# print((inst.message))
+# exit(1)
-@cli.command(name='config-agent-delete')
-@click.argument('name')
-@click.pass_context
-def config_agent_delete(ctx, name):
- """deletes a config agent
- NAME: name of the config agent to be deleted
- """
- try:
- check_client_version(ctx.obj, ctx.command.name, 'v1')
- ctx.obj.vca.delete(name)
- except ClientException as inst:
- print((inst.message))
- exit(1)
+#@cli.command(name='config-agent-list')
+#@click.pass_context
+#def config_agent_list(ctx):
+# """list config agents"""
+# try:
+# check_client_version(ctx.obj, ctx.command.name, 'v1')
+# except ClientException as inst:
+# print((inst.message))
+# exit(1)
+# table = PrettyTable(['name', 'account-type', 'details'])
+# for account in ctx.obj.vca.list():
+# table.add_row(
+# [account['name'],
+# account['account-type'],
+# account['juju']])
+# table.align = 'l'
+# print(table)
-@cli.command(name='config-agent-add')
-@click.option('--name',
- prompt=True)
-@click.option('--account_type',
- prompt=True)
-@click.option('--server',
- prompt=True)
-@click.option('--user',
- prompt=True)
-@click.option('--secret',
- prompt=True,
- hide_input=True,
- confirmation_prompt=True)
-@click.pass_context
-def config_agent_add(ctx, name, account_type, server, user, secret):
- """adds a config agent"""
- try:
- check_client_version(ctx.obj, ctx.command.name, 'v1')
- ctx.obj.vca.create(name, account_type, server, user, secret)
- except ClientException as inst:
- print((inst.message))
- exit(1)
+#@cli.command(name='config-agent-delete')
+#@click.argument('name')
+#@click.pass_context
+#def config_agent_delete(ctx, name):
+# """deletes a config agent
+#
+# NAME: name of the config agent to be deleted
+# """
+# try:
+# check_client_version(ctx.obj, ctx.command.name, 'v1')
+# ctx.obj.vca.delete(name)
+# except ClientException as inst:
+# print((inst.message))
+# exit(1)
-@cli.command(name='ro-dump')
-@click.pass_context
-def ro_dump(ctx):
- """shows RO agent information"""
- check_client_version(ctx.obj, ctx.command.name, 'v1')
- resp = ctx.obj.vim.get_resource_orchestrator()
- table = PrettyTable(['key', 'attribute'])
- for k, v in list(resp.items()):
- table.add_row([k, json.dumps(v, indent=2)])
- table.align = 'l'
- print(table)
+#@cli.command(name='config-agent-add')
+#@click.option('--name',
+# prompt=True)
+#@click.option('--account_type',
+# prompt=True)
+#@click.option('--server',
+# prompt=True)
+#@click.option('--user',
+# prompt=True)
+#@click.option('--secret',
+# prompt=True,
+# hide_input=True,
+# confirmation_prompt=True)
+#@click.pass_context
+#def config_agent_add(ctx, name, account_type, server, user, secret):
+# """adds a config agent"""
+# try:
+# check_client_version(ctx.obj, ctx.command.name, 'v1')
+# ctx.obj.vca.create(name, account_type, server, user, secret)
+# except ClientException as inst:
+# print((inst.message))
+# exit(1)
-@cli.command(name='vcs-list')
-@click.pass_context
-def vcs_list(ctx):
- check_client_version(ctx.obj, ctx.command.name, 'v1')
- resp = ctx.obj.utils.get_vcs_info()
- table = PrettyTable(['component name', 'state'])
- for component in resp:
- table.add_row([component['component_name'], component['state']])
- table.align = 'l'
- print(table)
+#@cli.command(name='ro-dump')
+#@click.pass_context
+#def ro_dump(ctx):
+# """shows RO agent information"""
+# check_client_version(ctx.obj, ctx.command.name, 'v1')
+# resp = ctx.obj.vim.get_resource_orchestrator()
+# table = PrettyTable(['key', 'attribute'])
+# for k, v in list(resp.items()):
+# table.add_row([k, json.dumps(v, indent=2)])
+# table.align = 'l'
+# print(table)
+
+
+#@cli.command(name='vcs-list')
+#@click.pass_context
+#def vcs_list(ctx):
+# check_client_version(ctx.obj, ctx.command.name, 'v1')
+# resp = ctx.obj.utils.get_vcs_info()
+# table = PrettyTable(['component name', 'state'])
+# for component in resp:
+# table.add_row([component['component_name'], component['state']])
+# table.align = 'l'
+# print(table)
-@cli.command(name='ns-action')
+@cli.command(name='ns-action', short_help='executes an action/primitive over a NS instance')
@click.argument('ns_name')
-@click.option('--vnf_name', default=None)
+@click.option('--vnf_name', default=None, help='member-vnf-index if the target is a vnf instead of a ns)')
+@click.option('--vdu_id', default=None, help='vdu-id if the target is a vdu o a vnf')
+@click.option('--vdu_count', default=None, help='number of vdu instance of this vdu_id')
@click.option('--action_name', prompt=True)
-@click.option('--params', prompt=True)
+@click.option('--params', default=None)
@click.option('--wait',
required=False,
default=False,
def ns_action(ctx,
ns_name,
vnf_name,
+ vdu_id,
+ vdu_count,
action_name,
params,
wait):
"""
try:
check_client_version(ctx.obj, ctx.command.name)
- op_data={}
+ op_data = {}
if vnf_name:
- op_data['vnf_member_index'] = vnf_name
+ op_data['member_vnf_index'] = vnf_name
+ if vdu_id:
+ op_data['vdu_id'] = vdu_id
+ if vdu_count:
+ op_data['vdu_count_index'] = vdu_count
op_data['primitive'] = action_name
- op_data['primitive_params'] = yaml.load(params)
+ if params:
+ op_data['primitive_params'] = yaml.safe_load(params)
+ else:
+ op_data['primitive_params'] = {}
ctx.obj.ns.exec_op(ns_name, op_name='action', op_data=op_data, wait=wait)
except ClientException as inst:
- print((inst.message))
+ print(inst.message)
exit(1)
-@cli.command(name='vnf-scale')
+@cli.command(name='vnf-scale', short_help='executes a VNF scale (adding/removing VDUs)')
@click.argument('ns_name')
@click.argument('vnf_name')
@click.option('--scaling-group', prompt=True, help="scaling-group-descriptor name to use")
# Role Management Operations #
##############################
-@cli.command(name='role-create', short_help='creates a role')
+@cli.command(name='role-create', short_help='creates a new role')
@click.argument('name')
-@click.option('--definition',
+@click.option('--permissions',
default=None,
- help='role definition using a dictionary')
+ help='role permissions using a dictionary')
@click.pass_context
-def role_create(ctx, name, definition):
+def role_create(ctx, name, permissions):
"""
Creates a new role.
"""
try:
check_client_version(ctx.obj, ctx.command.name)
- ctx.obj.role.create(name, definition)
+ ctx.obj.role.create(name, permissions)
except ClientException as inst:
print(inst.message)
+ exit(1)
@cli.command(name='role-update', short_help='updates a role')
@click.argument('name')
-@click.option('--definition',
+@click.option('--set-name',
default=None,
- help='add a new definition to the role')
+ help='change name of rle')
+# @click.option('--permissions',
+# default=None,
+# help='provide a yaml format dictionary with incremental changes. Values can be bool or None to delete')
@click.option('--add',
default=None,
- help='add a resource access grant/denial')
+ help='yaml format dictionary with permission: True/False to access grant/denial')
@click.option('--remove',
default=None,
- help='remove a resource access grant/denial')
+ help='yaml format list to remove a permission')
@click.pass_context
-def role_update(ctx, name, definition, add, remove):
+def role_update(ctx, name, set_name, add, remove):
"""
Updates a role.
"""
try:
check_client_version(ctx.obj, ctx.command.name)
- ctx.obj.role.update(name, definition, add, remove)
+ ctx.obj.role.update(name, set_name, None, add, remove)
except ClientException as inst:
print(inst.message)
exit(1)
table.align = 'l'
print(table)
-
if __name__ == '__main__':
try:
cli()
projects / osm / osmclient.git / blobdiff