Merge "fix NSlcm grant parameter error"

diff --combined lcm/ns_vnfs/biz/grant_vnf.py
index 6987fc0,69501b1..0923eb1
--- 1/lcm/ns_vnfs/biz/grant_vnf.py
--- 2/lcm/ns_vnfs/biz/grant_vnf.py
+++ b/lcm/ns_vnfs/biz/grant_vnf.py
@@@ -52,9 -52,12 +52,12 @@@ class GrantVnf(object)
              additional_param = ignore_case_get(self.data, "additionalparams")
              vnfm_inst_id = ignore_case_get(additional_param, "vnfmid")
              vim_id = ignore_case_get(additional_param, "vimid")
- 
-             vnfinsts = NfInstModel.objects.filter(
-                 nfinstid=m_vnf_inst_id, vnfm_inst_id=vnfm_inst_id)
+             if vnfm_inst_id and vnfm_inst_id != "":
+                 vnfinsts = NfInstModel.objects.filter(
+                     mnfinstid=m_vnf_inst_id, vnfm_inst_id=vnfm_inst_id)
+             else:
+                 vnfinsts = NfInstModel.objects.filter(
+                     mnfinstid=m_vnf_inst_id)
              if not vnfinsts:
                  raise NSLCMException("Vnfinst(%s) is not found in vnfm(%s)" % (
                      m_vnf_inst_id, vnfm_inst_id))
@@@ -105,14 -108,12 +108,14 @@@
  
          offs = OOFDataModel.objects.filter(service_resource_id=ignore_case_get(self.data, "vnfInstanceId"))
          if offs.exists():
 -            for off in offs:
 +            vdu_info = json.loads(offs[0].vdu_info)
 +            grant_resp['vimAssets'] = {'computeResourceFlavours': []}
 +            for vdu in vdu_info:
                  grant_resp['vimAssets']['computeResourceFlavours'].append({
 -                    'vimConnectionId': off.vim_id,
 -                    'resourceProviderId': off.vdu_name,
 +                    'vimConnectionId': offs[0].vim_id,
 +                    'resourceProviderId': vdu.get("vduName"),
                      'vnfdVirtualComputeDescId': None,  # TODO: required
 -                    'vimFlavourId': off.flavor_name
 +                    'vimFlavourId': vdu.get("flavorName")
                  })
                  # grant_resp['additionalparams'][off.vim_id] = off.directive