openstack/sunbeam-charms
Code Issues Proposed changes

fix: inconsistent ceph-nfs relation mon_hosts key

Browse Source 
The CephNfsProvides set the mon_hosts key, while the CephNfsRequires
accesses mon-hosts.

xref: https://github.com/canonical/charm-microceph/pull/200

Change-Id: Ib00947ed47fac6c82b25eea2dfe37b19649a716b
Signed-off-by: Claudiu Belu <cbelu@cloudbasesolutions.com>
This commit is contained in:
Claudiu Belu
2025-09-12 07:48:45 +00:00
parent bea759a56b
commit 9cdb254685
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
charms/manila-cephfs-k8s/tests/unit/test_charm.py
View File

@@ -17,6 +17,7 @@
"""Unit tests for the Manila Share (Cephfs) K8s Operator charm.""" """Unit tests for the Manila Share (Cephfs) K8s Operator charm."""
import charm import charm
import charms.ceph_nfs_client.v0.ceph_nfs_client as ceph_nfs_client
import charms.manila_k8s.v0.manila as manila_k8s import charms.manila_k8s.v0.manila as manila_k8s
import ops_sunbeam.test_utils as test_utils import ops_sunbeam.test_utils as test_utils
from ops import ( from ops import (
@@ -84,10 +85,10 @@ class TestManilaCephfsCharm(test_utils.CharmTestCase):
"""Add the ceph-nfs relation and unit data.""" """Add the ceph-nfs relation and unit data."""
app_data = { app_data = {
"client": "client.foo", "client": "client.foo",
"cluster-id": "lish", ceph_nfs_client.CLUSTER_ID: "lish",
"fsid": "fake-fsid", "fsid": "fake-fsid",
"keyring": "keys-do-not-ring", "keyring": "keys-do-not-ring",
"mon-hosts": '["mony"]', ceph_nfs_client.MON_HOSTS: '["mony"]',
"volume": "voly", "volume": "voly",
} }
return self.harness.add_relation( return self.harness.add_relation(

9
libs/external/lib/charms/ceph_nfs_client/v0/ceph_nfs_client.py vendored
View File

@@ -82,6 +82,9 @@ LIBAPI = 0
# to 0 if you are raising the major API version # to 0 if you are raising the major API version
LIBPATCH = 1 LIBPATCH = 1
MON_HOSTS = "mon_hosts"
CLUSTER_ID = "cluster-id"
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)
@@ -152,13 +155,13 @@ class CephNfsRequires(Object):
if not relation_data: if not relation_data:
return {} return {}
mon_hosts = json.loads(relation_data["mon-hosts"]) mon_hosts = json.loads(relation_data[MON_HOSTS])
return { return {
"client": relation_data["client"], "client": relation_data["client"],
"keyring": relation_data["keyring"], "keyring": relation_data["keyring"],
"mon_hosts": mon_hosts, MON_HOSTS: mon_hosts,
"cluster-id": relation_data["cluster-id"], CLUSTER_ID: relation_data[CLUSTER_ID],
"volume": relation_data["volume"], "volume": relation_data["volume"],
"fsid": relation_data["fsid"], "fsid": relation_data["fsid"],
} }