X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=openmano;h=c34d831f3e24c7ed7cbdc067d5de0493934b1eef;hb=06e6c396413630640cafae3488442a0869f1642d;hp=66c12610a566a2b04b8aa584da1655ebac4384ec;hpb=4540ea5619ae62e29ecec6b07bf0e81e35fd56f0;p=osm%2FRO.git diff --git a/openmano b/openmano index 66c12610..c34d831f 100755 --- a/openmano +++ b/openmano @@ -28,7 +28,7 @@ openmano client used to interact with openmano-server (openmanod) ''' __author__="Alfonso Tierno, Gerardo Garcia" __date__ ="$09-oct-2014 09:09:48$" -__version__="0.4.10-r516" +__version__="0.4.11-r517" version_date="Jan 2017" from argcomplete.completers import FilesCompleter @@ -127,20 +127,25 @@ def _print_verbose(mano_response, verbose_level=0): uuid = content['id'] elif "vim_id" in content: uuid = content['vim_id'] - myoutput = "%s %s" %(uuid.ljust(38),content['name'].ljust(20)) - if "status" in content: + name = content.get('name'); + if not uuid: + uuid = "" + if not name: + name = "" + myoutput = "%s %s" %(uuid.ljust(38),name.ljust(20)) + if content.get("status"): myoutput += " " + content['status'].ljust(20) elif "enabled" in content and not content["enabled"]: myoutput += " enabled=False".ljust(20) if verbose_level >=1: - if 'created_at' in content: + if content.get('created_at'): myoutput += " " + content['created_at'].ljust(20) if verbose_level >=2: new_line='\n' - if 'type' in content and content['type']!=None: + if content.get('type'): myoutput += new_line + " Type: " + content['type'].ljust(29) new_line='' - if 'description' in content and content['description']!=None: + if content.get('description'): myoutput += new_line + " Description: " + content['description'].ljust(20) print myoutput else: @@ -357,7 +362,7 @@ def vnf_list(args): print " External interfaces:" for interface in vnf['external-connections']: print " %s %s %s %s" %(interface['external_name'].ljust(20), interface['vm_name'].ljust(20), interface['internal_name'].ljust(20), \ - interface['vpci'].ljust(14)) + interface.get('vpci',"").ljust(14)) else: print content['error']['description'] if args.verbose: