myVNFDict["description"] = vnf_descriptor['vnf']['description']
myVNFDict["class"] = vnf_descriptor['vnf'].get('class',"MISC")
myVNFDict["tenant_id"] = vnf_descriptor['vnf'].get("tenant_id")
-
+
vnf_id = self._new_row_internal('vnfs', myVNFDict, add_uuid=True, root_uuid=None, created_time=created_time)
#print "Adding new vms to the NFVO database"
#For each vm, we must create the appropriate vm in the NFVO database.
self.logger.debug(cmd)
self.cur.execute(cmd)
scenario_dict['vnfs'] = self.cur.fetchall()
+
for vnf in scenario_dict['vnfs']:
+ cmd = "SELECT mgmt_access FROM vnfs WHERE uuid='{}'".format(scenario_dict['vnfs'][0]['vnf_id'])
+ self.logger.debug(cmd)
+ self.cur.execute(cmd)
+ mgmt_access_dict = self.cur.fetchall()
+ if mgmt_access_dict[0].get('mgmt_access'):
+ vnf['mgmt_access'] = yaml.load(mgmt_access_dict[0]['mgmt_access'])
+ else:
+ vnf['mgmt_access'] = None
#sce_interfaces
cmd = "SELECT scei.uuid,scei.sce_net_id,scei.interface_id,i.external_name,scei.ip_address"\
" FROM sce_interfaces as scei join interfaces as i on scei.interface_id=i.uuid"\
cmd = "DELETE FROM scenarios WHERE uuid='{}'".format(scenario_uuid)
self.logger.debug(cmd)
self.cur.execute(cmd)
-
+
return scenario_uuid + " " + scenario_name
except (mdb.Error, AttributeError) as e:
self._format_error(e, tries, "delete", "instances running")
with self.con:
self.cur = self.con.cursor(mdb.cursors.DictCursor)
# instance table
- where_list=[]
- if tenant_id is not None: where_list.append( "inst.tenant_id='" + tenant_id +"'" )
+ where_list = []
+ if tenant_id:
+ where_list.append("inst.tenant_id='{}'".format(tenant_id))
if db_base._check_valid_uuid(instance_id):
- where_list.append( "inst.uuid='" + instance_id +"'" )
+ where_list.append("inst.uuid='{}'".format(instance_id))
else:
- where_list.append( "inst.name='" + instance_id +"'" )
+ where_list.append("inst.name='{}'".format(instance_id))
where_text = " AND ".join(where_list)
- cmd = "SELECT inst.uuid as uuid,inst.name as name,inst.scenario_id as scenario_id, datacenter_id" +\
- " ,datacenter_tenant_id, s.name as scenario_name,inst.tenant_id as tenant_id" + \
- " ,inst.description as description,inst.created_at as created_at" +\
- " ,inst.cloud_config as 'cloud_config'" +\
- " FROM instance_scenarios as inst join scenarios as s on inst.scenario_id=s.uuid"+\
+ cmd = "SELECT inst.uuid as uuid, inst.name as name, inst.scenario_id as scenario_id, datacenter_id"\
+ " ,datacenter_tenant_id, s.name as scenario_name,inst.tenant_id as tenant_id" \
+ " ,inst.description as description, inst.created_at as created_at" \
+ " ,inst.cloud_config as cloud_config" \
+ " FROM instance_scenarios as inst left join scenarios as s on inst.scenario_id=s.uuid" \
" WHERE " + where_text
self.logger.debug(cmd)
self.cur.execute(cmd)
rows = self.cur.fetchall()
- if self.cur.rowcount==0:
+ if self.cur.rowcount == 0:
raise db_base.db_base_Exception("No instance found where " + where_text, db_base.HTTP_Not_Found)
- elif self.cur.rowcount>1:
- raise db_base.db_base_Exception("More than one instance found where " + where_text, db_base.HTTP_Bad_Request)
+ elif self.cur.rowcount > 1:
+ raise db_base.db_base_Exception("More than one instance found where " + where_text,
+ db_base.HTTP_Bad_Request)
instance_dict = rows[0]
if instance_dict["cloud_config"]:
instance_dict["cloud-config"] = yaml.load(instance_dict["cloud_config"])
del instance_dict["cloud_config"]
# instance_vnfs
- cmd = "SELECT iv.uuid as uuid,sv.vnf_id as vnf_id,sv.name as vnf_name, sce_vnf_id, datacenter_id, datacenter_tenant_id"\
- " FROM instance_vnfs as iv join sce_vnfs as sv on iv.sce_vnf_id=sv.uuid" \
+ cmd = "SELECT iv.uuid as uuid, iv.vnf_id as vnf_id, sv.name as vnf_name, sce_vnf_id, datacenter_id"\
+ " ,datacenter_tenant_id, v.mgmt_access, sv.member_vnf_index "\
+ " FROM instance_vnfs as iv left join sce_vnfs as sv "\
+ "on iv.sce_vnf_id=sv.uuid join vnfs as v on iv.vnf_id=v.uuid" \
" WHERE iv.instance_scenario_id='{}'" \
" ORDER BY iv.created_at ".format(instance_dict['uuid'])
self.logger.debug(cmd)
for vnf in instance_dict['vnfs']:
vnf_manage_iface_list=[]
#instance vms
- cmd = "SELECT iv.uuid as uuid, vim_vm_id, status, error_msg, vim_info, iv.created_at as created_at, name "\
+ cmd = "SELECT iv.uuid as uuid, vim_vm_id, status, error_msg, vim_info, iv.created_at as created_at, name"\
" FROM instance_vms as iv join vms on iv.vm_id=vms.uuid "\
" WHERE instance_vnf_id='{}' ORDER BY iv.created_at".format(vnf['uuid'])
self.logger.debug(cmd)
vnf['vms'] = self.cur.fetchall()
for vm in vnf['vms']:
vm_manage_iface_list=[]
- #instance_interfaces
+ # instance_interfaces
cmd = "SELECT vim_interface_id, instance_net_id, internal_name,external_name, mac_address,"\
" ii.ip_address as ip_address, vim_info, i.type as type, sdn_port_id"\
" FROM instance_interfaces as ii join interfaces as i on ii.interface_id=i.uuid"\
projects / osm / RO.git / blobdiff