octavia 14.0.1__tar.gz → 14.0.2__tar.gz

{octavia-14.0.1 → octavia-14.0.2}/ChangeLog

@@ -1,6 +1,12 @@
 CHANGES
 =======
 
+14.0.2
+------
+
+* Add an octavia-wsgi compatibility script
+* Ignore load\_balancer graph in task results to avoid break write data in jobboard DB
+
 14.0.1
 ------
 

{octavia-14.0.1/octavia.egg-info → octavia-14.0.2}/PKG-INFO

@@ -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.2/bin/octavia-wsgi

@@ -0,0 +1,52 @@
+#!/usr/bin/env python3
+#PBR Generated from 'wsgi_scripts' - Archived for Octavia stable branches
+
+import threading
+
+from octavia.api.app import setup_app
+
+if __name__ == "__main__":
+    import argparse
+    import socket
+    import sys
+    import wsgiref.simple_server as wss
+
+    parser = argparse.ArgumentParser(
+        description=setup_app.__doc__,
+        formatter_class=argparse.ArgumentDefaultsHelpFormatter,
+        usage='%(prog)s [-h] [--port PORT] [--host IP] -- [passed options]')
+    parser.add_argument('--port', '-p', type=int, default=8000,
+                        help='TCP port to listen on')
+    parser.add_argument('--host', '-b', default='',
+                        help='IP to bind the server to')
+    parser.add_argument('args',
+                        nargs=argparse.REMAINDER,
+                        metavar='-- [passed options]',
+                        help="'--' is the separator of the arguments used "
+                        "to start the WSGI server and the arguments passed "
+                        "to the WSGI application.")
+    args = parser.parse_args()
+    if args.args:
+        if args.args[0] == '--':
+            args.args.pop(0)
+        else:
+            parser.error("unrecognized arguments: %s" % ' '.join(args.args))
+    sys.argv[1:] = args.args
+    server = wss.make_server(args.host, args.port, setup_app())
+
+    print("*" * 80)
+    print("STARTING test server octavia.api.app.setup_app")
+    url = "http://%s:%d/" % (server.server_name, server.server_port)
+    print("Available at %s" % url)
+    print("DANGER! For testing only, do not use in production")
+    print("*" * 80)
+    sys.stdout.flush()
+
+    server.serve_forever()
+else:
+    application = None
+    app_lock = threading.Lock()
+
+    with app_lock:
+        if application is None:
+            application = setup_app()

{octavia-14.0.1 → octavia-14.0.2}/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-14.0.1 → octavia-14.0.2}/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 → octavia-14.0.2/octavia.egg-info}/PKG-INFO

@@ -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 → octavia-14.0.2}/octavia.egg-info/SOURCES.txt

@@ -198,6 +198,7 @@ api-ref/source/v2/examples/quotas-list-response.json
 api-ref/source/v2/examples/quotas-show-response.json
 bin/create_dual_intermediate_CA.sh
 bin/create_single_CA_intermediate_CA.sh
+bin/octavia-wsgi
 bin/openssl.cnf
 devstack/README.md
 devstack/plugin.sh
@@ -1055,6 +1056,7 @@ releasenotes/notes/Add-amphora-info-endpoint-e2e3b53ae5ab5a85.yaml
 releasenotes/notes/Add-cached_zone-to-the-amphora-record-7c3231c2b5b96574.yaml
 releasenotes/notes/Add-driver-agent-get-methods-b624a1342c3e6d0f.yaml
 releasenotes/notes/Add-log-offloading-233cd8612c0dd2b5.yaml
+releasenotes/notes/Add-octavia-wsgi-compatibility-script-42b8aca87b98c904.yaml
 releasenotes/notes/Add-pool-CA-and-CRL-bb467b17188ed022.yaml
 releasenotes/notes/Add-pool-tls-client-auth-01d3b8acfb78ab14.yaml
 releasenotes/notes/Add-pool-tls_enabled-f189677c0e13c447.yaml
@@ -1187,6 +1189,7 @@ releasenotes/notes/disable-conntrack-for-tcp-01ef6948d99353c2.yaml
 releasenotes/notes/disable_logging-3b50f388ee2b8127.yaml
 releasenotes/notes/diskimage-create-add-file-extension-to-default-34eeaa97b788cc67.yaml
 releasenotes/notes/diskimage-create-git-branch-9c44e7e3fa70a985.yaml
+releasenotes/notes/do-not-serialize-full-loadbalancer-graph-on-get-amphora-network-configs-347a0a4340ee222b.yaml
 releasenotes/notes/documentation-migration-f72c6a1703a105b7.yaml
 releasenotes/notes/drop-python-2-7-a6b3f456bf6a3da7.yaml
 releasenotes/notes/enable-keystone-on-api-b3ebb132ad5ab308.yaml

octavia-14.0.2/octavia.egg-info/pbr.json

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

octavia-14.0.2/releasenotes/notes/Add-octavia-wsgi-compatibility-script-42b8aca87b98c904.yaml

@@ -0,0 +1,5 @@
+---
+other:
+  - |
+    Added a "octavia-wsgi" script for backward compatibility now that pbr's
+    wsgi_scripts no longer functions with the latest setuptools.

octavia-14.0.2/releasenotes/notes/do-not-serialize-full-loadbalancer-graph-on-get-amphora-network-configs-347a0a4340ee222b.yaml

@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Ignore serialization loadbalancer class in GetAmphoraNetworkConfigs tasks.
+    It allows to avoid storing full graph in jobboard details. It fixes cases
+    with enabled jobboard for huge LBs with ~2000+ resources in graph.

{octavia-14.0.1 → octavia-14.0.2}/setup.cfg

@@ -37,6 +37,8 @@ data_files =
 	diskimage-create/test-requirements.txt
 	diskimage-create/tox.ini
 	diskimage-create/version.txt
+scripts = 
+	bin/octavia-wsgi
 
 [entry_points]
 wsgi_scripts = 

octavia-14.0.1/octavia.egg-info/pbr.json

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