openstack/tacker
Code Issues Proposed changes

Merge "Fix MgmtDriver can not be called when scale CNF"

Browse Source
This commit is contained in:
Zuul
2021-08-01 16:06:01 +00:00
committed by Gerrit Code Review
parent e0250d375b f4774e86ce
commit b84a1dc16b
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tacker/tests/unit/vnflcm/test_vnflcm_driver.py
View File

@@ -1871,6 +1871,8 @@ class TestVnflcmDriver(db_base.SqlTestCase):
mock_invoke.side_effect = [
# Kubernetes.get_scale_in_ids called in _scale_vnf_pre()
[[], [], None, None],
# MgmtDriver called in scale_start()
None,
# Kubernetes.scale called in scale()
None,
# Kubernetes.scale_wait called in scale()

6
tacker/vnflcm/vnflcm_driver.py
View File

@@ -892,7 +892,8 @@ class VnfLcmDriver(abstract_driver.VnfInstanceAbstractDriver):
# passed from conductor to vnflcm_driver, thus we put Null
# value to grant and grant_reqeust temporary.
# This part will be updated in next release.
if len(scale_id_list) != 0:
if len(scale_id_list) != 0 or \
vim_connection_info.vim_type == 'kubernetes':
kwargs = {'scale_name_list': scale_name_list}
self._mgmt_manager.invoke(
self._load_vnf_interface(
@@ -956,7 +957,8 @@ class VnfLcmDriver(abstract_driver.VnfInstanceAbstractDriver):
# passed from conductor to vnflcm_driver, thus we put Null
# value to grant and grant_reqeust temporary.
# This part will be updated in next release.
if len(id_list) != 0:
if len(id_list) != 0 or \
vim_connection_info.vim_type == 'kubernetes':
kwargs = {'scale_out_id_list': id_list}
self._mgmt_manager.invoke(
self._load_vnf_interface(