Feature 8047: osmclient package creation and validation tool

[osm/osmclient.git] / osmclient / scripts / osm.py

diff --git a/osmclient/scripts/osm.py b/osmclient/scripts/osm.py
index fe140dd..b1df0a5 100755 (executable)
--- a/osmclient/scripts/osm.py
+++ b/osmclient/scripts/osm.py
@@ -47,7 +47,9 @@ 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',
@@ -124,7 +126,7 @@ def cli(ctx, hostname, user, password, project):
 # 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
@@ -233,7 +235,7 @@ def nsd_list(ctx, filter):
     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
@@ -242,12 +244,12 @@ def nsd_list1(ctx, filter):
     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)
 
 
@@ -287,38 +289,38 @@ def vnfd_list(ctx, nf_type, filter):
     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)
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         exit(1)
 
 
@@ -332,8 +334,8 @@ def vnf_list(ctx, ns, filter):
             resp = ctx.obj.vnf.list(ns, filter)
         else:
             resp = ctx.obj.vnf.list()
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         exit(1)
     fullclassname = ctx.obj.__module__ + "." + ctx.obj.__class__.__name__
     if fullclassname == 'osmclient.sol005.client.Client':
@@ -374,7 +376,7 @@ def vnf_list(ctx, ns, 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.')
@@ -384,7 +386,7 @@ def vnf_list1(ctx, ns, 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.')
@@ -440,7 +442,7 @@ def nf_list(ctx, ns, 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):
@@ -451,8 +453,8 @@ def ns_op_list(ctx, name):
     try:
         check_client_version(ctx.obj, ctx.command.name)
         resp = ctx.obj.ns.list_op(name)
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         exit(1)
 
     table = PrettyTable(['id', 'operation', 'status'])
@@ -468,8 +470,8 @@ def nsi_list(ctx, filter):
     try:
         check_client_version(ctx.obj, ctx.command.name)
         resp = ctx.obj.nsi.list(filter)
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         exit(1)
     table = PrettyTable(
         ['netslice instance name',
@@ -495,7 +497,7 @@ def nsi_list(ctx, filter):
     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
@@ -504,7 +506,7 @@ def nsi_list1(ctx, filter):
     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
@@ -517,8 +519,8 @@ def nst_list(ctx, filter):
     try:
         check_client_version(ctx.obj, ctx.command.name)
         resp = ctx.obj.nst.list(filter)
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         exit(1)
     # print(yaml.safe_dump(resp))
     table = PrettyTable(['nst name', 'id'])
@@ -529,7 +531,7 @@ def nst_list(ctx, filter):
     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
@@ -538,7 +540,7 @@ def nst_list1(ctx, filter):
     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
@@ -551,8 +553,8 @@ def nsi_op_list(ctx, name):
     try:
         check_client_version(ctx.obj, ctx.command.name)
         resp = ctx.obj.nsi.list_op(name)
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         exit(1)
     table = PrettyTable(['id', 'operation', 'status'])
     for op in resp:
@@ -562,7 +564,7 @@ def nsi_op_list(ctx, name):
     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):
@@ -573,7 +575,7 @@ 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):
@@ -584,7 +586,7 @@ 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
@@ -593,8 +595,8 @@ def pdu_list(ctx, filter):
     try:
         check_client_version(ctx.obj, ctx.command.name)
         resp = ctx.obj.pdu.list(filter)
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         exit(1)
     table = PrettyTable(
         ['pdu name',
@@ -627,8 +629,8 @@ def nsd_show(ctx, name, literal):
     try:
         resp = ctx.obj.nsd.get(name)
         # resp = ctx.obj.nsd.get_individual(name)
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         exit(1)
 
     if literal:
@@ -672,8 +674,8 @@ def vnfd_show(ctx, name, literal):
     try:
         resp = ctx.obj.vnfd.get(name)
         # resp = ctx.obj.vnfd.get_individual(name)
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         exit(1)
 
     if literal:
@@ -739,8 +741,8 @@ def ns_show(ctx, name, literal, filter):
     """
     try:
         ns = ctx.obj.ns.get(name)
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         exit(1)
 
     if literal:
@@ -778,8 +780,8 @@ def vnf_show(ctx, name, literal, filter):
     try:
         check_client_version(ctx.obj, ctx.command.name)
         resp = ctx.obj.vnf.get(name)
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         exit(1)
 
     if literal:
@@ -801,8 +803,8 @@ def vnf_show(ctx, name, literal, filter):
 #    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))
+#    except ClientException as e:
+#        print(str(e))
 #        exit(1)
 #
 #    table = PrettyTable(['vnf name', 'monitoring name', 'value', 'units'])
@@ -824,8 +826,8 @@ def vnf_show(ctx, name, literal, filter):
 #    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))
+#    except ClientException as e:
+#        print(str(e))
 #        exit(1)
 #
 #    table = PrettyTable(['vnf name', 'monitoring name', 'value', 'units'])
@@ -840,20 +842,20 @@ def vnf_show(ctx, name, literal, filter):
 #    print(table)
 
 
-@cli.command(name='ns-op-show', short_help='shows the info of an operation')
+@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
     """
     try:
         check_client_version(ctx.obj, ctx.command.name)
         op_info = ctx.obj.ns.get_op(id)
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         exit(1)
 
     table = PrettyTable(['field', 'value'])
@@ -869,8 +871,8 @@ def nst_show(ctx, name, literal):
         check_client_version(ctx.obj, ctx.command.name)
         resp = ctx.obj.nst.get(name)
         #resp = ctx.obj.nst.get_individual(name)
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         exit(1)
 
     if literal:
@@ -914,8 +916,8 @@ def nsi_show(ctx, name, literal, filter):
     try:
         check_client_version(ctx.obj, ctx.command.name)
         nsi = ctx.obj.nsi.get(name)
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         exit(1)
 
     if literal:
@@ -964,8 +966,8 @@ def nsi_op_show(ctx, id, filter):
     try:
         check_client_version(ctx.obj, ctx.command.name)
         op_info = ctx.obj.nsi.get_op(id)
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         exit(1)
 
     table = PrettyTable(['field', 'value'])
@@ -1014,8 +1016,8 @@ def pdu_show(ctx, name, literal, filter):
     try:
         check_client_version(ctx.obj, ctx.command.name)
         pdu = ctx.obj.pdu.get(name)
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         exit(1)
 
     if literal:
@@ -1040,15 +1042,18 @@ def nsd_create(ctx, filename, overwrite):
     try:
         check_client_version(ctx.obj, ctx.command.name)
         ctx.obj.nsd.create(filename, overwrite)
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         exit(1)
 
 
 @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
@@ -1060,8 +1065,11 @@ def nsd_create1(ctx, filename, overwrite):
 
 @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
@@ -1075,15 +1083,18 @@ def vnfd_create(ctx, filename, overwrite):
     try:
         check_client_version(ctx.obj, ctx.command.name)
         ctx.obj.vnfd.create(filename, overwrite)
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         exit(1)
 
 
 @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
@@ -1095,8 +1106,11 @@ def vnfd_create1(ctx, filename, overwrite):
 
 @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
@@ -1108,8 +1122,11 @@ def vnfd_create2(ctx, filename, overwrite):
 
 @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
@@ -1169,8 +1186,8 @@ def ns_create(ctx,
             ssh_keys=ssh_keys,
             account=vim_account,
             wait=wait)
-    except ClientException as inst:
-        print(inst.message)
+    except ClientException as e:
+        print(str(e))
         exit(1)
 
 
@@ -1178,15 +1195,18 @@ def nst_create(ctx, filename, overwrite):
     try:
         check_client_version(ctx.obj, ctx.command.name)
         ctx.obj.nst.create(filename, overwrite)
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         exit(1)
 
 
 @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)
@@ -1198,8 +1218,11 @@ def nst_create1(ctx, filename, overwrite):
 
 @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)
@@ -1220,8 +1243,8 @@ def nsi_create(ctx, nst_name, nsi_name, vim_account, ssh_keys, config, config_fi
                 config=cf.read()
         ctx.obj.nsi.create(nst_name, nsi_name, config=config, ssh_keys=ssh_keys,
                            account=vim_account, wait=wait)
-    except ClientException as inst:
-        print(inst.message)
+    except ClientException as e:
+        print(str(e))
         exit(1)
 
 
@@ -1314,7 +1337,7 @@ def pdu_create(ctx, name, pdu_type, interface, description, vim_account, descrip
                 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
@@ -1327,8 +1350,8 @@ def pdu_create(ctx, name, pdu_type, interface, description, vim_account, descrip
                 ifaces_list.append(new_iface)
             pdu["interfaces"] = ifaces_list
         ctx.obj.pdu.create(pdu)
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         exit(1)
 
 ####################
@@ -1339,8 +1362,8 @@ def nsd_update(ctx, name, content):
     try:
         check_client_version(ctx.obj, ctx.command.name)
         ctx.obj.nsd.update(name, content)
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         exit(1)
 
 
@@ -1374,8 +1397,8 @@ def vnfd_update(ctx, name, content):
     try:
         check_client_version(ctx.obj, ctx.command.name)
         ctx.obj.vnfd.update(name, content)
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         exit(1)
 
 
@@ -1422,8 +1445,8 @@ def nst_update(ctx, name, content):
     try:
         check_client_version(ctx.obj, ctx.command.name)
         ctx.obj.nst.update(name, content)
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         exit(1)
 
 
@@ -1464,8 +1487,8 @@ def nsd_delete(ctx, name, force):
         else:
             check_client_version(ctx.obj, '--force')
             ctx.obj.nsd.delete(name, force)
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         exit(1)
 
 
@@ -1500,8 +1523,8 @@ def vnfd_delete(ctx, name, force):
         else:
             check_client_version(ctx.obj, '--force')
             ctx.obj.vnfd.delete(name, force)
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         exit(1)
 
 
@@ -1562,8 +1585,8 @@ def ns_delete(ctx, name, force, wait):
         else:
             check_client_version(ctx.obj, '--force')
             ctx.obj.ns.delete(name, force, wait=wait)
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         exit(1)
 
 
@@ -1571,8 +1594,8 @@ def nst_delete(ctx, name, force):
     try:
         check_client_version(ctx.obj, ctx.command.name)
         ctx.obj.nst.delete(name, force)
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         exit(1)
 
 
@@ -1604,8 +1627,8 @@ def nsi_delete(ctx, name, force, wait):
     try:
         check_client_version(ctx.obj, ctx.command.name)
         ctx.obj.nsi.delete(name, force, wait=wait)
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         exit(1)
 
 
@@ -1651,8 +1674,8 @@ def pdu_delete(ctx, name, force):
     try:
         check_client_version(ctx.obj, ctx.command.name)
         ctx.obj.pdu.delete(name, force)
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         exit(1)
 
 
@@ -1660,7 +1683,7 @@ def pdu_delete(ctx, name, force):
 # 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')
@@ -1726,8 +1749,8 @@ def vim_create(ctx,
             ctx.obj.vim.create(name, vim, sdn_controller, sdn_port_mapping, wait=wait)
         else:
             ctx.obj.vim.create(name, vim, wait=wait)
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         exit(1)
 
 
@@ -1779,12 +1802,12 @@ def vim_update(ctx,
         if description: vim['description'] = description
         if config: vim['config'] = config
         ctx.obj.vim.update(name, vim, sdn_controller, sdn_port_mapping, wait=wait)
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         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',
@@ -1805,12 +1828,12 @@ def vim_delete(ctx, name, force, wait):
         else:
             check_client_version(ctx.obj, '--force')
             ctx.obj.vim.delete(name, force, wait=wait)
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         exit(1)
 
 
-@cli.command(name='vim-list')
+@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')
@@ -1835,7 +1858,7 @@ def vim_list(ctx, filter):
     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):
@@ -1847,8 +1870,8 @@ def vim_show(ctx, name):
         resp = ctx.obj.vim.get(name)
         if 'vim_password' in resp:
             resp['vim_password']='********'
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         exit(1)
 
     table = PrettyTable(['key', 'attribute'])
@@ -1862,7 +1885,7 @@ 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')
@@ -1918,8 +1941,8 @@ def wim_create(ctx,
         if description: wim['description'] = description
         if config: wim['config'] = config
         ctx.obj.wim.create(name, wim, wim_port_mapping, wait=wait)
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         exit(1)
 
 
@@ -1967,12 +1990,12 @@ def wim_update(ctx,
         if description: wim['description'] = description
         if config: wim['config'] = config
         ctx.obj.wim.update(name, wim, wim_port_mapping, wait=wait)
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         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',
@@ -1990,12 +2013,12 @@ def wim_delete(ctx, name, force, wait):
     try:
         check_client_version(ctx.obj, ctx.command.name)
         ctx.obj.wim.delete(name, force, wait=wait)
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         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
@@ -2009,12 +2032,12 @@ def wim_list(ctx, filter):
             table.add_row([wim['name'], wim['uuid']])
         table.align = 'l'
         print(table)
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         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):
@@ -2027,8 +2050,8 @@ def wim_show(ctx, name):
         resp = ctx.obj.wim.get(name)
         if 'password' in resp:
             resp['wim_password']='********'
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         exit(1)
 
     table = PrettyTable(['key', 'attribute'])
@@ -2042,7 +2065,7 @@ 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')
@@ -2103,8 +2126,8 @@ def sdnc_create(ctx,
     try:
         check_client_version(ctx.obj, ctx.command.name)
         ctx.obj.sdnc.create(name, sdncontroller, wait=wait)
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         exit(1)
 
 @cli.command(name='sdnc-update', short_help='updates an SDN controller')
@@ -2165,12 +2188,12 @@ def sdnc_update(ctx,
     try:
         check_client_version(ctx.obj, ctx.command.name)
         ctx.obj.sdnc.update(name, sdncontroller, wait=wait)
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         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',
@@ -2188,12 +2211,12 @@ def sdnc_delete(ctx, name, force, wait):
     try:
         check_client_version(ctx.obj, ctx.command.name)
         ctx.obj.sdnc.delete(name, force, wait=wait)
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         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
@@ -2202,8 +2225,8 @@ def sdnc_list(ctx, filter):
     try:
         check_client_version(ctx.obj, ctx.command.name)
         resp = ctx.obj.sdnc.list(filter)
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         exit(1)
     table = PrettyTable(['sdnc name', 'id'])
     for sdnc in resp:
@@ -2212,7 +2235,7 @@ def sdnc_list(ctx, filter):
     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):
@@ -2223,8 +2246,8 @@ def sdnc_show(ctx, name):
     try:
         check_client_version(ctx.obj, ctx.command.name)
         resp = ctx.obj.sdnc.get(name)
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         exit(1)
 
     table = PrettyTable(['key', 'attribute'])
@@ -2238,7 +2261,7 @@ 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',
@@ -2254,12 +2277,12 @@ def project_create(ctx, name):
     try:
         check_client_version(ctx.obj, ctx.command.name)
         ctx.obj.project.create(name, project)
-    except ClientException as inst:
-        print(inst.message)
+    except ClientException as e:
+        print(str(e))
         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
@@ -2271,12 +2294,12 @@ def project_delete(ctx, name):
     try:
         check_client_version(ctx.obj, ctx.command.name)
         ctx.obj.project.delete(name)
-    except ClientException as inst:
-        print(inst.message)
+    except ClientException as e:
+        print(str(e))
         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
@@ -2285,8 +2308,8 @@ def project_list(ctx, filter):
     try:
         check_client_version(ctx.obj, ctx.command.name)
         resp = ctx.obj.project.list(filter)
-    except ClientException as inst:
-        print(inst.message)
+    except ClientException as e:
+        print(str(e))
         exit(1)
     table = PrettyTable(['name', 'id'])
     for proj in resp:
@@ -2295,7 +2318,7 @@ def project_list(ctx, filter):
     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):
@@ -2306,8 +2329,8 @@ def project_show(ctx, name):
     try:
         check_client_version(ctx.obj, ctx.command.name)
         resp = ctx.obj.project.get(name)
-    except ClientException as inst:
-        print(inst.message)
+    except ClientException as e:
+        print(str(e))
         exit(1)
 
     table = PrettyTable(['key', 'attribute'])
@@ -2317,7 +2340,7 @@ def project_show(ctx, name):
     print(table)
 
 
-@cli.command(name='project-update')
+@cli.command(name='project-update', short_help='updates a project (only the name can be updated)')
 @click.argument('project')
 @click.option('--name',
               prompt=True,
@@ -2340,15 +2363,15 @@ def project_update(ctx, project, name):
     try:
         check_client_version(ctx.obj, ctx.command.name)
         ctx.obj.project.update(project, project_changes)
-    except ClientException as inst:
-        print(inst.message)
+    except ClientException as e:
+        print(str(e))
 
 
 ####################
 # 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,
@@ -2382,12 +2405,12 @@ def user_create(ctx, username, password, projects, 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)
+    except ClientException as e:
+        print(str(e))
         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,
@@ -2434,12 +2457,12 @@ def user_update(ctx, username, password, set_username, set_project, remove_proje
     try:
         check_client_version(ctx.obj, ctx.command.name)
         ctx.obj.user.update(username, user)
-    except ClientException as inst:
-        print(inst.message)
+    except ClientException as e:
+        print(str(e))
         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
@@ -2452,12 +2475,12 @@ def user_delete(ctx, name):
     try:
         check_client_version(ctx.obj, ctx.command.name)
         ctx.obj.user.delete(name)
-    except ClientException as inst:
-        print(inst.message)
+    except ClientException as e:
+        print(str(e))
         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
@@ -2466,8 +2489,8 @@ def user_list(ctx, filter):
     try:
         check_client_version(ctx.obj, ctx.command.name)
         resp = ctx.obj.user.list(filter)
-    except ClientException as inst:
-        print(inst.message)
+    except ClientException as e:
+        print(str(e))
         exit(1)
     table = PrettyTable(['name', 'id'])
     for user in resp:
@@ -2476,7 +2499,7 @@ def user_list(ctx, filter):
     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):
@@ -2489,8 +2512,8 @@ def user_show(ctx, name):
         resp = ctx.obj.user.get(name)
         if 'password' in resp:
             resp['password']='********'
-    except ClientException as inst:
-        print(inst.message)
+    except ClientException as e:
+        print(str(e))
         exit(1)
 
     table = PrettyTable(['key', 'attribute'])
@@ -2542,8 +2565,8 @@ def ns_alarm_create(ctx, name, ns, vnf, vdu, metric, severity,
         alarm['statistic'] = statistic
         check_client_version(ctx.obj, ctx.command.name)
         ctx.obj.ns.create_alarm(alarm)
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         exit(1)
 
 
@@ -2558,8 +2581,8 @@ def ns_alarm_create(ctx, name, ns, vnf, vdu, metric, severity,
 #    try:
 #        check_client_version(ctx.obj, ctx.command.name)
 #        ctx.obj.ns.delete_alarm(name)
-#    except ClientException as inst:
-#        print(inst.message)
+#    except ClientException as e:
+#        print(str(e))
 #        exit(1)
 
 
@@ -2567,7 +2590,7 @@ def ns_alarm_create(ctx, name, ns, vnf, vdu, metric, severity,
 # 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)')
@@ -2602,8 +2625,8 @@ def ns_metric_export(ctx, ns, vnf, vdu, metric, interval):
                 print('{} {}'.format(ctx.obj.ns.export_metric(metric_data),i))
                 time.sleep(int(interval))
                 i+=1
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         exit(1)
 
 
@@ -2611,7 +2634,7 @@ def ns_metric_export(ctx, ns, vnf, vdu, metric, interval):
 # 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):
@@ -2624,8 +2647,8 @@ def upload_package(ctx, filename):
         fullclassname = ctx.obj.__module__ + "." + ctx.obj.__class__.__name__
         if fullclassname != 'osmclient.sol005.client.Client':
             ctx.obj.package.wait_for_upload(filename)
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         exit(1)
 
 
@@ -2640,8 +2663,8 @@ def upload_package(ctx, filename):
 #    try:
 #        check_client_version(ctx.obj, ctx.command.name, 'v1')
 #        resp = ctx.obj.ns.list()
-#    except ClientException as inst:
-#        print((inst.message))
+#    except ClientException as e:
+#        print(str(e))
 #        exit(1)
 #
 #    table = PrettyTable(
@@ -2690,8 +2713,8 @@ def upload_package(ctx, filename):
 #    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))
+#    except ClientException as e:
+#        print(str(e))
 #        exit(1)
 
 
@@ -2701,8 +2724,8 @@ def upload_package(ctx, filename):
 #    """list config agents"""
 #    try:
 #        check_client_version(ctx.obj, ctx.command.name, 'v1')
-#    except ClientException as inst:
-#        print((inst.message))
+#    except ClientException as e:
+#        print(str(e))
 #        exit(1)
 #    table = PrettyTable(['name', 'account-type', 'details'])
 #    for account in ctx.obj.vca.list():
@@ -2725,8 +2748,8 @@ def upload_package(ctx, filename):
 #    try:
 #        check_client_version(ctx.obj, ctx.command.name, 'v1')
 #        ctx.obj.vca.delete(name)
-#    except ClientException as inst:
-#        print((inst.message))
+#    except ClientException as e:
+#        print(str(e))
 #        exit(1)
 
 
@@ -2749,8 +2772,8 @@ def upload_package(ctx, filename):
 #    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))
+#    except ClientException as e:
+#        print(str(e))
 #        exit(1)
 
 
@@ -2779,7 +2802,7 @@ def upload_package(ctx, filename):
 #    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, 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')
@@ -2816,17 +2839,17 @@ def ns_action(ctx,
             op_data['vdu_count_index'] = vdu_count
         op_data['primitive'] = action_name
         if params:
-            op_data['primitive_params'] = yaml.load(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)
+    except ClientException as e:
+        print(str(e))
         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")
@@ -2851,8 +2874,8 @@ def vnf_scale(ctx,
         if not scale_in and not scale_out:
             scale_out = True
         ctx.obj.ns.scale_vnf(ns_name, vnf_name, scaling_group, scale_in, scale_out)
-    except ClientException as inst:
-        print((inst.message))
+    except ClientException as e:
+        print(str(e))
         exit(1)
 
 
@@ -2860,7 +2883,7 @@ def vnf_scale(ctx,
 # 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('--permissions',
               default=None,
@@ -2877,8 +2900,8 @@ def role_create(ctx, name, permissions):
     try:
         check_client_version(ctx.obj, ctx.command.name)
         ctx.obj.role.create(name, permissions)
-    except ClientException as inst:
-        print(inst.message)
+    except ClientException as e:
+        print(str(e))
         exit(1)
 
 
@@ -2910,8 +2933,8 @@ def role_update(ctx, name, set_name, add, remove):
     try:
         check_client_version(ctx.obj, ctx.command.name)
         ctx.obj.role.update(name, set_name, None, add, remove)
-    except ClientException as inst:
-        print(inst.message)
+    except ClientException as e:
+        print(str(e))
         exit(1)
 
 
@@ -2929,8 +2952,8 @@ def role_delete(ctx, name):
     try:
         check_client_version(ctx.obj, ctx.command.name)
         ctx.obj.role.delete(name)
-    except ClientException as inst:
-        print(inst.message)
+    except ClientException as e:
+        print(str(e))
         exit(1)
 
 
@@ -2945,8 +2968,8 @@ def role_list(ctx, filter):
     try:
         check_client_version(ctx.obj, ctx.command.name)
         resp = ctx.obj.role.list(filter)
-    except ClientException as inst:
-        print(inst.message)
+    except ClientException as e:
+        print(str(e))
         exit(1)
     table = PrettyTable(['name', 'id'])
     for role in resp:
@@ -2968,8 +2991,8 @@ def role_show(ctx, name):
     try:
         check_client_version(ctx.obj, ctx.command.name)
         resp = ctx.obj.role.get(name)
-    except ClientException as inst:
-        print(inst.message)
+    except ClientException as e:
+        print(str(e))
         exit(1)
 
     table = PrettyTable(['key', 'attribute'])
@@ -2979,6 +3002,151 @@ def role_show(ctx, name):
     print(table)
 
 
+@cli.command(name='package-create',
+             short_help='Create a package descriptor')
+@click.argument('package-type')
+@click.argument('package-name')
+@click.option('--base-directory',
+              default='.',
+              help=('(NS/VNF/NST) Set the location for package creation. Default: "."'))
+@click.option('--image',
+              default="image-name",
+              help='(VNF) Set the name of the vdu image. Default "image-name"')
+@click.option('--vdus',
+              default=1,
+              help='(VNF) Set the number of vdus in a VNF. Default 1')
+@click.option('--vcpu',
+              default=1,
+              help='(VNF) Set the number of virtual CPUs in a vdu. Default 1')
+@click.option('--memory',
+              default=1024,
+              help='(VNF) Set the memory size (MB) of the vdu. Default 1024')
+@click.option('--storage',
+              default=10,
+              help='(VNF) Set the disk size (GB) of the vdu. Default 10')
+@click.option('--interfaces',
+              default=0,
+              help='(VNF) Set the number of additional interfaces apart from the management interface. Default 0')
+@click.option('--vendor',
+              default="OSM",
+              help='(NS/VNF) Set the descriptor vendor. Default "OSM"')
+@click.option('--override',
+              default=False,
+              is_flag=True,
+              help='(NS/VNF/NST) Flag for overriding the package if exists.')
+@click.option('--detailed',
+              is_flag=True,
+              default=False,
+              help='(NS/VNF/NST) Flag for generating descriptor .yaml with all possible commented options')
+@click.option('--netslice-subnets',
+              default=1,
+              help='(NST) Number of netslice subnets. Default 1')
+@click.option('--netslice-vlds',
+              default=1,
+              help='(NST) Number of netslice vlds. Default 1')
+@click.pass_context
+def package_create(ctx,
+                   package_type,
+                   base_directory,
+                   package_name,
+                   override,
+                   image,
+                   vdus,
+                   vcpu,
+                   memory,
+                   storage,
+                   interfaces,
+                   vendor,
+                   detailed,
+                   netslice_subnets,
+                   netslice_vlds):
+    """
+    Creates an OSM NS, VNF, NST package
+
+    \b
+    PACKAGE_TYPE: Package to be created: NS, VNF or NST.
+    PACKAGE_NAME: Name of the package to create the folder with the content.
+    """
+
+    try:
+        check_client_version(ctx.obj, ctx.command.name)
+        print("Creating the {} structure: {}/{}".format(package_type.upper(), base_directory, package_name))
+        resp = ctx.obj.package_tool.create(package_type,
+                                           base_directory,
+                                           package_name,
+                                           override=override,
+                                           image=image,
+                                           vdus=vdus,
+                                           vcpu=vcpu,
+                                           memory=memory,
+                                           storage=storage,
+                                           interfaces=interfaces,
+                                           vendor=vendor,
+                                           detailed=detailed,
+                                           netslice_subnets=netslice_subnets,
+                                           netslice_vlds=netslice_vlds)
+        print(resp)
+    except ClientException as inst:
+        print("ERROR: {}".format(inst))
+        exit(1)
+
+@cli.command(name='package-validate',
+             short_help='Validate a package descriptor')
+@click.argument('base-directory',
+                default=".",
+                required=False)
+@click.pass_context
+def package_validate(ctx,
+                     base_directory):
+    """
+    Validate descriptors given a base directory.
+
+    \b
+    BASE_DIRECTORY: Stub folder for NS, VNF or NST package.
+    """
+    try:
+        check_client_version(ctx.obj, ctx.command.name)
+        results = ctx.obj.package_tool.validate(base_directory)
+        table = PrettyTable()
+        table.field_names = ["TYPE", "PATH", "VALID", "ERROR"]
+        # Print the dictionary generated by the validation function
+        for result in results:
+            table.add_row([result["type"], result["path"], result["valid"], result["error"]])
+        table.sortby = "VALID"
+        table.align["PATH"] = "l"
+        table.align["TYPE"] = "l"
+        table.align["ERROR"] = "l"
+        print(table)
+    except ClientException as inst:
+        print("ERROR: {}".format(inst))
+        exit(1)
+
+@cli.command(name='package-build',
+             short_help='Build the tar.gz of the package')
+@click.argument('package-folder')
+@click.option('--skip-validation',
+              default=False,
+              is_flag=True,
+              help='skip package validation')
+@click.pass_context
+def package_build(ctx,
+                  package_folder,
+                  skip_validation):
+    """
+    Build the package NS, VNF given the package_folder.
+
+    \b
+    PACKAGE_FOLDER: Folder of the NS, VNF or NST to be packaged
+    """
+    try:
+        check_client_version(ctx.obj, ctx.command.name)
+        results = ctx.obj.package_tool.build(package_folder, skip_validation)
+        print(results)
+    except ClientException as inst:
+        print("ERROR: {}".format(inst))
+        exit(1)
+
+
 if __name__ == '__main__':
     try:
         cli()