Change-Id: I5574ad2d8e2c14f061859ca6b3f70a75d04bb2b7
Issue-ID: VFC-1762
Signed-off-by: dyh <dengyuanhong@chinamobile.com>
import time
from lcm.pub.database.models import NfInstModel, OOFDataModel
from lcm.pub.exceptions import NSLCMException
import time
from lcm.pub.database.models import NfInstModel, OOFDataModel
from lcm.pub.exceptions import NSLCMException
+from lcm.pub.msapi import resmgr
from lcm.pub.msapi.sdc_run_catalog import query_vnfpackage_by_id
from lcm.pub.utils.values import ignore_case_get
from lcm.ns_vnfs.const import SCALAR_UNIT_DICT
from lcm.pub.msapi.sdc_run_catalog import query_vnfpackage_by_id
from lcm.pub.utils.values import ignore_case_get
from lcm.ns_vnfs.const import SCALAR_UNIT_DICT
break
req_param[grant_type].append(grant_res)
self.data = req_param
break
req_param[grant_type].append(grant_res)
self.data = req_param
- # tmp = resmgr.grant_vnf(self.data)
- # vimConnections.append(
- # {
- # "id": tmp["vim"]["vimId"],
- # "vimId": tmp["vim"]["vimId"],
- # "vimType": None,
- # "interfaceInfo": None,
- # "accessInfo": tmp["vim"]["accessInfo"],
- # "extra": None
- # }
- # )
+ tmp = resmgr.grant_vnf(self.data)
+ vimConnections.append(
+ {
+ "id": tmp["vim"]["vimId"],
+ "vimId": tmp["vim"]["vimId"],
+ "vimType": None,
+ "interfaceInfo": None,
+ "accessInfo": tmp["vim"]["accessInfo"],
+ "extra": None
+ }
+ )
grant_resp = {
"id": str(uuid.uuid4()),
grant_resp = {
"id": str(uuid.uuid4()),
resp = GrantVnf(json.dumps(self.data)).exec_grant()
self.assertEqual(resp["vnfInstanceId"], "add_resources_but_no_off")
self.assertEqual(resp["vnfLcmOpOccId"], "vnf_lcm_op_occ_id")
resp = GrantVnf(json.dumps(self.data)).exec_grant()
self.assertEqual(resp["vnfInstanceId"], "add_resources_but_no_off")
self.assertEqual(resp["vnfLcmOpOccId"], "vnf_lcm_op_occ_id")
+ vimConnections = [{
+ "id": "cloudOwner_casa",
+ "vimId": "cloudOwner_casa",
+ "vimType": None,
+ "interfaceInfo": None,
+ "accessInfo": {"tenant": "tenantA"},
+ "extra": None
+ }]
self.assertEqual(resp["vimConnections"], vimConnections)
@mock.patch.object(resmgr, "grant_vnf")
self.assertEqual(resp["vimConnections"], vimConnections)
@mock.patch.object(resmgr, "grant_vnf")
resp = GrantVnf(json.dumps(self.data)).exec_grant()
self.assertEqual(resp["vnfInstanceId"], "remove_resources_but_no_off")
self.assertEqual(resp["vnfLcmOpOccId"], "vnf_lcm_op_occ_id")
resp = GrantVnf(json.dumps(self.data)).exec_grant()
self.assertEqual(resp["vnfInstanceId"], "remove_resources_but_no_off")
self.assertEqual(resp["vnfLcmOpOccId"], "vnf_lcm_op_occ_id")
+ vimConnections = [{
+ "id": "cloudOwner_casa",
+ "vimId": "cloudOwner_casa",
+ "vimType": None,
+ "interfaceInfo": None,
+ "accessInfo": {"tenant": "tenantA"},
+ "extra": None
+ }]
self.assertEqual(resp["vimConnections"], vimConnections)
@mock.patch.object(resmgr, "grant_vnf")
self.assertEqual(resp["vimConnections"], vimConnections)
@mock.patch.object(resmgr, "grant_vnf")