X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=openmano;h=9351c81c7b5ca038055cc4bfe1c67af43e9155b0;hb=6082b7d161e7ccfbb38c1b7938c88c2619b8f690;hp=ec588a98546b3997d22e64c0679959bddcc75252;hpb=0abcd732a7aaf919f1be408fe946e52920e2702d;p=osm%2FRO.git diff --git a/openmano b/openmano index ec588a98..9351c81c 100755 --- a/openmano +++ b/openmano @@ -28,8 +28,8 @@ openmano client used to interact with openmano-server (openmanod) """ __author__ = "Alfonso Tierno, Gerardo Garcia, Pablo Montes" __date__ = "$09-oct-2014 09:09:48$" -__version__ = "0.4.15-r525" -version_date = "Jul 2017" +__version__ = "0.4.23-r533" +version_date = "May 2018" from argcomplete.completers import FilesCompleter import os @@ -133,24 +133,24 @@ def _print_verbose(mano_response, verbose_level=0): uuid = "" if not name: name = "" - myoutput = "%s %s" %(uuid.ljust(38),name.ljust(20)) + myoutput = "{:38} {:20}".format(uuid, name) if content.get("status"): - myoutput += " " + content['status'].ljust(20) + myoutput += " {:20}".format(content['status']) elif "enabled" in content and not content["enabled"]: myoutput += " enabled=False".ljust(20) if verbose_level >=1: if content.get('created_at'): - myoutput += " " + content['created_at'].ljust(20) + myoutput += " {:20}".format(content['created_at']) if content.get('sdn_attached_ports'): #myoutput += " " + str(content['sdn_attached_ports']).ljust(20) myoutput += "\nsdn_attached_ports:\n" + yaml.safe_dump(content['sdn_attached_ports'], indent=4, default_flow_style=False) if verbose_level >=2: new_line='\n' if content.get('type'): - myoutput += new_line + " Type: " + content['type'].ljust(29) + myoutput += new_line + " Type: {:29}".format(content['type']) new_line='' if content.get('description'): - myoutput += new_line + " Description: " + content['description'].ljust(20) + myoutput += new_line + " Description: {:20}".format(content['description']) print myoutput else: print content['error']['description'] @@ -226,6 +226,9 @@ def _get_item_uuid(item, item_name_id, tenant=None): if i["name"] == item_name_id: uuid = i["uuid"] found += 1 + if item_name_id.startswith("osm_id=") and i.get("osm_id") == item_name_id[7:]: + uuid = i["uuid"] + found += 1 if found == 0: raise OpenmanoCLIError("No %s found with name/uuid '%s'" %(item[:-1], item_name_id)) elif found > 1: @@ -259,45 +262,98 @@ def vnf_create(args): headers_req = {'Accept': 'application/json', 'content-type': 'application/json'} tenant = _get_tenant() myvnf = _load_file_or_yaml(args.file) + api_version = "" + if "vnfd:vnfd-catalog" in myvnf or "vnfd-catalog" in myvnf: + api_version = "/v3" + token = "vnfd" + vnfd_catalog = myvnf.get("vnfd:vnfd-catalog") + if not vnfd_catalog: + vnfd_catalog = myvnf.get("vnfd-catalog") + vnfds = vnfd_catalog.get("vnfd:vnfd") + if not vnfds: + vnfds = vnfd_catalog.get("vnfd") + vnfd = vnfds[0] + vdu_list = vnfd["vdu"] + + else: # old API + api_version = "" + token = "vnfs" + vnfd = myvnf['vnf'] + vdu_list = vnfd["VNFC"] if args.name or args.description or args.image_path or args.image_name or args.image_checksum: - #print args.name + # TODO, change this for API v3 + # print args.name try: if args.name: - myvnf['vnf']['name'] = args.name + vnfd['name'] = args.name if args.description: - myvnf['vnf']['description'] = args.description + vnfd['description'] = args.description if args.image_path: - index=0 + index = 0 for image_path_ in args.image_path.split(","): - #print "image-path", image_path_ - myvnf['vnf']['VNFC'][index]['VNFC image']=image_path_ - if "image name" in myvnf['vnf']['VNFC'][index]: - del myvnf['vnf']['VNFC'][index]["image name"] - if "image checksum" in myvnf['vnf']['VNFC'][index]: - del myvnf['vnf']['VNFC'][index]["image checksum"] - index=index+1 - if args.image_name: #image name precedes if both are supplied - index=0 + # print "image-path", image_path_ + if api_version == "/v3": + if vdu_list[index].get("image"): + vdu_list[index]['image'] = image_path_ + if "image-checksum" in vdu_list[index]: + del vdu_list[index]["image-checksum"] + else: # image name in volumes + vdu_list[index]["volumes"][0]["image"] = image_path_ + if "image-checksum" in vdu_list[index]["volumes"][0]: + del vdu_list[index]["volumes"][0]["image-checksum"] + else: + vdu_list[index]['VNFC image'] = image_path_ + if "image name" in vdu_list[index]: + del vdu_list[index]["image name"] + if "image checksum" in vdu_list[index]: + del vdu_list[index]["image checksum"] + index += 1 + if args.image_name: # image name precedes if both are supplied + index = 0 for image_name_ in args.image_name.split(","): - myvnf['vnf']['VNFC'][index]['image name']=image_name_ - if "VNFC image" in myvnf['vnf']['VNFC'][index]: - del myvnf['vnf']['VNFC'][index]["VNFC image"] - index=index+1 + if api_version == "/v3": + if vdu_list[index].get("image"): + vdu_list[index]['image'] = image_name_ + if "image-checksum" in vdu_list[index]: + del vdu_list[index]["image-checksum"] + if vdu_list[index].get("alternative-images"): + for a_image in vdu_list[index]["alternative-images"]: + a_image['image'] = image_name_ + if "image-checksum" in a_image: + del a_image["image-checksum"] + else: # image name in volumes + vdu_list[index]["volumes"][0]["image"] = image_name_ + if "image-checksum" in vdu_list[index]["volumes"][0]: + del vdu_list[index]["volumes"][0]["image-checksum"] + else: + vdu_list[index]['image name'] = image_name_ + if "VNFC image" in vdu_list[index]: + del vdu_list[index]["VNFC image"] + index += 1 if args.image_checksum: - index=0 + index = 0 for image_checksum_ in args.image_checksum.split(","): - myvnf['vnf']['VNFC'][index]['image checksum']=image_checksum_ - index=index+1 + if api_version == "/v3": + if vdu_list[index].get("image"): + vdu_list[index]['image-checksum'] = image_checksum_ + if vdu_list[index].get("alternative-images"): + for a_image in vdu_list[index]["alternative-images"]: + a_image['image-checksum'] = image_checksum_ + else: # image name in volumes + vdu_list[index]["volumes"][0]["image-checksum"] = image_checksum_ + else: + vdu_list[index]['image checksum'] = image_checksum_ + index += 1 except (KeyError, TypeError), e: - if str(e)=='vnf': error_pos= "missing field 'vnf'" - elif str(e)=='name': error_pos= "missing field 'vnf':'name'" - elif str(e)=='description': error_pos= "missing field 'vnf':'description'" - elif str(e)=='VNFC': error_pos= "missing field 'vnf':'VNFC'" - elif str(e)==str(index): error_pos= "field 'vnf':'VNFC' must be an array" - elif str(e)=='VNFC image': error_pos= "missing field 'vnf':'VNFC'['VNFC image']" - elif str(e)=='image name': error_pos= "missing field 'vnf':'VNFC'['image name']" - elif str(e)=='image checksum': error_pos= "missing field 'vnf':'VNFC'['image checksum']" + if str(e) == 'vnf': error_pos= "missing field 'vnf'" + elif str(e) == 'name': error_pos= "missing field 'vnf':'name'" + elif str(e) == 'description': error_pos= "missing field 'vnf':'description'" + elif str(e) == 'VNFC': error_pos= "missing field 'vnf':'VNFC'" + elif str(e) == str(index): error_pos= "field 'vnf':'VNFC' must be an array" + elif str(e) == 'VNFC image': error_pos= "missing field 'vnf':'VNFC'['VNFC image']" + elif str(e) == 'image name': error_pos= "missing field 'vnf':'VNFC'['image name']" + elif str(e) == 'image checksum': error_pos= "missing field 'vnf':'VNFC'['image checksum']" else: error_pos="wrong format" print "Wrong VNF descriptor: " + error_pos return -1 @@ -305,7 +361,7 @@ def vnf_create(args): #print payload_req - URLrequest = "http://%s:%s/openmano/%s/vnfs" %(mano_host, mano_port, tenant) + URLrequest = "http://{}:{}/openmano{}/{}/{token}".format(mano_host, mano_port, api_version, tenant, token=token) logger.debug("openmano request: %s", payload_req) mano_response = requests.post(URLrequest, headers = headers_req, data=payload_req) logger.debug("openmano response: %s", mano_response.text ) @@ -326,7 +382,7 @@ def vnf_list(args): mano_response = requests.get(URLrequest) logger.debug("openmano response: %s", mano_response.text ) content = mano_response.json() - #print json.dumps(content, indent=4) + # print json.dumps(content, indent=4) if args.verbose==None: args.verbose=0 result = 0 if mano_response.status_code==200 else mano_response.status_code @@ -337,36 +393,40 @@ def vnf_list(args): return result if len(content['vnfs']) == 0: print "No VNFs were found." - return 404 #HTTP_Not_Found + return 404 # HTTP_Not_Found for vnf in content['vnfs']: - myoutput = "%s %s" %(vnf['uuid'].ljust(38),vnf['name'].ljust(20)) - if args.verbose >=1: - myoutput = "%s %s" %(myoutput, vnf['created_at'].ljust(20)) - print myoutput - if args.verbose >=2: - print " Description: %s" %vnf['description'] - print " VNF descriptor file: %s" %vnf['path'] + myoutput = "{:38} {:20}".format(vnf['uuid'], vnf['name']) + if vnf.get('osm_id') or args.verbose >= 1: + myoutput += " osm_id={:20}".format(vnf.get('osm_id')) + if args.verbose >= 1: + myoutput += " {}".format(vnf['created_at']) + print (myoutput) + if args.verbose >= 2: + print (" Description: {}".format(vnf['description'])) + # print (" VNF descriptor file: {}".format(vnf['path'])) else: if args.verbose: print yaml.safe_dump(content, indent=4, default_flow_style=False) return result vnf = content['vnf'] - print "%s %s %s" %(vnf['uuid'].ljust(38),vnf['name'].ljust(20), vnf['created_at'].ljust(20)) - print " Description: %s" %vnf['description'] - #print " VNF descriptor file: %s" %vnf['path'] - print " VMs:" + print ("{:38} {:20} osm_id={:20} {:20}".format(vnf['uuid'], vnf['name'], vnf.get('osm_id'), + vnf['created_at'])) + print (" Description: {}".format(vnf['description'])) + # print " VNF descriptor file: %s" %vnf['path'] + print (" VMs:") for vm in vnf['VNFC']: - #print " %s %s %s" %(vm['name'].ljust(20), vm['uuid'].ljust(38), vm['description'].ljust(30)) - print " %s %s" %(vm['name'].ljust(20), vm['description']) - if len(vnf['nets'])>0: - print " Internal nets:" + print (" {:20} osm_id={:20} {}".format(vm['name'], vm.get('osm_id'), vm['description'])) + if len(vnf['nets']) > 0: + print (" Internal nets:") for net in vnf['nets']: - print " %s %s" %(net['name'].ljust(20), net['description']) - if len(vnf['external-connections'])>0: - print " External interfaces:" + print (" {:20} {}".format(net['name'], net['description'])) + if len(vnf['external-connections']) > 0: + 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.get('vpci',"").ljust(14)) + print (" {:20} {:20} {:20} {:14}".format( + interface['external_name'], interface['vm_name'], + interface['internal_name'], + interface.get('vpci') if interface.get('vpci') else "")) else: print content['error']['description'] if args.verbose: @@ -397,20 +457,38 @@ def vnf_delete(args): return result def scenario_create(args): - #print "scenario-create",args + # print "scenario-create",args tenant = _get_tenant() headers_req = {'content-type': 'application/yaml'} myscenario = _load_file_or_yaml(args.file) - + if "nsd:nsd-catalog" in myscenario or "nsd-catalog" in myscenario: + api_version = "/v3" + token = "nsd" + nsd_catalog = myscenario.get("nsd:nsd-catalog") + if not nsd_catalog: + nsd_catalog = myscenario.get("nsd-catalog") + nsds = nsd_catalog.get("nsd:nsd") + if not nsds: + nsds = nsd_catalog.get("nsd") + nsd = nsds[0] + else: # API=1: - myoutput = "%s %s" %(myoutput, scenario['created_at'].ljust(20)) - print myoutput + myoutput = "{:38} {:20}".format(scenario['uuid'], scenario['name']) + if scenario.get('osm_id') or args.verbose >= 1: + myoutput += " osm_id={:20}".format(scenario.get('osm_id')) + if args.verbose >= 1: + myoutput += " {}".format(scenario['created_at']) + print (myoutput) if args.verbose >=2: - print " Description: %s" %scenario['description'] + print (" Description: {}".format(scenario['description'])) else: if args.verbose: print yaml.safe_dump(content, indent=4, default_flow_style=False) return result scenario = content['scenario'] - myoutput = "%s %s %s" %(scenario['uuid'].ljust(38),scenario['name'].ljust(20), scenario['created_at'].ljust(20)) - print myoutput - print " Description: %s" %scenario['description'] - print " VNFs:" + print ("{:38} {:20} osm_id={:20} {:20}".format(scenario['uuid'], scenario['name'], scenario.get('osm_id'), + scenario['created_at'])) + print (" Description: {}".format(scenario['description'])) + print (" VNFs:") for vnf in scenario['vnfs']: - print " %s %s %s" %(vnf['name'].ljust(20), vnf['vnf_id'].ljust(38), vnf['description']) - if len(scenario['nets'])>0: - print " Internal nets:" - for net in scenario['nets']: - if net['description'] is None: #if description does not exist, description is "-". Valid for external and internal nets. - net['description'] = '-' - if not net['external']: - print " %s %s %s" %(net['name'].ljust(20), net['uuid'].ljust(38), net['description'].ljust(30)) - print " External nets:" + print (" {:38} {:20} vnf_index={} {}".format(vnf['vnf_id'], vnf['name'], vnf.get("member_vnf_index"), + vnf['description'])) + if len(scenario['nets']) > 0: + print (" nets:") for net in scenario['nets']: - if net['external']: - print " %s %s %s vim-id:%s" %(net['name'].ljust(20), net['uuid'].ljust(38), net['description'].ljust(30), net['vim_id']) + description = net['description'] + if not description: # if description does not exist, description is "-". Valid for external and internal nets. + description = '-' + vim_id = "" + if net.get('vim_id'): + vim_id = " vim_id=" + net["vim_id"] + external = "" + if net["external"]: + external = " external" + print (" {:20} {:38} {:30}{}{}".format(net['name'], net['uuid'], description, vim_id, external)) else: - print content['error']['description'] + print (content['error']['description']) if args.verbose: print yaml.safe_dump(content, indent=4, default_flow_style=False) return result @@ -708,11 +791,11 @@ def instance_create(args): return result if mano_response.status_code == 200: - myoutput = "%s %s" %(content['uuid'].ljust(38),content['name'].ljust(20)) + myoutput = "{:38} {:20}".format(content['uuid'], content['name']) if args.verbose >=1: - myoutput = "%s %s" %(myoutput, content['created_at'].ljust(20)) + myoutput = "{} {:20}".format(myoutput, content['created_at']) if args.verbose >=2: - myoutput = "%s %s %s" %(myoutput, content['description'].ljust(30)) + myoutput = "{} {:30}".format(myoutput, content['description']) print myoutput else: print content['error']['description'] @@ -746,9 +829,9 @@ def instance_scenario_list(args): print "No scenario instances were found." return result for instance in content['instances']: - myoutput = "%s %s" %(instance['uuid'].ljust(38),instance['name'].ljust(20)) + myoutput = "{:38} {:20}".format(instance['uuid'], instance['name']) if args.verbose >=1: - myoutput = "%s %s" %(myoutput, instance['created_at'].ljust(20)) + myoutput = "{} {:20}".format(myoutput, instance['created_at']) print myoutput if args.verbose >=2: print "Description: %s" %instance['description'] @@ -757,31 +840,32 @@ def instance_scenario_list(args): print yaml.safe_dump(content, indent=4, default_flow_style=False) return result instance = content - print "%s %s %s" %(instance['uuid'].ljust(38),instance['name'].ljust(20),instance['created_at'].ljust(20)) - print "Description: %s" %instance['description'] - print "Template scenario id: %s" %instance['scenario_id'] - print "Template scenario name: %s" %instance['scenario_name'] - print "---------------------------------------" - print "VNF instances: %d" %len(instance['vnfs']) + print ("{:38} {:20} {:20}".format(instance['uuid'],instance['name'],instance['created_at'])) + print ("Description: %s" %instance['description']) + print ("Template scenario id: {}".format(instance['scenario_id'])) + print ("Template scenario name: {}".format(instance['scenario_name'])) + print ("---------------------------------------") + print ("VNF instances: {}".format(len(instance['vnfs']))) for vnf in instance['vnfs']: #print " %s %s Template vnf name: %s Template vnf id: %s" %(vnf['uuid'].ljust(38), vnf['name'].ljust(20), vnf['vnf_name'].ljust(20), vnf['vnf_id'].ljust(38)) - print " %s %s Template vnf id: %s" %(vnf['uuid'].ljust(38), vnf['vnf_name'].ljust(20), vnf['vnf_id'].ljust(38)) + print (" {:38} {:20} Template vnf id: {:38}".format(vnf['uuid'], vnf['vnf_name'], vnf['vnf_id'])) if len(instance['nets'])>0: print "---------------------------------------" print "Internal nets:" for net in instance['nets']: if net['created']: - print " %s %s VIM ID: %s" %(net['uuid'].ljust(38), net['status'].ljust(12), net['vim_net_id']) + print (" {:38} {:12} VIM ID: {}".format(net['uuid'], net['status'], net['vim_net_id'])) print "---------------------------------------" print "External nets:" for net in instance['nets']: if not net['created']: - print " %s %s VIM ID: %s" %(net['uuid'].ljust(38), net['status'].ljust(12), net['vim_net_id']) - print "---------------------------------------" - print "VM instances:" + print (" {:38} {:12} VIM ID: {}".format(net['uuid'], net['status'], net['vim_net_id'])) + print ("---------------------------------------") + print ("VM instances:") for vnf in instance['vnfs']: for vm in vnf['vms']: - print " %s %s %s %s VIM ID: %s" %(vm['uuid'].ljust(38), vnf['vnf_name'].ljust(20), vm['name'].ljust(20), vm['status'].ljust(12), vm['vim_vm_id']) + print (" {:38} {:20} {:20} {:12} VIM ID: {}".format(vm['uuid'], vnf['vnf_name'], vm['name'], + vm['status'], vm['vim_vm_id'])) else: print content['error']['description'] if args.verbose: @@ -815,12 +899,34 @@ def instance_scenario_delete(args): print content['error']['description'] return result +def get_action(args): + if not args.all: + tenant = _get_tenant() + else: + tenant = "any" + if not args.instance: + instance_id = "any" + else: + instance_id =args.instance + action_id = "" + if args.id: + action_id = "/" + args.id + URLrequest = "http://{}:{}/openmano/{}/instances/{}/action{}".format(mano_host, mano_port, tenant, instance_id, + action_id) + mano_response = requests.get(URLrequest) + logger.debug("openmano response: %s", mano_response.text ) + if args.verbose == None: + args.verbose = 0 + if args.id != None: + args.verbose += 1 + return _print_verbose(mano_response, args.verbose) + def instance_scenario_action(args): #print "instance-scenario-action", args tenant = _get_tenant() toact = _get_item_uuid("instances", args.name, tenant=tenant) action={} - action[ args.action ] = args.param + action[ args.action ] = yaml.safe_load(args.param) if args.vnf: action["vnfs"] = args.vnf if args.vm: @@ -834,13 +940,16 @@ def instance_scenario_action(args): logger.debug("openmano response: %s", mano_response.text ) result = 0 if mano_response.status_code==200 else mano_response.status_code content = mano_response.json() - #print json.dumps(content, indent=4) + # print json.dumps(content, indent=4) if mano_response.status_code == 200: if args.verbose: print yaml.safe_dump(content, indent=4, default_flow_style=False) return result - for uuid,c in content.iteritems(): - print "%s %s %s" %(uuid.ljust(38), c['name'].ljust(20),c['description'].ljust(20)) + if "instance_action_id" in content: + print("instance_action_id={}".format(content["instance_action_id"])) + else: + for uuid,c in content.iteritems(): + print ("{:38} {:20} {:20}".format(uuid, c.get('name'), c.get('description'))) else: print content['error']['description'] return result @@ -919,8 +1028,9 @@ def datacenter_attach(args): datacenter_dict['vim_password'] = args.password if args.config!=None: datacenter_dict["config"] = _load_file_or_yaml(args.config) + payload_req = json.dumps( {"datacenter": datacenter_dict }) - + #print payload_req URLrequest = "http://%s:%s/openmano/%s/datacenters/%s" %(mano_host, mano_port, tenant, datacenter) @@ -1670,13 +1780,19 @@ if __name__=="__main__": instance_scenario_action_parser = subparsers.add_parser('instance-scenario-action', parents=[parent_parser], help="invoke an action over part or the whole scenario instance") instance_scenario_action_parser.add_argument("name", action="store", help="name or uuid of the scenario instance") instance_scenario_action_parser.add_argument("action", action="store", type=str, \ - choices=["start","pause","resume","shutoff","shutdown","forceOff","rebuild","reboot", "console"],\ + choices=["start","pause","resume","shutoff","shutdown","forceOff","rebuild","reboot", "console", "add_public_key","vdu-scaling"],\ help="action to send") - instance_scenario_action_parser.add_argument("param", nargs='?', help="addional param of the action. e.g. console type (novnc, ...), reboot type (TODO)") + instance_scenario_action_parser.add_argument("param", nargs='?', help="addional param of the action. e.g. console: novnc; reboot: type; vdu-scaling: '[{vdu-id: xxx, type: create|delete, count: 1}]'") instance_scenario_action_parser.add_argument("--vnf", action="append", help="VNF to act on (can use several entries)") instance_scenario_action_parser.add_argument("--vm", action="append", help="VM to act on (can use several entries)") instance_scenario_action_parser.set_defaults(func=instance_scenario_action) + action_parser = subparsers.add_parser('action-list', parents=[parent_parser], help="get action over an instance status") + action_parser.add_argument("id", nargs='?', action="store", help="action id") + action_parser.add_argument("--instance", action="store", help="fitler by this instance_id") + action_parser.add_argument("--all", action="store", help="Not filter by tenant") + action_parser.set_defaults(func=get_action) + #instance_scenario_status_parser = subparsers.add_parser('instance-scenario-status', help="show the status of a scenario instance") #instance_scenario_status_parser.add_argument("name", action="store", help="name or uuid of the scenario instance") #instance_scenario_status_parser.set_defaults(func=instance_scenario_status)