diff options
| author |   ying.yunlong <ying.yunlong@zte.com.cn> | 2017-04-21 20:44:22 +0800 |
|---|---|---|
| committer | ying.yunlong <ying.yunlong@zte.com.cn> | 2017-04-21 20:44:22 +0800 |
| commit | 277f28e784719d0705c027858005cc9c400e9766 (patch) | |
| tree | 3cb98f7ff058031be63c6f9296317896ca38f7fd | |
| parent | c14af82eb416b645f45a8d3276bf087526f4cf93 (diff) | |
Fix instantiate vnf logic of vnflcm
Change-Id: Ic5a82357ce445cd47e114ba308c97c1eef190da1
Issue-Id: GVNFM-50
Signed-off-by: ying.yunlong <ying.yunlong@zte.com.cn>
| -rw-r--r-- | lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py b/lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py index 2a708c20..a09ac84e 100644 --- a/lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py +++ b/lcm/lcm/nf/vnfs/vnf_create/inst_vnf.py @@ -86,7 +86,7 @@ class InstVnf(Thread): self.vnfd_info = toscautil.convert_vnfd_model(raw_data["rawData"]) # convert to inner json self.vnfd_info = json.JSONDecoder().decode(self.vnfd_info) - self.vnfd_info = vnfd_model_dict # just for test + #self.vnfd_info = vnfd_model_dict # just for test self.update_cps() self.check_parameter_exist() @@ -122,8 +122,8 @@ class InstVnf(Thread): logger.info('content_args=%s' % content_args) apply_result = apply_grant_to_nfvo(json.dumps(content_args)) - #vim_info = ignore_case_get(apply_result, "vim") - vim_info = ignore_case_get(json.JSONDecoder().decode(apply_result), "vim") + vim_info = ignore_case_get(apply_result, "vim") + #vim_info = ignore_case_get(json.JSONDecoder().decode(apply_result), "vim") for vdu in ignore_case_get(self.vnfd_info, "vdus"): if "location_info" in vdu["properties"]: |