X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=osmclient%2Fscripts%2Fosm.py;h=3af70c696c1ec1cdf4077296e5b106ccc8a9fbff;hb=refs%2Fchanges%2F72%2F10072%2F3;hp=4867e49fb689a1d3852572b503b2ecef79986e05;hpb=1c07734987fd56280f6f8a6198fa5823d6a6821a;p=osm%2Fosmclient.git

diff --git a/osmclient/scripts/osm.py b/osmclient/scripts/osm.py
index 4867e49..3af70c6 100755
--- a/osmclient/scripts/osm.py
+++ b/osmclient/scripts/osm.py
@@ -71,7 +71,7 @@ def check_client_version(obj, what, version='sol005'):
 
 def get_project(project_list, item):
     # project_list = ctx.obj.project.list()
-    item_project_list = item.get('_admin').get('projects_read')
+    item_project_list = item.get('_admin', {}).get('projects_read')
     project_id = 'None'
     project_name = 'None'
     if item_project_list:
@@ -543,7 +543,7 @@ def vnfd_list(ctx, nf_type, filter, long):
             table = PrettyTable(['nfpkg name', 'id', 'desc type'])
         for vnfd in resp:
             name = vnfd.get('id', vnfd.get('name','-'))
-            descriptor_type = 'sol005' if 'product-name' in vnfd else 'rel8'
+            descriptor_type = 'sol006' if 'product-name' in vnfd else 'rel8'
             if long:
                 onb_state = vnfd['_admin'].get('onboardingState','-')
                 op_state = vnfd['_admin'].get('operationalState','-')
@@ -3155,14 +3155,14 @@ def k8scluster_list(ctx, filter, literal, long):
     except:
         vim_list = []
     for cluster in resp:
+        logger.debug('Cluster details: {}'.format(yaml.safe_dump(cluster)))
         vim_name = get_vim_name(vim_list, cluster['vim_account'])
         #vim_info = '{} ({})'.format(vim_name,cluster['vim_account'])
         vim_info = vim_name
         op_state_details = "Helm: {}\nJuju: {}".format(
-                           cluster["_admin"].get("helm-chart", "-").get("operationalState", "-"),
-                           cluster["_admin"].get("juju-bundle", "-").get("operationalState", "-"))
+                           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
@@ -4312,7 +4312,7 @@ def package_create(ctx,
     #     exit(1)
 
 @cli_osm.command(name='package-validate',
-             short_help='Validate a package descriptor')
+                 short_help='Validate a package descriptor')
 @click.argument('base-directory',
                 default=".",
                 required=False)
@@ -4320,10 +4320,15 @@ def package_create(ctx,
               default=True,
               help='The activated recursive option will validate the yaml files'
                    ' within the indicated directory and in its subdirectories')
+@click.option('--old',
+              is_flag=True,
+              default=False,
+              help='Validates also the descriptors using the previous OSM format (pre SOL006)')
 @click.pass_context
 def package_validate(ctx,
                      base_directory,
-                     recursive):
+                     recursive,
+                     old):
     """
     Validate descriptors given a base directory.
 
@@ -4332,7 +4337,7 @@ def package_validate(ctx,
     """
     # try:
     check_client_version(ctx.obj, ctx.command.name)
-    results = ctx.obj.package_tool.validate(base_directory, recursive)
+    results = ctx.obj.package_tool.validate(base_directory, recursive, old)
     table = PrettyTable()
     table.field_names = ["TYPE", "PATH", "VALID", "ERROR"]
     # Print the dictionary generated by the validation function