openstack/tacker
Code Issues Proposed changes

fix contents of grant request

Browse Source 
This patch fixes some attributes of grant request for instantiate
and terminate of v2 API.

In the process of fixing bug #1949318 and adding UTs, some other
mistakes are found and fixed at the same time.

* fix number of STORAGE resource definitions of instantiate grant
  request is not correct.
* fix extManagedVLs are included in VL resource definitions of
  instantiate grant mistakenly.
* fix interpretation of vnfcCpInfo attributes is not correct when
  making terminate grant request.
* fix an incorrect variable used to handle extManagedVirtualLinkInfo
  when making terminate grant request. (fix bug #1949318)

Closes-Bug: #1949318
Change-Id: I61baaee8fec5bb2e1e954900dd2b9361ac594546
This commit is contained in:
Itsuro Oda 2021-11-01 00:09:03 +00:00
parent 975cce621e
commit 8029f4e101
5 changed files with 755 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tacker/sol_refactored/common/vnfd_utils.py
View File

@ -185,6 +185,13 @@ class Vnfd(object):
break
return cps
def get_vdu_storages(self, vdu_node):
storages = [req['virtual_storage']
for req in vdu_node.get('requirements', [])
if 'virtual_storage' in req]
return storages
def get_base_hot(self, flavour_id):
# NOTE: this method is openstack specific
hot_dict = {}

40
tacker/sol_refactored/conductor/vnflcm_driver_v2.py
View File

@ -84,9 +84,11 @@ class VnfLcmDriverV2(object):
add_reses = []
nodes = vnfd.get_vdu_nodes(flavour_id)
link_port_names = self._get_link_ports(req)
for name in nodes.keys():
for name, node in nodes.items():
num = vnfd.get_vdu_num(flavour_id, name, inst_level)
vdu_cp_names = vnfd.get_vdu_cps(flavour_id, name)
vdu_storage_names = vnfd.get_vdu_storages(node)
for _ in range(num):
res_def = objects.ResourceDefinitionV1(
id=uuidutils.generate_uuid(),
@ -104,16 +106,22 @@ class VnfLcmDriverV2(object):
resourceTemplateId=cp_name)
add_reses.append(res_def)
nodes = vnfd.get_storage_nodes(flavour_id)
for name in nodes.keys():
res_def = objects.ResourceDefinitionV1(
id=uuidutils.generate_uuid(),
type='STORAGE',
resourceTemplateId=name)
add_reses.append(res_def)
for storage_name in vdu_storage_names:
for _ in range(num):
res_def = objects.ResourceDefinitionV1(
id=uuidutils.generate_uuid(),
type='STORAGE',
resourceTemplateId=storage_name)
add_reses.append(res_def)
ext_mgd_vls = []
if req.obj_attr_is_set('extManagedVirtualLinks'):
ext_mgd_vls = [ext_mgd_vl.vnfVirtualLinkDescId
for ext_mgd_vl in req.extManagedVirtualLinks]
nodes = vnfd.get_virtual_link_nodes(flavour_id)
for name in nodes.keys():
if name in ext_mgd_vls:
continue
res_def = objects.ResourceDefinitionV1(
id=uuidutils.generate_uuid(),
type='VL',
@ -277,9 +285,13 @@ class VnfLcmDriverV2(object):
for cp_info in inst_vnc.vnfcCpInfo:
res_def = objects.ResourceDefinitionV1(
id=uuidutils.generate_uuid(),
resourceTemplateId=cp_info.cpdId,
type='LINKPORT')
rm_reses.append(res_def)
vnfc_cps[cp_info.id] = res_def
if cp_info.obj_attr_is_set('vnfExtCpId'):
vnfc_cps[cp_info.vnfExtCpId] = res_def
else: # vnfLinkPortId
vnfc_cps[cp_info.vnfLinkPortId] = res_def
if inst_info.obj_attr_is_set('vnfVirtualLinkResourceInfo'):
for inst_vl in inst_info.vnfVirtualLinkResourceInfo:
@ -292,8 +304,8 @@ class VnfLcmDriverV2(object):
if inst_vl.obj_attr_is_set('vnfLinkPorts'):
for port in inst_vl.vnfLinkPorts:
if port.cpInstanceId in vnfc_cps:
res_def = vnfc_cps[port.cpInstanceId]
if port.id in vnfc_cps:
res_def = vnfc_cps[port.id]
res_def.resource = port.resourceHandle
if inst_info.obj_attr_is_set('virtualStorageResourceInfo'):
@ -317,10 +329,10 @@ class VnfLcmDriverV2(object):
if inst_info.obj_attr_is_set('extManagedVirtualLinkInfo'):
for ext_mgd_vl in inst_info.extManagedVirtualLinkInfo:
if ext_mgd_vl.obj_attr_is_set('vnfLinkPorts'):
for port in ext_vl.extLinkPorts:
for port in ext_mgd_vl.vnfLinkPorts:
if (port.obj_attr_is_set('cpInstanceId') and
port.cpInstanceId in vnfc_cps):
res_def = vnfc_cps[port.cpInstanceId]
port.id in vnfc_cps):
res_def = vnfc_cps[port.id]
res_def.resource = port.resourceHandle
if rm_reses:

10
tacker/tests/unit/sol_refactored/common/test_vnfd_utils.py
View File

@ -86,6 +86,16 @@ class TestVnfd(base.BaseTestCase):
self.assertEqual(expected_result, result)
def test_get_vdu_storages(self):
vdu_nodes = self.vnfd_1.get_vdu_nodes(SAMPLE_FLAVOUR_ID)
expected_result = ['VirtualStorage']
result = self.vnfd_1.get_vdu_storages(vdu_nodes['VDU1'])
self.assertEqual(expected_result, result)
expected_result = []
result = self.vnfd_1.get_vdu_storages(vdu_nodes['VDU2'])
self.assertEqual(expected_result, result)
def test_get_base_hot(self):
result = self.vnfd_1.get_base_hot(SAMPLE_FLAVOUR_ID)
# check keys and sampling data

0
tacker/tests/unit/sol_refactored/conductor/__init__.py Normal file
View File

712
tacker/tests/unit/sol_refactored/conductor/test_vnflcm_driver_v2.py Normal file
View File

@ -0,0 +1,712 @@
# Copyright (C) 2021 Nippon Telegraph and Telephone Corporation
# All Rights Reserved.
#
# 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.
from datetime import datetime
import os
from unittest import mock
from oslo_utils import uuidutils
from tacker import context
from tacker.sol_refactored.common import vnfd_utils
from tacker.sol_refactored.conductor import vnflcm_driver_v2
from tacker.sol_refactored.nfvo import nfvo_client
from tacker.sol_refactored import objects
from tacker.sol_refactored.objects.v2 import fields
from tacker.tests import base
SAMPLE_VNFD_ID = "b1bb0ce7-ebca-4fa7-95ed-4840d7000000"
SAMPLE_FLAVOUR_ID = "simple"
# InstantiateVnfRequest example for instantiate grant test
_ext_vl_1 = {
"id": uuidutils.generate_uuid(),
"resourceId": 'net0_id',
"extCps": [
{
"cpdId": "VDU1_CP1",
"cpConfig": {
"VDU1_CP1_1": {
"cpProtocolData": [{
"layerProtocol": "IP_OVER_ETHERNET",
"ipOverEthernet": {
"ipAddresses": [{
"type": "IPV4",
"numDynamicAddresses": 1}]}}]}
}
},
{
"cpdId": "VDU2_CP1",
"cpConfig": {
"VDU2_CP1_1": {
"cpProtocolData": [{
"layerProtocol": "IP_OVER_ETHERNET",
"ipOverEthernet": {
"ipAddresses": [{
"type": "IPV4",
"fixedAddresses": ["10.10.0.101"]}]}}]}
}
}
],
}
_ext_vl_2 = {
"id": uuidutils.generate_uuid(),
"resourceId": 'net1_id',
"extCps": [
{
"cpdId": "VDU1_CP2",
"cpConfig": {
"VDU1_CP2_1": {
"cpProtocolData": [{
"layerProtocol": "IP_OVER_ETHERNET",
"ipOverEthernet": {
"ipAddresses": [{
"type": "IPV4",
"numDynamicAddresses": 1,
"subnetId": 'subnet1_id'}]}}]}
}
},
{
"cpdId": "VDU2_CP2",
"cpConfig": {
"VDU2_CP2_1": {
"cpProtocolData": [{
"layerProtocol": "IP_OVER_ETHERNET",
"ipOverEthernet": {
"ipAddresses": [{
"type": "IPV4",
"fixedAddresses": ["10.10.1.101"],
"subnetId": 'subnet1_id'}]}}]}
}
}
]
}
_inst_req_example = {
"flavourId": "simple",
"instantiationLevelId": "instantiation_level_2",
"extVirtualLinks": [
_ext_vl_1,
_ext_vl_2
],
"extManagedVirtualLinks": [
{
"id": uuidutils.generate_uuid(),
"vnfVirtualLinkDescId": "internalVL1",
"resourceId": 'net_mgmt_id'
},
],
"vimConnectionInfo": {
"vim1": {
"vimType": "ETSINFV.OPENSTACK_KEYSTONE.V_3",
"vimId": uuidutils.generate_uuid(),
"interfaceInfo": {"endpoint": "http://localhost/identity/v3"},
"accessInfo": {
"username": "nfv_user",
"region": "RegionOne",
"password": "devstack",
"project": "nfv",
"projectDomain": "Default",
"userDomain": "Default"
}
}
}
}
# instantiatedVnfInfo example for terminate grant test
# NOTE:
# - some identifiers are modified to make check easy.
# - some attributes which are not related to make terminate grant
# retuest are omitted.
_inst_info_example = {
"flavourId": "simple",
"vnfState": "STARTED",
"extCpInfo": [
{
"id": "90561570-264c-4472-b84f-1fff98513475",
"cpdId": "VDU2_CP1",
"cpConfigId": "VDU2_CP1_1",
# "cpProtocolInfo": omitted
"extLinkPortId": "ac27c99b-73c8-4e91-b730-90deade72af4",
"associatedVnfcCpId": "be955786-a0c7-4b61-8cd8-9bb8bcb1c6e3"
},
{
"id": "f9f4b4b2-50e2-4c73-b89b-e0665e65ffbe",
"cpdId": "VDU2_CP2",
"cpConfigId": "VDU2_CP2_1",
# "cpProtocolInfo": omitted
"extLinkPortId": "12567a13-9fbd-4803-ad9f-d94ced266cd8",
"associatedVnfcCpId": "c54fa2fc-185a-49a7-bb89-f30f7c3be6a4"
},
{
"id": "05474d0b-a1f7-4be5-b57e-ef6873e1f3b6",
"cpdId": "VDU1_CP2",
"cpConfigId": "VDU1_CP2_1",
# "cpProtocolInfo": omitted
"extLinkPortId": "aa6646da-2e59-4de9-9b72-c62e7c4d9142",
"associatedVnfcCpId": "fdbb289f-87c8-40d0-bf06-da07b41ba124"
},
{
"id": "42ede9a6-c2b8-4c0d-a337-26342ffb236c",
"cpdId": "VDU1_CP1",
"cpConfigId": "VDU1_CP1_1",
# "cpProtocolInfo": omitted
"extLinkPortId": "efd0eb4e-4e55-4ac8-8b9b-403ec79faf2d",
"associatedVnfcCpId": "235f920c-8b49-4894-9c36-73f5a3b9f74d"
},
{
"id": "4f0ab1ad-b7de-482f-a69b-1093c71d2ceb",
"cpdId": "VDU1_CP2",
"cpConfigId": "VDU1_CP2_1",
# "cpProtocolInfo": omitted
"extLinkPortId": "a6c4c043-e082-4873-a871-02467af66224",
"associatedVnfcCpId": "e23d970d-9ea9-4c26-9d67-8f244383ea3c"
},
{
"id": "7a7fa30f-a303-4856-bc8b-b836cb682892",
"cpdId": "VDU1_CP1",
"cpConfigId": "VDU1_CP1_1",
# "cpProtocolInfo": omitted
"extLinkPortId": "f58df4d9-08ff-41b7-ab73-95ebfb8103c4",
"associatedVnfcCpId": "259c5895-7be6-4bed-8a94-221c41b3d08f"
}
],
"extVirtualLinkInfo": [
{
"id": "137bdf0b-835c-43f0-b0d2-5c002599118a",
"resourceHandle": {
"resourceId": "6f97f400-2861-482a-ba78-65b652aaf8fc"
},
"extLinkPorts": [
{
"id": "ac27c99b-73c8-4e91-b730-90deade72af4",
"resourceHandle": {
# "vimConnectionId": omitted
"resourceId": "res_id_VDU2_CP1",
"vimLevelResourceType": "OS::Neutron::Port"
},
"cpInstanceId": "90561570-264c-4472-b84f-1fff98513475"
},
{
"id": "efd0eb4e-4e55-4ac8-8b9b-403ec79faf2d",
"resourceHandle": {
# "vimConnectionId": omitted
"resourceId": "res_id_VDU1_1_CP1",
"vimLevelResourceType": "OS::Neutron::Port"
},
"cpInstanceId": "42ede9a6-c2b8-4c0d-a337-26342ffb236c"
},
{
"id": "f58df4d9-08ff-41b7-ab73-95ebfb8103c4",
"resourceHandle": {
# "vimConnectionId": omitted
"resourceId": "res_id_VDU1_2_CP1",
"vimLevelResourceType": "OS::Neutron::Port"
},
"cpInstanceId": "7a7fa30f-a303-4856-bc8b-b836cb682892"
}
],
# "currentVnfExtCpData": omitted
},
{
"id": "d8141a5a-6b6e-4dab-9bf5-158f23a617d7",
"resourceHandle": {
"resourceId": "02bc95e0-3d43-4d11-83b8-f7b15d8661a9"
},
"extLinkPorts": [
{
"id": "12567a13-9fbd-4803-ad9f-d94ced266cd8",
"resourceHandle": {
# "vimConnectionId": omitted
"resourceId": "res_id_VDU2_CP2",
"vimLevelResourceType": "OS::Neutron::Port"
},
"cpInstanceId": "f9f4b4b2-50e2-4c73-b89b-e0665e65ffbe"
},
{
"id": "aa6646da-2e59-4de9-9b72-c62e7c4d9142",
"resourceHandle": {
# "vimConnectionId": omitted
"resourceId": "res_id_VDU1_1_CP2",
"vimLevelResourceType": "OS::Neutron::Port"
},
"cpInstanceId": "05474d0b-a1f7-4be5-b57e-ef6873e1f3b6"
},
{
"id": "a6c4c043-e082-4873-a871-02467af66224",
"resourceHandle": {
# "vimConnectionId": omitted
"resourceId": "res_id_VDU1_2_CP2",
"vimLevelResourceType": "OS::Neutron::Port"
},
"cpInstanceId": "4f0ab1ad-b7de-482f-a69b-1093c71d2ceb"
}
],
# "currentVnfExtCpData": omitted
}
],
"extManagedVirtualLinkInfo": [
{
"id": "bad53df7-f1fa-482d-91b1-caec382aeec2",
"vnfVirtualLinkDescId": "internalVL1",
"networkResource": {
"resourceId": "56730009-169c-4f96-8141-828acf1ee067"
},
"vnfLinkPorts": [
{
"id": "74f387fe-6355-4af3-adc7-cdb507d5fa5f",
"resourceHandle": {
# "vimConnectionId": omitted
"resourceId": "res_id_VDU2_CP3",
"vimLevelResourceType": "OS::Neutron::Port"
},
"cpInstanceId": "5b0b336b-c207-4fa8-8b41-a5ad87d85cd0",
"cpInstanceType": "VNFC_CP"
},
{
"id": "4064ec55-b862-4527-a911-8752d3aa765a",
"resourceHandle": {
# "vimConnectionId": omitted
"resourceId": "res_id_VDU1_1_CP3",
"vimLevelResourceType": "OS::Neutron::Port"
},
"cpInstanceId": "b0732fb7-a42a-4077-aebc-d22b67b64f13",
"cpInstanceType": "VNFC_CP"
},
{
"id": "f3c9e62d-0f31-4a36-bd99-eecd8def0871",
"resourceHandle": {
# "vimConnectionId": omitted
"resourceId": "res_id_VDU1_2_CP3",
"vimLevelResourceType": "OS::Neutron::Port"
},
"cpInstanceId": "9c65f67e-feb2-447c-b0e7-a4f896185b4f",
"cpInstanceType": "VNFC_CP"
}
]
}
],
"vnfcResourceInfo": [
{
"id": "cdf36e11-f6ca-4c80-aaf1-0d2e764a2f3a",
"vduId": "VDU2",
"computeResource": {
# "vimConnectionId": omitted
"resourceId": "res_id_VDU2",
"vimLevelResourceType": "OS::Nova::Server"
},
"vnfcCpInfo": [
{
"id": "be955786-a0c7-4b61-8cd8-9bb8bcb1c6e3",
"cpdId": "VDU2_CP1",
"vnfExtCpId": "90561570-264c-4472-b84f-1fff98513475"
},
{
"id": "c54fa2fc-185a-49a7-bb89-f30f7c3be6a4",
"cpdId": "VDU2_CP2",
"vnfExtCpId": "f9f4b4b2-50e2-4c73-b89b-e0665e65ffbe"
},
{
"id": "5b0b336b-c207-4fa8-8b41-a5ad87d85cd0",
"cpdId": "VDU2_CP3",
"vnfLinkPortId": "74f387fe-6355-4af3-adc7-cdb507d5fa5f"
},
{
"id": "2cb2b3a8-a7a0-41da-b3b8-4b82f576b090",
"cpdId": "VDU2_CP4",
"vnfLinkPortId": "8e01813f-35fc-4a35-8f64-0da08a45ea21"
},
{
"id": "39a7d895-3b19-4330-b6ec-ae3557ea9c01",
"cpdId": "VDU2_CP5",
"vnfLinkPortId": "4dd7cadd-b9a1-484f-b2f2-1ff50ef0d90f"
}
]
},
{
"id": "c8cb522d-ddf8-4136-9c85-92bab8f2993d",
"vduId": "VDU1",
"computeResource": {
# "vimConnectionId": omitted
"resourceId": "res_id_VDU1_1",
"vimLevelResourceType": "OS::Nova::Server"
},
"storageResourceIds": ["2135b13c-e630-4700-8f8d-85b6e48f7871"],
"vnfcCpInfo": [
{
"id": "235f920c-8b49-4894-9c36-73f5a3b9f74d",
"cpdId": "VDU1_CP1",
"vnfExtCpId": "42ede9a6-c2b8-4c0d-a337-26342ffb236c"
},
{
"id": "fdbb289f-87c8-40d0-bf06-da07b41ba124",
"cpdId": "VDU1_CP2",
"vnfExtCpId": "05474d0b-a1f7-4be5-b57e-ef6873e1f3b6"
},
{
"id": "b0732fb7-a42a-4077-aebc-d22b67b64f13",
"cpdId": "VDU1_CP3",
"vnfLinkPortId": "4064ec55-b862-4527-a911-8752d3aa765a"
},
{
"id": "a49f8fb8-6fd9-4e9f-a6dd-0d268e51c83c",
"cpdId": "VDU1_CP4",
"vnfLinkPortId": "1666a0f7-6a34-474e-87a2-07fb0c30ecdb"
},
{
"id": "33194d65-ecd6-48d9-8ef7-c15ce9fef46c",
"cpdId": "VDU1_CP5",
"vnfLinkPortId": "ace663cd-431b-402a-b2ae-d0824c996edb"
}
]
},
{
"id": "9f6537ca-9fe3-4fa3-8e57-87930f90a1c6",
"vduId": "VDU1",
"computeResource": {
# "vimConnectionId": omitted
"resourceId": "res_id_VDU1_2",
"vimLevelResourceType": "OS::Nova::Server"
},
"storageResourceIds": ["739f7012-7973-485b-b34f-b006bc336150"],
"vnfcCpInfo": [
{
"id": "259c5895-7be6-4bed-8a94-221c41b3d08f",
"cpdId": "VDU1_CP1",
"vnfExtCpId": "7a7fa30f-a303-4856-bc8b-b836cb682892"
},
{
"id": "e23d970d-9ea9-4c26-9d67-8f244383ea3c",
"cpdId": "VDU1_CP2",
"vnfExtCpId": "4f0ab1ad-b7de-482f-a69b-1093c71d2ceb"
},
{
"id": "9c65f67e-feb2-447c-b0e7-a4f896185b4f",
"cpdId": "VDU1_CP3",
"vnfLinkPortId": "f3c9e62d-0f31-4a36-bd99-eecd8def0871"
},
{
"id": "0716ac20-612a-4ac2-8c87-d83be31dd4b5",
"cpdId": "VDU1_CP4",
"vnfLinkPortId": "bce3159b-caca-45b7-8bb7-88015e951e56"
},
{
"id": "c9112298-61eb-4bba-b285-ed3419593b1b",
"cpdId": "VDU1_CP5",
"vnfLinkPortId": "e0f98917-70ff-4f79-8747-9d7fc22827a4"
}
]
}
],
"vnfVirtualLinkResourceInfo": [
{
"id": "18bd0111-d5e1-4aa3-b2d8-5b89833c6351",
"vnfVirtualLinkDescId": "internalVL3",
"networkResource": {
# "vimConnectionId": omitted
"resourceId": "res_id_internalVL3",
"vimLevelResourceType": "OS::Neutron::Net"
},
"vnfLinkPorts": [
{
"id": "4dd7cadd-b9a1-484f-b2f2-1ff50ef0d90f",
"resourceHandle": {
# "vimConnectionId": omitted
"resourceId": "res_id_VDU2_CP5",
"vimLevelResourceType": "OS::Neutron::Port"
},
"cpInstanceId": "39a7d895-3b19-4330-b6ec-ae3557ea9c01",
"cpInstanceType": "VNFC_CP"
},
{
"id": "ace663cd-431b-402a-b2ae-d0824c996edb",
"resourceHandle": {
# "vimConnectionId": omitted
"resourceId": "res_id_VDU1_1_CP5",
"vimLevelResourceType": "OS::Neutron::Port"
},
"cpInstanceId": "33194d65-ecd6-48d9-8ef7-c15ce9fef46c",
"cpInstanceType": "VNFC_CP"
},
{
"id": "e0f98917-70ff-4f79-8747-9d7fc22827a4",
"resourceHandle": {
# "vimConnectionId": omitted
"resourceId": "res_id_VDU1_2_CP5",
"vimLevelResourceType": "OS::Neutron::Port"
},
"cpInstanceId": "c9112298-61eb-4bba-b285-ed3419593b1b",
"cpInstanceType": "VNFC_CP"
}
]
},
{
"id": "047aa313-b591-4529-aa98-cb8ce2b82e28",
"vnfVirtualLinkDescId": "internalVL2",
"networkResource": {
# "vimConnectionId": omitted
"resourceId": "res_id_internalVL2",
"vimLevelResourceType": "OS::Neutron::Net"
},
"vnfLinkPorts": [
{
"id": "8e01813f-35fc-4a35-8f64-0da08a45ea21",
"resourceHandle": {
# "vimConnectionId": omitted
"resourceId": "res_id_VDU2_CP4",
"vimLevelResourceType": "OS::Neutron::Port"
},
"cpInstanceId": "2cb2b3a8-a7a0-41da-b3b8-4b82f576b090",
"cpInstanceType": "VNFC_CP"
},
{
"id": "1666a0f7-6a34-474e-87a2-07fb0c30ecdb",
"resourceHandle": {
# "vimConnectionId": omitted
"resourceId": "res_id_VDU1_1_CP4",
"vimLevelResourceType": "OS::Neutron::Port"
},
"cpInstanceId": "a49f8fb8-6fd9-4e9f-a6dd-0d268e51c83c",
"cpInstanceType": "VNFC_CP"
},
{
"id": "bce3159b-caca-45b7-8bb7-88015e951e56",
"resourceHandle": {
# "vimConnectionId": omitted
"resourceId": "res_id_VDU1_2_CP4",
"vimLevelResourceType": "OS::Neutron::Port"
},
"cpInstanceId": "0716ac20-612a-4ac2-8c87-d83be31dd4b5",
"cpInstanceType": "VNFC_CP"
}
]
}
],
"virtualStorageResourceInfo": [
{
"id": "2135b13c-e630-4700-8f8d-85b6e48f7871",
"virtualStorageDescId": "VirtualStorage",
"storageResource": {
# "vimConnectionId": omitted
"resourceId": "res_id_VirtualStorage_1",
"vimLevelResourceType": "OS::Cinder::Volume"
}
},
{
"id": "739f7012-7973-485b-b34f-b006bc336150",
"virtualStorageDescId": "VirtualStorage",
"storageResource": {
# "vimConnectionId": omitted
"resourceId": "res_id_VirtualStorage_2",
"vimLevelResourceType": "OS::Cinder::Volume"
}
}
],
# "vnfcInfo": omitted
}
class TestVnfLcmDriverV2(base.BaseTestCase):
def setUp(self):
super(TestVnfLcmDriverV2, self).setUp()
objects.register_all()
self.driver = vnflcm_driver_v2.VnfLcmDriverV2()
self.context = context.get_admin_context()
cur_dir = os.path.dirname(__file__)
sample_dir = os.path.join(cur_dir, "..", "samples")
self.vnfd_1 = vnfd_utils.Vnfd(SAMPLE_VNFD_ID)
self.vnfd_1.init_from_csar_dir(os.path.join(sample_dir, "sample1"))
@mock.patch.object(nfvo_client.NfvoClient, 'grant')
def test_instantiate_grant(self, mocked_grant):
# prepare
req = objects.InstantiateVnfRequestV2.from_dict(_inst_req_example)
inst = objects.VnfInstanceV2(
# required fields
id=uuidutils.generate_uuid(),
vnfdId=SAMPLE_VNFD_ID,
vnfProvider='provider',
vnfProductName='product name',
vnfSoftwareVersion='software version',
vnfdVersion='vnfd version',
instantiationState='NOT_INSTANTIATED'
)
lcmocc = objects.VnfLcmOpOccV2(
# required fields
id=uuidutils.generate_uuid(),
operationState=fields.LcmOperationStateType.PROCESSING,
stateEnteredTime=datetime.utcnow(),
startTime=datetime.utcnow(),
vnfInstanceId=inst.id,
operation=fields.LcmOperationType.INSTANTIATE,
isAutomaticInvocation=False,
isCancelPending=False,
operationParams=req)
mocked_grant.return_value = objects.GrantV1()
# run instantiate_grant
grant_req, _ = self.driver.instantiate_grant(
self.context, lcmocc, inst, self.vnfd_1)
# check grant_req is constructed according to intention
grant_req = grant_req.to_dict()
expected_fixed_items = {
'vnfInstanceId': inst.id,
'vnfLcmOpOccId': lcmocc.id,
'vnfdId': SAMPLE_VNFD_ID,
'flavourId': SAMPLE_FLAVOUR_ID,
'operation': 'INSTANTIATE',
'isAutomaticInvocation': False,
'instantiationLevelId': 'instantiation_level_2'
}
for key, value in expected_fixed_items.items():
self.assertEqual(value, grant_req[key])
add_reses = grant_req['addResources']
check_reses = {
'COMPUTE': {'VDU1': [], 'VDU2': []},
'STORAGE': {'VirtualStorage': []},
'LINKPORT': {'VDU1_CP1': [], 'VDU1_CP2': [], 'VDU1_CP3': [],
'VDU1_CP4': [], 'VDU1_CP5': [],
'VDU2_CP1': [], 'VDU2_CP2': [], 'VDU2_CP3': [],
'VDU2_CP4': [], 'VDU2_CP5': []},
# internalVL1 does not exist
'VL': {'internalVL2': [], 'internalVL3': []}
}
expected_num = {
'COMPUTE': {'VDU1': 3, 'VDU2': 1},
'STORAGE': {'VirtualStorage': 3},
'LINKPORT': {'VDU1_CP1': 3, 'VDU1_CP2': 3, 'VDU1_CP3': 3,
'VDU1_CP4': 3, 'VDU1_CP5': 3,
'VDU2_CP1': 1, 'VDU2_CP2': 1, 'VDU2_CP3': 1,
'VDU2_CP4': 1, 'VDU2_CP5': 1},
'VL': {'internalVL2': 1, 'internalVL3': 1}
}
for res in add_reses:
check_reses[res['type']][res['resourceTemplateId']].append(
res['id'])
for key, value in check_reses.items():
for name, ids in value.items():
self.assertEqual(expected_num[key][name], len(ids))
expected_placement_constraints = [{
'affinityOrAntiAffinity': 'ANTI_AFFINITY',
'scope': 'NFVI_NODE',
'resource': []}]
vdu_def_ids = (check_reses['COMPUTE']['VDU1'] +
check_reses['COMPUTE']['VDU2'])
for def_id in vdu_def_ids:
expected_placement_constraints[0]['resource'].append(
{'idType': 'GRANT', 'resourceId': def_id})
self.assertEqual(expected_placement_constraints,
grant_req['placementConstraints'])
@mock.patch.object(nfvo_client.NfvoClient, 'grant')
def test_terminate_grant(self, mocked_grant):
# prepare
inst = objects.VnfInstanceV2(
# required fields
id=uuidutils.generate_uuid(),
vnfdId=SAMPLE_VNFD_ID,
vnfProvider='provider',
vnfProductName='product name',
vnfSoftwareVersion='software version',
vnfdVersion='vnfd version',
instantiationState='INSTANTIATED'
)
inst_info = objects.VnfInstanceV2_InstantiatedVnfInfo.from_dict(
_inst_info_example)
inst.instantiatedVnfInfo = inst_info
req = objects.TerminateVnfRequest.from_dict(
{"terminationType": "FORCEFUL"})
lcmocc = objects.VnfLcmOpOccV2(
# required fields
id=uuidutils.generate_uuid(),
operationState=fields.LcmOperationStateType.PROCESSING,
stateEnteredTime=datetime.utcnow(),
startTime=datetime.utcnow(),
vnfInstanceId=inst.id,
operation=fields.LcmOperationType.TERMINATE,
isAutomaticInvocation=False,
isCancelPending=False,
operationParams=req)
mocked_grant.return_value = objects.GrantV1()
# run terminate_grant
grant_req, _ = self.driver.terminate_grant(
self.context, lcmocc, inst, self.vnfd_1)
# check grant_req is constructed according to intention
grant_req = grant_req.to_dict()
expected_fixed_items = {
'vnfInstanceId': inst.id,
'vnfLcmOpOccId': lcmocc.id,
'vnfdId': SAMPLE_VNFD_ID,
'operation': 'TERMINATE',
'isAutomaticInvocation': False
}
for key, value in expected_fixed_items.items():
self.assertEqual(value, grant_req[key])
rm_reses = grant_req['removeResources']
check_reses = {
'COMPUTE': {'VDU1': [], 'VDU2': []},
'STORAGE': {'VirtualStorage': []},
'LINKPORT': {'VDU1_CP1': [], 'VDU1_CP2': [], 'VDU1_CP3': [],
'VDU1_CP4': [], 'VDU1_CP5': [],
'VDU2_CP1': [], 'VDU2_CP2': [], 'VDU2_CP3': [],
'VDU2_CP4': [], 'VDU2_CP5': []},
'VL': {'internalVL2': [], 'internalVL3': []}
}
expected_res_ids = {
'COMPUTE': {
'VDU1': ['res_id_VDU1_1', 'res_id_VDU1_2'],
'VDU2': ['res_id_VDU2']
},
'STORAGE': {
'VirtualStorage': ['res_id_VirtualStorage_1',
'res_id_VirtualStorage_2']
},
'LINKPORT': {
'VDU1_CP1': ['res_id_VDU1_1_CP1', 'res_id_VDU1_2_CP1'],
'VDU1_CP2': ['res_id_VDU1_1_CP2', 'res_id_VDU1_2_CP2'],
'VDU1_CP3': ['res_id_VDU1_1_CP3', 'res_id_VDU1_2_CP3'],
'VDU1_CP4': ['res_id_VDU1_1_CP4', 'res_id_VDU1_2_CP4'],
'VDU1_CP5': ['res_id_VDU1_1_CP5', 'res_id_VDU1_2_CP5'],
'VDU2_CP1': ['res_id_VDU2_CP1'],
'VDU2_CP2': ['res_id_VDU2_CP2'],
'VDU2_CP3': ['res_id_VDU2_CP3'],
'VDU2_CP4': ['res_id_VDU2_CP4'],
'VDU2_CP5': ['res_id_VDU2_CP5']
},
'VL': {
'internalVL2': ['res_id_internalVL2'],
'internalVL3': ['res_id_internalVL3']
}
}
for res in rm_reses:
check_reses[res['type']][res['resourceTemplateId']].append(
res['resource']['resourceId'])
for key, value in check_reses.items():
for name, ids in value.items():
self.assertEqual(expected_res_ids[key][name], ids)