octavia 14.0.0.0rc1__py3-none-any.whl → 15.0.0__py3-none-any.whl

octavia/tests/unit/api/common/test_pagination.py

@@ -103,6 +103,16 @@ class TestPaginationHelper(base.TestCase):
         helper.apply(query_mock, models.LoadBalancer)
         self.assertEqual(params, helper.filters)
 
+    @mock.patch('octavia.api.common.pagination.request')
+    def test_filter_with_booleans(self, request_mock):
+        params = {'backup': 'True', 'admin_state_up': 'false'}
+        expected_params = {'backup': True, 'enabled': False}
+        helper = pagination.PaginationHelper(params)
+        query_mock = mock.MagicMock()
+
+        helper.apply(query_mock, models.Member)
+        self.assertEqual(expected_params, helper.filters)
+
     @mock.patch('octavia.api.common.pagination.request')
     def test_filter_mismatched_params(self, request_mock):
         params = {
@@ -180,11 +190,8 @@ class TestPaginationHelper(base.TestCase):
         self.assertEqual(links[0].rel, "next")
         self.assertEqual(
             links[0].href,
-            "{path_url}?limit={limit}&marker={marker}".format(
-                path_url=request_mock.path_url,
-                limit=params['limit'],
-                marker=member1.id
-            ))
+            f"{request_mock.path_url}?limit={params['limit']}&"
+            f"marker={member1.id}")
 
     @mock.patch('octavia.api.common.pagination.request')
     def test_make_links_prev(self, request_mock):
@@ -200,17 +207,13 @@ class TestPaginationHelper(base.TestCase):
         self.assertEqual(links[0].rel, "previous")
         self.assertEqual(
             links[1].href,
-            "{path_url}?limit={limit}&marker={marker}".format(
-                path_url=request_mock.path_url,
-                limit=params['limit'],
-                marker=member1.id))
+            f"{request_mock.path_url}?limit={params['limit']}&"
+            f"marker={member1.id}")
         self.assertEqual(links[1].rel, "next")
         self.assertEqual(
             links[1].href,
-            "{path_url}?limit={limit}&marker={marker}".format(
-                path_url=request_mock.path_url,
-                limit=params['limit'],
-                marker=member1.id))
+            f"{request_mock.path_url}?limit={params['limit']}&"
+            f"marker={member1.id}")
 
     @mock.patch('octavia.api.common.pagination.request')
     def test_make_links_with_configured_url(self, request_mock):
@@ -227,12 +230,46 @@ class TestPaginationHelper(base.TestCase):
         helper = pagination.PaginationHelper(params)
         links = helper._make_links(model_list)
         self.assertEqual(links[0].rel, "previous")
+        self.assertEqual(
+            links[0].href,
+            ("{base_uri}{path}?limit={limit}&marker={marker}"
+             "&page_reverse=True").format(
+                base_uri=api_base_uri,
+                path=request_mock.path,
+                limit=params['limit'],
+                marker=member1.id
+            ))
+        self.assertEqual(links[1].rel, "next")
         self.assertEqual(
             links[1].href,
             "{base_uri}{path}?limit={limit}&marker={marker}".format(
                 base_uri=api_base_uri,
                 path=request_mock.path,
                 limit=params['limit'],
+                marker=member1.id))
+
+    @mock.patch('octavia.api.common.pagination.request')
+    def test_make_links_with_zero_limit(self, request_mock):
+        request_mock.path = "/lbaas/v2/pools/1/members"
+        request_mock.path_url = "http://localhost" + request_mock.path
+        api_base_uri = "https://127.0.0.1"
+        conf = self.useFixture(oslo_fixture.Config(cfg.CONF))
+        conf.config(group='api_settings', api_base_uri=api_base_uri)
+        member1 = models.Member()
+        member1.id = uuidutils.generate_uuid()
+        model_list = [member1]
+
+        params = {'limit': 0, 'marker': member1.id}
+        helper = pagination.PaginationHelper(params)
+        links = helper._make_links(model_list)
+        self.assertEqual(links[0].rel, "previous")
+        self.assertEqual(
+            links[0].href,
+            ("{base_uri}{path}?limit={limit}&marker={marker}"
+             "&page_reverse=True").format(
+                base_uri=api_base_uri,
+                path=request_mock.path,
+                limit=None,
                 marker=member1.id
             ))
         self.assertEqual(links[1].rel, "next")
@@ -241,5 +278,38 @@ class TestPaginationHelper(base.TestCase):
             "{base_uri}{path}?limit={limit}&marker={marker}".format(
                 base_uri=api_base_uri,
                 path=request_mock.path,
-                limit=params['limit'],
+                limit=None,
+                marker=member1.id))
+
+    @mock.patch('octavia.api.common.pagination.request')
+    def test_make_links_with_negative_limit(self, request_mock):
+        request_mock.path = "/lbaas/v2/pools/1/members"
+        request_mock.path_url = "http://localhost" + request_mock.path
+        api_base_uri = "https://127.0.0.1"
+        conf = self.useFixture(oslo_fixture.Config(cfg.CONF))
+        conf.config(group='api_settings', api_base_uri=api_base_uri)
+        member1 = models.Member()
+        member1.id = uuidutils.generate_uuid()
+        model_list = [member1]
+
+        params = {'limit': -1, 'marker': member1.id}
+        helper = pagination.PaginationHelper(params)
+        links = helper._make_links(model_list)
+        self.assertEqual(links[0].rel, "previous")
+        self.assertEqual(
+            links[0].href,
+            ("{base_uri}{path}?limit={limit}&marker={marker}"
+             "&page_reverse=True").format(
+                base_uri=api_base_uri,
+                path=request_mock.path,
+                limit=None,
+                marker=member1.id
+            ))
+        self.assertEqual(links[1].rel, "next")
+        self.assertEqual(
+            links[1].href,
+            "{base_uri}{path}?limit={limit}&marker={marker}".format(
+                base_uri=api_base_uri,
+                path=request_mock.path,
+                limit=None,
                 marker=member1.id))

octavia/tests/unit/api/v2/types/test_availability_zone_profile.py

@@ -20,7 +20,7 @@ from octavia.common import constants
 from octavia.tests.unit.api.common import base
 
 
-class TestAvailabilityZoneProfile(object):
+class TestAvailabilityZoneProfile:
 
     _type = None
 

octavia/tests/unit/api/v2/types/test_availability_zones.py

@@ -20,7 +20,7 @@ from octavia.api.v2.types import availability_zones as availability_zone_type
 from octavia.tests.unit.api.common import base
 
 
-class TestAvailabilityZone(object):
+class TestAvailabilityZone:
 
     _type = None
 

octavia/tests/unit/api/v2/types/test_flavor_profile.py

@@ -20,7 +20,7 @@ from octavia.common import constants
 from octavia.tests.unit.api.common import base
 
 
-class TestFlavorProfile(object):
+class TestFlavorProfile:
 
     _type = None
 

octavia/tests/unit/api/v2/types/test_flavors.py

@@ -20,7 +20,7 @@ from octavia.api.v2.types import flavors as flavor_type
 from octavia.tests.unit.api.common import base
 
 
-class TestFlavor(object):
+class TestFlavor:
 
     _type = None
 

octavia/tests/unit/api/v2/types/test_health_monitor.py

@@ -22,7 +22,7 @@ from octavia.common import constants
 from octavia.tests.unit.api.v2.types import base
 
 
-class TestHealthMonitor(object):
+class TestHealthMonitor:
 
     _type = None
 

octavia/tests/unit/api/v2/types/test_listener.py

@@ -22,7 +22,7 @@ from octavia.common import constants
 from octavia.tests.unit.api.common import base
 
 
-class TestListener(object):
+class TestListener:
 
     _type = None
 

octavia/tests/unit/api/v2/types/test_load_balancer.py

@@ -21,7 +21,7 @@ from octavia.api.v2.types import load_balancer as lb_type
 from octavia.tests.unit.api.common import base
 
 
-class TestLoadBalancer(object):
+class TestLoadBalancer:
 
     _type = None
 

octavia/tests/unit/api/v2/types/test_pool.py

@@ -26,7 +26,7 @@ from octavia.common import data_models
 from octavia.tests.unit.api.common import base
 
 
-class TestSessionPersistence(object):
+class TestSessionPersistence:
 
     _type = None
 

octavia/tests/unit/base.py

@@ -35,6 +35,7 @@ class TestCase(testtools.TestCase):
         config.register_cli_opts()
         self.addCleanup(mock.patch.stopall)
         self.addCleanup(self.clean_caches)
+        self.addCleanup(cfg.CONF.reset)
 
         self.warning_fixture = self.useFixture(oc_fixtures.WarningsFixture())
 

octavia/tests/unit/certificates/generator/local_csr.py

@@ -34,7 +34,7 @@ class BaseLocalCSRTestCase(base.TestCase):
         )
         csr = x509.CertificateSigningRequestBuilder().subject_name(
             x509.Name([
-                x509.NameAttribute(x509.oid.NameOID.COMMON_NAME, u"test"),
+                x509.NameAttribute(x509.oid.NameOID.COMMON_NAME, "test"),
             ])).sign(csr_key, hashes.SHA256(), backends.default_backend())
         self.certificate_signing_request = csr.public_bytes(
             serialization.Encoding.PEM)

octavia/tests/unit/certificates/generator/test_local.py

@@ -39,13 +39,13 @@ class TestLocalGenerator(local_csr.BaseLocalCSRTestCase):
         ca_cert = ca_cert.not_valid_after(valid_until_datetime)
         ca_cert = ca_cert.serial_number(1)
         subject_name = x509.Name([
-            x509.NameAttribute(x509.oid.NameOID.COUNTRY_NAME, u"US"),
+            x509.NameAttribute(x509.oid.NameOID.COUNTRY_NAME, "US"),
             x509.NameAttribute(x509.oid.NameOID.STATE_OR_PROVINCE_NAME,
-                               u"Oregon"),
-            x509.NameAttribute(x509.oid.NameOID.LOCALITY_NAME, u"Springfield"),
+                               "Oregon"),
+            x509.NameAttribute(x509.oid.NameOID.LOCALITY_NAME, "Springfield"),
             x509.NameAttribute(x509.oid.NameOID.ORGANIZATION_NAME,
-                               u"Springfield Nuclear Power Plant"),
-            x509.NameAttribute(x509.oid.NameOID.COMMON_NAME, u"maggie1"),
+                               "Springfield Nuclear Power Plant"),
+            x509.NameAttribute(x509.oid.NameOID.COMMON_NAME, "maggie1"),
         ])
         ca_cert = ca_cert.subject_name(subject_name)
         ca_cert = ca_cert.issuer_name(subject_name)

octavia/tests/unit/certificates/manager/test_barbican.py

@@ -34,9 +34,8 @@ class TestBarbicanManager(base.TestCase):
         self.barbican_endpoint = 'http://localhost:9311/v1'
         self.secret_uuid = uuid.uuid4()
 
-        self.secret_ref = '{0}/secrets/{1}'.format(
-            self.barbican_endpoint, self.secret_uuid
-        )
+        self.secret_ref = (f'{self.barbican_endpoint}/secrets/'
+                           f'{self.secret_uuid}')
 
         self.name = 'My Fancy Cert'
         self.secret_pkcs12 = secrets.Secret(

octavia/tests/unit/certificates/manager/test_barbican_legacy.py

@@ -39,7 +39,7 @@ class TestBarbicanManager(base.TestCase):
         self.private_key_uuid = uuidutils.generate_uuid()
         self.private_key_passphrase_uuid = uuidutils.generate_uuid()
 
-        self.container_ref = '{0}/containers/{1}'.format(
+        self.container_ref = '{}/containers/{}'.format(
             self.barbican_endpoint, self.container_uuid
         )
 

octavia/tests/unit/certificates/manager/test_local.py

@@ -62,13 +62,13 @@ class TestLocalManager(base.TestCase):
         mode = stat.S_IRUSR | stat.S_IWUSR  # mode 0600
         open_mock.assert_has_calls([
             mock.call(
-                os.path.join('/tmp/{0}.crt'.format(cert_id)), flags, mode),
+                os.path.join(f'/tmp/{cert_id}.crt'), flags, mode),
             mock.call(
-                os.path.join('/tmp/{0}.key'.format(cert_id)), flags, mode),
+                os.path.join(f'/tmp/{cert_id}.key'), flags, mode),
             mock.call(
-                os.path.join('/tmp/{0}.int'.format(cert_id)), flags, mode),
+                os.path.join(f'/tmp/{cert_id}.int'), flags, mode),
             mock.call(
-                os.path.join('/tmp/{0}.pass'.format(cert_id)), flags, mode)
+                os.path.join(f'/tmp/{cert_id}.pass'), flags, mode)
         ], any_order=True)
 
         # Verify the writes were made
@@ -98,10 +98,10 @@ class TestLocalManager(base.TestCase):
         # Verify the correct files were opened
         flags = os.O_RDONLY
         open_mock.assert_has_calls([
-            mock.call(os.path.join('/tmp/{0}.crt'.format(cert_id)), flags),
-            mock.call(os.path.join('/tmp/{0}.key'.format(cert_id)), flags),
-            mock.call(os.path.join('/tmp/{0}.int'.format(cert_id)), flags),
-            mock.call(os.path.join('/tmp/{0}.pass'.format(cert_id)), flags)
+            mock.call(os.path.join(f'/tmp/{cert_id}.crt'), flags),
+            mock.call(os.path.join(f'/tmp/{cert_id}.key'), flags),
+            mock.call(os.path.join(f'/tmp/{cert_id}.int'), flags),
+            mock.call(os.path.join(f'/tmp/{cert_id}.pass'), flags)
         ], any_order=True)
 
         # The returned data should be a Cert object
@@ -117,10 +117,10 @@ class TestLocalManager(base.TestCase):
 
         # Verify the correct files were removed
         remove_mock.assert_has_calls([
-            mock.call(os.path.join('/tmp/{0}.crt'.format(cert_id))),
-            mock.call(os.path.join('/tmp/{0}.key'.format(cert_id))),
-            mock.call(os.path.join('/tmp/{0}.int'.format(cert_id))),
-            mock.call(os.path.join('/tmp/{0}.pass'.format(cert_id)))
+            mock.call(os.path.join(f'/tmp/{cert_id}.crt')),
+            mock.call(os.path.join(f'/tmp/{cert_id}.key')),
+            mock.call(os.path.join(f'/tmp/{cert_id}.int')),
+            mock.call(os.path.join(f'/tmp/{cert_id}.pass'))
         ], any_order=True)
 
     def test_store_cert(self):
@@ -151,8 +151,7 @@ class TestLocalManager(base.TestCase):
 
         # Verify the correct files were opened
         flags = os.O_RDONLY
-        open_mock.assert_called_once_with('/tmp/{0}.crt'.format(secret_id),
-                                          flags)
+        open_mock.assert_called_once_with(f'/tmp/{secret_id}.crt', flags)
 
         # Test failure path
         with mock.patch('os.open', open_mock), mock.patch.object(

octavia/tests/unit/cmd/test_health_checker.py

@@ -28,7 +28,7 @@ CONF = cfg.CONF
 class TestHealthCheckerCMD(base.TestCase):
 
     def setUp(self):
-        super(TestHealthCheckerCMD, self).setUp()
+        super().setUp()
         self.CONF = self.useFixture(oslo_fixture.Config(cfg.CONF))
 
     def test_crc32c(self):

octavia/tests/unit/cmd/test_prometheus_proxy.py

@@ -147,6 +147,7 @@ class TestPrometheusProxyCMD(base.TestCase):
         mock_http.shutdown.assert_called_once()
 
     @mock.patch('threading.Thread')
+    @mock.patch('http.server.ThreadingHTTPServer.__init__')
     @mock.patch('http.server.ThreadingHTTPServer.serve_forever')
     @mock.patch('octavia.amphorae.backends.utils.network_namespace.'
                 'NetworkNamespace.__exit__')
@@ -155,12 +156,18 @@ class TestPrometheusProxyCMD(base.TestCase):
     @mock.patch('octavia.cmd.prometheus_proxy.EXIT_EVENT')
     @mock.patch('octavia.cmd.prometheus_proxy.SignalHandler')
     def test_main(self, mock_signal_handler, mock_exit_event, mock_netns_enter,
-                  mock_netns_exit, mock_serve_forever, mock_thread):
+                  mock_netns_exit, mock_serve_forever, mock_server_init,
+                  mock_thread):
 
         mock_exit_event.is_set.side_effect = [False, False, True]
         mock_netns_enter.side_effect = [Exception('boom'), True]
 
+        mock_server_init.return_value = None
+
         prometheus_proxy.main()
 
         mock_signal_handler.assert_called_once()
+        mock_server_init.assert_called_once_with(
+            ('127.0.0.1', 9102),
+            prometheus_proxy.PrometheusProxy)
         mock_serve_forever.assert_called_once()