Fix bug 1265: fix error in k8scluster-list with helm and juju opState

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

diff --git a/osmclient/scripts/osm.py b/osmclient/scripts/osm.py
index 71506cd..7b3bfeb 100755 (executable)
--- a/osmclient/scripts/osm.py
+++ b/osmclient/scripts/osm.py
@@ -69,6 +69,30 @@ def check_client_version(obj, what, version='sol005'):
     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
+
+
+def get_vim_name(vim_list, vim_id):
+    vim_name = '-'
+    for v in vim_list:
+        if v['uuid'] == vim_id:
+            vim_name = v['name']
+            break
+    return vim_name
+
+
 @click.group(context_settings=dict(help_option_names=['-h', '--help'], max_content_width=160))
 @click.option('--hostname',
               default="127.0.0.1",
@@ -327,7 +351,10 @@ def ns_list(ctx, filter, long):
          'deployment status',
          'configuration status'])
         project_list = ctx.obj.project.list()
-        vim_list = ctx.obj.vim.list()
+        try:
+            vim_list = ctx.obj.vim.list()
+        except:
+            vim_list = []
     else:
         table = PrettyTable(
         ['ns instance name',
@@ -348,20 +375,11 @@ def ns_list(ctx, filter, long):
             if long:
                 deployment_status = summarize_deployment_status(nsr.get('deploymentStatus'))
                 config_status = summarize_config_status(nsr.get('configurationStatus'))
-                project_id = nsr.get('_admin').get('projects_read')[0]
-                project_name = '-'
-                for p in project_list:
-                    if p['_id'] == project_id:
-                        project_name = p['name']
-                        break
+                project_id, project_name = get_project(project_list, nsr)
                 #project = '{} ({})'.format(project_name, project_id)
                 project = project_name
                 vim_id = nsr.get('datacenter')
-                vim_name = '-'
-                for v in vim_list:
-                    if v['uuid'] == vim_id:
-                        vim_name = v['name']
-                        break
+                vim_name = get_vim_name(vim_list, vim_id)
                 #vim = '{} ({})'.format(vim_name, vim_id)
                 vim = vim_name
             if 'currentOperation' in nsr:
@@ -2573,29 +2591,22 @@ def vim_list(ctx, filter, long):
 #        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', '-')])
@@ -3142,21 +3153,35 @@ def k8scluster_list(ctx, filter, literal, long):
         print(yaml.safe_dump(resp, indent=4, default_flow_style=False))
         return
     if long:
-        table = PrettyTable(['Name', 'Id', 'Version', 'VIM', 'K8s-nets', 'Operational State', 'Op. state (details)',
-                             'Description', 'Detailed status'])
+        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'])
+    try:
+        vim_list = ctx.obj.vim.list()
+    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:
-            detailed_status = cluster["_admin"].get("detailedStatus","-")
-            table.add_row([cluster['name'], cluster['_id'], cluster['k8s_version'], cluster['vim_account'],
+            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'], vim_info,
                            json.dumps(cluster['nets']), cluster["_admin"]["operationalState"],
-                           op_state_details, trunc_text(cluster.get('description') or '', 40), detailed_status])
+                           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'],
+            table.add_row([cluster['name'], cluster['_id'], vim_info,
                            cluster["_admin"]["operationalState"], op_state_details])
     table.align = 'l'
     print(table)