# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-
import json
import uuid
from lcm.pub.database.models import NfInstModel, JobStatusModel, NfvoRegInfoModel, VmInstModel, NetworkInstModel, \
SubNetworkInstModel, PortInstModel
from lcm.pub.utils import restcall
-from lcm.pub.vimapi import adaptor
from lcm.pub.utils.jobutil import JobUtil
-inst_req_data = {
- "flavourId": "flavour_1",
- "instantiationLevelId": "instantiationLevel_1",
- "extVirtualLinks": [
- {
- "vlInstanceId": "1",
- "vim": {
- "vimInfoId": "1",
- "vimId": "1",
- "interfaceInfo": {
- "vimType": "vim",
- "apiVersion": "v2",
- "protocolType": "http"
- },
- "accessInfo": {
- "tenant": "tenant_vCPE",
- "username": "vCPE",
- "password": "vCPE_321"
- },
- "interfaceEndpoint": "http://10.43.21.105:80/"
- },
- "resourceId": "1246",
- "extCps": [
- {
- "cpdId": "11",
- "addresses": [
- {
- "addressType": "MAC",
- "l2AddressData": "00:f3:43:20:a2:a3"
- },
- {
- "addressType": "IP",
- "l3AddressData": {
- "iPAddressType": "IPv4",
- "iPAddress": "192.168.104.2"
- }
- }
- ],
- "numDynamicAddresses": 0
- }
- ]
- }
- ],
- "localizationLanguage": "en_US",
- "additionalParams": {}
-}
-
-class TestNsInstantiate(TestCase):
+class TestNFInstantiate(TestCase):
def setUp(self):
self.client = Client()
VmInstModel.objects.create(vmid="1", vimid="1", resouceid="11", insttype=0, instid="1", vmname="test_01",
operationalstate=1)
- VmInstModel.objects.create(vmid="2", vimid="2", resouceid="22", insttype=0, instid="2", vmname="test_02",
- operationalstate=1)
+ VmInstModel.objects.create(vmid="2", vimid="2", resouceid="22", insttype=0, instid="2",
+ vmname="test_02", operationalstate=1)
NetworkInstModel.objects.create(networkid='1', vimid='1', resouceid='1', name='pnet_network',
tenant='admin', insttype=0, instid='1')
SubNetworkInstModel.objects.create(subnetworkid='1', vimid='1', resouceid='1', networkid='1',
- name='sub_pnet',tenant='admin', insttype=0, instid='1')
+ name='sub_pnet', tenant='admin', insttype=0, instid='1')
PortInstModel.objects.create(portid='1', networkid='1', subnetworkid='1', vimid='1', resouceid='1',
name='aaa_pnet_cp', tenant='admin', insttype=0, instid='1')
def tearDown(self):
pass
+ VmInstModel.objects.all().delete()
+ NetworkInstModel.objects.all().delete()
+ SubNetworkInstModel.objects.all().delete()
+ PortInstModel.objects.all().delete()
def assert_job_result(self, job_id, job_progress, job_detail):
jobs = JobStatusModel.objects.filter(
self.assertEqual(1, len(jobs))
def test_swagger_ok(self):
- response = self.client.get("/gvnfmapi/lcm/v1/swagger.json", format='json')
+ response = self.client.get("/openoapi/vnflcm/v1/swagger.json", format='json')
self.assertEqual(response.status_code, status.HTTP_200_OK)
@mock.patch.object(restcall, 'call_req')
"vnfdId": "111",
"vnfInstanceName": "vFW_01",
"vnfInstanceDescription": " vFW in Nanjing TIC Edge"}
- response = self.client.post("/gvnfmapi/lcm/v1/vnf_instances", data=data, format='json')
+ response = self.client.post("/openoapi/vnflcm/v1/vnf_instances", data=data, format='json')
self.failUnlessEqual(status.HTTP_201_CREATED, response.status_code)
context = json.loads(response.content)
self.assertTrue(NfInstModel.objects.filter(nfinstid=context['vnfInstanceId']).exists())
@mock.patch.object(InstVnf, 'run')
def test_instantiate_vnf(self, mock_run):
- response = self.client.post("/gvnfmapi/lcm/v1/vnf_instances/12/instantiate", data={}, format='json')
+ mock_run.re.return_value = None
+ response = self.client.post("/openoapi/vnflcm/v1/vnf_instances/12/instantiate", data={}, format='json')
self.failUnlessEqual(status.HTTP_202_ACCEPTED, response.status_code)
def test_instantiate_vnf_when_inst_id_not_exist(self):
InstVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()
self.assert_job_result(self.job_id, 255, "VNF nf_inst_id is not exist.")
- @mock.patch.object(restcall, 'call_req')
- def test_instantiate_vnf_when_input_para_not_define_in_vnfd(self, mock_call_req):
- r1 = [0, json.JSONEncoder().encode(vnfd_model_dict), '200']
- r2 = [0, json.JSONEncoder().encode(''), '200']
- mock_call_req.side_effect = [r1, r2]
- create_data = {
- "vnfdId": "111",
- "vnfInstanceName": "vFW_01",
- "vnfInstanceDescription": " vFW in Nanjing TIC Edge"}
- self.nf_inst_id = CreateVnf(create_data).do_biz()
- self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id)
- JobUtil.add_job_status(self.job_id, 0, "INST_VNF_READY")
- data = inst_req_data
- InstVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()
- self.assert_job_result(self.job_id, 255, "Input parameter is not defined in vnfd_info.")
-
- @mock.patch.object(restcall, 'call_req')
- def test_instantiate_vnf_when_get_nfvo_config_failed(self, mock_call_req):
- r1 = [0, json.JSONEncoder().encode(vnfd_model_dict), '200']
- r2 = [0, json.JSONEncoder().encode(vnfd_model_dict), '200']
- mock_call_req.side_effect = [r1, r2]
- create_data = {
- "vnfdId": "111",
- "vnfInstanceName": "vFW_01",
- "vnfInstanceDescription": " vFW in Nanjing TIC Edge"}
- self.nf_inst_id = CreateVnf(create_data).do_biz()
- self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id)
- JobUtil.add_job_status(self.job_id, 0, "INST_VNF_READY")
- data = inst_req_data
- InstVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()
- self.assert_job_result(self.job_id, 255, "Nfvo was not registered")
-
- @mock.patch.object(restcall, 'call_req')
- def test_instantiate_vnf_when_applay_grant_failed(self, mock_call_req):
- NfvoRegInfoModel.objects.create(nfvoid='nfvo111', vnfminstid='vnfm111', apiurl='http://10.74.44.11',
- nfvouser='root', nfvopassword='root123')
- r1 = [0, json.JSONEncoder().encode(vnfd_model_dict), '200']
- r2 = [0, json.JSONEncoder().encode(vnfd_model_dict), '200']
- r3 = [1, json.JSONEncoder().encode(''), '200']
- mock_call_req.side_effect = [r1, r2, r3]
- create_data = {
- "vnfdId": "111",
- "vnfInstanceName": "vFW_01",
- "vnfInstanceDescription": " vFW in Nanjing TIC Edge"}
- self.nf_inst_id = CreateVnf(create_data).do_biz()
- self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id)
- JobUtil.add_job_status(self.job_id, 0, "INST_VNF_READY")
- data = inst_req_data
- InstVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()
- self.assert_job_result(self.job_id, 255, "Nf instancing apply grant exception")
-
- @mock.patch.object(restcall, 'call_req')
- # @mock.patch.object(adaptor, 'create_vim_res')
- def test_instantiate_vnf_when_create_res_failed(self, mock_call_req):
- NfvoRegInfoModel.objects.create(nfvoid='nfvo111', vnfminstid='vnfm111', apiurl='http://10.74.44.11',
- nfvouser='root', nfvopassword='root123')
- r1 = [0, json.JSONEncoder().encode(vnfd_model_dict), '200']
- r2 = [0, json.JSONEncoder().encode(vnfd_model_dict), '200']
- r3 = [0, json.JSONEncoder().encode('Nf instancing apply grant'), '200']
- # r4 = [0, json.JSONEncoder().encode('Nf instancing apply resource'), '200']
- mock_call_req.side_effect = [r1, r2, r3]
- # mock_create_vim_res.re.return_value = None
- create_data = {
- "vnfdId": "111",
- "vnfInstanceName": "vFW_01",
- "vnfInstanceDescription": " vFW in Nanjing TIC Edge"}
- self.nf_inst_id = CreateVnf(create_data).do_biz()
- self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id)
- JobUtil.add_job_status(self.job_id, 0, "INST_VNF_READY")
- data = inst_req_data
- InstVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()
- self.assert_job_result(self.job_id, 255, "Create resource failed")
+ # @mock.patch.object(restcall, 'call_req')
+ # def test_instantiate_vnf_when_input_para_not_define_in_vnfd(self, mock_call_req):
+ # r1 = [0, json.JSONEncoder().encode(vnfd_model_dict), '200']
+ # r2 = [0, json.JSONEncoder().encode(''), '200']
+ # mock_call_req.side_effect = [r1, r2]
+ # create_data = {
+ # "vnfdId": "111",
+ # "vnfInstanceName": "vFW_01",
+ # "vnfInstanceDescription": " vFW in Nanjing TIC Edge"}
+ # self.nf_inst_id = CreateVnf(create_data).do_biz()
+ # self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id)
+ # JobUtil.add_job_status(self.job_id, 0, "INST_VNF_READY")
+ # data = inst_req_data
+ # InstVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()
+ # self.assert_job_result(self.job_id, 255, "Input parameter is not defined in vnfd_info.")
+ #
+ # @mock.patch.object(restcall, 'call_req')
+ # def test_instantiate_vnf_when_get_nfvo_config_failed(self, mock_call_req):
+ # r1 = [0, json.JSONEncoder().encode(vnfd_model_dict), '200']
+ # r2 = [0, json.JSONEncoder().encode(vnfd_model_dict), '200']
+ # mock_call_req.side_effect = [r1, r2]
+ # create_data = {
+ # "vnfdId": "111",
+ # "vnfInstanceName": "vFW_01",
+ # "vnfInstanceDescription": " vFW in Nanjing TIC Edge"}
+ # self.nf_inst_id = CreateVnf(create_data).do_biz()
+ # self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id)
+ # JobUtil.add_job_status(self.job_id, 0, "INST_VNF_READY")
+ # data = inst_req_data
+ # InstVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()
+ # self.assert_job_result(self.job_id, 255, "Nfvo was not registered")
+ #
+ # @mock.patch.object(restcall, 'call_req')
+ # def test_instantiate_vnf_when_applay_grant_failed(self, mock_call_req):
+ # NfvoRegInfoModel.objects.create(nfvoid='nfvo111', vnfminstid='vnfm111', apiurl='http://10.74.44.11',
+ # nfvouser='root', nfvopassword='root123')
+ # r1 = [0, json.JSONEncoder().encode(vnfd_model_dict), '200']
+ # r2 = [0, json.JSONEncoder().encode(vnfd_model_dict), '200']
+ # r3 = [1, json.JSONEncoder().encode(''), '200']
+ # mock_call_req.side_effect = [r1, r2, r3]
+ # create_data = {
+ # "vnfdId": "111",
+ # "vnfInstanceName": "vFW_01",
+ # "vnfInstanceDescription": " vFW in Nanjing TIC Edge"}
+ # self.nf_inst_id = CreateVnf(create_data).do_biz()
+ # self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id)
+ # JobUtil.add_job_status(self.job_id, 0, "INST_VNF_READY")
+ # data = inst_req_data
+ # InstVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()
+ # self.assert_job_result(self.job_id, 255, "Nf instancing apply grant exception")
# @mock.patch.object(restcall, 'call_req')
# # @mock.patch.object(adaptor, 'create_vim_res')
- # def test_instantiate_vnf_success(self, mock_call_req):
+ # def test_instantiate_vnf_when_create_res_failed(self, mock_call_req):
# NfvoRegInfoModel.objects.create(nfvoid='nfvo111', vnfminstid='vnfm111', apiurl='http://10.74.44.11',
# nfvouser='root', nfvopassword='root123')
# r1 = [0, json.JSONEncoder().encode(vnfd_model_dict), '200']
# JobUtil.add_job_status(self.job_id, 0, "INST_VNF_READY")
# data = inst_req_data
# InstVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()
+ # self.assert_job_result(self.job_id, 255, "Create resource failed")
+
+ # @mock.patch.object(restcall, 'call_req')
+ # # @mock.patch.object(adaptor, 'create_vim_res')
+ # def test_instantiate_vnf_success(self, mock_call_req):
+ # NfvoRegInfoModel.objects.create(nfvoid='nfvo111', vnfminstid='vnfm111', apiurl='http://10.74.44.11',
+ # nfvouser='root', nfvopassword='root123')
+ # r1 = [0, json.JSONEncoder().encode(vnfd_model_dict), '200']
+ # r2 = [0, json.JSONEncoder().encode(vnfd_model_dict), '200']
+ # r3 = [0, json.JSONEncoder().encode('Nf instancing apply grant'), '200']
+ # r4 = [0, json.JSONEncoder().encode('None'), '200']
+ # mock_call_req.side_effect = [r1, r2, r3, r4]
+ # # mock_create_vim_res.re.return_value = None
+ # create_data = {
+ # "vnfdId": "111",
+ # "vnfInstanceName": "vFW_01",
+ # "vnfInstanceDescription": " vFW in Nanjing TIC Edge"}
+ # self.nf_inst_id = CreateVnf(create_data).do_biz()
+ # self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id)
+ # JobUtil.add_job_status(self.job_id, 0, "INST_VNF_READY")
+ # data = inst_req_data
+ # InstVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()
# self.assert_job_result(self.job_id, 100, "Instantiate Vnf success.")
+inst_req_data = {
+ "flavourId": "flavour_1",
+ "instantiationLevelId": "instantiationLevel_1",
+ "extVirtualLinks": [
+ {
+ "vlInstanceId": "1",
+ "vim": {
+ "vimInfoId": "1",
+ "vimId": "1",
+ "interfaceInfo": {
+ "vimType": "vim",
+ "apiVersion": "v2",
+ "protocolType": "http"
+ },
+ "accessInfo": {
+ "tenant": "tenant_vCPE",
+ "username": "vCPE",
+ "password": "vCPE_321"
+ },
+ "interfaceEndpoint": "http://10.43.21.105:80/"
+ },
+ "resourceId": "1246",
+ "extCps": [
+ {
+ "cpdId": "11",
+ "addresses": [
+ {
+ "addressType": "MAC",
+ "l2AddressData": "00:f3:43:20:a2:a3"
+ },
+ {
+ "addressType": "IP",
+ "l3AddressData": {
+ "iPAddressType": "IPv4",
+ "iPAddress": "192.168.104.2"
+ }
+ }
+ ],
+ "numDynamicAddresses": 0
+ }
+ ]
+ }
+ ],
+ "localizationLanguage": "en_US",
+ "additionalParams": {}
+}
vnfd_model_dict = {
'local_storages': [],
],
"localizationLanguage": "en_US",
"additionalParams": {}
-}
\ No newline at end of file
+}
Code Review / vfc / gvnfm / vnflcm.git / blobdiff