Add Kinetic and Zed support

* sync charm-helpers to classic charms
* rebuild for reactive charms
* change openstack-origin/source default to zed
* add new zed bundles
* add zed bundles to tests.yaml
* add zed tests to osci.yaml and .zuul.yaml
* add run-on base for 22.10
* drop series from metadata.yaml in favor of run-on bases

Change-Id: I68434d15a68d087a4fd704d9dde6e5a878d5cdca

.zuul.yaml

@@ -1,4 +1,4 @@
 - project:
     templates:
-      - openstack-python3-charm-yoga-jobs
+      - openstack-python3-charm-zed-jobs
       - openstack-cover-jobs

charmcraft.yaml

@@ -24,13 +24,13 @@ parts:
 bases:
   - build-on:
       - name: ubuntu
-        channel: "20.04"
+        channel: "22.04"
         architectures:
           - amd64
     run-on:
-      - name: ubuntu
-        channel: "20.04"
-        architectures: [amd64, s390x, ppc64el, arm64]
       - name: ubuntu
         channel: "22.04"
         architectures: [amd64, s390x, ppc64el, arm64]
+      - name: ubuntu
+        channel: "22.10"
+        architectures: [amd64, s390x, ppc64el, arm64]

config.yaml

@@ -14,7 +14,7 @@ options:
       Setting this to True will allow supporting services to log to syslog.
   openstack-origin:
     type: string
-    default: yoga
+    default: zed
     description: |
       Repository from which to install. May be one of the following:
       distro (default), ppa:somecustom/ppa, a deb url sources entry,

hooks/charmhelpers/contrib/network/ip.py

@@ -467,7 +467,7 @@ def ns_query(address):
 
     try:
         answers = dns.resolver.query(address, rtype)
-    except dns.resolver.NXDOMAIN:
+    except (dns.resolver.NXDOMAIN, dns.resolver.NoNameservers):
         return None
 
     if answers:

hooks/charmhelpers/contrib/openstack/context.py

@@ -2560,14 +2560,18 @@ class OVSDPDKDeviceContext(OSContextGenerator):
         :rtype: List[int]
         """
         cores = []
-        ranges = cpulist.split(',')
+        if cpulist and re.match(r"^[0-9,\-^]*$", cpulist):
-        for cpu_range in ranges:
+            ranges = cpulist.split(',')
-            if "-" in cpu_range:
+            for cpu_range in ranges:
-                cpu_min_max = cpu_range.split('-')
+                if "-" in cpu_range:
-                cores += range(int(cpu_min_max[0]),
+                    cpu_min_max = cpu_range.split('-')
-                               int(cpu_min_max[1]) + 1)
+                    cores += range(int(cpu_min_max[0]),
-            else:
+                                   int(cpu_min_max[1]) + 1)
-                cores.append(int(cpu_range))
+                elif "^" in cpu_range:
+                    cpu_rm = cpu_range.split('^')
+                    cores.remove(int(cpu_rm[1]))
+                else:
+                    cores.append(int(cpu_range))
         return cores
 
     def _numa_node_cores(self):
@@ -2586,36 +2590,32 @@ class OVSDPDKDeviceContext(OSContextGenerator):
 
     def cpu_mask(self):
         """Get hex formatted CPU mask
-
         The mask is based on using the first config:dpdk-socket-cores
         cores of each NUMA node in the unit.
         :returns: hex formatted CPU mask
         :rtype: str
         """
-        return self.cpu_masks()['dpdk_lcore_mask']
+        num_cores = config('dpdk-socket-cores')
-
+        mask = 0
-    def cpu_masks(self):
-        """Get hex formatted CPU masks
-
-        The mask is based on using the first config:dpdk-socket-cores
-        cores of each NUMA node in the unit, followed by the
-        next config:pmd-socket-cores
-
-        :returns: Dict of hex formatted CPU masks
-        :rtype: Dict[str, str]
-        """
-        num_lcores = config('dpdk-socket-cores')
-        pmd_cores = config('pmd-socket-cores')
-        lcore_mask = 0
-        pmd_mask = 0
         for cores in self._numa_node_cores().values():
-            for core in cores[:num_lcores]:
+            for core in cores[:num_cores]:
-                lcore_mask = lcore_mask | 1 << core
+                mask = mask | 1 << core
-            for core in cores[num_lcores:][:pmd_cores]:
+        return format(mask, '#04x')
-                pmd_mask = pmd_mask | 1 << core
+
-        return {
+    @classmethod
-            'pmd_cpu_mask': format(pmd_mask, '#04x'),
+    def pmd_cpu_mask(cls):
-            'dpdk_lcore_mask': format(lcore_mask, '#04x')}
+        """Get hex formatted pmd CPU mask
+
+        The mask is based on config:pmd-cpu-set.
+        :returns: hex formatted CPU mask
+        :rtype: str
+        """
+        mask = 0
+        cpu_list = cls._parse_cpu_list(config('pmd-cpu-set'))
+        if cpu_list:
+            for core in cpu_list:
+                mask = mask | 1 << core
+        return format(mask, '#x')
 
     def socket_memory(self):
         """Formatted list of socket memory configuration per socket.
@@ -2694,6 +2694,7 @@ class OVSDPDKDeviceContext(OSContextGenerator):
             ctxt['device_whitelist'] = self.device_whitelist()
             ctxt['socket_memory'] = self.socket_memory()
             ctxt['cpu_mask'] = self.cpu_mask()
+            ctxt['pmd_cpu_mask'] = self.pmd_cpu_mask()
         return ctxt
 
 

hooks/charmhelpers/contrib/openstack/utils.py

@@ -158,6 +158,7 @@ OPENSTACK_CODENAMES = OrderedDict([
     ('2021.1', 'wallaby'),
     ('2021.2', 'xena'),
     ('2022.1', 'yoga'),
+    ('2022.2', 'zed'),
 ])
 
 # The ugly duckling - must list releases oldest to newest
@@ -400,13 +401,16 @@ def get_os_codename_version(vers):
         error_out(e)
 
 
-def get_os_version_codename(codename, version_map=OPENSTACK_CODENAMES):
+def get_os_version_codename(codename, version_map=OPENSTACK_CODENAMES,
+                            raise_exception=False):
     '''Determine OpenStack version number from codename.'''
     for k, v in version_map.items():
         if v == codename:
             return k
     e = 'Could not derive OpenStack version for '\
         'codename: %s' % codename
+    if raise_exception:
+        raise ValueError(str(e))
     error_out(e)
 
 

hooks/charmhelpers/core/host.py

@@ -277,7 +277,7 @@ def service_resume(service_name, init_dir="/etc/init",
     return started
 
 
-def service(action, service_name, **kwargs):
+def service(action, service_name=None, **kwargs):
     """Control a system service.
 
     :param action: the action to take on the service
@@ -286,7 +286,9 @@ def service(action, service_name, **kwargs):
                     the form of key=value.
     """
     if init_is_systemd(service_name=service_name):
-        cmd = ['systemctl', action, service_name]
+        cmd = ['systemctl', action]
+        if service_name is not None:
+            cmd.append(service_name)
     else:
         cmd = ['service', service_name, action]
         for key, value in kwargs.items():

hooks/charmhelpers/core/host_factory/ubuntu.py

@@ -30,6 +30,7 @@ UBUNTU_RELEASES = (
     'hirsute',
     'impish',
     'jammy',
+    'kinetic',
 )
 
 

hooks/charmhelpers/core/services/base.py

@@ -15,7 +15,8 @@
 import os
 import json
 import inspect
-from collections import Iterable, OrderedDict
+from collections import OrderedDict
+from collections.abc import Iterable
 
 from charmhelpers.core import host
 from charmhelpers.core import hookenv

hooks/charmhelpers/fetch/archiveurl.py

@@ -12,6 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import contextlib
 import os
 import hashlib
 import re
@@ -24,11 +25,15 @@ from charmhelpers.payload.archive import (
     get_archive_handler,
     extract,
 )
+from charmhelpers.core.hookenv import (
+    env_proxy_settings,
+)
 from charmhelpers.core.host import mkdir, check_hash
 
 from urllib.request import (
     build_opener, install_opener, urlopen, urlretrieve,
     HTTPPasswordMgrWithDefaultRealm, HTTPBasicAuthHandler,
+    ProxyHandler
 )
 from urllib.parse import urlparse, urlunparse, parse_qs
 from urllib.error import URLError
@@ -50,6 +55,20 @@ def splitpasswd(user):
     return user, None
 
 
+@contextlib.contextmanager
+def proxy_env():
+    """
+    Creates a context which temporarily modifies the proxy settings in os.environ.
+    """
+    restore = {**os.environ}  # Copy the current os.environ
+    juju_proxies = env_proxy_settings() or {}
+    os.environ.update(**juju_proxies)  # Insert or Update the os.environ
+    yield os.environ
+    for key in juju_proxies:
+        del os.environ[key]  # remove any keys which were added or updated
+    os.environ.update(**restore)  # restore any original values
+
+
 class ArchiveUrlFetchHandler(BaseFetchHandler):
     """
     Handler to download archive files from arbitrary URLs.
@@ -80,6 +99,7 @@ class ArchiveUrlFetchHandler(BaseFetchHandler):
         # propagate all exceptions
         # URLError, OSError, etc
         proto, netloc, path, params, query, fragment = urlparse(source)
+        handlers = []
         if proto in ('http', 'https'):
             auth, barehost = splituser(netloc)
             if auth is not None:
@@ -89,10 +109,13 @@ class ArchiveUrlFetchHandler(BaseFetchHandler):
                 # Realm is set to None in add_password to force the username and password
                 # to be used whatever the realm
                 passman.add_password(None, source, username, password)
-                authhandler = HTTPBasicAuthHandler(passman)
+                handlers.append(HTTPBasicAuthHandler(passman))
-                opener = build_opener(authhandler)
+
-                install_opener(opener)
+        with proxy_env():
-        response = urlopen(source)
+            handlers.append(ProxyHandler())
+            opener = build_opener(*handlers)
+            install_opener(opener)
+            response = urlopen(source)
         try:
             with open(dest, 'wb') as dest_file:
                 dest_file.write(response.read())

hooks/charmhelpers/fetch/ubuntu.py

@@ -222,6 +222,14 @@ CLOUD_ARCHIVE_POCKETS = {
     'yoga/proposed': 'focal-proposed/yoga',
     'focal-yoga/proposed': 'focal-proposed/yoga',
     'focal-proposed/yoga': 'focal-proposed/yoga',
+    # Zed
+    'zed': 'jammy-updates/zed',
+    'jammy-zed': 'jammy-updates/zed',
+    'jammy-zed/updates': 'jammy-updates/zed',
+    'jammy-updates/zed': 'jammy-updates/zed',
+    'zed/proposed': 'jammy-proposed/zed',
+    'jammy-zed/proposed': 'jammy-proposed/zed',
+    'jammy-proposed/zed': 'jammy-proposed/zed',
 }
 
 
@@ -248,6 +256,7 @@ OPENSTACK_RELEASES = (
     'wallaby',
     'xena',
     'yoga',
+    'zed',
 )
 
 
@@ -274,6 +283,7 @@ UBUNTU_OPENSTACK_RELEASE = OrderedDict([
     ('hirsute', 'wallaby'),
     ('impish', 'xena'),
     ('jammy', 'yoga'),
+    ('kinetic', 'zed'),
 ])
 
 

metadata.yaml

@@ -8,8 +8,8 @@ description: |
 tags:
 - openstack
 series:
-- focal
 - jammy
+- kinetic
 extra-bindings:
   public:
   admin:

osci.yaml

@@ -2,8 +2,8 @@
     templates:
       - charm-unit-jobs-py38
       - charm-unit-jobs-py310
-      - charm-xena-functional-jobs
       - charm-yoga-functional-jobs
+      - charm-zed-functional-jobs
     vars:
       needs_charm_build: true
       charm_build_name: heat

tests/bundles/focal-yoga.yaml

@@ -1,242 +0,0 @@
-variables:
-  openstack-origin: &openstack-origin cloud:focal-yoga
-
-series: &series focal
-
-machines:
-  0:
-    constraints: "mem=3072M"
-  1:
-    constraints: "mem=3072M"
-  2:
-    constraints: "mem=3072M"
-  3:
-  4:
-  5:
-  6:
-  7:
-    constraints: "root-disk=20G mem=4G cores=4"
-  8:
-  9:
-  10:
-  11:
-    constaints: "mem=2048M"
-  12:
-    constaints: "mem=2048M"
-
-# We specify machine placements for these to improve iteration
-# time, given that machine "0" comes up way before machine "7"
-applications:
-
-  heat-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  nova-cloud-controller-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  placement-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  keystone-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  glance-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-  neutron-api-mysql-router:
-    charm: ch:mysql-router
-    channel: latest/edge
-
-  mysql-innodb-cluster:
-    charm: ch:mysql-innodb-cluster
-    num_units: 3
-    options:
-      source: *openstack-origin
-    to:
-      - '0'
-      - '1'
-      - '2'
-    channel: latest/edge
-
-  keystone:
-    charm: ch:keystone
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '3'
-    channel: yoga/edge
-
-  rabbitmq-server:
-    charm: ch:rabbitmq-server
-    num_units: 1
-    options:
-      source: *openstack-origin
-    to:
-      - '4'
-    channel: latest/edge
-
-  glance:
-    charm: ch:glance
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '5'
-    channel: yoga/edge
-
-  nova-cloud-controller:
-    charm: ch:nova-cloud-controller
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      api-rate-limit-rules: "( POST, '*', .*, 9999, MINUTE );"
-      network-manager: Neutron
-    to:
-      - '6'
-    channel: yoga/edge
-
-  nova-compute:
-    charm: ch:nova-compute
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      config-flags: 'auto_assign_floating_ip=False'
-      enable-live-migration: "False"
-    to:
-      - '7'
-    channel: yoga/edge
-
-  placement:
-    charm: ch:placement
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-      debug: "True"
-    to:
-      - '8'
-    channel: yoga/edge
-
-  neutron-gateway:
-    charm: ch:neutron-gateway
-    num_units: 1
-    options:
-      openstack-origin: *openstack-origin
-    to:
-      - '9'
-    channel: yoga/edge
-
-  neutron-api:
-    charm: ch:neutron-api
-    num_units: 1
-    options:
-      manage-neutron-plugin-legacy-mode: true
-      neutron-plugin: ovs
-      openstack-origin: *openstack-origin
-    to:
-      - '10'
-    channel: yoga/edge
-
-  neutron-openvswitch:
-    charm: ch:neutron-openvswitch
-    channel: yoga/edge
-
-  heat:
-    charm: ../../heat.charm
-    num_units: 2
-    constraints: mem=2048
-    options:
-      openstack-origin: *openstack-origin
-      debug: "True"
-      verbose: "True"
-    to:
-      - '11'
-      - '12'
-
-relations:
-  - - 'heat:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'heat:identity-service'
-    - 'keystone:identity-service'
-
-  - - "heat:shared-db"
-    - "heat-mysql-router:shared-db"
-  - - "heat-mysql-router:db-router"
-    - "mysql-innodb-cluster:db-router"
-
-  - - 'nova-compute:image-service'
-    - 'glance:image-service'
-
-  - - 'nova-compute:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - "nova-cloud-controller:shared-db"
-    - "nova-cloud-controller-mysql-router:shared-db"
-  - - "nova-cloud-controller-mysql-router:db-router"
-    - "mysql-innodb-cluster:db-router"
-
-  - - 'nova-cloud-controller:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-cloud-controller:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:cloud-compute'
-    - 'nova-compute:cloud-compute'
-
-  - - 'nova-cloud-controller:image-service'
-    - 'glance:image-service'
-
-  - - "placement:shared-db"
-    - "placement-mysql-router:shared-db"
-  - - "placement-mysql-router:db-router"
-    - "mysql-innodb-cluster:db-router"
-
-  - - 'placement:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'placement:placement'
-    - 'nova-cloud-controller:placement'
-
-  - - "keystone:shared-db"
-    - "keystone-mysql-router:shared-db"
-  - - "keystone-mysql-router:db-router"
-    - "mysql-innodb-cluster:db-router"
-
-  - - 'glance:identity-service'
-    - 'keystone:identity-service'
-
-  - - "glance:shared-db"
-    - "glance-mysql-router:shared-db"
-  - - "glance-mysql-router:db-router"
-    - "mysql-innodb-cluster:db-router"
-
-  - - 'glance:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'neutron-gateway:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'nova-cloud-controller:quantum-network-service'
-    - 'neutron-gateway:quantum-network-service'
-
-  - - "neutron-api:shared-db"
-    - "neutron-api-mysql-router:shared-db"
-  - - "neutron-api-mysql-router:db-router"
-    - "mysql-innodb-cluster:db-router"
-
-  - - 'neutron-api:amqp'
-    - 'rabbitmq-server:amqp'
-
-  - - 'neutron-api:neutron-api'
-    - 'nova-cloud-controller:neutron-api'
-
-  - - 'neutron-api:identity-service'
-    - 'keystone:identity-service'
-
-  - - 'nova-compute:neutron-plugin'
-    - 'neutron-openvswitch:neutron-plugin'
-
-  - - 'rabbitmq-server:amqp'
-    - 'neutron-openvswitch:amqp'

tests/bundles/jammy-zed.yaml

@@ -1,7 +1,7 @@
 variables:
-  openstack-origin: &openstack-origin cloud:focal-xena
+  openstack-origin: &openstack-origin cloud:jammy-zed
 
-series: &series focal
+series: &series jammy
 
 machines:
   0:

tests/bundles/kinetic-zed.yaml

@@ -1,7 +1,7 @@
 variables:
   openstack-origin: &openstack-origin distro
 
-series: &series impish
+series: &series kinetic
 
 machines:
   0:

tests/tests.yaml

@@ -1,15 +1,15 @@
 charm_name: heat
 
 smoke_bundles:
-  - focal-xena
+  - jammy-yoga
 
 gate_bundles:
-  - focal-xena
+  - jammy-yoga
-  - impish-xena
 
 dev_bundles:
-  - focal-yoga
   - jammy-yoga
+  - jammy-zed
+  - kinetic-zed
 
 configure:
   - zaza.openstack.charm_tests.glance.setup.add_cirros_image
@@ -24,5 +24,4 @@ tests_options:
   policyd:
     service: heat
   force_deploy:
-    - impish-xena
+    - kinetic-zed
-    - jammy-yoga