Merge pull request #588 from lmiccini/fix-instanceha-test-mocks

Fix InstanceHA test mock configurations

Author: openshift-merge-bot[bot]

test/instanceha/functional_test.py

@@ -125,6 +125,11 @@ def list(self, search_opts=None):
             servers.append(server)
         return servers
 
+    def reset_state(self, server, state):
+        """Reset server state."""
+        if server in self.servers_data:
+            self.servers_data[server]['status'] = state.upper()
+
     def evacuate(self, server, host=None):
         """Evacuate a server.
 
@@ -156,6 +161,7 @@ def add_server(self, **kwargs):
             'host': kwargs.get('host', 'compute-0'),
             'flavor': kwargs.get('flavor', {'id': 'flavor-1', 'extra_specs': {}}),
             'image': kwargs.get('image', {'id': 'image-1'}),
+            'OS-EXT-STS:task_state': kwargs.get('task_state', None),
         }
         self.servers_data[server_id] = server_data
         return server_id

test/instanceha/test_coverage_gaps.py

@@ -713,10 +713,13 @@ def _run_monitor(self, status_sequence, monotonic_values=None, start_time=100):
         if monotonic_values is None:
             monotonic_values = [start_time + i for i in range(len(status_sequence) + 5)]
 
+        conn = Mock()
+        conn.servers.evacuate.return_value = (Mock(status_code=200, reason='OK'), {})
+
         with patch('instanceha.time.sleep'):
             with patch('instanceha.time.monotonic', side_effect=monotonic_values):
                 with patch('instanceha._server_evacuation_status', side_effect=status_sequence):
-                    return instanceha._monitor_evacuation(Mock(), 'srv-1', 'resp-1', start_time)
+                    return instanceha._monitor_evacuation(conn, 'srv-1', 'resp-1', start_time)
 
     def test_immediate_completion(self):
         status = Mock(completed=True, error=False)

test/instanceha/test_critical_error_paths.py

@@ -244,6 +244,7 @@ def test_smart_evacuation_timeout(self):
         mock_connection = Mock()
         mock_server = Mock()
         mock_server.id = 'server-123'
+        setattr(mock_server, 'OS-EXT-STS:task_state', None)
 
         # Mock evacuation to succeed
         mock_connection.servers.evacuate.return_value = (Mock(status_code=200, reason='OK'), {})
@@ -267,6 +268,7 @@ def test_smart_evacuation_retry_exhaustion(self):
         mock_connection = Mock()
         mock_server = Mock()
         mock_server.id = 'server-123'
+        setattr(mock_server, 'OS-EXT-STS:task_state', None)
 
         # Mock evacuation to succeed
         mock_connection.servers.evacuate.return_value = (Mock(status_code=200, reason='OK'), {})

test/instanceha/test_unit_core.py

@@ -1365,7 +1365,8 @@ def _create_test_configs(self):
                         'auth_url': 'http://keystone:5000/v3',
                         'user_domain_name': 'Default',
                         'project_domain_name': 'Default'
-                    }
+                    },
+                    'region_name': 'regionOne'
                 }
             }
         }
@@ -1462,6 +1463,7 @@ class MockUnauthorized(Exception):
 
             self._assert_no_secrets_in_logs()
 
+    @patch.dict(os.environ, {'OS_CLOUD': 'testcloud'})
     def test_create_connection_exception_no_secret_exposure(self):
         """Test that create_connection exceptions don't expose passwords."""
         # Clear log capture
@@ -1609,6 +1611,7 @@ class MockConflict(Exception):
 
         self._assert_no_secrets_in_logs()
 
+    @patch.dict(os.environ, {'OS_CLOUD': 'testcloud'})
     def test_get_nova_connection_exception_no_secret_exposure(self):
         """Test that _get_nova_connection exceptions don't expose passwords."""
         # Clear log capture
@@ -1630,6 +1633,7 @@ def test_get_nova_connection_exception_no_secret_exposure(self):
 
             self._assert_no_secrets_in_logs()
 
+    @patch.dict(os.environ, {'OS_CLOUD': 'testcloud'})
     def test_establish_nova_connection_exception_no_secret_exposure(self):
         """Test that _establish_nova_connection exceptions don't expose passwords."""
         # Clear log capture
@@ -2691,6 +2695,7 @@ def test_complete_evacuation_workflow(self):
         server1.name = 'test-server-1'
         server1.image = {'id': 'image-1'}
         server1.flavor = {'id': 'flavor-1'}
+        setattr(server1, 'OS-EXT-STS:task_state', None)
         nova_state['servers'].append(server1)
 
         # Create service and config
@@ -2757,6 +2762,7 @@ def test_service_poll_cycle_integration(self):
             server.name = f'test-server-{i}'
             server.image = {'id': 'image-1'}
             server.flavor = {'id': 'flavor-1'}
+            setattr(server, 'OS-EXT-STS:task_state', None)
             nova_state['servers'].append(server)
 
         # Create service
@@ -2841,6 +2847,7 @@ def test_multi_host_failure_scenario(self):
             server.host = f'compute-{i}.example.com'
             server.status = 'ACTIVE'
             server.name = f'test-server-{i}'
+            setattr(server, 'OS-EXT-STS:task_state', None)
             # First 3 have evacuable tag, last 2 don't
             if i < 3:
                 server.image = {'id': 'image-1'}
@@ -3204,6 +3211,7 @@ def test_smart_evacuation_with_migration_tracking(self):
         """Test smart evacuation tracks migration status to completion."""
         conn = Mock()
         server = Mock(id='server-123', status='ACTIVE', host='compute-01')
+        setattr(server, 'OS-EXT-STS:task_state', None)
 
         # Mock evacuation response
         response = Mock(status_code=200, reason='OK')
@@ -3229,6 +3237,7 @@ def test_smart_evacuation_timeout_handling(self):
         """Test smart evacuation handles timeout correctly."""
         conn = Mock()
         server = Mock(id='server-456', status='ACTIVE')
+        setattr(server, 'OS-EXT-STS:task_state', None)
 
         response = Mock(status_code=200, reason='OK')
         conn.servers.evacuate.return_value = (response, {})
@@ -3249,6 +3258,7 @@ def test_smart_evacuation_retry_logic(self):
         """Test smart evacuation retries on errors."""
         conn = Mock()
         server = Mock(id='server-789', status='ACTIVE')
+        setattr(server, 'OS-EXT-STS:task_state', None)
 
         response = Mock(status_code=200, reason='OK')
         conn.servers.evacuate.return_value = (response, {})