self.test_data_single_vnf = {
"id": "1",
"vnfInstanceName": "VNF1",
- "vnfProvider": None,
+ "vnfInstanceDescription": "VNF DESC",
+ "vnfdId": "1",
+ "vnfProvider": "ZTE",
+ "vnfProductName": "XGW",
+ "vnfSoftwareVersion": "V1",
+ "vnfdVersion": "V1",
+ "vnfPkgId": "2",
"instantiationState": "INSTANTIATED",
"instantiatedVnfInfo": {
"vnfState": "STARTED",
],
"extVirtualLinkInfo": [],
"vnfcResourceInfo": [],
- "monitoringParameters": {},
+ "monitoringParameters": [],
"flavourId": None,
"vnfVirtualLinkResourceInfo": [],
"scaleStatus": []
- },
- "vnfdVersion": None,
- "vnfPkgId": None
+ }
}
self.test_data_multi_vnf = [
{
"id": "1",
"vnfInstanceName": "VNF1",
- "vnfProvider": None,
+ "vnfInstanceDescription": "VNF DESC",
+ "vnfdId": "1",
+ "vnfProvider": "ZTE",
+ "vnfProductName": "XGW",
+ "vnfSoftwareVersion": "V1",
+ "vnfdVersion": "V1",
+ "vnfPkgId": "2",
"instantiationState": "INSTANTIATED",
"instantiatedVnfInfo": {
"vnfState": "STARTED",
],
"extVirtualLinkInfo": [],
"vnfcResourceInfo": [],
- "monitoringParameters": {},
+ "monitoringParameters": [],
"flavourId": None,
"vnfVirtualLinkResourceInfo": [],
"scaleStatus": []
- },
- "vnfdVersion": None,
- "vnfPkgId": None
+ }
},
{
"id": "2",
"vnfInstanceName": "VNF2",
- "vnfProvider": None,
+ "vnfInstanceDescription": "VNF DESC",
+ "vnfdId": "1",
+ "vnfProvider": "ZTE",
+ "vnfProductName": "XGW",
+ "vnfSoftwareVersion": "V1",
+ "vnfdVersion": "V1",
+ "vnfPkgId": "2",
"instantiationState": "INSTANTIATED",
"instantiatedVnfInfo": {
"vnfState": "STARTED",
],
"extVirtualLinkInfo": [],
"vnfcResourceInfo": [],
- "monitoringParameters": {},
+ "monitoringParameters": [],
"flavourId": None,
"vnfVirtualLinkResourceInfo": [],
"scaleStatus": []
- },
- "vnfdVersion": None,
- "vnfPkgId": None
+ }
}
]
def test_get_vnf(self):
vnf_inst_id = "1"
- NfInstModel(nfinstid=vnf_inst_id, nf_name='VNF1', status='INSTANTIATED').save()
+ NfInstModel(nfinstid=vnf_inst_id,
+ nf_name='VNF1',
+ nf_desc="VNF DESC",
+ vnfdid="1",
+ netype="XGW",
+ vendor="ZTE",
+ vnfSoftwareVersion="V1",
+ version="V1",
+ package_id="2",
+ status='INSTANTIATED').save()
StorageInstModel(storageid='s02',
vimid='vim01',
resourceid='resource01',
def test_get_vnf_not_exist(self):
response = self.client.get("/api/vnflcm/v1/vnf_instances/x", format='json')
self.assertEqual(response.status_code, status.HTTP_500_INTERNAL_SERVER_ERROR)
- self.assertEqual({'error': 'VnfInst(x) does not exist.'}, response.data)
+ self.assertEqual({
+ 'detail': 'VnfInst(x) does not exist.',
+ 'status': 500
+ }, response.data)
def test_get_vnf_net_not_exist(self):
vnf_inst_id = "1"
- NfInstModel(nfinstid=vnf_inst_id, nf_name='VNF1', status='INSTANTIATED').save()
- VLInstModel(ownerid=vnf_inst_id, relatednetworkid='x', ownertype='0').save()
+ NfInstModel(nfinstid=vnf_inst_id,
+ nf_name='VNF1',
+ vnfdid="1",
+ netype="XGW",
+ vendor="ZTE",
+ vnfSoftwareVersion="V1",
+ version="V1",
+ package_id="2",
+ status='INSTANTIATED').save()
+ VLInstModel(ownerid=vnf_inst_id,
+ relatednetworkid='x',
+ ownertype='0').save()
response = self.client.get("/api/vnflcm/v1/vnf_instances/%s" % vnf_inst_id, format='json')
self.assertEqual(response.status_code, status.HTTP_500_INTERNAL_SERVER_ERROR)
- self.assertEqual({'error': 'NetworkInst(x) does not exist.'}, response.data)
+ self.assertEqual({
+ 'detail': 'NetworkInst(x) does not exist.',
+ 'status': 500
+ }, response.data)
def test_get_vnf_vm_not_exist(self):
vnf_inst_id = "1"
- NfInstModel(nfinstid=vnf_inst_id, nf_name='VNF1', status='INSTANTIATED').save()
- VNFCInstModel(instid=vnf_inst_id, vmid='x').save()
+ NfInstModel(nfinstid=vnf_inst_id,
+ nf_name='VNF1',
+ vnfdid="1",
+ netype="XGW",
+ vendor="ZTE",
+ vnfSoftwareVersion="V1",
+ version="V1",
+ package_id="2",
+ status='INSTANTIATED').save()
+ VNFCInstModel(instid=vnf_inst_id,
+ vmid='x').save()
response = self.client.get("/api/vnflcm/v1/vnf_instances/%s" % vnf_inst_id, format='json')
self.assertEqual(response.status_code, status.HTTP_500_INTERNAL_SERVER_ERROR)
- self.assertEqual({'error': 'VmInst(x) does not exist.'}, response.data)
+ self.assertEqual({
+ 'detail': 'VmInst(x) does not exist.',
+ 'status': 500
+ }, response.data)
def test_get_vnf_storage_not_exist(self):
vnf_inst_id = "1"
- NfInstModel(nfinstid=vnf_inst_id, nf_name='VNF1', status='INSTANTIATED').save()
+ NfInstModel(nfinstid=vnf_inst_id,
+ nf_name='VNF1',
+ vnfdid="1",
+ netype="XGW",
+ vendor="ZTE",
+ vnfSoftwareVersion="V1",
+ version="V1",
+ package_id="2",
+ status='INSTANTIATED').save()
VNFCInstModel(instid=vnf_inst_id,
vmid='x',).save()
VmInstModel(vmid='x', insttype='0').save()
response = self.client.get("/api/vnflcm/v1/vnf_instances/%s" % vnf_inst_id, format='json')
self.assertEqual(response.status_code, status.HTTP_500_INTERNAL_SERVER_ERROR)
- self.assertEqual({'error': 'StorageInst(x) does not exist.'}, response.data)
def test_get_vnfs(self):
for i in range(1, 3):
NfInstModel(nfinstid='%s' % i,
nf_name='VNF%s' % i,
+ nf_desc="VNF DESC",
+ vnfdid="1",
+ netype="XGW",
+ vendor="ZTE",
+ vnfSoftwareVersion="V1",
+ version="V1",
+ package_id="2",
status='INSTANTIATED').save()
StorageInstModel(storageid='s0%s' % i,
vimid='vim0%s' % i,
insttype=1,
instid='%s' % i).save()
response = self.client.get("/api/vnflcm/v1/vnf_instances", format='json')
- self.failUnlessEqual(status.HTTP_200_OK, response.status_code)
+ self.assertEqual(status.HTTP_200_OK, response.status_code)
self.assertEqual(self.test_data_multi_vnf, response.data)
def test_get_vnfs_not_exist(self):
response = self.client.get("/api/vnflcm/v1/vnf_instances", format='json')
- self.assertEqual(response.status_code, status.HTTP_500_INTERNAL_SERVER_ERROR)
- self.assertEqual({'error': 'VnfInsts does not exist.'}, response.data)
+ self.assertEqual(response.status_code, status.HTTP_200_OK)