octavia 12.0.0.0rc2__py3-none-any.whl → 13.0.0.0rc1__py3-none-any.whl

octavia/tests/common/constants.py

@@ -12,6 +12,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 from octavia_lib.common import constants as lib_constants
+from openstack.network.v2.floating_ip import FloatingIP
+from openstack.network.v2.network import Network
+from openstack.network.v2.network_ip_availability import NetworkIPAvailability
+from openstack.network.v2.port import Port
+from openstack.network.v2.security_group import SecurityGroup
+from openstack.network.v2.subnet import Subnet
 
 from octavia.common import constants
 
@@ -43,16 +49,16 @@ MOCK_MAC_ADDR = 'fe:16:3e:00:95:5c'
 MOCK_MAC_ADDR2 = 'fe:16:3e:00:95:5d'
 MOCK_PROJECT_ID = 'mock-project-1'
 MOCK_HOST_ROUTES = []
-MOCK_SUBNET = {'subnet': {'id': MOCK_SUBNET_ID,
-                          'network_id': MOCK_NETWORK_ID,
-                          'name': MOCK_SUBNET_NAME,
-                          'tenant_id': MOCK_PROJECT_ID,
-                          'gateway_ip': MOCK_GATEWAY_IP,
-                          'cidr': MOCK_CIDR,
-                          'ip_version': MOCK_IP_VERSION,
-                          'host_routes': MOCK_HOST_ROUTES}}
-MOCK_SUBNET2 = {'subnet': {'id': MOCK_SUBNET_ID2,
-                           'network_id': MOCK_NETWORK_ID2}}
+MOCK_SUBNET = Subnet(**{'id': MOCK_SUBNET_ID,
+                        'network_id': MOCK_NETWORK_ID,
+                        'name': MOCK_SUBNET_NAME,
+                        'tenant_id': MOCK_PROJECT_ID,
+                        'gateway_ip': MOCK_GATEWAY_IP,
+                        'cidr': MOCK_CIDR,
+                        'ip_version': MOCK_IP_VERSION,
+                        'host_routes': MOCK_HOST_ROUTES})
+MOCK_SUBNET2 = Subnet(**{'id': MOCK_SUBNET_ID2,
+                         'network_id': MOCK_NETWORK_ID2})
 MOCK_HOST_ROUTES = []
 
 MOCK_NOVA_INTERFACE = MockNovaInterface()
@@ -69,7 +75,7 @@ MOCK_DEVICE_ID2 = 'Moctavia124'
 MOCK_SECURITY_GROUP_ID = 'security-group-1'
 MOCK_SECURITY_GROUP_NAME = 'SecurityGroup1'
 
-MOCK_SECURITY_GROUP = {
+MOCK_SECURITY_GROUP = SecurityGroup(**{
     "id": MOCK_SECURITY_GROUP_ID,
     "name": MOCK_SECURITY_GROUP_NAME,
     "tenant_id": MOCK_PROJECT_ID,
@@ -113,7 +119,7 @@ MOCK_SECURITY_GROUP = {
     "created_at": "2020-03-12T20:43:31Z",
     "updated_at": "2020-03-12T20:44:48Z",
     "revision_number": 3,
-    "project_id": MOCK_PROJECT_ID}
+    "project_id": MOCK_PROJECT_ID})
 
 MOCK_ADMIN_STATE_UP = True
 MOCK_STATUS = 'ACTIVE'
@@ -122,59 +128,60 @@ MOCK_NETWORK_TYPE = 'flat'
 MOCK_SEGMENTATION_ID = 1
 MOCK_ROUTER_EXTERNAL = False
 
-MOCK_NEUTRON_PORT = {'port': {'network_id': MOCK_NETWORK_ID,
-                              'device_id': MOCK_DEVICE_ID,
-                              'device_owner': MOCK_DEVICE_OWNER,
-                              'id': MOCK_PORT_ID,
-                              'name': MOCK_PORT_NAME,
-                              'tenant_id': MOCK_PROJECT_ID,
-                              'admin_state_up': MOCK_ADMIN_STATE_UP,
-                              'status': MOCK_STATUS,
-                              'mac_address': MOCK_MAC_ADDR,
-                              'fixed_ips': [{'ip_address': MOCK_IP_ADDRESS,
-                                             'subnet_id': MOCK_SUBNET_ID}],
-                              'security_groups': [MOCK_SECURITY_GROUP_ID]}}
+MOCK_NEUTRON_PORT = Port(**{'network_id': MOCK_NETWORK_ID,
+                            'device_id': MOCK_DEVICE_ID,
+                            'device_owner': MOCK_DEVICE_OWNER,
+                            'id': MOCK_PORT_ID,
+                            'name': MOCK_PORT_NAME,
+                            'tenant_id': MOCK_PROJECT_ID,
+                            'admin_state_up': MOCK_ADMIN_STATE_UP,
+                            'status': MOCK_STATUS,
+                            'mac_address': MOCK_MAC_ADDR,
+                            'fixed_ips': [{'ip_address': MOCK_IP_ADDRESS,
+                                           'subnet_id': MOCK_SUBNET_ID}],
+                            'security_groups': [MOCK_SECURITY_GROUP_ID]})
 MOCK_NEUTRON_QOS_POLICY_ID = 'mock-qos-id'
 MOCK_QOS_POLICY_ID1 = 'qos1-id'
 MOCK_QOS_POLICY_ID2 = 'qos2-id'
 
-MOCK_NEUTRON_PORT2 = {'port': {'network_id': MOCK_NETWORK_ID2,
-                               'device_id': MOCK_DEVICE_ID2,
-                               'device_owner': MOCK_DEVICE_OWNER,
-                               'id': MOCK_PORT_ID2,
-                               'name': MOCK_PORT_NAME2,
-                               'tenant_id': MOCK_PROJECT_ID,
-                               'admin_state_up': MOCK_ADMIN_STATE_UP,
-                               'status': MOCK_STATUS,
-                               'mac_address': MOCK_MAC_ADDR2,
-                               'fixed_ips': [{'ip_address': MOCK_IP_ADDRESS2,
-                                              'subnet_id': MOCK_SUBNET_ID2}]}}
+MOCK_NEUTRON_PORT2 = Port(**{'network_id': MOCK_NETWORK_ID2,
+                             'device_id': MOCK_DEVICE_ID2,
+                             'device_owner': MOCK_DEVICE_OWNER,
+                             'id': MOCK_PORT_ID2,
+                             'name': MOCK_PORT_NAME2,
+                             'tenant_id': MOCK_PROJECT_ID,
+                             'admin_state_up': MOCK_ADMIN_STATE_UP,
+                             'status': MOCK_STATUS,
+                             'mac_address': MOCK_MAC_ADDR2,
+                             'fixed_ips': [{'ip_address': MOCK_IP_ADDRESS2,
+                                            'subnet_id': MOCK_SUBNET_ID2}]})
 
-MOCK_NETWORK = {'network': {'id': MOCK_NETWORK_ID,
-                            'name': MOCK_NETWORK_NAME,
-                            'tenant_id': MOCK_PROJECT_ID,
-                            'admin_state_up': MOCK_ADMIN_STATE_UP,
-                            'subnets': [MOCK_SUBNET_ID],
-                            'mtu': MOCK_MTU,
-                            'provider:network_type': 'flat',
-                            'provider:physical_network': MOCK_NETWORK_NAME,
-                            'provider:segmentation_id': MOCK_SEGMENTATION_ID,
-                            'router:external': MOCK_ROUTER_EXTERNAL}}
-MOCK_FIXED_IP = {'fixed_ip': {'subnet_id': MOCK_SUBNET_ID,
-                              'ip_address': MOCK_IP_ADDRESS}}
+MOCK_NETWORK = Network(**{'id': MOCK_NETWORK_ID,
+                          'name': MOCK_NETWORK_NAME,
+                          'project_id': MOCK_PROJECT_ID,
+                          'admin_state_up': MOCK_ADMIN_STATE_UP,
+                          'subnet_ids': [MOCK_SUBNET_ID],
+                          'mtu': MOCK_MTU,
+                          'provider_network_type': 'flat',
+                          'provider_physical_network': MOCK_NETWORK_NAME,
+                          'provider_segmentation_id': MOCK_SEGMENTATION_ID,
+                          'router_external': MOCK_ROUTER_EXTERNAL,
+                          'port_security_enabled': False})
+MOCK_FIXED_IP = {'subnet_id': MOCK_SUBNET_ID,
+                 'ip_address': MOCK_IP_ADDRESS}
 MOCK_FLOATING_IP_ID = 'floating-ip-1'
 MOCK_FLOATING_IP_DESC = 'TestFloatingIP1'
 MOCK_ROUTER_ID = 'mock-router-1'
-MOCK_FLOATING_IP = {'floatingip': {'id': MOCK_FLOATING_IP_ID,
-                                   'description': MOCK_FLOATING_IP_DESC,
-                                   'tenant_id': MOCK_PROJECT_ID,
-                                   'status': MOCK_STATUS,
-                                   'port_id': MOCK_PORT_ID,
-                                   'router_id': MOCK_ROUTER_ID,
-                                   'floating_network_id': MOCK_NETWORK_ID,
-                                   'floating_ip_address': MOCK_IP_ADDRESS,
-                                   'fixed_ip_address': MOCK_IP_ADDRESS2,
-                                   'fixed_port_id': MOCK_PORT_ID2}}
+MOCK_FLOATING_IP = FloatingIP(**{'id': MOCK_FLOATING_IP_ID,
+                                 'description': MOCK_FLOATING_IP_DESC,
+                                 'tenant_id': MOCK_PROJECT_ID,
+                                 'status': MOCK_STATUS,
+                                 'port_id': MOCK_PORT_ID,
+                                 'router_id': MOCK_ROUTER_ID,
+                                 'floating_network_id': MOCK_NETWORK_ID,
+                                 'floating_ip_address': MOCK_IP_ADDRESS,
+                                 'fixed_ip_address': MOCK_IP_ADDRESS2,
+                                 'fixed_port_id': MOCK_PORT_ID2})
 
 MOCK_AMP_ID1 = 'amp1-id'
 MOCK_AMP_ID2 = 'amp2-id'
@@ -205,17 +212,17 @@ MOCK_MANAGEMENT_INTERFACE2.net_id = MOCK_MANAGEMENT_NET_ID
 MOCK_MANAGEMENT_INTERFACE2.port_id = MOCK_MANAGEMENT_PORT_ID2
 MOCK_MANAGEMENT_INTERFACE2.fixed_ips = MOCK_MANAGEMENT_FIXED_IPS2
 
-MOCK_MANAGEMENT_PORT1 = {'port': {'network_id': MOCK_MANAGEMENT_NET_ID,
-                                  'device_id': MOCK_AMP_COMPUTE_ID1,
-                                  'device_owner': MOCK_DEVICE_OWNER,
-                                  'id': MOCK_MANAGEMENT_PORT_ID1,
-                                  'fixed_ips': MOCK_MANAGEMENT_FIXED_IPS1}}
+MOCK_MANAGEMENT_PORT1 = Port(**{'network_id': MOCK_MANAGEMENT_NET_ID,
+                                'device_id': MOCK_AMP_COMPUTE_ID1,
+                                'device_owner': MOCK_DEVICE_OWNER,
+                                'id': MOCK_MANAGEMENT_PORT_ID1,
+                                'fixed_ips': MOCK_MANAGEMENT_FIXED_IPS1})
 
-MOCK_MANAGEMENT_PORT2 = {'port': {'network_id': MOCK_MANAGEMENT_NET_ID,
-                                  'device_id': MOCK_AMP_COMPUTE_ID2,
-                                  'device_owner': MOCK_DEVICE_OWNER,
-                                  'id': MOCK_MANAGEMENT_PORT_ID2,
-                                  'fixed_ips': MOCK_MANAGEMENT_FIXED_IPS2}}
+MOCK_MANAGEMENT_PORT2 = Port(**{'network_id': MOCK_MANAGEMENT_NET_ID,
+                                'device_id': MOCK_AMP_COMPUTE_ID2,
+                                'device_owner': MOCK_DEVICE_OWNER,
+                                'id': MOCK_MANAGEMENT_PORT_ID2,
+                                'fixed_ips': MOCK_MANAGEMENT_FIXED_IPS2})
 
 MOCK_VIP_SUBNET_ID = 'vip-subnet-1'
 MOCK_VIP_SUBNET_ID2 = 'vip-subnet-2'
@@ -242,17 +249,17 @@ MOCK_VRRP_INTERFACE2.net_id = MOCK_VIP_NET_ID
 MOCK_VRRP_INTERFACE2.port_id = MOCK_VRRP_PORT_ID2
 MOCK_VRRP_INTERFACE2.fixed_ips = MOCK_VRRP_FIXED_IPS2
 
-MOCK_VRRP_PORT1 = {'port': {'network_id': MOCK_VIP_NET_ID,
-                            'device_id': MOCK_AMP_COMPUTE_ID1,
-                            'device_owner': MOCK_DEVICE_OWNER,
-                            'id': MOCK_VRRP_PORT_ID1,
-                            'fixed_ips': MOCK_VRRP_FIXED_IPS1}}
+MOCK_VRRP_PORT1 = Port(**{'network_id': MOCK_VIP_NET_ID,
+                          'device_id': MOCK_AMP_COMPUTE_ID1,
+                          'device_owner': MOCK_DEVICE_OWNER,
+                          'id': MOCK_VRRP_PORT_ID1,
+                          'fixed_ips': MOCK_VRRP_FIXED_IPS1})
 
-MOCK_VRRP_PORT2 = {'port': {'network_id': MOCK_VIP_NET_ID,
-                            'device_id': MOCK_AMP_COMPUTE_ID2,
-                            'device_owner': MOCK_DEVICE_OWNER,
-                            'id': MOCK_VRRP_PORT_ID2,
-                            'fixed_ips': MOCK_VRRP_FIXED_IPS2}}
+MOCK_VRRP_PORT2 = Port(**{'network_id': MOCK_VIP_NET_ID,
+                          'device_id': MOCK_AMP_COMPUTE_ID2,
+                          'device_owner': MOCK_DEVICE_OWNER,
+                          'id': MOCK_VRRP_PORT_ID2,
+                          'fixed_ips': MOCK_VRRP_FIXED_IPS2})
 
 MOCK_NETWORK_TOTAL_IPS = 254
 MOCK_NETWORK_USED_IPS = 0
@@ -262,13 +269,13 @@ MOCK_SUBNET_IP_AVAILABILITY = [{'used_ips': MOCK_SUBNET_USED_IPS,
                                 'subnet_id': MOCK_SUBNET_ID,
                                 'total_ips': MOCK_SUBNET_TOTAL_IPS}]
 
-MOCK_NETWORK_IP_AVAILABILITY = {'network_ip_availability': (
-    {'network_id': MOCK_NETWORK_ID,
-     'tenant_id': MOCK_PROJECT_ID,
-     'network_name': MOCK_NETWORK_NAME,
-     'total_ips': MOCK_NETWORK_TOTAL_IPS,
-     'used_ips': MOCK_NETWORK_USED_IPS,
-     'subnet_ip_availability': MOCK_SUBNET_IP_AVAILABILITY})}
+MOCK_NETWORK_IP_AVAILABILITY = NetworkIPAvailability(
+    **{'network_id': MOCK_NETWORK_ID,
+       'tenant_id': MOCK_PROJECT_ID,
+       'network_name': MOCK_NETWORK_NAME,
+       'total_ips': MOCK_NETWORK_TOTAL_IPS,
+       'used_ips': MOCK_NETWORK_USED_IPS,
+       'subnet_ip_availability': MOCK_SUBNET_IP_AVAILABILITY})
 
 INVALID_LISTENER_POOL_PROTOCOL_MAP = {
     constants.PROTOCOL_HTTP: [constants.PROTOCOL_HTTPS,

octavia/tests/common/sample_data_models.py

@@ -476,7 +476,10 @@ class SampleDriverDataModels(object):
             lib_consts.TLS_CIPHERS: constants.CIPHERS_OWASP_SUITE_B,
             lib_consts.TLS_VERSIONS: constants.TLS_VERSIONS_OWASP_SUITE_B,
             lib_consts.ALPN_PROTOCOLS:
-                constants.AMPHORA_SUPPORTED_ALPN_PROTOCOLS
+                constants.AMPHORA_SUPPORTED_ALPN_PROTOCOLS,
+            lib_consts.HSTS_INCLUDE_SUBDOMAINS: False,
+            lib_consts.HSTS_MAX_AGE: None,
+            lib_consts.HSTS_PRELOAD: False,
         }
 
         self.test_listener1_dict.update(self._common_test_dict)
@@ -488,6 +491,9 @@ class SampleDriverDataModels(object):
         self.test_listener2_dict[lib_consts.DEFAULT_POOL_ID] = self.pool2_id
         self.test_listener2_dict[
             lib_consts.DEFAULT_POOL] = self.test_pool2_dict
+        self.test_listener2_dict[lib_consts.HSTS_INCLUDE_SUBDOMAINS] = True
+        self.test_listener2_dict[lib_consts.HSTS_MAX_AGE] = 10
+        self.test_listener2_dict[lib_consts.HSTS_PRELOAD] = False
         del self.test_listener2_dict[lib_consts.L7POLICIES]
         del self.test_listener2_dict[constants.SNI_CONTAINERS]
         del self.test_listener2_dict[constants.CLIENT_CA_TLS_CERTIFICATE_ID]
@@ -524,6 +530,9 @@ class SampleDriverDataModels(object):
             lib_consts.DEFAULT_TLS_CONTAINER_REF:
                 self.default_tls_container_ref,
             lib_consts.DESCRIPTION: 'Listener 1',
+            lib_consts.HSTS_INCLUDE_SUBDOMAINS: False,
+            lib_consts.HSTS_MAX_AGE: None,
+            lib_consts.HSTS_PRELOAD: False,
             lib_consts.INSERT_HEADERS: {},
             lib_consts.L7POLICIES: self.provider_l7policies_dict,
             lib_consts.LISTENER_ID: self.listener1_id,
@@ -571,6 +580,9 @@ class SampleDriverDataModels(object):
         self.provider_listener2_dict[
             lib_consts.CLIENT_CRL_CONTAINER_REF] = None
         del self.provider_listener2_dict[lib_consts.CLIENT_CRL_CONTAINER_DATA]
+        self.provider_listener2_dict[lib_consts.HSTS_INCLUDE_SUBDOMAINS] = True
+        self.provider_listener2_dict[lib_consts.HSTS_MAX_AGE] = 10
+        self.provider_listener2_dict[lib_consts.HSTS_PRELOAD] = False
 
         self.provider_listener1 = driver_dm.Listener(
             **self.provider_listener1_dict)

octavia/tests/fixtures.py

@@ -0,0 +1,32 @@
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+import warnings
+
+import fixtures
+from sqlalchemy import exc as sqla_exc
+
+
+class WarningsFixture(fixtures.Fixture):
+    """Filters out warnings during test runs."""
+
+    def setUp(self):
+        super().setUp()
+        # Make deprecation warnings only happen once to avoid spamming
+        warnings.simplefilter('once', DeprecationWarning)
+
+        # Enable deprecation warnings to capture upcoming SQLAlchemy changes
+        warnings.filterwarnings(
+            'error',
+            category=sqla_exc.SADeprecationWarning)
+
+        self.addCleanup(warnings.resetwarnings)

octavia/tests/functional/amphorae/backend/agent/api_server/test_server.py

@@ -1008,7 +1008,9 @@ class TestServerTestCase(base.TestCase):
 
         mock_int_exists.return_value = False
         netns_handle = mock_netns.return_value.__enter__.return_value
-        netns_handle.get_links.return_value = [0] * test_int_num
+        netns_handle.get_links.return_value = [
+            {'attrs': [['IFLA_IFNAME', f'eth{idx}']]}
+            for idx in range(test_int_num)]
         mock_isfile.return_value = True
 
         mock_check_output.return_value = b"1\n2\n3\n"
@@ -1396,7 +1398,7 @@ class TestServerTestCase(base.TestCase):
 
         netns_handle = mock_netns.return_value.__enter__.return_value
         netns_handle.get_links.return_value = [{
-            'attrs': [['IFLA_IFNAME', consts.NETNS_PRIMARY_INTERFACE]]}]
+            'attrs': [['IFLA_IFNAME', 'eth2']]}]
 
         port_info = {'mac_address': MAC, 'mtu': 1450, 'fixed_ips': [
             {'ip_address': IP, 'subnet_cidr': SUBNET_CIDR,
@@ -1405,8 +1407,7 @@ class TestServerTestCase(base.TestCase):
 
         flags = os.O_WRONLY | os.O_CREAT | os.O_TRUNC
         mode = stat.S_IRUSR | stat.S_IWUSR | stat.S_IRGRP | stat.S_IROTH
-        file_name = '/etc/octavia/interfaces/{}.json'.format(
-            consts.NETNS_PRIMARY_INTERFACE)
+        file_name = '/etc/octavia/interfaces/eth3.json'
 
         m = self.useFixture(test_utils.OpenFixture(file_name)).mock_open
         with mock.patch('os.open') as mock_open, mock.patch.object(
@@ -1436,7 +1437,7 @@ class TestServerTestCase(base.TestCase):
             mock_fdopen.assert_any_call(123, 'r+')
 
             expected_dict = {
-                consts.NAME: consts.NETNS_PRIMARY_INTERFACE,
+                consts.NAME: 'eth3',
                 consts.MTU: 1450,
                 consts.ADDRESSES: [
                     {
@@ -1458,13 +1459,12 @@ class TestServerTestCase(base.TestCase):
                 consts.SCRIPTS: {
                     consts.IFACE_UP: [{
                         consts.COMMAND: (
-                            "/usr/local/bin/lvs-masquerade.sh add ipv4 "
-                            "{}".format(consts.NETNS_PRIMARY_INTERFACE))
+                            "/usr/local/bin/lvs-masquerade.sh add ipv4 eth3")
                     }],
                     consts.IFACE_DOWN: [{
                         consts.COMMAND: (
                             "/usr/local/bin/lvs-masquerade.sh delete ipv4 "
-                            "{}".format(consts.NETNS_PRIMARY_INTERFACE))
+                            "eth3")
                     }]
                 }
             }
@@ -1476,8 +1476,7 @@ class TestServerTestCase(base.TestCase):
 
             mock_check_output.assert_called_with(
                 ['ip', 'netns', 'exec', consts.AMPHORA_NAMESPACE,
-                 'amphora-interface', 'up',
-                 consts.NETNS_PRIMARY_INTERFACE], stderr=-2)
+                 'amphora-interface', 'up', 'eth3'], stderr=-2)
 
     def test_ubuntu_plug_VIP4(self):
         self._test_plug_VIP4(consts.UBUNTU)