octavia 14.0.1__py3-none-any.whl → 14.0.2__py3-none-any.whl

octavia/controller/worker/v2/tasks/network_tasks.py

@@ -706,7 +706,11 @@ class GetAmphoraNetworkConfigs(BaseNetworkTask):
             db_lb, amphora=db_amp)
         provider_dict = {}
         for amp_id, amp_conf in db_configs.items():
-            provider_dict[amp_id] = amp_conf.to_dict(recurse=True)
+            # Do not serialize loadbalancer class.  It's unused later and
+            # could be ignored for storing in results of task in persistence DB
+            provider_dict[amp_id] = amp_conf.to_dict(
+                recurse=True, calling_classes=[data_models.LoadBalancer]
+            )
         return provider_dict
 
 
@@ -724,7 +728,11 @@ class GetAmphoraNetworkConfigsByID(BaseNetworkTask):
                                                              amphora=amphora)
         provider_dict = {}
         for amp_id, amp_conf in db_configs.items():
-            provider_dict[amp_id] = amp_conf.to_dict(recurse=True)
+            # Do not serialize loadbalancer class.  It's unused later and
+            # could be ignored for storing in results of task in persistence DB
+            provider_dict[amp_id] = amp_conf.to_dict(
+                recurse=True, calling_classes=[data_models.LoadBalancer]
+            )
         return provider_dict
 
 
@@ -740,7 +748,11 @@ class GetAmphoraeNetworkConfigs(BaseNetworkTask):
         db_configs = self.network_driver.get_network_configs(db_lb)
         provider_dict = {}
         for amp_id, amp_conf in db_configs.items():
-            provider_dict[amp_id] = amp_conf.to_dict(recurse=True)
+            # Do not serialize loadbalancer class.  It's unused later and
+            # could be ignored for storing in results of task in persistence DB
+            provider_dict[amp_id] = amp_conf.to_dict(
+                recurse=True, calling_classes=[data_models.LoadBalancer]
+            )
         return provider_dict
 
 

octavia/tests/unit/controller/worker/v2/tasks/test_network_tasks.py

@@ -1380,6 +1380,10 @@ class TestNetworkTasks(base.TestCase):
         AMP_ID = uuidutils.generate_uuid()
         mock_driver = mock.MagicMock()
         mock_get_net_driver.return_value = mock_driver
+        amphora_config_mock = mock.MagicMock()
+        mock_driver.get_network_configs.return_value = {
+            "amphora_uuid1": amphora_config_mock
+        }
         mock_amp_get.return_value = 'mock amphora'
         mock_lb_get.return_value = 'mock load balancer'
 
@@ -1391,6 +1395,9 @@ class TestNetworkTasks(base.TestCase):
             'mock load balancer', amphora='mock amphora')
         mock_amp_get.assert_called_once_with(mock_get_session(), id=AMP_ID)
         mock_lb_get.assert_called_once_with(mock_get_session(), id=LB_ID)
+        amphora_config_mock.to_dict.assert_called_once_with(
+            recurse=True, calling_classes=[o_data_models.LoadBalancer]
+        )
 
     @mock.patch('octavia.db.repositories.LoadBalancerRepository.get')
     @mock.patch('octavia.db.api.get_session', return_value=_session_mock)
@@ -1399,10 +1406,17 @@ class TestNetworkTasks(base.TestCase):
         mock_driver = mock.MagicMock()
         mock_lb_get.return_value = LB
         mock_get_net_driver.return_value = mock_driver
+        amphora_config_mock = mock.MagicMock()
+        mock_driver.get_network_configs.return_value = {
+            "amphora_uuid1": amphora_config_mock
+        }
         lb = o_data_models.LoadBalancer()
         net_task = network_tasks.GetAmphoraeNetworkConfigs()
         net_task.execute(self.load_balancer_mock)
         mock_driver.get_network_configs.assert_called_once_with(lb)
+        amphora_config_mock.to_dict.assert_called_once_with(
+            recurse=True, calling_classes=[o_data_models.LoadBalancer]
+        )
 
     def test_retrieve_portids_on_amphora_except_lb_network(
             self, mock_get_net_driver):

{octavia-14.0.1.dist-info → octavia-14.0.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: octavia
-Version: 14.0.1
+Version: 14.0.2
 Summary: OpenStack Octavia Scalable Load Balancer as a Service
 Home-page: https://docs.openstack.org/octavia/latest/
 Author: OpenStack

{octavia-14.0.1.dist-info → octavia-14.0.2.dist-info}/RECORD

@@ -219,7 +219,7 @@ octavia/controller/worker/v2/tasks/cert_task.py,sha256=6BoMIyeNQeiV-Jsi2XWuxzU3x
 octavia/controller/worker/v2/tasks/compute_tasks.py,sha256=gozHMYsru-pRYyDlMMop9qU7hq93fOOEXAyLv9E1yxA,15454
 octavia/controller/worker/v2/tasks/database_tasks.py,sha256=7e4I87iUBJI5mvhXu9A9TNSLFXOOnabJj__0mH75hTk,116532
 octavia/controller/worker/v2/tasks/lifecycle_tasks.py,sha256=wQe30D_yI1i3bb3r6pC_eD1F8fo-8Jh1oJN4TC_PHSI,9803
-octavia/controller/worker/v2/tasks/network_tasks.py,sha256=eilzZYBapZpqQYMISvxVO32Ot6ISmP--DRhCtNODlkg,44503
+octavia/controller/worker/v2/tasks/network_tasks.py,sha256=s7XWDtrjdt3pg8yvHA9iOd46kEe_b_2v1C5Y0xiTZsQ,45187
 octavia/controller/worker/v2/tasks/notification_tasks.py,sha256=I2J6qNf1L7rRB0gpjy9OS7ZM4REB91-ty8xiy1WsjfQ,1631
 octavia/controller/worker/v2/tasks/retry_tasks.py,sha256=z8ZX47TKH84wzSjDOZuOtPEOjOj6DpCh4hU3_Nd1SRI,3359
 octavia/controller/worker/v2/tasks/shim_tasks.py,sha256=v8y_OYcyYJZ4cMjuY7oob6c74Y6k_56vj13AqYpPsRU,1095
@@ -583,7 +583,7 @@ octavia/tests/unit/controller/worker/v2/tasks/test_compute_tasks.py,sha256=mhYzR
 octavia/tests/unit/controller/worker/v2/tasks/test_database_tasks.py,sha256=bhcaCnmCjXF479ZNKsHil8VlNwciSjtxJrBggGvrhYE,133123
 octavia/tests/unit/controller/worker/v2/tasks/test_database_tasks_quota.py,sha256=SYofCx3JG07ytORwyqw2Kt7upgmxAE282Olk9JNsB74,17095
 octavia/tests/unit/controller/worker/v2/tasks/test_lifecycle_tasks.py,sha256=GZ0tkCu3zAqPVoWOiNaboAsL_V7Eksj1oXqED8QOuZE,16944
-octavia/tests/unit/controller/worker/v2/tasks/test_network_tasks.py,sha256=Lycr5exjFfk6fNTnCBp4uJh_blyKWKI03JsB-dEXafg,86695
+octavia/tests/unit/controller/worker/v2/tasks/test_network_tasks.py,sha256=rH2lAD-oPr22pOYLoZHPZqbawo9OWgcC5W3ZGf1TE9M,87305
 octavia/tests/unit/controller/worker/v2/tasks/test_notification_tasks.py,sha256=zW-zwrwaMFp7hAvayMSWzT0rAi_Z3KI_gdi1t6BA7aM,2566
 octavia/tests/unit/controller/worker/v2/tasks/test_retry_tasks.py,sha256=X5CGpPbLvl2LTUFGDKF-cUSo7z9c2jELnZgP1bJtiCU,1501
 octavia/tests/unit/controller/worker/v2/tasks/test_shim_tasks.py,sha256=T1ud61oLOjzQ1NPeUImqe6l4-6w7CrHNyygmbFtDmDo,1232
@@ -617,21 +617,21 @@ octavia/volume/drivers/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3
 octavia/volume/drivers/cinder_driver.py,sha256=t170XOvJ_-eTdYUpLir7ttd2vNcLuDKiqr6wx4t19Ug,4694
 octavia/volume/drivers/noop_driver/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 octavia/volume/drivers/noop_driver/driver.py,sha256=lZ2TNjyLSKbjPJY6RaNdqn8J36dlNP0hyKweM_kPMqs,2122
-octavia-14.0.1.data/data/share/octavia/LICENSE,sha256=XfKg2H1sVi8OoRxoisUlMqoo10TKvHmU_wU39ks7MyA,10143
-octavia-14.0.1.data/data/share/octavia/README.rst,sha256=1OBh9sollCLeB_vRE7cuHKOyYqkdNNToDnBkm8Zql2E,1840
-octavia-14.0.1.data/data/share/octavia/diskimage-create/README.rst,sha256=YfMT25v5GKZzL9BUHAtFpxrf7WkTb0SsP7JnARfPNeo,13582
-octavia-14.0.1.data/data/share/octavia/diskimage-create/diskimage-create.sh,sha256=PAO-CC5cK4jHse3IsuIePOFnraqvWLqXAuL4Nc0G4rY,19540
-octavia-14.0.1.data/data/share/octavia/diskimage-create/image-tests.sh,sha256=Pf2t_3ecm0aPnZhMZXBthFRNf6g0IR_JjtiWiq39VK4,3307
-octavia-14.0.1.data/data/share/octavia/diskimage-create/requirements.txt,sha256=eFwjt74uwuZ0tHJ6gr5NFJVkNC4Rhj3Rq3E3yNRc0S0,26
-octavia-14.0.1.data/data/share/octavia/diskimage-create/test-requirements.txt,sha256=1LHXsGOnVbwN8R077Bsig0g-n6egb5JGsBb6pluZkAU,22
-octavia-14.0.1.data/data/share/octavia/diskimage-create/tox.ini,sha256=xlRZdKoVgDcLG40yx_Bgl9m5plpxO_3lzPcVaZ1KAPk,1346
-octavia-14.0.1.data/data/share/octavia/diskimage-create/version.txt,sha256=pjEQCcbDIsqKwuYgz_UgTww68jEV1AMpOgy1vjZ5Zog,4
-octavia-14.0.1.data/scripts/octavia-wsgi,sha256=WW8-WIzotMi67uLd6UzD45ZCZZkpJ-eQZZ3w37Dle7U,1777
-octavia-14.0.1.dist-info/AUTHORS,sha256=3r46-5-2wm6qk5myd1vk8YGBlZppA6i2saDlJq20Uk4,11927
-octavia-14.0.1.dist-info/LICENSE,sha256=XfKg2H1sVi8OoRxoisUlMqoo10TKvHmU_wU39ks7MyA,10143
-octavia-14.0.1.dist-info/METADATA,sha256=8cdh2bK2qp_SQb6wF6shh6E0lWKndTS48vu3YmkQZAE,5742
-octavia-14.0.1.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-octavia-14.0.1.dist-info/entry_points.txt,sha256=Nl_dCK_l32Jy2IKdSNAMH10xJq7HXLpAEy9fVK3M7KA,3964
-octavia-14.0.1.dist-info/pbr.json,sha256=K4tvHHYmu4THb2BSYR7ojgdKcFHJdejvgkJYPIq28Cg,48
-octavia-14.0.1.dist-info/top_level.txt,sha256=3fR7BRuzN3OSlXpG8VH75_hi6tCwlNUs2JePIxiRPUA,8
-octavia-14.0.1.dist-info/RECORD,,
+octavia-14.0.2.data/data/share/octavia/LICENSE,sha256=XfKg2H1sVi8OoRxoisUlMqoo10TKvHmU_wU39ks7MyA,10143
+octavia-14.0.2.data/data/share/octavia/README.rst,sha256=1OBh9sollCLeB_vRE7cuHKOyYqkdNNToDnBkm8Zql2E,1840
+octavia-14.0.2.data/data/share/octavia/diskimage-create/README.rst,sha256=YfMT25v5GKZzL9BUHAtFpxrf7WkTb0SsP7JnARfPNeo,13582
+octavia-14.0.2.data/data/share/octavia/diskimage-create/diskimage-create.sh,sha256=PAO-CC5cK4jHse3IsuIePOFnraqvWLqXAuL4Nc0G4rY,19540
+octavia-14.0.2.data/data/share/octavia/diskimage-create/image-tests.sh,sha256=Pf2t_3ecm0aPnZhMZXBthFRNf6g0IR_JjtiWiq39VK4,3307
+octavia-14.0.2.data/data/share/octavia/diskimage-create/requirements.txt,sha256=eFwjt74uwuZ0tHJ6gr5NFJVkNC4Rhj3Rq3E3yNRc0S0,26
+octavia-14.0.2.data/data/share/octavia/diskimage-create/test-requirements.txt,sha256=1LHXsGOnVbwN8R077Bsig0g-n6egb5JGsBb6pluZkAU,22
+octavia-14.0.2.data/data/share/octavia/diskimage-create/tox.ini,sha256=xlRZdKoVgDcLG40yx_Bgl9m5plpxO_3lzPcVaZ1KAPk,1346
+octavia-14.0.2.data/data/share/octavia/diskimage-create/version.txt,sha256=pjEQCcbDIsqKwuYgz_UgTww68jEV1AMpOgy1vjZ5Zog,4
+octavia-14.0.2.data/scripts/octavia-wsgi,sha256=WW8-WIzotMi67uLd6UzD45ZCZZkpJ-eQZZ3w37Dle7U,1777
+octavia-14.0.2.dist-info/AUTHORS,sha256=3r46-5-2wm6qk5myd1vk8YGBlZppA6i2saDlJq20Uk4,11927
+octavia-14.0.2.dist-info/LICENSE,sha256=XfKg2H1sVi8OoRxoisUlMqoo10TKvHmU_wU39ks7MyA,10143
+octavia-14.0.2.dist-info/METADATA,sha256=6Bvn1TNoOWro7o4dSp2Gpfa6j3gkxgLj5itD8d5REVQ,5742
+octavia-14.0.2.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+octavia-14.0.2.dist-info/entry_points.txt,sha256=Nl_dCK_l32Jy2IKdSNAMH10xJq7HXLpAEy9fVK3M7KA,3964
+octavia-14.0.2.dist-info/pbr.json,sha256=Bv09W1Esz_FeLdoXZaoqUcwqJeBzKKwnNvY4jPP5v54,48
+octavia-14.0.2.dist-info/top_level.txt,sha256=3fR7BRuzN3OSlXpG8VH75_hi6tCwlNUs2JePIxiRPUA,8
+octavia-14.0.2.dist-info/RECORD,,

octavia-14.0.2.dist-info/pbr.json

@@ -0,0 +1 @@
+{"git_version": "041b07959", "is_release": true}

octavia-14.0.1.dist-info/pbr.json

@@ -1 +0,0 @@
-{"git_version": "13b28537a", "is_release": true}