Merge ~zzehring/charm-juju-controller:bugfix/nrpe-relation-functest-not-series-aware into charm-juju-controller:master

[Zachary Zehring]

Fix nrpe relation test thru series awareness.

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

This merge proposal is being monitored by mergebot. Change the status to Approved to merge.

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

A CI job is currently in progress. A follow up comment will be added when it completes.

[🤖 prod-jenkaas-bootstack (prod-jenkaas-bootstack)]

PASSED: Continuous integration, rev:b3991fa0414765e7f68ab9f5a5db54ea925a84c4
https://jenkins.canonical.com/bootstack/job/lp-charm-juju-controller-ci/13/
Executed test runs:
    SUCCESS: https://jenkins.canonical.com/bootstack/job/lp-charm-test-unit/204/
    None: https://jenkins.canonical.com/bootstack/job/lp-update-mp/589/

Click here to trigger a rebuild:
https://jenkins.canonical.com/bootstack/job/lp-charm-juju-controller-ci/13//rebuild

review: Approve (continuous-integration)

[🤖 Canonical IS Merge Bot (canonical-is-mergebot)]

Change successfully merged at revision 57fe32b111aca74d3dbba17683dce66304a4a9b8

diff --git a/src/tests/functional/tests/bundles/base.yaml b/src/tests/functional/tests/bundles/base.yaml
index d87988f..bdf6f5b 100644
--- a/src/tests/functional/tests/bundles/base.yaml
+++ b/src/tests/functional/tests/bundles/base.yaml
@@ -1,7 +1,12 @@
 description: "juju-controller charm test bundle"
+machines:
+  '0':
+    constraints: cores=2 mem=2G root-disk=16G
 applications:
   ubuntu:
     num_units: 1
+    to:
+      - '0'
   juju-local:
     charm: "cs:~bootstack-charmers-next/juju-local"
 relations:
diff --git a/src/tests/functional/tests/tests_juju_controller.py b/src/tests/functional/tests/tests_juju_controller.py
index fd7b048..30325be 100644
--- a/src/tests/functional/tests/tests_juju_controller.py
+++ b/src/tests/functional/tests/tests_juju_controller.py
@@ -5,7 +5,7 @@ import os
 import unittest
 from pathlib import Path
 
-from zaza import model
+from zaza import model, run
 
 
 CHARM_BUILD_DIR = os.environ.get("CHARM_BUILD_DIR", "/tmp/charm-builds")
@@ -114,9 +114,21 @@ class JujuControllerTestBase(unittest.TestCase):
 class BasicJujucontrollerTest(JujuControllerTestBase):
     """Class for charm functional tests."""
 
+    def _get_release_inner_model(self):
+        juju_status_dict = run(juju_status(self.unit, "controller"))
+        return juju_status_dict.get("machines").get("0").get("series")
+
     def test_nrpe_rel(self):
         """Check that nrpe check is rendered correctly."""
-        expect = "/usr/local/lib/nagios/plugins/check_systemd.py juju-db"
+        inner_controller_series = self._get_release_inner_model()
+        if inner_controller_series == "focal":
+            expected_content = (
+                "/usr/local/lib/nagios/plugins/check_systemd.py snap.juju-db.daemon"
+            )
+            check_filepath = "/etc/nagios/nrpe.d/check_snap.juju-db.daemon.cfg"
+        else:
+            expected_content = "/usr/local/lib/nagios/plugins/check_systemd.py juju-db"
+            check_filepath = "/etc/nagios/nrpe.d/check_juju-db.cfg"
         for u in (0, 1, 2):
-            chk = self.remote_cat(u, "/etc/nagios/nrpe.d/check_juju-db.cfg")
-            self.assertTrue(chk.find(expect) != -1)
+            chk = self.remote_cat(u, check_filepath)
+            self.assertTrue(chk.find(expected_content) != -1)