openstack/charm-swift-proxy
Code Issues Proposed changes

Add Kinetic and Zed support

Browse Source 
* sync charm-helpers to classic charms
* change openstack-origin/source default to zed
* align testing with zed
* add new zed bundles
* add zed bundles to tests.yaml
* add zed tests to osci.yaml and .zuul.yaml
* update build-on and run-on bases
* add bindep.txt for py310
* sync tox.ini and requirements.txt for ruamel
* use charmcraft_channel 2.0/stable
* drop reactive plugin overrides
* move interface/layer env vars to charmcraft.yaml
* add domain/project to auth section of yoga proxy-server.conf

Change-Id: I93da9ce52bed2b3e8a467491d2a61bfd2ed4ea7d
Closes-Bug: #1988491
This commit is contained in:
Corey Bryant 2022-06-10 20:14:49 +00:00
parent fa61a4e59b
commit 745a89a7c1
33 changed files with 380 additions and 251 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.zuul.yaml
View File

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

3
bindep.txt Normal file
View File

@ -0,0 +1,3 @@
libffi-dev [platform:dpkg]
libxml2-dev [platform:dpkg]
libxslt1-dev [platform:dpkg]

8
charmcraft.yaml
View File

@ -25,13 +25,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]

2
charmhelpers/contrib/network/ip.py
View File

@ -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:

65
charmhelpers/contrib/openstack/context.py
View File

@ -2560,14 +2560,18 @@ class OVSDPDKDeviceContext(OSContextGenerator):
:rtype: List[int]
"""
cores = []
ranges = cpulist.split(',')
for cpu_range in ranges:
if "-" in cpu_range:
cpu_min_max = cpu_range.split('-')
cores += range(int(cpu_min_max[0]),
int(cpu_min_max[1]) + 1)
else:
cores.append(int(cpu_range))
if cpulist and re.match(r"^[0-9,\-^]*$", cpulist):
ranges = cpulist.split(',')
for cpu_range in ranges:
if "-" in cpu_range:
cpu_min_max = cpu_range.split('-')
cores += range(int(cpu_min_max[0]),
int(cpu_min_max[1]) + 1)
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']
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
num_cores = config('dpdk-socket-cores')
mask = 0
for cores in self._numa_node_cores().values():
for core in cores[:num_lcores]:
lcore_mask = lcore_mask | 1 << core
for core in cores[num_lcores:][:pmd_cores]:
pmd_mask = pmd_mask | 1 << core
return {
'pmd_cpu_mask': format(pmd_mask, '#04x'),
'dpdk_lcore_mask': format(lcore_mask, '#04x')}
for core in cores[:num_cores]:
mask = mask | 1 << core
return format(mask, '#04x')
@classmethod
def pmd_cpu_mask(cls):
"""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

6
charmhelpers/contrib/openstack/utils.py
View File

@ -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)

6
charmhelpers/core/host.py
View File

@ -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():

1
charmhelpers/core/host_factory/ubuntu.py
View File

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

3
charmhelpers/core/services/base.py
View File

@ -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

31
charmhelpers/fetch/archiveurl.py
View File

@ -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)
opener = build_opener(authhandler)
install_opener(opener)
response = urlopen(source)
handlers.append(HTTPBasicAuthHandler(passman))
with proxy_env():
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())

10
charmhelpers/fetch/ubuntu.py
View File

@ -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'),
])

2
config.yaml
View File

@ -9,7 +9,7 @@ options:
description: Enable logging of all request headers.
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,

2
metadata.yaml
View File

@ -18,8 +18,8 @@ tags:
- openstack
- cache-proxy
series:
- focal
- jammy
- kinetic
extra-bindings:
public:
admin:

54
osci.yaml
View File

@ -1,50 +1,40 @@
- project:
templates:
- charm-unit-jobs-py38
- charm-unit-jobs-py310
check:
jobs:
- test-s3api-focal-xena
- test-s3api-focal-yoga:
- test-s3api-jammy-yoga
- test-s3api-jammy-zed:
voting: false
- test-s3api-impish-xena:
voting: false
- test-s3api-jammy-yoga:
- test-s3api-kinetic-zed:
voting: false
vars:
needs_charm_build: true
charm_build_name: swift-proxy
build_type: charmcraft
charmcraft_channel: 2.0/stable
- job:
name: test-s3api-focal-xena
parent: func-target
dependencies:
- charm-build
- osci-lint
- tox-py38
- name: tox-py310
soft: true
vars:
tox_extra_args: test-s3api:focal-xena
- job:
name: test-s3api-focal-yoga
parent: func-target
dependencies:
- test-s3api-focal-xena
vars:
tox_extra_args: test-s3api:focal-yoga
- job:
name: test-s3api-impish-xena
parent: func-target
dependencies:
- test-s3api-focal-xena
vars:
tox_extra_args: test-s3api:impish-xena
- job:
name: test-s3api-jammy-yoga
parent: func-target
dependencies:
- test-s3api-focal-xena
- charm-build
- osci-lint
- name: tox-py310
soft: true
vars:
tox_extra_args: test-s3api:jammy-yoga
- job:
name: test-s3api-jammy-zed
parent: func-target
dependencies:
- test-s3api-jammy-yoga
vars:
tox_extra_args: test-s3api:jammy-zed
- job:
name: test-s3api-kinetic-zed
parent: func-target
dependencies:
- test-s3api-jammy-yoga
vars:
tox_extra_args: test-s3api:kinetic-zed

7
requirements.txt
View File

@ -11,9 +11,6 @@ pbr==5.6.0
simplejson>=2.2.0
netifaces>=0.10.4
# Build requirements
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
# NOTE: newer versions of cryptography require a Rust compiler to build,
# see
# * https://github.com/openstack-charmers/zaza/issues/421
@ -27,8 +24,6 @@ netaddr>0.7.16,<0.8.0
Jinja2>=2.6 # BSD License (3 clause)
six>=1.9.0
# dnspython 2.0.0 dropped py3.5 support
dnspython<2.0.0; python_version < '3.6'
dnspython; python_version >= '3.6'
dnspython
psutil>=1.1.1,<2.0.0

3
templates/yoga/proxy-server.conf
View File

@ -127,6 +127,9 @@ auth_url = {{ auth_protocol }}://{{ keystone_host }}:{{ auth_port }}/v3
auth_plugin = password
username = {{ service_user }}
password = {{ service_password }}
project_domain_name = {{ admin_domain_name }}
user_domain_name = {{ admin_domain_name }}
project_name = {{ admin_tenant_name }}
cache = swift.cache
include_service_catalog = False
delay_auth_decision = {{ delay_auth_decision|lower }}

17
test-requirements.txt
View File

@ -8,7 +8,6 @@
# all of its own requirements and if it doesn't, fix it there.
#
pyparsing<3.0.0 # aodhclient is pinned in zaza and needs pyparsing < 3.0.0, but cffi also needs it, so pin here.
cffi==1.14.6; python_version < '3.6' # cffi 1.15.0 drops support for py35.
setuptools<50.0.0 # https://github.com/pypa/setuptools/commit/04e3df22df840c6bb244e9b27bc56750c44b7c85
requests>=2.18.4
@ -19,26 +18,12 @@ stestr>=2.2.0
# https://github.com/mtreinish/stestr/issues/145
cliff<3.0.0
# Dependencies of stestr. Newer versions use keywords that didn't exist in
# python 3.5 yet (e.g. "ModuleNotFoundError")
importlib-metadata<3.0.0; python_version < '3.6'
importlib-resources<3.0.0; python_version < '3.6'
# Some Zuul nodes sometimes pull newer versions of these dependencies which
# dropped support for python 3.5:
osprofiler<2.7.0;python_version<'3.6'
stevedore<1.31.0;python_version<'3.6'
debtcollector<1.22.0;python_version<'3.6'
oslo.utils<=3.41.0;python_version<'3.6'
coverage>=4.5.2
pyudev # for ceph-* charm unit tests (need to fix the ceph-* charm unit tests/mocking)
git+https://github.com/openstack-charmers/zaza.git#egg=zaza
git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
# Needed for charm-glance:
git+https://opendev.org/openstack/tempest.git#egg=tempest;python_version>='3.8'
tempest<31.0.0;python_version<'3.8' and python_version>='3.6'
tempest<24.0.0;python_version<'3.6'
git+https://opendev.org/openstack/tempest.git#egg=tempest
croniter # needed for charm-rabbitmq-server unit tests

105
tests/bundles/focal-yoga.yaml
View File

@ -1,105 +0,0 @@
variables:
openstack-origin: &openstack-origin cloud:focal-yoga
series: focal
comment:
- 'machines section to decide order of deployment. database sooner = faster'
machines:
'0':
constraints: mem=3072M
'1':
constraints: mem=3072M
'2':
constraints: mem=3072M
'3':
'4':
'5':
'6':
applications:
keystone-mysql-router:
charm: ch:mysql-router
channel: latest/edge
glance-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:
expose: True
charm: ch:keystone
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '3'
channel: yoga/edge
swift-proxy:
charm: ../../swift-proxy.charm
num_units: 1
options:
zone-assignment: manual
replicas: 1
swift-hash: fdfef9d4-8b06-11e2-8ac0-531c923c8fae
openstack-origin: *openstack-origin
to:
- '4'
glance:
expose: True
charm: ch:glance
num_units: 1
options:
openstack-origin: *openstack-origin
to:
- '5'
channel: yoga/edge
swift-storage:
charm: ch:swift-storage
num_units: 1
storage:
block-devices: 'cinder,2G,2'
options:
zone: 1
openstack-origin: *openstack-origin
to:
- '6'
channel: yoga/edge
relations:
- - 'keystone:shared-db'
- 'keystone-mysql-router:shared-db'
- - 'keystone-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'glance:shared-db'
- 'glance-mysql-router:shared-db'
- - 'glance-mysql-router:db-router'
- 'mysql-innodb-cluster:db-router'
- - 'glance:identity-service'
- 'keystone:identity-service'
- - 'swift-proxy:identity-service'
- 'keystone:identity-service'
- - 'swift-storage:swift-storage'
- 'swift-proxy:swift-storage'
- - 'glance:object-store'
- 'swift-proxy:object-store'

6
tests/bundles/jammy-yoga.yaml
View File

@ -45,7 +45,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '3'
channel: yoga/edge
channel: latest/edge
swift-proxy:
charm: ../../swift-proxy.charm
@ -66,7 +66,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: yoga/edge
channel: latest/edge
swift-storage:
charm: ch:swift-storage
@ -78,7 +78,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: yoga/edge
channel: latest/edge
relations:

10
tests/bundles/focal-xena.yaml → tests/bundles/jammy-zed.yaml
View File

@ -1,7 +1,7 @@
variables:
openstack-origin: &openstack-origin cloud:focal-xena
openstack-origin: &openstack-origin cloud:jammy-zed
series: focal
series: jammy
comment:
- 'machines section to decide order of deployment. database sooner = faster'
@ -45,7 +45,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '3'
channel: yoga/edge
channel: latest/edge
swift-proxy:
charm: ../../swift-proxy.charm
@ -66,7 +66,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: yoga/edge
channel: latest/edge
swift-storage:
charm: ch:swift-storage
@ -78,7 +78,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: yoga/edge
channel: latest/edge
relations:

8
tests/bundles/impish-xena.yaml → tests/bundles/kinetic-zed.yaml
View File

@ -1,7 +1,7 @@
variables:
openstack-origin: &openstack-origin distro
series: impish
series: kinetic
comment:
- 'machines section to decide order of deployment. database sooner = faster'
@ -45,7 +45,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '3'
channel: yoga/edge
channel: latest/edge
swift-proxy:
charm: ../../swift-proxy.charm
@ -66,7 +66,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '5'
channel: yoga/edge
channel: latest/edge
swift-storage:
charm: ch:swift-storage
@ -78,7 +78,7 @@ applications:
openstack-origin: *openstack-origin
to:
- '6'
channel: yoga/edge
channel: latest/edge
relations:

0
tests/bundles/overlays/focal-ussuri-gr-r1.yaml.j2 → tests/bundles/overlays/focal-xena-gr-r1.yaml.j2
View File

0
tests/bundles/overlays/focal-ussuri-gr-r2.yaml.j2 → tests/bundles/overlays/focal-xena-gr-r2.yaml.j2
View File

28
tests/bundles/overlays/focal-yoga-gr-r1.yaml.j2 Normal file
View File

@ -0,0 +1,28 @@
applications:
keystone:
offers:
keystone:
endpoints:
- identity-service
swift-proxy-region1:
charm: {{ charm_location }}
offers:
swift-proxy-region1:
endpoints:
- swift-storage
- rings-distributor
swift-storage-region1-zone1:
offers:
swift-storage-region1-zone1:
endpoints:
- swift-storage
swift-storage-region1-zone2:
offers:
swift-storage-region1-zone2:
endpoints:
- swift-storage
swift-storage-region1-zone3:
offers:
swift-storage-region1-zone3:
endpoints:
- swift-storage

31
tests/bundles/overlays/focal-yoga-gr-r2.yaml.j2 Normal file
View File

@ -0,0 +1,31 @@
applications:
swift-proxy-region2:
charm: {{ charm_location }}
relations:
- - swift-proxy-region2:identity-service
- keystone:identity-service
- - swift-proxy-region2:swift-storage
- swift-storage-region1-zone1:swift-storage
- - swift-proxy-region2:swift-storage
- swift-storage-region1-zone2:swift-storage
- - swift-proxy-region2:swift-storage
- swift-storage-region1-zone3:swift-storage
- - swift-storage-region2-zone1:swift-storage
- swift-proxy-region1:swift-storage
- - swift-storage-region2-zone2:swift-storage
- swift-proxy-region1:swift-storage
- - swift-storage-region2-zone3:swift-storage
- swift-proxy-region1:swift-storage
- - swift-proxy-region2:rings-consumer
- swift-proxy-region1:rings-distributor
saas:
keystone:
url: admin/{{ swift_gr_region1 }}.keystone
swift-proxy-region1:
url: admin/{{ swift_gr_region1 }}.swift-proxy-region1
swift-storage-region1-zone1:
url: admin/{{ swift_gr_region1 }}.swift-storage-region1-zone1
swift-storage-region1-zone2:
url: admin/{{ swift_gr_region1 }}.swift-storage-region1-zone2
swift-storage-region1-zone3:
url: admin/{{ swift_gr_region1 }}.swift-storage-region1-zone3

28
tests/bundles/overlays/jammy-yoga-gr-r1.yaml.j2 Normal file
View File

@ -0,0 +1,28 @@
applications:
keystone:
offers:
keystone:
endpoints:
- identity-service
swift-proxy-region1:
charm: {{ charm_location }}
offers:
swift-proxy-region1:
endpoints:
- swift-storage
- rings-distributor
swift-storage-region1-zone1:
offers:
swift-storage-region1-zone1:
endpoints:
- swift-storage
swift-storage-region1-zone2:
offers:
swift-storage-region1-zone2:
endpoints:
- swift-storage
swift-storage-region1-zone3:
offers:
swift-storage-region1-zone3:
endpoints:
- swift-storage

31
tests/bundles/overlays/jammy-yoga-gr-r2.yaml.j2 Normal file
View File

@ -0,0 +1,31 @@
applications:
swift-proxy-region2:
charm: {{ charm_location }}
relations:
- - swift-proxy-region2:identity-service
- keystone:identity-service
- - swift-proxy-region2:swift-storage
- swift-storage-region1-zone1:swift-storage
- - swift-proxy-region2:swift-storage
- swift-storage-region1-zone2:swift-storage
- - swift-proxy-region2:swift-storage
- swift-storage-region1-zone3:swift-storage
- - swift-storage-region2-zone1:swift-storage
- swift-proxy-region1:swift-storage
- - swift-storage-region2-zone2:swift-storage
- swift-proxy-region1:swift-storage
- - swift-storage-region2-zone3:swift-storage
- swift-proxy-region1:swift-storage
- - swift-proxy-region2:rings-consumer
- swift-proxy-region1:rings-distributor
saas:
keystone:
url: admin/{{ swift_gr_region1 }}.keystone
swift-proxy-region1:
url: admin/{{ swift_gr_region1 }}.swift-proxy-region1
swift-storage-region1-zone1:
url: admin/{{ swift_gr_region1 }}.swift-storage-region1-zone1
swift-storage-region1-zone2:
url: admin/{{ swift_gr_region1 }}.swift-storage-region1-zone2
swift-storage-region1-zone3:
url: admin/{{ swift_gr_region1 }}.swift-storage-region1-zone3

28
tests/bundles/overlays/jammy-zed-gr-r1.yaml.j2 Normal file
View File

@ -0,0 +1,28 @@
applications:
keystone:
offers:
keystone:
endpoints:
- identity-service
swift-proxy-region1:
charm: {{ charm_location }}
offers:
swift-proxy-region1:
endpoints:
- swift-storage
- rings-distributor
swift-storage-region1-zone1:
offers:
swift-storage-region1-zone1:
endpoints:
- swift-storage
swift-storage-region1-zone2:
offers:
swift-storage-region1-zone2:
endpoints:
- swift-storage
swift-storage-region1-zone3:
offers:
swift-storage-region1-zone3:
endpoints:
- swift-storage

31
tests/bundles/overlays/jammy-zed-gr-r2.yaml.j2 Normal file
View File

@ -0,0 +1,31 @@
applications:
swift-proxy-region2:
charm: {{ charm_location }}
relations:
- - swift-proxy-region2:identity-service
- keystone:identity-service
- - swift-proxy-region2:swift-storage
- swift-storage-region1-zone1:swift-storage
- - swift-proxy-region2:swift-storage
- swift-storage-region1-zone2:swift-storage
- - swift-proxy-region2:swift-storage
- swift-storage-region1-zone3:swift-storage
- - swift-storage-region2-zone1:swift-storage
- swift-proxy-region1:swift-storage
- - swift-storage-region2-zone2:swift-storage
- swift-proxy-region1:swift-storage
- - swift-storage-region2-zone3:swift-storage
- swift-proxy-region1:swift-storage
- - swift-proxy-region2:rings-consumer
- swift-proxy-region1:rings-distributor
saas:
keystone:
url: admin/{{ swift_gr_region1 }}.keystone
swift-proxy-region1:
url: admin/{{ swift_gr_region1 }}.swift-proxy-region1
swift-storage-region1-zone1:
url: admin/{{ swift_gr_region1 }}.swift-storage-region1-zone1
swift-storage-region1-zone2:
url: admin/{{ swift_gr_region1 }}.swift-storage-region1-zone2
swift-storage-region1-zone3:
url: admin/{{ swift_gr_region1 }}.swift-storage-region1-zone3

28
tests/bundles/overlays/kinetic-zed-gr-r1.yaml.j2 Normal file
View File

@ -0,0 +1,28 @@
applications:
keystone:
offers:
keystone:
endpoints:
- identity-service
swift-proxy-region1:
charm: {{ charm_location }}
offers:
swift-proxy-region1:
endpoints:
- swift-storage
- rings-distributor
swift-storage-region1-zone1:
offers:
swift-storage-region1-zone1:
endpoints:
- swift-storage
swift-storage-region1-zone2:
offers:
swift-storage-region1-zone2:
endpoints:
- swift-storage
swift-storage-region1-zone3:
offers:
swift-storage-region1-zone3:
endpoints:
- swift-storage

31
tests/bundles/overlays/kinetic-zed-gr-r2.yaml.j2 Normal file
View File

@ -0,0 +1,31 @@
applications:
swift-proxy-region2:
charm: {{ charm_location }}
relations:
- - swift-proxy-region2:identity-service
- keystone:identity-service
- - swift-proxy-region2:swift-storage
- swift-storage-region1-zone1:swift-storage
- - swift-proxy-region2:swift-storage
- swift-storage-region1-zone2:swift-storage
- - swift-proxy-region2:swift-storage
- swift-storage-region1-zone3:swift-storage
- - swift-storage-region2-zone1:swift-storage
- swift-proxy-region1:swift-storage
- - swift-storage-region2-zone2:swift-storage
- swift-proxy-region1:swift-storage
- - swift-storage-region2-zone3:swift-storage
- swift-proxy-region1:swift-storage
- - swift-proxy-region2:rings-consumer
- swift-proxy-region1:rings-distributor
saas:
keystone:
url: admin/{{ swift_gr_region1 }}.keystone
swift-proxy-region1:
url: admin/{{ swift_gr_region1 }}.swift-proxy-region1
swift-storage-region1-zone1:
url: admin/{{ swift_gr_region1 }}.swift-storage-region1-zone1
swift-storage-region1-zone2:
url: admin/{{ swift_gr_region1 }}.swift-storage-region1-zone2
swift-storage-region1-zone3:
url: admin/{{ swift_gr_region1 }}.swift-storage-region1-zone3

11
tests/tests.yaml
View File

@ -1,16 +1,16 @@
charm_name: swift-proxy
gate_bundles:
- test-s3api: focal-xena
- test-s3api: impish-xena
- test-s3api: jammy-yoga
dev_bundles:
- test-s3api: focal-yoga
- test-s3api: jammy-yoga
- test-s3api: jammy-zed
- test-s3api: kinetic-zed
smoke_bundles:
# Use no s3api test for smoke
- focal-xena
- focal-yoga
configure:
- swift_gr_region1:
@ -29,7 +29,6 @@ tests:
tests_options:
force_deploy:
- impish-xena
- jammy-yoga
- kinetic-zed
policyd:
- service: swift

33
tox.ini
View File

@ -48,42 +48,23 @@ basepython = python3
deps = -r{toxinidir}/build-requirements.txt
commands =
charmcraft clean
charmcraft -v build
charmcraft -v pack
{toxinidir}/rename.sh
[testenv:py310]
basepython = python3.10
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
[testenv:py3]
basepython = python3
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
[testenv:py36]
basepython = python3.6
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs}
[testenv:py38]
basepython = python3.8
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs}
[testenv:py39]
basepython = python3.9
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs}
[testenv:py310]
basepython = python3.10
deps = -r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands = stestr run --slowest {posargs}
[testenv:pep8]
basepython = python3
deps = flake8==3.9.2
charm-tools==2.8.3
git+https://github.com/juju/charm-tools.git
commands = flake8 {posargs} hooks unit_tests tests actions lib files
charm-proof