Merge "Fixes bug #57"

[osm/RO.git] / nfvo.py

diff --git a/nfvo.py b/nfvo.py
index c27c51e..dd3eb55 100644 (file)
--- a/nfvo.py
+++ b/nfvo.py
@@ -1320,6 +1320,7 @@ def start_scenario(mydb, tenant_id, scenario_id, instance_scenario_name, instanc
                 sce_net['vim_id'] = network_id
                 auxNetDict['scenario'][sce_net['uuid']] = network_id
                 rollbackList.append({'what':'network','where':'vim','vim_id':datacenter_id,'uuid':network_id})
+                sce_net["created"] = True
             else:
                 if sce_net['vim_id'] == None:
                     error_text = "Error, datacenter '%s' does not have external network '%s'." % (datacenter_name, sce_net['name'])
@@ -1353,6 +1354,7 @@ def start_scenario(mydb, tenant_id, scenario_id, instance_scenario_name, instanc
                     auxNetDict[sce_vnf['uuid']] = {}
                 auxNetDict[sce_vnf['uuid']][net['uuid']] = network_id
                 rollbackList.append({'what':'network','where':'vim','vim_id':datacenter_id,'uuid':network_id})
+                net["created"] = True
     
         #print "auxNetDict:"
         #print yaml.safe_dump(auxNetDict, indent=4, default_flow_style=False)
@@ -1820,6 +1822,7 @@ def create_instance(mydb, tenant_id, instance_dict):
                     sce_net["vim_id_sites"][datacenter_id] = network_id
                     auxNetDict['scenario'][sce_net['uuid']][datacenter_id] = network_id
                     rollbackList.append({'what':'network', 'where':'vim', 'vim_id':datacenter_id, 'uuid':network_id})
+                    sce_net["created"] = True
         
     #2. Creating new nets (vnf internal nets) in the VIM"
         #For each vnf net, we create it and we add it to instanceNetlist.
@@ -1843,6 +1846,8 @@ def create_instance(mydb, tenant_id, instance_dict):
                     auxNetDict[sce_vnf['uuid']] = {}
                 auxNetDict[sce_vnf['uuid']][net['uuid']] = network_id
                 rollbackList.append({'what':'network','where':'vim','vim_id':datacenter_id,'uuid':network_id})
+                net["created"] = True
+
     
         #print "auxNetDict:"
         #print yaml.safe_dump(auxNetDict, indent=4, default_flow_style=False)
@@ -2014,7 +2019,7 @@ def delete_instance(mydb, tenant_id, instance_id):
     #2.2 deleting NETS
     #net_fail_list=[]
     for net in instanceDict['nets']:
-        if net['external']:
+        if not net['created']:
             continue #skip not created nets
         if not myvim:
             continue
@@ -2080,7 +2085,7 @@ def refresh_instance(mydb, nfvo_tenant, instanceDict, datacenter=None, vim_tenan
                     if iface["type"]=="mgmt":
                         has_mgmt_iface = True
                 if vm_dict[vm_id]['status'] == "ACTIVE:NoMgmtIP" and not has_mgmt_iface:
-                        vm_dict[vm_id]['status'] = "ACTIVE"
+                    vm_dict[vm_id]['status'] = "ACTIVE"
                 if vm['status'] != vm_dict[vm_id]['status'] or vm.get('error_msg')!=vm_dict[vm_id].get('error_msg') or vm.get('vim_info')!=vm_dict[vm_id].get('vim_info'):
                     vm['status']    = vm_dict[vm_id]['status']
                     vm['error_msg'] = vm_dict[vm_id].get('error_msg')
@@ -2096,16 +2101,16 @@ def refresh_instance(mydb, nfvo_tenant, instanceDict, datacenter=None, vim_tenan
                 # 2.2. Update in openmano DB the interface VMs
                 for interface in interfaces:
                     #translate from vim_net_id to instance_net_id
-                    network_id=None
+                    network_id_list=[]
                     for net in instanceDict['nets']:
                         if net["vim_net_id"] == interface["vim_net_id"]:
-                            network_id = net["uuid"]
-                            break
-                    if not network_id:
+                            network_id_list.append(net["uuid"])
+                    if not network_id_list:
                         continue
                     del interface["vim_net_id"]
-                    try: 
-                        mydb.update_rows('instance_interfaces', UPDATE=interface, WHERE={'instance_vm_id':vm["uuid"], "instance_net_id":network_id})
+                    try:
+                        for network_id in network_id_list:
+                            mydb.update_rows('instance_interfaces', UPDATE=interface, WHERE={'instance_vm_id':vm["uuid"], "instance_net_id":network_id})
                     except db_base_Exception as e:
                         logger.error( "nfvo.refresh_instance error with vm=%s, interface_net_id=%s", vm["uuid"], network_id)