From 7540e7905b92a3d62ff5b72b8bfec6dd8c3c4201 Mon Sep 17 00:00:00 2001 From: Bart Wensley Date: Mon, 11 May 2020 12:00:41 -0500 Subject: [PATCH] VIM: patch AIO-DX hosts before worker hosts The VIM's patch orchestration was designed to patch controller hosts before worker hosts. However, when the AIO-DX plus worker hosts configuration was allowed, the VIM was not updated, so patch orchestration does not patch the AIO-DX controller hosts before the worker hosts. This change ensures AIO-DX hosts are patched before worker hosts. Change-Id: I15acd44348c6065741bcf3cbe5c183e6aafb463d Closes-Bug: 1878052 Signed-off-by: Bart Wensley --- .../tests/test_sw_patch_strategy.py | 412 ++++++++++++++++++ nfv/nfv-vim/nfv_vim/strategy/_strategy.py | 20 +- nfv/tox.ini | 1 + 3 files changed, 426 insertions(+), 7 deletions(-) diff --git a/nfv/nfv-tests/nfv_unit_tests/tests/test_sw_patch_strategy.py b/nfv/nfv-tests/nfv_unit_tests/tests/test_sw_patch_strategy.py index ff550ab1..e4659f79 100755 --- a/nfv/nfv-tests/nfv_unit_tests/tests/test_sw_patch_strategy.py +++ b/nfv/nfv-tests/nfv_unit_tests/tests/test_sw_patch_strategy.py @@ -3332,6 +3332,418 @@ class TestSwPatchStrategy(testcase.NFVTestCase): validate_strategy_persists(strategy) validate_phase(apply_phase, expected_results) + def test_sw_patch_strategy_cpe_plus_stages_parallel_stop_start(self): + """ + Test the sw_patch strategy add worker strategy stages: + - cpe hosts plus workers + - parallel apply treated as serial + - stop start instance action + - test both reboot and no reboot cases + """ + self.create_host('controller-0', cpe=True) + self.create_host('controller-1', cpe=True) + + self.create_instance('small', + "test_instance_0", + 'controller-0') + self.create_instance('small', + "test_instance_1", + 'controller-1') + + self.create_host('compute-0') + self.create_host('compute-1') + + self.create_instance('small', + "test_instance_2", + 'compute-0') + self.create_instance('small', + "test_instance_3", + 'compute-1') + + worker_hosts = [] + for host in self._host_table.values(): + if HOST_PERSONALITY.WORKER in host.personality: + worker_hosts.append(host) + # Sort worker hosts so the order of the steps is deterministic + sorted_worker_hosts = sorted(worker_hosts, key=lambda host: host.name) + + # Test reboot patches + strategy = create_sw_patch_strategy( + worker_apply_type=SW_UPDATE_APPLY_TYPE.PARALLEL, + default_instance_action=SW_UPDATE_INSTANCE_ACTION.STOP_START + ) + + strategy._add_worker_strategy_stages(worker_hosts=sorted_worker_hosts, + reboot=True) + + apply_phase = strategy.apply_phase.as_dict() + + expected_results = { + 'total_stages': 3, + 'stages': [ + {'name': 'sw-patch-worker-hosts', + 'total_steps': 9, + 'steps': [ + {'name': 'query-alarms'}, + {'name': 'swact-hosts', + 'entity_names': ['controller-0']}, + {'name': 'stop-instances', + 'entity_names': ['test_instance_0']}, + {'name': 'lock-hosts', + 'entity_names': ['controller-0']}, + {'name': 'sw-patch-hosts', + 'entity_names': ['controller-0']}, + {'name': 'system-stabilize', + 'timeout': 15}, + {'name': 'unlock-hosts', + 'entity_names': ['controller-0']}, + {'name': 'start-instances', + 'entity_names': ['test_instance_0']}, + {'name': 'system-stabilize', + 'timeout': 60}, + ] + }, + {'name': 'sw-patch-worker-hosts', + 'total_steps': 9, + 'steps': [ + {'name': 'query-alarms'}, + {'name': 'swact-hosts', + 'entity_names': ['controller-1']}, + {'name': 'stop-instances', + 'entity_names': ['test_instance_1']}, + {'name': 'lock-hosts', + 'entity_names': ['controller-1']}, + {'name': 'sw-patch-hosts', + 'entity_names': ['controller-1']}, + {'name': 'system-stabilize', + 'timeout': 15}, + {'name': 'unlock-hosts', + 'entity_names': ['controller-1']}, + {'name': 'start-instances', + 'entity_names': ['test_instance_1']}, + {'name': 'system-stabilize', + 'timeout': 60} + ] + }, + {'name': 'sw-patch-worker-hosts', + 'total_steps': 8, + 'steps': [ + {'name': 'query-alarms'}, + {'name': 'stop-instances', + 'entity_names': ['test_instance_2', 'test_instance_3']}, + {'name': 'lock-hosts', + 'entity_names': ['compute-0', 'compute-1']}, + {'name': 'sw-patch-hosts', + 'entity_names': ['compute-0', 'compute-1']}, + {'name': 'system-stabilize', + 'timeout': 15}, + {'name': 'unlock-hosts', + 'entity_names': ['compute-0', 'compute-1']}, + {'name': 'start-instances', + 'entity_names': ['test_instance_2', 'test_instance_3']}, + {'name': 'system-stabilize', + 'timeout': 60} + ] + }, + ] + } + + validate_strategy_persists(strategy) + validate_phase(apply_phase, expected_results) + + # Test no reboot patches + strategy = create_sw_patch_strategy( + worker_apply_type=SW_UPDATE_APPLY_TYPE.PARALLEL, + default_instance_action=SW_UPDATE_INSTANCE_ACTION.STOP_START + ) + + strategy._add_worker_strategy_stages(worker_hosts=sorted_worker_hosts, + reboot=False) + + apply_phase = strategy.apply_phase.as_dict() + + expected_results = { + 'total_stages': 3, + 'stages': [ + {'name': 'sw-patch-worker-hosts', + 'total_steps': 3, + 'steps': [ + {'name': 'query-alarms'}, + {'name': 'sw-patch-hosts', + 'entity_names': ['controller-0']}, + {'name': 'system-stabilize'} + ] + }, + {'name': 'sw-patch-worker-hosts', + 'total_steps': 3, + 'steps': [ + {'name': 'query-alarms'}, + {'name': 'sw-patch-hosts', + 'entity_names': ['controller-1']}, + {'name': 'system-stabilize'} + ] + }, + {'name': 'sw-patch-worker-hosts', + 'total_steps': 3, + 'steps': [ + {'name': 'query-alarms'}, + {'name': 'sw-patch-hosts', + 'entity_names': ['compute-0', 'compute-1']}, + {'name': 'system-stabilize'} + ] + }, + ] + } + + validate_strategy_persists(strategy) + validate_phase(apply_phase, expected_results) + + def test_sw_patch_strategy_cpe_plus_stages_serial_stop_start(self): + """ + Test the sw_patch strategy add worker strategy stages: + - cpe hosts plus workers + - serial apply + - stop start instance action + """ + self.create_host('controller-0', cpe=True) + self.create_host('controller-1', cpe=True) + + self.create_instance('small', + "test_instance_0", + 'controller-0') + self.create_instance('small', + "test_instance_1", + 'controller-1') + + self.create_host('compute-0') + self.create_host('compute-1') + + self.create_instance('small', + "test_instance_2", + 'compute-0') + self.create_instance('small', + "test_instance_3", + 'compute-1') + + worker_hosts = [] + for host in self._host_table.values(): + if HOST_PERSONALITY.WORKER in host.personality: + worker_hosts.append(host) + # Sort worker hosts so the order of the steps is deterministic + sorted_worker_hosts = sorted(worker_hosts, key=lambda host: host.name) + + strategy = create_sw_patch_strategy( + worker_apply_type=SW_UPDATE_APPLY_TYPE.SERIAL, + default_instance_action=SW_UPDATE_INSTANCE_ACTION.STOP_START + ) + + strategy._add_worker_strategy_stages(worker_hosts=sorted_worker_hosts, + reboot=True) + + apply_phase = strategy.apply_phase.as_dict() + + expected_results = { + 'total_stages': 4, + 'stages': [ + {'name': 'sw-patch-worker-hosts', + 'total_steps': 9, + 'steps': [ + {'name': 'query-alarms'}, + {'name': 'swact-hosts', + 'entity_names': ['controller-0']}, + {'name': 'stop-instances', + 'entity_names': ['test_instance_0']}, + {'name': 'lock-hosts', + 'entity_names': ['controller-0']}, + {'name': 'sw-patch-hosts', + 'entity_names': ['controller-0']}, + {'name': 'system-stabilize', + 'timeout': 15}, + {'name': 'unlock-hosts', + 'entity_names': ['controller-0']}, + {'name': 'start-instances', + 'entity_names': ['test_instance_0']}, + {'name': 'system-stabilize', + 'timeout': 60} + ] + }, + {'name': 'sw-patch-worker-hosts', + 'total_steps': 9, + 'steps': [ + {'name': 'query-alarms'}, + {'name': 'swact-hosts', + 'entity_names': ['controller-1']}, + {'name': 'stop-instances', + 'entity_names': ['test_instance_1']}, + {'name': 'lock-hosts', + 'entity_names': ['controller-1']}, + {'name': 'sw-patch-hosts', + 'entity_names': ['controller-1']}, + {'name': 'system-stabilize', + 'timeout': 15}, + {'name': 'unlock-hosts', + 'entity_names': ['controller-1']}, + {'name': 'start-instances', + 'entity_names': ['test_instance_1']}, + {'name': 'system-stabilize', + 'timeout': 60} + ] + }, + {'name': 'sw-patch-worker-hosts', + 'total_steps': 8, + 'steps': [ + {'name': 'query-alarms'}, + {'name': 'stop-instances', + 'entity_names': ['test_instance_2']}, + {'name': 'lock-hosts', + 'entity_names': ['compute-0']}, + {'name': 'sw-patch-hosts', + 'entity_names': ['compute-0']}, + {'name': 'system-stabilize', + 'timeout': 15}, + {'name': 'unlock-hosts', + 'entity_names': ['compute-0']}, + {'name': 'start-instances', + 'entity_names': ['test_instance_2']}, + {'name': 'system-stabilize', + 'timeout': 60} + ] + }, + {'name': 'sw-patch-worker-hosts', + 'total_steps': 8, + 'steps': [ + {'name': 'query-alarms'}, + {'name': 'stop-instances', + 'entity_names': ['test_instance_3']}, + {'name': 'lock-hosts', + 'entity_names': ['compute-1']}, + {'name': 'sw-patch-hosts', + 'entity_names': ['compute-1']}, + {'name': 'system-stabilize', + 'timeout': 15}, + {'name': 'unlock-hosts', + 'entity_names': ['compute-1']}, + {'name': 'start-instances', + 'entity_names': ['test_instance_3']}, + {'name': 'system-stabilize', + 'timeout': 60} + ] + } + ] + } + + validate_strategy_persists(strategy) + validate_phase(apply_phase, expected_results) + + def test_sw_patch_strategy_cpe_plus_stages_serial_stop_start_no_instances( + self): + """ + Test the sw_patch strategy add worker strategy stages: + - cpe hosts plus workers + - no instances + - serial apply + - stop start instance action + """ + self.create_host('controller-0', cpe=True) + self.create_host('controller-1', cpe=True) + + self.create_host('compute-0') + self.create_host('compute-1') + + worker_hosts = [] + for host in self._host_table.values(): + if HOST_PERSONALITY.WORKER in host.personality: + worker_hosts.append(host) + # Sort worker hosts so the order of the steps is deterministic + sorted_worker_hosts = sorted(worker_hosts, key=lambda host: host.name) + + strategy = create_sw_patch_strategy( + worker_apply_type=SW_UPDATE_APPLY_TYPE.SERIAL, + default_instance_action=SW_UPDATE_INSTANCE_ACTION.STOP_START + ) + + strategy._add_worker_strategy_stages(worker_hosts=sorted_worker_hosts, + reboot=True) + + apply_phase = strategy.apply_phase.as_dict() + + expected_results = { + 'total_stages': 4, + 'stages': [ + {'name': 'sw-patch-worker-hosts', + 'total_steps': 7, + 'steps': [ + {'name': 'query-alarms'}, + {'name': 'swact-hosts', + 'entity_names': ['controller-0']}, + {'name': 'lock-hosts', + 'entity_names': ['controller-0']}, + {'name': 'sw-patch-hosts', + 'entity_names': ['controller-0']}, + {'name': 'system-stabilize', + 'timeout': 15}, + {'name': 'unlock-hosts', + 'entity_names': ['controller-0']}, + {'name': 'system-stabilize', + 'timeout': 60} + ] + }, + {'name': 'sw-patch-worker-hosts', + 'total_steps': 7, + 'steps': [ + {'name': 'query-alarms'}, + {'name': 'swact-hosts', + 'entity_names': ['controller-1']}, + {'name': 'lock-hosts', + 'entity_names': ['controller-1']}, + {'name': 'sw-patch-hosts', + 'entity_names': ['controller-1']}, + {'name': 'system-stabilize', + 'timeout': 15}, + {'name': 'unlock-hosts', + 'entity_names': ['controller-1']}, + {'name': 'system-stabilize', + 'timeout': 60} + ] + }, + {'name': 'sw-patch-worker-hosts', + 'total_steps': 6, + 'steps': [ + {'name': 'query-alarms'}, + {'name': 'lock-hosts', + 'entity_names': ['compute-0']}, + {'name': 'sw-patch-hosts', + 'entity_names': ['compute-0']}, + {'name': 'system-stabilize', + 'timeout': 15}, + {'name': 'unlock-hosts', + 'entity_names': ['compute-0']}, + {'name': 'system-stabilize', + 'timeout': 60} + ] + }, + {'name': 'sw-patch-worker-hosts', + 'total_steps': 6, + 'steps': [ + {'name': 'query-alarms'}, + {'name': 'lock-hosts', + 'entity_names': ['compute-1']}, + {'name': 'sw-patch-hosts', + 'entity_names': ['compute-1']}, + {'name': 'system-stabilize', + 'timeout': 15}, + {'name': 'unlock-hosts', + 'entity_names': ['compute-1']}, + {'name': 'system-stabilize', + 'timeout': 60} + ] + } + ] + } + + validate_strategy_persists(strategy) + validate_phase(apply_phase, expected_results) + def test_sw_patch_strategy_cpe_simplex_stages_serial_migrate(self): """ Test the sw_patch strategy add worker strategy stages: diff --git a/nfv/nfv-vim/nfv_vim/strategy/_strategy.py b/nfv/nfv-vim/nfv_vim/strategy/_strategy.py index 0279f414..e19da9c2 100755 --- a/nfv/nfv-vim/nfv_vim/strategy/_strategy.py +++ b/nfv/nfv-vim/nfv_vim/strategy/_strategy.py @@ -269,14 +269,19 @@ class SwUpdateStrategy(strategy.Strategy): host_lists = list() if SW_UPDATE_APPLY_TYPE.SERIAL == self._worker_apply_type: - host_with_instances_lists = list() - - # handle the workers with no instances first + # handle controller hosts first for host in worker_hosts: - if not instance_table.exist_on_host(host.name): + if HOST_PERSONALITY.CONTROLLER in host.personality: host_lists.append([host]) - else: - host_with_instances_lists.append([host]) + + # handle the workers with no instances next + host_with_instances_lists = list() + for host in worker_hosts: + if HOST_PERSONALITY.CONTROLLER not in host.personality: + if not instance_table.exist_on_host(host.name): + host_lists.append([host]) + else: + host_with_instances_lists.append([host]) # then add workers with instances if host_with_instances_lists: @@ -330,7 +335,8 @@ class SwUpdateStrategy(strategy.Strategy): host_lists.append([host]) if controller_list: - host_lists += controller_list + # handle controller hosts first + host_lists = controller_list + host_lists else: DLOG.verbose("Compute apply type set to ignore.") diff --git a/nfv/tox.ini b/nfv/tox.ini index a63f4054..cfe3bc90 100644 --- a/nfv/tox.ini +++ b/nfv/tox.ini @@ -92,6 +92,7 @@ commands = [testenv:pylint] +basepython = python2.7 deps = {[nfv]deps} {[nfv]nfv_test_dir}/nfv_scenario_tests fixtures