@click.option('--config_file',
default=None,
help='ns specific yaml configuration file')
+@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_create(ctx,
nsd_name,
admin_status,
ssh_keys,
config,
- config_file):
+ config_file,
+ wait):
"""creates a new NS instance"""
try:
if config_file:
ns_name,
config=config,
ssh_keys=ssh_keys,
- account=vim_account)
+ account=vim_account,
+ wait=wait)
except ClientException as inst:
print(inst.message)
exit(1)
nst_create(ctx, filename, overwrite)
-def nsi_create(ctx, nst_name, nsi_name, vim_account, ssh_keys, config, config_file):
+def nsi_create(ctx, nst_name, nsi_name, vim_account, ssh_keys, config, config_file, wait):
"""creates a new Network Slice Instance (NSI)"""
try:
check_client_version(ctx.obj, ctx.command.name)
with open(config_file, 'r') as cf:
config=cf.read()
ctx.obj.nsi.create(nst_name, nsi_name, config=config, ssh_keys=ssh_keys,
- account=vim_account)
+ account=vim_account, wait=wait)
except ClientException as inst:
print(inst.message)
exit(1)
@click.option('--config_file',
default=None,
help='nsi specific yaml configuration file')
+@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 nsi_create1(ctx, nst_name, nsi_name, vim_account, ssh_keys, config, config_file):
+def nsi_create1(ctx, nst_name, nsi_name, vim_account, ssh_keys, config, config_file, wait):
"""creates a new Network Slice Instance (NSI)"""
- nsi_create(ctx, nst_name, nsi_name, vim_account, ssh_keys, config, config_file)
+ nsi_create(ctx, nst_name, nsi_name, vim_account, ssh_keys, config, config_file, wait=wait)
@cli.command(name='netslice-instance-create', short_help='creates a new Network Slice Instance')
@click.option('--config_file',
default=None,
help='nsi specific yaml configuration file')
+@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 nsi_create2(ctx, nst_name, nsi_name, vim_account, ssh_keys, config, config_file):
+def nsi_create2(ctx, nst_name, nsi_name, vim_account, ssh_keys, config, config_file, wait):
"""creates a new Network Slice Instance (NSI)"""
- nsi_create(ctx, nst_name, nsi_name, vim_account, ssh_keys, config, config_file)
+ nsi_create(ctx, nst_name, nsi_name, vim_account, ssh_keys, config, config_file, wait=wait)
@cli.command(name='pdu-create', short_help='adds a new Physical Deployment Unit to the catalog')
@cli.command(name='ns-delete', short_help='deletes a NS instance')
@click.argument('name')
@click.option('--force', is_flag=True, help='forces the deletion bypassing pre-conditions')
+@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_delete(ctx, name, force):
+def ns_delete(ctx, name, force, wait):
"""deletes a NS instance
NAME: name or ID of the NS instance to be deleted
"""
try:
if not force:
- ctx.obj.ns.delete(name)
+ ctx.obj.ns.delete(name, wait=wait)
else:
check_client_version(ctx.obj, '--force')
- ctx.obj.ns.delete(name, force)
+ ctx.obj.ns.delete(name, force, wait=wait)
except ClientException as inst:
print((inst.message))
exit(1)
nst_delete(ctx, name, force)
-def nsi_delete(ctx, name, force):
+def nsi_delete(ctx, name, force, wait):
try:
check_client_version(ctx.obj, ctx.command.name)
- ctx.obj.nsi.delete(name, force)
+ ctx.obj.nsi.delete(name, force, wait=wait)
except ClientException as inst:
print((inst.message))
exit(1)
@cli.command(name='nsi-delete', short_help='deletes a Network Slice Instance (NSI)')
@click.argument('name')
@click.option('--force', is_flag=True, help='forces the deletion bypassing pre-conditions')
+@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 nsi_delete1(ctx, name, force):
+def nsi_delete1(ctx, name, force, wait):
"""deletes a Network Slice Instance (NSI)
NAME: name or ID of the Network Slice instance to be deleted
"""
- nsi_delete(ctx, name, force)
+ nsi_delete(ctx, name, force, wait=wait)
@cli.command(name='netslice-instance-delete', short_help='deletes a Network Slice Instance (NSI)')
@click.argument('name')
@click.option('--force', is_flag=True, help='forces the deletion bypassing pre-conditions')
@click.pass_context
-def nsi_delete2(ctx, name, force):
+def nsi_delete2(ctx, name, force, wait):
"""deletes a Network Slice Instance (NSI)
NAME: name or ID of the Network Slice instance to be deleted
"""
- nsi_delete(ctx, name, force)
+ nsi_delete(ctx, name, force, wait=wait)
@cli.command(name='pdu-delete', short_help='deletes a Physical Deployment Unit (PDU)')
help='human readable description')
@click.option('--sdn_controller', default=None, help='Name or id of the SDN controller associated to this VIM account')
@click.option('--sdn_port_mapping', default=None, help="File describing the port mapping between compute nodes' ports and switch ports")
+@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 vim_create(ctx,
name,
account_type,
description,
sdn_controller,
- sdn_port_mapping):
+ sdn_port_mapping,
+ wait):
"""creates a new VIM account"""
try:
if sdn_controller:
vim['description'] = description
vim['config'] = config
if sdn_controller or sdn_port_mapping:
- ctx.obj.vim.create(name, vim, sdn_controller, sdn_port_mapping)
+ ctx.obj.vim.create(name, vim, sdn_controller, sdn_port_mapping, wait=wait)
else:
- ctx.obj.vim.create(name, vim)
+ ctx.obj.vim.create(name, vim, wait=wait)
except ClientException as inst:
print((inst.message))
exit(1)
@click.option('--description', help='human readable description')
@click.option('--sdn_controller', default=None, help='Name or id of the SDN controller associated to this VIM account')
@click.option('--sdn_port_mapping', default=None, help="File describing the port mapping between compute nodes' ports and switch ports")
+@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 vim_update(ctx,
name,
account_type,
description,
sdn_controller,
- sdn_port_mapping):
+ sdn_port_mapping,
+ wait):
"""updates a VIM account
NAME: name or ID of the VIM account
if account_type: vim['vim_type'] = account_type
if description: vim['description'] = description
if config: vim['config'] = config
- ctx.obj.vim.update(name, vim, sdn_controller, sdn_port_mapping)
+ ctx.obj.vim.update(name, vim, sdn_controller, sdn_port_mapping, wait=wait)
except ClientException as inst:
print((inst.message))
exit(1)
@cli.command(name='vim-delete')
@click.argument('name')
@click.option('--force', is_flag=True, help='forces the deletion bypassing pre-conditions')
+@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 vim_delete(ctx, name, force):
+def vim_delete(ctx, name, force, wait):
"""deletes a VIM account
NAME: name or ID of the VIM account to be deleted
"""
try:
if not force:
- ctx.obj.vim.delete(name)
+ ctx.obj.vim.delete(name, wait=wait)
else:
check_client_version(ctx.obj, '--force')
- ctx.obj.vim.delete(name, force)
+ ctx.obj.vim.delete(name, force, wait=wait)
except ClientException as inst:
print((inst.message))
exit(1)
default='no description',
help='human readable description')
@click.option('--wim_port_mapping', default=None, help="File describing the port mapping between DC edge (datacenters, switches, ports) and WAN edge (WAN service endpoint id and info)")
+@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 wim_create(ctx,
name,
config,
wim_type,
description,
- wim_port_mapping):
+ wim_port_mapping,
+ wait):
"""creates a new WIM account"""
try:
check_client_version(ctx.obj, ctx.command.name)
wim['wim_type'] = wim_type
if description: wim['description'] = description
if config: wim['config'] = config
- ctx.obj.wim.create(name, wim, wim_port_mapping)
+ ctx.obj.wim.create(name, wim, wim_port_mapping, wait=wait)
except ClientException as inst:
print((inst.message))
exit(1)
@click.option('--wim_type', help='WIM type')
@click.option('--description', help='human readable description')
@click.option('--wim_port_mapping', default=None, help="File describing the port mapping between DC edge (datacenters, switches, ports) and WAN edge (WAN service endpoint id and info)")
+@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 wim_update(ctx,
name,
config,
wim_type,
description,
- wim_port_mapping):
+ wim_port_mapping,
+ wait):
"""updates a WIM account
NAME: name or ID of the WIM account
if wim_type: wim['wim_type'] = wim_type
if description: wim['description'] = description
if config: wim['config'] = config
- ctx.obj.wim.update(name, wim, wim_port_mapping)
+ ctx.obj.wim.update(name, wim, wim_port_mapping, wait=wait)
except ClientException as inst:
print((inst.message))
exit(1)
@cli.command(name='wim-delete')
@click.argument('name')
@click.option('--force', is_flag=True, help='forces the deletion bypassing pre-conditions')
+@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 wim_delete(ctx, name, force):
+def wim_delete(ctx, name, force, wait):
"""deletes a WIM account
NAME: name or ID of the WIM account to be deleted
"""
try:
check_client_version(ctx.obj, ctx.command.name)
- ctx.obj.wim.delete(name, force)
+ ctx.obj.wim.delete(name, force, wait=wait)
except ClientException as inst:
print((inst.message))
exit(1)
prompt=True,
help='SDN controller type')
@click.option('--sdn_controller_version',
- help='SDN controller username')
+ help='SDN controller version')
@click.option('--ip_address',
prompt=True,
help='SDN controller IP address')
#@click.option('--description',
# default='no description',
# help='human readable description')
+@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 sdnc_create(ctx,
- name,
- type,
- sdn_controller_version,
- ip_address,
- port,
- switch_dpid,
- user,
- password):
+ name,
+ type,
+ sdn_controller_version,
+ ip_address,
+ port,
+ switch_dpid,
+ user,
+ password,
+ wait):
"""creates a new SDN controller"""
sdncontroller = {}
sdncontroller['name'] = name
# sdncontroller['description'] = description
try:
check_client_version(ctx.obj, ctx.command.name)
- ctx.obj.sdnc.create(name, sdncontroller)
+ ctx.obj.sdnc.create(name, sdncontroller, wait=wait)
except ClientException as inst:
print((inst.message))
@click.option('--user', help='SDN controller username')
@click.option('--password', help='SDN controller password')
#@click.option('--description', default=None, help='human readable description')
+@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 sdnc_update(ctx,
- name,
- newname,
- type,
- sdn_controller_version,
- ip_address,
- port,
- switch_dpid,
- user,
- password):
+ name,
+ newname,
+ type,
+ sdn_controller_version,
+ ip_address,
+ port,
+ switch_dpid,
+ user,
+ password,
+ wait):
"""updates an SDN controller
NAME: name or ID of the SDN controller
sdncontroller['password'] = user
try:
check_client_version(ctx.obj, ctx.command.name)
- ctx.obj.sdnc.update(name, sdncontroller)
+ ctx.obj.sdnc.update(name, sdncontroller, wait=wait)
except ClientException as inst:
print((inst.message))
exit(1)
@cli.command(name='sdnc-delete')
@click.argument('name')
@click.option('--force', is_flag=True, help='forces the deletion bypassing pre-conditions')
+@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 sdnc_delete(ctx, name, force):
+def sdnc_delete(ctx, name, force, wait):
"""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, force)
+ ctx.obj.sdnc.delete(name, force, wait=wait)
except ClientException as inst:
print((inst.message))
exit(1)
#@click.argument('name')
#@click.pass_context
#def ns_alarm_delete(ctx, name):
-# '''deletes an alarm
+# """deletes an alarm
#
# NAME: name of the alarm to be deleted
-# '''
+# """
# try:
# check_client_version(ctx.obj, ctx.command.name)
# ctx.obj.ns.delete_alarm(name)
@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):
+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)
+ ctx.obj.ns.scale(ns_name, ns_scale_group, index, wait=wait)
except ClientException as inst:
print((inst.message))
exit(1)
@click.option('--vnf_name', default=None)
@click.option('--action_name', prompt=True)
@click.option('--params', 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_action(ctx,
ns_name,
vnf_name,
action_name,
- params):
+ params,
+ wait):
"""executes an action/primitive over a NS instance
NS_NAME: name or ID of the NS instance
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)
+ ctx.obj.ns.exec_op(ns_name, op_name='action', op_data=op_data, wait=wait)
except ClientException as inst:
print((inst.message))
projects / osm / osmclient.git / blobdiff