octavia 13.0.0__py3-none-any.whl → 13.0.1__py3-none-any.whl

octavia/tests/functional/api/v2/test_listener.py

@@ -1044,6 +1044,51 @@ class TestListener(base.BaseAPITest):
         self.assertEqual(constants.CLIENT_AUTH_NONE,
                          listener_api.get('client_authentication'))
 
+    def test_create_tls_with_no_subject_no_alt_names(self):
+        tls_cert_mock = mock.MagicMock()
+        tls_cert_mock.get_certificate.return_value = (
+            sample_certs.NOCN_NOSUBALT_CRT)
+        self.cert_manager_mock().get_cert.return_value = tls_cert_mock
+
+        lb_listener = {'name': 'listener1-no-subject-no-alt-names',
+                       'default_pool_id': None,
+                       'description': 'desc1',
+                       'admin_state_up': False,
+                       'protocol': constants.PROTOCOL_TERMINATED_HTTPS,
+                       'protocol_port': 80, 'connection_limit': 10,
+                       'default_tls_container_ref': uuidutils.generate_uuid(),
+                       'insert_headers': {},
+                       'project_id': self.project_id,
+                       'loadbalancer_id': self.lb_id,
+                       'tags': ['test_tag']}
+        body = self._build_body(lb_listener)
+        response = self.post(self.LISTENERS_PATH, body, status=400)
+        self.assertIn("No CN or DNSName", response)
+
+    def test_create_tls_with_no_subject_with_alt_names(self):
+        tls_cert_mock = mock.MagicMock()
+        tls_cert_mock.get_certificate.return_value = (
+            sample_certs.NOCN_SUBALT_CRT)
+        tls_cert_mock.get_private_key.return_value = (
+            sample_certs.NOCN_SUBALT_KEY)
+        tls_cert_mock.get_private_key_passphrase.return_value = None
+        self.cert_manager_mock().get_cert.return_value = tls_cert_mock
+
+        lb_listener = {'name': 'listener1-no-subject',
+                       'default_pool_id': None,
+                       'description': 'desc1',
+                       'admin_state_up': False,
+                       'protocol': constants.PROTOCOL_TERMINATED_HTTPS,
+                       'protocol_port': 80, 'connection_limit': 10,
+                       'default_tls_container_ref': uuidutils.generate_uuid(),
+                       'insert_headers': {},
+                       'project_id': self.project_id,
+                       'loadbalancer_id': self.lb_id,
+                       'tags': ['test_tag']}
+        body = self._build_body(lb_listener)
+        response = self.post(self.LISTENERS_PATH, body, status=201)
+        self.assertIn("PENDING_CREATE", response)
+
     def test_create_with_ca_cert_and_option(self):
         self.cert_manager_mock().get_secret.return_value = (
             sample_certs.X509_CA_CERT)

octavia/tests/functional/api/v2/test_member.py

@@ -913,6 +913,38 @@ class TestMember(base.BaseAPITest):
             m_subnet_exists.assert_called_once_with(
                 member1['subnet_id'], context=mock.ANY)
 
+    @mock.patch('octavia.api.drivers.driver_factory.get_driver')
+    @mock.patch('octavia.api.drivers.utils.call_provider')
+    def test_update_members_member_duplicate(
+            self, mock_provider, mock_get_driver):
+        mock_driver = mock.MagicMock()
+        mock_driver.name = 'noop_driver'
+        mock_get_driver.return_value = mock_driver
+        subnet_id = uuidutils.generate_uuid()
+
+        member1 = {'address': '192.0.2.1', 'protocol_port': 80,
+                   'project_id': self.project_id, 'subnet_id': subnet_id}
+
+        req_dict = [member1]
+        body = {self.root_tag_list: req_dict}
+        path = self.MEMBERS_PATH.format(pool_id=self.pool_id)
+        self.put(path, body, status=202)
+
+        self.set_lb_status(self.lb_id)
+
+        # Same member (same address and protocol_port) updated twice in the
+        # same PUT request
+        member1 = {'address': '192.0.2.1', 'protocol_port': 80,
+                   'project_id': self.project_id, 'subnet_id': subnet_id,
+                   'name': 'member1'}
+        member2 = {'address': '192.0.2.1', 'protocol_port': 80,
+                   'project_id': self.project_id, 'subnet_id': subnet_id,
+                   'name': 'member2'}
+
+        req_dict = [member1, member2]
+        body = {self.root_tag_list: req_dict}
+        self.put(path, body, status=400)
+
     @mock.patch('octavia.api.drivers.driver_factory.get_driver')
     @mock.patch('octavia.api.drivers.utils.call_provider')
     def test_update_members_subnet_not_found(

octavia/tests/functional/db/base.py

@@ -30,6 +30,8 @@ from octavia.tests import fixtures as oc_fixtures
 
 class OctaviaDBTestBase(test_base.BaseTestCase):
 
+    facade = None
+
     def setUp(self, connection_string='sqlite://'):
         super().setUp()
 
@@ -73,11 +75,18 @@ class OctaviaDBTestBase(test_base.BaseTestCase):
                                                          sqlite_fk=True)
             engine = facade.get_engine()
             session = facade.get_session(expire_on_commit=True)
+            self.facade = facade
         else:
             engine = db_api.get_engine()
             session = db_api.get_session()
         return engine, session
 
+    def get_session(self):
+        if 'sqlite:///' in self.connection_string:
+            return self.facade.get_session(expire_on_commit=True)
+        else:
+            return db_api.get_session()
+
     def _seed_lookup_tables(self, session):
         self._seed_lookup_table(
             session, constants.SUPPORTED_PROVISIONING_STATUSES,