created_time += 0.00001
db_base._convert_bandwidth(dataiface, logger=self.logger)
dataifacesDict[vm['name']][dataiface['name']] = {}
- dataifacesDict[vm['name']][dataiface['name']]['vpci'] = dataiface['vpci']
+ dataifacesDict[vm['name']][dataiface['name']]['vpci'] = dataiface.get('vpci')
dataifacesDict[vm['name']][dataiface['name']]['bw'] = dataiface['bandwidth']
dataifacesDict[vm['name']][dataiface['name']]['model'] = "PF" if dataiface[
'dedicated'] == "yes" else (
created_time += 0.00001
db_base._convert_bandwidth(dataiface, logger=self.logger)
ifaceDict = {}
- ifaceDict['vpci'] = dataiface['vpci']
+ ifaceDict['vpci'] = dataiface.get('vpci')
ifaceDict['bw'] = dataiface['bandwidth']
ifaceDict['model'] = "PF" if dataiface['dedicated'] == "yes" else \
("VF" if dataiface['dedicated'] == "no" else "VFnotShared")
self.cur.execute(cmd)
vnf['interfaces'] = self.cur.fetchall()
#vms
- cmd = "SELECT vms.uuid as uuid, flavor_id, image_id, vms.name as name, vms.description as description, vms.boot_data as boot_data " \
- " FROM vnfs join vms on vnfs.uuid=vms.vnf_id " \
- " WHERE vnfs.uuid='" + vnf['vnf_id'] +"'" \
- " ORDER BY vms.created_at"
+ cmd = "SELECT vms.uuid as uuid, flavor_id, image_id, vms.name as name," \
+ " vms.description as description, vms.boot_data as boot_data," \
+ " vms.availability_zone as availability_zone" \
+ " FROM vnfs join vms on vnfs.uuid=vms.vnf_id " \
+ " WHERE vnfs.uuid='" + vnf['vnf_id'] +"'" \
+ " ORDER BY vms.created_at"
self.logger.debug(cmd)
self.cur.execute(cmd)
vnf['vms'] = self.cur.fetchall()