octavia 13.0.0.0rc1__py3-none-any.whl → 14.0.0__py3-none-any.whl

octavia/tests/unit/controller/worker/v2/test_controller_worker.py

@@ -70,7 +70,7 @@ _db_load_balancer_mock = mock.MagicMock()
 _load_balancer_mock = {
     constants.LOADBALANCER_ID: LB_ID,
     constants.TOPOLOGY: constants.TOPOLOGY_SINGLE,
-    constants.FLAVOR_ID: None,
+    constants.FLAVOR_ID: 1,
     constants.AVAILABILITY_ZONE: None,
     constants.SERVER_GROUP_ID: None
 }
@@ -133,7 +133,7 @@ class TestControllerWorker(base.TestCase):
         _db_load_balancer_mock.amphorae = _db_amphora_mock
         _db_load_balancer_mock.vip = _vip_mock
         _db_load_balancer_mock.id = LB_ID
-        _db_load_balancer_mock.flavor_id = None
+        _db_load_balancer_mock.flavor_id = 1
         _db_load_balancer_mock.availability_zone = None
         _db_load_balancer_mock.server_group_id = None
         _db_load_balancer_mock.project_id = PROJECT_ID
@@ -331,7 +331,10 @@ class TestControllerWorker(base.TestCase):
         cw.update_health_monitor(_health_mon_mock,
                                  HEALTH_UPDATE_DICT)
 
+    @mock.patch('octavia.db.repositories.FlavorRepository.'
+                'get_flavor_metadata_dict', return_value={})
     def test_create_listener(self,
+                             mock_get_flavor_dict,
                              mock_api_get_session,
                              mock_dyn_log_listener,
                              mock_taskflow_load,
@@ -355,14 +358,19 @@ class TestControllerWorker(base.TestCase):
         provider_lb = provider_utils.db_loadbalancer_to_provider_loadbalancer(
             _db_load_balancer_mock).to_dict(recurse=True)
 
+        flavor_dict = {constants.LOADBALANCER_TOPOLOGY:
+                       constants.TOPOLOGY_SINGLE}
         (cw.services_controller.run_poster.
             assert_called_once_with(
-                flow_utils.get_create_listener_flow, store={
-                    constants.LOADBALANCER: provider_lb,
-                    constants.LOADBALANCER_ID: LB_ID,
-                    constants.LISTENERS: [listener_dict]}))
+                flow_utils.get_create_listener_flow, flavor_dict=flavor_dict,
+                store={constants.LOADBALANCER: provider_lb,
+                       constants.LOADBALANCER_ID: LB_ID,
+                       constants.LISTENERS: [listener_dict]}))
 
+    @mock.patch('octavia.db.repositories.FlavorRepository.'
+                'get_flavor_metadata_dict', return_value={})
     def test_delete_listener(self,
+                             mock_get_flavor_dict,
                              mock_api_get_session,
                              mock_dyn_log_listener,
                              mock_taskflow_load,
@@ -375,6 +383,13 @@ class TestControllerWorker(base.TestCase):
                              mock_health_mon_repo_get,
                              mock_amp_repo_get):
 
+        load_balancer_mock = mock.MagicMock()
+        load_balancer_mock.provisioning_status = constants.PENDING_UPDATE
+        load_balancer_mock.id = LB_ID
+        load_balancer_mock.flavor_id = 1
+        load_balancer_mock.topology = constants.TOPOLOGY_SINGLE
+        mock_lb_repo_get.return_value = load_balancer_mock
+
         _flow_mock.reset_mock()
 
         listener_dict = {constants.LISTENER_ID: LISTENER_ID,
@@ -383,14 +398,19 @@ class TestControllerWorker(base.TestCase):
         cw = controller_worker.ControllerWorker()
         cw.delete_listener(listener_dict)
 
+        flavor_dict = {constants.LOADBALANCER_TOPOLOGY:
+                       constants.TOPOLOGY_SINGLE}
         (cw.services_controller.run_poster.
          assert_called_once_with(
-             flow_utils.get_delete_listener_flow,
+             flow_utils.get_delete_listener_flow, flavor_dict=flavor_dict,
              store={constants.LISTENER: self.ref_listener_dict,
                     constants.LOADBALANCER_ID: LB_ID,
                     constants.PROJECT_ID: PROJECT_ID}))
 
+    @mock.patch('octavia.db.repositories.FlavorRepository.'
+                'get_flavor_metadata_dict', return_value={})
     def test_update_listener(self,
+                             mock_get_flavor_dict,
                              mock_api_get_session,
                              mock_dyn_log_listener,
                              mock_taskflow_load,
@@ -406,6 +426,8 @@ class TestControllerWorker(base.TestCase):
         load_balancer_mock = mock.MagicMock()
         load_balancer_mock.provisioning_status = constants.PENDING_UPDATE
         load_balancer_mock.id = LB_ID
+        load_balancer_mock.flavor_id = None
+        load_balancer_mock.topology = constants.TOPOLOGY_SINGLE
         mock_lb_repo_get.return_value = load_balancer_mock
 
         _flow_mock.reset_mock()
@@ -416,8 +438,11 @@ class TestControllerWorker(base.TestCase):
         cw = controller_worker.ControllerWorker()
         cw.update_listener(listener_dict, LISTENER_UPDATE_DICT)
 
+        flavor_dict = {constants.LOADBALANCER_TOPOLOGY:
+                       constants.TOPOLOGY_SINGLE}
         (cw.services_controller.run_poster.
             assert_called_once_with(flow_utils.get_update_listener_flow,
+                                    flavor_dict=flavor_dict,
                                     store={constants.LISTENER: listener_dict,
                                            constants.UPDATE_DICT:
                                            LISTENER_UPDATE_DICT,
@@ -425,10 +450,13 @@ class TestControllerWorker(base.TestCase):
                                            constants.LISTENERS:
                                            [listener_dict]}))
 
+    @mock.patch('octavia.db.repositories.FlavorRepository.'
+                'get_flavor_metadata_dict', return_value={})
     @mock.patch("octavia.controller.worker.v2.controller_worker."
                 "ControllerWorker._get_db_obj_until_pending_update")
     def test_update_listener_timeout(self,
                                      mock__get_db_obj_until_pending,
+                                     mock_get_flavor_dict,
                                      mock_api_get_session,
                                      mock_dyn_log_listener,
                                      mock_taskflow_load,
@@ -443,6 +471,7 @@ class TestControllerWorker(base.TestCase):
         load_balancer_mock = mock.MagicMock()
         load_balancer_mock.provisioning_status = constants.PENDING_UPDATE
         load_balancer_mock.id = LB_ID
+        load_balancer_mock.flavor_id = 1
         _flow_mock.reset_mock()
         _listener_mock.provisioning_status = constants.PENDING_UPDATE
         last_attempt_mock = mock.MagicMock()
@@ -522,7 +551,8 @@ class TestControllerWorker(base.TestCase):
 
         cw.services_controller.run_poster.assert_called_with(
             flow_utils.get_create_load_balancer_flow,
-            constants.TOPOLOGY_SINGLE, listeners=[], store=store)
+            constants.TOPOLOGY_SINGLE, listeners=[],
+            flavor_dict=None, store=store)
         self.assertEqual(4, mock_lb_repo_get.call_count)
 
     def test_create_load_balancer_active_standby(
@@ -561,7 +591,8 @@ class TestControllerWorker(base.TestCase):
 
         cw.services_controller.run_poster.assert_called_with(
             flow_utils.get_create_load_balancer_flow,
-            constants.TOPOLOGY_ACTIVE_STANDBY, listeners=[], store=store)
+            constants.TOPOLOGY_ACTIVE_STANDBY, listeners=[],
+            flavor_dict=None, store=store)
 
     def test_create_load_balancer_full_graph_single(
             self,
@@ -603,7 +634,8 @@ class TestControllerWorker(base.TestCase):
 
         cw.services_controller.run_poster.assert_called_with(
             flow_utils.get_create_load_balancer_flow,
-            constants.TOPOLOGY_SINGLE, listeners=dict_listeners, store=store)
+            constants.TOPOLOGY_SINGLE, listeners=dict_listeners,
+            flavor_dict=None, store=store)
 
     def test_create_load_balancer_full_graph_active_standby(
             self,
@@ -650,7 +682,7 @@ class TestControllerWorker(base.TestCase):
         cw.services_controller.run_poster.assert_called_with(
             flow_utils.get_create_load_balancer_flow,
             constants.TOPOLOGY_ACTIVE_STANDBY, listeners=dict_listeners,
-            store=store)
+            store=store, flavor_dict=None)
 
     @mock.patch('octavia.controller.worker.v2.flows.load_balancer_flows.'
                 'LoadBalancerFlows.get_create_load_balancer_flow')
@@ -695,7 +727,8 @@ class TestControllerWorker(base.TestCase):
         cw.create_load_balancer(_load_balancer_mock)
 
         mock_get_create_load_balancer_flow.assert_called_with(
-            constants.TOPOLOGY_SINGLE, listeners=dict_listeners)
+            constants.TOPOLOGY_SINGLE, listeners=dict_listeners,
+            flavor_dict=None)
         mock_base_taskflow_load.assert_called_with(
             mock_get_create_load_balancer_flow.return_value, store=store)
 
@@ -1461,12 +1494,13 @@ class TestControllerWorker(base.TestCase):
         mock_amphora.load_balancer_id = LB_ID
         mock_amphora.status = constants.AMPHORA_READY
         mock_amp_repo_get.return_value = mock_amphora
+        flavor_dict = {constants.LOADBALANCER_TOPOLOGY:
+                       constants.TOPOLOGY_SINGLE}
         expected_stored_params = {
             constants.AVAILABILITY_ZONE: {},
             constants.BUILD_TYPE_PRIORITY:
                 constants.LB_CREATE_FAILOVER_PRIORITY,
-            constants.FLAVOR: {constants.LOADBALANCER_TOPOLOGY:
-                               constants.TOPOLOGY_SINGLE},
+            constants.FLAVOR: flavor_dict,
             constants.LOADBALANCER: mock_provider_lb.to_dict(),
             constants.LOADBALANCER_ID: LB_ID,
             constants.SERVER_GROUP_ID: None,
@@ -1479,7 +1513,8 @@ class TestControllerWorker(base.TestCase):
 
         cw.services_controller.run_poster.assert_called_once_with(
             flow_utils.get_failover_amphora_flow,
-            mock_amphora.to_dict(), 1, store=expected_stored_params)
+            mock_amphora.to_dict(), 1, flavor_dict=flavor_dict,
+            store=expected_stored_params)
 
     @mock.patch('octavia.db.repositories.AvailabilityZoneRepository.'
                 'get_availability_zone_metadata_dict', return_value={})
@@ -1516,12 +1551,13 @@ class TestControllerWorker(base.TestCase):
         mock_amphora.load_balancer_id = LB_ID
         mock_amphora.status = constants.AMPHORA_READY
         mock_amp_repo_get.return_value = mock_amphora
+        flavor_dict = {constants.LOADBALANCER_TOPOLOGY:
+                       constants.TOPOLOGY_ACTIVE_STANDBY}
         expected_stored_params = {
             constants.AVAILABILITY_ZONE: {},
             constants.BUILD_TYPE_PRIORITY:
                 constants.LB_CREATE_FAILOVER_PRIORITY,
-            constants.FLAVOR: {constants.LOADBALANCER_TOPOLOGY:
-                               constants.TOPOLOGY_ACTIVE_STANDBY},
+            constants.FLAVOR: flavor_dict,
             constants.LOADBALANCER: mock_provider_lb.to_dict(),
             constants.LOADBALANCER_ID: LB_ID,
             constants.SERVER_GROUP_ID: None,
@@ -1534,7 +1570,8 @@ class TestControllerWorker(base.TestCase):
 
         cw.services_controller.run_poster.assert_called_once_with(
             flow_utils.get_failover_amphora_flow,
-            mock_amphora.to_dict(), 2, store=expected_stored_params)
+            mock_amphora.to_dict(), 2, flavor_dict=flavor_dict,
+            store=expected_stored_params)
 
     @mock.patch('octavia.db.repositories.AvailabilityZoneRepository.'
                 'get_availability_zone_metadata_dict', return_value={})
@@ -1571,12 +1608,13 @@ class TestControllerWorker(base.TestCase):
         mock_amphora.load_balancer_id = LB_ID
         mock_amphora.status = constants.AMPHORA_READY
         mock_amp_repo_get.return_value = mock_amphora
+        flavor_dict = {constants.LOADBALANCER_TOPOLOGY:
+                       constants.TOPOLOGY_ACTIVE_STANDBY}
         expected_stored_params = {
             constants.AVAILABILITY_ZONE: {},
             constants.BUILD_TYPE_PRIORITY:
                 constants.LB_CREATE_FAILOVER_PRIORITY,
-            constants.FLAVOR: {constants.LOADBALANCER_TOPOLOGY:
-                               constants.TOPOLOGY_ACTIVE_STANDBY},
+            constants.FLAVOR: flavor_dict,
             constants.LOADBALANCER: mock_provider_lb.to_dict(),
             constants.LOADBALANCER_ID: LB_ID,
             constants.SERVER_GROUP_ID: SERVER_GROUP_ID,
@@ -1589,7 +1627,8 @@ class TestControllerWorker(base.TestCase):
 
         cw.services_controller.run_poster.assert_called_once_with(
             flow_utils.get_failover_amphora_flow,
-            mock_amphora.to_dict(), 2, store=expected_stored_params)
+            mock_amphora.to_dict(), 2, flavor_dict=flavor_dict,
+            store=expected_stored_params)
 
     @mock.patch('octavia.api.drivers.utils.'
                 'db_loadbalancer_to_provider_loadbalancer')
@@ -1623,12 +1662,12 @@ class TestControllerWorker(base.TestCase):
         mock_amphora.load_balancer_id = LB_ID
         mock_amphora.status = constants.AMPHORA_READY
         mock_amp_repo_get.return_value = mock_amphora
+        flavor_dict = {constants.LOADBALANCER_TOPOLOGY: mock_lb.topology}
         expected_stored_params = {
             constants.AVAILABILITY_ZONE: {},
             constants.BUILD_TYPE_PRIORITY:
                 constants.LB_CREATE_FAILOVER_PRIORITY,
-            constants.FLAVOR: {constants.LOADBALANCER_TOPOLOGY:
-                               mock_lb.topology},
+            constants.FLAVOR: flavor_dict,
             constants.LOADBALANCER: mock_provider_lb.to_dict(),
             constants.LOADBALANCER_ID: LB_ID,
             constants.SERVER_GROUP_ID: SERVER_GROUP_ID,
@@ -1641,7 +1680,8 @@ class TestControllerWorker(base.TestCase):
 
         cw.services_controller.run_poster.assert_called_once_with(
             flow_utils.get_failover_amphora_flow,
-            mock_amphora.to_dict(), None, store=expected_stored_params)
+            mock_amphora.to_dict(), None, flavor_dict=flavor_dict,
+            store=expected_stored_params)
 
     @mock.patch('octavia.db.repositories.FlavorRepository.'
                 'get_flavor_metadata_dict', return_value={})
@@ -1678,13 +1718,13 @@ class TestControllerWorker(base.TestCase):
         mock_amphora.load_balancer_id = LB_ID
         mock_amphora.status = constants.AMPHORA_READY
         mock_amp_repo_get.return_value = mock_amphora
+        flavor_dict = {constants.LOADBALANCER_TOPOLOGY:
+                       constants.TOPOLOGY_SINGLE, 'taste': 'spicy'}
         expected_stored_params = {
             constants.AVAILABILITY_ZONE: {},
             constants.BUILD_TYPE_PRIORITY:
                 constants.LB_CREATE_FAILOVER_PRIORITY,
-            constants.FLAVOR: {constants.LOADBALANCER_TOPOLOGY:
-                               constants.TOPOLOGY_SINGLE,
-                               'taste': 'spicy'},
+            constants.FLAVOR: flavor_dict,
             constants.LOADBALANCER: mock_provider_lb.to_dict(),
             constants.LOADBALANCER_ID: LB_ID,
             constants.SERVER_GROUP_ID: None,
@@ -1698,7 +1738,8 @@ class TestControllerWorker(base.TestCase):
 
         cw.services_controller.run_poster.assert_called_once_with(
             flow_utils.get_failover_amphora_flow,
-            mock_amphora.to_dict(), 1, store=expected_stored_params)
+            mock_amphora.to_dict(), 1, flavor_dict=flavor_dict,
+            store=expected_stored_params)
 
     @mock.patch('octavia.db.repositories.AvailabilityZoneRepository.'
                 'get_availability_zone_metadata_dict', return_value={})
@@ -1735,12 +1776,13 @@ class TestControllerWorker(base.TestCase):
         mock_amphora.load_balancer_id = LB_ID
         mock_amphora.status = constants.AMPHORA_READY
         mock_amp_repo_get.return_value = mock_amphora
+        flavor_dict = {constants.LOADBALANCER_TOPOLOGY:
+                       constants.TOPOLOGY_SINGLE}
         expected_stored_params = {
             constants.AVAILABILITY_ZONE: {'planet': 'jupiter'},
             constants.BUILD_TYPE_PRIORITY:
                 constants.LB_CREATE_FAILOVER_PRIORITY,
-            constants.FLAVOR: {constants.LOADBALANCER_TOPOLOGY:
-                               constants.TOPOLOGY_SINGLE},
+            constants.FLAVOR: flavor_dict,
             constants.LOADBALANCER: mock_provider_lb.to_dict(),
             constants.LOADBALANCER_ID: LB_ID,
             constants.SERVER_GROUP_ID: None,
@@ -1752,12 +1794,10 @@ class TestControllerWorker(base.TestCase):
         cw.services_controller.reset_mock()
         cw.failover_amphora(AMP_ID)
 
-        print(cw, flush=True)
-        print(cw.services_controller, flush=True)
-        print(cw.services_controller.run_poster, flush=True)
         cw.services_controller.run_poster.assert_called_once_with(
             flow_utils.get_failover_amphora_flow,
-            mock_amphora.to_dict(), 1, store=expected_stored_params)
+            mock_amphora.to_dict(), 1, flavor_dict=flavor_dict,
+            store=expected_stored_params)
 
     @mock.patch('octavia.api.drivers.utils.'
                 'db_loadbalancer_to_provider_loadbalancer')
@@ -1794,12 +1834,13 @@ class TestControllerWorker(base.TestCase):
         mock_amphora.load_balancer_id = LB_ID
         mock_amphora.status = constants.AMPHORA_READY
         mock_amp_repo_get.return_value = mock_amphora
+        flavor_dict = {constants.LOADBALANCER_TOPOLOGY:
+                       constants.TOPOLOGY_SINGLE}
         expected_stored_params = {
             constants.AVAILABILITY_ZONE: {},
             constants.BUILD_TYPE_PRIORITY:
                 constants.LB_CREATE_FAILOVER_PRIORITY,
-            constants.FLAVOR: {constants.LOADBALANCER_TOPOLOGY:
-                               constants.TOPOLOGY_SINGLE},
+            constants.FLAVOR: flavor_dict,
             constants.LOADBALANCER: mock_provider_lb.to_dict(),
             constants.LOADBALANCER_ID: LB_ID,
             constants.SERVER_GROUP_ID: None,
@@ -1813,12 +1854,10 @@ class TestControllerWorker(base.TestCase):
         cw.services_controller.reset_mock()
         cw.failover_amphora(AMP_ID)
 
-        print(cw, flush=True)
-        print(cw.services_controller, flush=True)
-        print(cw.services_controller.run_poster, flush=True)
         cw.services_controller.run_poster.assert_called_once_with(
             flow_utils.get_failover_amphora_flow,
-            mock_amphora.to_dict(), 1, store=expected_stored_params)
+            mock_amphora.to_dict(), 1, flavor_dict=flavor_dict,
+            store=expected_stored_params)
 
     @mock.patch('octavia.controller.worker.v2.flows.amphora_flows.'
                 'AmphoraFlows.get_failover_amphora_flow')
@@ -1931,7 +1970,7 @@ class TestControllerWorker(base.TestCase):
         cw.services_controller.run_poster.assert_called_once_with(
             flow_utils.get_failover_amphora_flow,
             mock_amphora.to_dict(),
-            None, store=expected_stored_params)
+            None, flavor_dict={}, store=expected_stored_params)
 
     @mock.patch('octavia.db.repositories.AmphoraHealthRepository.delete')
     def test_failover_deleted_amphora(self,
@@ -2036,7 +2075,7 @@ class TestControllerWorker(base.TestCase):
             mock_member_repo_get, mock_l7rule_repo_get, mock_l7policy_repo_get,
             mock_listener_repo_get, mock_lb_repo_get, mock_health_mon_repo_get,
             mock_amp_repo_get):
-        # Case where the amps can't see eachother and somehow end up with
+        # Case where the amps can't see each other and somehow end up with
         # two amphora with an interface. This is highly unlikely as the
         # higher priority amphora should get the IP in a net split, but
         # let's test the code for this odd case.
@@ -2085,10 +2124,13 @@ class TestControllerWorker(base.TestCase):
                           cw._get_amphorae_for_failover,
                           load_balancer_mock)
 
+    @mock.patch('octavia.db.repositories.FlavorRepository.'
+                'get_flavor_metadata_dict')
     @mock.patch('octavia.controller.worker.v2.controller_worker.'
                 'ControllerWorker._get_amphorae_for_failover')
     def test_failover_loadbalancer_single(self,
                                           mock_get_amps_for_failover,
+                                          mock_get_flavor_dict,
                                           mock_api_get_session,
                                           mock_dyn_log_listener,
                                           mock_taskflow_load,
@@ -2103,6 +2145,7 @@ class TestControllerWorker(base.TestCase):
         _flow_mock.reset_mock()
         mock_lb_repo_get.return_value = _db_load_balancer_mock
         mock_get_amps_for_failover.return_value = [_amphora_mock]
+        mock_get_flavor_dict.return_value = {}
         provider_lb = provider_utils.db_loadbalancer_to_provider_loadbalancer(
             _db_load_balancer_mock).to_dict()