Merge "SX-to-DX: Check host administrative state"

This commit is contained in:
Zuul 2021-04-27 19:53:24 +00:00 committed by Gerrit Code Review
commit 83d2d3b1f1
2 changed files with 97 additions and 16 deletions

View File

@ -312,6 +312,15 @@ class SystemController(rest.RestController):
% system_mode) % system_mode)
raise wsme.exc.ClientSideError(msg) raise wsme.exc.ClientSideError(msg)
def _check_controller_locked(self):
controller = api_utils.HostHelper.get_active_controller()
if controller is None:
return
if controller.administrative != constants.ADMIN_LOCKED:
msg = _("Cannot modify system mode if host '%s' is not "
"locked." % controller.hostname)
raise wsme.exc.ClientSideError(msg)
def _get_isystem_collection(self, marker, limit, sort_key, sort_dir, def _get_isystem_collection(self, marker, limit, sort_key, sort_dir,
expand=False, resource_url=None): expand=False, resource_url=None):
limit = api_utils.validate_limit(limit) limit = api_utils.validate_limit(limit)
@ -433,6 +442,7 @@ class SystemController(rest.RestController):
"set to %s." % rpc_isystem.system_mode) "set to %s." % rpc_isystem.system_mode)
raise wsme.exc.ClientSideError(msg) raise wsme.exc.ClientSideError(msg)
elif new_system_mode != constants.SYSTEM_MODE_SIMPLEX: elif new_system_mode != constants.SYSTEM_MODE_SIMPLEX:
self._check_controller_locked()
self._check_interfaces(new_system_mode) self._check_interfaces(new_system_mode)
else: else:
system_mode_options.append(constants.SYSTEM_MODE_SIMPLEX) system_mode_options.append(constants.SYSTEM_MODE_SIMPLEX)

View File

@ -98,6 +98,7 @@ class TestSystemUpdateModeFromSimplex(TestSystem):
personality=constants.CONTROLLER, personality=constants.CONTROLLER,
subfunctions=constants.CONTROLLER, subfunctions=constants.CONTROLLER,
invprovision=constants.PROVISIONED, invprovision=constants.PROVISIONED,
administrative=constants.ADMIN_LOCKED
) )
def _create_mgmt_interface_network(self, interface='mgmt'): def _create_mgmt_interface_network(self, interface='mgmt'):
@ -152,8 +153,12 @@ class TestSystemUpdateModeFromSimplex(TestSystem):
interface_id=self.cluster_host_interface.id, interface_id=self.cluster_host_interface.id,
network_id=self.cluster_host_network.id) network_id=self.cluster_host_network.id)
@mock.patch('sysinv.common.utils.is_initial_config_complete', return_value=True) @mock.patch('socket.gethostname',
def test_update_system_mode_simplex_to_duplex(self, mock_exists): return_value='controller-0')
@mock.patch('sysinv.common.utils.is_initial_config_complete',
return_value=True)
def test_update_system_mode_simplex_to_duplex(self, mock_init_config,
mock_controller):
self._create_mgmt_interface_network() self._create_mgmt_interface_network()
self._create_cluster_host_interface_network() self._create_cluster_host_interface_network()
update = {"system_mode": constants.SYSTEM_MODE_DUPLEX} update = {"system_mode": constants.SYSTEM_MODE_DUPLEX}
@ -163,8 +168,13 @@ class TestSystemUpdateModeFromSimplex(TestSystem):
system_dict = system.as_dict() system_dict = system.as_dict()
self.assertIn('simplex_to_duplex_migration', system_dict['capabilities']) self.assertIn('simplex_to_duplex_migration', system_dict['capabilities'])
@mock.patch('sysinv.common.utils.is_initial_config_complete', return_value=True) @mock.patch('socket.gethostname',
def test_update_system_mode_simplex_to_duplex_mgmt_on_lo(self, mock_exists): return_value='controller-0')
@mock.patch('sysinv.common.utils.is_initial_config_complete',
return_value=True)
def test_update_system_mode_simplex_to_duplex_mgmt_on_lo(self,
mock_init_config,
mock_controller):
self._create_mgmt_interface_network(interface=constants.LOOPBACK_IFNAME) self._create_mgmt_interface_network(interface=constants.LOOPBACK_IFNAME)
self._create_cluster_host_interface_network() self._create_cluster_host_interface_network()
update = {"system_mode": constants.SYSTEM_MODE_DUPLEX} update = {"system_mode": constants.SYSTEM_MODE_DUPLEX}
@ -174,8 +184,13 @@ class TestSystemUpdateModeFromSimplex(TestSystem):
system_dict = system.as_dict() system_dict = system.as_dict()
self.assertNotIn('simplex_to_duplex_migration', system_dict['capabilities']) self.assertNotIn('simplex_to_duplex_migration', system_dict['capabilities'])
@mock.patch('sysinv.common.utils.is_initial_config_complete', return_value=True) @mock.patch('socket.gethostname',
def test_update_system_mode_simplex_to_duplex_no_mgmt_if(self, mock_exists): return_value='controller-0')
@mock.patch('sysinv.common.utils.is_initial_config_complete',
return_value=True)
def test_update_system_mode_simplex_to_duplex_no_mgmt_if(self,
mock_init_config,
mock_controller):
self._create_cluster_host_interface_network() self._create_cluster_host_interface_network()
update = {"system_mode": constants.SYSTEM_MODE_DUPLEX} update = {"system_mode": constants.SYSTEM_MODE_DUPLEX}
self._patch_and_check(self._get_path(self.system.uuid), self._patch_and_check(self._get_path(self.system.uuid),
@ -184,8 +199,13 @@ class TestSystemUpdateModeFromSimplex(TestSystem):
system_dict = system.as_dict() system_dict = system.as_dict()
self.assertNotIn('simplex_to_duplex_migration', system_dict['capabilities']) self.assertNotIn('simplex_to_duplex_migration', system_dict['capabilities'])
@mock.patch('sysinv.common.utils.is_initial_config_complete', return_value=True) @mock.patch('socket.gethostname',
def test_update_system_mode_simplex_to_duplex_cluster_host_on_lo(self, mock_exists): return_value='controller-0')
@mock.patch('sysinv.common.utils.is_initial_config_complete',
return_value=True)
def test_update_system_mode_simplex_to_duplex_cluster_host_on_lo(self,
mock_init_config,
mock_controller):
self._create_mgmt_interface_network() self._create_mgmt_interface_network()
self._create_cluster_host_interface_network(interface=constants.LOOPBACK_IFNAME) self._create_cluster_host_interface_network(interface=constants.LOOPBACK_IFNAME)
update = {"system_mode": constants.SYSTEM_MODE_DUPLEX} update = {"system_mode": constants.SYSTEM_MODE_DUPLEX}
@ -195,8 +215,13 @@ class TestSystemUpdateModeFromSimplex(TestSystem):
system_dict = system.as_dict() system_dict = system.as_dict()
self.assertNotIn('simplex_to_duplex_migration', system_dict['capabilities']) self.assertNotIn('simplex_to_duplex_migration', system_dict['capabilities'])
@mock.patch('sysinv.common.utils.is_initial_config_complete', return_value=True) @mock.patch('socket.gethostname',
def test_update_system_mode_simplex_to_duplex_no_cluster_host_if(self, mock_exists): return_value='controller-0')
@mock.patch('sysinv.common.utils.is_initial_config_complete',
return_value=True)
def test_update_system_mode_simplex_to_duplex_no_cluster_host_if(self,
mock_init_config,
mock_controller):
self._create_mgmt_interface_network() self._create_mgmt_interface_network()
update = {"system_mode": constants.SYSTEM_MODE_DUPLEX} update = {"system_mode": constants.SYSTEM_MODE_DUPLEX}
self._patch_and_check(self._get_path(self.system.uuid), self._patch_and_check(self._get_path(self.system.uuid),
@ -205,8 +230,12 @@ class TestSystemUpdateModeFromSimplex(TestSystem):
system_dict = system.as_dict() system_dict = system.as_dict()
self.assertNotIn('simplex_to_duplex_migration', system_dict['capabilities']) self.assertNotIn('simplex_to_duplex_migration', system_dict['capabilities'])
@mock.patch('sysinv.common.utils.is_initial_config_complete', return_value=True) @mock.patch('socket.gethostname',
def test_update_system_mode_simplex_to_simplex(self, mock_exists): return_value='controller-0')
@mock.patch('sysinv.common.utils.is_initial_config_complete',
return_value=True)
def test_update_system_mode_simplex_to_simplex(self, mock_init_config,
mock_controller):
update = {"system_mode": constants.SYSTEM_MODE_SIMPLEX} update = {"system_mode": constants.SYSTEM_MODE_SIMPLEX}
self._patch_and_check(self._get_path(self.system.uuid), self._patch_and_check(self._get_path(self.system.uuid),
update) update)
@ -214,8 +243,13 @@ class TestSystemUpdateModeFromSimplex(TestSystem):
system_dict = system.as_dict() system_dict = system.as_dict()
self.assertNotIn('simplex_to_duplex_migration', system_dict['capabilities']) self.assertNotIn('simplex_to_duplex_migration', system_dict['capabilities'])
@mock.patch('sysinv.common.utils.is_initial_config_complete', return_value=False) @mock.patch('socket.gethostname',
def test_update_system_mode_before_initial_config_complete(self, mock_exists): return_value='controller-0')
@mock.patch('sysinv.common.utils.is_initial_config_complete',
return_value=False)
def test_update_system_mode_before_initial_config_complete(self,
mock_init_config,
mock_controller):
update = {"system_mode": constants.SYSTEM_MODE_DUPLEX} update = {"system_mode": constants.SYSTEM_MODE_DUPLEX}
self._patch_and_check(self._get_path(self.system.uuid), self._patch_and_check(self._get_path(self.system.uuid),
update) update)
@ -223,8 +257,13 @@ class TestSystemUpdateModeFromSimplex(TestSystem):
system_dict = system.as_dict() system_dict = system.as_dict()
self.assertNotIn('simplex_to_duplex_migration', system_dict['capabilities']) self.assertNotIn('simplex_to_duplex_migration', system_dict['capabilities'])
@mock.patch('sysinv.common.utils.is_initial_config_complete', return_value=False) @mock.patch('socket.gethostname',
def test_update_system_mode_before_initial_config_complete_only_mgmt_if(self, mock_exists): return_value='controller-0')
@mock.patch('sysinv.common.utils.is_initial_config_complete',
return_value=False)
def test_update_system_mode_before_initial_config_complete_only_mgmt_if(self,
mock_init_config,
mock_controller):
self._create_mgmt_interface_network() self._create_mgmt_interface_network()
update = {"system_mode": constants.SYSTEM_MODE_DUPLEX} update = {"system_mode": constants.SYSTEM_MODE_DUPLEX}
self._patch_and_check(self._get_path(self.system.uuid), self._patch_and_check(self._get_path(self.system.uuid),
@ -234,6 +273,38 @@ class TestSystemUpdateModeFromSimplex(TestSystem):
self.assertNotIn('simplex_to_duplex_migration', system_dict['capabilities']) self.assertNotIn('simplex_to_duplex_migration', system_dict['capabilities'])
class TestSystemUpdateModeUnlockedController(TestSystem):
def setUp(self):
super(TestSystemUpdateModeUnlockedController, self).setUp()
self.dbapi = db_api.get_instance()
self.system = dbutils.create_test_isystem(system_type=constants.TIS_AIO_BUILD,
system_mode=constants.SYSTEM_MODE_SIMPLEX)
self.controller = dbutils.create_test_ihost(
id='1',
uuid=None,
forisystemid=self.system.id,
hostname='controller-0',
personality=constants.CONTROLLER,
subfunctions=constants.CONTROLLER,
invprovision=constants.PROVISIONED,
administrative=constants.ADMIN_UNLOCKED
)
@mock.patch('socket.gethostname',
return_value='controller-0')
@mock.patch('sysinv.common.utils.is_initial_config_complete',
return_value=True)
def test_update_system_mode_on_unlocked_controller(self, mock_init_config,
mock_controller):
update = {"system_mode": constants.SYSTEM_MODE_DUPLEX}
self._patch_and_check(self._get_path(self.system.uuid),
update, expect_errors=True)
system = self.dbapi.isystem_get_one()
system_dict = system.as_dict()
self.assertNotIn('simplex_to_duplex_migration', system_dict['capabilities'])
class TestSystemUpdateModeFromDuplex(TestSystem): class TestSystemUpdateModeFromDuplex(TestSystem):
def setUp(self): def setUp(self):