From 26ed090dac2c712641d81a3b7b06d8b557e54c6a Mon Sep 17 00:00:00 2001
From: Liam Young <liam.young@canonical.com>
Date: Thu, 28 Apr 2022 15:00:05 +0100
Subject: [PATCH] Fix unit tests

---
 charms/ovn-central-k8s/requirements.txt       |  2 +-
 .../unit_tests/test_ovn_central_charm.py      | 81 +++++++------------
 2 files changed, 31 insertions(+), 52 deletions(-)

diff --git a/charms/ovn-central-k8s/requirements.txt b/charms/ovn-central-k8s/requirements.txt
index 66629aac..d521ef19 100644
--- a/charms/ovn-central-k8s/requirements.txt
+++ b/charms/ovn-central-k8s/requirements.txt
@@ -6,7 +6,7 @@ jinja2
 git+https://github.com/openstack/charm-ops-openstack#egg=ops_openstack
 git+https://github.com/openstack/charm-ops-interface-tls-certificates#egg=interface_tls_certificates
 
-git+https://github.com/openstack-charmers/advanced-sunbeam-openstack@v0.1#egg=advanced_sunbeam_openstack
+git+https://github.com/openstack-charmers/advanced-sunbeam-openstack#egg=advanced_sunbeam_openstack
 lightkube
 lightkube-models
 cryptography < 3.4
diff --git a/charms/ovn-central-k8s/unit_tests/test_ovn_central_charm.py b/charms/ovn-central-k8s/unit_tests/test_ovn_central_charm.py
index 1ed094c2..00fb9867 100644
--- a/charms/ovn-central-k8s/unit_tests/test_ovn_central_charm.py
+++ b/charms/ovn-central-k8s/unit_tests/test_ovn_central_charm.py
@@ -70,35 +70,40 @@ class TestOVNCentralXenaOperatorCharm(test_utils.CharmTestCase):
         test_utils.set_all_pebbles_ready(self.harness)
         self.assertEqual(len(self.harness.charm.seen_events), 3)
 
+    def check_rendered_files(self):
+        sb_config_files = [
+            '/etc/ovn/cert_host',
+            '/etc/ovn/key_host',
+            '/etc/ovn/ovn-central.crt',
+            '/root/ovn-sb-cluster-join.sh',
+            '/root/ovn-sb-db-server-wrapper.sh']
+        for f in sb_config_files:
+            self.check_file('ovn-sb-db-server', f)
+
+        nb_config_files = [
+            '/etc/ovn/cert_host',
+            '/etc/ovn/key_host',
+            '/etc/ovn/ovn-central.crt',
+            '/root/ovn-nb-cluster-join.sh',
+            '/root/ovn-nb-db-server-wrapper.sh']
+        for f in nb_config_files:
+            self.check_file('ovn-nb-db-server', f)
+
+        northd_config_files = [
+            '/etc/ovn/cert_host',
+            '/etc/ovn/key_host',
+            '/etc/ovn/ovn-central.crt',
+            '/etc/ovn/ovn-northd-db-params.conf',
+            '/root/ovn-northd-wrapper.sh']
+        for f in northd_config_files:
+            self.check_file('ovn-northd', f)
+
     def test_all_relations_leader(self):
         self.harness.set_leader()
         self.assertEqual(self.harness.charm.seen_events, [])
         test_utils.set_all_pebbles_ready(self.harness)
         test_utils.add_all_relations(self.harness)
-        self.assertEqual(
-            sorted(self.container_calls.updated_files('ovn-sb-db-server')),
-            [
-                '/etc/ovn/cert_host',
-                '/etc/ovn/key_host',
-                '/etc/ovn/ovn-central.crt',
-                '/root/ovn-sb-cluster-join.sh',
-                '/root/ovn-sb-db-server-wrapper.sh'])
-        self.assertEqual(
-            sorted(self.container_calls.updated_files('ovn-nb-db-server')),
-            [
-                '/etc/ovn/cert_host',
-                '/etc/ovn/key_host',
-                '/etc/ovn/ovn-central.crt',
-                '/root/ovn-nb-cluster-join.sh',
-                '/root/ovn-nb-db-server-wrapper.sh'])
-        self.assertEqual(
-            sorted(self.container_calls.updated_files('ovn-northd')),
-            [
-                '/etc/ovn/cert_host',
-                '/etc/ovn/key_host',
-                '/etc/ovn/ovn-central.crt',
-                '/etc/ovn/ovn-northd-db-params.conf',
-                '/root/ovn-northd-wrapper.sh'])
+        self.check_rendered_files()
 
     def test_all_relations_non_leader(self):
         self.harness.set_leader(False)
@@ -115,33 +120,7 @@ class TestOVNCentralXenaOperatorCharm(test_utils.CharmTestCase):
                 'nb_cid': 'nbcid',
                 'sb_cid': 'sbcid'}
         )
-        self.assertEqual(
-            sorted(list(set(
-                self.container_calls.updated_files('ovn-sb-db-server')))),
-            [
-                '/etc/ovn/cert_host',
-                '/etc/ovn/key_host',
-                '/etc/ovn/ovn-central.crt',
-                '/root/ovn-sb-cluster-join.sh',
-                '/root/ovn-sb-db-server-wrapper.sh'])
-        self.assertEqual(
-            sorted(list(set(
-                self.container_calls.updated_files('ovn-nb-db-server')))),
-            [
-                '/etc/ovn/cert_host',
-                '/etc/ovn/key_host',
-                '/etc/ovn/ovn-central.crt',
-                '/root/ovn-nb-cluster-join.sh',
-                '/root/ovn-nb-db-server-wrapper.sh'])
-        self.assertEqual(
-            sorted(list(set(
-                self.container_calls.updated_files('ovn-northd')))),
-            [
-                '/etc/ovn/cert_host',
-                '/etc/ovn/key_host',
-                '/etc/ovn/ovn-central.crt',
-                '/etc/ovn/ovn-northd-db-params.conf',
-                '/root/ovn-northd-wrapper.sh'])
+        self.check_rendered_files()
         self.assertEqual(
             self.container_calls.execute['ovn-sb-db-server'],
             [