return
+def get_project(project_list, item):
+ # project_list = ctx.obj.project.list()
+ item_project_list = item.get('_admin').get('projects_read')
+ project_id = 'None'
+ project_name = 'None'
+ if item_project_list:
+ for p1 in item_project_list:
+ project_id = p1
+ for p2 in project_list:
+ if p2['_id'] == project_id:
+ project_name = p2['name']
+ return project_id, project_name
+ return project_id, project_name
+
+
@click.group(context_settings=dict(help_option_names=['-h', '--help'], max_content_width=160))
@click.option('--hostname',
default="127.0.0.1",
nsd_list(ctx, filter, long)
-def pkg_repo_list(ctx, pkgtype, filter, repo, long):
- if filter:
- filter='&'.join(filter)
- resp = ctx.obj.osmrepo.pkg_list(pkgtype, filter, repo)
- if long:
- table = PrettyTable(['nfpkg name', 'vendor', 'version', 'latest', 'description', 'repository'])
- else:
- table = PrettyTable(['nfpkg name', 'repository'])
- for vnfd in resp:
- name = vnfd.get('name', '-')
- repository = vnfd.get('repository')
- if long:
- vendor = vnfd.get('vendor')
- version = vnfd.get('version')
- description = vnfd.get('description')
- latest = vnfd.get('latest')
- table.add_row([name, vendor, version, latest, description, repository])
- else:
- table.add_row([name, repository])
- table.align = 'l'
- print(table)
-
def vnfd_list(ctx, nf_type, filter, long):
logger.debug("")
if nf_type:
logger.debug("")
vnfd_list(ctx, nf_type, filter, long)
+
@cli_osm.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, multiple=True,
# print(str(e))
# exit(1)
+
+def pkg_repo_list(ctx, pkgtype, filter, repo, long):
+ if filter:
+ filter='&'.join(filter)
+ resp = ctx.obj.osmrepo.pkg_list(pkgtype, filter, repo)
+ if long:
+ table = PrettyTable(['nfpkg name', 'vendor', 'version', 'latest', 'description', 'repository'])
+ else:
+ table = PrettyTable(['nfpkg name', 'repository'])
+ for vnfd in resp:
+ name = vnfd.get('name', '-')
+ repository = vnfd.get('repository')
+ if long:
+ vendor = vnfd.get('vendor')
+ version = vnfd.get('version')
+ description = vnfd.get('description')
+ latest = vnfd.get('latest')
+ table.add_row([name, vendor, version, latest, description, repository])
+ else:
+ table.add_row([name, repository])
+ table.align = 'l'
+ print(table)
+
+
@cli_osm.command(name='vnfpkg-repo-list', short_help='list all xNF from OSM repositories')
@click.option('--filter', default=None, multiple=True,
help='restricts the list to the NFpkg matching the filter')
pkgtype = 'vnf'
pkg_repo_list(ctx, pkgtype, filter, repo, long)
+
@cli_osm.command(name='nfpkg-repo-list', short_help='list all xNF from OSM repositories')
@click.option('--filter', default=None, multiple=True,
help='restricts the list to the NFpkg matching the filter')
pkgtype = 'vnf'
pkg_repo_list(ctx, pkgtype, filter, repo, long)
+
+@cli_osm.command(name='nsd-repo-list', short_help='list all NS from OSM repositories')
+@click.option('--filter', default=None, multiple=True,
+ help='restricts the list to the NS matching the filter')
+@click.option('--repo', default=None,
+ help='restricts the list to a particular OSM repository')
+@click.option('--long', is_flag=True, help='get more details')
+@click.pass_context
+def nspkg_repo_list(ctx, filter, repo, long):
+ """list xNF packages from OSM repositories"""
+ pkgtype = 'ns'
+ pkg_repo_list(ctx, pkgtype, filter, repo, long)
+
+
+@cli_osm.command(name='nspkg-repo-list', short_help='list all NS from OSM repositories')
+@click.option('--filter', default=None, multiple=True,
+ help='restricts the list to the NS matching the filter')
+@click.option('--repo', default=None,
+ help='restricts the list to a particular OSM repository')
+@click.option('--long', is_flag=True, help='get more details')
+@click.pass_context
+def nspkg_repo_list2(ctx, filter, repo, long):
+ """list xNF packages from OSM repositories"""
+ pkgtype = 'ns'
+ pkg_repo_list(ctx, pkgtype, filter, repo, long)
+
+
def vnf_list(ctx, ns, filter, long):
# try:
if ns or filter:
logger.debug("")
vnf_list(ctx, ns, filter, long)
-@cli_osm.command(name='nsd-repo-list', short_help='list all NS from OSM repositories')
-@click.option('--filter', default=None, multiple=True,
- help='restricts the list to the NS matching the filter')
-@click.option('--repo', default=None,
- help='restricts the list to a particular OSM repository')
-@click.option('--long', is_flag=True, help='get more details')
-@click.pass_context
-def nspkg_repo_list(ctx, filter, repo, long):
- """list xNF packages from OSM repositories"""
- pkgtype = 'ns'
- pkg_repo_list(ctx, pkgtype, filter, repo, long)
-
-@cli_osm.command(name='nspkg-repo-list', short_help='list all NS from OSM repositories')
-@click.option('--filter', default=None, multiple=True,
- help='restricts the list to the NS matching the filter')
-@click.option('--repo', default=None,
- help='restricts the list to a particular OSM repository')
-@click.option('--long', is_flag=True, help='get more details')
-@click.pass_context
-def nspkg_repo_list2(ctx, filter, repo, long):
- """list xNF packages from OSM repositories"""
- pkgtype = 'ns'
- pkg_repo_list(ctx, pkgtype, filter, repo, long)
@cli_osm.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')
# resp = ctx.obj.vim.list(ro_update)
if long:
table = PrettyTable(['vim name', 'uuid', 'project', 'operational state', 'error details'])
+ project_list = ctx.obj.project.list()
else:
table = PrettyTable(['vim name', 'uuid', 'operational state'])
for vim in resp:
if long:
- vim_details = ctx.obj.vim.get(vim['uuid'])
- if 'vim_password' in vim_details:
- vim_details['vim_password']='********'
- logger.debug('VIM details: {}'.format(yaml.safe_dump(vim_details)))
- vim_state = vim_details['_admin'].get('operationalState', '-')
+ if 'vim_password' in vim:
+ vim['vim_password']='********'
+ logger.debug('VIM details: {}'.format(yaml.safe_dump(vim)))
+ vim_state = vim['_admin'].get('operationalState', '-')
error_details = 'N/A'
if vim_state == 'ERROR':
- error_details = vim_details['_admin'].get('detailed-status', 'Not found')
- project_list = ctx.obj.project.list()
- vim_project_list = vim_details.get('_admin').get('projects_read')
- project_id = 'None'
- project_name = 'None'
- if vim_project_list:
- project_id = vim_project_list[0]
- for p in project_list:
- if p['_id'] == project_id:
- project_name = p['name']
- break
- table.add_row([vim['name'], vim['uuid'], '{} ({})'.format(project_name, project_id),
+ error_details = vim['_admin'].get('detailed-status', 'Not found')
+ project_id, project_name = get_project(project_list, vim)
+ #project_info = '{} ({})'.format(project_name, project_id)
+ project_info = project_name
+ table.add_row([vim['name'], vim['uuid'], project_info,
vim_state, wrap_text(text=error_details, width=80)])
else:
table.add_row([vim['name'], vim['uuid'], vim['_admin'].get('operationalState', '-')])
@cli_osm.command(name='vim-show', short_help='shows the details of a VIM account')
@click.argument('name')
+@click.option('--filter', multiple=True,
+ help='restricts the information to the fields in the filter')
@click.pass_context
-def vim_show(ctx, name):
+def vim_show(ctx, name, filter):
"""shows the details of a VIM account
NAME: name or ID of the VIM account
table = PrettyTable(['key', 'attribute'])
for k, v in list(resp.items()):
- table.add_row([k, wrap_text(text=json.dumps(v, indent=2),width=100)])
+ if not filter or k in filter:
+ table.add_row([k, wrap_text(text=json.dumps(v, indent=2),width=100)])
table.align = 'l'
print(table)
help='restricts the list to the K8s clusters matching the filter')
@click.option('--literal', is_flag=True,
help='print literally, no pretty table')
+@click.option('--long', is_flag=True, help='get more details')
@click.pass_context
-def k8scluster_list(ctx, filter, literal):
+def k8scluster_list(ctx, filter, literal, long):
"""list all K8s clusters"""
# try:
check_client_version(ctx.obj, ctx.command.name)
if literal:
print(yaml.safe_dump(resp, indent=4, default_flow_style=False))
return
- table = PrettyTable(['Name', 'Id', 'Version', 'VIM', 'K8s-nets', 'Operational State', 'Description'])
+ if long:
+ table = PrettyTable(['Name', 'Id', 'Project', 'Version', 'VIM', 'K8s-nets',
+ 'Operational State', 'Op. state (details)', 'Description', 'Detailed status'])
+ project_list = ctx.obj.project.list()
+ else:
+ table = PrettyTable(['Name', 'Id', 'VIM', 'Operational State', 'Op. state details'])
for cluster in resp:
- table.add_row([cluster['name'], cluster['_id'], cluster['k8s_version'], cluster['vim_account'],
- json.dumps(cluster['nets']), cluster["_admin"]["operationalState"],
- trunc_text(cluster.get('description') or '', 40)])
+ op_state_details = "Helm: {}\nJuju: {}".format(
+ cluster["_admin"].get("helm-chart", "-").get("operationalState", "-"),
+ cluster["_admin"].get("juju-bundle", "-").get("operationalState", "-"))
+ if long:
+ logger.debug('Cluster details: {}'.format(yaml.safe_dump(cluster)))
+ project_id, project_name = get_project(project_list, cluster)
+ #project_info = '{} ({})'.format(project_name, project_id)
+ project_info = project_name
+ detailed_status = cluster["_admin"].get("detailed-status","-")
+ table.add_row([cluster['name'], cluster['_id'], project_info,
+ cluster['k8s_version'], cluster['vim_account'],
+ json.dumps(cluster['nets']), cluster["_admin"]["operationalState"],
+ op_state_details, trunc_text(cluster.get('description') or '', 40),
+ wrap_text(text=detailed_status, width=40)])
+ else:
+ table.add_row([cluster['name'], cluster['_id'], cluster['vim_account'],
+ cluster["_admin"]["operationalState"], op_state_details])
table.align = 'l'
print(table)
# except ClientException as e:
projects / osm / osmclient.git / blobdiff