# 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
pass
def assert_job_result(self, job_id, job_progress, job_detail):
- jobs = JobStatusModel.objects.filter(
- jobid=job_id,
- progress=job_progress,
- descp=job_detail)
+ jobs = JobStatusModel.objects.filter(jobid=job_id,
+ progress=job_progress,
+ descp=job_detail)
self.assertEqual(1, len(jobs))
def test_swagger_ok(self):
- response = self.client.get("/openoapi/vnflcm/v1/swagger.json", format='json')
+ response = self.client.get("/api/vnflcm/v1/swagger.json", format='json')
self.assertEqual(response.status_code, status.HTTP_200_OK)
@mock.patch.object(restcall, 'call_req')
def test_create_vnf_identifier(self, mock_call_req):
- r1_get_csarid_by_vnfdid = [0, json.JSONEncoder().encode({'package_id': '222', 'csar_id': '2222'}), '200']
+ r1_get_csarid_by_vnfdid = [0, json.JSONEncoder().encode(
+ {
+ 'csars': [
+ {
+ 'package_id': '222',
+ 'csarId': '2222',
+ 'vnfdId': '111'
+ }
+ ]
+ }), '200']
r2_get_rawdata_from_catalog = [0, json.JSONEncoder().encode(vnfd_rawdata), '200']
- mock_call_req.side_effect = [r1_get_csarid_by_vnfdid, r2_get_rawdata_from_catalog]
+ r3_create_vnf_to_aai = [0, json.JSONEncoder().encode({}), '200']
+ mock_call_req.side_effect = [r1_get_csarid_by_vnfdid, r2_get_rawdata_from_catalog, r3_create_vnf_to_aai]
data = {
"vnfdId": "111",
"vnfInstanceName": "vFW_01",
- "vnfInstanceDescription": "vFW in Nanjing TIC Edge"}
- response = self.client.post("/openoapi/vnflcm/v1/vnf_instances", data=data, format='json')
+ "vnfInstanceDescription": "vFW in Nanjing TIC Edge"
+ }
+ response = self.client.post("/api/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):
mock_run.re.return_value = None
- response = self.client.post("/openoapi/vnflcm/v1/vnf_instances/12/instantiate", data={}, format='json')
+ response = self.client.post("/api/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):
self.nf_inst_id = str(uuid.uuid4())
self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id)
JobUtil.add_job_status(self.job_id, 0, "INST_VNF_READY")
- jobs = JobStatusModel.objects.filter(
- jobid=self.job_id,
- progress=0,
- descp="INST_VNF_READY")
+ jobs = JobStatusModel.objects.filter(jobid=self.job_id,
+ progress=0,
+ descp="INST_VNF_READY")
self.assertEqual(1, len(jobs))
data = inst_req_data
InstVnf(data, nf_inst_id=self.nf_inst_id, job_id=self.job_id).run()
@mock.patch.object(restcall, 'call_req')
def test_instantiate_vnf_when_get_package_info_by_vnfdid_failed(self, mock_call_req):
- NfInstModel.objects.create(nfinstid='1111', nf_name='vFW_01', package_id='222',
- version='', vendor='', netype='', vnfd_model='', status='NOT_INSTANTIATED',
- nf_desc='vFW in Nanjing TIC Edge', vnfdid='111', create_time=now_time())
- r1_get_csarid_by_vnfdid = [1, json.JSONEncoder().encode({'package_id': '222', 'csar_id': '2222'}), '200']
+ NfInstModel.objects.create(nfinstid='1111',
+ nf_name='vFW_01',
+ package_id='222',
+ version='',
+ vendor='',
+ netype='',
+ vnfd_model='',
+ status='NOT_INSTANTIATED',
+ nf_desc='vFW in Nanjing TIC Edge',
+ vnfdid='111',
+ create_time=now_time())
+ r1_get_csarid_by_vnfdid = [1, json.JSONEncoder().encode(
+ {
+ 'csars': [
+ {
+ 'package_id': '222',
+ 'csarId': '2222',
+ 'vnfdId': '111'
+ }
+ ]
+ }), '200']
mock_call_req.side_effect = [r1_get_csarid_by_vnfdid]
self.nf_inst_id = '1111'
self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id)
@mock.patch.object(restcall, 'call_req')
def test_instantiate_vnf_when_get_rawdata_by_csarid_failed(self, mock_call_req):
- NfInstModel.objects.create(nfinstid='1111', nf_name='vFW_01', package_id='222',
- version='', vendor='', netype='', vnfd_model='', status='NOT_INSTANTIATED',
- nf_desc='vFW in Nanjing TIC Edge', vnfdid='111', create_time=now_time())
- r1_get_csarid_by_vnfdid = [0, json.JSONEncoder().encode({'package_id': '222', 'csar_id': '2222'}), '200']
+ NfInstModel.objects.create(nfinstid='1111',
+ nf_name='vFW_01',
+ package_id='222',
+ version='',
+ vendor='',
+ netype='',
+ vnfd_model='',
+ status='NOT_INSTANTIATED',
+ nf_desc='vFW in Nanjing TIC Edge',
+ vnfdid='111',
+ create_time=now_time())
+ r1_get_csarid_by_vnfdid = [0, json.JSONEncoder().encode(
+ {
+ 'csars': [
+ {
+ 'package_id': '222',
+ 'csarId': '2222',
+ 'vnfdId': '111'
+ }
+ ]
+ }), '200']
r2_get_rawdata_from_catalog = [1, json.JSONEncoder().encode(vnfd_rawdata), '200']
mock_call_req.side_effect = [r1_get_csarid_by_vnfdid, r2_get_rawdata_from_catalog]
self.nf_inst_id = '1111'
@mock.patch.object(restcall, 'call_req')
def test_instantiate_vnf_when_applay_grant_failed(self, mock_call_req):
- NfInstModel.objects.create(nfinstid='1111', nf_name='vFW_01', package_id='222',
- version='', vendor='', netype='', vnfd_model='', status='NOT_INSTANTIATED',
- nf_desc='vFW in Nanjing TIC Edge', vnfdid='111', create_time=now_time())
- r1_get_csarid_by_vnfdid = [0, json.JSONEncoder().encode({'package_id': '222', 'csar_id': '2222'}), '200']
+ NfInstModel.objects.create(nfinstid='1111',
+ nf_name='vFW_01',
+ package_id='222',
+ version='',
+ vendor='',
+ netype='',
+ vnfd_model='',
+ status='NOT_INSTANTIATED',
+ nf_desc='vFW in Nanjing TIC Edge',
+ vnfdid='111',
+ create_time=now_time())
+ r1_get_csarid_by_vnfdid = [0, json.JSONEncoder().encode(
+ {
+ 'csars': [
+ {
+ 'package_id': '222',
+ 'csarId': '2222',
+ 'vnfdId': '111'
+ }
+ ]
+ }), '200']
r2_get_rawdata_from_catalog = [0, json.JSONEncoder().encode(vnfd_rawdata), '200']
r3_apply_grant_result = [1, json.JSONEncoder().encode(
- {"vim": {"vimid": 'vimid_1', "accessinfo": {"tenant": 'tenantname_1'}}}), '200']
+ {
+ "vim": {
+ "vimid": 'vimid_1',
+ "accessinfo": {
+ "tenant": 'tenantname_1'
+ }
+ }
+ }), '200']
mock_call_req.side_effect = [r1_get_csarid_by_vnfdid, r2_get_rawdata_from_catalog, r3_apply_grant_result]
self.nf_inst_id = '1111'
self.job_id = JobUtil.create_job('NF', 'CREATE', self.nf_inst_id)
@mock.patch.object(restcall, 'call_req')
@mock.patch.object(api, 'call')
- def test_instantiate_vnf_when_(self, mock_call, mock_call_req):
- NfInstModel.objects.create(nfinstid='1111', nf_name='vFW_01', package_id='222',
- version='', vendor='', netype='', vnfd_model='', status='NOT_INSTANTIATED',
- nf_desc='vFW in Nanjing TIC Edge', vnfdid='111', create_time=now_time())
- r1_get_csarid_by_vnfdid = [0, json.JSONEncoder().encode({'package_id': '222', 'csar_id': '2222'}), '200']
+ def test_instantiate_vnf_when_unexpected_exception(self, mock_call, mock_call_req):
+ NfInstModel.objects.create(nfinstid='1111',
+ nf_name='vFW_01',
+ package_id='222',
+ version='',
+ vendor='',
+ netype='',
+ vnfd_model='',
+ status='NOT_INSTANTIATED',
+ nf_desc='vFW in Nanjing TIC Edge',
+ vnfdid='111',
+ create_time=now_time())
+ r1_get_csarid_by_vnfdid = [0, json.JSONEncoder().encode(
+ {
+ 'csars': [
+ {
+ 'package_id': '222',
+ 'csarId': '2222',
+ 'vnfdId': '111'
+ }
+ ]
+ }), '200']
r2_get_rawdata_from_catalog = [0, json.JSONEncoder().encode(vnfd_rawdata), '200']
r3_apply_grant_result = [0, json.JSONEncoder().encode(
- {"vim": {"vimid": 'vimid_1', "accessinfo": {"tenant": 'tenantname_1'}}}), '200']
+ {
+ "vim": {
+ "vimid": 'vimid_1',
+ "accessinfo": {
+ "tenant": 'tenantname_1'
+ }
+ }
+ }), '200']
mock_call_req.side_effect = [r1_get_csarid_by_vnfdid, r2_get_rawdata_from_catalog, r3_apply_grant_result]
mock_call.side_effect = [c1_data_get_tenant_id, c2_data_create_volume, c3_data_get_volume]
self.nf_inst_id = '1111'
@mock.patch.object(restcall, 'call_req')
@mock.patch.object(api, 'call')
def test_instantiate_vnf_success(self, mock_call, mock_call_req):
- NfInstModel.objects.create(nfinstid='1111', nf_name='vFW_01', package_id='222',
- version='', vendor='', netype='', vnfd_model='', status='NOT_INSTANTIATED',
- nf_desc='vFW in Nanjing TIC Edge', vnfdid='111', create_time=now_time())
- r1_get_csarid_by_vnfdid = [0, json.JSONEncoder().encode({'package_id': '222', 'csar_id': '2222'}), '200']
+ NfInstModel.objects.create(nfinstid='1111',
+ nf_name='vFW_01',
+ package_id='222',
+ version='',
+ vendor='',
+ netype='',
+ vnfd_model='',
+ status='NOT_INSTANTIATED',
+ nf_desc='vFW in Nanjing TIC Edge',
+ vnfdid='111',
+ create_time=now_time())
+ r1_get_csarid_by_vnfdid = [0, json.JSONEncoder().encode(
+ {
+ 'csars': [
+ {
+ 'package_id': '222',
+ 'csarId': '2222',
+ 'vnfdId': '111'
+ }
+ ]
+ }), '200']
r2_get_rawdata_from_catalog = [0, json.JSONEncoder().encode(vnfd_rawdata), '200']
r3_apply_grant_result = [0, json.JSONEncoder().encode(
- {"vim": {"vimid": 'vimid_1', "accessinfo": {"tenant": 'tenantname_1'}}}), '200']
+ {
+ "vim": {
+ "vimid": 'vimid_1',
+ "accessinfo": {
+ "tenant": 'tenantname_1'
+ }
+ }
+ }), '200']
r4_lcm_notify_result = [0, json.JSONEncoder().encode(''), '200']
mock_call_req.side_effect = [r1_get_csarid_by_vnfdid, r2_get_rawdata_from_catalog,
r3_apply_grant_result, r4_lcm_notify_result]
Code Review / vfc / gvnfm / vnflcm.git / blobdiff