if vnfc.vmid:
vm = VmInstModel.objects.filter(vmid=vnfc.vmid)
if vm:
- vm_resource = {'vimId': vm[0].vimConnectionId, 'resourceId': vm[0].resouceid,
- 'resourceProviderId': vm[0].vmname, 'vimLevelResourceType': 'vm'}
+ vm_resource = {
+ 'vimId': vm[0].vimConnectionId,
+ 'resourceId': vm[0].resouceid,
+ 'resourceProviderId': vm[0].vmname,
+ 'vimLevelResourceType': 'vm'
+ }
# TODO: is resourceName mapped to resourceProviderId?
- affected_vnfcs.append(
- {'id': vnfc.vnfcinstanceid,
- 'vduId': vnfc.vduid,
- 'changeType': 'ADDED',
- 'computeResource': vm_resource})
+ affected_vnfcs.append({
+ 'id': vnfc.vnfcinstanceid,
+ 'vduId': vnfc.vduid,
+ 'changeType': 'ADDED',
+ 'computeResource': vm_resource
+ })
affected_vls = []
networks = NetworkInstModel.objects.filter(instid=self.nf_inst_id)
for network in networks:
- network_resource = {'vimConnectionId': network.vimid, 'resourceId': network.resouceid,
- 'resourceProviderId': network.name, 'vimLevelResourceType': 'network'}
+ network_resource = {
+ 'vimConnectionId': network.vimid,
+ 'resourceId': network.resouceid,
+ 'resourceProviderId': network.name,
+ 'vimLevelResourceType': 'network'
+ }
# TODO: is resourceName mapped to resourceProviderId?
- affected_vls.append(
- {'id': network.networkid,
- 'virtualLinkDescId': network.nodeId,
- 'changeType': 'ADDED',
- 'networkResource': network_resource})
+ affected_vls.append({
+ 'id': network.networkid,
+ 'virtualLinkDescId': network.nodeId,
+ 'changeType': 'ADDED',
+ 'networkResource': network_resource
+ })
ext_link_ports = []
ports = PortInstModel.objects.filter(instid=self.nf_inst_id)
for port in ports:
# TODO: is resourceName mapped to resourceProviderId?
content_args = {
"notificationType": 'VnfLcmOperationOccurrenceNotification',
- "notificationStatus": 'Result',
+ "notificationStatus": 'RESULT',
"vnfInstanceId": self.nf_inst_id,
"operation": 'INSTANTIATE',
"vnfLcmOpOccId": self.job_id,
def query_notify_data(self):
logger.info('Send notify request to nfvo')
- affected_vnfc = []
+ affected_vnfcs = []
vnfcs = VNFCInstModel.objects.filter(instid=self.nf_inst_id)
for vnfc in vnfcs:
vm_resource = {}
if vnfc.vmid:
vm = VmInstModel.objects.filter(vmid=vnfc.vmid)
if vm:
- vm_resource = {'vimId': vm[0].vimid, 'resourceId': vm[0].resouceid,
- 'resourceName': vm[0].vmname, 'resourceType': 'vm'}
- affected_vnfc.append(
- {'vnfcInstanceId': vnfc.vnfcinstanceid,
- 'vduId': vnfc.vduid,
- 'changeType': 'removed',
- 'computeResource': vm_resource})
- affected_vl = []
+ vm_resource = {
+ 'vimId': vm[0].vimid,
+ 'resourceId': vm[0].resouceid,
+ 'resourceProviderId': vm[0].vmname,
+ 'vimLevelResourceType': 'vm'
+ }
+ affected_vnfcs.append({
+ 'id': vnfc.vnfcinstanceid,
+ 'vduId': vnfc.vduid,
+ 'changeType': 'REMOVED',
+ 'computeResource': vm_resource
+ })
+ affected_vls = []
networks = NetworkInstModel.objects.filter(instid=self.nf_inst_id)
for network in networks:
network_resource = {
- 'vimId': network.vimid,
+ 'vimConnectionId': network.vimid,
'resourceId': network.resouceid,
- 'resourceName': network.name,
- 'resourceType': 'network'}
- affected_vl.append(
- {'vlInstanceId': network.networkid,
- 'vldid': network.nodeId,
- 'changeType': 'removed',
- 'networkResource': network_resource})
- affected_cp = []
+ 'resourceProviderId': network.name,
+ 'vimLevelResourceType': 'network'
+ }
+ affected_vls.append({
+ 'id': network.networkid,
+ 'virtualLinkDescId': network.nodeId,
+ 'changeType': 'REMOVED',
+ 'networkResource': network_resource
+ })
+ ext_link_ports = []
ports = PortInstModel.objects.filter(instid=self.nf_inst_id)
for port in ports:
- affected_cp.append(
- {'vsInstanceId': port.portid,
- 'cpdid': port.nodeId,
- 'changeType': 'removed',
- 'storageResource': {'vimId': port.vimid, 'resourceId': port.resouceid,
- 'resourceName': port.name, 'resourceType': 'port'}})
- affected_vs = []
+ ext_link_ports.append({
+ 'id': port.portid,
+ 'resourceHandle': {
+ 'vimConnectionId': port.vimid,
+ 'resourceId': port.resouceid,
+ 'resourceProviderId': port.name,
+ 'vimLevelResourceType': 'port'
+ },
+ 'cpInstanceId': port.cpinstanceid
+ })
+ affected_vss = []
vss = StorageInstModel.objects.filter(instid=self.nf_inst_id)
for vs in vss:
- affected_vs.append(
- {'vsInstanceId': vs.storageid,
- 'vsdId': vs.nodeId,
- 'changeType': 'removed',
- 'storageResource': {'vimId': vs.vimid, 'resourceId': vs.resouceid,
- 'resourceName': vs.name, 'resourceType': 'volume'}})
+ affected_vss.append({
+ 'id': vs.storageid,
+ 'virtualStorageDescId': vs.nodeId,
+ 'changeType': 'REMOVED',
+ 'storageResource': {
+ 'vimConnectionId': vs.vimid,
+ 'resourceId': vs.resouceid,
+ 'resourceProviderId': vs.name,
+ 'vimLevelResourceType': 'volume'
+ }
+ })
FlavourInstModel.objects.filter(instid=self.nf_inst_id)
SubNetworkInstModel.objects.filter(instid=self.nf_inst_id)
self.notify_data = {
- "status": 'result',
+ "notificationType": 'VnfLcmOperationOccurrenceNotification',
+ "notificationStatus": 'RESULT',
"vnfInstanceId": self.nf_inst_id,
- "operation": 'Terminal',
- "jobId": self.job_id,
- 'affectedVnfc': affected_vnfc,
- 'affectedVirtualLink': affected_vl,
- 'affectedVirtualStorage': affected_vs,
- 'affectedCp': affected_cp}
+ "operation": 'TERMINATE',
+ "vnfLcmOpOccId": self.job_id,
+ 'affectedVnfcs': affected_vnfcs,
+ 'affectedVirtualLinks': affected_vls,
+ 'affectedVirtualStorages': affected_vss,
+ 'chengedExtConnectivity': [{
+ 'id': None, # TODO
+ 'resourceHandle': None, # TODO
+ 'extLinkPorts': ext_link_ports
+ }]
+ }
vnfInsts = NfInstModel.objects.filter(nfinstid=self.nf_inst_id)
- self.notify_data['VNFMID'] = vnfInsts[0].vnfminstid
+ self.notify_data['vnfmInstId'] = vnfInsts[0].vnfminstid
logger.info('Notify request data=%s' % self.notify_data)
def delete_resource(self):
--- /dev/null
+# Copyright 2018 ZTE Corporation.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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 unittest
+import mock
+import enumutil
+import fileutil
+import urllib2
+import syscomm
+import timeutil
+import values
+
+from lcm.pub.database.models import JobStatusModel, JobModel
+from lcm.pub.utils.jobutil import JobUtil
+
+
+class MockReq():
+ def read(self):
+ return "1"
+
+ def close(self):
+ pass
+
+
+class UtilsTest(unittest.TestCase):
+ def setUp(self):
+ pass
+
+ def tearDown(self):
+ pass
+
+ def test_enum(self):
+ MY_TYPE = enumutil.enum(SAMLL=0, LARGE=1)
+ self.assertEqual(0, MY_TYPE.SAMLL)
+ self.assertEqual(1, MY_TYPE.LARGE)
+
+ def test_create_and_delete_dir(self):
+ dirs = "abc/def/hij"
+ fileutil.make_dirs(dirs)
+ fileutil.make_dirs(dirs)
+ fileutil.delete_dirs(dirs)
+
+ @mock.patch.object(urllib2, 'urlopen')
+ def test_download_file_from_http(self, mock_urlopen):
+ mock_urlopen.return_value = MockReq()
+ fileutil.delete_dirs("abc")
+ is_ok, f_name = fileutil.download_file_from_http("1", "abc", "1.txt")
+ self.assertTrue(is_ok)
+ self.assertTrue(f_name.endswith("abc/1.txt"))
+ fileutil.delete_dirs("abc")
+
+ def test_query_job_status(self):
+ job_id = "1"
+ JobStatusModel.objects.filter().delete()
+ JobStatusModel(
+ indexid=1,
+ jobid=job_id,
+ status="success",
+ progress=10
+ ).save()
+ JobStatusModel(
+ indexid=2,
+ jobid=job_id,
+ status="success",
+ progress=50
+ ).save()
+ JobStatusModel(
+ indexid=3,
+ jobid=job_id,
+ status="success",
+ progress=100
+ ).save()
+ jobs = JobUtil.query_job_status(job_id)
+ self.assertEqual(1, len(jobs))
+ self.assertEqual(3, jobs[0].indexid)
+ jobs = JobUtil.query_job_status(job_id, 1)
+ self.assertEqual(2, len(jobs))
+ self.assertEqual(3, jobs[0].indexid)
+ self.assertEqual(2, jobs[1].indexid)
+ JobStatusModel.objects.filter().delete()
+
+ def test_is_job_exists(self):
+ job_id = "1"
+ JobModel.objects.filter().delete()
+ JobModel(
+ jobid=job_id,
+ jobtype="1",
+ jobaction="2",
+ resid="3",
+ status=0
+ ).save()
+ self.assertTrue(JobUtil.is_job_exists(job_id))
+ JobModel.objects.filter().delete()
+
+ def test_create_job(self):
+ job_id = "5"
+ JobModel.objects.filter().delete()
+ JobUtil.create_job(
+ inst_type="1",
+ jobaction="2",
+ inst_id="3",
+ user="4",
+ job_id=5,
+ res_name="6")
+ self.assertEqual(1, len(JobModel.objects.filter(jobid=job_id)))
+ JobModel.objects.filter().delete()
+
+ def test_clear_job(self):
+ job_id = "1"
+ JobModel.objects.filter().delete()
+ JobModel(
+ jobid=job_id,
+ jobtype="1",
+ jobaction="2",
+ resid="3",
+ status=0
+ ).save()
+ JobUtil.clear_job(job_id)
+ self.assertEqual(0, len(JobModel.objects.filter(jobid=job_id)))
+
+ def test_add_job_status_when_job_is_not_created(self):
+ JobModel.objects.filter().delete()
+ self.assertRaises(
+ Exception,
+ JobUtil.add_job_status,
+ job_id="1",
+ progress=1,
+ status_decs="2",
+ error_code="0"
+ )
+
+ def test_add_job_status_normal(self):
+ job_id = "1"
+ JobModel.objects.filter().delete()
+ JobStatusModel.objects.filter().delete()
+ JobModel(
+ jobid=job_id,
+ jobtype="1",
+ jobaction="2",
+ resid="3",
+ status=0
+ ).save()
+ JobUtil.add_job_status(
+ job_id="1",
+ progress=1,
+ status_decs="2",
+ error_code="0"
+ )
+ self.assertEqual(1, len(JobStatusModel.objects.filter(jobid=job_id)))
+ JobStatusModel.objects.filter().delete()
+ JobModel.objects.filter().delete()
+
+ def test_clear_job_status(self):
+ job_id = "1"
+ JobStatusModel.objects.filter().delete()
+ JobStatusModel(
+ indexid=1,
+ jobid=job_id,
+ status="success",
+ progress=10
+ ).save()
+ JobUtil.clear_job_status(job_id)
+ self.assertEqual(0, len(JobStatusModel.objects.filter(jobid=job_id)))
+
+ def test_get_unfinished_jobs(self):
+ JobModel.objects.filter().delete()
+ JobModel(
+ jobid="11",
+ jobtype="InstVnf",
+ jobaction="2",
+ resid="3",
+ status=0
+ ).save()
+ JobModel(
+ jobid="22",
+ jobtype="InstVnf",
+ jobaction="2",
+ resid="3",
+ status=0
+ ).save()
+ JobModel(
+ jobid="33",
+ jobtype="InstVnf",
+ jobaction="2",
+ resid="3",
+ status=0
+ ).save()
+ progresses = JobUtil.get_unfinished_jobs(
+ url_prefix="/vnfinst",
+ inst_id="3",
+ inst_type="InstVnf"
+ )
+ expect_progresses = ['/vnfinst/11', '/vnfinst/22', '/vnfinst/33']
+ self.assertEqual(expect_progresses, progresses)
+ JobModel.objects.filter().delete()
+
+ def test_fun_name(self):
+ self.assertEqual("test_fun_name", syscomm.fun_name())
+
+ def test_now_time(self):
+ self.assertIn(":", timeutil.now_time())
+ self.assertIn("-", timeutil.now_time())
+
+ def test_ignore_case_get(self):
+ data = {
+ "Abc": "def",
+ "HIG": "klm"
+ }
+ self.assertEqual("def", values.ignore_case_get(data, 'ABC'))
+ self.assertEqual("def", values.ignore_case_get(data, 'abc'))
+ self.assertEqual("klm", values.ignore_case_get(data, 'hig'))
+ self.assertEqual("bbb", values.ignore_case_get(data, 'aaa', 'bbb'))
Code Review / vfc / gvnfm / vnflcm.git / commitdiff