octavia 13.0.0.0rc1__py3-none-any.whl → 14.0.0__py3-none-any.whl

octavia/db/migration/alembic_migrations/versions/db2a73e82626_add_vnic_type_for_vip.py

@@ -0,0 +1,36 @@
+#    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.
+
+"""Add vnic_type for VIP
+
+Revision ID: db2a73e82626
+Revises: 632152d2d32e
+Create Date: 2023-11-09 21:57:05.302435
+
+"""
+
+from alembic import op
+import sqlalchemy as sa
+
+from octavia.common import constants
+
+# revision identifiers, used by Alembic.
+revision = 'db2a73e82626'
+down_revision = '632152d2d32e'
+
+
+def upgrade():
+    op.add_column(
+        u'vip',
+        sa.Column(u'vnic_type', sa.String(64), nullable=False,
+                  server_default=constants.VNIC_TYPE_NORMAL)
+    )

octavia/db/models.py

@@ -506,6 +506,7 @@ class Vip(base_models.BASE):
     network_id = sa.Column(sa.String(36), nullable=True)
     qos_policy_id = sa.Column(sa.String(36), nullable=True)
     octavia_owned = sa.Column(sa.Boolean(), nullable=True)
+    vnic_type = sa.Column(sa.String(64), nullable=True)
 
 
 class AdditionalVip(base_models.BASE):

octavia/db/prepare.py

@@ -31,7 +31,7 @@ def create_load_balancer(lb_dict):
     lb_dict[constants.PROVISIONING_STATUS] = constants.PENDING_CREATE
     lb_dict[constants.OPERATING_STATUS] = constants.OFFLINE
 
-    # Set defaults later possibly overriden by flavors later
+    # Set defaults later possibly overridden by flavors later
     lb_dict['topology'] = CONF.controller_worker.loadbalancer_topology
 
     return lb_dict

octavia/db/repositories.py

@@ -39,7 +39,9 @@ from sqlalchemy import update
 from octavia.common import constants as consts
 from octavia.common import data_models
 from octavia.common import exceptions
+from octavia.common import utils
 from octavia.common import validate
+from octavia.db import api as db_api
 from octavia.db import models
 
 CONF = cfg.CONF
@@ -364,8 +366,7 @@ class Repositories(object):
                                  provisioning_status=lb_prov_status)
         return success
 
-    def check_quota_met(self, session, lock_session, _class, project_id,
-                        count=1):
+    def check_quota_met(self, session: Session, _class, project_id, count=1):
         """Checks and updates object quotas.
 
         This method makes sure the project has available quota
@@ -373,7 +374,6 @@ class Repositories(object):
         new ussage.
 
         :param session: Context database session
-        :param lock_session: Locking database session (autocommit=False)
         :param _class: Data model object requesting quota
         :param project_id: Project ID requesting quota
         :param count: Number of objects we're going to create (default=1)
@@ -390,19 +390,14 @@ class Repositories(object):
         if not project_id:
             raise exceptions.MissingProjectID()
 
-        quotas = self.quotas.get(session, project_id=project_id)
-        if not quotas:
-            # Make sure we have a record to lock
-            self.quotas.update(
-                session,
-                project_id,
-                quota={})
+        self.quotas.ensure_project_exists(project_id)
+
         # Lock the project record in the database to block other quota checks
         #
         # Note: You cannot just use the current count as the in-use
         # value as we don't want to lock the whole resource table
         try:
-            quotas = (lock_session.query(models.Quotas)
+            quotas = (session.query(models.Quotas)
                       .filter_by(project_id=project_id)
                       .populate_existing()
                       .with_for_update()
@@ -1091,6 +1086,23 @@ class ListenerRepository(BaseRepository):
          update({self.model_class.provisioning_status: consts.ACTIVE},
                 synchronize_session='fetch'))
 
+    def get_port_protocol_cidr_for_lb(self, session, loadbalancer_id):
+        # readability variables
+        Listener = self.model_class
+        ListenerCidr = models.ListenerCidr
+
+        stmt = (select(Listener.protocol,
+                       ListenerCidr.cidr,
+                       Listener.protocol_port.label(consts.PORT))
+                .select_from(Listener)
+                .join(models.ListenerCidr,
+                      Listener.id == ListenerCidr.listener_id, isouter=True)
+                .where(Listener.load_balancer_id == loadbalancer_id))
+        rows = session.execute(stmt)
+
+        return [utils.map_protocol_to_nftable_protocol(u._asdict()) for u
+                in rows.all()]
+
 
 class ListenerStatisticsRepository(BaseRepository):
     model_class = models.ListenerStatistics
@@ -1244,23 +1256,22 @@ class AmphoraRepository(BaseRepository):
         :param amphora_id: The amphora id to list the load balancers from
         :returns: [octavia.common.data_model]
         """
-        with session.begin():
-            db_lb = (
-                # Get LB records
-                session.query(models.LoadBalancer)
-                # Joined to amphora records
-                .filter(models.LoadBalancer.id ==
-                        models.Amphora.load_balancer_id)
-                # For just this amphora
-                .filter(models.Amphora.id == amphora_id)
-                # Where the amphora is not DELETED
-                .filter(models.Amphora.status != consts.DELETED)
-                # And the LB is also not DELETED
-                .filter(models.LoadBalancer.provisioning_status !=
-                        consts.DELETED)).first()
-            if db_lb:
-                return db_lb.to_data_model()
-            return None
+        db_lb = (
+            # Get LB records
+            session.query(models.LoadBalancer)
+            # Joined to amphora records
+            .filter(models.LoadBalancer.id ==
+                    models.Amphora.load_balancer_id)
+            # For just this amphora
+            .filter(models.Amphora.id == amphora_id)
+            # Where the amphora is not DELETED
+            .filter(models.Amphora.status != consts.DELETED)
+            # And the LB is also not DELETED
+            .filter(models.LoadBalancer.provisioning_status !=
+                    consts.DELETED)).first()
+        if db_lb:
+            return db_lb.to_data_model()
+        return None
 
     def get_cert_expiring_amphora(self, session):
         """Retrieves an amphora whose cert is close to expiring..
@@ -1372,7 +1383,7 @@ class AmphoraRepository(BaseRepository):
 
         Puts a lock on the amphora table to check the status of the
         amphora. The status must be either AMPHORA_READY or ERROR to
-        successfuly update the amphora status.
+        successfully update the amphora status.
 
         :param lock_session: A Sql Alchemy database session.
         :param id: id of Load Balancer
@@ -1884,11 +1895,6 @@ class L7PolicyRepository(BaseRepository):
 class QuotasRepository(BaseRepository):
     model_class = models.Quotas
 
-    # Since this is for the initial quota record creation it locks the table
-    # which can lead to recoverable deadlocks. Thus we use the deadlock
-    # retry wrapper here. This may not be appropriate for other sessions
-    # and or queries. Use with caution.
-    @oslo_db_api.wrap_db_retry(max_retries=5, retry_on_deadlock=True)
     def update(self, session, project_id, **model_kwargs):
         kwargs_quota = model_kwargs['quota']
         quotas = (
@@ -1905,6 +1911,19 @@ class QuotasRepository(BaseRepository):
         session.flush()
         return self.get(session, project_id=project_id)
 
+    # Since this is for the initial quota record creation it locks the table
+    # which can lead to recoverable deadlocks. Thus we use the deadlock
+    # retry wrapper here. This may not be appropriate for other sessions
+    # and or queries. Use with caution.
+    @oslo_db_api.wrap_db_retry(max_retries=5, retry_on_deadlock=True)
+    def ensure_project_exists(self, project_id):
+        with db_api.session().begin() as session:
+            quotas = self.get(session, project_id=project_id)
+            if not quotas:
+                # Make sure we have a record to lock
+                self.update(session, project_id, quota={})
+            session.commit()
+
     def delete(self, session, project_id):
         quotas = (
             session.query(self.model_class)

octavia/distributor/drivers/driver_base.py

@@ -64,7 +64,7 @@ class DistributorDriver(object, metaclass=abc.ABCMeta):
         :returns: A TaskFlow Flow that will add a VIP to the distributor
 
         This method will return a TaskFlow Flow that adds a VIP to the
-        distributor by perfoming the necessary steps to plug the VIP and
+        distributor by performing the necessary steps to plug the VIP and
         configure the distributor to start receiving requests on this VIP.
         """
 

octavia/network/base.py

@@ -14,6 +14,7 @@
 
 import abc
 
+from octavia.common import constants
 from octavia.common import exceptions
 
 
@@ -108,7 +109,8 @@ class AbstractNetworkDriver(object, metaclass=abc.ABCMeta):
     @abc.abstractmethod
     def create_port(self, network_id, name=None, fixed_ips=(),
                     secondary_ips=(), security_group_ids=(),
-                    admin_state_up=True, qos_policy_id=None):
+                    admin_state_up=True, qos_policy_id=None,
+                    vnic_type=constants.VNIC_TYPE_NORMAL):
         """Creates a network port.
 
         fixed_ips = [{'subnet_id': <id>, ('ip_address': <IP>')},]
@@ -141,21 +143,6 @@ class AbstractNetworkDriver(object, metaclass=abc.ABCMeta):
         :returns: None
         """
 
-    @abc.abstractmethod
-    def plug_vip(self, load_balancer, vip):
-        """Plugs a virtual ip as the frontend connection of a load balancer.
-
-        Sets up the routing of traffic from the vip to the load balancer
-        and its amphorae.
-
-        :param load_balancer: octavia.common.data_models.LoadBalancer instance
-        :param vip: octavia.common.data_models.VIP instance
-        :return: dict consisting of amphora_id as key and bind_ip as value.
-                 bind_ip is the ip that the amphora should listen on to
-                 receive traffic to load balance.
-        :raises: PlugVIPException, PortNotFound
-        """
-
     @abc.abstractmethod
     def unplug_vip(self, load_balancer, vip):
         """Unplugs a virtual ip as the frontend connection of a load balancer.

octavia/network/data_models.py

@@ -12,6 +12,7 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+from octavia.common import constants
 from octavia.common import data_models
 
 
@@ -81,7 +82,8 @@ class Port(data_models.BaseDataModel):
     def __init__(self, id=None, name=None, device_id=None, device_owner=None,
                  mac_address=None, network_id=None, status=None,
                  project_id=None, admin_state_up=None, fixed_ips=None,
-                 network=None, qos_policy_id=None, security_group_ids=None):
+                 network=None, qos_policy_id=None, security_group_ids=None,
+                 vnic_type=constants.VNIC_TYPE_NORMAL):
         self.id = id
         self.name = name
         self.device_id = device_id
@@ -95,6 +97,7 @@ class Port(data_models.BaseDataModel):
         self.network = network
         self.qos_policy_id = qos_policy_id
         self.security_group_ids = security_group_ids or []
+        self.vnic_type = vnic_type
 
     def get_subnet_id(self, fixed_ip_address):
         for fixed_ip in self.fixed_ips:

octavia/network/drivers/neutron/allowed_address_pairs.py

@@ -34,7 +34,6 @@ from octavia.network.drivers.neutron import utils
 LOG = logging.getLogger(__name__)
 AAP_EXT_ALIAS = 'allowed-address-pairs'
 PROJECT_ID_ALIAS = 'project-id'
-OCTAVIA_OWNER = 'Octavia'
 
 CONF = cfg.CONF
 
@@ -89,7 +88,7 @@ class AllowedAddressPairsDriver(neutron_base.BaseNeutronDriver):
                 constants.NETWORK_ID: subnet.network_id,
                 constants.FIXED_IPS: [{'subnet_id': subnet.id}],
                 constants.ADMIN_STATE_UP: True,
-                constants.DEVICE_OWNER: OCTAVIA_OWNER,
+                constants.DEVICE_OWNER: constants.OCTAVIA_OWNER,
             }
             new_port = self.network_proxy.create_port(**port)
             new_port = utils.convert_port_to_model(new_port)
@@ -364,12 +363,13 @@ class AllowedAddressPairsDriver(neutron_base.BaseNeutronDriver):
         """
         try:
             for amphora in vip.load_balancer.amphorae:
-                try:
-                    self.network_proxy.delete_port(amphora.vrrp_port_id)
-                except os_exceptions.ResourceNotFound:
-                    LOG.debug(
-                        'VIP instance port %s already deleted. Skipping.',
-                        amphora.vrrp_port_id)
+                if amphora.vrrp_port_id:
+                    try:
+                        self.network_proxy.delete_port(amphora.vrrp_port_id)
+                    except os_exceptions.ResourceNotFound:
+                        LOG.debug(
+                            'VIP instance port %s already deleted. Skipping.',
+                            amphora.vrrp_port_id)
         except AttributeError as ex:
             LOG.warning(f"Cannot delete port from amphorae. Object does not "
                         f"exist ({ex!r})")
@@ -384,7 +384,7 @@ class AllowedAddressPairsDriver(neutron_base.BaseNeutronDriver):
 
         self._delete_security_group(vip, port)
 
-        if port and port.device_owner == OCTAVIA_OWNER:
+        if port and port.device_owner == constants.OCTAVIA_OWNER:
             try:
                 self.network_proxy.delete_port(vip.port_id)
             except os_exceptions.ResourceNotFound:
@@ -442,18 +442,6 @@ class AllowedAddressPairsDriver(neutron_base.BaseNeutronDriver):
             vrrp_port_id=interface.port_id,
             ha_port_id=vip.port_id)
 
-    # todo (xgerman): Delete later
-    def plug_vip(self, load_balancer, vip):
-        self.update_vip_sg(load_balancer, vip)
-        plugged_amphorae = []
-        subnet = self.get_subnet(vip.subnet_id)
-        for amphora in filter(
-            lambda amp: amp.status == constants.AMPHORA_ALLOCATED,
-                load_balancer.amphorae):
-            plugged_amphorae.append(self.plug_aap_port(load_balancer, vip,
-                                                       amphora, subnet))
-        return plugged_amphorae
-
     def _validate_fixed_ip(self, fixed_ips, subnet_id, ip_address):
         """Validate an IP address exists in a fixed_ips dict
 
@@ -479,6 +467,16 @@ class AllowedAddressPairsDriver(neutron_base.BaseNeutronDriver):
         return list_of_dicts
 
     def allocate_vip(self, load_balancer):
+        """Allocates a virtual ip.
+
+        Reserves the IP for later use as the frontend connection of a load
+        balancer.
+
+        :param load_balancer: octavia.common.data_models.LoadBalancer instance
+        :return: octavia.common.data_models.Vip,
+                 list(octavia.common.data_models.AdditionalVip)
+        :raises: AllocateVIPException, PortNotFound, SubnetNotFound
+        """
         if load_balancer.vip.port_id:
             try:
                 port = self.get_port(load_balancer.vip.port_id)
@@ -490,7 +488,7 @@ class AllowedAddressPairsDriver(neutron_base.BaseNeutronDriver):
                     LOG.info('Port %s already exists. Nothing to be done.',
                              load_balancer.vip.port_id)
                     return self._port_to_vip(port, load_balancer)
-                LOG.error('Neutron VIP mis-match. Expected ip %s on '
+                LOG.error('Neutron VIP mismatch. Expected ip %s on '
                           'subnet %s in network %s. Neutron has fixed_ips %s '
                           'in network %s. Deleting and recreating the VIP '
                           'port.', load_balancer.vip.ip_address,
@@ -523,7 +521,7 @@ class AllowedAddressPairsDriver(neutron_base.BaseNeutronDriver):
 
         fixed_ip = {}
         if load_balancer.vip.subnet_id:
-            fixed_ip['subnet_id'] = load_balancer.vip.subnet_id
+            fixed_ip[constants.SUBNET_ID] = load_balancer.vip.subnet_id
         if load_balancer.vip.ip_address:
             fixed_ip[constants.IP_ADDRESS] = load_balancer.vip.ip_address
 
@@ -555,7 +553,7 @@ class AllowedAddressPairsDriver(neutron_base.BaseNeutronDriver):
             constants.NETWORK_ID: load_balancer.vip.network_id,
             constants.ADMIN_STATE_UP: False,
             'device_id': 'lb-{0}'.format(load_balancer.id),
-            constants.DEVICE_OWNER: OCTAVIA_OWNER,
+            constants.DEVICE_OWNER: constants.OCTAVIA_OWNER,
             project_id_key: load_balancer.project_id}
 
         if fixed_ips:
@@ -828,7 +826,8 @@ class AllowedAddressPairsDriver(neutron_base.BaseNeutronDriver):
 
     def create_port(self, network_id, name=None, fixed_ips=(),
                     secondary_ips=(), security_group_ids=(),
-                    admin_state_up=True, qos_policy_id=None):
+                    admin_state_up=True, qos_policy_id=None,
+                    vnic_type=constants.VNIC_TYPE_NORMAL):
         """Creates a network port.
 
         fixed_ips = [{'subnet_id': <id>, ('ip_addrss': <IP>')},]
@@ -840,6 +839,7 @@ class AllowedAddressPairsDriver(neutron_base.BaseNeutronDriver):
         :param secondary_ips: A list of secondary IPs to add to the port.
         :param security_group_ids: A list of security group IDs for the port.
         :param qos_policy_id: The QoS policy ID to apply to the port.
+        :param vnic_type: The vNIC type this port should attach to.
         :returns port: A port data model object.
         """
         try:
@@ -848,7 +848,8 @@ class AllowedAddressPairsDriver(neutron_base.BaseNeutronDriver):
                 aap_list.append({constants.IP_ADDRESS: ip})
             port = {constants.NETWORK_ID: network_id,
                     constants.ADMIN_STATE_UP: admin_state_up,
-                    constants.DEVICE_OWNER: OCTAVIA_OWNER}
+                    constants.DEVICE_OWNER: constants.OCTAVIA_OWNER,
+                    constants.BINDING_VNIC_TYPE: vnic_type}
             if aap_list:
                 port[constants.ALLOWED_ADDRESS_PAIRS] = aap_list
             if fixed_ips:

octavia/network/drivers/noop_driver/driver.py

@@ -15,6 +15,7 @@
 from oslo_log import log as logging
 from oslo_utils import uuidutils
 
+from octavia.common import constants
 from octavia.common import data_models
 from octavia.network import base as driver_base
 from octavia.network import data_models as network_models
@@ -73,19 +74,6 @@ class NoopManager(object):
         self.networkconfigconfig[vip.ip_address] = (vip,
                                                     'deallocate_vip')
 
-    def plug_vip(self, loadbalancer, vip):
-        LOG.debug("Network %s no-op, plug_vip loadbalancer %s, vip %s",
-                  self.__class__.__name__,
-                  loadbalancer.id, vip.ip_address)
-        self.update_vip_sg(loadbalancer, vip)
-        amps = []
-        for amphora in loadbalancer.amphorae:
-            amps.append(self.plug_aap_port(loadbalancer, vip, amphora, None))
-        self.networkconfigconfig[(loadbalancer.id,
-                                  vip.ip_address)] = (loadbalancer, vip,
-                                                      'plug_vip')
-        return amps
-
     def update_vip_sg(self, load_balancer, vip):
         LOG.debug("Network %s no-op, update_vip_sg loadbalancer %s, vip %s",
                   self.__class__.__name__,
@@ -204,8 +192,7 @@ class NoopManager(object):
                 return len(self.known_subnets) + 1
 
             def __iter__(self):
-                for subnet_id in self.known_subnets:
-                    yield subnet_id
+                yield from self.known_subnets
                 subnet = network_models.Subnet(id=uuidutils.generate_uuid(),
                                                network_id=self.network.id)
                 self.known_subnets[subnet.id] = subnet
@@ -395,7 +382,8 @@ class NoopManager(object):
 
     def create_port(self, network_id, name=None, fixed_ips=(),
                     secondary_ips=(), security_group_ids=(),
-                    admin_state_up=True, qos_policy_id=None):
+                    admin_state_up=True, qos_policy_id=None,
+                    vnic_type=constants.VNIC_TYPE_NORMAL):
         LOG.debug("Network %s no-op, create_port network_id %s",
                   self.__class__.__name__, network_id)
         if not name:
@@ -421,13 +409,14 @@ class NoopManager(object):
 
         self.networkconfigconfig[(network_id, 'create_port')] = (
             network_id, name, fixed_ip_obj_list, secondary_ips,
-            security_group_ids, admin_state_up, qos_policy_id)
+            security_group_ids, admin_state_up, qos_policy_id, vnic_type)
         return network_models.Port(
             id=port_id, name=name, device_id='no-op-device-id',
             device_owner='Octavia', mac_address='00:00:5E:00:53:05',
             network_id=network_id, status='UP', project_id=project_id,
             admin_state_up=admin_state_up, fixed_ips=fixed_ip_obj_list,
-            qos_policy_id=qos_policy_id, security_group_ids=security_group_ids)
+            qos_policy_id=qos_policy_id, security_group_ids=security_group_ids,
+            vnic_type=vnic_type)
 
     def plug_fixed_ip(self, port_id, subnet_id, ip_address=None):
         LOG.debug("Network %s no-op, plug_fixed_ip port_id %s, subnet_id "
@@ -462,9 +451,6 @@ class NoopNetworkDriver(driver_base.AbstractNetworkDriver):
     def deallocate_vip(self, vip):
         self.driver.deallocate_vip(vip)
 
-    def plug_vip(self, loadbalancer, vip):
-        return self.driver.plug_vip(loadbalancer, vip)
-
     def unplug_vip(self, loadbalancer, vip):
         self.driver.unplug_vip(loadbalancer, vip)
 
@@ -542,10 +528,11 @@ class NoopNetworkDriver(driver_base.AbstractNetworkDriver):
 
     def create_port(self, network_id, name=None, fixed_ips=(),
                     secondary_ips=(), security_group_ids=(),
-                    admin_state_up=True, qos_policy_id=None):
+                    admin_state_up=True, qos_policy_id=None,
+                    vnic_type=constants.VNIC_TYPE_NORMAL):
         return self.driver.create_port(
             network_id, name, fixed_ips, secondary_ips, security_group_ids,
-            admin_state_up, qos_policy_id)
+            admin_state_up, qos_policy_id, vnic_type)
 
     def plug_fixed_ip(self, port_id, subnet_id, ip_address=None):
         return self.driver.plug_fixed_ip(port_id, subnet_id, ip_address)

octavia/tests/common/sample_certs.py

@@ -872,3 +872,118 @@ phYuPfZekoNbsOIPDTiPFniuP2saOF4TSRCW4KnpgblRkds6c8X+1ExdlSo5GjNa
 PftOKlYtE7T7Kw4CI9+O2H38IUOYjDt/c2twy954K4pKe4x9Ud8mImpS/oEzOsoz
 /Mn++bjO55LdaAUKQ3wa8LZ5WFB+Gs6b2kmBfzGarWEiX64=
 -----END X509 CRL-----"""
+
+# An invalid certificate due to no subject and no subjectAltName
+NOCN_NOSUBALT_CRT = b"""-----BEGIN CERTIFICATE-----
+MIIE4zCCAsugAwIBAgIUTo7POpWDLecy0B7fY2OAbLztmswwDQYJKoZIhvcNAQEL
+BQAwADAgFw0yMzExMjIyMjE4MzBaGA8yMTIzMTAyOTIyMTgzMFowADCCAiIwDQYJ
+KoZIhvcNAQEBBQADggIPADCCAgoCggIBAPClqkTqRyjlp+LXE4oElYGvg7y710yZ
+pR96TNqgugXxNLmIgzx2A3wWJ77z6qn3XoTFEXNnT6f4WrVr1Eh5/Zd1ioyj1r0G
+hIuEWMkm42UsTv+bId6BkXrr4wTgXgU+ss82dmRsYArV1b+c+89oYlEjQorhQ6eT
+2aWnt1XJbtpgRYCy5DsBKg1Iq63QRXp5svEr4iX+jAiDCQnBBLhrkfMUf8zuMCev
+Ij5119OGY5ihLuopIZi6OurA0fyN9e2MFlnYmWcxSZu49+6yBnXGmhmev3qzWj1+
+9DA50Pqu+NS9rVpYBNhhKuBTBxaTeZPDAl67DC2Mc8TFI1OfpiOwb+w/ewRYznry
+ZceASFovPFsAlUddwu/94sxgUSCmSE81Op+VlXS0LRgg8o/OZHp/eFsG2NM0OGAH
+v2uJly4OTPTd/kT50zViX3wJlRYIH+4szSjpbNXE0aF+cqQ56PBrGEe6j+SaGZEV
+6k4N9WMHNipffkq10N2d6fkRQjAD9B7gHOB6AAQ1mxoZtgchCKL7E8FuA803Yx8B
+a7h9J65SJq9nbr0z4eTscFZPulW8wMZT/ZeooQJJWqvA+g2FZf0dExk46gqU3F2F
+IRMvfGzSbIQF7bp/Yj4fLMUwLVaYv6NNdzhI+/eC0wVDWwbQ2rZkkvcvysSteGT4
+IDuFKuIWt4UnAgMBAAGjUzBRMB0GA1UdDgQWBBSEDhho9+R5JhsAZlQ0wU4Rjbqn
+OjAfBgNVHSMEGDAWgBSEDhho9+R5JhsAZlQ0wU4RjbqnOjAPBgNVHRMBAf8EBTAD
+AQH/MA0GCSqGSIb3DQEBCwUAA4ICAQAZ8E7l2H56z08yJiAa5DFmT8jmBHUCoJlM
+HiZSn04mtzZEfho/21Zdnb2Pa2SDrRkVXmrO+DebO5sK1Kn/EFC9P3SAOeZ3LB+m
+bJUX4WGEJ+7fv9uVRwSRfF21Lxo9QFgSVfQlQAhmXcKCE/8VtKB34oOZRhR8tAxH
+I4VvHUPyCT8ZwNhofP2TYHEjRi/4fsXueBH4kBHDy0/pyHMy1b5crWQAjlOhFXhW
++qauSXkbIXNXd+wX23UF2uQ8YH819V7cHAidx9ikwn6HC5hxXjzMjViDwI451V6Q
+eAgrVuKTgx6cdnd2mgra8k7Bd2S+uTxwcrzVVzNfF+D2Al43xgeFF02M8Wp6ZDsh
+3/mJ7NOJGTJbXLRP+u73PEh1mGGU8H2QoGvaRO7R599sbmU4LedWX/VJc2GXojzF
+ibPWaMkKtX31QiOeNiLTMSkUWiyDTvzFW2ErqyzARv/yYFcEixEFl1GV8Bqb+ujj
+cxO5/y9cK6aM+qPb/FrXivXQsNArrpE3T1C54RvhUWOi+kyCiV/mDIG+oOp7sfZ5
+tBPenwWB2/LGS4rS67jZdwyIC5UbVySaVxtqJrdQXTRNjGfj2m963CHbiaQLSoSF
+2Zh2e8W4ixo6k6mhih2YjZVtpHrXyzNEtHT9HpPHDeElVcWteIceZMI2Ah0C6Ggj
+uTbEBYW85Q==
+-----END CERTIFICATE-----"""
+
+# A certificate with no subject but with Subject Alternative Name
+NOCN_SUBALT_CRT = b"""-----BEGIN CERTIFICATE-----
+MIIFAjCCAuqgAwIBAgIUNjJqSdaJ9FsivfRHbXpdmcZgJR4wDQYJKoZIhvcNAQEL
+BQAwADAgFw0yMzExMzAyMTQyNTVaGA8yMTIzMTEwNjIxNDI1NVowADCCAiIwDQYJ
+KoZIhvcNAQEBBQADggIPADCCAgoCggIBAKA8+0iJzx51kTufmIpxGCM/KUFWdJ0U
+MmOPN1NmySNaj6nGI/Ix6m13A5SaezhbRlJvEwN7Hqg+tl+fqu0RgtQOXfBDMiJm
++kAl0CQiOH7XU41P6fyk/QL8WF3VVGBtawTWn3x9Jw7Itd/zFr+aepQOj5LIwcx1
+ncHXreWdMLqDa7PpW1Ru6BW0FKVxX6WYQr2PI08nEIxu6DzLcaLHktRyNYg7r9X9
+a0tLZcp5MCBG3h3EtVgUkL9qw8q6acJpDGBF7ssRTNDf3QUSg0jrfzkD9WJCi631
+tefdAkDNIZXGZggbWsDGPseX4JG9p7WGzPx5QY2DkMqDJqi6FoS35tT+WNcY0n9V
+oBQXtXFV/AqOC070NwrhxsNA3cBbpRqEQYJsIDaXq0cmFR4aoDWk4OXqs7I+dpyi
+MFeRHEU7h4DpwzaOmOyaSmzsZqEMG2lsdJZmC+fIFkyKtP0BQv/movWY25oJSpF5
+4Q/PdwKn6PFO2bRVSLStlrhpuqXw2+CzlQT6YCAz+ajqDnn/w8NIrT6y+DiFd+kt
+WCed/o4ZBzsxOexRph+t0bdkTmR8PNpnHwcxzVN33gCSc6Q5DW1/M2V8VGYqnPd/
+taEaMlHm/wQ3y2/aH/tkyq85PM5tqCbUscD4TUZ7R6kb0k83Ak2iZOM5RHb4zc4p
+mreNKLPfgrQ7AgMBAAGjcjBwMB0GA1UdDgQWBBT6/yXwr+5BhORB3cUkrrSgnreq
+NTAfBgNVHSMEGDAWgBT6/yXwr+5BhORB3cUkrrSgnreqNTAPBgNVHRMBAf8EBTAD
+AQH/MB0GA1UdEQEB/wQTMBGCD3d3dy5leGFtcGxlLmNvbTANBgkqhkiG9w0BAQsF
+AAOCAgEAjxrBZ3v6wK7oZWvrzFV+aCs+KkoUkK0Y61TM4SCbWIT8oinN68nweha5
+p48Jp+hSBHEsj9h0opHezihduKh5IVM7KtbcXn1GSeN2hmyAAPm/MbxyD+l+UEfB
+G/behQcsYdVXXog7nwD2NXINvra8KGPqA7n/BnQ7RsxBXHVa9+IHF2L4LpbcvG7G
+Ci/jmLSBk7Gi/75TsFphHAhfomovfnnNykfJ0u99ew14MxVmRWbZ+rbpMsUL/AhV
+h8VujkfUs1hFbdxePTVyHwplqH65yjzzQ18q8CX7kMGi9sz2k8xJS04Nz0x1l7xQ
+JDuhFMDDrcyb7vAqG7BHQ9zXWJ3IkTg9WrbfkOyTqQsJeInToWQybmr/7lY3PmC2
+e/X0zNABF+ypX29RrKzWL+KfpbslysZIEPLEW28qAh3KOyml1du+lbDSNtcHxQcT
+bnvz2rQlAYE70Ds3znLLuMXbq8GtS+h8EYH1jxcjZD9DAPhxi37v8QSY/ABIBGE2
+lfbhbzZ5OWQLMA0L1tbTg7bG5JGoi/GmPl4oA+Dbz3+8Yd/v8XJUzQgI221tx+T+
+isog5o96m62pW6hd1R+eZjVAOVMT/OxecJ9eIVva8EiZwu1Ja9arBkuhIBVK2htm
+PVi6J1iFUrPZG+QrK/ZePo4xE06Lm31dr8pxdZ7Y860owwIuHfA=
+-----END CERTIFICATE-----"""
+
+NOCN_SUBALT_KEY = b"""-----BEGIN PRIVATE KEY-----
+MIIJQgIBADANBgkqhkiG9w0BAQEFAASCCSwwggkoAgEAAoICAQCgPPtIic8edZE7
+n5iKcRgjPylBVnSdFDJjjzdTZskjWo+pxiPyMeptdwOUmns4W0ZSbxMDex6oPrZf
+n6rtEYLUDl3wQzIiZvpAJdAkIjh+11ONT+n8pP0C/Fhd1VRgbWsE1p98fScOyLXf
+8xa/mnqUDo+SyMHMdZ3B163lnTC6g2uz6VtUbugVtBSlcV+lmEK9jyNPJxCMbug8
+y3Gix5LUcjWIO6/V/WtLS2XKeTAgRt4dxLVYFJC/asPKumnCaQxgRe7LEUzQ390F
+EoNI6385A/ViQout9bXn3QJAzSGVxmYIG1rAxj7Hl+CRvae1hsz8eUGNg5DKgyao
+uhaEt+bU/ljXGNJ/VaAUF7VxVfwKjgtO9DcK4cbDQN3AW6UahEGCbCA2l6tHJhUe
+GqA1pODl6rOyPnacojBXkRxFO4eA6cM2jpjsmkps7GahDBtpbHSWZgvnyBZMirT9
+AUL/5qL1mNuaCUqReeEPz3cCp+jxTtm0VUi0rZa4abql8Nvgs5UE+mAgM/mo6g55
+/8PDSK0+svg4hXfpLVgnnf6OGQc7MTnsUaYfrdG3ZE5kfDzaZx8HMc1Td94AknOk
+OQ1tfzNlfFRmKpz3f7WhGjJR5v8EN8tv2h/7ZMqvOTzObagm1LHA+E1Ge0epG9JP
+NwJNomTjOUR2+M3OKZq3jSiz34K0OwIDAQABAoICABC+7r/g7w1O2hOyFR36vbwJ
+QMV8RImZ774p3G1R45lXQIZMl7sa7lXsRyqDjncQSuQYiZMmjcilbSfHJvTJjLOe
+oMCYNSgVPPfxO7RbAy52UFwHSvvFPk/OkWmU/tFo/fMuftJive80mJVD8U+q1D6e
+2vBLHL3CWO9GG/1QFSSY0Wum6o2DXavO+w1jMMy8gdUPnXALNBaJDKo11LVfR//9
+w4xuOG0To9/ljEjBq37kCRhxU0ZWN95ZSQbpvl273rg89rywHSgDDTUXfzLisZQC
+zuUq8TAH6q/FkBO3nFfruQQF39EfprXzMFvqxxkYclm8TlZ8tmgDlsmxUOMj2PKl
+H9kWDC5YkynfkxltKgiEJ9Kc3pZnfaScABnz0GySsZN71bUbr7fBqwH0LhbZiQqa
+b9pWcbyKuGFJ56gVsokVHcpKnKmKHedtmL33oJzI3iWYZls/mPejmkwIWt1i3F7c
+ZnhDJJp3gWgzZzSyV5OjZ05SIrM9er9r+WqS75ns7vKEzhgzpHdZuUR2jNNVu/EA
+rCnsebUtemr0tDYxhI5BcPgj3fzq02u7plJUFIwlPrpMxZ8VBJgoSwT7Di5qpHnt
+LmiGoqRM+vVXiWshops1I7q7zLCgvP+Difi4KNjap/lBsj7hiB7alZTrMVVAXiBr
+Ia++3L38ga5DJ+SHDzjBAoIBAQDNUG4URQD/j0E3pS4zn4wezSp0wOTKKIw2Z6oU
+02reZq9uFLIt+/74DVy3NZm3tBgeSakYUZeDB8zpog3mGpkPAHpwObB/fPbMYmst
+cCnXYDf9Uvb7k287a0GIbCOXwkHSrgRwznAZ4EQp6E0nZSoLbyZiC+uhYEVZgQQo
+JswsjKCSaL7o/4XXQOi6Mdsd4BX7aVVKjYrQZ8TkkCsMYFdQMSL1fB8DW4Q+Ixco
+6BGXPoaav/2XOb0HGBmrXX/yqllA8rw0U7RNLgsE7gZIlltGeTsQMeo/+w5+LJKt
+HOhhEUHITJkRZ7P/S8OdXXoVCNiUzCxGy/LrHW/AWu0t1WWbAoIBAQDHy9Allaod
+WDxdbe5G5ke03WFcPoVAxOWu0mloaFdbd7Ec39y4vr1hxRZz+SEUdouCie1nVB3P
+sj2lPJ44qKS8triqNCuEalpMHaTBdIyjItqh1l66fLA1/FYxAM7cxcz5rBVK2zvf
+KrT3LNmzVpbltl3nPQhvAKEV8zEdSVze6Z0K6QbZP8WfPtCiQYMAjeNu48AIp/+t
+pxJbkcmWLIYixfiJbHfe0LUu/P3rk0WDCHnheVzOTSE8XzGqnIxyv6w4rYOl9IeT
+SnYublICJHOTp6gKuiIieGD7TC14DB8vYbSc0+opIvYYItcS//laLOD+eLUgZx5K
+Wb4ubbosnyXhAoIBAFGzQsqgFuCbQemBupviTmDnZZCmPaTQc9Mmd0DoTGuJ0x9r
+7udrkq9kqdNh6fR3Hu3WhApgVXlXvkvuJ7e8N9IHb7F+02Q39wGn3FxteMjyyfTt
+ccj0h1vOt3oxBgzayVSr2KqHC4bQfm9quGEH2a5JIa38blx+MbqHI39SyQalQzRf
+qDCRldHtS27kbfw6cqTj6oPLRUTfNjN5xxeassP/eZjUNocggMQ1NH8bsfxMbkXg
+RmpKGJVdGsHdaA/Jh9DXhtsPv/zCaLIiga+a3WFy1nUAV+Xz4nWFCS0IBtSxiErL
+aFHLwY3CuWnCi9UY+w5jHO9jMxwqT5Ds3drSQycCggEBALoewFEy4d0iRGGYtb6w
+aJ4xGLBwwXt7sKcx9eXARZi8oG5QkHI9pXg9vFPfAZTpdb7uNAzszDSeS1TxakdH
+uubdpJtRrDRXSrTbbI6Wvyh9oIPgijBZVWGFJtnRceMyFGeFifRI1LZpN1mHG2o4
+QKvPPhzau0+Em4syGE+69tvlblkqiSm6gaN+RabRNnM+ul6jpVGrBsBDAhPxdIQE
+CBS+rW9/bw9PB2m1XemlML0HGVsUzoKUUWDHISJZYXDH42yNHzVq3R014XARby31
+vQEQzrbnfEL2NwoChdzuFeLytujddKZLnksPsaFOeYAqjJIh6kE8Lnh+r27a4vMM
+cqECggEAAx1DVI43AMBfSbAs5C41vjRdjMrZtxfKIpFjj1whGj/JzLKdMdqqH+Ai
++R6NI7IB88pGHlCOmdEpfbr4Cq1ZnizA3yLV9sluMz1bpHlIDsCIp+1VkQYKfsEv
+upZy82MtfGtG3BSLn+GCTzLJcTN6KINg98Xivp/WsRAEvwT/w1o4iJMgzKmTET2I
+UGJfZcF0WeSVo34FNArfXyfXPvPV7mi08Z6fQuUnFvH9tGZs5Y9mUUSgXXEDSjKY
+ZHliqmDNGub7rMy6/0wDOWiS4pi/w8FeCyBvbx23rj6i+FLO6GK+5B7TaCxjOVbk
+SYVTfCHpvJIgjRkRMP2yZCk3g6T4XA==
+-----END PRIVATE KEY-----"""

octavia/tests/common/sample_haproxy_prometheus

@@ -25,7 +25,7 @@ haproxy_process_pool_failures_total 0
 # HELP haproxy_process_max_fds Maximum number of open file descriptors; 0=unset.
 # TYPE haproxy_process_max_fds gauge
 haproxy_process_max_fds 375033
-# HELP haproxy_process_max_sockets Maximum numer of open sockets.
+# HELP haproxy_process_max_sockets Maximum number of open sockets.
 # TYPE haproxy_process_max_sockets gauge
 haproxy_process_max_sockets 375033
 # HELP haproxy_process_max_connections Maximum number of concurrent connections.