resp_data = {
"id": vnf.nfinstid,
"vnfInstanceName": vnf.nf_name,
- "vnfPkgId": vnf.package_id,
- "vnfdVersion": vnf.version,
+ "vnfInstanceDescription": vnf.nf_desc,
+ "vnfdId": vnf.vnfdid,
"vnfProvider": vnf.vendor,
+ "vnfProductName": vnf.netype,
+ "vnfSoftwareVersion": vnf.vnfSoftwareVersion,
+ "vnfdVersion": vnf.version,
+ "vnfPkgId": vnf.package_id,
"instantiationState": vnf.status,
"instantiatedVnfInfo": {
"flavourId": vnf.flavour_id,
"scaleStatus": [],
"extCpInfo": [],
"extVirtualLinkInfo": [],
- "monitoringParameters": {},
+ "monitoringParameters": [],
"vnfcResourceInfo": vnfc_arr,
"vnfVirtualLinkResourceInfo": vl_arr,
"virtualStorageResourceInfo": arr
}
}
+ logger.debug("vnf instance: %s", resp_data)
return resp_data
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',
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,