diff options
| -rw-r--r-- | lcm/lcm/pub/utils/toscautil.py | 3 | ||||
| -rw-r--r-- | lcm/lcm/pub/vimapi/adaptor.py | 6 |
2 files changed, 7 insertions, 2 deletions
diff --git a/lcm/lcm/pub/utils/toscautil.py b/lcm/lcm/pub/utils/toscautil.py index af62a49c..ecc00d9e 100644 --- a/lcm/lcm/pub/utils/toscautil.py +++ b/lcm/lcm/pub/utils/toscautil.py @@ -55,7 +55,8 @@ def convert_metadata(src_json): def convert_factor_unit(value): - return "%s %s" % (value["factor"], value["unit"]) + return value + #return "%s %s" % (value["factor"], value["unit"]) def convert_inputs(src_json): diff --git a/lcm/lcm/pub/vimapi/adaptor.py b/lcm/lcm/pub/vimapi/adaptor.py index 9cbc7b16..28c173da 100644 --- a/lcm/lcm/pub/vimapi/adaptor.py +++ b/lcm/lcm/pub/vimapi/adaptor.py @@ -279,7 +279,11 @@ def create_vm(vim_cache, res_cache, data, vm, do_notify, res_type): ret = api.create_vm(vim_id, tenant_id, param) do_notify(res_type, ret) - vm_id, vm_name, return_code = ret["id"], ret["name"], ret["returnCode"] + #vm_id, vm_name, return_code = ret["id"], ret["name"], ret["returnCode"] + vm_id, return_code = ret["id"], ret["returnCode"] + if ignore_case_get(ret, "name"): + vm_name = vm["properties"]["name"] + logger.debug("vm_name:%s" % vm_name) opt_vm_status = "Timeout" retry_count, max_retry_count = 0, 100 while retry_count < max_retry_count: |