X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_ro%2Fnfvo_db.py;h=eb72b133829860f3581a7bc6973f148fbe522e21;hb=1fa49b16e92ff2e4f512ccc466fdc3dff31559e4;hp=f47ad162bc50183983ff4bd77a07e5d0b355ba69;hpb=a15c4b97ee155f7ad78077abed9ec9a5fe88ee10;p=osm%2FRO.git diff --git a/osm_ro/nfvo_db.py b/osm_ro/nfvo_db.py index f47ad162..eb72b133 100644 --- a/osm_ro/nfvo_db.py +++ b/osm_ro/nfvo_db.py @@ -1,7 +1,7 @@ # -*- coding: utf-8 -*- ## -# Copyright 2015 Telefónica Investigación y Desarrollo, S.A.U. +# Copyright 2015 Telefonica Investigacion y Desarrollo, S.A.U. # This file is part of openmano # All Rights Reserved. # @@ -21,9 +21,9 @@ # contact with: nfvlabs@tid.es ## -''' +""" NFVO DB engine. It implements all the methods to interact with the Openmano Database -''' +""" __author__="Alfonso Tierno, Gerardo Garcia, Pablo Montes" __date__ ="$28-aug-2014 10:05:01$" @@ -34,484 +34,470 @@ import yaml import time #import sys, os +from .db_base import retry, with_transaction +from .http_tools import errors as httperrors +from .utils import Attempt + + +_ATTEMPT = Attempt() + + tables_with_createdat_field=["datacenters","instance_nets","instance_scenarios","instance_vms","instance_vnfs", "interfaces","nets","nfvo_tenants","scenarios","sce_interfaces","sce_nets", "sce_vnfs","tenants_datacenters","datacenter_tenants","vms","vnfs", "datacenter_nets", - "instance_actions", "vim_actions"] + "instance_actions", "sce_vnffgs", "sce_rsps", "sce_rsp_hops", + "sce_classifiers", "sce_classifier_matches", "instance_sfis", "instance_sfs", + "instance_classifications", "instance_sfps", "wims", "wim_accounts", "wim_nfvo_tenants", + "wim_port_mappings", "vim_wim_actions", + "instance_wim_nets"] class nfvo_db(db_base.db_base): - def __init__(self, host=None, user=None, passwd=None, database=None, log_name='openmano.db', log_level=None): - db_base.db_base.__init__(self, host, user, passwd, database, log_name, log_level) + def __init__(self, host=None, user=None, passwd=None, database=None, + log_name='openmano.db', log_level=None, lock=None): + db_base.db_base.__init__(self, host, user, passwd, database, + log_name, log_level, lock) db_base.db_base.tables_with_created_field=tables_with_createdat_field return + @retry + @with_transaction def new_vnf_as_a_whole(self,nfvo_tenant,vnf_name,vnf_descriptor,VNFCDict): self.logger.debug("Adding new vnf to the NFVO database") - tries = 2 - while tries: - created_time = time.time() - try: - with self.con: - - myVNFDict = {} - myVNFDict["name"] = vnf_name - myVNFDict["descriptor"] = vnf_descriptor['vnf'].get('descriptor') - myVNFDict["public"] = vnf_descriptor['vnf'].get('public', "false") - 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. - vmDict = {} - for _,vm in VNFCDict.iteritems(): - #This code could make the name of the vms grow and grow. - #If we agree to follow this convention, we should check with a regex that the vnfc name is not including yet the vnf name - #vm['name'] = "%s-%s" % (vnf_name,vm['name']) - #print "VM name: %s. Description: %s" % (vm['name'], vm['description']) - vm["vnf_id"] = vnf_id - created_time += 0.00001 - vm_id = self._new_row_internal('vms', vm, add_uuid=True, root_uuid=vnf_id, created_time=created_time) - #print "Internal vm id in NFVO DB: %s" % vm_id - vmDict[vm['name']] = vm_id - - #Collect the bridge interfaces of each VM/VNFC under the 'bridge-ifaces' field - bridgeInterfacesDict = {} - for vm in vnf_descriptor['vnf']['VNFC']: - if 'bridge-ifaces' in vm: - bridgeInterfacesDict[vm['name']] = {} - for bridgeiface in vm['bridge-ifaces']: - created_time += 0.00001 - if 'port-security' in bridgeiface: - bridgeiface['port_security'] = bridgeiface.pop('port-security') - if 'floating-ip' in bridgeiface: - bridgeiface['floating_ip'] = bridgeiface.pop('floating-ip') - db_base._convert_bandwidth(bridgeiface, logger=self.logger) - bridgeInterfacesDict[vm['name']][bridgeiface['name']] = {} - bridgeInterfacesDict[vm['name']][bridgeiface['name']]['vpci'] = bridgeiface.get('vpci',None) - bridgeInterfacesDict[vm['name']][bridgeiface['name']]['mac'] = bridgeiface.get('mac_address',None) - bridgeInterfacesDict[vm['name']][bridgeiface['name']]['bw'] = bridgeiface.get('bandwidth', None) - bridgeInterfacesDict[vm['name']][bridgeiface['name']]['model'] = bridgeiface.get('model', None) - bridgeInterfacesDict[vm['name']][bridgeiface['name']]['port_security'] = \ - int(bridgeiface.get('port_security', True)) - bridgeInterfacesDict[vm['name']][bridgeiface['name']]['floating_ip'] = \ - int(bridgeiface.get('floating_ip', False)) - bridgeInterfacesDict[vm['name']][bridgeiface['name']]['created_time'] = created_time - - # Collect the data interfaces of each VM/VNFC under the 'numas' field - dataifacesDict = {} - for vm in vnf_descriptor['vnf']['VNFC']: - dataifacesDict[vm['name']] = {} - for numa in vm.get('numas', []): - for dataiface in numa.get('interfaces', []): - created_time += 0.00001 - db_base._convert_bandwidth(dataiface, logger=self.logger) - dataifacesDict[vm['name']][dataiface['name']] = {} - 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 ( - "VF" if dataiface['dedicated'] == "no" else "VFnotShared") - dataifacesDict[vm['name']][dataiface['name']]['created_time'] = created_time - - #For each internal connection, we add it to the interfaceDict and we create the appropriate net in the NFVO database. - #print "Adding new nets (VNF internal nets) to the NFVO database (if any)" - internalconnList = [] - if 'internal-connections' in vnf_descriptor['vnf']: - for net in vnf_descriptor['vnf']['internal-connections']: - #print "Net name: %s. Description: %s" % (net['name'], net['description']) - - myNetDict = {} - myNetDict["name"] = net['name'] - myNetDict["description"] = net['description'] - myNetDict["type"] = net['type'] - myNetDict["vnf_id"] = vnf_id - - created_time += 0.00001 - net_id = self._new_row_internal('nets', myNetDict, add_uuid=True, root_uuid=vnf_id, created_time=created_time) - - for element in net['elements']: - ifaceItem = {} - #ifaceItem["internal_name"] = "%s-%s-%s" % (net['name'],element['VNFC'], element['local_iface_name']) - ifaceItem["internal_name"] = element['local_iface_name'] - #ifaceItem["vm_id"] = vmDict["%s-%s" % (vnf_name,element['VNFC'])] - ifaceItem["vm_id"] = vmDict[element['VNFC']] - ifaceItem["net_id"] = net_id - ifaceItem["type"] = net['type'] - if ifaceItem ["type"] == "data": - dataiface = dataifacesDict[ element['VNFC'] ][ element['local_iface_name'] ] - ifaceItem["vpci"] = dataiface['vpci'] - ifaceItem["bw"] = dataiface['bw'] - ifaceItem["model"] = dataiface['model'] - created_time_iface = dataiface['created_time'] - else: - bridgeiface = bridgeInterfacesDict[ element['VNFC'] ][ element['local_iface_name'] ] - ifaceItem["vpci"] = bridgeiface['vpci'] - ifaceItem["mac"] = bridgeiface['mac'] - ifaceItem["bw"] = bridgeiface['bw'] - ifaceItem["model"] = bridgeiface['model'] - ifaceItem["port_security"] = bridgeiface['port_security'] - ifaceItem["floating_ip"] = bridgeiface['floating_ip'] - created_time_iface = bridgeiface['created_time'] - internalconnList.append(ifaceItem) - #print "Internal net id in NFVO DB: %s" % net_id - - #print "Adding internal interfaces to the NFVO database (if any)" - for iface in internalconnList: - #print "Iface name: %s" % iface['internal_name'] - iface_id = self._new_row_internal('interfaces', iface, add_uuid=True, root_uuid=vnf_id, created_time = created_time_iface) - #print "Iface id in NFVO DB: %s" % iface_id - - #print "Adding external interfaces to the NFVO database" - for iface in vnf_descriptor['vnf']['external-connections']: - myIfaceDict = {} - #myIfaceDict["internal_name"] = "%s-%s-%s" % (vnf_name,iface['VNFC'], iface['local_iface_name']) - myIfaceDict["internal_name"] = iface['local_iface_name'] - #myIfaceDict["vm_id"] = vmDict["%s-%s" % (vnf_name,iface['VNFC'])] - myIfaceDict["vm_id"] = vmDict[iface['VNFC']] - myIfaceDict["external_name"] = iface['name'] - myIfaceDict["type"] = iface['type'] - if iface["type"] == "data": - dataiface = dataifacesDict[ iface['VNFC'] ][ iface['local_iface_name'] ] - myIfaceDict["vpci"] = dataiface['vpci'] - myIfaceDict["bw"] = dataiface['bw'] - myIfaceDict["model"] = dataiface['model'] - created_time_iface = dataiface['created_time'] - else: - bridgeiface = bridgeInterfacesDict[ iface['VNFC'] ][ iface['local_iface_name'] ] - myIfaceDict["vpci"] = bridgeiface['vpci'] - myIfaceDict["bw"] = bridgeiface['bw'] - myIfaceDict["model"] = bridgeiface['model'] - myIfaceDict["mac"] = bridgeiface['mac'] - myIfaceDict["port_security"]= bridgeiface['port_security'] - myIfaceDict["floating_ip"] = bridgeiface['floating_ip'] - created_time_iface = bridgeiface['created_time'] - #print "Iface name: %s" % iface['name'] - iface_id = self._new_row_internal('interfaces', myIfaceDict, add_uuid=True, root_uuid=vnf_id, created_time = created_time_iface) - #print "Iface id in NFVO DB: %s" % iface_id - - return vnf_id - - except (mdb.Error, AttributeError) as e: - self._format_error(e, tries) - tries -= 1 - + created_time = time.time() + myVNFDict = {} + myVNFDict["name"] = vnf_name + myVNFDict["descriptor"] = vnf_descriptor['vnf'].get('descriptor') + myVNFDict["public"] = vnf_descriptor['vnf'].get('public', "false") + 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. + vmDict = {} + for _,vm in VNFCDict.iteritems(): + #This code could make the name of the vms grow and grow. + #If we agree to follow this convention, we should check with a regex that the vnfc name is not including yet the vnf name + #vm['name'] = "%s-%s" % (vnf_name,vm['name']) + #print "VM name: %s. Description: %s" % (vm['name'], vm['description']) + vm["vnf_id"] = vnf_id + created_time += 0.00001 + vm_id = self._new_row_internal('vms', vm, add_uuid=True, root_uuid=vnf_id, created_time=created_time) + #print "Internal vm id in NFVO DB: %s" % vm_id + vmDict[vm['name']] = vm_id + + #Collect the bridge interfaces of each VM/VNFC under the 'bridge-ifaces' field + bridgeInterfacesDict = {} + for vm in vnf_descriptor['vnf']['VNFC']: + if 'bridge-ifaces' in vm: + bridgeInterfacesDict[vm['name']] = {} + for bridgeiface in vm['bridge-ifaces']: + created_time += 0.00001 + if 'port-security' in bridgeiface: + bridgeiface['port_security'] = bridgeiface.pop('port-security') + if 'floating-ip' in bridgeiface: + bridgeiface['floating_ip'] = bridgeiface.pop('floating-ip') + db_base._convert_bandwidth(bridgeiface, logger=self.logger) + bridgeInterfacesDict[vm['name']][bridgeiface['name']] = {} + bridgeInterfacesDict[vm['name']][bridgeiface['name']]['vpci'] = bridgeiface.get('vpci',None) + bridgeInterfacesDict[vm['name']][bridgeiface['name']]['mac'] = bridgeiface.get('mac_address',None) + bridgeInterfacesDict[vm['name']][bridgeiface['name']]['bw'] = bridgeiface.get('bandwidth', None) + bridgeInterfacesDict[vm['name']][bridgeiface['name']]['model'] = bridgeiface.get('model', None) + bridgeInterfacesDict[vm['name']][bridgeiface['name']]['port_security'] = \ + int(bridgeiface.get('port_security', True)) + bridgeInterfacesDict[vm['name']][bridgeiface['name']]['floating_ip'] = \ + int(bridgeiface.get('floating_ip', False)) + bridgeInterfacesDict[vm['name']][bridgeiface['name']]['created_time'] = created_time + + # Collect the data interfaces of each VM/VNFC under the 'numas' field + dataifacesDict = {} + for vm in vnf_descriptor['vnf']['VNFC']: + dataifacesDict[vm['name']] = {} + for numa in vm.get('numas', []): + for dataiface in numa.get('interfaces', []): + created_time += 0.00001 + db_base._convert_bandwidth(dataiface, logger=self.logger) + dataifacesDict[vm['name']][dataiface['name']] = {} + 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 ( + "VF" if dataiface['dedicated'] == "no" else "VFnotShared") + dataifacesDict[vm['name']][dataiface['name']]['created_time'] = created_time + + #For each internal connection, we add it to the interfaceDict and we create the appropriate net in the NFVO database. + #print "Adding new nets (VNF internal nets) to the NFVO database (if any)" + internalconnList = [] + if 'internal-connections' in vnf_descriptor['vnf']: + for net in vnf_descriptor['vnf']['internal-connections']: + #print "Net name: %s. Description: %s" % (net['name'], net['description']) + + myNetDict = {} + myNetDict["name"] = net['name'] + myNetDict["description"] = net['description'] + myNetDict["type"] = net['type'] + myNetDict["vnf_id"] = vnf_id + + created_time += 0.00001 + net_id = self._new_row_internal('nets', myNetDict, add_uuid=True, root_uuid=vnf_id, created_time=created_time) + + for element in net['elements']: + ifaceItem = {} + #ifaceItem["internal_name"] = "%s-%s-%s" % (net['name'],element['VNFC'], element['local_iface_name']) + ifaceItem["internal_name"] = element['local_iface_name'] + #ifaceItem["vm_id"] = vmDict["%s-%s" % (vnf_name,element['VNFC'])] + ifaceItem["vm_id"] = vmDict[element['VNFC']] + ifaceItem["net_id"] = net_id + ifaceItem["type"] = net['type'] + if ifaceItem ["type"] == "data": + dataiface = dataifacesDict[ element['VNFC'] ][ element['local_iface_name'] ] + ifaceItem["vpci"] = dataiface['vpci'] + ifaceItem["bw"] = dataiface['bw'] + ifaceItem["model"] = dataiface['model'] + created_time_iface = dataiface['created_time'] + else: + bridgeiface = bridgeInterfacesDict[ element['VNFC'] ][ element['local_iface_name'] ] + ifaceItem["vpci"] = bridgeiface['vpci'] + ifaceItem["mac"] = bridgeiface['mac'] + ifaceItem["bw"] = bridgeiface['bw'] + ifaceItem["model"] = bridgeiface['model'] + ifaceItem["port_security"] = bridgeiface['port_security'] + ifaceItem["floating_ip"] = bridgeiface['floating_ip'] + created_time_iface = bridgeiface['created_time'] + internalconnList.append(ifaceItem) + #print "Internal net id in NFVO DB: %s" % net_id + + #print "Adding internal interfaces to the NFVO database (if any)" + for iface in internalconnList: + #print "Iface name: %s" % iface['internal_name'] + iface_id = self._new_row_internal('interfaces', iface, add_uuid=True, root_uuid=vnf_id, created_time = created_time_iface) + #print "Iface id in NFVO DB: %s" % iface_id + + #print "Adding external interfaces to the NFVO database" + for iface in vnf_descriptor['vnf']['external-connections']: + myIfaceDict = {} + #myIfaceDict["internal_name"] = "%s-%s-%s" % (vnf_name,iface['VNFC'], iface['local_iface_name']) + myIfaceDict["internal_name"] = iface['local_iface_name'] + #myIfaceDict["vm_id"] = vmDict["%s-%s" % (vnf_name,iface['VNFC'])] + myIfaceDict["vm_id"] = vmDict[iface['VNFC']] + myIfaceDict["external_name"] = iface['name'] + myIfaceDict["type"] = iface['type'] + if iface["type"] == "data": + dataiface = dataifacesDict[ iface['VNFC'] ][ iface['local_iface_name'] ] + myIfaceDict["vpci"] = dataiface['vpci'] + myIfaceDict["bw"] = dataiface['bw'] + myIfaceDict["model"] = dataiface['model'] + created_time_iface = dataiface['created_time'] + else: + bridgeiface = bridgeInterfacesDict[ iface['VNFC'] ][ iface['local_iface_name'] ] + myIfaceDict["vpci"] = bridgeiface['vpci'] + myIfaceDict["bw"] = bridgeiface['bw'] + myIfaceDict["model"] = bridgeiface['model'] + myIfaceDict["mac"] = bridgeiface['mac'] + myIfaceDict["port_security"]= bridgeiface['port_security'] + myIfaceDict["floating_ip"] = bridgeiface['floating_ip'] + created_time_iface = bridgeiface['created_time'] + #print "Iface name: %s" % iface['name'] + iface_id = self._new_row_internal('interfaces', myIfaceDict, add_uuid=True, root_uuid=vnf_id, created_time = created_time_iface) + #print "Iface id in NFVO DB: %s" % iface_id + + return vnf_id + + @retry + @with_transaction def new_vnf_as_a_whole2(self,nfvo_tenant,vnf_name,vnf_descriptor,VNFCDict): self.logger.debug("Adding new vnf to the NFVO database") - tries = 2 - while tries: - created_time = time.time() - try: - with self.con: - - myVNFDict = {} - myVNFDict["name"] = vnf_name - myVNFDict["descriptor"] = vnf_descriptor['vnf'].get('descriptor') - myVNFDict["public"] = vnf_descriptor['vnf'].get('public', "false") - 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. - vmDict = {} - for _,vm in VNFCDict.iteritems(): - #This code could make the name of the vms grow and grow. - #If we agree to follow this convention, we should check with a regex that the vnfc name is not including yet the vnf name - #vm['name'] = "%s-%s" % (vnf_name,vm['name']) - #print "VM name: %s. Description: %s" % (vm['name'], vm['description']) - vm["vnf_id"] = vnf_id - created_time += 0.00001 - vm_id = self._new_row_internal('vms', vm, add_uuid=True, root_uuid=vnf_id, created_time=created_time) - #print "Internal vm id in NFVO DB: %s" % vm_id - vmDict[vm['name']] = vm_id - - #Collect the bridge interfaces of each VM/VNFC under the 'bridge-ifaces' field - bridgeInterfacesDict = {} - for vm in vnf_descriptor['vnf']['VNFC']: - if 'bridge-ifaces' in vm: - bridgeInterfacesDict[vm['name']] = {} - for bridgeiface in vm['bridge-ifaces']: - created_time += 0.00001 - db_base._convert_bandwidth(bridgeiface, logger=self.logger) - if 'port-security' in bridgeiface: - bridgeiface['port_security'] = bridgeiface.pop('port-security') - if 'floating-ip' in bridgeiface: - bridgeiface['floating_ip'] = bridgeiface.pop('floating-ip') - ifaceDict = {} - ifaceDict['vpci'] = bridgeiface.get('vpci',None) - ifaceDict['mac'] = bridgeiface.get('mac_address',None) - ifaceDict['bw'] = bridgeiface.get('bandwidth', None) - ifaceDict['model'] = bridgeiface.get('model', None) - ifaceDict['port_security'] = int(bridgeiface.get('port_security', True)) - ifaceDict['floating_ip'] = int(bridgeiface.get('floating_ip', False)) - ifaceDict['created_time'] = created_time - bridgeInterfacesDict[vm['name']][bridgeiface['name']] = ifaceDict - - # Collect the data interfaces of each VM/VNFC under the 'numas' field - dataifacesDict = {} - for vm in vnf_descriptor['vnf']['VNFC']: - dataifacesDict[vm['name']] = {} - for numa in vm.get('numas', []): - for dataiface in numa.get('interfaces', []): - created_time += 0.00001 - db_base._convert_bandwidth(dataiface, logger=self.logger) - ifaceDict = {} - ifaceDict['vpci'] = dataiface.get('vpci') - ifaceDict['bw'] = dataiface['bandwidth'] - ifaceDict['model'] = "PF" if dataiface['dedicated'] == "yes" else \ - ("VF" if dataiface['dedicated'] == "no" else "VFnotShared") - ifaceDict['created_time'] = created_time - dataifacesDict[vm['name']][dataiface['name']] = ifaceDict - - #For each internal connection, we add it to the interfaceDict and we create the appropriate net in the NFVO database. - #print "Adding new nets (VNF internal nets) to the NFVO database (if any)" - if 'internal-connections' in vnf_descriptor['vnf']: - for net in vnf_descriptor['vnf']['internal-connections']: - #print "Net name: %s. Description: %s" % (net['name'], net['description']) - - myNetDict = {} - myNetDict["name"] = net['name'] - myNetDict["description"] = net['description'] - if (net["implementation"] == "overlay"): - net["type"] = "bridge" - #It should give an error if the type is e-line. For the moment, we consider it as a bridge - elif (net["implementation"] == "underlay"): - if (net["type"] == "e-line"): - net["type"] = "ptp" - elif (net["type"] == "e-lan"): - net["type"] = "data" - net.pop("implementation") - myNetDict["type"] = net['type'] - myNetDict["vnf_id"] = vnf_id - - created_time += 0.00001 - net_id = self._new_row_internal('nets', myNetDict, add_uuid=True, root_uuid=vnf_id, created_time=created_time) - - if "ip-profile" in net: - ip_profile = net["ip-profile"] - myIPProfileDict = {} - myIPProfileDict["net_id"] = net_id - myIPProfileDict["ip_version"] = ip_profile.get('ip-version',"IPv4") - myIPProfileDict["subnet_address"] = ip_profile.get('subnet-address',None) - myIPProfileDict["gateway_address"] = ip_profile.get('gateway-address',None) - myIPProfileDict["dns_address"] = ip_profile.get('dns-address',None) - if ("dhcp" in ip_profile): - myIPProfileDict["dhcp_enabled"] = ip_profile["dhcp"].get('enabled',"true") - myIPProfileDict["dhcp_start_address"] = ip_profile["dhcp"].get('start-address',None) - myIPProfileDict["dhcp_count"] = ip_profile["dhcp"].get('count',None) - - created_time += 0.00001 - ip_profile_id = self._new_row_internal('ip_profiles', myIPProfileDict) - - for element in net['elements']: - ifaceItem = {} - #ifaceItem["internal_name"] = "%s-%s-%s" % (net['name'],element['VNFC'], element['local_iface_name']) - ifaceItem["internal_name"] = element['local_iface_name'] - #ifaceItem["vm_id"] = vmDict["%s-%s" % (vnf_name,element['VNFC'])] - ifaceItem["vm_id"] = vmDict[element['VNFC']] - ifaceItem["net_id"] = net_id - ifaceItem["type"] = net['type'] - ifaceItem["ip_address"] = element.get('ip_address',None) - if ifaceItem ["type"] == "data": - ifaceDict = dataifacesDict[ element['VNFC'] ][ element['local_iface_name'] ] - ifaceItem["vpci"] = ifaceDict['vpci'] - ifaceItem["bw"] = ifaceDict['bw'] - ifaceItem["model"] = ifaceDict['model'] - else: - ifaceDict = bridgeInterfacesDict[ element['VNFC'] ][ element['local_iface_name'] ] - ifaceItem["vpci"] = ifaceDict['vpci'] - ifaceItem["mac"] = ifaceDict['mac'] - ifaceItem["bw"] = ifaceDict['bw'] - ifaceItem["model"] = ifaceDict['model'] - ifaceItem["port_security"] = ifaceDict['port_security'] - ifaceItem["floating_ip"] = ifaceDict['floating_ip'] - created_time_iface = ifaceDict["created_time"] - #print "Iface name: %s" % iface['internal_name'] - iface_id = self._new_row_internal('interfaces', ifaceItem, add_uuid=True, root_uuid=vnf_id, created_time=created_time_iface) - #print "Iface id in NFVO DB: %s" % iface_id - - #print "Adding external interfaces to the NFVO database" - for iface in vnf_descriptor['vnf']['external-connections']: - myIfaceDict = {} - #myIfaceDict["internal_name"] = "%s-%s-%s" % (vnf_name,iface['VNFC'], iface['local_iface_name']) - myIfaceDict["internal_name"] = iface['local_iface_name'] - #myIfaceDict["vm_id"] = vmDict["%s-%s" % (vnf_name,iface['VNFC'])] - myIfaceDict["vm_id"] = vmDict[iface['VNFC']] - myIfaceDict["external_name"] = iface['name'] - myIfaceDict["type"] = iface['type'] - if iface["type"] == "data": - myIfaceDict["vpci"] = dataifacesDict[ iface['VNFC'] ][ iface['local_iface_name'] ]['vpci'] - myIfaceDict["bw"] = dataifacesDict[ iface['VNFC'] ][ iface['local_iface_name'] ]['bw'] - myIfaceDict["model"] = dataifacesDict[ iface['VNFC'] ][ iface['local_iface_name'] ]['model'] - created_time_iface = dataifacesDict[ iface['VNFC'] ][ iface['local_iface_name'] ]['created_time'] - else: - myIfaceDict["vpci"] = bridgeInterfacesDict[ iface['VNFC'] ][ iface['local_iface_name'] ]['vpci'] - myIfaceDict["bw"] = bridgeInterfacesDict[ iface['VNFC'] ][ iface['local_iface_name'] ]['bw'] - myIfaceDict["model"] = bridgeInterfacesDict[ iface['VNFC'] ][ iface['local_iface_name'] ]['model'] - myIfaceDict["mac"] = bridgeInterfacesDict[ iface['VNFC'] ][ iface['local_iface_name'] ]['mac'] - myIfaceDict["port_security"] = \ - bridgeInterfacesDict[iface['VNFC']][iface['local_iface_name']]['port_security'] - myIfaceDict["floating_ip"] = \ - bridgeInterfacesDict[iface['VNFC']][iface['local_iface_name']]['floating_ip'] - created_time_iface = bridgeInterfacesDict[iface['VNFC']][iface['local_iface_name']]['created_time'] - #print "Iface name: %s" % iface['name'] - iface_id = self._new_row_internal('interfaces', myIfaceDict, add_uuid=True, root_uuid=vnf_id, created_time=created_time_iface) - #print "Iface id in NFVO DB: %s" % iface_id - - return vnf_id - - except (mdb.Error, AttributeError) as e: - self._format_error(e, tries) + created_time = time.time() + myVNFDict = {} + myVNFDict["name"] = vnf_name + myVNFDict["descriptor"] = vnf_descriptor['vnf'].get('descriptor') + myVNFDict["public"] = vnf_descriptor['vnf'].get('public', "false") + 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. + vmDict = {} + for _,vm in VNFCDict.iteritems(): + #This code could make the name of the vms grow and grow. + #If we agree to follow this convention, we should check with a regex that the vnfc name is not including yet the vnf name + #vm['name'] = "%s-%s" % (vnf_name,vm['name']) + #print "VM name: %s. Description: %s" % (vm['name'], vm['description']) + vm["vnf_id"] = vnf_id + created_time += 0.00001 + vm_id = self._new_row_internal('vms', vm, add_uuid=True, root_uuid=vnf_id, created_time=created_time) + #print "Internal vm id in NFVO DB: %s" % vm_id + vmDict[vm['name']] = vm_id + + #Collect the bridge interfaces of each VM/VNFC under the 'bridge-ifaces' field + bridgeInterfacesDict = {} + for vm in vnf_descriptor['vnf']['VNFC']: + if 'bridge-ifaces' in vm: + bridgeInterfacesDict[vm['name']] = {} + for bridgeiface in vm['bridge-ifaces']: + created_time += 0.00001 + db_base._convert_bandwidth(bridgeiface, logger=self.logger) + if 'port-security' in bridgeiface: + bridgeiface['port_security'] = bridgeiface.pop('port-security') + if 'floating-ip' in bridgeiface: + bridgeiface['floating_ip'] = bridgeiface.pop('floating-ip') + ifaceDict = {} + ifaceDict['vpci'] = bridgeiface.get('vpci',None) + ifaceDict['mac'] = bridgeiface.get('mac_address',None) + ifaceDict['bw'] = bridgeiface.get('bandwidth', None) + ifaceDict['model'] = bridgeiface.get('model', None) + ifaceDict['port_security'] = int(bridgeiface.get('port_security', True)) + ifaceDict['floating_ip'] = int(bridgeiface.get('floating_ip', False)) + ifaceDict['created_time'] = created_time + bridgeInterfacesDict[vm['name']][bridgeiface['name']] = ifaceDict + + # Collect the data interfaces of each VM/VNFC under the 'numas' field + dataifacesDict = {} + for vm in vnf_descriptor['vnf']['VNFC']: + dataifacesDict[vm['name']] = {} + for numa in vm.get('numas', []): + for dataiface in numa.get('interfaces', []): + created_time += 0.00001 + db_base._convert_bandwidth(dataiface, logger=self.logger) + ifaceDict = {} + ifaceDict['vpci'] = dataiface.get('vpci') + ifaceDict['bw'] = dataiface['bandwidth'] + ifaceDict['model'] = "PF" if dataiface['dedicated'] == "yes" else \ + ("VF" if dataiface['dedicated'] == "no" else "VFnotShared") + ifaceDict['created_time'] = created_time + dataifacesDict[vm['name']][dataiface['name']] = ifaceDict + + #For each internal connection, we add it to the interfaceDict and we create the appropriate net in the NFVO database. + #print "Adding new nets (VNF internal nets) to the NFVO database (if any)" + if 'internal-connections' in vnf_descriptor['vnf']: + for net in vnf_descriptor['vnf']['internal-connections']: + #print "Net name: %s. Description: %s" % (net['name'], net['description']) + + myNetDict = {} + myNetDict["name"] = net['name'] + myNetDict["description"] = net['description'] + if (net["implementation"] == "overlay"): + net["type"] = "bridge" + #It should give an error if the type is e-line. For the moment, we consider it as a bridge + elif (net["implementation"] == "underlay"): + if (net["type"] == "e-line"): + net["type"] = "ptp" + elif (net["type"] == "e-lan"): + net["type"] = "data" + net.pop("implementation") + myNetDict["type"] = net['type'] + myNetDict["vnf_id"] = vnf_id + + created_time += 0.00001 + net_id = self._new_row_internal('nets', myNetDict, add_uuid=True, root_uuid=vnf_id, created_time=created_time) + + if "ip-profile" in net: + ip_profile = net["ip-profile"] + myIPProfileDict = {} + myIPProfileDict["net_id"] = net_id + myIPProfileDict["ip_version"] = ip_profile.get('ip-version',"IPv4") + myIPProfileDict["subnet_address"] = ip_profile.get('subnet-address',None) + myIPProfileDict["gateway_address"] = ip_profile.get('gateway-address',None) + myIPProfileDict["dns_address"] = ip_profile.get('dns-address',None) + if ("dhcp" in ip_profile): + myIPProfileDict["dhcp_enabled"] = ip_profile["dhcp"].get('enabled',"true") + myIPProfileDict["dhcp_start_address"] = ip_profile["dhcp"].get('start-address',None) + myIPProfileDict["dhcp_count"] = ip_profile["dhcp"].get('count',None) + + created_time += 0.00001 + ip_profile_id = self._new_row_internal('ip_profiles', myIPProfileDict) + + for element in net['elements']: + ifaceItem = {} + #ifaceItem["internal_name"] = "%s-%s-%s" % (net['name'],element['VNFC'], element['local_iface_name']) + ifaceItem["internal_name"] = element['local_iface_name'] + #ifaceItem["vm_id"] = vmDict["%s-%s" % (vnf_name,element['VNFC'])] + ifaceItem["vm_id"] = vmDict[element['VNFC']] + ifaceItem["net_id"] = net_id + ifaceItem["type"] = net['type'] + ifaceItem["ip_address"] = element.get('ip_address',None) + if ifaceItem ["type"] == "data": + ifaceDict = dataifacesDict[ element['VNFC'] ][ element['local_iface_name'] ] + ifaceItem["vpci"] = ifaceDict['vpci'] + ifaceItem["bw"] = ifaceDict['bw'] + ifaceItem["model"] = ifaceDict['model'] + else: + ifaceDict = bridgeInterfacesDict[ element['VNFC'] ][ element['local_iface_name'] ] + ifaceItem["vpci"] = ifaceDict['vpci'] + ifaceItem["mac"] = ifaceDict['mac'] + ifaceItem["bw"] = ifaceDict['bw'] + ifaceItem["model"] = ifaceDict['model'] + ifaceItem["port_security"] = ifaceDict['port_security'] + ifaceItem["floating_ip"] = ifaceDict['floating_ip'] + created_time_iface = ifaceDict["created_time"] + #print "Iface name: %s" % iface['internal_name'] + iface_id = self._new_row_internal('interfaces', ifaceItem, add_uuid=True, root_uuid=vnf_id, created_time=created_time_iface) + #print "Iface id in NFVO DB: %s" % iface_id + + #print "Adding external interfaces to the NFVO database" + for iface in vnf_descriptor['vnf']['external-connections']: + myIfaceDict = {} + #myIfaceDict["internal_name"] = "%s-%s-%s" % (vnf_name,iface['VNFC'], iface['local_iface_name']) + myIfaceDict["internal_name"] = iface['local_iface_name'] + #myIfaceDict["vm_id"] = vmDict["%s-%s" % (vnf_name,iface['VNFC'])] + myIfaceDict["vm_id"] = vmDict[iface['VNFC']] + myIfaceDict["external_name"] = iface['name'] + myIfaceDict["type"] = iface['type'] + if iface["type"] == "data": + myIfaceDict["vpci"] = dataifacesDict[ iface['VNFC'] ][ iface['local_iface_name'] ]['vpci'] + myIfaceDict["bw"] = dataifacesDict[ iface['VNFC'] ][ iface['local_iface_name'] ]['bw'] + myIfaceDict["model"] = dataifacesDict[ iface['VNFC'] ][ iface['local_iface_name'] ]['model'] + created_time_iface = dataifacesDict[ iface['VNFC'] ][ iface['local_iface_name'] ]['created_time'] + else: + myIfaceDict["vpci"] = bridgeInterfacesDict[ iface['VNFC'] ][ iface['local_iface_name'] ]['vpci'] + myIfaceDict["bw"] = bridgeInterfacesDict[ iface['VNFC'] ][ iface['local_iface_name'] ]['bw'] + myIfaceDict["model"] = bridgeInterfacesDict[ iface['VNFC'] ][ iface['local_iface_name'] ]['model'] + myIfaceDict["mac"] = bridgeInterfacesDict[ iface['VNFC'] ][ iface['local_iface_name'] ]['mac'] + myIfaceDict["port_security"] = \ + bridgeInterfacesDict[iface['VNFC']][iface['local_iface_name']]['port_security'] + myIfaceDict["floating_ip"] = \ + bridgeInterfacesDict[iface['VNFC']][iface['local_iface_name']]['floating_ip'] + created_time_iface = bridgeInterfacesDict[iface['VNFC']][iface['local_iface_name']]['created_time'] + #print "Iface name: %s" % iface['name'] + iface_id = self._new_row_internal('interfaces', myIfaceDict, add_uuid=True, root_uuid=vnf_id, created_time=created_time_iface) + #print "Iface id in NFVO DB: %s" % iface_id + + return vnf_id + # except KeyError as e2: # exc_type, exc_obj, exc_tb = sys.exc_info() # fname = os.path.split(exc_tb.tb_frame.f_code.co_filename)[1] # self.logger.debug("Exception type: %s; Filename: %s; Line number: %s", exc_type, fname, exc_tb.tb_lineno) # raise KeyError - tries -= 1 + @retry + @with_transaction def new_scenario(self, scenario_dict): - tries = 2 - while tries: - created_time = time.time() - try: - with self.con: - self.cur = self.con.cursor() - tenant_id = scenario_dict.get('tenant_id') - #scenario - INSERT_={'tenant_id': tenant_id, - 'name': scenario_dict['name'], - 'description': scenario_dict['description'], - 'public': scenario_dict.get('public', "false")} - - scenario_uuid = self._new_row_internal('scenarios', INSERT_, add_uuid=True, root_uuid=None, created_time=created_time) - #sce_nets - for net in scenario_dict['nets'].values(): - net_dict={'scenario_id': scenario_uuid} - net_dict["name"] = net["name"] - net_dict["type"] = net["type"] - net_dict["description"] = net.get("description") - net_dict["external"] = net.get("external", False) - if "graph" in net: - #net["graph"]=yaml.safe_dump(net["graph"],default_flow_style=True,width=256) - #TODO, must be json because of the GUI, change to yaml - net_dict["graph"]=json.dumps(net["graph"]) - created_time += 0.00001 - net_uuid = self._new_row_internal('sce_nets', net_dict, add_uuid=True, root_uuid=scenario_uuid, created_time=created_time) - net['uuid']=net_uuid - - if net.get("ip-profile"): - ip_profile = net["ip-profile"] - myIPProfileDict = { - "sce_net_id": net_uuid, - "ip_version": ip_profile.get('ip-version', "IPv4"), - "subnet_address": ip_profile.get('subnet-address'), - "gateway_address": ip_profile.get('gateway-address'), - "dns_address": ip_profile.get('dns-address')} - if "dhcp" in ip_profile: - myIPProfileDict["dhcp_enabled"] = ip_profile["dhcp"].get('enabled', "true") - myIPProfileDict["dhcp_start_address"] = ip_profile["dhcp"].get('start-address') - myIPProfileDict["dhcp_count"] = ip_profile["dhcp"].get('count') - self._new_row_internal('ip_profiles', myIPProfileDict) - - # sce_vnfs - for k, vnf in scenario_dict['vnfs'].items(): - INSERT_ = {'scenario_id': scenario_uuid, - 'name': k, - 'vnf_id': vnf['uuid'], - # 'description': scenario_dict['name'] - 'description': vnf['description']} - if "graph" in vnf: - #I NSERT_["graph"]=yaml.safe_dump(vnf["graph"],default_flow_style=True,width=256) - # TODO, must be json because of the GUI, change to yaml - INSERT_["graph"] = json.dumps(vnf["graph"]) - created_time += 0.00001 - scn_vnf_uuid = self._new_row_internal('sce_vnfs', INSERT_, add_uuid=True, - root_uuid=scenario_uuid, created_time=created_time) - vnf['scn_vnf_uuid']=scn_vnf_uuid - # sce_interfaces - for iface in vnf['ifaces'].values(): - # print 'iface', iface - if 'net_key' not in iface: - continue - iface['net_id'] = scenario_dict['nets'][ iface['net_key'] ]['uuid'] - INSERT_={'sce_vnf_id': scn_vnf_uuid, - 'sce_net_id': iface['net_id'], - 'interface_id': iface['uuid'], - 'ip_address': iface.get('ip_address')} - created_time += 0.00001 - iface_uuid = self._new_row_internal('sce_interfaces', INSERT_, add_uuid=True, - root_uuid=scenario_uuid, created_time=created_time) - - return scenario_uuid - - except (mdb.Error, AttributeError) as e: - self._format_error(e, tries) - tries -= 1 + created_time = time.time() + tenant_id = scenario_dict.get('tenant_id') + #scenario + INSERT_={'tenant_id': tenant_id, + 'name': scenario_dict['name'], + 'description': scenario_dict['description'], + 'public': scenario_dict.get('public', "false")} + + scenario_uuid = self._new_row_internal('scenarios', INSERT_, add_uuid=True, root_uuid=None, created_time=created_time) + #sce_nets + for net in scenario_dict['nets'].values(): + net_dict={'scenario_id': scenario_uuid} + net_dict["name"] = net["name"] + net_dict["type"] = net["type"] + net_dict["description"] = net.get("description") + net_dict["external"] = net.get("external", False) + if "graph" in net: + #net["graph"]=yaml.safe_dump(net["graph"],default_flow_style=True,width=256) + #TODO, must be json because of the GUI, change to yaml + net_dict["graph"]=json.dumps(net["graph"]) + created_time += 0.00001 + net_uuid = self._new_row_internal('sce_nets', net_dict, add_uuid=True, root_uuid=scenario_uuid, created_time=created_time) + net['uuid']=net_uuid + + if net.get("ip-profile"): + ip_profile = net["ip-profile"] + myIPProfileDict = { + "sce_net_id": net_uuid, + "ip_version": ip_profile.get('ip-version', "IPv4"), + "subnet_address": ip_profile.get('subnet-address'), + "gateway_address": ip_profile.get('gateway-address'), + "dns_address": ip_profile.get('dns-address')} + if "dhcp" in ip_profile: + myIPProfileDict["dhcp_enabled"] = ip_profile["dhcp"].get('enabled', "true") + myIPProfileDict["dhcp_start_address"] = ip_profile["dhcp"].get('start-address') + myIPProfileDict["dhcp_count"] = ip_profile["dhcp"].get('count') + self._new_row_internal('ip_profiles', myIPProfileDict) + # sce_vnfs + for k, vnf in scenario_dict['vnfs'].items(): + INSERT_ = {'scenario_id': scenario_uuid, + 'name': k, + 'vnf_id': vnf['uuid'], + # 'description': scenario_dict['name'] + 'description': vnf['description']} + if "graph" in vnf: + #I NSERT_["graph"]=yaml.safe_dump(vnf["graph"],default_flow_style=True,width=256) + # TODO, must be json because of the GUI, change to yaml + INSERT_["graph"] = json.dumps(vnf["graph"]) + created_time += 0.00001 + scn_vnf_uuid = self._new_row_internal('sce_vnfs', INSERT_, add_uuid=True, + root_uuid=scenario_uuid, created_time=created_time) + vnf['scn_vnf_uuid']=scn_vnf_uuid + # sce_interfaces + for iface in vnf['ifaces'].values(): + # print 'iface', iface + if 'net_key' not in iface: + continue + iface['net_id'] = scenario_dict['nets'][ iface['net_key'] ]['uuid'] + INSERT_={'sce_vnf_id': scn_vnf_uuid, + 'sce_net_id': iface['net_id'], + 'interface_id': iface['uuid'], + 'ip_address': iface.get('ip_address')} + created_time += 0.00001 + iface_uuid = self._new_row_internal('sce_interfaces', INSERT_, add_uuid=True, + root_uuid=scenario_uuid, created_time=created_time) + + return scenario_uuid + + @retry + @with_transaction def edit_scenario(self, scenario_dict): - tries = 2 - while tries: - modified_time = time.time() - item_changed=0 - try: - with self.con: - self.cur = self.con.cursor() - #check that scenario exist - tenant_id = scenario_dict.get('tenant_id') - scenario_uuid = scenario_dict['uuid'] - - where_text = "uuid='{}'".format(scenario_uuid) - if not tenant_id and tenant_id != "any": - where_text += " AND (tenant_id='{}' OR public='True')".format(tenant_id) - cmd = "SELECT * FROM scenarios WHERE "+ where_text - self.logger.debug(cmd) - self.cur.execute(cmd) - self.cur.fetchall() - if self.cur.rowcount==0: - raise db_base.db_base_Exception("No scenario found with this criteria " + where_text, db_base.HTTP_Bad_Request) - elif self.cur.rowcount>1: - raise db_base.db_base_Exception("More than one scenario found with this criteria " + where_text, db_base.HTTP_Bad_Request) - - #scenario - nodes = {} - topology = scenario_dict.pop("topology", None) - if topology != None and "nodes" in topology: - nodes = topology.get("nodes",{}) - UPDATE_ = {} - if "name" in scenario_dict: UPDATE_["name"] = scenario_dict["name"] - if "description" in scenario_dict: UPDATE_["description"] = scenario_dict["description"] - if len(UPDATE_)>0: - WHERE_={'tenant_id': tenant_id, 'uuid': scenario_uuid} - item_changed += self._update_rows('scenarios', UPDATE_, WHERE_, modified_time=modified_time) - #sce_nets - for node_id, node in nodes.items(): - if "graph" in node: - #node["graph"] = yaml.safe_dump(node["graph"],default_flow_style=True,width=256) - #TODO, must be json because of the GUI, change to yaml - node["graph"] = json.dumps(node["graph"]) - WHERE_={'scenario_id': scenario_uuid, 'uuid': node_id} - #Try to change at sce_nets(version 0 API backward compatibility and sce_vnfs) - item_changed += self._update_rows('sce_nets', node, WHERE_) - item_changed += self._update_rows('sce_vnfs', node, WHERE_, modified_time=modified_time) - return item_changed - - except (mdb.Error, AttributeError) as e: - self._format_error(e, tries) - tries -= 1 + modified_time = time.time() + item_changed=0 + #check that scenario exist + tenant_id = scenario_dict.get('tenant_id') + scenario_uuid = scenario_dict['uuid'] + + where_text = "uuid='{}'".format(scenario_uuid) + if not tenant_id and tenant_id != "any": + where_text += " AND (tenant_id='{}' OR public='True')".format(tenant_id) + cmd = "SELECT * FROM scenarios WHERE "+ where_text + self.logger.debug(cmd) + self.cur.execute(cmd) + self.cur.fetchall() + if self.cur.rowcount==0: + raise db_base.db_base_Exception("No scenario found with this criteria " + where_text, httperrors.Bad_Request) + elif self.cur.rowcount>1: + raise db_base.db_base_Exception("More than one scenario found with this criteria " + where_text, httperrors.Bad_Request) + + #scenario + nodes = {} + topology = scenario_dict.pop("topology", None) + if topology != None and "nodes" in topology: + nodes = topology.get("nodes",{}) + UPDATE_ = {} + if "name" in scenario_dict: UPDATE_["name"] = scenario_dict["name"] + if "description" in scenario_dict: UPDATE_["description"] = scenario_dict["description"] + if len(UPDATE_)>0: + WHERE_={'tenant_id': tenant_id, 'uuid': scenario_uuid} + item_changed += self._update_rows('scenarios', UPDATE_, WHERE_, modified_time=modified_time) + #sce_nets + for node_id, node in nodes.items(): + if "graph" in node: + #node["graph"] = yaml.safe_dump(node["graph"],default_flow_style=True,width=256) + #TODO, must be json because of the GUI, change to yaml + node["graph"] = json.dumps(node["graph"]) + WHERE_={'scenario_id': scenario_uuid, 'uuid': node_id} + #Try to change at sce_nets(version 0 API backward compatibility and sce_vnfs) + item_changed += self._update_rows('sce_nets', node, WHERE_) + item_changed += self._update_rows('sce_vnfs', node, WHERE_, modified_time=modified_time) + return item_changed # def get_instance_scenario(self, instance_scenario_id, tenant_id=None): -# '''Obtain the scenario instance information, filtering by one or serveral of the tenant, uuid or name +# '''Obtain the scenario instance information, filtering by one or several of the tenant, uuid or name # instance_scenario_id is the uuid or the name if it is not a valid uuid format # Only one scenario isntance must mutch the filtering or an error is returned -# ''' +# ''' # print "1******************************************************************" # try: -# with self.con: -# self.cur = self.con.cursor(mdb.cursors.DictCursor) +# with self.transaction(mdb.cursors.DictCursor): # #scenario table # where_list=[] # if tenant_id is not None: where_list.append( "tenant_id='" + tenant_id +"'" ) @@ -523,11 +509,11 @@ class nfvo_db(db_base.db_base): # self.cur.execute("SELECT * FROM instance_scenarios WHERE "+ where_text) # rows = self.cur.fetchall() # if self.cur.rowcount==0: -# return -HTTP_Bad_Request, "No scenario instance found with this criteria " + where_text +# return -httperrors.Bad_Request, "No scenario instance found with this criteria " + where_text # elif self.cur.rowcount>1: -# return -HTTP_Bad_Request, "More than one scenario instance found with this criteria " + where_text +# return -httperrors.Bad_Request, "More than one scenario instance found with this criteria " + where_text # instance_scenario_dict = rows[0] -# +# # #instance_vnfs # self.cur.execute("SELECT uuid,vnf_id FROM instance_vnfs WHERE instance_scenario_id='"+ instance_scenario_dict['uuid'] + "'") # instance_scenario_dict['instance_vnfs'] = self.cur.fetchall() @@ -535,17 +521,17 @@ class nfvo_db(db_base.db_base): # #instance_vms # self.cur.execute("SELECT uuid, vim_vm_id "+ # "FROM instance_vms "+ -# "WHERE instance_vnf_id='" + vnf['uuid'] +"'" +# "WHERE instance_vnf_id='" + vnf['uuid'] +"'" # ) # vnf['instance_vms'] = self.cur.fetchall() # #instance_nets # self.cur.execute("SELECT uuid, vim_net_id FROM instance_nets WHERE instance_scenario_id='"+ instance_scenario_dict['uuid'] + "'") # instance_scenario_dict['instance_nets'] = self.cur.fetchall() -# +# # #instance_interfaces # self.cur.execute("SELECT uuid, vim_interface_id, instance_vm_id, instance_net_id FROM instance_interfaces WHERE instance_scenario_id='"+ instance_scenario_dict['uuid'] + "'") # instance_scenario_dict['instance_interfaces'] = self.cur.fetchall() -# +# # db_base._convert_datetime2str(instance_scenario_dict) # db_base._convert_str2boolean(instance_scenario_dict, ('public','shared','external') ) # print "2******************************************************************" @@ -554,191 +540,224 @@ class nfvo_db(db_base.db_base): # print "nfvo_db.get_instance_scenario DB Exception %d: %s" % (e.args[0], e.args[1]) # return self._format_error(e) + @retry + @with_transaction(cursor='dict') def get_scenario(self, scenario_id, tenant_id=None, datacenter_vim_id=None, datacenter_id=None): - '''Obtain the scenario information, filtering by one or serveral of the tenant, uuid or name + '''Obtain the scenario information, filtering by one or several of the tenant, uuid or name scenario_id is the uuid or the name if it is not a valid uuid format if datacenter_vim_id,d datacenter_id is provided, it supply aditional vim_id fields with the matching vim uuid Only one scenario must mutch the filtering or an error is returned - ''' - tries = 2 - while tries: - try: - with self.con: - self.cur = self.con.cursor(mdb.cursors.DictCursor) - where_text = "uuid='{}'".format(scenario_id) - if not tenant_id and tenant_id != "any": - where_text += " AND (tenant_id='{}' OR public='True')".format(tenant_id) - cmd = "SELECT * FROM scenarios WHERE " + where_text - self.logger.debug(cmd) - self.cur.execute(cmd) - rows = self.cur.fetchall() - if self.cur.rowcount==0: - raise db_base.db_base_Exception("No scenario found with this criteria " + where_text, db_base.HTTP_Bad_Request) - elif self.cur.rowcount>1: - raise db_base.db_base_Exception("More than one scenario found with this criteria " + where_text, db_base.HTTP_Bad_Request) - scenario_dict = rows[0] - if scenario_dict["cloud_config"]: - scenario_dict["cloud-config"] = yaml.load(scenario_dict["cloud_config"]) - del scenario_dict["cloud_config"] - #sce_vnfs - cmd = "SELECT uuid,name,member_vnf_index,vnf_id,description FROM sce_vnfs WHERE scenario_id='{}' "\ - "ORDER BY created_at".format(scenario_dict['uuid']) - 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"\ - " WHERE scei.sce_vnf_id='{}' ORDER BY scei.created_at".format(vnf['uuid']) - self.logger.debug(cmd) - 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, count," \ - " 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" + ''' + where_text = "uuid='{}'".format(scenario_id) + if not tenant_id and tenant_id != "any": + where_text += " AND (tenant_id='{}' OR public='True')".format(tenant_id) + cmd = "SELECT * FROM scenarios WHERE " + where_text + self.logger.debug(cmd) + self.cur.execute(cmd) + rows = self.cur.fetchall() + if self.cur.rowcount==0: + raise db_base.db_base_Exception("No scenario found with this criteria " + where_text, httperrors.Bad_Request) + elif self.cur.rowcount>1: + raise db_base.db_base_Exception("More than one scenario found with this criteria " + where_text, httperrors.Bad_Request) + scenario_dict = rows[0] + if scenario_dict["cloud_config"]: + scenario_dict["cloud-config"] = yaml.load(scenario_dict["cloud_config"]) + del scenario_dict["cloud_config"] + # sce_vnfs + cmd = "SELECT uuid,name,member_vnf_index,vnf_id,description FROM sce_vnfs WHERE scenario_id='{}' "\ + "ORDER BY created_at".format(scenario_dict['uuid']) + 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"\ + " WHERE scei.sce_vnf_id='{}' ORDER BY scei.created_at".format(vnf['uuid']) + self.logger.debug(cmd) + self.cur.execute(cmd) + vnf['interfaces'] = self.cur.fetchall() + # vms + cmd = "SELECT vms.uuid as uuid, flavor_id, image_id, image_list, vms.name as name," \ + " vms.description as description, vms.boot_data as boot_data, count," \ + " vms.availability_zone as availability_zone, vms.osm_id as osm_id, vms.pdu_type" \ + " 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() + for vm in vnf['vms']: + if vm["boot_data"]: + vm["boot_data"] = yaml.safe_load(vm["boot_data"]) + else: + del vm["boot_data"] + if vm["image_list"]: + vm["image_list"] = yaml.safe_load(vm["image_list"]) + else: + del vm["image_list"] + if datacenter_vim_id!=None: + if vm['image_id']: + cmd = "SELECT vim_id FROM datacenters_images WHERE image_id='{}' AND " \ + "datacenter_vim_id='{}'".format(vm['image_id'], datacenter_vim_id) self.logger.debug(cmd) self.cur.execute(cmd) - vnf['vms'] = self.cur.fetchall() - for vm in vnf['vms']: - if vm["boot_data"]: - vm["boot_data"] = yaml.safe_load(vm["boot_data"]) - else: - del vm["boot_data"] - if datacenter_vim_id!=None: - cmd = "SELECT vim_id FROM datacenters_images WHERE image_id='{}' AND datacenter_vim_id='{}'".format(vm['image_id'],datacenter_vim_id) - self.logger.debug(cmd) - self.cur.execute(cmd) - if self.cur.rowcount==1: - vim_image_dict = self.cur.fetchone() - vm['vim_image_id']=vim_image_dict['vim_id'] - cmd = "SELECT vim_id FROM datacenters_flavors WHERE flavor_id='{}' AND datacenter_vim_id='{}'".format(vm['flavor_id'],datacenter_vim_id) - self.logger.debug(cmd) - self.cur.execute(cmd) - if self.cur.rowcount==1: - vim_flavor_dict = self.cur.fetchone() - vm['vim_flavor_id']=vim_flavor_dict['vim_id'] - - #interfaces - cmd = "SELECT uuid,internal_name,external_name,net_id,type,vpci,mac,bw,model,ip_address," \ - "floating_ip, port_security" \ - " FROM interfaces" \ - " WHERE vm_id='{}'" \ - " ORDER BY created_at".format(vm['uuid']) - self.logger.debug(cmd) - self.cur.execute(cmd) - vm['interfaces'] = self.cur.fetchall() - for index in range(0,len(vm['interfaces'])): - vm['interfaces'][index]['port-security'] = vm['interfaces'][index].pop("port_security") - vm['interfaces'][index]['floating-ip'] = vm['interfaces'][index].pop("floating_ip") - #nets every net of a vms - cmd = "SELECT uuid,name,type,description FROM nets WHERE vnf_id='{}'".format(vnf['vnf_id']) + if self.cur.rowcount==1: + vim_image_dict = self.cur.fetchone() + vm['vim_image_id']=vim_image_dict['vim_id'] + if vm['flavor_id']: + cmd = "SELECT vim_id FROM datacenters_flavors WHERE flavor_id='{}' AND " \ + "datacenter_vim_id='{}'".format(vm['flavor_id'], datacenter_vim_id) self.logger.debug(cmd) self.cur.execute(cmd) - vnf['nets'] = self.cur.fetchall() - for vnf_net in vnf['nets']: - SELECT_ = "ip_version,subnet_address,gateway_address,dns_address,dhcp_enabled,dhcp_start_address,dhcp_count" - cmd = "SELECT {} FROM ip_profiles WHERE net_id='{}'".format(SELECT_,vnf_net['uuid']) - self.logger.debug(cmd) - self.cur.execute(cmd) - ipprofiles = self.cur.fetchall() - if self.cur.rowcount==1: - vnf_net["ip_profile"] = ipprofiles[0] - elif self.cur.rowcount>1: - raise db_base.db_base_Exception("More than one ip-profile found with this criteria: net_id='{}'".format(vnf_net['uuid']), db_base.HTTP_Bad_Request) - - #sce_nets - cmd = "SELECT uuid,name,type,external,description" \ - " FROM sce_nets WHERE scenario_id='{}'" \ - " ORDER BY created_at ".format(scenario_dict['uuid']) - self.logger.debug(cmd) - self.cur.execute(cmd) - scenario_dict['nets'] = self.cur.fetchall() - #datacenter_nets - for net in scenario_dict['nets']: - if str(net['external']) == 'false': - SELECT_ = "ip_version,subnet_address,gateway_address,dns_address,dhcp_enabled,dhcp_start_address,dhcp_count" - cmd = "SELECT {} FROM ip_profiles WHERE sce_net_id='{}'".format(SELECT_,net['uuid']) - self.logger.debug(cmd) - self.cur.execute(cmd) - ipprofiles = self.cur.fetchall() - if self.cur.rowcount==1: - net["ip_profile"] = ipprofiles[0] - elif self.cur.rowcount>1: - raise db_base.db_base_Exception("More than one ip-profile found with this criteria: sce_net_id='{}'".format(net['uuid']), db_base.HTTP_Bad_Request) - continue - WHERE_=" WHERE name='{}'".format(net['name']) - if datacenter_id!=None: - WHERE_ += " AND datacenter_id='{}'".format(datacenter_id) - cmd = "SELECT vim_net_id FROM datacenter_nets" + WHERE_ - self.logger.debug(cmd) - self.cur.execute(cmd) - d_net = self.cur.fetchone() - if d_net==None or datacenter_vim_id==None: - #print "nfvo_db.get_scenario() WARNING external net %s not found" % net['name'] - net['vim_id']=None - else: - net['vim_id']=d_net['vim_net_id'] - - db_base._convert_datetime2str(scenario_dict) - db_base._convert_str2boolean(scenario_dict, ('public','shared','external','port-security','floating-ip') ) - return scenario_dict - except (mdb.Error, AttributeError) as e: - self._format_error(e, tries) - tries -= 1 + if self.cur.rowcount==1: + vim_flavor_dict = self.cur.fetchone() + vm['vim_flavor_id']=vim_flavor_dict['vim_id'] + + #interfaces + cmd = "SELECT uuid,internal_name,external_name,net_id,type,vpci,mac,bw,model,ip_address," \ + "floating_ip, port_security" \ + " FROM interfaces" \ + " WHERE vm_id='{}'" \ + " ORDER BY created_at".format(vm['uuid']) + self.logger.debug(cmd) + self.cur.execute(cmd) + vm['interfaces'] = self.cur.fetchall() + for iface in vm['interfaces']: + iface['port-security'] = iface.pop("port_security") + iface['floating-ip'] = iface.pop("floating_ip") + for sce_interface in vnf["interfaces"]: + if sce_interface["interface_id"] == iface["uuid"]: + if sce_interface["ip_address"]: + iface["ip_address"] = sce_interface["ip_address"] + break + #nets every net of a vms + cmd = "SELECT uuid,name,type,description, osm_id FROM nets WHERE vnf_id='{}'".format(vnf['vnf_id']) + self.logger.debug(cmd) + self.cur.execute(cmd) + vnf['nets'] = self.cur.fetchall() + for vnf_net in vnf['nets']: + SELECT_ = "ip_version,subnet_address,gateway_address,dns_address,dhcp_enabled,dhcp_start_address,dhcp_count" + cmd = "SELECT {} FROM ip_profiles WHERE net_id='{}'".format(SELECT_,vnf_net['uuid']) + self.logger.debug(cmd) + self.cur.execute(cmd) + ipprofiles = self.cur.fetchall() + if self.cur.rowcount==1: + vnf_net["ip_profile"] = ipprofiles[0] + elif self.cur.rowcount>1: + raise db_base.db_base_Exception("More than one ip-profile found with this criteria: net_id='{}'".format(vnf_net['uuid']), httperrors.Bad_Request) + + #sce_nets + cmd = "SELECT uuid,name,type,external,description,vim_network_name, osm_id" \ + " FROM sce_nets WHERE scenario_id='{}'" \ + " ORDER BY created_at ".format(scenario_dict['uuid']) + self.logger.debug(cmd) + self.cur.execute(cmd) + scenario_dict['nets'] = self.cur.fetchall() + #datacenter_nets + for net in scenario_dict['nets']: + if str(net['external']) == 'false': + SELECT_ = "ip_version,subnet_address,gateway_address,dns_address,dhcp_enabled,dhcp_start_address,dhcp_count" + cmd = "SELECT {} FROM ip_profiles WHERE sce_net_id='{}'".format(SELECT_,net['uuid']) + self.logger.debug(cmd) + self.cur.execute(cmd) + ipprofiles = self.cur.fetchall() + if self.cur.rowcount==1: + net["ip_profile"] = ipprofiles[0] + elif self.cur.rowcount>1: + raise db_base.db_base_Exception("More than one ip-profile found with this criteria: sce_net_id='{}'".format(net['uuid']), httperrors.Bad_Request) + continue + WHERE_=" WHERE name='{}'".format(net['name']) + if datacenter_id!=None: + WHERE_ += " AND datacenter_id='{}'".format(datacenter_id) + cmd = "SELECT vim_net_id FROM datacenter_nets" + WHERE_ + self.logger.debug(cmd) + self.cur.execute(cmd) + d_net = self.cur.fetchone() + if d_net==None or datacenter_vim_id==None: + #print "nfvo_db.get_scenario() WARNING external net %s not found" % net['name'] + net['vim_id']=None + else: + net['vim_id']=d_net['vim_net_id'] + + db_base._convert_datetime2str(scenario_dict) + db_base._convert_str2boolean(scenario_dict, ('public','shared','external','port-security','floating-ip') ) + + #forwarding graphs + cmd = "SELECT uuid,name,description,vendor FROM sce_vnffgs WHERE scenario_id='{}' "\ + "ORDER BY created_at".format(scenario_dict['uuid']) + self.logger.debug(cmd) + self.cur.execute(cmd) + scenario_dict['vnffgs'] = self.cur.fetchall() + for vnffg in scenario_dict['vnffgs']: + cmd = "SELECT uuid,name FROM sce_rsps WHERE sce_vnffg_id='{}' "\ + "ORDER BY created_at".format(vnffg['uuid']) + self.logger.debug(cmd) + self.cur.execute(cmd) + vnffg['rsps'] = self.cur.fetchall() + for rsp in vnffg['rsps']: + cmd = "SELECT uuid,if_order,ingress_interface_id,egress_interface_id,sce_vnf_id " \ + "FROM sce_rsp_hops WHERE sce_rsp_id='{}' "\ + "ORDER BY created_at".format(rsp['uuid']) + self.logger.debug(cmd) + self.cur.execute(cmd) + rsp['connection_points'] = self.cur.fetchall(); + cmd = "SELECT uuid,name,sce_vnf_id,interface_id FROM sce_classifiers WHERE sce_vnffg_id='{}' "\ + "AND sce_rsp_id='{}' ORDER BY created_at".format(vnffg['uuid'], rsp['uuid']) + self.logger.debug(cmd) + self.cur.execute(cmd) + rsp['classifier'] = self.cur.fetchone(); + cmd = "SELECT uuid,ip_proto,source_ip,destination_ip,source_port,destination_port FROM sce_classifier_matches "\ + "WHERE sce_classifier_id='{}' ORDER BY created_at".format(rsp['classifier']['uuid']) + self.logger.debug(cmd) + self.cur.execute(cmd) + rsp['classifier']['matches'] = self.cur.fetchall() + return scenario_dict + + @retry(command="delete", extra="instances running") + @with_transaction(cursor='dict') def delete_scenario(self, scenario_id, tenant_id=None): '''Deletes a scenario, filtering by one or several of the tenant, uuid or name scenario_id is the uuid or the name if it is not a valid uuid format Only one scenario must mutch the filtering or an error is returned - ''' - tries = 2 - while tries: - try: - with self.con: - self.cur = self.con.cursor(mdb.cursors.DictCursor) - - #scenario table - where_text = "uuid='{}'".format(scenario_id) - if not tenant_id and tenant_id != "any": - where_text += " AND (tenant_id='{}' OR public='True')".format(tenant_id) - cmd = "SELECT * FROM scenarios WHERE "+ where_text - self.logger.debug(cmd) - self.cur.execute(cmd) - rows = self.cur.fetchall() - if self.cur.rowcount==0: - raise db_base.db_base_Exception("No scenario found where " + where_text, db_base.HTTP_Bad_Request) - elif self.cur.rowcount>1: - raise db_base.db_base_Exception("More than one scenario found where " + where_text, db_base.HTTP_Bad_Request) - scenario_uuid = rows[0]["uuid"] - scenario_name = rows[0]["name"] - - #sce_vnfs - 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") - tries -= 1 - - def new_rows(self, tables, uuid_list=None): + ''' + #scenario table + where_text = "uuid='{}'".format(scenario_id) + if not tenant_id and tenant_id != "any": + where_text += " AND (tenant_id='{}' OR public='True')".format(tenant_id) + cmd = "SELECT * FROM scenarios WHERE "+ where_text + self.logger.debug(cmd) + self.cur.execute(cmd) + rows = self.cur.fetchall() + if self.cur.rowcount==0: + raise db_base.db_base_Exception("No scenario found where " + where_text, httperrors.Not_Found) + elif self.cur.rowcount>1: + raise db_base.db_base_Exception("More than one scenario found where " + where_text, httperrors.Conflict) + scenario_uuid = rows[0]["uuid"] + scenario_name = rows[0]["name"] + + #sce_vnfs + cmd = "DELETE FROM scenarios WHERE uuid='{}'".format(scenario_uuid) + self.logger.debug(cmd) + self.cur.execute(cmd) + + return scenario_uuid + " " + scenario_name + + @retry + @with_transaction + def new_rows(self, tables, uuid_list=None, confidential_data=False, attempt=_ATTEMPT): """ - Make a transactional insertion of rows at several tables + Make a transactional insertion of rows at several tables. Can be also a deletion :param tables: list with dictionary where the keys are the table names and the values are a row or row list with the values to be inserted at the table. Each row is a dictionary with the key values. E.g.: tables = [ @@ -749,289 +768,328 @@ class nfvo_db(db_base.db_base): If tables does not contain the 'created_at', it is generated incrementally with the order of tables. You can provide a integer value, that it is an index multiply by 0.00001 to add to the created time to manually set up and order + If dict contains {"TO-DELETE": uuid} the entry is deleted if exist instead of inserted :param uuid_list: list of created uuids, first one is the root (#TODO to store at uuid table) :return: None if success, raise exception otherwise """ - tries = 2 - while tries: - created_time = time.time() - try: - with self.con: - self.cur = self.con.cursor() - for table in tables: - for table_name, row_list in table.items(): - index = 0 - if isinstance(row_list, dict): - row_list = (row_list, ) #create a list with the single value - for row in row_list: - if table_name in self.tables_with_created_field: - if "created_at" in row: - created_time_param = created_time + row.pop("created_at")*0.00001 - else: - created_time_param = created_time + index*0.00001 - index += 1 - else: - created_time_param = 0 - self._new_row_internal(table_name, row, add_uuid=False, root_uuid=None, - created_time=created_time_param) - return - except (mdb.Error, AttributeError) as e: - self._format_error(e, tries) - tries -= 1 + table_name = None + created_time = time.time() + for table in tables: + for table_name, row_list in table.items(): + index = 0 + attempt.info['table'] = table_name + if isinstance(row_list, dict): + row_list = (row_list, ) #create a list with the single value + for row in row_list: + if "TO-DELETE" in row: + self._delete_row_by_id_internal(table_name, row["TO-DELETE"]) + continue + if table_name in self.tables_with_created_field: + if "created_at" in row: + created_time_param = created_time + (index + row.pop("created_at"))*0.00001 + else: + created_time_param = created_time + index*0.00001 + index += 1 + else: + created_time_param = 0 + self._new_row_internal(table_name, row, add_uuid=False, root_uuid=None, + confidential_data=confidential_data, + created_time=created_time_param) + @retry + @with_transaction def new_instance_scenario_as_a_whole(self,tenant_id,instance_scenario_name,instance_scenario_description,scenarioDict): - tries = 2 - while tries: - created_time = time.time() - try: - with self.con: - self.cur = self.con.cursor() - #instance_scenarios - datacenter_id = scenarioDict['datacenter_id'] - INSERT_={'tenant_id': tenant_id, - 'datacenter_tenant_id': scenarioDict["datacenter2tenant"][datacenter_id], - 'name': instance_scenario_name, - 'description': instance_scenario_description, - 'scenario_id' : scenarioDict['uuid'], - 'datacenter_id': datacenter_id - } - if scenarioDict.get("cloud-config"): - INSERT_["cloud_config"] = yaml.safe_dump(scenarioDict["cloud-config"], default_flow_style=True, width=256) - - instance_uuid = self._new_row_internal('instance_scenarios', INSERT_, add_uuid=True, root_uuid=None, created_time=created_time) - - net_scene2instance={} - #instance_nets #nets interVNF - for net in scenarioDict['nets']: - net_scene2instance[ net['uuid'] ] ={} - datacenter_site_id = net.get('datacenter_id', datacenter_id) - if not "vim_id_sites" in net: - net["vim_id_sites"] ={datacenter_site_id: net['vim_id']} - net["vim_id_sites"]["datacenter_site_id"] = {datacenter_site_id: net['vim_id']} - sce_net_id = net.get("uuid") - - for datacenter_site_id,vim_id in net["vim_id_sites"].iteritems(): - INSERT_={'vim_net_id': vim_id, 'created': net.get('created', False), 'instance_scenario_id':instance_uuid } #, 'type': net['type'] - INSERT_['datacenter_id'] = datacenter_site_id - INSERT_['datacenter_tenant_id'] = scenarioDict["datacenter2tenant"][datacenter_site_id] - if not net.get('created', False): - INSERT_['status'] = "ACTIVE" - if sce_net_id: - INSERT_['sce_net_id'] = sce_net_id - created_time += 0.00001 - instance_net_uuid = self._new_row_internal('instance_nets', INSERT_, True, instance_uuid, created_time) - net_scene2instance[ sce_net_id ][datacenter_site_id] = instance_net_uuid - net['uuid'] = instance_net_uuid #overwrite scnario uuid by instance uuid - - if 'ip_profile' in net: - net['ip_profile']['net_id'] = None - net['ip_profile']['sce_net_id'] = None - net['ip_profile']['instance_net_id'] = instance_net_uuid - created_time += 0.00001 - ip_profile_id = self._new_row_internal('ip_profiles', net['ip_profile']) - - #instance_vnfs - for vnf in scenarioDict['vnfs']: - datacenter_site_id = vnf.get('datacenter_id', datacenter_id) - INSERT_={'instance_scenario_id': instance_uuid, 'vnf_id': vnf['vnf_id'] } - INSERT_['datacenter_id'] = datacenter_site_id - INSERT_['datacenter_tenant_id'] = scenarioDict["datacenter2tenant"][datacenter_site_id] - if vnf.get("uuid"): - INSERT_['sce_vnf_id'] = vnf['uuid'] - created_time += 0.00001 - instance_vnf_uuid = self._new_row_internal('instance_vnfs', INSERT_, True, instance_uuid, created_time) - vnf['uuid'] = instance_vnf_uuid #overwrite scnario uuid by instance uuid - - #instance_nets #nets intraVNF - for net in vnf['nets']: - net_scene2instance[ net['uuid'] ] = {} - INSERT_={'vim_net_id': net['vim_id'], 'created': net.get('created', False), 'instance_scenario_id':instance_uuid } #, 'type': net['type'] - INSERT_['datacenter_id'] = net.get('datacenter_id', datacenter_site_id) - INSERT_['datacenter_tenant_id'] = scenarioDict["datacenter2tenant"][datacenter_id] - if net.get("uuid"): - INSERT_['net_id'] = net['uuid'] - created_time += 0.00001 - instance_net_uuid = self._new_row_internal('instance_nets', INSERT_, True, instance_uuid, created_time) - net_scene2instance[ net['uuid'] ][datacenter_site_id] = instance_net_uuid - net['uuid'] = instance_net_uuid #overwrite scnario uuid by instance uuid - - if 'ip_profile' in net: - net['ip_profile']['net_id'] = None - net['ip_profile']['sce_net_id'] = None - net['ip_profile']['instance_net_id'] = instance_net_uuid - created_time += 0.00001 - ip_profile_id = self._new_row_internal('ip_profiles', net['ip_profile']) - - #instance_vms - for vm in vnf['vms']: - INSERT_={'instance_vnf_id': instance_vnf_uuid, 'vm_id': vm['uuid'], 'vim_vm_id': vm['vim_id'] } - created_time += 0.00001 - instance_vm_uuid = self._new_row_internal('instance_vms', INSERT_, True, instance_uuid, created_time) - vm['uuid'] = instance_vm_uuid #overwrite scnario uuid by instance uuid - - #instance_interfaces - for interface in vm['interfaces']: - net_id = interface.get('net_id', None) - if net_id is None: - #check if is connected to a inter VNFs net - for iface in vnf['interfaces']: - if iface['interface_id'] == interface['uuid']: - if 'ip_address' in iface: - interface['ip_address'] = iface['ip_address'] - net_id = iface.get('sce_net_id', None) - break - if net_id is None: - continue - interface_type='external' if interface['external_name'] is not None else 'internal' - INSERT_={'instance_vm_id': instance_vm_uuid, 'instance_net_id': net_scene2instance[net_id][datacenter_site_id], - 'interface_id': interface['uuid'], 'vim_interface_id': interface.get('vim_id'), 'type': interface_type, - 'ip_address': interface.get('ip_address'), 'floating_ip': int(interface.get('floating-ip',False)), - 'port_security': int(interface.get('port-security',True))} - #created_time += 0.00001 - interface_uuid = self._new_row_internal('instance_interfaces', INSERT_, True, instance_uuid) #, created_time) - interface['uuid'] = interface_uuid #overwrite scnario uuid by instance uuid - return instance_uuid - except (mdb.Error, AttributeError) as e: - self._format_error(e, tries) - tries -= 1 + created_time = time.time() + #instance_scenarios + datacenter_id = scenarioDict['datacenter_id'] + INSERT_={'tenant_id': tenant_id, + 'datacenter_tenant_id': scenarioDict["datacenter2tenant"][datacenter_id], + 'name': instance_scenario_name, + 'description': instance_scenario_description, + 'scenario_id' : scenarioDict['uuid'], + 'datacenter_id': datacenter_id + } + if scenarioDict.get("cloud-config"): + INSERT_["cloud_config"] = yaml.safe_dump(scenarioDict["cloud-config"], default_flow_style=True, width=256) + + instance_uuid = self._new_row_internal('instance_scenarios', INSERT_, add_uuid=True, root_uuid=None, created_time=created_time) + + net_scene2instance={} + #instance_nets #nets interVNF + for net in scenarioDict['nets']: + net_scene2instance[ net['uuid'] ] ={} + datacenter_site_id = net.get('datacenter_id', datacenter_id) + if not "vim_id_sites" in net: + net["vim_id_sites"] ={datacenter_site_id: net['vim_id']} + net["vim_id_sites"]["datacenter_site_id"] = {datacenter_site_id: net['vim_id']} + sce_net_id = net.get("uuid") + + for datacenter_site_id,vim_id in net["vim_id_sites"].iteritems(): + INSERT_={'vim_net_id': vim_id, 'created': net.get('created', False), 'instance_scenario_id':instance_uuid } #, 'type': net['type'] + INSERT_['datacenter_id'] = datacenter_site_id + INSERT_['datacenter_tenant_id'] = scenarioDict["datacenter2tenant"][datacenter_site_id] + if not net.get('created', False): + INSERT_['status'] = "ACTIVE" + if sce_net_id: + INSERT_['sce_net_id'] = sce_net_id + created_time += 0.00001 + instance_net_uuid = self._new_row_internal('instance_nets', INSERT_, True, instance_uuid, created_time) + net_scene2instance[ sce_net_id ][datacenter_site_id] = instance_net_uuid + net['uuid'] = instance_net_uuid #overwrite scnario uuid by instance uuid + + if 'ip_profile' in net: + net['ip_profile']['net_id'] = None + net['ip_profile']['sce_net_id'] = None + net['ip_profile']['instance_net_id'] = instance_net_uuid + created_time += 0.00001 + ip_profile_id = self._new_row_internal('ip_profiles', net['ip_profile']) + + #instance_vnfs + for vnf in scenarioDict['vnfs']: + datacenter_site_id = vnf.get('datacenter_id', datacenter_id) + INSERT_={'instance_scenario_id': instance_uuid, 'vnf_id': vnf['vnf_id'] } + INSERT_['datacenter_id'] = datacenter_site_id + INSERT_['datacenter_tenant_id'] = scenarioDict["datacenter2tenant"][datacenter_site_id] + if vnf.get("uuid"): + INSERT_['sce_vnf_id'] = vnf['uuid'] + created_time += 0.00001 + instance_vnf_uuid = self._new_row_internal('instance_vnfs', INSERT_, True, instance_uuid, created_time) + vnf['uuid'] = instance_vnf_uuid #overwrite scnario uuid by instance uuid + #instance_nets #nets intraVNF + for net in vnf['nets']: + net_scene2instance[ net['uuid'] ] = {} + INSERT_={'vim_net_id': net['vim_id'], 'created': net.get('created', False), 'instance_scenario_id':instance_uuid } #, 'type': net['type'] + INSERT_['datacenter_id'] = net.get('datacenter_id', datacenter_site_id) + INSERT_['datacenter_tenant_id'] = scenarioDict["datacenter2tenant"][datacenter_id] + if net.get("uuid"): + INSERT_['net_id'] = net['uuid'] + created_time += 0.00001 + instance_net_uuid = self._new_row_internal('instance_nets', INSERT_, True, instance_uuid, created_time) + net_scene2instance[ net['uuid'] ][datacenter_site_id] = instance_net_uuid + net['uuid'] = instance_net_uuid #overwrite scnario uuid by instance uuid + + if 'ip_profile' in net: + net['ip_profile']['net_id'] = None + net['ip_profile']['sce_net_id'] = None + net['ip_profile']['instance_net_id'] = instance_net_uuid + created_time += 0.00001 + ip_profile_id = self._new_row_internal('ip_profiles', net['ip_profile']) + + #instance_vms + for vm in vnf['vms']: + INSERT_={'instance_vnf_id': instance_vnf_uuid, 'vm_id': vm['uuid'], 'vim_vm_id': vm['vim_id'] } + created_time += 0.00001 + instance_vm_uuid = self._new_row_internal('instance_vms', INSERT_, True, instance_uuid, created_time) + vm['uuid'] = instance_vm_uuid #overwrite scnario uuid by instance uuid + + #instance_interfaces + for interface in vm['interfaces']: + net_id = interface.get('net_id', None) + if net_id is None: + #check if is connected to a inter VNFs net + for iface in vnf['interfaces']: + if iface['interface_id'] == interface['uuid']: + if 'ip_address' in iface: + interface['ip_address'] = iface['ip_address'] + net_id = iface.get('sce_net_id', None) + break + if net_id is None: + continue + interface_type='external' if interface['external_name'] is not None else 'internal' + INSERT_={'instance_vm_id': instance_vm_uuid, 'instance_net_id': net_scene2instance[net_id][datacenter_site_id], + 'interface_id': interface['uuid'], 'vim_interface_id': interface.get('vim_id'), 'type': interface_type, + 'ip_address': interface.get('ip_address'), 'floating_ip': int(interface.get('floating-ip',False)), + 'port_security': int(interface.get('port-security',True))} + #created_time += 0.00001 + interface_uuid = self._new_row_internal('instance_interfaces', INSERT_, True, instance_uuid) #, created_time) + interface['uuid'] = interface_uuid #overwrite scnario uuid by instance uuid + return instance_uuid + + @retry + @with_transaction(cursor='dict') def get_instance_scenario(self, instance_id, tenant_id=None, verbose=False): '''Obtain the instance information, filtering by one or several of the tenant, uuid or name instance_id is the uuid or the name if it is not a valid uuid format Only one instance must mutch the filtering or an error is returned - ''' - tries = 2 - while tries: - try: - with self.con: - self.cur = self.con.cursor(mdb.cursors.DictCursor) - # instance table - 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='{}'".format(instance_id)) - else: - 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 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: - 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) - 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, iv.vnf_id as vnf_id, sv.name as vnf_name, sce_vnf_id, datacenter_id"\ - " ,datacenter_tenant_id, v.mgmt_access "\ - " 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) - self.cur.execute(cmd) - instance_dict['vnfs'] = self.cur.fetchall() - 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"\ - " 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) - self.cur.execute(cmd) - vnf['vms'] = self.cur.fetchall() - for vm in vnf['vms']: - vm_manage_iface_list=[] - # 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"\ - " WHERE instance_vm_id='{}' ORDER BY created_at".format(vm['uuid']) - self.logger.debug(cmd) - self.cur.execute(cmd ) - vm['interfaces'] = self.cur.fetchall() - for iface in vm['interfaces']: - if iface["type"] == "mgmt" and iface["ip_address"]: - vnf_manage_iface_list.append(iface["ip_address"]) - vm_manage_iface_list.append(iface["ip_address"]) - if not verbose: - del iface["type"] - if vm_manage_iface_list: vm["ip_address"] = ",".join(vm_manage_iface_list) - if vnf_manage_iface_list: vnf["ip_address"] = ",".join(vnf_manage_iface_list) - - #instance_nets - #select_text = "instance_nets.uuid as uuid,sce_nets.name as net_name,instance_nets.vim_net_id as net_id,instance_nets.status as status,instance_nets.external as external" - #from_text = "instance_nets join instance_scenarios on instance_nets.instance_scenario_id=instance_scenarios.uuid " + \ - # "join sce_nets on instance_scenarios.scenario_id=sce_nets.scenario_id" - #where_text = "instance_nets.instance_scenario_id='"+ instance_dict['uuid'] + "'" - cmd = "SELECT uuid,vim_net_id,status,error_msg,vim_info,created, sce_net_id, net_id as vnf_net_id, datacenter_id, datacenter_tenant_id, sdn_net_id"\ - " FROM instance_nets" \ - " WHERE instance_scenario_id='{}' ORDER BY created_at".format(instance_dict['uuid']) - self.logger.debug(cmd) - self.cur.execute(cmd) - instance_dict['nets'] = self.cur.fetchall() - - db_base._convert_datetime2str(instance_dict) - db_base._convert_str2boolean(instance_dict, ('public','shared','created') ) - return instance_dict - except (mdb.Error, AttributeError) as e: - self._format_error(e, tries) - tries -= 1 - + ''' + # instance table + 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='{}'".format(instance_id)) + else: + 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, s.osm_id as nsd_osm_id" \ + " 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: + raise db_base.db_base_Exception("No instance found where " + where_text, httperrors.Not_Found) + elif self.cur.rowcount > 1: + raise db_base.db_base_Exception("More than one instance found where " + where_text, + httperrors.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, 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, v.osm_id as vnfd_osm_id "\ + "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) + self.cur.execute(cmd) + instance_dict['vnfs'] = self.cur.fetchall() + for vnf in instance_dict['vnfs']: + vnf["ip_address"] = None + vnf_mgmt_access_iface = None + vnf_mgmt_access_vm = None + if vnf["mgmt_access"]: + vnf_mgmt_access = yaml.load(vnf["mgmt_access"]) + vnf_mgmt_access_iface = vnf_mgmt_access.get("interface_id") + vnf_mgmt_access_vm = vnf_mgmt_access.get("vm_id") + vnf["ip_address"] = vnf_mgmt_access.get("ip-address") + + # instance vms + cmd = "SELECT iv.uuid as uuid, vim_vm_id, status, error_msg, vim_info, iv.created_at as "\ + "created_at, name, vms.osm_id as vdu_osm_id, vim_name, vms.uuid as vm_uuid, related"\ + " 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) + self.cur.execute(cmd) + vnf['vms'] = self.cur.fetchall() + for vm in vnf['vms']: + vm_manage_iface_list=[] + # 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, i.uuid"\ + " FROM instance_interfaces as ii join interfaces as i on ii.interface_id=i.uuid"\ + " WHERE instance_vm_id='{}' ORDER BY created_at".format(vm['uuid']) + self.logger.debug(cmd) + self.cur.execute(cmd ) + vm['interfaces'] = self.cur.fetchall() + for iface in vm['interfaces']: + if vnf_mgmt_access_iface and vnf_mgmt_access_iface == iface["uuid"]: + if not vnf["ip_address"]: + vnf["ip_address"] = iface["ip_address"] + if iface["type"] == "mgmt" and iface["ip_address"]: + vm_manage_iface_list.append(iface["ip_address"]) + if not verbose: + del iface["type"] + del iface["uuid"] + if vm_manage_iface_list: + vm["ip_address"] = ",".join(vm_manage_iface_list) + if not vnf["ip_address"] and vnf_mgmt_access_vm == vm["vm_uuid"]: + vnf["ip_address"] = vm["ip_address"] + del vm["vm_uuid"] + + #instance_nets + #select_text = "instance_nets.uuid as uuid,sce_nets.name as net_name,instance_nets.vim_net_id as net_id,instance_nets.status as status,instance_nets.external as external" + #from_text = "instance_nets join instance_scenarios on instance_nets.instance_scenario_id=instance_scenarios.uuid " + \ + # "join sce_nets on instance_scenarios.scenario_id=sce_nets.scenario_id" + #where_text = "instance_nets.instance_scenario_id='"+ instance_dict['uuid'] + "'" + cmd = "SELECT inets.uuid as uuid,vim_net_id,status,error_msg,vim_info,created, sce_net_id, " \ + "net_id as vnf_net_id, datacenter_id, datacenter_tenant_id, sdn_net_id, " \ + "snets.osm_id as ns_net_osm_id, nets.osm_id as vnf_net_osm_id, inets.vim_name, related " \ + "FROM instance_nets as inets left join sce_nets as snets on inets.sce_net_id=snets.uuid " \ + "left join nets on inets.net_id=nets.uuid " \ + "WHERE instance_scenario_id='{}' ORDER BY inets.created_at".format(instance_dict['uuid']) + self.logger.debug(cmd) + self.cur.execute(cmd) + instance_dict['nets'] = self.cur.fetchall() + + #instance_sfps + cmd = "SELECT uuid,vim_sfp_id,sce_rsp_id,datacenter_id,"\ + "datacenter_tenant_id,status,error_msg,vim_info, related"\ + " FROM instance_sfps" \ + " WHERE instance_scenario_id='{}' ORDER BY created_at".format(instance_dict['uuid']) + self.logger.debug(cmd) + self.cur.execute(cmd) + instance_dict['sfps'] = self.cur.fetchall() + + # for sfp in instance_dict['sfps']: + #instance_sfs + cmd = "SELECT uuid,vim_sf_id,sce_rsp_hop_id,datacenter_id,"\ + "datacenter_tenant_id,status,error_msg,vim_info, related"\ + " FROM instance_sfs" \ + " WHERE instance_scenario_id='{}' ORDER BY created_at".format(instance_dict['uuid']) # TODO: replace instance_scenario_id with instance_sfp_id + self.logger.debug(cmd) + self.cur.execute(cmd) + instance_dict['sfs'] = self.cur.fetchall() + + #for sf in instance_dict['sfs']: + #instance_sfis + cmd = "SELECT uuid,vim_sfi_id,sce_rsp_hop_id,datacenter_id,"\ + "datacenter_tenant_id,status,error_msg,vim_info, related"\ + " FROM instance_sfis" \ + " WHERE instance_scenario_id='{}' ORDER BY created_at".format(instance_dict['uuid']) # TODO: replace instance_scenario_id with instance_sf_id + self.logger.debug(cmd) + self.cur.execute(cmd) + instance_dict['sfis'] = self.cur.fetchall() +# for sfi in instance_dict['sfi']: + + #instance_classifications + cmd = "SELECT uuid,vim_classification_id,sce_classifier_match_id,datacenter_id,"\ + "datacenter_tenant_id,status,error_msg,vim_info, related"\ + " FROM instance_classifications" \ + " WHERE instance_scenario_id='{}' ORDER BY created_at".format(instance_dict['uuid']) + self.logger.debug(cmd) + self.cur.execute(cmd) + instance_dict['classifications'] = self.cur.fetchall() +# for classification in instance_dict['classifications'] + + db_base._convert_datetime2str(instance_dict) + db_base._convert_str2boolean(instance_dict, ('public','shared','created') ) + return instance_dict + + @retry(command='delete', extra='No dependences can avoid deleting!!!!') + @with_transaction(cursor='dict') def delete_instance_scenario(self, instance_id, tenant_id=None): - '''Deletes a instance_Scenario, filtering by one or serveral of the tenant, uuid or name + '''Deletes a instance_Scenario, filtering by one or several of the tenant, uuid or name instance_id is the uuid or the name if it is not a valid uuid format Only one instance_scenario must mutch the filtering or an error is returned - ''' - tries = 2 - while tries: - try: - with self.con: - self.cur = self.con.cursor(mdb.cursors.DictCursor) - - #instance table - where_list=[] - if tenant_id is not None: where_list.append( "tenant_id='" + tenant_id +"'" ) - if db_base._check_valid_uuid(instance_id): - where_list.append( "uuid='" + instance_id +"'" ) - else: - where_list.append( "name='" + instance_id +"'" ) - where_text = " AND ".join(where_list) - cmd = "SELECT * FROM instance_scenarios WHERE "+ where_text - self.logger.debug(cmd) - self.cur.execute(cmd) - rows = self.cur.fetchall() - - if self.cur.rowcount==0: - raise db_base.db_base_Exception("No 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_uuid = rows[0]["uuid"] - instance_name = rows[0]["name"] - - #sce_vnfs - cmd = "DELETE FROM instance_scenarios WHERE uuid='{}'".format(instance_uuid) - self.logger.debug(cmd) - self.cur.execute(cmd) - - return instance_uuid + " " + instance_name - except (mdb.Error, AttributeError) as e: - self._format_error(e, tries, "delete", "No dependences can avoid deleting!!!!") - tries -= 1 - + ''' + #instance table + where_list=[] + if tenant_id is not None: where_list.append( "tenant_id='" + tenant_id +"'" ) + if db_base._check_valid_uuid(instance_id): + where_list.append( "uuid='" + instance_id +"'" ) + else: + where_list.append( "name='" + instance_id +"'" ) + where_text = " AND ".join(where_list) + cmd = "SELECT * FROM instance_scenarios WHERE "+ where_text + self.logger.debug(cmd) + self.cur.execute(cmd) + rows = self.cur.fetchall() + + if self.cur.rowcount==0: + raise db_base.db_base_Exception("No instance found where " + where_text, httperrors.Bad_Request) + elif self.cur.rowcount>1: + raise db_base.db_base_Exception("More than one instance found where " + where_text, httperrors.Bad_Request) + instance_uuid = rows[0]["uuid"] + instance_name = rows[0]["name"] + + #sce_vnfs + cmd = "DELETE FROM instance_scenarios WHERE uuid='{}'".format(instance_uuid) + self.logger.debug(cmd) + self.cur.execute(cmd) + + return instance_uuid + " " + instance_name + + @retry(table='instance_scenarios') + @with_transaction def new_instance_scenario(self, instance_scenario_dict, tenant_id): #return self.new_row('vnfs', vnf_dict, None, tenant_id, True, True) return self._new_row_internal('instance_scenarios', instance_scenario_dict, tenant_id, add_uuid=True, root_uuid=None, log=True) @@ -1040,6 +1098,8 @@ class nfvo_db(db_base.db_base): #TODO: return + @retry(table='instance_vnfs') + @with_transaction def new_instance_vnf(self, instance_vnf_dict, tenant_id, instance_scenario_id = None): #return self.new_row('vms', vm_dict, tenant_id, True, True) return self._new_row_internal('instance_vnfs', instance_vnf_dict, tenant_id, add_uuid=True, root_uuid=instance_scenario_id, log=True) @@ -1047,11 +1107,13 @@ class nfvo_db(db_base.db_base): def update_instance_vnf(self, instance_vnf_dict): #TODO: return - + def delete_instance_vnf(self, instance_vnf_id): #TODO: return + @retry(table='instance_vms') + @with_transaction def new_instance_vm(self, instance_vm_dict, tenant_id, instance_scenario_id = None): #return self.new_row('vms', vm_dict, tenant_id, True, True) return self._new_row_internal('instance_vms', instance_vm_dict, tenant_id, add_uuid=True, root_uuid=instance_scenario_id, log=True) @@ -1059,14 +1121,16 @@ class nfvo_db(db_base.db_base): def update_instance_vm(self, instance_vm_dict): #TODO: return - + def delete_instance_vm(self, instance_vm_id): #TODO: return + @retry(table='instance_nets') + @with_transaction def new_instance_net(self, instance_net_dict, tenant_id, instance_scenario_id = None): return self._new_row_internal('instance_nets', instance_net_dict, tenant_id, add_uuid=True, root_uuid=instance_scenario_id, log=True) - + def update_instance_net(self, instance_net_dict): #TODO: return @@ -1074,7 +1138,9 @@ class nfvo_db(db_base.db_base): def delete_instance_net(self, instance_net_id): #TODO: return - + + @retry(table='instance_interfaces') + @with_transaction def new_instance_interface(self, instance_interface_dict, tenant_id, instance_scenario_id = None): return self._new_row_internal('instance_interfaces', instance_interface_dict, tenant_id, add_uuid=True, root_uuid=instance_scenario_id, log=True) @@ -1086,32 +1152,24 @@ class nfvo_db(db_base.db_base): #TODO: return + @retry(table='datacenter_nets') + @with_transaction def update_datacenter_nets(self, datacenter_id, new_net_list=[]): ''' Removes the old and adds the new net list at datacenter list for one datacenter. - Attribute + Attribute datacenter_id: uuid of the datacenter to act upon table: table where to insert new_net_list: the new values to be inserted. If empty it only deletes the existing nets Return: (Inserted items, Deleted items) if OK, (-Error, text) if error ''' - tries = 2 - while tries: - created_time = time.time() - try: - with self.con: - self.cur = self.con.cursor() - cmd="DELETE FROM datacenter_nets WHERE datacenter_id='{}'".format(datacenter_id) - self.logger.debug(cmd) - self.cur.execute(cmd) - deleted = self.cur.rowcount - inserted = 0 - for new_net in new_net_list: - created_time += 0.00001 - self._new_row_internal('datacenter_nets', new_net, add_uuid=True, created_time=created_time) - inserted += 1 - return inserted, deleted - except (mdb.Error, AttributeError) as e: - self._format_error(e, tries) - tries -= 1 - - + created_time = time.time() + cmd="DELETE FROM datacenter_nets WHERE datacenter_id='{}'".format(datacenter_id) + self.logger.debug(cmd) + self.cur.execute(cmd) + deleted = self.cur.rowcount + inserted = 0 + for new_net in new_net_list: + created_time += 0.00001 + self._new_row_internal('datacenter_nets', new_net, add_uuid=True, created_time=created_time) + inserted += 1 + return inserted, deleted