From 4c5a703b30e32b97f739ed2bbb33993ddc61c5d0 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Mon, 1 Jun 2020 13:53:55 +0000 Subject: [PATCH] osm.py: renamed internal functions for pkg_repo_list Change-Id: I82c64f44db6356b2aafa4dd17bf87dbeae919448 Signed-off-by: garciadeblas --- osmclient/scripts/osm.py | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/osmclient/scripts/osm.py b/osmclient/scripts/osm.py index a369c48..f31d5f6 100755 --- a/osmclient/scripts/osm.py +++ b/osmclient/scripts/osm.py @@ -562,18 +562,6 @@ def vnfd_list2(ctx, nf_type, filter, long): logger.debug("") vnfd_list(ctx, nf_type, filter, long) -@cli_osm.command(name='vnfpkg-repo-list', short_help='list all xNF from OSM repositories') -@click.option('--filter', default=None, - help='restricts the list to the NFpkg 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 vnfd_list3(ctx, filter, repo, long): - """list xNF packages from OSM repositories""" - pkgtype = 'vnf' - pkg_repo_list(ctx, pkgtype, filter, repo, 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, @@ -590,6 +578,18 @@ def nfpkg_list(ctx, nf_type, filter, long): # print(str(e)) # exit(1) +@cli_osm.command(name='vnfpkg-repo-list', short_help='list all xNF from OSM repositories') +@click.option('--filter', default=None, + help='restricts the list to the NFpkg 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 nfpkg_repo_list1(ctx, filter, repo, long): + """list xNF packages from OSM repositories""" + 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, help='restricts the list to the NFpkg matching the filter') @@ -597,7 +597,7 @@ def nfpkg_list(ctx, nf_type, filter, long): help='restricts the list to a particular OSM repository') @click.option('--long', is_flag=True, help='get more details') @click.pass_context -def vnfd_list4(ctx, filter, repo, long): +def nfpkg_repo_list2(ctx, filter, repo, long): """list xNF packages from OSM repositories""" pkgtype = 'vnf' pkg_repo_list(ctx, pkgtype, filter, repo, long) @@ -671,7 +671,7 @@ def vnf_list1(ctx, ns, filter, long): help='restricts the list to a particular OSM repository') @click.option('--long', is_flag=True, help='get more details') @click.pass_context -def nsd_list3(ctx, filter, repo, long): +def nspkg_repo_list(ctx, filter, repo, long): """list xNF packages from OSM repositories""" pkgtype = 'ns' pkg_repo_list(ctx, pkgtype, filter, repo, long) @@ -683,7 +683,7 @@ def nsd_list3(ctx, filter, repo, long): help='restricts the list to a particular OSM repository') @click.option('--long', is_flag=True, help='get more details') @click.pass_context -def nspkg_list(ctx, filter, repo, long): +def nspkg_repo_list2(ctx, filter, repo, long): """list xNF packages from OSM repositories""" pkgtype = 'ns' pkg_repo_list(ctx, pkgtype, filter, repo, long) -- 2.17.1