Remove rollback logic of vnf instantiate

[vfc/gvnfm/vnflcm.git] / lcm / lcm / pub / vimapi / adaptor.py

diff --git a/lcm/lcm/pub/vimapi/adaptor.py b/lcm/lcm/pub/vimapi/adaptor.py
index f7ffc1f..4039392 100644 (file)
--- a/lcm/lcm/pub/vimapi/adaptor.py
+++ b/lcm/lcm/pub/vimapi/adaptor.py
@@ -13,10 +13,9 @@
 # limitations under the License.
 
 import logging
-import json
-import traceback
 import sys
 import time
+import traceback
 
 from lcm.pub.utils.values import ignore_case_get, set_opt_val
 from . import api
@@ -35,44 +34,35 @@ OPT_CREATE_SUBNET = 40
 OPT_CREATE_PORT = 50
 OPT_CREATE_FLAVOR = 60
 OPT_CREATE_VM = 80
-OPT_END = 100
 
 BOOT_FROM_VOLUME = 1
 
-def create_vim_res(data, do_notify, do_rollback):
-    try:
-        for vol in ignore_case_get(data, "volume_storages"):
-            create_volume(vol, do_notify, OPT_CREATE_VOLUME)
-        for network in ignore_case_get(data, "vls"):
-            create_network(network, do_notify, OPT_CREATE_NETWORK)
-        for subnet in ignore_case_get(data, "vls"):
-            create_subnet(subnet, do_notify, OPT_CREATE_SUBNET)
-        for port in ignore_case_get(data, "cps"):
-            create_port(port, do_notify, OPT_CREATE_PORT)
-        for flavor in ignore_case_get(data, "vdus"):
-            create_flavor(flavor, do_notify, OPT_CREATE_FLAVOR)
-        for vm in ignore_case_get(data, "vdus"):
-            create_vm(vm, do_notify, OPT_CREATE_VM)
-        do_notify(RES_END, {})
-    except VimException as e:
-        logger.error(e.message)
-        do_rollback(e.message)
-    except:
-        logger.error(traceback.format_exc())
-        do_rollback(str(sys.exc_info()))
-    
+
+def create_vim_res(data, do_notify):
+    for vol in ignore_case_get(data, "volume_storages"):
+        create_volume(vol, do_notify, OPT_CREATE_VOLUME)
+    for network in ignore_case_get(data, "vls"):
+        create_network(network, do_notify, OPT_CREATE_NETWORK)
+    for subnet in ignore_case_get(data, "vls"):
+        create_subnet(subnet, do_notify, OPT_CREATE_SUBNET)
+    for port in ignore_case_get(data, "cps"):
+        create_port(port, do_notify, OPT_CREATE_PORT)
+    for flavor in ignore_case_get(data, "vdus"):
+        create_flavor(flavor, do_notify, OPT_CREATE_FLAVOR)
+    for vm in ignore_case_get(data, "vdus"):
+        create_vm(vm, do_notify, OPT_CREATE_VM)
+
 def delete_vim_res(data, do_notify):
-    def ignore_exception_call(fun, *args):
-        try:
-            fun(*args)
-        except VimException as e:
-            logger.error(e.message)
     res_types = ["vm", "flavor", "port", "subnet", "network", "volume"]
     res_del_funs = [api.delete_vm, api.delete_flavor, api.delete_port, 
         api.delete_subnet, api.delete_network, api.delete_volume]
     for res_type, res_del_fun in zip(res_types, res_del_funs):
         for res in ignore_case_get(data, res_type):
-            ignore_exception_call(res_del_fun, res["vim_id"], res["res_id"])
+            try:
+                res_del_fun(res["vim_id"], res["res_id"])
+            except VimException as e:
+                logger.error("Failed to delete %s(%s): %s", 
+                    res_type, res["res_id"], e.message)
             do_notify(res_type)
 
 def create_volume(vol, do_notify, progress):
@@ -96,7 +86,7 @@ def create_volume(vol, do_notify, progress):
         retry_count = retry_count + 1
     if return_code == RES_NEW:
         api.delete_volume(vim_id, vol_id)
-    raise VimException("Failed to create Volume(%s): Timeout." % vol_name)
+    raise VimException("Failed to create Volume(%s): Timeout." % vol_name, "500")
     
 def create_network(network, do_notify, progress):
     param = {
@@ -131,18 +121,18 @@ def create_subnet(subnet, do_notify, progress):
     if allocation_pool:
         param["allocationPools"] = [allocation_pool]
     set_opt_val(param, "hostRoutes", ignore_case_get(subnet["properties"], "host_routes"))
-    vim_id = network["properties"]["location_info"]["vimid"],
+    vim_id = subnet["properties"]["location_info"]["vimid"],
     ret = api.create_subnet(vim_id, param)
     do_notify(progress, ret)
     
 def create_port(port, do_notify, progress):
     param = {
-        "tenant": subnet["properties"]["location_info"]["tenant"],
-        "networkName": subnet["properties"]["network_name"],
-        "subnetName": subnet["properties"]["name"],
-        "portName": subnet["properties"]["name"]
+        "tenant": port["properties"]["location_info"]["tenant"],
+        "networkName": port["properties"]["network_name"],
+        "subnetName": port["properties"]["name"],
+        "portName": port["properties"]["name"]
     }
-    vim_id = subnet["properties"]["location_info"]["vimid"],
+    vim_id = port["properties"]["location_info"]["vimid"],
     ret = api.create_subnet(vim_id, param)
     do_notify(progress, ret)
 
@@ -153,7 +143,7 @@ def create_flavor(flavor, do_notify, progress):
         "memory": int(flavor["nfv_compute"]["mem_size"].replace('MB', '').strip())
     }
     set_opt_val(param, "extraSpecs", ignore_case_get(flavor["nfv_compute"], "flavor_extra_specs"))
-    vim_id = subnet["properties"]["location_info"]["vimid"],
+    vim_id = flavor["properties"]["location_info"]["vimid"],
     ret = api.create_flavor(vim_id, param)
     do_notify(progress, ret)
     
@@ -179,7 +169,7 @@ def create_vm(vm, do_notify, progress):
     for vol_data in vm["volume_storages"]:
         param["contextArray"].append(vol_data["volume_storage_id"])
     # nicArray TODO:
-    vim_id = subnet["properties"]["location_info"]["vimid"],
+    vim_id = vm["properties"]["location_info"]["vimid"],
     ret = api.create_vm(vim_id, param)
     vm_id, vm_name, return_code = ret["id"], ret["name"], ret["returnCode"]
     opt_vm_status = "Timeout"
@@ -196,4 +186,4 @@ def create_vm(vm, do_notify, progress):
         retry_count = retry_count + 1
     if return_code == RES_NEW:
         api.delete_vm(vim_id, vm_id)
-    raise VimException("Failed to create Vm(%s): %s." % (vm_name, opt_vm_status))
+    raise VimException("Failed to create Vm(%s): %s." % (vm_name, opt_vm_status), "500")