From 6870447e5bdb4b562d70e3d7ac72bb7e18c5e446 Mon Sep 17 00:00:00 2001
From: James Page <james.page@canonical.com>
Date: Tue, 12 Dec 2023 10:58:52 +0000
Subject: [PATCH] Retire project post merge to sunbeam-charms

Change-Id: Ie2828c61608e9eed054ed7683731c9e2b681fbde
---
 .stestr.conf                                  |    3 -
 .zuul.yaml                                    |   11 +-
 CONTRIBUTING.md                               |   33 -
 LICENSE                                       |  202 ---
 README.md                                     |   18 -
 README.rst                                    |   12 +
 actions.yaml                                  |   15 -
 charmcraft.yaml                               |   26 -
 config.yaml                                   |   28 -
 .../ceilometer_k8s/v0/ceilometer_service.py   |  224 ---
 lib/charms/cinder_ceph_k8s/v0/ceph_access.py  |  266 ---
 .../v0/database_requires.py                   |  496 ------
 lib/charms/grafana_agent/v0/cos_agent.py      |  824 ---------
 .../keystone_k8s/v0/cloud_credentials.py      |  418 -----
 .../keystone_k8s/v0/identity_credentials.py   |  458 -----
 .../keystone_k8s/v0/identity_service.py       |  493 ------
 .../keystone_k8s/v1/cloud_credentials.py      |  451 -----
 .../keystone_k8s/v1/identity_service.py       |  518 ------
 .../v0/kubernetes_service_patch.py            |  280 ---
 .../v1/kubernetes_service_patch.py            |  342 ----
 lib/charms/operator_libs_linux/v2/snap.py     | 1099 ------------
 lib/charms/ovn_central_k8s/v0/ovsdb.py        |  218 ---
 lib/charms/rabbitmq_k8s/v0/rabbitmq.py        |  286 ---
 .../v1/tls_certificates.py                    | 1261 -------------
 lib/charms/traefik_k8s/v1/ingress.py          |  558 ------
 metadata.yaml                                 |   38 -
 osci.yaml                                     |   10 -
 pyproject.toml                                |   39 -
 rename.sh                                     |   13 -
 requirements.txt                              |   14 -
 src/charm.py                                  |  500 ------
 .../capacity_dashboard.json                   | 1575 -----------------
 src/prometheus_alert_rules/libvirt.yaml       |   16 -
 src/prometheus_alert_rules/ovs.yaml           |   51 -
 src/utils.py                                  |  109 --
 test-requirements.txt                         |   15 -
 tests/actions.yaml                            |    1 -
 tests/integration/test_charm.py               |   62 -
 tests/unit/__init__.py                        |   15 -
 tests/unit/config.yaml                        |    1 -
 tests/unit/test_alert_rules/test_libvirt.yaml |   25 -
 tests/unit/test_alert_rules/test_ovs.yaml     |   90 -
 tests/unit/test_charm.py                      |  265 ---
 tox.ini                                       |  168 --
 44 files changed, 13 insertions(+), 11534 deletions(-)
 delete mode 100644 .stestr.conf
 delete mode 100644 CONTRIBUTING.md
 delete mode 100644 LICENSE
 delete mode 100644 README.md
 create mode 100644 README.rst
 delete mode 100644 actions.yaml
 delete mode 100644 charmcraft.yaml
 delete mode 100644 config.yaml
 delete mode 100644 lib/charms/ceilometer_k8s/v0/ceilometer_service.py
 delete mode 100644 lib/charms/cinder_ceph_k8s/v0/ceph_access.py
 delete mode 100644 lib/charms/data_platform_libs/v0/database_requires.py
 delete mode 100644 lib/charms/grafana_agent/v0/cos_agent.py
 delete mode 100644 lib/charms/keystone_k8s/v0/cloud_credentials.py
 delete mode 100644 lib/charms/keystone_k8s/v0/identity_credentials.py
 delete mode 100644 lib/charms/keystone_k8s/v0/identity_service.py
 delete mode 100644 lib/charms/keystone_k8s/v1/cloud_credentials.py
 delete mode 100644 lib/charms/keystone_k8s/v1/identity_service.py
 delete mode 100644 lib/charms/observability_libs/v0/kubernetes_service_patch.py
 delete mode 100644 lib/charms/observability_libs/v1/kubernetes_service_patch.py
 delete mode 100644 lib/charms/operator_libs_linux/v2/snap.py
 delete mode 100644 lib/charms/ovn_central_k8s/v0/ovsdb.py
 delete mode 100644 lib/charms/rabbitmq_k8s/v0/rabbitmq.py
 delete mode 100644 lib/charms/tls_certificates_interface/v1/tls_certificates.py
 delete mode 100644 lib/charms/traefik_k8s/v1/ingress.py
 delete mode 100644 metadata.yaml
 delete mode 100644 osci.yaml
 delete mode 100644 pyproject.toml
 delete mode 100755 rename.sh
 delete mode 100644 requirements.txt
 delete mode 100755 src/charm.py
 delete mode 100644 src/grafana_dashboards/capacity_dashboard.json
 delete mode 100644 src/prometheus_alert_rules/libvirt.yaml
 delete mode 100644 src/prometheus_alert_rules/ovs.yaml
 delete mode 100644 src/utils.py
 delete mode 100644 test-requirements.txt
 delete mode 120000 tests/actions.yaml
 delete mode 100644 tests/integration/test_charm.py
 delete mode 100644 tests/unit/__init__.py
 delete mode 120000 tests/unit/config.yaml
 delete mode 100644 tests/unit/test_alert_rules/test_libvirt.yaml
 delete mode 100644 tests/unit/test_alert_rules/test_ovs.yaml
 delete mode 100644 tests/unit/test_charm.py
 delete mode 100644 tox.ini

diff --git a/.stestr.conf b/.stestr.conf
deleted file mode 100644
index e4750de..0000000
--- a/.stestr.conf
+++ /dev/null
@@ -1,3 +0,0 @@
-[DEFAULT]
-test_path=./tests/unit
-top_dir=./tests
diff --git a/.zuul.yaml b/.zuul.yaml
index fd8a2c1..e7c200a 100644
--- a/.zuul.yaml
+++ b/.zuul.yaml
@@ -1,12 +1,3 @@
 - project:
     templates:
-      - openstack-python3-charm-jobs
-      - openstack-cover-jobs
-      - prometheus-alert-rules-test
-    vars:
-      charm_build_name: openstack-hypervisor
-      juju_channel: 3.1/stable
-      juju_classic_mode: false
-      microk8s_channel: 1.28-strict/stable
-      microk8s_classic_mode: false
-      prometheus_alerts_test_rules_dir: tests/unit/test_alert_rules
+      - noop-jobs
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
deleted file mode 100644
index 2969183..0000000
--- a/CONTRIBUTING.md
+++ /dev/null
@@ -1,33 +0,0 @@
-# Contributing
-
-To make contributions to this charm, you'll need a working [development setup](https://juju.is/docs/sdk/dev-setup).
-
-You can use the environments created by `tox` for development:
-
-```shell
-tox --notest -e unit
-source .tox/unit/bin/activate
-```
-
-## Testing
-
-This project uses `tox` for managing test environments. There are some pre-configured environments
-that can be used for linting and formatting code when you're preparing contributions to the charm:
-
-```shell
-tox -e fmt           # update your code according to linting rules
-tox -e lint          # code style
-tox -e unit          # unit tests
-tox -e integration   # integration tests
-tox                  # runs 'lint' and 'unit' environments
-```
-
-## Build the charm
-
-Build the charm in this git repository using:
-
-```shell
-charmcraft pack
-```
-
-<!-- You may want to include any contribution/style guidelines in this document>
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index d645695..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,202 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
diff --git a/README.md b/README.md
deleted file mode 100644
index 08e5a70..0000000
--- a/README.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# openstack-hypervisor
-
-This charm deploys the openstack-hypervisor snap.
-
-It is expected to be related to the control plane via cross model relations. To
-achieve this assuming the control plane is in a model called *k8s*.
-
-```
-juju offer k8s.rabbitmq-k8s:amqp
-juju offer k8s.keystone:identity-credentials
-juju offer k8s.certificate-authority:certificates
-juju offer k8s.ovn-relay:ovsdb-cms-relay
-
-juju relate -m hypervisor openstack-hypervisor admin/k8s.rabbitmq-k8s
-juju relate -m hypervisor openstack-hypervisor admin/k8s.keystone
-juju relate -m hypervisor openstack-hypervisor admin/k8s.certificate-authority
-juju relate -m hypervisor openstack-hypervisor admin/k8s.ovn-relay
-```
diff --git a/README.rst b/README.rst
new file mode 100644
index 0000000..39cdc03
--- /dev/null
+++ b/README.rst
@@ -0,0 +1,12 @@
+This repository has been merged into the
+`Sunbeam Charms <https://opendev.org/openstack/sunbeam-charms>`_
+repository.
+
+The contents of this repository are still available in the Git
+source code management system.  To see the contents of this
+repository before it reached its end of life, please check out the
+previous commit with "git checkout HEAD^1".
+
+For any further questions, please email
+openstack-discuss@lists.openstack.org or join #openstack-sunbeam on
+OFTC.
diff --git a/actions.yaml b/actions.yaml
deleted file mode 100644
index 98ea1af..0000000
--- a/actions.yaml
+++ /dev/null
@@ -1,15 +0,0 @@
-set-hypervisor-local-settings:
-  description: |
-    Apply settings specific to this hypervisor unit
-  params:
-    external-nic:
-      type: string
-      description: NIC that hypervisor will configure for North/South traffic
-    spice-proxy-address:
-      type: string
-      description: IP address to use for configuration of SPICE consoles in instances.
-    ip-address:
-      type: string
-      description: IP address to use for service configuration
-  additionalProperties: false
-
diff --git a/charmcraft.yaml b/charmcraft.yaml
deleted file mode 100644
index c82f303..0000000
--- a/charmcraft.yaml
+++ /dev/null
@@ -1,26 +0,0 @@
-# This file configures Charmcraft.
-# See https://juju.is/docs/sdk/charmcraft-config for guidance.
-
-type: charm
-bases:
-  - build-on:
-    - name: ubuntu
-      channel: "22.04"
-    run-on:
-    - name: ubuntu
-      channel: "22.04"
-
-parts:
-  charm:
-    build-packages:
-      - git
-      - libffi-dev
-      - libssl-dev
-      - pkg-config
-      - rustc
-      - cargo
-    charm-binary-python-packages:
-      - cryptography
-      - jsonschema
-      - jinja2
-      - git+https://opendev.org/openstack/charm-ops-sunbeam#egg=ops_sunbeam
diff --git a/config.yaml b/config.yaml
deleted file mode 100644
index a690337..0000000
--- a/config.yaml
+++ /dev/null
@@ -1,28 +0,0 @@
-options:
-  snap-channel:
-    default: "2023.2/edge"
-    type: string
-  debug:
-    default: False
-    type: boolean
-  dns-domain:
-    default: "openstack.local"
-    type: string
-  dns-servers:
-    default: "8.8.8.8"
-    type: string
-  enable-gateway:
-    default: False
-    type: boolean
-  external-bridge:
-    default: "br-ex"
-    type: string
-  external-bridge-address:
-    default: "10.20.20.1/24"
-    type: string
-  physnet-name:
-    default: "physnet1"
-    type: string
-  use-migration-binding:
-    default: False
-    type: boolean
diff --git a/lib/charms/ceilometer_k8s/v0/ceilometer_service.py b/lib/charms/ceilometer_k8s/v0/ceilometer_service.py
deleted file mode 100644
index 016e1ba..0000000
--- a/lib/charms/ceilometer_k8s/v0/ceilometer_service.py
+++ /dev/null
@@ -1,224 +0,0 @@
-"""CeilometerServiceProvides and Requires module.
-
-This library contains the Requires and Provides classes for handling
-the ceilometer_service interface.
-
-Import `CeilometerServiceRequires` in your charm, with the charm object and the
-relation name:
-    - self
-    - "ceilometer_service"
-
-Two events are also available to respond to:
-    - config_changed
-    - goneaway
-
-A basic example showing the usage of this relation follows:
-
-```
-from charms.ceilometer_k8s.v0.ceilometer_service import (
-    CeilometerServiceRequires
-)
-
-class CeilometerServiceClientCharm(CharmBase):
-    def __init__(self, *args):
-        super().__init__(*args)
-        # CeilometerService Requires
-        self.ceilometer_service = CeilometerServiceRequires(
-            self, "ceilometer_service",
-        )
-        self.framework.observe(
-            self.ceilometer_service.on.config_changed,
-            self._on_ceilometer_service_config_changed
-        )
-        self.framework.observe(
-            self.ceilometer_service.on.goneaway,
-            self._on_ceiometer_service_goneaway
-        )
-
-    def _on_ceilometer_service_config_changed(self, event):
-        '''React to the Ceilometer service config changed event.
-
-        This event happens when CeilometerService relation is added to the
-        model and relation data is changed.
-        '''
-        # Do something with the configuration provided by relation.
-        pass
-
-    def _on_ceilometer_service_goneaway(self, event):
-        '''React to the CeilometerService goneaway event.
-
-        This event happens when CeilometerService relation is removed.
-        '''
-        # CeilometerService Relation has goneaway.
-        pass
-```
-"""
-
-import logging
-from typing import (
-    Optional,
-)
-
-from ops.charm import (
-    CharmBase,
-    RelationBrokenEvent,
-    RelationChangedEvent,
-    RelationEvent,
-)
-from ops.framework import (
-    EventSource,
-    Object,
-    ObjectEvents,
-)
-from ops.model import (
-    Relation,
-)
-
-logger = logging.getLogger(__name__)
-
-
-# The unique Charmhub library identifier, never change it
-LIBID = "fcbb94e7a18740729eaf9e2c3b90017f"
-
-# Increment this major API version when introducing breaking changes
-LIBAPI = 0
-
-# Increment this PATCH version before using `charmcraft publish-lib` or reset
-# to 0 if you are raising the major API version
-LIBPATCH = 1
-
-
-class CeilometerConfigRequestEvent(RelationEvent):
-    """CeilometerConfigRequest Event."""
-
-    pass
-
-
-class CeilometerServiceProviderEvents(ObjectEvents):
-    """Events class for `on`."""
-
-    config_request = EventSource(CeilometerConfigRequestEvent)
-
-
-class CeilometerServiceProvides(Object):
-    """CeilometerServiceProvides class."""
-
-    on = CeilometerServiceProviderEvents()
-
-    def __init__(self, charm: CharmBase, relation_name: str):
-        super().__init__(charm, relation_name)
-        self.charm = charm
-        self.relation_name = relation_name
-        self.framework.observe(
-            self.charm.on[relation_name].relation_changed,
-            self._on_ceilometer_service_relation_changed,
-        )
-
-    def _on_ceilometer_service_relation_changed(
-        self, event: RelationChangedEvent
-    ):
-        """Handle CeilometerService relation changed."""
-        logging.debug("CeilometerService relation changed")
-        self.on.config_request.emit(event.relation)
-
-    def set_config(
-        self, relation: Optional[Relation], telemetry_secret: str
-    ) -> None:
-        """Set ceilometer configuration on the relation."""
-        if not self.charm.unit.is_leader():
-            logging.debug("Not a leader unit, skipping set config")
-            return
-
-        # If relation is not provided send config to all the related
-        # applications. This happens usually when config data is
-        # updated by provider and wants to send the data to all
-        # related applications
-        if relation is None:
-            logging.debug(
-                "Sending config to all related applications of relation"
-                f"{self.relation_name}"
-            )
-            for relation in self.framework.model.relations[self.relation_name]:
-                relation.data[self.charm.app][
-                    "telemetry-secret"
-                ] = telemetry_secret
-        else:
-            logging.debug(
-                f"Sending config on relation {relation.app.name} "
-                f"{relation.name}/{relation.id}"
-            )
-            relation.data[self.charm.app][
-                "telemetry-secret"
-            ] = telemetry_secret
-
-
-class CeilometerConfigChangedEvent(RelationEvent):
-    """CeilometerConfigChanged Event."""
-
-    pass
-
-
-class CeilometerServiceGoneAwayEvent(RelationEvent):
-    """CeilometerServiceGoneAway Event."""
-
-    pass
-
-
-class CeilometerServiceRequirerEvents(ObjectEvents):
-    """Events class for `on`."""
-
-    config_changed = EventSource(CeilometerConfigChangedEvent)
-    goneaway = EventSource(CeilometerServiceGoneAwayEvent)
-
-
-class CeilometerServiceRequires(Object):
-    """CeilometerServiceRequires class."""
-
-    on = CeilometerServiceRequirerEvents()
-
-    def __init__(self, charm: CharmBase, relation_name: str):
-        super().__init__(charm, relation_name)
-        self.charm = charm
-        self.relation_name = relation_name
-        self.framework.observe(
-            self.charm.on[relation_name].relation_changed,
-            self._on_ceilometer_service_relation_changed,
-        )
-        self.framework.observe(
-            self.charm.on[relation_name].relation_broken,
-            self._on_ceilometer_service_relation_broken,
-        )
-
-    def _on_ceilometer_service_relation_changed(
-        self, event: RelationChangedEvent
-    ):
-        """Handle CeilometerService relation changed."""
-        logging.debug("CeilometerService config data changed")
-        self.on.config_changed.emit(event.relation)
-
-    def _on_ceilometer_service_relation_broken(
-        self, event: RelationBrokenEvent
-    ):
-        """Handle CeilometerService relation changed."""
-        logging.debug("CeilometerService on_broken")
-        self.on.goneaway.emit(event.relation)
-
-    @property
-    def _ceilometer_service_rel(self) -> Optional[Relation]:
-        """The ceilometer service relation."""
-        return self.framework.model.get_relation(self.relation_name)
-
-    def get_remote_app_data(self, key: str) -> Optional[str]:
-        """Return the value for the given key from remote app data."""
-        if self._ceilometer_service_rel:
-            data = self._ceilometer_service_rel.data[
-                self._ceilometer_service_rel.app
-            ]
-            return data.get(key)
-
-        return None
-
-    @property
-    def telemetry_secret(self) -> Optional[str]:
-        """Return the telemetry_secret."""
-        return self.get_remote_app_data("telemetry-secret")
diff --git a/lib/charms/cinder_ceph_k8s/v0/ceph_access.py b/lib/charms/cinder_ceph_k8s/v0/ceph_access.py
deleted file mode 100644
index 94c5fe6..0000000
--- a/lib/charms/cinder_ceph_k8s/v0/ceph_access.py
+++ /dev/null
@@ -1,266 +0,0 @@
-"""CephAccess Provides and Requires module.
-
-This library contains the Requires and Provides classes for handling
-the ceph-access interface.
-
-Import `CephAccessRequires` in your charm, with the charm object and the
-relation name:
-    - self
-    - "ceph_access"
-
-Three events are also available to respond to:
-    - connected
-    - ready
-    - goneaway
-
-A basic example showing the usage of this relation follows:
-
-```
-from charms.cinder_ceph_k8s.v0.ceph_access import CephAccessRequires
-
-class CephAccessClientCharm(CharmBase):
-    def __init__(self, *args):
-        super().__init__(*args)
-        # CephAccess Requires
-        self.ceph_access = CephAccessRequires(
-            self,
-            relation_name="ceph_access",
-        )
-        self.framework.observe(
-            self.ceph_access.on.connected, self._on_ceph_access_connected)
-        self.framework.observe(
-            self.ceph_access.on.ready, self._on_ceph_access_ready)
-        self.framework.observe(
-            self.ceph_access.on.goneaway, self._on_ceph_access_goneaway)
-
-    def _on_ceph_access_connected(self, event):
-        '''React to the CephAccess connected event.
-
-        This event happens when n CephAccess relation is added to the
-        model before credentials etc have been provided.
-        '''
-        # Do something before the relation is complete
-        pass
-
-    def _on_ceph_access_ready(self, event):
-        '''React to the CephAccess ready event.
-
-        This event happens when an CephAccess relation is removed.
-        '''
-        # IdentityService Relation has goneaway. shutdown services or suchlike
-        pass
-
-```
-
-"""
-
-# The unique Charmhub library identifier, never change it
-LIBID = "7fa8d4f8407c4f31ab1deb51c0c046f1"
-
-# Increment this major API version when introducing breaking changes
-LIBAPI = 0
-
-# Increment this PATCH version before using `charmcraft publish-lib` or reset
-# to 0 if you are raising the major API version
-LIBPATCH = 1
-
-import logging
-from ops.model import (
-    Relation,
-    SecretNotFoundError,
-)
-from ops.framework import (
-    EventBase,
-    ObjectEvents,
-    EventSource,
-    Object,
-)
-logger = logging.getLogger(__name__)
-
-class CephAccessConnectedEvent(EventBase):
-    """CephAccess connected Event."""
-
-    pass
-
-
-class CephAccessReadyEvent(EventBase):
-    """CephAccess ready for use Event."""
-
-    pass
-
-
-class CephAccessGoneAwayEvent(EventBase):
-    """CephAccess relation has gone-away Event"""
-
-    pass
-
-
-class CephAccessServerEvents(ObjectEvents):
-    """Events class for `on`"""
-
-    connected = EventSource(CephAccessConnectedEvent)
-    ready = EventSource(CephAccessReadyEvent)
-    goneaway = EventSource(CephAccessGoneAwayEvent)
-
-
-class CephAccessRequires(Object):
-    """
-    CephAccessRequires class
-    """
-
-
-    on = CephAccessServerEvents()
-
-    def __init__(self, charm, relation_name: str):
-        super().__init__(charm, relation_name)
-        self.charm = charm
-        self.relation_name = relation_name
-        self.framework.observe(
-            self.charm.on[relation_name].relation_joined,
-            self._on_ceph_access_relation_joined,
-        )
-        self.framework.observe(
-            self.charm.on[relation_name].relation_changed,
-            self._on_ceph_access_relation_changed,
-        )
-        self.framework.observe(
-            self.charm.on[relation_name].relation_departed,
-            self._on_ceph_access_relation_changed,
-        )
-        self.framework.observe(
-            self.charm.on[relation_name].relation_broken,
-            self._on_ceph_access_relation_broken,
-        )
-
-    @property
-    def _ceph_access_rel(self) -> Relation:
-        """The CephAccess relation."""
-        return self.framework.model.get_relation(self.relation_name)
-
-    def get_remote_app_data(self, key: str) -> str:
-        """Return the value for the given key from remote app data."""
-        data = self._ceph_access_rel.data[self._ceph_access_rel.app]
-        return data.get(key)
-
-    def _on_ceph_access_relation_joined(self, event):
-        """CephAccess relation joined."""
-        logging.debug("CephAccess on_joined")
-        self.on.connected.emit()
-
-    def _on_ceph_access_relation_changed(self, event):
-        """CephAccess relation changed."""
-        logging.debug("CephAccess on_changed")
-        try:
-            if self.ready:
-                self.on.ready.emit()
-        except (AttributeError, KeyError):
-            pass
-
-    def _on_ceph_access_relation_broken(self, event):
-        """CephAccess relation broken."""
-        logging.debug("CephAccess on_broken")
-        self.on.goneaway.emit()
-
-    def _retrieve_secret(self):
-        try:
-            credentials_id = self.get_remote_app_data('access-credentials')
-            if not credentials_id:
-                return None
-            credentials = self.charm.model.get_secret(id=credentials_id)
-            return credentials
-        except SecretNotFoundError:
-            logger.warning(f"Secret {credentials_id} not found")
-            return None
-
-    @property
-    def ceph_access_data(self):
-        """Return the service_password."""
-        secret = self._retrieve_secret()
-        if not secret:
-            return {}
-        return secret.get_content()
-
-    @property
-    def ready(self) -> str:
-        """Return the service_password."""
-        return all(k in self.ceph_access_data for k in ["uuid", "key"])
-
-class HasCephAccessClientsEvent(EventBase):
-    """Has CephAccessClients Event."""
-
-    pass
-
-class ReadyCephAccessClientsEvent(EventBase):
-    """Has CephAccessClients Event."""
-
-    def __init__(self, handle, relation_id):
-        super().__init__(handle)
-        self.relation_id = relation_id
-
-    def snapshot(self):
-        return {"relation_id": self.relation_id}
-
-    def restore(self, snapshot):
-        super().restore(snapshot)
-        self.relation_id = snapshot["relation_id"]
-
-class CephAccessClientEvents(ObjectEvents):
-    """Events class for `on`"""
-
-    has_ceph_access_clients = EventSource(HasCephAccessClientsEvent)
-    ready_ceph_access_clients = EventSource(ReadyCephAccessClientsEvent)
-
-
-class CephAccessProvides(Object):
-    """
-    CephAccessProvides class
-    """
-
-    on = CephAccessClientEvents()
-
-    def __init__(self, charm, relation_name):
-        super().__init__(charm, relation_name)
-        self.charm = charm
-        self.relation_name = relation_name
-        self.framework.observe(
-            self.charm.on[relation_name].relation_joined,
-            self._on_ceph_access_relation_joined,
-        )
-        self.framework.observe(
-            self.charm.on[relation_name].relation_changed,
-            self._on_ceph_access_relation_changed,
-        )
-        self.framework.observe(
-            self.charm.on[relation_name].relation_broken,
-            self._on_ceph_access_relation_broken,
-        )
-
-    def _on_ceph_access_relation_joined(self, event):
-        """Handle CephAccess joined."""
-        logging.debug("CephAccess on_joined")
-        self.on.has_ceph_access_clients.emit()
-
-    def _on_ceph_access_relation_changed(self, event):
-        """Handle CephAccess joined."""
-        logging.debug("CephAccess on_changed")
-        self.on.ready_ceph_access_clients.emit(event.relation.id)
-
-    def _on_ceph_access_relation_broken(self, event):
-        """Handle CephAccess broken."""
-        logging.debug("CephAccessProvides on_broken")
-
-    def set_ceph_access_credentials(self, relation_name: int,
-                                    relation_id: str,
-                                    access_credentials: str):
-
-        logging.debug("Setting ceph_access connection information.")
-        _ceph_access_rel = None
-        for relation in self.framework.model.relations[relation_name]:
-            if relation.id == relation_id:
-                _ceph_access_rel = relation
-        if not _ceph_access_rel:
-            # Relation has disappeared so skip send of data
-            return
-        app_data = _ceph_access_rel.data[self.charm.app]
-        logging.debug(access_credentials)
-        app_data["access-credentials"] = access_credentials
diff --git a/lib/charms/data_platform_libs/v0/database_requires.py b/lib/charms/data_platform_libs/v0/database_requires.py
deleted file mode 100644
index 53d6191..0000000
--- a/lib/charms/data_platform_libs/v0/database_requires.py
+++ /dev/null
@@ -1,496 +0,0 @@
-# Copyright 2022 Canonical Ltd.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""Relation 'requires' side abstraction for database relation.
-
-This library is a uniform interface to a selection of common database
-metadata, with added custom events that add convenience to database management,
-and methods to consume the application related data.
-
-Following an example of using the DatabaseCreatedEvent, in the context of the
-application charm code:
-
-```python
-
-from charms.data_platform_libs.v0.database_requires import DatabaseRequires
-
-class ApplicationCharm(CharmBase):
-    # Application charm that connects to database charms.
-
-    def __init__(self, *args):
-        super().__init__(*args)
-
-        # Charm events defined in the database requires charm library.
-        self.database = DatabaseRequires(self, relation_name="database", database_name="database")
-        self.framework.observe(self.database.on.database_created, self._on_database_created)
-
-    def _on_database_created(self, event: DatabaseCreatedEvent) -> None:
-        # Handle the created database
-
-        # Create configuration file for app
-        config_file = self._render_app_config_file(
-            event.username,
-            event.password,
-            event.endpoints,
-        )
-
-        # Start application with rendered configuration
-        self._start_application(config_file)
-
-        # Set active status
-        self.unit.status = ActiveStatus("received database credentials")
-```
-
-As shown above, the library provides some custom events to handle specific situations,
-which are listed below:
-
-— database_created: event emitted when the requested database is created.
-— endpoints_changed: event emitted when the read/write endpoints of the database have changed.
-— read_only_endpoints_changed: event emitted when the read-only endpoints of the database
-  have changed. Event is not triggered if read/write endpoints changed too.
-
-If it is needed to connect multiple database clusters to the same relation endpoint
-the application charm can implement the same code as if it would connect to only
-one database cluster (like the above code example).
-
-To differentiate multiple clusters connected to the same relation endpoint
-the application charm can use the name of the remote application:
-
-```python
-
-def _on_database_created(self, event: DatabaseCreatedEvent) -> None:
-    # Get the remote app name of the cluster that triggered this event
-    cluster = event.relation.app.name
-```
-
-It is also possible to provide an alias for each different database cluster/relation.
-
-So, it is possible to differentiate the clusters in two ways.
-The first is to use the remote application name, i.e., `event.relation.app.name`, as above.
-
-The second way is to use different event handlers to handle each cluster events.
-The implementation would be something like the following code:
-
-```python
-
-from charms.data_platform_libs.v0.database_requires import DatabaseRequires
-
-class ApplicationCharm(CharmBase):
-    # Application charm that connects to database charms.
-
-    def __init__(self, *args):
-        super().__init__(*args)
-
-        # Define the cluster aliases and one handler for each cluster database created event.
-        self.database = DatabaseRequires(
-            self,
-            relation_name="database",
-            database_name="database",
-            relations_aliases = ["cluster1", "cluster2"],
-        )
-        self.framework.observe(
-            self.database.on.cluster1_database_created, self._on_cluster1_database_created
-        )
-        self.framework.observe(
-            self.database.on.cluster2_database_created, self._on_cluster2_database_created
-        )
-
-    def _on_cluster1_database_created(self, event: DatabaseCreatedEvent) -> None:
-        # Handle the created database on the cluster named cluster1
-
-        # Create configuration file for app
-        config_file = self._render_app_config_file(
-            event.username,
-            event.password,
-            event.endpoints,
-        )
-        ...
-
-    def _on_cluster2_database_created(self, event: DatabaseCreatedEvent) -> None:
-        # Handle the created database on the cluster named cluster2
-
-        # Create configuration file for app
-        config_file = self._render_app_config_file(
-            event.username,
-            event.password,
-            event.endpoints,
-        )
-        ...
-
-```
-"""
-
-import json
-import logging
-from collections import namedtuple
-from datetime import datetime
-from typing import List, Optional
-
-from ops.charm import (
-    CharmEvents,
-    RelationChangedEvent,
-    RelationEvent,
-    RelationJoinedEvent,
-)
-from ops.framework import EventSource, Object
-from ops.model import Relation
-
-# The unique Charmhub library identifier, never change it
-LIBID = "0241e088ffa9440fb4e3126349b2fb62"
-
-# Increment this major API version when introducing breaking changes
-LIBAPI = 0
-
-# Increment this PATCH version before using `charmcraft publish-lib` or reset
-# to 0 if you are raising the major API version.
-LIBPATCH = 4
-
-logger = logging.getLogger(__name__)
-
-
-class DatabaseEvent(RelationEvent):
-    """Base class for database events."""
-
-    @property
-    def endpoints(self) -> Optional[str]:
-        """Returns a comma separated list of read/write endpoints."""
-        return self.relation.data[self.relation.app].get("endpoints")
-
-    @property
-    def password(self) -> Optional[str]:
-        """Returns the password for the created user."""
-        return self.relation.data[self.relation.app].get("password")
-
-    @property
-    def read_only_endpoints(self) -> Optional[str]:
-        """Returns a comma separated list of read only endpoints."""
-        return self.relation.data[self.relation.app].get("read-only-endpoints")
-
-    @property
-    def replset(self) -> Optional[str]:
-        """Returns the replicaset name.
-
-        MongoDB only.
-        """
-        return self.relation.data[self.relation.app].get("replset")
-
-    @property
-    def tls(self) -> Optional[str]:
-        """Returns whether TLS is configured."""
-        return self.relation.data[self.relation.app].get("tls")
-
-    @property
-    def tls_ca(self) -> Optional[str]:
-        """Returns TLS CA."""
-        return self.relation.data[self.relation.app].get("tls-ca")
-
-    @property
-    def uris(self) -> Optional[str]:
-        """Returns the connection URIs.
-
-        MongoDB, Redis, OpenSearch and Kafka only.
-        """
-        return self.relation.data[self.relation.app].get("uris")
-
-    @property
-    def username(self) -> Optional[str]:
-        """Returns the created username."""
-        return self.relation.data[self.relation.app].get("username")
-
-    @property
-    def version(self) -> Optional[str]:
-        """Returns the version of the database.
-
-        Version as informed by the database daemon.
-        """
-        return self.relation.data[self.relation.app].get("version")
-
-
-class DatabaseCreatedEvent(DatabaseEvent):
-    """Event emitted when a new database is created for use on this relation."""
-
-
-class DatabaseEndpointsChangedEvent(DatabaseEvent):
-    """Event emitted when the read/write endpoints are changed."""
-
-
-class DatabaseReadOnlyEndpointsChangedEvent(DatabaseEvent):
-    """Event emitted when the read only endpoints are changed."""
-
-
-class DatabaseEvents(CharmEvents):
-    """Database events.
-
-    This class defines the events that the database can emit.
-    """
-
-    database_created = EventSource(DatabaseCreatedEvent)
-    endpoints_changed = EventSource(DatabaseEndpointsChangedEvent)
-    read_only_endpoints_changed = EventSource(DatabaseReadOnlyEndpointsChangedEvent)
-
-
-Diff = namedtuple("Diff", "added changed deleted")
-Diff.__doc__ = """
-A tuple for storing the diff between two data mappings.
-
-— added — keys that were added.
-— changed — keys that still exist but have new values.
-— deleted — keys that were deleted.
-"""
-
-
-class DatabaseRequires(Object):
-    """Requires-side of the database relation."""
-
-    on = DatabaseEvents()
-
-    def __init__(
-        self,
-        charm,
-        relation_name: str,
-        database_name: str,
-        extra_user_roles: str = None,
-        relations_aliases: List[str] = None,
-    ):
-        """Manager of database client relations."""
-        super().__init__(charm, relation_name)
-        self.charm = charm
-        self.database = database_name
-        self.extra_user_roles = extra_user_roles
-        self.local_app = self.charm.model.app
-        self.local_unit = self.charm.unit
-        self.relation_name = relation_name
-        self.relations_aliases = relations_aliases
-        self.framework.observe(
-            self.charm.on[relation_name].relation_joined, self._on_relation_joined_event
-        )
-        self.framework.observe(
-            self.charm.on[relation_name].relation_changed, self._on_relation_changed_event
-        )
-
-        # Define custom event names for each alias.
-        if relations_aliases:
-            # Ensure the number of aliases does not exceed the maximum
-            # of connections allowed in the specific relation.
-            relation_connection_limit = self.charm.meta.requires[relation_name].limit
-            if len(relations_aliases) != relation_connection_limit:
-                raise ValueError(
-                    f"The number of aliases must match the maximum number of connections allowed in the relation. "
-                    f"Expected {relation_connection_limit}, got {len(relations_aliases)}"
-                )
-
-            for relation_alias in relations_aliases:
-                self.on.define_event(f"{relation_alias}_database_created", DatabaseCreatedEvent)
-                self.on.define_event(
-                    f"{relation_alias}_endpoints_changed", DatabaseEndpointsChangedEvent
-                )
-                self.on.define_event(
-                    f"{relation_alias}_read_only_endpoints_changed",
-                    DatabaseReadOnlyEndpointsChangedEvent,
-                )
-
-    def _assign_relation_alias(self, relation_id: int) -> None:
-        """Assigns an alias to a relation.
-
-        This function writes in the unit data bag.
-
-        Args:
-            relation_id: the identifier for a particular relation.
-        """
-        # If no aliases were provided, return immediately.
-        if not self.relations_aliases:
-            return
-
-        # Return if an alias was already assigned to this relation
-        # (like when there are more than one unit joining the relation).
-        if (
-            self.charm.model.get_relation(self.relation_name, relation_id)
-            .data[self.local_unit]
-            .get("alias")
-        ):
-            return
-
-        # Retrieve the available aliases (the ones that weren't assigned to any relation).
-        available_aliases = self.relations_aliases[:]
-        for relation in self.charm.model.relations[self.relation_name]:
-            alias = relation.data[self.local_unit].get("alias")
-            if alias:
-                logger.debug("Alias %s was already assigned to relation %d", alias, relation.id)
-                available_aliases.remove(alias)
-
-        # Set the alias in the unit relation databag of the specific relation.
-        relation = self.charm.model.get_relation(self.relation_name, relation_id)
-        relation.data[self.local_unit].update({"alias": available_aliases[0]})
-
-    def _diff(self, event: RelationChangedEvent) -> Diff:
-        """Retrieves the diff of the data in the relation changed databag.
-
-        Args:
-            event: relation changed event.
-
-        Returns:
-            a Diff instance containing the added, deleted and changed
-                keys from the event relation databag.
-        """
-        # Retrieve the old data from the data key in the local unit relation databag.
-        old_data = json.loads(event.relation.data[self.local_unit].get("data", "{}"))
-        # Retrieve the new data from the event relation databag.
-        new_data = {
-            key: value for key, value in event.relation.data[event.app].items() if key != "data"
-        }
-
-        # These are the keys that were added to the databag and triggered this event.
-        added = new_data.keys() - old_data.keys()
-        # These are the keys that were removed from the databag and triggered this event.
-        deleted = old_data.keys() - new_data.keys()
-        # These are the keys that already existed in the databag,
-        # but had their values changed.
-        changed = {
-            key for key in old_data.keys() & new_data.keys() if old_data[key] != new_data[key]
-        }
-
-        # TODO: evaluate the possibility of losing the diff if some error
-        # happens in the charm before the diff is completely checked (DPE-412).
-        # Convert the new_data to a serializable format and save it for a next diff check.
-        event.relation.data[self.local_unit].update({"data": json.dumps(new_data)})
-
-        # Return the diff with all possible changes.
-        return Diff(added, changed, deleted)
-
-    def _emit_aliased_event(self, event: RelationChangedEvent, event_name: str) -> None:
-        """Emit an aliased event to a particular relation if it has an alias.
-
-        Args:
-            event: the relation changed event that was received.
-            event_name: the name of the event to emit.
-        """
-        alias = self._get_relation_alias(event.relation.id)
-        if alias:
-            getattr(self.on, f"{alias}_{event_name}").emit(
-                event.relation, app=event.app, unit=event.unit
-            )
-
-    def _get_relation_alias(self, relation_id: int) -> Optional[str]:
-        """Returns the relation alias.
-
-        Args:
-            relation_id: the identifier for a particular relation.
-
-        Returns:
-            the relation alias or None if the relation was not found.
-        """
-        for relation in self.charm.model.relations[self.relation_name]:
-            if relation.id == relation_id:
-                return relation.data[self.local_unit].get("alias")
-        return None
-
-    def fetch_relation_data(self) -> dict:
-        """Retrieves data from relation.
-
-        This function can be used to retrieve data from a relation
-        in the charm code when outside an event callback.
-
-        Returns:
-            a dict of the values stored in the relation data bag
-                for all relation instances (indexed by the relation ID).
-        """
-        data = {}
-        for relation in self.relations:
-            data[relation.id] = {
-                key: value for key, value in relation.data[relation.app].items() if key != "data"
-            }
-        return data
-
-    def _update_relation_data(self, relation_id: int, data: dict) -> None:
-        """Updates a set of key-value pairs in the relation.
-
-        This function writes in the application data bag, therefore,
-        only the leader unit can call it.
-
-        Args:
-            relation_id: the identifier for a particular relation.
-            data: dict containing the key-value pairs
-                that should be updated in the relation.
-        """
-        if self.local_unit.is_leader():
-            relation = self.charm.model.get_relation(self.relation_name, relation_id)
-            relation.data[self.local_app].update(data)
-
-    def _on_relation_joined_event(self, event: RelationJoinedEvent) -> None:
-        """Event emitted when the application joins the database relation."""
-        # If relations aliases were provided, assign one to the relation.
-        self._assign_relation_alias(event.relation.id)
-
-        # Sets both database and extra user roles in the relation
-        # if the roles are provided. Otherwise, sets only the database.
-        if self.extra_user_roles:
-            self._update_relation_data(
-                event.relation.id,
-                {
-                    "database": self.database,
-                    "extra-user-roles": self.extra_user_roles,
-                },
-            )
-        else:
-            self._update_relation_data(event.relation.id, {"database": self.database})
-
-    def _on_relation_changed_event(self, event: RelationChangedEvent) -> None:
-        """Event emitted when the database relation has changed."""
-        # Check which data has changed to emit customs events.
-        diff = self._diff(event)
-
-        # Check if the database is created
-        # (the database charm shared the credentials).
-        if "username" in diff.added and "password" in diff.added:
-            # Emit the default event (the one without an alias).
-            logger.info("database created at %s", datetime.now())
-            self.on.database_created.emit(event.relation, app=event.app, unit=event.unit)
-
-            # Emit the aliased event (if any).
-            self._emit_aliased_event(event, "database_created")
-
-            # To avoid unnecessary application restarts do not trigger
-            # “endpoints_changed“ event if “database_created“ is triggered.
-            return
-
-        # Emit an endpoints changed event if the database
-        # added or changed this info in the relation databag.
-        if "endpoints" in diff.added or "endpoints" in diff.changed:
-            # Emit the default event (the one without an alias).
-            logger.info("endpoints changed on %s", datetime.now())
-            self.on.endpoints_changed.emit(event.relation, app=event.app, unit=event.unit)
-
-            # Emit the aliased event (if any).
-            self._emit_aliased_event(event, "endpoints_changed")
-
-            # To avoid unnecessary application restarts do not trigger
-            # “read_only_endpoints_changed“ event if “endpoints_changed“ is triggered.
-            return
-
-        # Emit a read only endpoints changed event if the database
-        # added or changed this info in the relation databag.
-        if "read-only-endpoints" in diff.added or "read-only-endpoints" in diff.changed:
-            # Emit the default event (the one without an alias).
-            logger.info("read-only-endpoints changed on %s", datetime.now())
-            self.on.read_only_endpoints_changed.emit(
-                event.relation, app=event.app, unit=event.unit
-            )
-
-            # Emit the aliased event (if any).
-            self._emit_aliased_event(event, "read_only_endpoints_changed")
-
-    @property
-    def relations(self) -> List[Relation]:
-        """The list of Relation instances associated with this relation_name."""
-        return list(self.charm.model.relations[self.relation_name])
diff --git a/lib/charms/grafana_agent/v0/cos_agent.py b/lib/charms/grafana_agent/v0/cos_agent.py
deleted file mode 100644
index 9261582..0000000
--- a/lib/charms/grafana_agent/v0/cos_agent.py
+++ /dev/null
@@ -1,824 +0,0 @@
-# Copyright 2023 Canonical Ltd.
-# See LICENSE file for licensing details.
-
-r"""## Overview.
-
-This library can be used to manage the cos_agent relation interface:
-
-- `COSAgentProvider`: Use in machine charms that need to have a workload's metrics
-  or logs scraped, or forward rule files or dashboards to Prometheus, Loki or Grafana through
-  the Grafana Agent machine charm.
-
-- `COSAgentConsumer`: Used in the Grafana Agent machine charm to manage the requirer side of
-  the `cos_agent` interface.
-
-
-## COSAgentProvider Library Usage
-
-Grafana Agent machine Charmed Operator interacts with its clients using the cos_agent library.
-Charms seeking to send telemetry, must do so using the `COSAgentProvider` object from
-this charm library.
-
-Using the `COSAgentProvider` object only requires instantiating it,
-typically in the `__init__` method of your charm (the one which sends telemetry).
-
-The constructor of `COSAgentProvider` has only one required and nine optional parameters:
-
-```python
-    def __init__(
-        self,
-        charm: CharmType,
-        relation_name: str = DEFAULT_RELATION_NAME,
-        metrics_endpoints: Optional[List[_MetricsEndpointDict]] = None,
-        metrics_rules_dir: str = "./src/prometheus_alert_rules",
-        logs_rules_dir: str = "./src/loki_alert_rules",
-        recurse_rules_dirs: bool = False,
-        log_slots: Optional[List[str]] = None,
-        dashboard_dirs: Optional[List[str]] = None,
-        refresh_events: Optional[List] = None,
-        scrape_configs: Optional[Union[List[Dict], Callable]] = None,
-    ):
-```
-
-### Parameters
-
-- `charm`: The instance of the charm that instantiates `COSAgentProvider`, typically `self`.
-
-- `relation_name`: If your charmed operator uses a relation name other than `cos-agent` to use
-    the `cos_agent` interface, this is where you have to specify that.
-
-- `metrics_endpoints`: In this parameter you can specify the metrics endpoints that Grafana Agent
-    machine Charmed Operator will scrape. The configs of this list will be merged with the configs
-    from `scrape_configs`.
-
-- `metrics_rules_dir`: The directory in which the Charmed Operator stores its metrics alert rules
-  files.
-
-- `logs_rules_dir`: The directory in which the Charmed Operator stores its logs alert rules files.
-
-- `recurse_rules_dirs`: This parameters set whether Grafana Agent machine Charmed Operator has to
-  search alert rules files recursively in the previous two directories or not.
-
-- `log_slots`: Snap slots to connect to for scraping logs in the form ["snap-name:slot", ...].
-
-- `dashboard_dirs`: List of directories where the dashboards are stored in the Charmed Operator.
-
-- `refresh_events`: List of events on which to refresh relation data.
-
-- `scrape_configs`: List of standard scrape_configs dicts or a callable that returns the list in
-    case the configs need to be generated dynamically. The contents of this list will be merged
-    with the configs from `metrics_endpoints`.
-
-
-### Example 1 - Minimal instrumentation:
-
-In order to use this object the following should be in the `charm.py` file.
-
-```python
-from charms.grafana_agent.v0.cos_agent import COSAgentProvider
-...
-class TelemetryProviderCharm(CharmBase):
-    def __init__(self, *args):
-        ...
-        self._grafana_agent = COSAgentProvider(self)
-```
-
-### Example 2 - Full instrumentation:
-
-In order to use this object the following should be in the `charm.py` file.
-
-```python
-from charms.grafana_agent.v0.cos_agent import COSAgentProvider
-...
-class TelemetryProviderCharm(CharmBase):
-    def __init__(self, *args):
-        ...
-        self._grafana_agent = COSAgentProvider(
-            self,
-            relation_name="custom-cos-agent",
-            metrics_endpoints=[
-                # specify "path" and "port" to scrape from localhost
-                {"path": "/metrics", "port": 9000},
-                {"path": "/metrics", "port": 9001},
-                {"path": "/metrics", "port": 9002},
-            ],
-            metrics_rules_dir="./src/alert_rules/prometheus",
-            logs_rules_dir="./src/alert_rules/loki",
-            recursive_rules_dir=True,
-            log_slots=["my-app:slot"],
-            dashboard_dirs=["./src/dashboards_1", "./src/dashboards_2"],
-            refresh_events=["update-status", "upgrade-charm"],
-            scrape_configs=[
-                {
-                    "job_name": "custom_job",
-                    "metrics_path": "/metrics",
-                    "authorization": {"credentials": "bearer-token"},
-                    "static_configs": [
-                        {
-                            "targets": ["localhost:9003"]},
-                            "labels": {"key": "value"},
-                        },
-                    ],
-                },
-            ]
-        )
-```
-
-### Example 3 - Dynamic scrape configs generation:
-
-Pass a function to the `scrape_configs` to decouple the generation of the configs
-from the instantiation of the COSAgentProvider object.
-
-```python
-from charms.grafana_agent.v0.cos_agent import COSAgentProvider
-...
-
-class TelemetryProviderCharm(CharmBase):
-    def generate_scrape_configs(self):
-        return [
-            {
-                "job_name": "custom",
-                "metrics_path": "/metrics",
-                "static_configs": [{"targets": ["localhost:9000"]}],
-            },
-        ]
-
-    def __init__(self, *args):
-        ...
-        self._grafana_agent = COSAgentProvider(
-            self,
-            scrape_configs=self.generate_scrape_configs,
-        )
-```
-
-## COSAgentConsumer Library Usage
-
-This object may be used by any Charmed Operator which gathers telemetry data by
-implementing the consumer side of the `cos_agent` interface.
-For instance Grafana Agent machine Charmed Operator.
-
-For this purpose the charm needs to instantiate the `COSAgentConsumer` object with one mandatory
-and two optional arguments.
-
-### Parameters
-
-- `charm`: A reference to the parent (Grafana Agent machine) charm.
-
-- `relation_name`: The name of the relation that the charm uses to interact
-  with its clients that provides telemetry data using the `COSAgentProvider` object.
-
-  If provided, this relation name must match a provided relation in metadata.yaml with the
-  `cos_agent` interface.
-  The default value of this argument is "cos-agent".
-
-- `refresh_events`: List of events on which to refresh relation data.
-
-
-### Example 1 - Minimal instrumentation:
-
-In order to use this object the following should be in the `charm.py` file.
-
-```python
-from charms.grafana_agent.v0.cos_agent import COSAgentConsumer
-...
-class GrafanaAgentMachineCharm(GrafanaAgentCharm)
-    def __init__(self, *args):
-        ...
-        self._cos = COSAgentRequirer(self)
-```
-
-
-### Example 2 - Full instrumentation:
-
-In order to use this object the following should be in the `charm.py` file.
-
-```python
-from charms.grafana_agent.v0.cos_agent import COSAgentConsumer
-...
-class GrafanaAgentMachineCharm(GrafanaAgentCharm)
-    def __init__(self, *args):
-        ...
-        self._cos = COSAgentRequirer(
-            self,
-            relation_name="cos-agent-consumer",
-            refresh_events=["update-status", "upgrade-charm"],
-        )
-```
-"""
-
-import base64
-import json
-import logging
-import lzma
-from collections import namedtuple
-from itertools import chain
-from pathlib import Path
-from typing import TYPE_CHECKING, Any, Callable, ClassVar, Dict, List, Optional, Set, Union
-
-import pydantic
-from cosl import JujuTopology
-from cosl.rules import AlertRules
-from ops.charm import RelationChangedEvent
-from ops.framework import EventBase, EventSource, Object, ObjectEvents
-from ops.model import Relation, Unit
-from ops.testing import CharmType
-
-if TYPE_CHECKING:
-    try:
-        from typing import TypedDict
-
-        class _MetricsEndpointDict(TypedDict):
-            path: str
-            port: int
-
-    except ModuleNotFoundError:
-        _MetricsEndpointDict = Dict  # pyright: ignore
-
-LIBID = "dc15fa84cef84ce58155fb84f6c6213a"
-LIBAPI = 0
-LIBPATCH = 5
-
-PYDEPS = ["cosl", "pydantic<2"]
-
-DEFAULT_RELATION_NAME = "cos-agent"
-DEFAULT_PEER_RELATION_NAME = "peers"
-DEFAULT_SCRAPE_CONFIG = {
-    "static_configs": [{"targets": ["localhost:80"]}],
-    "metrics_path": "/metrics",
-}
-
-logger = logging.getLogger(__name__)
-SnapEndpoint = namedtuple("SnapEndpoint", "owner, name")
-
-
-class GrafanaDashboard(str):
-    """Grafana Dashboard encoded json; lzma-compressed."""
-
-    # TODO Replace this with a custom type when pydantic v2 released (end of 2023 Q1?)
-    # https://github.com/pydantic/pydantic/issues/4887
-    @staticmethod
-    def _serialize(raw_json: Union[str, bytes]) -> "GrafanaDashboard":
-        if not isinstance(raw_json, bytes):
-            raw_json = raw_json.encode("utf-8")
-        encoded = base64.b64encode(lzma.compress(raw_json)).decode("utf-8")
-        return GrafanaDashboard(encoded)
-
-    def _deserialize(self) -> Dict:
-        try:
-            raw = lzma.decompress(base64.b64decode(self.encode("utf-8"))).decode()
-            return json.loads(raw)
-        except json.decoder.JSONDecodeError as e:
-            logger.error("Invalid Dashboard format: %s", e)
-            return {}
-
-    def __repr__(self):
-        """Return string representation of self."""
-        return "<GrafanaDashboard>"
-
-
-class CosAgentProviderUnitData(pydantic.BaseModel):
-    """Unit databag model for `cos-agent` relation."""
-
-    # The following entries are the same for all units of the same principal.
-    # Note that the same grafana agent subordinate may be related to several apps.
-    # this needs to make its way to the gagent leader
-    metrics_alert_rules: dict
-    log_alert_rules: dict
-    dashboards: List[GrafanaDashboard]
-
-    # The following entries may vary across units of the same principal app.
-    # this data does not need to be forwarded to the gagent leader
-    metrics_scrape_jobs: List[Dict]
-    log_slots: List[str]
-
-    # when this whole datastructure is dumped into a databag, it will be nested under this key.
-    # while not strictly necessary (we could have it 'flattened out' into the databag),
-    # this simplifies working with the model.
-    KEY: ClassVar[str] = "config"
-
-
-class CosAgentPeersUnitData(pydantic.BaseModel):
-    """Unit databag model for `peers` cos-agent machine charm peer relation."""
-
-    # We need the principal unit name and relation metadata to be able to render identifiers
-    # (e.g. topology) on the leader side, after all the data moves into peer data (the grafana
-    # agent leader can only see its own principal, because it is a subordinate charm).
-    principal_unit_name: str
-    principal_relation_id: str
-    principal_relation_name: str
-
-    # The only data that is forwarded to the leader is data that needs to go into the app databags
-    # of the outgoing o11y relations.
-    metrics_alert_rules: Optional[dict]
-    log_alert_rules: Optional[dict]
-    dashboards: Optional[List[GrafanaDashboard]]
-
-    # when this whole datastructure is dumped into a databag, it will be nested under this key.
-    # while not strictly necessary (we could have it 'flattened out' into the databag),
-    # this simplifies working with the model.
-    KEY: ClassVar[str] = "config"
-
-    @property
-    def app_name(self) -> str:
-        """Parse out the app name from the unit name.
-
-        TODO: Switch to using `model_post_init` when pydantic v2 is released?
-          https://github.com/pydantic/pydantic/issues/1729#issuecomment-1300576214
-        """
-        return self.principal_unit_name.split("/")[0]
-
-
-class COSAgentProvider(Object):
-    """Integration endpoint wrapper for the provider side of the cos_agent interface."""
-
-    def __init__(
-        self,
-        charm: CharmType,
-        relation_name: str = DEFAULT_RELATION_NAME,
-        metrics_endpoints: Optional[List["_MetricsEndpointDict"]] = None,
-        metrics_rules_dir: str = "./src/prometheus_alert_rules",
-        logs_rules_dir: str = "./src/loki_alert_rules",
-        recurse_rules_dirs: bool = False,
-        log_slots: Optional[List[str]] = None,
-        dashboard_dirs: Optional[List[str]] = None,
-        refresh_events: Optional[List] = None,
-        *,
-        scrape_configs: Optional[Union[List[dict], Callable]] = None,
-    ):
-        """Create a COSAgentProvider instance.
-
-        Args:
-            charm: The `CharmBase` instance that is instantiating this object.
-            relation_name: The name of the relation to communicate over.
-            metrics_endpoints: List of endpoints in the form [{"path": path, "port": port}, ...].
-                This argument is a simplified form of the `scrape_configs`.
-                The contents of this list will be merged with the contents of `scrape_configs`.
-            metrics_rules_dir: Directory where the metrics rules are stored.
-            logs_rules_dir: Directory where the logs rules are stored.
-            recurse_rules_dirs: Whether to recurse into rule paths.
-            log_slots: Snap slots to connect to for scraping logs
-                in the form ["snap-name:slot", ...].
-            dashboard_dirs: Directory where the dashboards are stored.
-            refresh_events: List of events on which to refresh relation data.
-            scrape_configs: List of standard scrape_configs dicts or a callable
-                that returns the list in case the configs need to be generated dynamically.
-                The contents of this list will be merged with the contents of `metrics_endpoints`.
-        """
-        super().__init__(charm, relation_name)
-        dashboard_dirs = dashboard_dirs or ["./src/grafana_dashboards"]
-
-        self._charm = charm
-        self._relation_name = relation_name
-        self._metrics_endpoints = metrics_endpoints or []
-        self._scrape_configs = scrape_configs or []
-        self._metrics_rules = metrics_rules_dir
-        self._logs_rules = logs_rules_dir
-        self._recursive = recurse_rules_dirs
-        self._log_slots = log_slots or []
-        self._dashboard_dirs = dashboard_dirs
-        self._refresh_events = refresh_events or [self._charm.on.config_changed]
-
-        events = self._charm.on[relation_name]
-        self.framework.observe(events.relation_joined, self._on_refresh)
-        self.framework.observe(events.relation_changed, self._on_refresh)
-        for event in self._refresh_events:
-            self.framework.observe(event, self._on_refresh)
-
-    def _on_refresh(self, event):
-        """Trigger the class to update relation data."""
-        relations = self._charm.model.relations[self._relation_name]
-
-        for relation in relations:
-            # Before a principal is related to the grafana-agent subordinate, we'd get
-            # ModelError: ERROR cannot read relation settings: unit "zk/2": settings not found
-            # Add a guard to make sure it doesn't happen.
-            if relation.data and self._charm.unit in relation.data:
-                # Subordinate relations can communicate only over unit data.
-                try:
-                    data = CosAgentProviderUnitData(
-                        metrics_alert_rules=self._metrics_alert_rules,
-                        log_alert_rules=self._log_alert_rules,
-                        dashboards=self._dashboards,
-                        metrics_scrape_jobs=self._scrape_jobs,
-                        log_slots=self._log_slots,
-                    )
-                    relation.data[self._charm.unit][data.KEY] = data.json()
-                except (
-                    pydantic.ValidationError,
-                    json.decoder.JSONDecodeError,
-                ) as e:
-                    logger.error("Invalid relation data provided: %s", e)
-
-    @property
-    def _scrape_jobs(self) -> List[Dict]:
-        """Return a prometheus_scrape-like data structure for jobs.
-
-        https://prometheus.io/docs/prometheus/latest/configuration/configuration/#scrape_config
-        """
-        if callable(self._scrape_configs):
-            scrape_configs = self._scrape_configs()
-        else:
-            # Create a copy of the user scrape_configs, since we will mutate this object
-            scrape_configs = self._scrape_configs.copy()
-
-        # Convert "metrics_endpoints" to standard scrape_configs, and add them in
-        for endpoint in self._metrics_endpoints:
-            scrape_configs.append(
-                {
-                    "metrics_path": endpoint["path"],
-                    "static_configs": [{"targets": [f"localhost:{endpoint['port']}"]}],
-                }
-            )
-
-        scrape_configs = scrape_configs or [DEFAULT_SCRAPE_CONFIG]
-
-        # Augment job name to include the app name and a unique id (index)
-        for idx, scrape_config in enumerate(scrape_configs):
-            scrape_config["job_name"] = "_".join(
-                [self._charm.app.name, str(idx), scrape_config.get("job_name", "default")]
-            )
-
-        return scrape_configs
-
-    @property
-    def _metrics_alert_rules(self) -> Dict:
-        """Use (for now) the prometheus_scrape AlertRules to initialize this."""
-        alert_rules = AlertRules(
-            query_type="promql", topology=JujuTopology.from_charm(self._charm)
-        )
-        alert_rules.add_path(self._metrics_rules, recursive=self._recursive)
-        return alert_rules.as_dict()
-
-    @property
-    def _log_alert_rules(self) -> Dict:
-        """Use (for now) the loki_push_api AlertRules to initialize this."""
-        alert_rules = AlertRules(query_type="logql", topology=JujuTopology.from_charm(self._charm))
-        alert_rules.add_path(self._logs_rules, recursive=self._recursive)
-        return alert_rules.as_dict()
-
-    @property
-    def _dashboards(self) -> List[GrafanaDashboard]:
-        dashboards: List[GrafanaDashboard] = []
-        for d in self._dashboard_dirs:
-            for path in Path(d).glob("*"):
-                dashboard = GrafanaDashboard._serialize(path.read_bytes())
-                dashboards.append(dashboard)
-        return dashboards
-
-
-class COSAgentDataChanged(EventBase):
-    """Event emitted by `COSAgentRequirer` when relation data changes."""
-
-
-class COSAgentValidationError(EventBase):
-    """Event emitted by `COSAgentRequirer` when there is an error in the relation data."""
-
-    def __init__(self, handle, message: str = ""):
-        super().__init__(handle)
-        self.message = message
-
-    def snapshot(self) -> Dict:
-        """Save COSAgentValidationError source information."""
-        return {"message": self.message}
-
-    def restore(self, snapshot):
-        """Restore COSAgentValidationError source information."""
-        self.message = snapshot["message"]
-
-
-class COSAgentRequirerEvents(ObjectEvents):
-    """`COSAgentRequirer` events."""
-
-    data_changed = EventSource(COSAgentDataChanged)
-    validation_error = EventSource(COSAgentValidationError)
-
-
-class COSAgentRequirer(Object):
-    """Integration endpoint wrapper for the Requirer side of the cos_agent interface."""
-
-    on = COSAgentRequirerEvents()  # pyright: ignore
-
-    def __init__(
-        self,
-        charm: CharmType,
-        *,
-        relation_name: str = DEFAULT_RELATION_NAME,
-        peer_relation_name: str = DEFAULT_PEER_RELATION_NAME,
-        refresh_events: Optional[List[str]] = None,
-    ):
-        """Create a COSAgentRequirer instance.
-
-        Args:
-            charm: The `CharmBase` instance that is instantiating this object.
-            relation_name: The name of the relation to communicate over.
-            peer_relation_name: The name of the peer relation to communicate over.
-            refresh_events: List of events on which to refresh relation data.
-        """
-        super().__init__(charm, relation_name)
-        self._charm = charm
-        self._relation_name = relation_name
-        self._peer_relation_name = peer_relation_name
-        self._refresh_events = refresh_events or [self._charm.on.config_changed]
-
-        events = self._charm.on[relation_name]
-        self.framework.observe(
-            events.relation_joined, self._on_relation_data_changed
-        )  # TODO: do we need this?
-        self.framework.observe(events.relation_changed, self._on_relation_data_changed)
-        for event in self._refresh_events:
-            self.framework.observe(event, self.trigger_refresh)  # pyright: ignore
-
-        # Peer relation events
-        # A peer relation is needed as it is the only mechanism for exchanging data across
-        # subordinate units.
-        # self.framework.observe(
-        #     self.on[self._peer_relation_name].relation_joined, self._on_peer_relation_joined
-        # )
-        peer_events = self._charm.on[peer_relation_name]
-        self.framework.observe(peer_events.relation_changed, self._on_peer_relation_changed)
-
-    @property
-    def peer_relation(self) -> Optional["Relation"]:
-        """Helper function for obtaining the peer relation object.
-
-        Returns: peer relation object
-        (NOTE: would return None if called too early, e.g. during install).
-        """
-        return self.model.get_relation(self._peer_relation_name)
-
-    def _on_peer_relation_changed(self, _):
-        # Peer data is used for forwarding data from principal units to the grafana agent
-        # subordinate leader, for updating the app data of the outgoing o11y relations.
-        if self._charm.unit.is_leader():
-            self.on.data_changed.emit()  # pyright: ignore
-
-    def _on_relation_data_changed(self, event: RelationChangedEvent):
-        # Peer data is the only means of communication between subordinate units.
-        if not self.peer_relation:
-            event.defer()
-            return
-
-        cos_agent_relation = event.relation
-        if not event.unit or not cos_agent_relation.data.get(event.unit):
-            return
-        principal_unit = event.unit
-
-        # Coherence check
-        units = cos_agent_relation.units
-        if len(units) > 1:
-            # should never happen
-            raise ValueError(
-                f"unexpected error: subordinate relation {cos_agent_relation} "
-                f"should have exactly one unit"
-            )
-
-        if not (raw := cos_agent_relation.data[principal_unit].get(CosAgentProviderUnitData.KEY)):
-            return
-
-        if not (provider_data := self._validated_provider_data(raw)):
-            return
-
-        # Copy data from the principal relation to the peer relation, so the leader could
-        # follow up.
-        # Save the originating unit name, so it could be used for topology later on by the leader.
-        data = CosAgentPeersUnitData(  # peer relation databag model
-            principal_unit_name=event.unit.name,
-            principal_relation_id=str(event.relation.id),
-            principal_relation_name=event.relation.name,
-            metrics_alert_rules=provider_data.metrics_alert_rules,
-            log_alert_rules=provider_data.log_alert_rules,
-            dashboards=provider_data.dashboards,
-        )
-        self.peer_relation.data[self._charm.unit][data.KEY] = data.json()
-
-        # We can't easily tell if the data that was changed is limited to only the data
-        # that goes into peer relation (in which case, if this is not a leader unit, we wouldn't
-        # need to emit `on.data_changed`), so we're emitting `on.data_changed` either way.
-        self.on.data_changed.emit()  # pyright: ignore
-
-    def _validated_provider_data(self, raw) -> Optional[CosAgentProviderUnitData]:
-        try:
-            return CosAgentProviderUnitData(**json.loads(raw))
-        except (pydantic.ValidationError, json.decoder.JSONDecodeError) as e:
-            self.on.validation_error.emit(message=str(e))  # pyright: ignore
-            return None
-
-    def trigger_refresh(self, _):
-        """Trigger a refresh of relation data."""
-        # FIXME: Figure out what we should do here
-        self.on.data_changed.emit()  # pyright: ignore
-
-    @property
-    def _principal_unit(self) -> Optional[Unit]:
-        """Return the principal unit for a relation.
-
-        Assumes that the relation is of type subordinate.
-        Relies on the fact that, for subordinate relations, the only remote unit visible to
-        *this unit* is the principal unit that this unit is attached to.
-        """
-        if relations := self._principal_relations:
-            # Technically it's a list, but for subordinates there can only be one relation
-            principal_relation = next(iter(relations))
-            if units := principal_relation.units:
-                # Technically it's a list, but for subordinates there can only be one
-                return next(iter(units))
-
-        return None
-
-    @property
-    def _principal_relations(self):
-        # Technically it's a list, but for subordinates there can only be one.
-        return self._charm.model.relations[self._relation_name]
-
-    @property
-    def _principal_unit_data(self) -> Optional[CosAgentProviderUnitData]:
-        """Return the principal unit's data.
-
-        Assumes that the relation is of type subordinate.
-        Relies on the fact that, for subordinate relations, the only remote unit visible to
-        *this unit* is the principal unit that this unit is attached to.
-        """
-        if not (relations := self._principal_relations):
-            return None
-
-        # Technically it's a list, but for subordinates there can only be one relation
-        principal_relation = next(iter(relations))
-
-        if not (units := principal_relation.units):
-            return None
-
-        # Technically it's a list, but for subordinates there can only be one
-        unit = next(iter(units))
-        if not (raw := principal_relation.data[unit].get(CosAgentProviderUnitData.KEY)):
-            return None
-
-        if not (provider_data := self._validated_provider_data(raw)):
-            return None
-
-        return provider_data
-
-    def _gather_peer_data(self) -> List[CosAgentPeersUnitData]:
-        """Collect data from the peers.
-
-        Returns a trimmed-down list of CosAgentPeersUnitData.
-        """
-        relation = self.peer_relation
-
-        # Ensure that whatever context we're running this in, we take the necessary precautions:
-        if not relation or not relation.data or not relation.app:
-            return []
-
-        # Iterate over all peer unit data and only collect every principal once.
-        peer_data: List[CosAgentPeersUnitData] = []
-        app_names: Set[str] = set()
-
-        for unit in chain((self._charm.unit,), relation.units):
-            if not relation.data.get(unit) or not (
-                raw := relation.data[unit].get(CosAgentPeersUnitData.KEY)
-            ):
-                logger.info(f"peer {unit} has not set its primary data yet; skipping for now...")
-                continue
-
-            data = CosAgentPeersUnitData(**json.loads(raw))
-            app_name = data.app_name
-            # Have we already seen this principal app?
-            if app_name in app_names:
-                continue
-            peer_data.append(data)
-
-        return peer_data
-
-    @property
-    def metrics_alerts(self) -> Dict[str, Any]:
-        """Fetch metrics alerts."""
-        alert_rules = {}
-
-        seen_apps: List[str] = []
-        for data in self._gather_peer_data():
-            if rules := data.metrics_alert_rules:
-                app_name = data.app_name
-                if app_name in seen_apps:
-                    continue  # dedup!
-                seen_apps.append(app_name)
-                # This is only used for naming the file, so be as specific as we can be
-                identifier = JujuTopology(
-                    model=self._charm.model.name,
-                    model_uuid=self._charm.model.uuid,
-                    application=app_name,
-                    # For the topology unit, we could use `data.principal_unit_name`, but that unit
-                    # name may not be very stable: `_gather_peer_data` de-duplicates by app name so
-                    # the exact unit name that turns up first in the iterator may vary from time to
-                    # time. So using the grafana-agent unit name instead.
-                    unit=self._charm.unit.name,
-                ).identifier
-
-                alert_rules[identifier] = rules
-
-        return alert_rules
-
-    @property
-    def metrics_jobs(self) -> List[Dict]:
-        """Parse the relation data contents and extract the metrics jobs."""
-        scrape_jobs = []
-        if data := self._principal_unit_data:
-            for job in data.metrics_scrape_jobs:
-                # In #220, relation schema changed from a simplified dict to the standard
-                # `scrape_configs`.
-                # This is to ensure backwards compatibility with Providers older than v0.5.
-                if "path" in job and "port" in job and "job_name" in job:
-                    job = {
-                        "job_name": job["job_name"],
-                        "metrics_path": job["path"],
-                        "static_configs": [{"targets": [f"localhost:{job['port']}"]}],
-                    }
-
-                scrape_jobs.append(job)
-
-        return scrape_jobs
-
-    @property
-    def snap_log_endpoints(self) -> List[SnapEndpoint]:
-        """Fetch logging endpoints exposed by related snaps."""
-        plugs = []
-        if data := self._principal_unit_data:
-            targets = data.log_slots
-            if targets:
-                for target in targets:
-                    if target in plugs:
-                        logger.warning(
-                            f"plug {target} already listed. "
-                            "The same snap is being passed from multiple "
-                            "endpoints; this should not happen."
-                        )
-                    else:
-                        plugs.append(target)
-
-        endpoints = []
-        for plug in plugs:
-            if ":" not in plug:
-                logger.error(f"invalid plug definition received: {plug}. Ignoring...")
-            else:
-                endpoint = SnapEndpoint(*plug.split(":"))
-                endpoints.append(endpoint)
-        return endpoints
-
-    @property
-    def logs_alerts(self) -> Dict[str, Any]:
-        """Fetch log alerts."""
-        alert_rules = {}
-        seen_apps: List[str] = []
-
-        for data in self._gather_peer_data():
-            if rules := data.log_alert_rules:
-                # This is only used for naming the file, so be as specific as we can be
-                app_name = data.app_name
-                if app_name in seen_apps:
-                    continue  # dedup!
-                seen_apps.append(app_name)
-
-                identifier = JujuTopology(
-                    model=self._charm.model.name,
-                    model_uuid=self._charm.model.uuid,
-                    application=app_name,
-                    # For the topology unit, we could use `data.principal_unit_name`, but that unit
-                    # name may not be very stable: `_gather_peer_data` de-duplicates by app name so
-                    # the exact unit name that turns up first in the iterator may vary from time to
-                    # time. So using the grafana-agent unit name instead.
-                    unit=self._charm.unit.name,
-                ).identifier
-
-                alert_rules[identifier] = rules
-
-        return alert_rules
-
-    @property
-    def dashboards(self) -> List[Dict[str, str]]:
-        """Fetch dashboards as encoded content.
-
-        Dashboards are assumed not to vary across units of the same primary.
-        """
-        dashboards: List[Dict[str, Any]] = []
-
-        seen_apps: List[str] = []
-        for data in self._gather_peer_data():
-            app_name = data.app_name
-            if app_name in seen_apps:
-                continue  # dedup!
-            seen_apps.append(app_name)
-
-            for encoded_dashboard in data.dashboards or ():
-                content = GrafanaDashboard(encoded_dashboard)._deserialize()
-
-                title = content.get("title", "no_title")
-
-                dashboards.append(
-                    {
-                        "relation_id": data.principal_relation_id,
-                        # We have the remote charm name - use it for the identifier
-                        "charm": f"{data.principal_relation_name}-{app_name}",
-                        "content": content,
-                        "title": title,
-                    }
-                )
-
-        return dashboards
diff --git a/lib/charms/keystone_k8s/v0/cloud_credentials.py b/lib/charms/keystone_k8s/v0/cloud_credentials.py
deleted file mode 100644
index 6253f73..0000000
--- a/lib/charms/keystone_k8s/v0/cloud_credentials.py
+++ /dev/null
@@ -1,418 +0,0 @@
-"""CloudCredentialsProvides and Requires module.
-
-
-This library contains the Requires and Provides classes for handling
-the cloud_credentials interface.
-
-Import `CloudCredentialsRequires` in your charm, with the charm object and the
-relation name:
-    - self
-    - "cloud_credentials"
-
-Also provide additional parameters to the charm object:
-    - service
-    - internal_url
-    - public_url
-    - admin_url
-    - region
-    - username
-    - vhost
-
-Two events are also available to respond to:
-    - connected
-    - ready
-    - goneaway
-
-A basic example showing the usage of this relation follows:
-
-```
-from charms.keystone_k8s.v0.cloud_credentials import CloudCredentialsRequires
-
-class CloudCredentialsClientCharm(CharmBase):
-    def __init__(self, *args):
-        super().__init__(*args)
-        # CloudCredentials Requires
-        self.cloud_credentials = CloudCredentialsRequires(
-            self, "cloud_credentials",
-            service = "my-service"
-            internal_url = "http://internal-url"
-            public_url = "http://public-url"
-            admin_url = "http://admin-url"
-            region = "region"
-        )
-        self.framework.observe(
-            self.cloud_credentials.on.connected, self._on_cloud_credentials_connected)
-        self.framework.observe(
-            self.cloud_credentials.on.ready, self._on_cloud_credentials_ready)
-        self.framework.observe(
-            self.cloud_credentials.on.goneaway, self._on_cloud_credentials_goneaway)
-
-    def _on_cloud_credentials_connected(self, event):
-        '''React to the CloudCredentials connected event.
-
-        This event happens when n CloudCredentials relation is added to the
-        model before credentials etc have been provided.
-        '''
-        # Do something before the relation is complete
-        pass
-
-    def _on_cloud_credentials_ready(self, event):
-        '''React to the CloudCredentials ready event.
-
-        The CloudCredentials interface will use the provided config for the
-        request to the identity server.
-        '''
-        # CloudCredentials Relation is ready. Do something with the completed relation.
-        pass
-
-    def _on_cloud_credentials_goneaway(self, event):
-        '''React to the CloudCredentials goneaway event.
-
-        This event happens when an CloudCredentials relation is removed.
-        '''
-        # CloudCredentials Relation has goneaway. shutdown services or suchlike
-        pass
-```
-"""
-
-import logging
-
-from ops.framework import (
-    StoredState,
-    EventBase,
-    ObjectEvents,
-    EventSource,
-    Object,
-)
-from ops.model import Relation
-
-# The unique Charmhub library identifier, never change it
-LIBID = "a5d96cc2686c47eea554ce2210c2d24e"
-
-# Increment this major API version when introducing breaking changes
-LIBAPI = 0
-
-# Increment this PATCH version before using `charmcraft publish-lib` or reset
-# to 0 if you are raising the major API version
-LIBPATCH = 2
-
-logger = logging.getLogger(__name__)
-
-
-class CloudCredentialsConnectedEvent(EventBase):
-    """CloudCredentials connected Event."""
-
-    pass
-
-
-class CloudCredentialsReadyEvent(EventBase):
-    """CloudCredentials ready for use Event."""
-
-    pass
-
-
-class CloudCredentialsGoneAwayEvent(EventBase):
-    """CloudCredentials relation has gone-away Event"""
-
-    pass
-
-
-class CloudCredentialsServerEvents(ObjectEvents):
-    """Events class for `on`"""
-
-    connected = EventSource(CloudCredentialsConnectedEvent)
-    ready = EventSource(CloudCredentialsReadyEvent)
-    goneaway = EventSource(CloudCredentialsGoneAwayEvent)
-
-
-class CloudCredentialsRequires(Object):
-    """
-    CloudCredentialsRequires class
-    """
-
-    on = CloudCredentialsServerEvents()
-    _stored = StoredState()
-
-    def __init__(self, charm, relation_name: str):
-        super().__init__(charm, relation_name)
-        self.charm = charm
-        self.relation_name = relation_name
-        self.framework.observe(
-            self.charm.on[relation_name].relation_joined,
-            self._on_cloud_credentials_relation_joined,
-        )
-        self.framework.observe(
-            self.charm.on[relation_name].relation_changed,
-            self._on_cloud_credentials_relation_changed,
-        )
-        self.framework.observe(
-            self.charm.on[relation_name].relation_departed,
-            self._on_cloud_credentials_relation_changed,
-        )
-        self.framework.observe(
-            self.charm.on[relation_name].relation_broken,
-            self._on_cloud_credentials_relation_broken,
-        )
-
-    def _on_cloud_credentials_relation_joined(self, event):
-        """CloudCredentials relation joined."""
-        logging.debug("CloudCredentials on_joined")
-        self.on.connected.emit()
-        self.request_credentials()
-
-    def _on_cloud_credentials_relation_changed(self, event):
-        """CloudCredentials relation changed."""
-        logging.debug("CloudCredentials on_changed")
-        try:
-            self.on.ready.emit()
-        except (AttributeError, KeyError):
-            logger.exception('Error when emitting event')
-
-    def _on_cloud_credentials_relation_broken(self, event):
-        """CloudCredentials relation broken."""
-        logging.debug("CloudCredentials on_broken")
-        self.on.goneaway.emit()
-
-    @property
-    def _cloud_credentials_rel(self) -> Relation:
-        """The CloudCredentials relation."""
-        return self.framework.model.get_relation(self.relation_name)
-
-    def get_remote_app_data(self, key: str) -> str:
-        """Return the value for the given key from remote app data."""
-        data = self._cloud_credentials_rel.data[self._cloud_credentials_rel.app]
-        return data.get(key)
-
-    @property
-    def api_version(self) -> str:
-        """Return the api_version."""
-        return self.get_remote_app_data('api-version')
-
-    @property
-    def auth_host(self) -> str:
-        """Return the auth_host."""
-        return self.get_remote_app_data('auth-host')
-
-    @property
-    def auth_port(self) -> str:
-        """Return the auth_port."""
-        return self.get_remote_app_data('auth-port')
-
-    @property
-    def auth_protocol(self) -> str:
-        """Return the auth_protocol."""
-        return self.get_remote_app_data('auth-protocol')
-
-    @property
-    def internal_host(self) -> str:
-        """Return the internal_host."""
-        return self.get_remote_app_data('internal-host')
-
-    @property
-    def internal_port(self) -> str:
-        """Return the internal_port."""
-        return self.get_remote_app_data('internal-port')
-
-    @property
-    def internal_protocol(self) -> str:
-        """Return the internal_protocol."""
-        return self.get_remote_app_data('internal-protocol')
-
-    @property
-    def username(self) -> str:
-        """Return the username."""
-        return self.get_remote_app_data('username')
-
-    @property
-    def password(self) -> str:
-        """Return the password."""
-        return self.get_remote_app_data('password')
-
-    @property
-    def project_name(self) -> str:
-        """Return the project name."""
-        return self.get_remote_app_data('project-name')
-
-    @property
-    def project_id(self) -> str:
-        """Return the project id."""
-        return self.get_remote_app_data('project-id')
-
-    @property
-    def user_domain_name(self) -> str:
-        """Return the name of the user domain."""
-        return self.get_remote_app_data('user-domain-name')
-
-    @property
-    def user_domain_id(self) -> str:
-        """Return the id of the user domain."""
-        return self.get_remote_app_data('user-domain-id')
-
-    @property
-    def project_domain_name(self) -> str:
-        """Return the name of the project domain."""
-        return self.get_remote_app_data('project-domain-name')
-
-    @property
-    def project_domain_id(self) -> str:
-        """Return the id of the project domain."""
-        return self.get_remote_app_data('project-domain-id')
-
-    @property
-    def region(self) -> str:
-        """Return the region for the auth urls."""
-        return self.get_remote_app_data('region')
-
-    def request_credentials(self) -> None:
-        """Request credentials from the CloudCredentials server."""
-        if self.model.unit.is_leader():
-            logging.debug(f'Requesting credentials for {self.charm.app.name}')
-            app_data = self._cloud_credentials_rel.data[self.charm.app]
-            app_data['username'] = self.charm.app.name
-
-
-class HasCloudCredentialsClientsEvent(EventBase):
-    """Has CloudCredentialsClients Event."""
-
-    pass
-
-
-class ReadyCloudCredentialsClientsEvent(EventBase):
-    """CloudCredentialsClients Ready Event."""
-
-    def __init__(self, handle, relation_id, relation_name, username):
-        super().__init__(handle)
-        self.relation_id = relation_id
-        self.relation_name = relation_name
-        self.username = username
-
-    def snapshot(self):
-        return {
-            "relation_id": self.relation_id,
-            "relation_name": self.relation_name,
-            "username": self.username,
-        }
-
-    def restore(self, snapshot):
-        super().restore(snapshot)
-        self.relation_id = snapshot["relation_id"]
-        self.relation_name = snapshot["relation_name"]
-        self.username = snapshot["username"]
-
-
-class CloudCredentialsClientsGoneAwayEvent(EventBase):
-    """Has CloudCredentialsClientsGoneAwayEvent Event."""
-
-    pass
-
-
-class CloudCredentialsClientEvents(ObjectEvents):
-    """Events class for `on`"""
-
-    has_cloud_credentials_clients = EventSource(
-        HasCloudCredentialsClientsEvent
-    )
-    ready_cloud_credentials_clients = EventSource(
-        ReadyCloudCredentialsClientsEvent
-    )
-    cloud_credentials_clients_gone = EventSource(
-        CloudCredentialsClientsGoneAwayEvent
-    )
-
-
-class CloudCredentialsProvides(Object):
-    """
-    CloudCredentialsProvides class
-    """
-
-    on = CloudCredentialsClientEvents()
-    _stored = StoredState()
-
-    def __init__(self, charm, relation_name):
-        super().__init__(charm, relation_name)
-        self.charm = charm
-        self.relation_name = relation_name
-        self.framework.observe(
-            self.charm.on[relation_name].relation_joined,
-            self._on_cloud_credentials_relation_joined,
-        )
-        self.framework.observe(
-            self.charm.on[relation_name].relation_changed,
-            self._on_cloud_credentials_relation_changed,
-        )
-        self.framework.observe(
-            self.charm.on[relation_name].relation_broken,
-            self._on_cloud_credentials_relation_broken,
-        )
-
-    def _on_cloud_credentials_relation_joined(self, event):
-        """Handle CloudCredentials joined."""
-        logging.debug("CloudCredentialsProvides on_joined")
-        self.on.has_cloud_credentials_clients.emit()
-
-    def _on_cloud_credentials_relation_changed(self, event):
-        """Handle CloudCredentials changed."""
-        logging.debug("CloudCredentials on_changed")
-        REQUIRED_KEYS = ['username']
-
-        values = [
-            event.relation.data[event.relation.app].get(k)
-            for k in REQUIRED_KEYS
-        ]
-        # Validate data on the relation
-        if all(values):
-            username = event.relation.data[event.relation.app]['username']
-            self.on.ready_cloud_credentials_clients.emit(
-                event.relation.id,
-                event.relation.name,
-                username,
-            )
-
-    def _on_cloud_credentials_relation_broken(self, event):
-        """Handle CloudCredentials broken."""
-        logging.debug("CloudCredentialsProvides on_departed")
-        self.on.cloud_credentials_clients_gone.emit()
-
-    def set_cloud_credentials(self, relation_name: int,
-                              relation_id: str,
-                              api_version: str,
-                              auth_host: str,
-                              auth_port: str,
-                              auth_protocol: str,
-                              internal_host: str,
-                              internal_port: str,
-                              internal_protocol: str,
-                              username: str,
-                              password: str,
-                              project_name: str,
-                              project_id: str,
-                              user_domain_name: str,
-                              user_domain_id: str,
-                              project_domain_name: str,
-                              project_domain_id: str,
-                              region: str):
-        logging.debug("Setting cloud_credentials connection information.")
-        _cloud_credentials_rel = None
-        for relation in self.framework.model.relations[relation_name]:
-            if relation.id == relation_id:
-                _cloud_credentials_rel = relation
-        if not _cloud_credentials_rel:
-            # Relation has disappeared so don't send the data
-            return
-        app_data = _cloud_credentials_rel.data[self.charm.app]
-        app_data["api-version"] = api_version
-        app_data["auth-host"] = auth_host
-        app_data["auth-port"] = str(auth_port)
-        app_data["auth-protocol"] = auth_protocol
-        app_data["internal-host"] = internal_host
-        app_data["internal-port"] = str(internal_port)
-        app_data["internal-protocol"] = internal_protocol
-        app_data["username"] = username
-        app_data["password"] = password
-        app_data["project-name"] = project_name
-        app_data["project-id"] = project_id
-        app_data["user-domain-name"] = user_domain_name
-        app_data["user-domain-id"] = user_domain_id
-        app_data["project-domain-name"] = project_domain_name
-        app_data["project-domain-id"] = project_domain_id
-        app_data["region"] = region
diff --git a/lib/charms/keystone_k8s/v0/identity_credentials.py b/lib/charms/keystone_k8s/v0/identity_credentials.py
deleted file mode 100644
index e3f4565..0000000
--- a/lib/charms/keystone_k8s/v0/identity_credentials.py
+++ /dev/null
@@ -1,458 +0,0 @@
-"""IdentityCredentialsProvides and Requires module.
-
-
-This library contains the Requires and Provides classes for handling
-the identity_credentials interface.
-
-Import `IdentityCredentialsRequires` in your charm, with the charm object and the
-relation name:
-    - self
-    - "identity_credentials"
-
-Also provide additional parameters to the charm object:
-    - service
-    - internal_url
-    - public_url
-    - admin_url
-    - region
-    - username
-    - vhost
-
-Two events are also available to respond to:
-    - connected
-    - ready
-    - goneaway
-
-A basic example showing the usage of this relation follows:
-
-```
-from charms.keystone_k8s.v0.identity_credentials import IdentityCredentialsRequires
-
-class IdentityCredentialsClientCharm(CharmBase):
-    def __init__(self, *args):
-        super().__init__(*args)
-        # IdentityCredentials Requires
-        self.identity_credentials = IdentityCredentialsRequires(
-            self, "identity_credentials",
-            service = "my-service"
-            internal_url = "http://internal-url"
-            public_url = "http://public-url"
-            admin_url = "http://admin-url"
-            region = "region"
-        )
-        self.framework.observe(
-            self.identity_credentials.on.connected, self._on_identity_credentials_connected)
-        self.framework.observe(
-            self.identity_credentials.on.ready, self._on_identity_credentials_ready)
-        self.framework.observe(
-            self.identity_credentials.on.goneaway, self._on_identity_credentials_goneaway)
-
-    def _on_identity_credentials_connected(self, event):
-        '''React to the IdentityCredentials connected event.
-
-        This event happens when IdentityCredentials relation is added to the
-        model before credentials etc have been provided.
-        '''
-        # Do something before the relation is complete
-        pass
-
-    def _on_identity_credentials_ready(self, event):
-        '''React to the IdentityCredentials ready event.
-
-        The IdentityCredentials interface will use the provided config for the
-        request to the identity server.
-        '''
-        # IdentityCredentials Relation is ready. Do something with the completed relation.
-        pass
-
-    def _on_identity_credentials_goneaway(self, event):
-        '''React to the IdentityCredentials goneaway event.
-
-        This event happens when an IdentityCredentials relation is removed.
-        '''
-        # IdentityCredentials Relation has goneaway. shutdown services or suchlike
-        pass
-```
-"""
-
-import logging
-
-from ops.framework import (
-    StoredState,
-    EventBase,
-    ObjectEvents,
-    EventSource,
-    Object,
-)
-from ops.model import (
-    Relation,
-    SecretNotFoundError,
-)
-
-# The unique Charmhub library identifier, never change it
-LIBID = "b5fa18d4427c4ab9a269c3a2fbed545c"
-
-# Increment this major API version when introducing breaking changes
-LIBAPI = 0
-
-# Increment this PATCH version before using `charmcraft publish-lib` or reset
-# to 0 if you are raising the major API version
-LIBPATCH = 3
-
-logger = logging.getLogger(__name__)
-
-
-class IdentityCredentialsConnectedEvent(EventBase):
-    """IdentityCredentials connected Event."""
-
-    pass
-
-
-class IdentityCredentialsReadyEvent(EventBase):
-    """IdentityCredentials ready for use Event."""
-
-    pass
-
-
-class IdentityCredentialsGoneAwayEvent(EventBase):
-    """IdentityCredentials relation has gone-away Event"""
-
-    pass
-
-
-class IdentityCredentialsServerEvents(ObjectEvents):
-    """Events class for `on`"""
-
-    connected = EventSource(IdentityCredentialsConnectedEvent)
-    ready = EventSource(IdentityCredentialsReadyEvent)
-    goneaway = EventSource(IdentityCredentialsGoneAwayEvent)
-
-
-class IdentityCredentialsRequires(Object):
-    """
-    IdentityCredentialsRequires class
-    """
-
-    on = IdentityCredentialsServerEvents()
-    _stored = StoredState()
-
-    def __init__(self, charm, relation_name: str):
-        super().__init__(charm, relation_name)
-        self.charm = charm
-        self.relation_name = relation_name
-        self.framework.observe(
-            self.charm.on[relation_name].relation_joined,
-            self._on_identity_credentials_relation_joined,
-        )
-        self.framework.observe(
-            self.charm.on[relation_name].relation_changed,
-            self._on_identity_credentials_relation_changed,
-        )
-        self.framework.observe(
-            self.charm.on[relation_name].relation_departed,
-            self._on_identity_credentials_relation_changed,
-        )
-        self.framework.observe(
-            self.charm.on[relation_name].relation_broken,
-            self._on_identity_credentials_relation_broken,
-        )
-
-    def _on_identity_credentials_relation_joined(self, event):
-        """IdentityCredentials relation joined."""
-        logging.debug("IdentityCredentials on_joined")
-        self.on.connected.emit()
-        self.request_credentials()
-
-    def _on_identity_credentials_relation_changed(self, event):
-        """IdentityCredentials relation changed."""
-        logging.debug("IdentityCredentials on_changed")
-        try:
-            self.on.ready.emit()
-        except (AttributeError, KeyError):
-            logger.exception('Error when emitting event')
-
-    def _on_identity_credentials_relation_broken(self, event):
-        """IdentityCredentials relation broken."""
-        logging.debug("IdentityCredentials on_broken")
-        self.on.goneaway.emit()
-
-    @property
-    def _identity_credentials_rel(self) -> Relation:
-        """The IdentityCredentials relation."""
-        return self.framework.model.get_relation(self.relation_name)
-
-    def get_remote_app_data(self, key: str) -> str:
-        """Return the value for the given key from remote app data."""
-        data = self._identity_credentials_rel.data[self._identity_credentials_rel.app]
-        return data.get(key)
-
-    @property
-    def api_version(self) -> str:
-        """Return the api_version."""
-        return self.get_remote_app_data('api-version')
-
-    @property
-    def auth_host(self) -> str:
-        """Return the auth_host."""
-        return self.get_remote_app_data('auth-host')
-
-    @property
-    def auth_port(self) -> str:
-        """Return the auth_port."""
-        return self.get_remote_app_data('auth-port')
-
-    @property
-    def auth_protocol(self) -> str:
-        """Return the auth_protocol."""
-        return self.get_remote_app_data('auth-protocol')
-
-    @property
-    def internal_host(self) -> str:
-        """Return the internal_host."""
-        return self.get_remote_app_data('internal-host')
-
-    @property
-    def internal_port(self) -> str:
-        """Return the internal_port."""
-        return self.get_remote_app_data('internal-port')
-
-    @property
-    def internal_protocol(self) -> str:
-        """Return the internal_protocol."""
-        return self.get_remote_app_data('internal-protocol')
-
-    @property
-    def credentials(self) -> str:
-        return self.get_remote_app_data('credentials')
-
-    @property
-    def username(self) -> str:
-        credentials_id = self.get_remote_app_data('credentials')
-        if not credentials_id:
-            return None
-
-        try:
-            credentials = self.charm.model.get_secret(id=credentials_id)
-            return credentials.get_content().get("username")
-        except SecretNotFoundError:
-            logger.warning(f"Secret {credentials_id} not found")
-            return None
-
-    @property
-    def password(self) -> str:
-        credentials_id = self.get_remote_app_data('credentials')
-        if not credentials_id:
-            return None
-
-        try:
-            credentials = self.charm.model.get_secret(id=credentials_id)
-            return credentials.get_content().get("password")
-        except SecretNotFoundError:
-            logger.warning(f"Secret {credentials_id} not found")
-            return None
-
-    @property
-    def project_name(self) -> str:
-        """Return the project name."""
-        return self.get_remote_app_data('project-name')
-
-    @property
-    def project_id(self) -> str:
-        """Return the project id."""
-        return self.get_remote_app_data('project-id')
-
-    @property
-    def user_domain_name(self) -> str:
-        """Return the name of the user domain."""
-        return self.get_remote_app_data('user-domain-name')
-
-    @property
-    def user_domain_id(self) -> str:
-        """Return the id of the user domain."""
-        return self.get_remote_app_data('user-domain-id')
-
-    @property
-    def project_domain_name(self) -> str:
-        """Return the name of the project domain."""
-        return self.get_remote_app_data('project-domain-name')
-
-    @property
-    def project_domain_id(self) -> str:
-        """Return the id of the project domain."""
-        return self.get_remote_app_data('project-domain-id')
-
-    @property
-    def region(self) -> str:
-        """Return the region for the auth urls."""
-        return self.get_remote_app_data('region')
-
-    @property
-    def internal_endpoint(self) -> str:
-        """Return the region for the internal auth url."""
-        return self.get_remote_app_data('internal-endpoint')
-
-    @property
-    def public_endpoint(self) -> str:
-        """Return the region for the public auth url."""
-        return self.get_remote_app_data('public-endpoint')
-
-    @property
-    def admin_role(self) -> str:
-        """Return the admin_role."""
-        return self.get_remote_app_data('admin-role')
-
-    def request_credentials(self) -> None:
-        """Request credentials from the IdentityCredentials server."""
-        if self.model.unit.is_leader():
-            logging.debug(f'Requesting credentials for {self.charm.app.name}')
-            app_data = self._identity_credentials_rel.data[self.charm.app]
-            app_data['username'] = self.charm.app.name
-
-
-class HasIdentityCredentialsClientsEvent(EventBase):
-    """Has IdentityCredentialsClients Event."""
-
-    pass
-
-
-class ReadyIdentityCredentialsClientsEvent(EventBase):
-    """IdentityCredentialsClients Ready Event."""
-
-    def __init__(self, handle, relation_id, relation_name, username):
-        super().__init__(handle)
-        self.relation_id = relation_id
-        self.relation_name = relation_name
-        self.username = username
-
-    def snapshot(self):
-        return {
-            "relation_id": self.relation_id,
-            "relation_name": self.relation_name,
-            "username": self.username,
-        }
-
-    def restore(self, snapshot):
-        super().restore(snapshot)
-        self.relation_id = snapshot["relation_id"]
-        self.relation_name = snapshot["relation_name"]
-        self.username = snapshot["username"]
-
-
-class IdentityCredentialsClientsGoneAwayEvent(EventBase):
-    """Has IdentityCredentialsClientsGoneAwayEvent Event."""
-
-    pass
-
-
-class IdentityCredentialsClientEvents(ObjectEvents):
-    """Events class for `on`"""
-
-    has_identity_credentials_clients = EventSource(
-        HasIdentityCredentialsClientsEvent
-    )
-    ready_identity_credentials_clients = EventSource(
-        ReadyIdentityCredentialsClientsEvent
-    )
-    identity_credentials_clients_gone = EventSource(
-        IdentityCredentialsClientsGoneAwayEvent
-    )
-
-
-class IdentityCredentialsProvides(Object):
-    """
-    IdentityCredentialsProvides class
-    """
-
-    on = IdentityCredentialsClientEvents()
-    _stored = StoredState()
-
-    def __init__(self, charm, relation_name):
-        super().__init__(charm, relation_name)
-        self.charm = charm
-        self.relation_name = relation_name
-        self.framework.observe(
-            self.charm.on[relation_name].relation_joined,
-            self._on_identity_credentials_relation_joined,
-        )
-        self.framework.observe(
-            self.charm.on[relation_name].relation_changed,
-            self._on_identity_credentials_relation_changed,
-        )
-        self.framework.observe(
-            self.charm.on[relation_name].relation_broken,
-            self._on_identity_credentials_relation_broken,
-        )
-
-    def _on_identity_credentials_relation_joined(self, event):
-        """Handle IdentityCredentials joined."""
-        logging.debug("IdentityCredentialsProvides on_joined")
-        self.on.has_identity_credentials_clients.emit()
-
-    def _on_identity_credentials_relation_changed(self, event):
-        """Handle IdentityCredentials changed."""
-        logging.debug("IdentityCredentials on_changed")
-        REQUIRED_KEYS = ['username']
-
-        values = [
-            event.relation.data[event.relation.app].get(k)
-            for k in REQUIRED_KEYS
-        ]
-        # Validate data on the relation
-        if all(values):
-            username = event.relation.data[event.relation.app]['username']
-            self.on.ready_identity_credentials_clients.emit(
-                event.relation.id,
-                event.relation.name,
-                username,
-            )
-
-    def _on_identity_credentials_relation_broken(self, event):
-        """Handle IdentityCredentials broken."""
-        logging.debug("IdentityCredentialsProvides on_departed")
-        self.on.identity_credentials_clients_gone.emit()
-
-    def set_identity_credentials(self, relation_name: int,
-                              relation_id: str,
-                              api_version: str,
-                              auth_host: str,
-                              auth_port: str,
-                              auth_protocol: str,
-                              internal_host: str,
-                              internal_port: str,
-                              internal_protocol: str,
-                              credentials: str,
-                              project_name: str,
-                              project_id: str,
-                              user_domain_name: str,
-                              user_domain_id: str,
-                              project_domain_name: str,
-                              project_domain_id: str,
-                              region: str,
-                              admin_role: str):
-        logging.debug("Setting identity_credentials connection information.")
-        _identity_credentials_rel = None
-        for relation in self.framework.model.relations[relation_name]:
-            if relation.id == relation_id:
-                _identity_credentials_rel = relation
-        if not _identity_credentials_rel:
-            # Relation has disappeared so don't send the data
-            return
-        app_data = _identity_credentials_rel.data[self.charm.app]
-        app_data["api-version"] = api_version
-        app_data["auth-host"] = auth_host
-        app_data["auth-port"] = str(auth_port)
-        app_data["auth-protocol"] = auth_protocol
-        app_data["internal-host"] = internal_host
-        app_data["internal-port"] = str(internal_port)
-        app_data["internal-protocol"] = internal_protocol
-        app_data["credentials"] = credentials
-        app_data["project-name"] = project_name
-        app_data["project-id"] = project_id
-        app_data["user-domain-name"] = user_domain_name
-        app_data["user-domain-id"] = user_domain_id
-        app_data["project-domain-name"] = project_domain_name
-        app_data["project-domain-id"] = project_domain_id
-        app_data["region"] = region
-        app_data["internal-endpoint"] = self.charm.internal_endpoint
-        app_data["public-endpoint"] = self.charm.public_endpoint
-        app_data["admin-role"] = admin_role
diff --git a/lib/charms/keystone_k8s/v0/identity_service.py b/lib/charms/keystone_k8s/v0/identity_service.py
deleted file mode 100644
index e8d2773..0000000
--- a/lib/charms/keystone_k8s/v0/identity_service.py
+++ /dev/null
@@ -1,493 +0,0 @@
-"""IdentityServiceProvides and Requires module.
-
-
-This library contains the Requires and Provides classes for handling
-the identity_service interface.
-
-Import `IdentityServiceRequires` in your charm, with the charm object and the
-relation name:
-    - self
-    - "identity_service"
-
-Also provide additional parameters to the charm object:
-    - service
-    - internal_url
-    - public_url
-    - admin_url
-    - region
-    - username
-    - vhost
-
-Two events are also available to respond to:
-    - connected
-    - ready
-    - goneaway
-
-A basic example showing the usage of this relation follows:
-
-```
-from charms.keystone_k8s.v0.identity_service import IdentityServiceRequires
-
-class IdentityServiceClientCharm(CharmBase):
-    def __init__(self, *args):
-        super().__init__(*args)
-        # IdentityService Requires
-        self.identity_service = IdentityServiceRequires(
-            self, "identity_service",
-            service = "my-service"
-            internal_url = "http://internal-url"
-            public_url = "http://public-url"
-            admin_url = "http://admin-url"
-            region = "region"
-        )
-        self.framework.observe(
-            self.identity_service.on.connected, self._on_identity_service_connected)
-        self.framework.observe(
-            self.identity_service.on.ready, self._on_identity_service_ready)
-        self.framework.observe(
-            self.identity_service.on.goneaway, self._on_identity_service_goneaway)
-
-    def _on_identity_service_connected(self, event):
-        '''React to the IdentityService connected event.
-
-        This event happens when n IdentityService relation is added to the
-        model before credentials etc have been provided.
-        '''
-        # Do something before the relation is complete
-        pass
-
-    def _on_identity_service_ready(self, event):
-        '''React to the IdentityService ready event.
-
-        The IdentityService interface will use the provided config for the
-        request to the identity server.
-        '''
-        # IdentityService Relation is ready. Do something with the completed relation.
-        pass
-
-    def _on_identity_service_goneaway(self, event):
-        '''React to the IdentityService goneaway event.
-
-        This event happens when an IdentityService relation is removed.
-        '''
-        # IdentityService Relation has goneaway. shutdown services or suchlike
-        pass
-```
-"""
-
-import json
-import logging
-
-from ops.framework import (
-    StoredState,
-    EventBase,
-    ObjectEvents,
-    EventSource,
-    Object,
-)
-from ops.model import Relation
-
-logger = logging.getLogger(__name__)
-
-# The unique Charmhub library identifier, never change it
-LIBID = "0fa7fe7236c14c6e9624acf232b9a3b0"
-
-# Increment this major API version when introducing breaking changes
-LIBAPI = 0
-
-# Increment this PATCH version before using `charmcraft publish-lib` or reset
-# to 0 if you are raising the major API version
-LIBPATCH = 2
-
-
-logger = logging.getLogger(__name__)
-
-
-class IdentityServiceConnectedEvent(EventBase):
-    """IdentityService connected Event."""
-
-    pass
-
-
-class IdentityServiceReadyEvent(EventBase):
-    """IdentityService ready for use Event."""
-
-    pass
-
-
-class IdentityServiceGoneAwayEvent(EventBase):
-    """IdentityService relation has gone-away Event"""
-
-    pass
-
-
-class IdentityServiceServerEvents(ObjectEvents):
-    """Events class for `on`"""
-
-    connected = EventSource(IdentityServiceConnectedEvent)
-    ready = EventSource(IdentityServiceReadyEvent)
-    goneaway = EventSource(IdentityServiceGoneAwayEvent)
-
-
-class IdentityServiceRequires(Object):
-    """
-    IdentityServiceRequires class
-    """
-
-    on = IdentityServiceServerEvents()
-    _stored = StoredState()
-
-    def __init__(self, charm, relation_name: str, service_endpoints: dict,
-                 region: str):
-        super().__init__(charm, relation_name)
-        self.charm = charm
-        self.relation_name = relation_name
-        self.service_endpoints = service_endpoints
-        self.region = region
-        self.framework.observe(
-            self.charm.on[relation_name].relation_joined,
-            self._on_identity_service_relation_joined,
-        )
-        self.framework.observe(
-            self.charm.on[relation_name].relation_changed,
-            self._on_identity_service_relation_changed,
-        )
-        self.framework.observe(
-            self.charm.on[relation_name].relation_departed,
-            self._on_identity_service_relation_changed,
-        )
-        self.framework.observe(
-            self.charm.on[relation_name].relation_broken,
-            self._on_identity_service_relation_broken,
-        )
-
-    def _on_identity_service_relation_joined(self, event):
-        """IdentityService relation joined."""
-        logging.debug("IdentityService on_joined")
-        self.on.connected.emit()
-        self.register_services(
-            self.service_endpoints,
-            self.region)
-
-    def _on_identity_service_relation_changed(self, event):
-        """IdentityService relation changed."""
-        logging.debug("IdentityService on_changed")
-        try:
-            self.service_password
-            self.on.ready.emit()
-        except (AttributeError, KeyError):
-            pass
-
-    def _on_identity_service_relation_broken(self, event):
-        """IdentityService relation broken."""
-        logging.debug("IdentityService on_broken")
-        self.on.goneaway.emit()
-
-    @property
-    def _identity_service_rel(self) -> Relation:
-        """The IdentityService relation."""
-        return self.framework.model.get_relation(self.relation_name)
-
-    def get_remote_app_data(self, key: str) -> str:
-        """Return the value for the given key from remote app data."""
-        data = self._identity_service_rel.data[self._identity_service_rel.app]
-        return data.get(key)
-
-    @property
-    def api_version(self) -> str:
-        """Return the api_version."""
-        return self.get_remote_app_data('api-version')
-
-    @property
-    def auth_host(self) -> str:
-        """Return the auth_host."""
-        return self.get_remote_app_data('auth-host')
-
-    @property
-    def auth_port(self) -> str:
-        """Return the auth_port."""
-        return self.get_remote_app_data('auth-port')
-
-    @property
-    def auth_protocol(self) -> str:
-        """Return the auth_protocol."""
-        return self.get_remote_app_data('auth-protocol')
-
-    @property
-    def internal_host(self) -> str:
-        """Return the internal_host."""
-        return self.get_remote_app_data('internal-host')
-
-    @property
-    def internal_port(self) -> str:
-        """Return the internal_port."""
-        return self.get_remote_app_data('internal-port')
-
-    @property
-    def internal_protocol(self) -> str:
-        """Return the internal_protocol."""
-        return self.get_remote_app_data('internal-protocol')
-
-    @property
-    def admin_domain_name(self) -> str:
-        """Return the admin_domain_name."""
-        return self.get_remote_app_data('admin-domain-name')
-
-    @property
-    def admin_domain_id(self) -> str:
-        """Return the admin_domain_id."""
-        return self.get_remote_app_data('admin-domain-id')
-
-    @property
-    def admin_project_name(self) -> str:
-        """Return the admin_project_name."""
-        return self.get_remote_app_data('admin-project-name')
-
-    @property
-    def admin_project_id(self) -> str:
-        """Return the admin_project_id."""
-        return self.get_remote_app_data('admin-project-id')
-
-    @property
-    def admin_user_name(self) -> str:
-        """Return the admin_user_name."""
-        return self.get_remote_app_data('admin-user-name')
-
-    @property
-    def admin_user_id(self) -> str:
-        """Return the admin_user_id."""
-        return self.get_remote_app_data('admin-user-id')
-
-    @property
-    def service_domain_name(self) -> str:
-        """Return the service_domain_name."""
-        return self.get_remote_app_data('service-domain-name')
-
-    @property
-    def service_domain_id(self) -> str:
-        """Return the service_domain_id."""
-        return self.get_remote_app_data('service-domain-id')
-
-    @property
-    def service_host(self) -> str:
-        """Return the service_host."""
-        return self.get_remote_app_data('service-host')
-
-    @property
-    def service_password(self) -> str:
-        """Return the service_password."""
-        return self.get_remote_app_data('service-password')
-
-    @property
-    def service_port(self) -> str:
-        """Return the service_port."""
-        return self.get_remote_app_data('service-port')
-
-    @property
-    def service_protocol(self) -> str:
-        """Return the service_protocol."""
-        return self.get_remote_app_data('service-protocol')
-
-    @property
-    def service_project_name(self) -> str:
-        """Return the service_project_name."""
-        return self.get_remote_app_data('service-project-name')
-
-    @property
-    def service_project_id(self) -> str:
-        """Return the service_project_id."""
-        return self.get_remote_app_data('service-project-id')
-
-    @property
-    def service_user_name(self) -> str:
-        """Return the service_user_name."""
-        return self.get_remote_app_data('service-user-name')
-
-    @property
-    def service_user_id(self) -> str:
-        """Return the service_user_id."""
-        return self.get_remote_app_data('service-user-id')
-
-    @property
-    def internal_auth_url(self) -> str:
-        """Return the internal_auth_url."""
-        return self.get_remote_app_data('internal-auth-url')
-
-    @property
-    def admin_auth_url(self) -> str:
-        """Return the admin_auth_url."""
-        return self.get_remote_app_data('admin-auth-url')
-
-    @property
-    def public_auth_url(self) -> str:
-        """Return the public_auth_url."""
-        return self.get_remote_app_data('public-auth-url')
-
-    def register_services(self, service_endpoints: dict,
-                          region: str) -> None:
-        """Request access to the IdentityService server."""
-        if self.model.unit.is_leader():
-            logging.debug("Requesting service registration")
-            app_data = self._identity_service_rel.data[self.charm.app]
-            app_data["service-endpoints"] = json.dumps(
-                service_endpoints, sort_keys=True
-            )
-            app_data["region"] = region
-
-
-class HasIdentityServiceClientsEvent(EventBase):
-    """Has IdentityServiceClients Event."""
-
-    pass
-
-
-class ReadyIdentityServiceClientsEvent(EventBase):
-    """IdentityServiceClients Ready Event."""
-
-    def __init__(self, handle, relation_id, relation_name, service_endpoints,
-                 region, client_app_name):
-        super().__init__(handle)
-        self.relation_id = relation_id
-        self.relation_name = relation_name
-        self.service_endpoints = service_endpoints
-        self.region = region
-        self.client_app_name = client_app_name
-
-    def snapshot(self):
-        return {
-            "relation_id": self.relation_id,
-            "relation_name": self.relation_name,
-            "service_endpoints": self.service_endpoints,
-            "client_app_name": self.client_app_name,
-            "region": self.region}
-
-    def restore(self, snapshot):
-        super().restore(snapshot)
-        self.relation_id = snapshot["relation_id"]
-        self.relation_name = snapshot["relation_name"]
-        self.service_endpoints = snapshot["service_endpoints"]
-        self.region = snapshot["region"]
-        self.client_app_name = snapshot["client_app_name"]
-
-
-class IdentityServiceClientEvents(ObjectEvents):
-    """Events class for `on`"""
-
-    has_identity_service_clients = EventSource(HasIdentityServiceClientsEvent)
-    ready_identity_service_clients = EventSource(ReadyIdentityServiceClientsEvent)
-
-
-class IdentityServiceProvides(Object):
-    """
-    IdentityServiceProvides class
-    """
-
-    on = IdentityServiceClientEvents()
-    _stored = StoredState()
-
-    def __init__(self, charm, relation_name):
-        super().__init__(charm, relation_name)
-        self.charm = charm
-        self.relation_name = relation_name
-        self.framework.observe(
-            self.charm.on[relation_name].relation_joined,
-            self._on_identity_service_relation_joined,
-        )
-        self.framework.observe(
-            self.charm.on[relation_name].relation_changed,
-            self._on_identity_service_relation_changed,
-        )
-        self.framework.observe(
-            self.charm.on[relation_name].relation_broken,
-            self._on_identity_service_relation_broken,
-        )
-
-    def _on_identity_service_relation_joined(self, event):
-        """Handle IdentityService joined."""
-        logging.debug("IdentityService on_joined")
-        self.on.has_identity_service_clients.emit()
-
-    def _on_identity_service_relation_changed(self, event):
-        """Handle IdentityService changed."""
-        logging.debug("IdentityService on_changed")
-        REQUIRED_KEYS = [
-            'service-endpoints',
-            'region']
-
-        values = [
-            event.relation.data[event.relation.app].get(k)
-            for k in REQUIRED_KEYS
-        ]
-        # Validate data on the relation
-        if all(values):
-            service_eps = json.loads(
-                event.relation.data[event.relation.app]['service-endpoints'])
-            self.on.ready_identity_service_clients.emit(
-                event.relation.id,
-                event.relation.name,
-                service_eps,
-                event.relation.data[event.relation.app]['region'],
-                event.relation.app.name)
-
-    def _on_identity_service_relation_broken(self, event):
-        """Handle IdentityService broken."""
-        logging.debug("IdentityServiceProvides on_departed")
-        # TODO clear data on the relation
-
-    def set_identity_service_credentials(self, relation_name: int,
-                                         relation_id: str,
-                                         api_version: str,
-                                         auth_host: str,
-                                         auth_port: str,
-                                         auth_protocol: str,
-                                         internal_host: str,
-                                         internal_port: str,
-                                         internal_protocol: str,
-                                         service_host: str,
-                                         service_port: str,
-                                         service_protocol: str,
-                                         admin_domain: str,
-                                         admin_project: str,
-                                         admin_user: str,
-                                         service_domain: str,
-                                         service_password: str,
-                                         service_project: str,
-                                         service_user: str,
-                                         internal_auth_url: str,
-                                         admin_auth_url: str,
-                                         public_auth_url: str):
-        logging.debug("Setting identity_service connection information.")
-        _identity_service_rel = None
-        for relation in self.framework.model.relations[relation_name]:
-            if relation.id == relation_id:
-                _identity_service_rel = relation
-        if not _identity_service_rel:
-            # Relation has disappeared so skip send of data
-            return
-        app_data = _identity_service_rel.data[self.charm.app]
-        app_data["api-version"] = api_version
-        app_data["auth-host"] = auth_host
-        app_data["auth-port"] = str(auth_port)
-        app_data["auth-protocol"] = auth_protocol
-        app_data["internal-host"] = internal_host
-        app_data["internal-port"] = str(internal_port)
-        app_data["internal-protocol"] = internal_protocol
-        app_data["service-host"] = service_host
-        app_data["service-port"] = str(service_port)
-        app_data["service-protocol"] = service_protocol
-        app_data["admin-domain-name"] = admin_domain.name
-        app_data["admin-domain-id"] = admin_domain.id
-        app_data["admin-project-name"] = admin_project.name
-        app_data["admin-project-id"] = admin_project.id
-        app_data["admin-user-name"] = admin_user.name
-        app_data["admin-user-id"] = admin_user.id
-        app_data["service-domain-name"] = service_domain.name
-        app_data["service-domain-id"] = service_domain.id
-        app_data["service-project-name"] = service_project.name
-        app_data["service-project-id"] = service_project.id
-        app_data["service-user-name"] = service_user.name
-        app_data["service-user-id"] = service_user.id
-        app_data["service-password"] = service_password
-        app_data["internal-auth-url"] = internal_auth_url
-        app_data["admin-auth-url"] = admin_auth_url
-        app_data["public-auth-url"] = public_auth_url
diff --git a/lib/charms/keystone_k8s/v1/cloud_credentials.py b/lib/charms/keystone_k8s/v1/cloud_credentials.py
deleted file mode 100644
index 75ece45..0000000
--- a/lib/charms/keystone_k8s/v1/cloud_credentials.py
+++ /dev/null
@@ -1,451 +0,0 @@
-"""CloudCredentialsProvides and Requires module.
-
-
-This library contains the Requires and Provides classes for handling
-the cloud_credentials interface.
-
-Import `CloudCredentialsRequires` in your charm, with the charm object and the
-relation name:
-    - self
-    - "cloud_credentials"
-
-Also provide additional parameters to the charm object:
-    - service
-    - internal_url
-    - public_url
-    - admin_url
-    - region
-    - username
-    - vhost
-
-Two events are also available to respond to:
-    - connected
-    - ready
-    - goneaway
-
-A basic example showing the usage of this relation follows:
-
-```
-from charms.keystone_k8s.v0.cloud_credentials import CloudCredentialsRequires
-
-class CloudCredentialsClientCharm(CharmBase):
-    def __init__(self, *args):
-        super().__init__(*args)
-        # CloudCredentials Requires
-        self.cloud_credentials = CloudCredentialsRequires(
-            self, "cloud_credentials",
-            service = "my-service"
-            internal_url = "http://internal-url"
-            public_url = "http://public-url"
-            admin_url = "http://admin-url"
-            region = "region"
-        )
-        self.framework.observe(
-            self.cloud_credentials.on.connected, self._on_cloud_credentials_connected)
-        self.framework.observe(
-            self.cloud_credentials.on.ready, self._on_cloud_credentials_ready)
-        self.framework.observe(
-            self.cloud_credentials.on.goneaway, self._on_cloud_credentials_goneaway)
-
-    def _on_cloud_credentials_connected(self, event):
-        '''React to the CloudCredentials connected event.
-
-        This event happens when n CloudCredentials relation is added to the
-        model before credentials etc have been provided.
-        '''
-        # Do something before the relation is complete
-        pass
-
-    def _on_cloud_credentials_ready(self, event):
-        '''React to the CloudCredentials ready event.
-
-        The CloudCredentials interface will use the provided config for the
-        request to the identity server.
-        '''
-        # CloudCredentials Relation is ready. Do something with the completed relation.
-        pass
-
-    def _on_cloud_credentials_goneaway(self, event):
-        '''React to the CloudCredentials goneaway event.
-
-        This event happens when an CloudCredentials relation is removed.
-        '''
-        # CloudCredentials Relation has goneaway. shutdown services or suchlike
-        pass
-```
-"""
-
-import logging
-
-from ops.framework import (
-    StoredState,
-    EventBase,
-    ObjectEvents,
-    EventSource,
-    Object,
-)
-from ops.model import (
-    Relation,
-    SecretNotFoundError,
-)
-
-# The unique Charmhub library identifier, never change it
-LIBID = "a5d96cc2686c47eea554ce2210c2d24e"
-
-# Increment this major API version when introducing breaking changes
-LIBAPI = 1
-
-# Increment this PATCH version before using `charmcraft publish-lib` or reset
-# to 0 if you are raising the major API version
-LIBPATCH = 1
-
-logger = logging.getLogger(__name__)
-
-
-class CloudCredentialsConnectedEvent(EventBase):
-    """CloudCredentials connected Event."""
-
-    pass
-
-
-class CloudCredentialsReadyEvent(EventBase):
-    """CloudCredentials ready for use Event."""
-
-    pass
-
-
-class CloudCredentialsGoneAwayEvent(EventBase):
-    """CloudCredentials relation has gone-away Event"""
-
-    pass
-
-
-class CloudCredentialsServerEvents(ObjectEvents):
-    """Events class for `on`"""
-
-    connected = EventSource(CloudCredentialsConnectedEvent)
-    ready = EventSource(CloudCredentialsReadyEvent)
-    goneaway = EventSource(CloudCredentialsGoneAwayEvent)
-
-
-class CloudCredentialsRequires(Object):
-    """
-    CloudCredentialsRequires class
-    """
-
-    on = CloudCredentialsServerEvents()
-    _stored = StoredState()
-
-    def __init__(self, charm, relation_name: str):
-        super().__init__(charm, relation_name)
-        self.charm = charm
-        self.relation_name = relation_name
-        self.framework.observe(
-            self.charm.on[relation_name].relation_joined,
-            self._on_cloud_credentials_relation_joined,
-        )
-        self.framework.observe(
-            self.charm.on[relation_name].relation_changed,
-            self._on_cloud_credentials_relation_changed,
-        )
-        self.framework.observe(
-            self.charm.on[relation_name].relation_departed,
-            self._on_cloud_credentials_relation_changed,
-        )
-        self.framework.observe(
-            self.charm.on[relation_name].relation_broken,
-            self._on_cloud_credentials_relation_broken,
-        )
-
-    def _on_cloud_credentials_relation_joined(self, event):
-        """CloudCredentials relation joined."""
-        logging.debug("CloudCredentials on_joined")
-        self.on.connected.emit()
-        self.request_credentials()
-
-    def _on_cloud_credentials_relation_changed(self, event):
-        """CloudCredentials relation changed."""
-        logging.debug("CloudCredentials on_changed")
-        try:
-            self.on.ready.emit()
-        except (AttributeError, KeyError):
-            logger.exception('Error when emitting event')
-
-    def _on_cloud_credentials_relation_broken(self, event):
-        """CloudCredentials relation broken."""
-        logging.debug("CloudCredentials on_broken")
-        self.on.goneaway.emit()
-
-    @property
-    def _cloud_credentials_rel(self) -> Relation:
-        """The CloudCredentials relation."""
-        return self.framework.model.get_relation(self.relation_name)
-
-    def get_remote_app_data(self, key: str) -> str:
-        """Return the value for the given key from remote app data."""
-        data = self._cloud_credentials_rel.data[self._cloud_credentials_rel.app]
-        return data.get(key)
-
-    @property
-    def api_version(self) -> str:
-        """Return the api_version."""
-        return self.get_remote_app_data('api-version')
-
-    @property
-    def auth_host(self) -> str:
-        """Return the auth_host."""
-        return self.get_remote_app_data('auth-host')
-
-    @property
-    def auth_port(self) -> str:
-        """Return the auth_port."""
-        return self.get_remote_app_data('auth-port')
-
-    @property
-    def auth_protocol(self) -> str:
-        """Return the auth_protocol."""
-        return self.get_remote_app_data('auth-protocol')
-
-    @property
-    def internal_host(self) -> str:
-        """Return the internal_host."""
-        return self.get_remote_app_data('internal-host')
-
-    @property
-    def internal_port(self) -> str:
-        """Return the internal_port."""
-        return self.get_remote_app_data('internal-port')
-
-    @property
-    def internal_protocol(self) -> str:
-        """Return the internal_protocol."""
-        return self.get_remote_app_data('internal-protocol')
-
-    @property
-    def credentials(self) -> str:
-        return self.get_remote_app_data('credentials')
-
-    @property
-    def username(self) -> str:
-        credentials_id = self.get_remote_app_data('credentials')
-        if not credentials_id:
-            return None
-
-        try:
-            credentials = self.charm.model.get_secret(id=credentials_id)
-            return credentials.get_content().get("username")
-        except SecretNotFoundError:
-            logger.warning(f"Secret {credentials_id} not found")
-            return None
-
-    @property
-    def password(self) -> str:
-        credentials_id = self.get_remote_app_data('credentials')
-        if not credentials_id:
-            return None
-
-        try:
-            credentials = self.charm.model.get_secret(id=credentials_id)
-            return credentials.get_content().get("password")
-        except SecretNotFoundError:
-            logger.warning(f"Secret {credentials_id} not found")
-            return None
-
-    @property
-    def project_name(self) -> str:
-        """Return the project name."""
-        return self.get_remote_app_data('project-name')
-
-    @property
-    def project_id(self) -> str:
-        """Return the project id."""
-        return self.get_remote_app_data('project-id')
-
-    @property
-    def user_domain_name(self) -> str:
-        """Return the name of the user domain."""
-        return self.get_remote_app_data('user-domain-name')
-
-    @property
-    def user_domain_id(self) -> str:
-        """Return the id of the user domain."""
-        return self.get_remote_app_data('user-domain-id')
-
-    @property
-    def project_domain_name(self) -> str:
-        """Return the name of the project domain."""
-        return self.get_remote_app_data('project-domain-name')
-
-    @property
-    def project_domain_id(self) -> str:
-        """Return the id of the project domain."""
-        return self.get_remote_app_data('project-domain-id')
-
-    @property
-    def region(self) -> str:
-        """Return the region for the auth urls."""
-        return self.get_remote_app_data('region')
-
-    @property
-    def internal_endpoint(self) -> str:
-        """Return the region for the internal auth url."""
-        return self.get_remote_app_data('internal-endpoint')
-
-    @property
-    def public_endpoint(self) -> str:
-        """Return the region for the public auth url."""
-        return self.get_remote_app_data('public-endpoint')
-
-    def request_credentials(self) -> None:
-        """Request credentials from the CloudCredentials server."""
-        if self.model.unit.is_leader():
-            logging.debug(f'Requesting credentials for {self.charm.app.name}')
-            app_data = self._cloud_credentials_rel.data[self.charm.app]
-            app_data['username'] = self.charm.app.name
-
-
-class HasCloudCredentialsClientsEvent(EventBase):
-    """Has CloudCredentialsClients Event."""
-
-    pass
-
-
-class ReadyCloudCredentialsClientsEvent(EventBase):
-    """CloudCredentialsClients Ready Event."""
-
-    def __init__(self, handle, relation_id, relation_name, username):
-        super().__init__(handle)
-        self.relation_id = relation_id
-        self.relation_name = relation_name
-        self.username = username
-
-    def snapshot(self):
-        return {
-            "relation_id": self.relation_id,
-            "relation_name": self.relation_name,
-            "username": self.username,
-        }
-
-    def restore(self, snapshot):
-        super().restore(snapshot)
-        self.relation_id = snapshot["relation_id"]
-        self.relation_name = snapshot["relation_name"]
-        self.username = snapshot["username"]
-
-
-class CloudCredentialsClientsGoneAwayEvent(EventBase):
-    """Has CloudCredentialsClientsGoneAwayEvent Event."""
-
-    pass
-
-
-class CloudCredentialsClientEvents(ObjectEvents):
-    """Events class for `on`"""
-
-    has_cloud_credentials_clients = EventSource(
-        HasCloudCredentialsClientsEvent
-    )
-    ready_cloud_credentials_clients = EventSource(
-        ReadyCloudCredentialsClientsEvent
-    )
-    cloud_credentials_clients_gone = EventSource(
-        CloudCredentialsClientsGoneAwayEvent
-    )
-
-
-class CloudCredentialsProvides(Object):
-    """
-    CloudCredentialsProvides class
-    """
-
-    on = CloudCredentialsClientEvents()
-    _stored = StoredState()
-
-    def __init__(self, charm, relation_name):
-        super().__init__(charm, relation_name)
-        self.charm = charm
-        self.relation_name = relation_name
-        self.framework.observe(
-            self.charm.on[relation_name].relation_joined,
-            self._on_cloud_credentials_relation_joined,
-        )
-        self.framework.observe(
-            self.charm.on[relation_name].relation_changed,
-            self._on_cloud_credentials_relation_changed,
-        )
-        self.framework.observe(
-            self.charm.on[relation_name].relation_broken,
-            self._on_cloud_credentials_relation_broken,
-        )
-
-    def _on_cloud_credentials_relation_joined(self, event):
-        """Handle CloudCredentials joined."""
-        logging.debug("CloudCredentialsProvides on_joined")
-        self.on.has_cloud_credentials_clients.emit()
-
-    def _on_cloud_credentials_relation_changed(self, event):
-        """Handle CloudCredentials changed."""
-        logging.debug("CloudCredentials on_changed")
-        REQUIRED_KEYS = ['username']
-
-        values = [
-            event.relation.data[event.relation.app].get(k)
-            for k in REQUIRED_KEYS
-        ]
-        # Validate data on the relation
-        if all(values):
-            username = event.relation.data[event.relation.app]['username']
-            self.on.ready_cloud_credentials_clients.emit(
-                event.relation.id,
-                event.relation.name,
-                username,
-            )
-
-    def _on_cloud_credentials_relation_broken(self, event):
-        """Handle CloudCredentials broken."""
-        logging.debug("CloudCredentialsProvides on_departed")
-        self.on.cloud_credentials_clients_gone.emit()
-
-    def set_cloud_credentials(self, relation_name: int,
-                              relation_id: str,
-                              api_version: str,
-                              auth_host: str,
-                              auth_port: str,
-                              auth_protocol: str,
-                              internal_host: str,
-                              internal_port: str,
-                              internal_protocol: str,
-                              credentials: str,
-                              project_name: str,
-                              project_id: str,
-                              user_domain_name: str,
-                              user_domain_id: str,
-                              project_domain_name: str,
-                              project_domain_id: str,
-                              region: str):
-        logging.debug("Setting cloud_credentials connection information.")
-        _cloud_credentials_rel = None
-        for relation in self.framework.model.relations[relation_name]:
-            if relation.id == relation_id:
-                _cloud_credentials_rel = relation
-        if not _cloud_credentials_rel:
-            # Relation has disappeared so don't send the data
-            return
-        app_data = _cloud_credentials_rel.data[self.charm.app]
-        app_data["api-version"] = api_version
-        app_data["auth-host"] = auth_host
-        app_data["auth-port"] = str(auth_port)
-        app_data["auth-protocol"] = auth_protocol
-        app_data["internal-host"] = internal_host
-        app_data["internal-port"] = str(internal_port)
-        app_data["internal-protocol"] = internal_protocol
-        app_data["credentials"] = credentials
-        app_data["project-name"] = project_name
-        app_data["project-id"] = project_id
-        app_data["user-domain-name"] = user_domain_name
-        app_data["user-domain-id"] = user_domain_id
-        app_data["project-domain-name"] = project_domain_name
-        app_data["project-domain-id"] = project_domain_id
-        app_data["region"] = region
-        app_data["internal-endpoint"] = self.charm.internal_endpoint
-        app_data["public-endpoint"] = self.charm.public_endpoint
diff --git a/lib/charms/keystone_k8s/v1/identity_service.py b/lib/charms/keystone_k8s/v1/identity_service.py
deleted file mode 100644
index 3555662..0000000
--- a/lib/charms/keystone_k8s/v1/identity_service.py
+++ /dev/null
@@ -1,518 +0,0 @@
-"""IdentityServiceProvides and Requires module.
-
-
-This library contains the Requires and Provides classes for handling
-the identity_service interface.
-
-Import `IdentityServiceRequires` in your charm, with the charm object and the
-relation name:
-    - self
-    - "identity_service"
-
-Also provide additional parameters to the charm object:
-    - service
-    - internal_url
-    - public_url
-    - admin_url
-    - region
-    - username
-    - vhost
-
-Two events are also available to respond to:
-    - connected
-    - ready
-    - goneaway
-
-A basic example showing the usage of this relation follows:
-
-```
-from charms.keystone_k8s.v1.identity_service import IdentityServiceRequires
-
-class IdentityServiceClientCharm(CharmBase):
-    def __init__(self, *args):
-        super().__init__(*args)
-        # IdentityService Requires
-        self.identity_service = IdentityServiceRequires(
-            self, "identity_service",
-            service = "my-service"
-            internal_url = "http://internal-url"
-            public_url = "http://public-url"
-            admin_url = "http://admin-url"
-            region = "region"
-        )
-        self.framework.observe(
-            self.identity_service.on.connected, self._on_identity_service_connected)
-        self.framework.observe(
-            self.identity_service.on.ready, self._on_identity_service_ready)
-        self.framework.observe(
-            self.identity_service.on.goneaway, self._on_identity_service_goneaway)
-
-    def _on_identity_service_connected(self, event):
-        '''React to the IdentityService connected event.
-
-        This event happens when n IdentityService relation is added to the
-        model before credentials etc have been provided.
-        '''
-        # Do something before the relation is complete
-        pass
-
-    def _on_identity_service_ready(self, event):
-        '''React to the IdentityService ready event.
-
-        The IdentityService interface will use the provided config for the
-        request to the identity server.
-        '''
-        # IdentityService Relation is ready. Do something with the completed relation.
-        pass
-
-    def _on_identity_service_goneaway(self, event):
-        '''React to the IdentityService goneaway event.
-
-        This event happens when an IdentityService relation is removed.
-        '''
-        # IdentityService Relation has goneaway. shutdown services or suchlike
-        pass
-```
-"""
-
-import json
-import logging
-
-from ops.framework import (
-    StoredState,
-    EventBase,
-    ObjectEvents,
-    EventSource,
-    Object,
-)
-from ops.model import (
-    Relation,
-    SecretNotFoundError,
-)
-
-logger = logging.getLogger(__name__)
-
-# The unique Charmhub library identifier, never change it
-LIBID = "0fa7fe7236c14c6e9624acf232b9a3b0"
-
-# Increment this major API version when introducing breaking changes
-LIBAPI = 1
-
-# Increment this PATCH version before using `charmcraft publish-lib` or reset
-# to 0 if you are raising the major API version
-LIBPATCH = 0
-
-
-logger = logging.getLogger(__name__)
-
-
-class IdentityServiceConnectedEvent(EventBase):
-    """IdentityService connected Event."""
-
-    pass
-
-
-class IdentityServiceReadyEvent(EventBase):
-    """IdentityService ready for use Event."""
-
-    pass
-
-
-class IdentityServiceGoneAwayEvent(EventBase):
-    """IdentityService relation has gone-away Event"""
-
-    pass
-
-
-class IdentityServiceServerEvents(ObjectEvents):
-    """Events class for `on`"""
-
-    connected = EventSource(IdentityServiceConnectedEvent)
-    ready = EventSource(IdentityServiceReadyEvent)
-    goneaway = EventSource(IdentityServiceGoneAwayEvent)
-
-
-class IdentityServiceRequires(Object):
-    """
-    IdentityServiceRequires class
-    """
-
-    on = IdentityServiceServerEvents()
-    _stored = StoredState()
-
-    def __init__(self, charm, relation_name: str, service_endpoints: dict,
-                 region: str):
-        super().__init__(charm, relation_name)
-        self.charm = charm
-        self.relation_name = relation_name
-        self.service_endpoints = service_endpoints
-        self.region = region
-        self.framework.observe(
-            self.charm.on[relation_name].relation_joined,
-            self._on_identity_service_relation_joined,
-        )
-        self.framework.observe(
-            self.charm.on[relation_name].relation_changed,
-            self._on_identity_service_relation_changed,
-        )
-        self.framework.observe(
-            self.charm.on[relation_name].relation_departed,
-            self._on_identity_service_relation_changed,
-        )
-        self.framework.observe(
-            self.charm.on[relation_name].relation_broken,
-            self._on_identity_service_relation_broken,
-        )
-
-    def _on_identity_service_relation_joined(self, event):
-        """IdentityService relation joined."""
-        logging.debug("IdentityService on_joined")
-        self.on.connected.emit()
-        self.register_services(
-            self.service_endpoints,
-            self.region)
-
-    def _on_identity_service_relation_changed(self, event):
-        """IdentityService relation changed."""
-        logging.debug("IdentityService on_changed")
-        try:
-            self.service_password
-            self.on.ready.emit()
-        except (AttributeError, KeyError):
-            pass
-
-    def _on_identity_service_relation_broken(self, event):
-        """IdentityService relation broken."""
-        logging.debug("IdentityService on_broken")
-        self.on.goneaway.emit()
-
-    @property
-    def _identity_service_rel(self) -> Relation:
-        """The IdentityService relation."""
-        return self.framework.model.get_relation(self.relation_name)
-
-    def get_remote_app_data(self, key: str) -> str:
-        """Return the value for the given key from remote app data."""
-        data = self._identity_service_rel.data[self._identity_service_rel.app]
-        return data.get(key)
-
-    @property
-    def api_version(self) -> str:
-        """Return the api_version."""
-        return self.get_remote_app_data('api-version')
-
-    @property
-    def auth_host(self) -> str:
-        """Return the auth_host."""
-        return self.get_remote_app_data('auth-host')
-
-    @property
-    def auth_port(self) -> str:
-        """Return the auth_port."""
-        return self.get_remote_app_data('auth-port')
-
-    @property
-    def auth_protocol(self) -> str:
-        """Return the auth_protocol."""
-        return self.get_remote_app_data('auth-protocol')
-
-    @property
-    def internal_host(self) -> str:
-        """Return the internal_host."""
-        return self.get_remote_app_data('internal-host')
-
-    @property
-    def internal_port(self) -> str:
-        """Return the internal_port."""
-        return self.get_remote_app_data('internal-port')
-
-    @property
-    def internal_protocol(self) -> str:
-        """Return the internal_protocol."""
-        return self.get_remote_app_data('internal-protocol')
-
-    @property
-    def admin_domain_name(self) -> str:
-        """Return the admin_domain_name."""
-        return self.get_remote_app_data('admin-domain-name')
-
-    @property
-    def admin_domain_id(self) -> str:
-        """Return the admin_domain_id."""
-        return self.get_remote_app_data('admin-domain-id')
-
-    @property
-    def admin_project_name(self) -> str:
-        """Return the admin_project_name."""
-        return self.get_remote_app_data('admin-project-name')
-
-    @property
-    def admin_project_id(self) -> str:
-        """Return the admin_project_id."""
-        return self.get_remote_app_data('admin-project-id')
-
-    @property
-    def admin_user_name(self) -> str:
-        """Return the admin_user_name."""
-        return self.get_remote_app_data('admin-user-name')
-
-    @property
-    def admin_user_id(self) -> str:
-        """Return the admin_user_id."""
-        return self.get_remote_app_data('admin-user-id')
-
-    @property
-    def service_domain_name(self) -> str:
-        """Return the service_domain_name."""
-        return self.get_remote_app_data('service-domain-name')
-
-    @property
-    def service_domain_id(self) -> str:
-        """Return the service_domain_id."""
-        return self.get_remote_app_data('service-domain-id')
-
-    @property
-    def service_host(self) -> str:
-        """Return the service_host."""
-        return self.get_remote_app_data('service-host')
-
-    @property
-    def service_credentials(self) -> str:
-        """Return the service_credentials secret."""
-        return self.get_remote_app_data('service-credentials')
-
-    @property
-    def service_password(self) -> str:
-        """Return the service_password."""
-        credentials_id = self.get_remote_app_data('service-credentials')
-        if not credentials_id:
-            return None
-
-        try:
-            credentials = self.charm.model.get_secret(id=credentials_id)
-            return credentials.get_content().get("password")
-        except SecretNotFoundError:
-            logger.warning(f"Secret {credentials_id} not found")
-            return None
-
-    @property
-    def service_port(self) -> str:
-        """Return the service_port."""
-        return self.get_remote_app_data('service-port')
-
-    @property
-    def service_protocol(self) -> str:
-        """Return the service_protocol."""
-        return self.get_remote_app_data('service-protocol')
-
-    @property
-    def service_project_name(self) -> str:
-        """Return the service_project_name."""
-        return self.get_remote_app_data('service-project-name')
-
-    @property
-    def service_project_id(self) -> str:
-        """Return the service_project_id."""
-        return self.get_remote_app_data('service-project-id')
-
-    @property
-    def service_user_name(self) -> str:
-        """Return the service_user_name."""
-        credentials_id = self.get_remote_app_data('service-credentials')
-        if not credentials_id:
-            return None
-
-        try:
-            credentials = self.charm.model.get_secret(id=credentials_id)
-            return credentials.get_content().get("username")
-        except SecretNotFoundError:
-            logger.warning(f"Secret {credentials_id} not found")
-            return None
-
-    @property
-    def service_user_id(self) -> str:
-        """Return the service_user_id."""
-        return self.get_remote_app_data('service-user-id')
-
-    @property
-    def internal_auth_url(self) -> str:
-        """Return the internal_auth_url."""
-        return self.get_remote_app_data('internal-auth-url')
-
-    @property
-    def admin_auth_url(self) -> str:
-        """Return the admin_auth_url."""
-        return self.get_remote_app_data('admin-auth-url')
-
-    @property
-    def public_auth_url(self) -> str:
-        """Return the public_auth_url."""
-        return self.get_remote_app_data('public-auth-url')
-
-    def register_services(self, service_endpoints: dict,
-                          region: str) -> None:
-        """Request access to the IdentityService server."""
-        if self.model.unit.is_leader():
-            logging.debug("Requesting service registration")
-            app_data = self._identity_service_rel.data[self.charm.app]
-            app_data["service-endpoints"] = json.dumps(
-                service_endpoints, sort_keys=True
-            )
-            app_data["region"] = region
-
-
-class HasIdentityServiceClientsEvent(EventBase):
-    """Has IdentityServiceClients Event."""
-
-    pass
-
-
-class ReadyIdentityServiceClientsEvent(EventBase):
-    """IdentityServiceClients Ready Event."""
-
-    def __init__(self, handle, relation_id, relation_name, service_endpoints,
-                 region, client_app_name):
-        super().__init__(handle)
-        self.relation_id = relation_id
-        self.relation_name = relation_name
-        self.service_endpoints = service_endpoints
-        self.region = region
-        self.client_app_name = client_app_name
-
-    def snapshot(self):
-        return {
-            "relation_id": self.relation_id,
-            "relation_name": self.relation_name,
-            "service_endpoints": self.service_endpoints,
-            "client_app_name": self.client_app_name,
-            "region": self.region}
-
-    def restore(self, snapshot):
-        super().restore(snapshot)
-        self.relation_id = snapshot["relation_id"]
-        self.relation_name = snapshot["relation_name"]
-        self.service_endpoints = snapshot["service_endpoints"]
-        self.region = snapshot["region"]
-        self.client_app_name = snapshot["client_app_name"]
-
-
-class IdentityServiceClientEvents(ObjectEvents):
-    """Events class for `on`"""
-
-    has_identity_service_clients = EventSource(HasIdentityServiceClientsEvent)
-    ready_identity_service_clients = EventSource(ReadyIdentityServiceClientsEvent)
-
-
-class IdentityServiceProvides(Object):
-    """
-    IdentityServiceProvides class
-    """
-
-    on = IdentityServiceClientEvents()
-    _stored = StoredState()
-
-    def __init__(self, charm, relation_name):
-        super().__init__(charm, relation_name)
-        self.charm = charm
-        self.relation_name = relation_name
-        self.framework.observe(
-            self.charm.on[relation_name].relation_joined,
-            self._on_identity_service_relation_joined,
-        )
-        self.framework.observe(
-            self.charm.on[relation_name].relation_changed,
-            self._on_identity_service_relation_changed,
-        )
-        self.framework.observe(
-            self.charm.on[relation_name].relation_broken,
-            self._on_identity_service_relation_broken,
-        )
-
-    def _on_identity_service_relation_joined(self, event):
-        """Handle IdentityService joined."""
-        logging.debug("IdentityService on_joined")
-        self.on.has_identity_service_clients.emit()
-
-    def _on_identity_service_relation_changed(self, event):
-        """Handle IdentityService changed."""
-        logging.debug("IdentityService on_changed")
-        REQUIRED_KEYS = [
-            'service-endpoints',
-            'region']
-
-        values = [
-            event.relation.data[event.relation.app].get(k)
-            for k in REQUIRED_KEYS
-        ]
-        # Validate data on the relation
-        if all(values):
-            service_eps = json.loads(
-                event.relation.data[event.relation.app]['service-endpoints'])
-            self.on.ready_identity_service_clients.emit(
-                event.relation.id,
-                event.relation.name,
-                service_eps,
-                event.relation.data[event.relation.app]['region'],
-                event.relation.app.name)
-
-    def _on_identity_service_relation_broken(self, event):
-        """Handle IdentityService broken."""
-        logging.debug("IdentityServiceProvides on_departed")
-        # TODO clear data on the relation
-
-    def set_identity_service_credentials(self, relation_name: int,
-                                         relation_id: str,
-                                         api_version: str,
-                                         auth_host: str,
-                                         auth_port: str,
-                                         auth_protocol: str,
-                                         internal_host: str,
-                                         internal_port: str,
-                                         internal_protocol: str,
-                                         service_host: str,
-                                         service_port: str,
-                                         service_protocol: str,
-                                         admin_domain: str,
-                                         admin_project: str,
-                                         admin_user: str,
-                                         service_domain: str,
-                                         service_project: str,
-                                         service_user: str,
-                                         internal_auth_url: str,
-                                         admin_auth_url: str,
-                                         public_auth_url: str,
-                                         service_credentials: str):
-        logging.debug("Setting identity_service connection information.")
-        _identity_service_rel = None
-        for relation in self.framework.model.relations[relation_name]:
-            if relation.id == relation_id:
-                _identity_service_rel = relation
-        if not _identity_service_rel:
-            # Relation has disappeared so skip send of data
-            return
-        app_data = _identity_service_rel.data[self.charm.app]
-        app_data["api-version"] = api_version
-        app_data["auth-host"] = auth_host
-        app_data["auth-port"] = str(auth_port)
-        app_data["auth-protocol"] = auth_protocol
-        app_data["internal-host"] = internal_host
-        app_data["internal-port"] = str(internal_port)
-        app_data["internal-protocol"] = internal_protocol
-        app_data["service-host"] = service_host
-        app_data["service-port"] = str(service_port)
-        app_data["service-protocol"] = service_protocol
-        app_data["admin-domain-name"] = admin_domain.name
-        app_data["admin-domain-id"] = admin_domain.id
-        app_data["admin-project-name"] = admin_project.name
-        app_data["admin-project-id"] = admin_project.id
-        app_data["admin-user-name"] = admin_user.name
-        app_data["admin-user-id"] = admin_user.id
-        app_data["service-domain-name"] = service_domain.name
-        app_data["service-domain-id"] = service_domain.id
-        app_data["service-project-name"] = service_project.name
-        app_data["service-project-id"] = service_project.id
-        app_data["service-user-id"] = service_user.id
-        app_data["internal-auth-url"] = internal_auth_url
-        app_data["admin-auth-url"] = admin_auth_url
-        app_data["public-auth-url"] = public_auth_url
-        app_data["service-credentials"] = service_credentials
diff --git a/lib/charms/observability_libs/v0/kubernetes_service_patch.py b/lib/charms/observability_libs/v0/kubernetes_service_patch.py
deleted file mode 100644
index a3fb910..0000000
--- a/lib/charms/observability_libs/v0/kubernetes_service_patch.py
+++ /dev/null
@@ -1,280 +0,0 @@
-# Copyright 2021 Canonical Ltd.
-# See LICENSE file for licensing details.
-
-"""# KubernetesServicePatch Library.
-
-This library is designed to enable developers to more simply patch the Kubernetes Service created
-by Juju during the deployment of a sidecar charm. When sidecar charms are deployed, Juju creates a
-service named after the application in the namespace (named after the Juju model). This service by
-default contains a "placeholder" port, which is 65536/TCP.
-
-When modifying the default set of resources managed by Juju, one must consider the lifecycle of the
-charm. In this case, any modifications to the default service (created during deployment), will
-be overwritten during a charm upgrade.
-
-When initialised, this library binds a handler to the parent charm's `install` and `upgrade_charm`
-events which applies the patch to the cluster. This should ensure that the service ports are
-correct throughout the charm's life.
-
-The constructor simply takes a reference to the parent charm, and a list of tuples that each define
-a port for the service, where each tuple contains:
-
-- a name for the port
-- port for the service to listen on
-- optionally: a targetPort for the service (the port in the container!)
-- optionally: a nodePort for the service (for NodePort or LoadBalancer services only!)
-- optionally: a name of the service (in case service name needs to be patched as well)
-
-## Getting Started
-
-To get started using the library, you just need to fetch the library using `charmcraft`. **Note
-that you also need to add `lightkube` and `lightkube-models` to your charm's `requirements.txt`.**
-
-```shell
-cd some-charm
-charmcraft fetch-lib charms.observability_libs.v0.kubernetes_service_patch
-echo <<-EOF >> requirements.txt
-lightkube
-lightkube-models
-EOF
-```
-
-Then, to initialise the library:
-
-For ClusterIP services:
-```python
-# ...
-from charms.observability_libs.v0.kubernetes_service_patch import KubernetesServicePatch
-
-class SomeCharm(CharmBase):
-  def __init__(self, *args):
-    # ...
-    self.service_patcher = KubernetesServicePatch(self, [(f"{self.app.name}", 8080)])
-    # ...
-```
-
-For LoadBalancer/NodePort services:
-```python
-# ...
-from charms.observability_libs.v0.kubernetes_service_patch import KubernetesServicePatch
-
-class SomeCharm(CharmBase):
-  def __init__(self, *args):
-    # ...
-    self.service_patcher = KubernetesServicePatch(
-        self, [(f"{self.app.name}", 443, 443, 30666)], "LoadBalancer"
-    )
-    # ...
-```
-
-Additionally, you may wish to use mocks in your charm's unit testing to ensure that the library
-does not try to make any API calls, or open any files during testing that are unlikely to be
-present, and could break your tests. The easiest way to do this is during your test `setUp`:
-
-```python
-# ...
-
-@patch("charm.KubernetesServicePatch", lambda x, y: None)
-def setUp(self, *unused):
-    self.harness = Harness(SomeCharm)
-    # ...
-```
-"""
-
-import logging
-from types import MethodType
-from typing import Literal, Sequence, Tuple, Union
-
-from lightkube import ApiError, Client
-from lightkube.models.core_v1 import ServicePort, ServiceSpec
-from lightkube.models.meta_v1 import ObjectMeta
-from lightkube.resources.core_v1 import Service
-from lightkube.types import PatchType
-from ops.charm import CharmBase
-from ops.framework import Object
-
-logger = logging.getLogger(__name__)
-
-# The unique Charmhub library identifier, never change it
-LIBID = "0042f86d0a874435adef581806cddbbb"
-
-# Increment this major API version when introducing breaking changes
-LIBAPI = 0
-
-# Increment this PATCH version before using `charmcraft publish-lib` or reset
-# to 0 if you are raising the major API version
-LIBPATCH = 6
-
-PortDefinition = Union[Tuple[str, int], Tuple[str, int, int], Tuple[str, int, int, int]]
-ServiceType = Literal["ClusterIP", "LoadBalancer"]
-
-
-class KubernetesServicePatch(Object):
-    """A utility for patching the Kubernetes service set up by Juju."""
-
-    def __init__(
-        self,
-        charm: CharmBase,
-        ports: Sequence[PortDefinition],
-        service_name: str = None,
-        service_type: ServiceType = "ClusterIP",
-        additional_labels: dict = None,
-        additional_selectors: dict = None,
-        additional_annotations: dict = None,
-    ):
-        """Constructor for KubernetesServicePatch.
-
-        Args:
-            charm: the charm that is instantiating the library.
-            ports: a list of tuples (name, port, targetPort, nodePort) for every service port.
-            service_name: allows setting custom name to the patched service. If none given,
-                application name will be used.
-            service_type: desired type of K8s service. Default value is in line with ServiceSpec's
-                default value.
-            additional_labels: Labels to be added to the kubernetes service (by default only
-                "app.kubernetes.io/name" is set to the service name)
-            additional_selectors: Selectors to be added to the kubernetes service (by default only
-                "app.kubernetes.io/name" is set to the service name)
-            additional_annotations: Annotations to be added to the kubernetes service.
-        """
-        super().__init__(charm, "kubernetes-service-patch")
-        self.charm = charm
-        self.service_name = service_name if service_name else self._app
-        self.service = self._service_object(
-            ports,
-            service_name,
-            service_type,
-            additional_labels,
-            additional_selectors,
-            additional_annotations,
-        )
-
-        # Make mypy type checking happy that self._patch is a method
-        assert isinstance(self._patch, MethodType)
-        # Ensure this patch is applied during the 'install' and 'upgrade-charm' events
-        self.framework.observe(charm.on.install, self._patch)
-        self.framework.observe(charm.on.upgrade_charm, self._patch)
-
-    def _service_object(
-        self,
-        ports: Sequence[PortDefinition],
-        service_name: str = None,
-        service_type: ServiceType = "ClusterIP",
-        additional_labels: dict = None,
-        additional_selectors: dict = None,
-        additional_annotations: dict = None,
-    ) -> Service:
-        """Creates a valid Service representation.
-
-        Args:
-            ports: a list of tuples of the form (name, port) or (name, port, targetPort)
-                or (name, port, targetPort, nodePort) for every service port. If the 'targetPort'
-                is omitted, it is assumed to be equal to 'port', with the exception of NodePort
-                and LoadBalancer services, where all port numbers have to be specified.
-            service_name: allows setting custom name to the patched service. If none given,
-                application name will be used.
-            service_type: desired type of K8s service. Default value is in line with ServiceSpec's
-                default value.
-            additional_labels: Labels to be added to the kubernetes service (by default only
-                "app.kubernetes.io/name" is set to the service name)
-            additional_selectors: Selectors to be added to the kubernetes service (by default only
-                "app.kubernetes.io/name" is set to the service name)
-            additional_annotations: Annotations to be added to the kubernetes service.
-
-        Returns:
-            Service: A valid representation of a Kubernetes Service with the correct ports.
-        """
-        if not service_name:
-            service_name = self._app
-        labels = {"app.kubernetes.io/name": self._app}
-        if additional_labels:
-            labels.update(additional_labels)
-        selector = {"app.kubernetes.io/name": self._app}
-        if additional_selectors:
-            selector.update(additional_selectors)
-        return Service(
-            apiVersion="v1",
-            kind="Service",
-            metadata=ObjectMeta(
-                namespace=self._namespace,
-                name=service_name,
-                labels=labels,
-                annotations=additional_annotations,  # type: ignore[arg-type]
-            ),
-            spec=ServiceSpec(
-                selector=selector,
-                ports=[
-                    ServicePort(
-                        name=p[0],
-                        port=p[1],
-                        targetPort=p[2] if len(p) > 2 else p[1],  # type: ignore[misc]
-                        nodePort=p[3] if len(p) > 3 else None,  # type: ignore[arg-type, misc]
-                    )
-                    for p in ports
-                ],
-                type=service_type,
-            ),
-        )
-
-    def _patch(self, _) -> None:
-        """Patch the Kubernetes service created by Juju to map the correct port.
-
-        Raises:
-            PatchFailed: if patching fails due to lack of permissions, or otherwise.
-        """
-        if not self.charm.unit.is_leader():
-            return
-
-        client = Client()
-        try:
-            if self.service_name != self._app:
-                self._delete_and_create_service(client)
-            client.patch(Service, self.service_name, self.service, patch_type=PatchType.MERGE)
-        except ApiError as e:
-            if e.status.code == 403:
-                logger.error("Kubernetes service patch failed: `juju trust` this application.")
-            else:
-                logger.error("Kubernetes service patch failed: %s", str(e))
-        else:
-            logger.info("Kubernetes service '%s' patched successfully", self._app)
-
-    def _delete_and_create_service(self, client: Client):
-        service = client.get(Service, self._app, namespace=self._namespace)
-        service.metadata.name = self.service_name  # type: ignore[attr-defined]
-        service.metadata.resourceVersion = service.metadata.uid = None  # type: ignore[attr-defined]   # noqa: E501
-        client.delete(Service, self._app, namespace=self._namespace)
-        client.create(service)
-
-    def is_patched(self) -> bool:
-        """Reports if the service patch has been applied.
-
-        Returns:
-            bool: A boolean indicating if the service patch has been applied.
-        """
-        client = Client()
-        # Get the relevant service from the cluster
-        service = client.get(Service, name=self.service_name, namespace=self._namespace)
-        # Construct a list of expected ports, should the patch be applied
-        expected_ports = [(p.port, p.targetPort) for p in self.service.spec.ports]
-        # Construct a list in the same manner, using the fetched service
-        fetched_ports = [(p.port, p.targetPort) for p in service.spec.ports]  # type: ignore[attr-defined]  # noqa: E501
-        return expected_ports == fetched_ports
-
-    @property
-    def _app(self) -> str:
-        """Name of the current Juju application.
-
-        Returns:
-            str: A string containing the name of the current Juju application.
-        """
-        return self.charm.app.name
-
-    @property
-    def _namespace(self) -> str:
-        """The Kubernetes namespace we're running in.
-
-        Returns:
-            str: A string containing the name of the current Kubernetes namespace.
-        """
-        with open("/var/run/secrets/kubernetes.io/serviceaccount/namespace", "r") as f:
-            return f.read().strip()
diff --git a/lib/charms/observability_libs/v1/kubernetes_service_patch.py b/lib/charms/observability_libs/v1/kubernetes_service_patch.py
deleted file mode 100644
index 56cca01..0000000
--- a/lib/charms/observability_libs/v1/kubernetes_service_patch.py
+++ /dev/null
@@ -1,342 +0,0 @@
-# Copyright 2021 Canonical Ltd.
-# See LICENSE file for licensing details.
-
-"""# KubernetesServicePatch Library.
-
-This library is designed to enable developers to more simply patch the Kubernetes Service created
-by Juju during the deployment of a sidecar charm. When sidecar charms are deployed, Juju creates a
-service named after the application in the namespace (named after the Juju model). This service by
-default contains a "placeholder" port, which is 65536/TCP.
-
-When modifying the default set of resources managed by Juju, one must consider the lifecycle of the
-charm. In this case, any modifications to the default service (created during deployment), will be
-overwritten during a charm upgrade.
-
-When initialised, this library binds a handler to the parent charm's `install` and `upgrade_charm`
-events which applies the patch to the cluster. This should ensure that the service ports are
-correct throughout the charm's life.
-
-The constructor simply takes a reference to the parent charm, and a list of
-[`lightkube`](https://github.com/gtsystem/lightkube) ServicePorts that each define a port for the
-service. For information regarding the `lightkube` `ServicePort` model, please visit the
-`lightkube` [docs](https://gtsystem.github.io/lightkube-models/1.23/models/core_v1/#serviceport).
-
-Optionally, a name of the service (in case service name needs to be patched as well), labels,
-selectors, and annotations can be provided as keyword arguments.
-
-## Getting Started
-
-To get started using the library, you just need to fetch the library using `charmcraft`. **Note
-that you also need to add `lightkube` and `lightkube-models` to your charm's `requirements.txt`.**
-
-```shell
-cd some-charm
-charmcraft fetch-lib charms.observability_libs.v1.kubernetes_service_patch
-cat << EOF >> requirements.txt
-lightkube
-lightkube-models
-EOF
-```
-
-Then, to initialise the library:
-
-For `ClusterIP` services:
-
-```python
-# ...
-from charms.observability_libs.v1.kubernetes_service_patch import KubernetesServicePatch
-from lightkube.models.core_v1 import ServicePort
-
-class SomeCharm(CharmBase):
-  def __init__(self, *args):
-    # ...
-    port = ServicePort(443, name=f"{self.app.name}")
-    self.service_patcher = KubernetesServicePatch(self, [port])
-    # ...
-```
-
-For `LoadBalancer`/`NodePort` services:
-
-```python
-# ...
-from charms.observability_libs.v1.kubernetes_service_patch import KubernetesServicePatch
-from lightkube.models.core_v1 import ServicePort
-
-class SomeCharm(CharmBase):
-  def __init__(self, *args):
-    # ...
-    port = ServicePort(443, name=f"{self.app.name}", targetPort=443, nodePort=30666)
-    self.service_patcher = KubernetesServicePatch(
-        self, [port], "LoadBalancer"
-    )
-    # ...
-```
-
-Port protocols can also be specified. Valid protocols are `"TCP"`, `"UDP"`, and `"SCTP"`
-
-```python
-# ...
-from charms.observability_libs.v1.kubernetes_service_patch import KubernetesServicePatch
-from lightkube.models.core_v1 import ServicePort
-
-class SomeCharm(CharmBase):
-  def __init__(self, *args):
-    # ...
-    tcp = ServicePort(443, name=f"{self.app.name}-tcp", protocol="TCP")
-    udp = ServicePort(443, name=f"{self.app.name}-udp", protocol="UDP")
-    sctp = ServicePort(443, name=f"{self.app.name}-sctp", protocol="SCTP")
-    self.service_patcher = KubernetesServicePatch(self, [tcp, udp, sctp])
-    # ...
-```
-
-Bound with custom events by providing `refresh_event` argument:
-For example, you would like to have a configurable port in your charm and want to apply
-service patch every time charm config is changed.
-
-```python
-from charms.observability_libs.v1.kubernetes_service_patch import KubernetesServicePatch
-from lightkube.models.core_v1 import ServicePort
-
-class SomeCharm(CharmBase):
-  def __init__(self, *args):
-    # ...
-    port = ServicePort(int(self.config["charm-config-port"]), name=f"{self.app.name}")
-    self.service_patcher = KubernetesServicePatch(
-        self,
-        [port],
-        refresh_event=self.on.config_changed
-    )
-    # ...
-```
-
-Additionally, you may wish to use mocks in your charm's unit testing to ensure that the library
-does not try to make any API calls, or open any files during testing that are unlikely to be
-present, and could break your tests. The easiest way to do this is during your test `setUp`:
-
-```python
-# ...
-
-@patch("charm.KubernetesServicePatch", lambda x, y: None)
-def setUp(self, *unused):
-    self.harness = Harness(SomeCharm)
-    # ...
-```
-"""
-
-import logging
-from types import MethodType
-from typing import List, Literal, Optional, Union
-
-from lightkube import ApiError, Client
-from lightkube.core import exceptions
-from lightkube.models.core_v1 import ServicePort, ServiceSpec
-from lightkube.models.meta_v1 import ObjectMeta
-from lightkube.resources.core_v1 import Service
-from lightkube.types import PatchType
-from ops.charm import CharmBase
-from ops.framework import BoundEvent, Object
-
-logger = logging.getLogger(__name__)
-
-# The unique Charmhub library identifier, never change it
-LIBID = "0042f86d0a874435adef581806cddbbb"
-
-# Increment this major API version when introducing breaking changes
-LIBAPI = 1
-
-# Increment this PATCH version before using `charmcraft publish-lib` or reset
-# to 0 if you are raising the major API version
-LIBPATCH = 6
-
-ServiceType = Literal["ClusterIP", "LoadBalancer"]
-
-
-class KubernetesServicePatch(Object):
-    """A utility for patching the Kubernetes service set up by Juju."""
-
-    def __init__(
-        self,
-        charm: CharmBase,
-        ports: List[ServicePort],
-        service_name: Optional[str] = None,
-        service_type: ServiceType = "ClusterIP",
-        additional_labels: Optional[dict] = None,
-        additional_selectors: Optional[dict] = None,
-        additional_annotations: Optional[dict] = None,
-        *,
-        refresh_event: Optional[Union[BoundEvent, List[BoundEvent]]] = None,
-    ):
-        """Constructor for KubernetesServicePatch.
-
-        Args:
-            charm: the charm that is instantiating the library.
-            ports: a list of ServicePorts
-            service_name: allows setting custom name to the patched service. If none given,
-                application name will be used.
-            service_type: desired type of K8s service. Default value is in line with ServiceSpec's
-                default value.
-            additional_labels: Labels to be added to the kubernetes service (by default only
-                "app.kubernetes.io/name" is set to the service name)
-            additional_selectors: Selectors to be added to the kubernetes service (by default only
-                "app.kubernetes.io/name" is set to the service name)
-            additional_annotations: Annotations to be added to the kubernetes service.
-            refresh_event: an optional bound event or list of bound events which
-                will be observed to re-apply the patch (e.g. on port change).
-                The `install` and `upgrade-charm` events would be observed regardless.
-        """
-        super().__init__(charm, "kubernetes-service-patch")
-        self.charm = charm
-        self.service_name = service_name if service_name else self._app
-        self.service = self._service_object(
-            ports,
-            service_name,
-            service_type,
-            additional_labels,
-            additional_selectors,
-            additional_annotations,
-        )
-
-        # Make mypy type checking happy that self._patch is a method
-        assert isinstance(self._patch, MethodType)
-        # Ensure this patch is applied during the 'install' and 'upgrade-charm' events
-        self.framework.observe(charm.on.install, self._patch)
-        self.framework.observe(charm.on.upgrade_charm, self._patch)
-        self.framework.observe(charm.on.update_status, self._patch)
-
-        # apply user defined events
-        if refresh_event:
-            if not isinstance(refresh_event, list):
-                refresh_event = [refresh_event]
-
-            for evt in refresh_event:
-                self.framework.observe(evt, self._patch)
-
-    def _service_object(
-        self,
-        ports: List[ServicePort],
-        service_name: Optional[str] = None,
-        service_type: ServiceType = "ClusterIP",
-        additional_labels: Optional[dict] = None,
-        additional_selectors: Optional[dict] = None,
-        additional_annotations: Optional[dict] = None,
-    ) -> Service:
-        """Creates a valid Service representation.
-
-        Args:
-            ports: a list of ServicePorts
-            service_name: allows setting custom name to the patched service. If none given,
-                application name will be used.
-            service_type: desired type of K8s service. Default value is in line with ServiceSpec's
-                default value.
-            additional_labels: Labels to be added to the kubernetes service (by default only
-                "app.kubernetes.io/name" is set to the service name)
-            additional_selectors: Selectors to be added to the kubernetes service (by default only
-                "app.kubernetes.io/name" is set to the service name)
-            additional_annotations: Annotations to be added to the kubernetes service.
-
-        Returns:
-            Service: A valid representation of a Kubernetes Service with the correct ports.
-        """
-        if not service_name:
-            service_name = self._app
-        labels = {"app.kubernetes.io/name": self._app}
-        if additional_labels:
-            labels.update(additional_labels)
-        selector = {"app.kubernetes.io/name": self._app}
-        if additional_selectors:
-            selector.update(additional_selectors)
-        return Service(
-            apiVersion="v1",
-            kind="Service",
-            metadata=ObjectMeta(
-                namespace=self._namespace,
-                name=service_name,
-                labels=labels,
-                annotations=additional_annotations,  # type: ignore[arg-type]
-            ),
-            spec=ServiceSpec(
-                selector=selector,
-                ports=ports,
-                type=service_type,
-            ),
-        )
-
-    def _patch(self, _) -> None:
-        """Patch the Kubernetes service created by Juju to map the correct port.
-
-        Raises:
-            PatchFailed: if patching fails due to lack of permissions, or otherwise.
-        """
-        try:
-            client = Client()
-        except exceptions.ConfigError as e:
-            logger.warning("Error creating k8s client: %s", e)
-            return
-
-        try:
-            if self._is_patched(client):
-                return
-            if self.service_name != self._app:
-                self._delete_and_create_service(client)
-            client.patch(Service, self.service_name, self.service, patch_type=PatchType.MERGE)
-        except ApiError as e:
-            if e.status.code == 403:
-                logger.error("Kubernetes service patch failed: `juju trust` this application.")
-            else:
-                logger.error("Kubernetes service patch failed: %s", str(e))
-        else:
-            logger.info("Kubernetes service '%s' patched successfully", self._app)
-
-    def _delete_and_create_service(self, client: Client):
-        service = client.get(Service, self._app, namespace=self._namespace)
-        service.metadata.name = self.service_name  # type: ignore[attr-defined]
-        service.metadata.resourceVersion = service.metadata.uid = None  # type: ignore[attr-defined]   # noqa: E501
-        client.delete(Service, self._app, namespace=self._namespace)
-        client.create(service)
-
-    def is_patched(self) -> bool:
-        """Reports if the service patch has been applied.
-
-        Returns:
-            bool: A boolean indicating if the service patch has been applied.
-        """
-        client = Client()
-        return self._is_patched(client)
-
-    def _is_patched(self, client: Client) -> bool:
-        # Get the relevant service from the cluster
-        try:
-            service = client.get(Service, name=self.service_name, namespace=self._namespace)
-        except ApiError as e:
-            if e.status.code == 404 and self.service_name != self._app:
-                return False
-            else:
-                logger.error("Kubernetes service get failed: %s", str(e))
-                raise
-
-        # Construct a list of expected ports, should the patch be applied
-        expected_ports = [(p.port, p.targetPort) for p in self.service.spec.ports]
-        # Construct a list in the same manner, using the fetched service
-        fetched_ports = [
-            (p.port, p.targetPort) for p in service.spec.ports  # type: ignore[attr-defined]
-        ]  # noqa: E501
-        return expected_ports == fetched_ports
-
-    @property
-    def _app(self) -> str:
-        """Name of the current Juju application.
-
-        Returns:
-            str: A string containing the name of the current Juju application.
-        """
-        return self.charm.app.name
-
-    @property
-    def _namespace(self) -> str:
-        """The Kubernetes namespace we're running in.
-
-        Returns:
-            str: A string containing the name of the current Kubernetes namespace.
-        """
-        with open("/var/run/secrets/kubernetes.io/serviceaccount/namespace", "r") as f:
-            return f.read().strip()
diff --git a/lib/charms/operator_libs_linux/v2/snap.py b/lib/charms/operator_libs_linux/v2/snap.py
deleted file mode 100644
index 37cbe3e..0000000
--- a/lib/charms/operator_libs_linux/v2/snap.py
+++ /dev/null
@@ -1,1099 +0,0 @@
-# Copyright 2021 Canonical Ltd.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""Representations of the system's Snaps, and abstractions around managing them.
-
-The `snap` module provides convenience methods for listing, installing, refreshing, and removing
-Snap packages, in addition to setting and getting configuration options for them.
-
-In the `snap` module, `SnapCache` creates a dict-like mapping of `Snap` objects at when
-instantiated. Installed snaps are fully populated, and available snaps are lazily-loaded upon
-request. This module relies on an installed and running `snapd` daemon to perform operations over
-the `snapd` HTTP API.
-
-`SnapCache` objects can be used to install or modify Snap packages by name in a manner similar to
-using the `snap` command from the commandline.
-
-An example of adding Juju to the system with `SnapCache` and setting a config value:
-
-```python
-try:
-    cache = snap.SnapCache()
-    juju = cache["juju"]
-
-    if not juju.present:
-        juju.ensure(snap.SnapState.Latest, channel="beta")
-        juju.set({"some.key": "value", "some.key2": "value2"})
-except snap.SnapError as e:
-    logger.error("An exception occurred when installing charmcraft. Reason: %s", e.message)
-```
-
-In addition, the `snap` module provides "bare" methods which can act on Snap packages as
-simple function calls. :meth:`add`, :meth:`remove`, and :meth:`ensure` are provided, as
-well as :meth:`add_local` for installing directly from a local `.snap` file. These return
-`Snap` objects.
-
-As an example of installing several Snaps and checking details:
-
-```python
-try:
-    nextcloud, charmcraft = snap.add(["nextcloud", "charmcraft"])
-    if nextcloud.get("mode") != "production":
-        nextcloud.set({"mode": "production"})
-except snap.SnapError as e:
-    logger.error("An exception occurred when installing snaps. Reason: %s" % e.message)
-```
-"""
-
-import http.client
-import json
-import logging
-import os
-import re
-import socket
-import subprocess
-import sys
-import urllib.error
-import urllib.parse
-import urllib.request
-from collections.abc import Mapping
-from datetime import datetime, timedelta, timezone
-from enum import Enum
-from subprocess import CalledProcessError, CompletedProcess
-from typing import Any, Dict, Iterable, List, Optional, Union
-
-logger = logging.getLogger(__name__)
-
-# The unique Charmhub library identifier, never change it
-LIBID = "05394e5893f94f2d90feb7cbe6b633cd"
-
-# Increment this major API version when introducing breaking changes
-LIBAPI = 2
-
-# Increment this PATCH version before using `charmcraft publish-lib` or reset
-# to 0 if you are raising the major API version
-LIBPATCH = 2
-
-
-# Regex to locate 7-bit C1 ANSI sequences
-ansi_filter = re.compile(r"\x1B(?:[@-Z\\-_]|\[[0-?]*[ -/]*[@-~])")
-
-
-def _cache_init(func):
-    def inner(*args, **kwargs):
-        if _Cache.cache is None:
-            _Cache.cache = SnapCache()
-        return func(*args, **kwargs)
-
-    return inner
-
-
-# recursive hints seems to error out pytest
-JSONType = Union[Dict[str, Any], List[Any], str, int, float]
-
-
-class SnapService:
-    """Data wrapper for snap services."""
-
-    def __init__(
-        self,
-        daemon: Optional[str] = None,
-        daemon_scope: Optional[str] = None,
-        enabled: bool = False,
-        active: bool = False,
-        activators: List[str] = [],
-        **kwargs,
-    ):
-        self.daemon = daemon
-        self.daemon_scope = kwargs.get("daemon-scope", None) or daemon_scope
-        self.enabled = enabled
-        self.active = active
-        self.activators = activators
-
-    def as_dict(self) -> Dict:
-        """Return instance representation as dict."""
-        return {
-            "daemon": self.daemon,
-            "daemon_scope": self.daemon_scope,
-            "enabled": self.enabled,
-            "active": self.active,
-            "activators": self.activators,
-        }
-
-
-class MetaCache(type):
-    """MetaCache class used for initialising the snap cache."""
-
-    @property
-    def cache(cls) -> "SnapCache":
-        """Property for returning the snap cache."""
-        return cls._cache
-
-    @cache.setter
-    def cache(cls, cache: "SnapCache") -> None:
-        """Setter for the snap cache."""
-        cls._cache = cache
-
-    def __getitem__(cls, name) -> "Snap":
-        """Snap cache getter."""
-        return cls._cache[name]
-
-
-class _Cache(object, metaclass=MetaCache):
-    _cache = None
-
-
-class Error(Exception):
-    """Base class of most errors raised by this library."""
-
-    def __repr__(self):
-        """Represent the Error class."""
-        return "<{}.{} {}>".format(type(self).__module__, type(self).__name__, self.args)
-
-    @property
-    def name(self):
-        """Return a string representation of the model plus class."""
-        return "<{}.{}>".format(type(self).__module__, type(self).__name__)
-
-    @property
-    def message(self):
-        """Return the message passed as an argument."""
-        return self.args[0]
-
-
-class SnapAPIError(Error):
-    """Raised when an HTTP API error occurs talking to the Snapd server."""
-
-    def __init__(self, body: Dict, code: int, status: str, message: str):
-        super().__init__(message)  # Makes str(e) return message
-        self.body = body
-        self.code = code
-        self.status = status
-        self._message = message
-
-    def __repr__(self):
-        """Represent the SnapAPIError class."""
-        return "APIError({!r}, {!r}, {!r}, {!r})".format(
-            self.body, self.code, self.status, self._message
-        )
-
-
-class SnapState(Enum):
-    """The state of a snap on the system or in the cache."""
-
-    Present = "present"
-    Absent = "absent"
-    Latest = "latest"
-    Available = "available"
-
-
-class SnapError(Error):
-    """Raised when there's an error running snap control commands."""
-
-
-class SnapNotFoundError(Error):
-    """Raised when a requested snap is not known to the system."""
-
-
-class Snap(object):
-    """Represents a snap package and its properties.
-
-    `Snap` exposes the following properties about a snap:
-      - name: the name of the snap
-      - state: a `SnapState` representation of its install status
-      - channel: "stable", "candidate", "beta", and "edge" are common
-      - revision: a string representing the snap's revision
-      - confinement: "classic" or "strict"
-    """
-
-    def __init__(
-        self,
-        name,
-        state: SnapState,
-        channel: str,
-        revision: str,
-        confinement: str,
-        apps: Optional[List[Dict[str, str]]] = None,
-        cohort: Optional[str] = "",
-    ) -> None:
-        self._name = name
-        self._state = state
-        self._channel = channel
-        self._revision = revision
-        self._confinement = confinement
-        self._cohort = cohort
-        self._apps = apps or []
-        self._snap_client = SnapClient()
-
-    def __eq__(self, other) -> bool:
-        """Equality for comparison."""
-        return isinstance(other, self.__class__) and (
-            self._name,
-            self._revision,
-        ) == (other._name, other._revision)
-
-    def __hash__(self):
-        """Calculate a hash for this snap."""
-        return hash((self._name, self._revision))
-
-    def __repr__(self):
-        """Represent the object such that it can be reconstructed."""
-        return "<{}.{}: {}>".format(self.__module__, self.__class__.__name__, self.__dict__)
-
-    def __str__(self):
-        """Represent the snap object as a string."""
-        return "<{}: {}-{}.{} -- {}>".format(
-            self.__class__.__name__,
-            self._name,
-            self._revision,
-            self._channel,
-            str(self._state),
-        )
-
-    def _snap(self, command: str, optargs: Optional[Iterable[str]] = None) -> str:
-        """Perform a snap operation.
-
-        Args:
-          command: the snap command to execute
-          optargs: an (optional) list of additional arguments to pass,
-            commonly confinement or channel
-
-        Raises:
-          SnapError if there is a problem encountered
-        """
-        optargs = optargs or []
-        args = ["snap", command, self._name, *optargs]
-        try:
-            return subprocess.check_output(args, universal_newlines=True)
-        except CalledProcessError as e:
-            raise SnapError(
-                "Snap: {!r}; command {!r} failed with output = {!r}".format(
-                    self._name, args, e.output
-                )
-            )
-
-    def _snap_daemons(
-        self,
-        command: List[str],
-        services: Optional[List[str]] = None,
-    ) -> CompletedProcess:
-        """Perform snap app commands.
-
-        Args:
-          command: the snap command to execute
-          services: the snap service to execute command on
-
-        Raises:
-          SnapError if there is a problem encountered
-        """
-        if services:
-            # an attempt to keep the command constrained to the snap instance's services
-            services = ["{}.{}".format(self._name, service) for service in services]
-        else:
-            services = [self._name]
-
-        args = ["snap", *command, *services]
-
-        try:
-            return subprocess.run(args, universal_newlines=True, check=True, capture_output=True)
-        except CalledProcessError as e:
-            raise SnapError("Could not {} for snap [{}]: {}".format(args, self._name, e.stderr))
-
-    def get(self, key: Optional[str], *, typed: bool = False) -> Any:
-        """Fetch snap configuration values.
-
-        Args:
-            key: the key to retrieve. Default to retrieve all values for typed=True.
-            typed: set to True to retrieve typed values (set with typed=True).
-                Default is to return a string.
-        """
-        if typed:
-            config = json.loads(self._snap("get", ["-d", key]))
-            if key:
-                return config.get(key)
-            return config
-
-        if not key:
-            raise TypeError("Key must be provided when typed=False")
-
-        return self._snap("get", [key]).strip()
-
-    def set(self, config: Dict[str, Any], *, typed: bool = False) -> str:
-        """Set a snap configuration value.
-
-        Args:
-           config: a dictionary containing keys and values specifying the config to set.
-           typed: set to True to convert all values in the config into typed values while
-                configuring the snap (set with typed=True). Default is not to convert.
-        """
-        if typed:
-            kv = [f"{key}={json.dumps(val)}" for key, val in config.items()]
-            return self._snap("set", ["-t"] + kv)
-
-        return self._snap("set", [f"{key}={val}" for key, val in config.items()])
-
-    def unset(self, key) -> str:
-        """Unset a snap configuration value.
-
-        Args:
-            key: the key to unset
-        """
-        return self._snap("unset", [key])
-
-    def start(self, services: Optional[List[str]] = None, enable: Optional[bool] = False) -> None:
-        """Start a snap's services.
-
-        Args:
-            services (list): (optional) list of individual snap services to start (otherwise all)
-            enable (bool): (optional) flag to enable snap services on start. Default `false`
-        """
-        args = ["start", "--enable"] if enable else ["start"]
-        self._snap_daemons(args, services)
-
-    def stop(self, services: Optional[List[str]] = None, disable: Optional[bool] = False) -> None:
-        """Stop a snap's services.
-
-        Args:
-            services (list): (optional) list of individual snap services to stop (otherwise all)
-            disable (bool): (optional) flag to disable snap services on stop. Default `False`
-        """
-        args = ["stop", "--disable"] if disable else ["stop"]
-        self._snap_daemons(args, services)
-
-    def logs(self, services: Optional[List[str]] = None, num_lines: Optional[int] = 10) -> str:
-        """Fetch a snap services' logs.
-
-        Args:
-            services (list): (optional) list of individual snap services to show logs from
-                (otherwise all)
-            num_lines (int): (optional) integer number of log lines to return. Default `10`
-        """
-        args = ["logs", "-n={}".format(num_lines)] if num_lines else ["logs"]
-        return self._snap_daemons(args, services).stdout
-
-    def connect(
-        self, plug: str, service: Optional[str] = None, slot: Optional[str] = None
-    ) -> None:
-        """Connect a plug to a slot.
-
-        Args:
-            plug (str): the plug to connect
-            service (str): (optional) the snap service name to plug into
-            slot (str): (optional) the snap service slot to plug in to
-
-        Raises:
-            SnapError if there is a problem encountered
-        """
-        command = ["connect", "{}:{}".format(self._name, plug)]
-
-        if service and slot:
-            command = command + ["{}:{}".format(service, slot)]
-        elif slot:
-            command = command + [slot]
-
-        args = ["snap", *command]
-        try:
-            subprocess.run(args, universal_newlines=True, check=True, capture_output=True)
-        except CalledProcessError as e:
-            raise SnapError("Could not {} for snap [{}]: {}".format(args, self._name, e.stderr))
-
-    def hold(self, duration: Optional[timedelta] = None) -> None:
-        """Add a refresh hold to a snap.
-
-        Args:
-            duration: duration for the hold, or None (the default) to hold this snap indefinitely.
-        """
-        hold_str = "forever"
-        if duration is not None:
-            seconds = round(duration.total_seconds())
-            hold_str = f"{seconds}s"
-        self._snap("refresh", [f"--hold={hold_str}"])
-
-    def unhold(self) -> None:
-        """Remove the refresh hold of a snap."""
-        self._snap("refresh", ["--unhold"])
-
-    def alias(self, application: str, alias: Optional[str] = None) -> None:
-        """Create an alias for a given application.
-
-        Args:
-            application: application to get an alias.
-            alias: (optional) name of the alias; if not provided, the application name is used.
-        """
-        if alias is None:
-            alias = application
-        args = ["snap", "alias", f"{self.name}.{application}", alias]
-        try:
-            subprocess.check_output(args, universal_newlines=True)
-        except CalledProcessError as e:
-            raise SnapError(
-                "Snap: {!r}; command {!r} failed with output = {!r}".format(
-                    self._name, args, e.output
-                )
-            )
-
-    def restart(
-        self, services: Optional[List[str]] = None, reload: Optional[bool] = False
-    ) -> None:
-        """Restarts a snap's services.
-
-        Args:
-            services (list): (optional) list of individual snap services to restart.
-                (otherwise all)
-            reload (bool): (optional) flag to use the service reload command, if available.
-                Default `False`
-        """
-        args = ["restart", "--reload"] if reload else ["restart"]
-        self._snap_daemons(args, services)
-
-    def _install(
-        self,
-        channel: Optional[str] = "",
-        cohort: Optional[str] = "",
-        revision: Optional[str] = None,
-    ) -> None:
-        """Add a snap to the system.
-
-        Args:
-          channel: the channel to install from
-          cohort: optional, the key of a cohort that this snap belongs to
-          revision: optional, the revision of the snap to install
-        """
-        cohort = cohort or self._cohort
-
-        args = []
-        if self.confinement == "classic":
-            args.append("--classic")
-        if channel:
-            args.append('--channel="{}"'.format(channel))
-        if revision:
-            args.append('--revision="{}"'.format(revision))
-        if cohort:
-            args.append('--cohort="{}"'.format(cohort))
-
-        self._snap("install", args)
-
-    def _refresh(
-        self,
-        channel: Optional[str] = "",
-        cohort: Optional[str] = "",
-        revision: Optional[str] = None,
-        leave_cohort: Optional[bool] = False,
-    ) -> None:
-        """Refresh a snap.
-
-        Args:
-          channel: the channel to install from
-          cohort: optionally, specify a cohort.
-          revision: optionally, specify the revision of the snap to refresh
-          leave_cohort: leave the current cohort.
-        """
-        args = []
-        if channel:
-            args.append('--channel="{}"'.format(channel))
-
-        if revision:
-            args.append('--revision="{}"'.format(revision))
-
-        if not cohort:
-            cohort = self._cohort
-
-        if leave_cohort:
-            self._cohort = ""
-            args.append("--leave-cohort")
-        elif cohort:
-            args.append('--cohort="{}"'.format(cohort))
-
-        self._snap("refresh", args)
-
-    def _remove(self) -> str:
-        """Remove a snap from the system."""
-        return self._snap("remove")
-
-    @property
-    def name(self) -> str:
-        """Returns the name of the snap."""
-        return self._name
-
-    def ensure(
-        self,
-        state: SnapState,
-        classic: Optional[bool] = False,
-        channel: Optional[str] = "",
-        cohort: Optional[str] = "",
-        revision: Optional[str] = None,
-    ):
-        """Ensure that a snap is in a given state.
-
-        Args:
-          state: a `SnapState` to reconcile to.
-          classic: an (Optional) boolean indicating whether classic confinement should be used
-          channel: the channel to install from
-          cohort: optional. Specify the key of a snap cohort.
-          revision: optional. the revision of the snap to install/refresh
-
-        While both channel and revision could be specified, the underlying snap install/refresh
-        command will determine which one takes precedence (revision at this time)
-
-        Raises:
-          SnapError if an error is encountered
-        """
-        self._confinement = "classic" if classic or self._confinement == "classic" else ""
-
-        if state not in (SnapState.Present, SnapState.Latest):
-            # We are attempting to remove this snap.
-            if self._state in (SnapState.Present, SnapState.Latest):
-                # The snap is installed, so we run _remove.
-                self._remove()
-            else:
-                # The snap is not installed -- no need to do anything.
-                pass
-        else:
-            # We are installing or refreshing a snap.
-            if self._state not in (SnapState.Present, SnapState.Latest):
-                # The snap is not installed, so we install it.
-                self._install(channel, cohort, revision)
-            else:
-                # The snap is installed, but we are changing it (e.g., switching channels).
-                self._refresh(channel, cohort, revision)
-
-        self._update_snap_apps()
-        self._state = state
-
-    def _update_snap_apps(self) -> None:
-        """Update a snap's apps after snap changes state."""
-        try:
-            self._apps = self._snap_client.get_installed_snap_apps(self._name)
-        except SnapAPIError:
-            logger.debug("Unable to retrieve snap apps for {}".format(self._name))
-            self._apps = []
-
-    @property
-    def present(self) -> bool:
-        """Report whether or not a snap is present."""
-        return self._state in (SnapState.Present, SnapState.Latest)
-
-    @property
-    def latest(self) -> bool:
-        """Report whether the snap is the most recent version."""
-        return self._state is SnapState.Latest
-
-    @property
-    def state(self) -> SnapState:
-        """Report the current snap state."""
-        return self._state
-
-    @state.setter
-    def state(self, state: SnapState) -> None:
-        """Set the snap state to a given value.
-
-        Args:
-          state: a `SnapState` to reconcile the snap to.
-
-        Raises:
-          SnapError if an error is encountered
-        """
-        if self._state is not state:
-            self.ensure(state)
-        self._state = state
-
-    @property
-    def revision(self) -> str:
-        """Returns the revision for a snap."""
-        return self._revision
-
-    @property
-    def channel(self) -> str:
-        """Returns the channel for a snap."""
-        return self._channel
-
-    @property
-    def confinement(self) -> str:
-        """Returns the confinement for a snap."""
-        return self._confinement
-
-    @property
-    def apps(self) -> List:
-        """Returns (if any) the installed apps of the snap."""
-        self._update_snap_apps()
-        return self._apps
-
-    @property
-    def services(self) -> Dict:
-        """Returns (if any) the installed services of the snap."""
-        self._update_snap_apps()
-        services = {}
-        for app in self._apps:
-            if "daemon" in app:
-                services[app["name"]] = SnapService(**app).as_dict()
-
-        return services
-
-    @property
-    def held(self) -> bool:
-        """Report whether the snap has a hold."""
-        info = self._snap("info")
-        return "hold:" in info
-
-
-class _UnixSocketConnection(http.client.HTTPConnection):
-    """Implementation of HTTPConnection that connects to a named Unix socket."""
-
-    def __init__(self, host, timeout=None, socket_path=None):
-        if timeout is None:
-            super().__init__(host)
-        else:
-            super().__init__(host, timeout=timeout)
-        self.socket_path = socket_path
-
-    def connect(self):
-        """Override connect to use Unix socket (instead of TCP socket)."""
-        if not hasattr(socket, "AF_UNIX"):
-            raise NotImplementedError("Unix sockets not supported on {}".format(sys.platform))
-        self.sock = socket.socket(socket.AF_UNIX, socket.SOCK_STREAM)
-        self.sock.connect(self.socket_path)
-        if self.timeout is not None:
-            self.sock.settimeout(self.timeout)
-
-
-class _UnixSocketHandler(urllib.request.AbstractHTTPHandler):
-    """Implementation of HTTPHandler that uses a named Unix socket."""
-
-    def __init__(self, socket_path: str):
-        super().__init__()
-        self.socket_path = socket_path
-
-    def http_open(self, req) -> http.client.HTTPResponse:
-        """Override http_open to use a Unix socket connection (instead of TCP)."""
-        return self.do_open(_UnixSocketConnection, req, socket_path=self.socket_path)
-
-
-class SnapClient:
-    """Snapd API client to talk to HTTP over UNIX sockets.
-
-    In order to avoid shelling out and/or involving sudo in calling the snapd API,
-    use a wrapper based on the Pebble Client, trimmed down to only the utility methods
-    needed for talking to snapd.
-    """
-
-    def __init__(
-        self,
-        socket_path: str = "/run/snapd.socket",
-        opener: Optional[urllib.request.OpenerDirector] = None,
-        base_url: str = "http://localhost/v2/",
-        timeout: float = 5.0,
-    ):
-        """Initialize a client instance.
-
-        Args:
-            socket_path: a path to the socket on the filesystem. Defaults to /run/snap/snapd.socket
-            opener: specifies an opener for unix socket, if unspecified a default is used
-            base_url: base url for making requests to the snap client. Defaults to
-                http://localhost/v2/
-            timeout: timeout in seconds to use when making requests to the API. Default is 5.0s.
-        """
-        if opener is None:
-            opener = self._get_default_opener(socket_path)
-        self.opener = opener
-        self.base_url = base_url
-        self.timeout = timeout
-
-    @classmethod
-    def _get_default_opener(cls, socket_path):
-        """Build the default opener to use for requests (HTTP over Unix socket)."""
-        opener = urllib.request.OpenerDirector()
-        opener.add_handler(_UnixSocketHandler(socket_path))
-        opener.add_handler(urllib.request.HTTPDefaultErrorHandler())
-        opener.add_handler(urllib.request.HTTPRedirectHandler())
-        opener.add_handler(urllib.request.HTTPErrorProcessor())
-        return opener
-
-    def _request(
-        self,
-        method: str,
-        path: str,
-        query: Dict = None,
-        body: Dict = None,
-    ) -> JSONType:
-        """Make a JSON request to the Snapd server with the given HTTP method and path.
-
-        If query dict is provided, it is encoded and appended as a query string
-        to the URL. If body dict is provided, it is serialied as JSON and used
-        as the HTTP body (with Content-Type: "application/json"). The resulting
-        body is decoded from JSON.
-        """
-        headers = {"Accept": "application/json"}
-        data = None
-        if body is not None:
-            data = json.dumps(body).encode("utf-8")
-            headers["Content-Type"] = "application/json"
-
-        response = self._request_raw(method, path, query, headers, data)
-        return json.loads(response.read().decode())["result"]
-
-    def _request_raw(
-        self,
-        method: str,
-        path: str,
-        query: Dict = None,
-        headers: Dict = None,
-        data: bytes = None,
-    ) -> http.client.HTTPResponse:
-        """Make a request to the Snapd server; return the raw HTTPResponse object."""
-        url = self.base_url + path
-        if query:
-            url = url + "?" + urllib.parse.urlencode(query)
-
-        if headers is None:
-            headers = {}
-        request = urllib.request.Request(url, method=method, data=data, headers=headers)
-
-        try:
-            response = self.opener.open(request, timeout=self.timeout)
-        except urllib.error.HTTPError as e:
-            code = e.code
-            status = e.reason
-            message = ""
-            try:
-                body = json.loads(e.read().decode())["result"]
-            except (IOError, ValueError, KeyError) as e2:
-                # Will only happen on read error or if Pebble sends invalid JSON.
-                body = {}
-                message = "{} - {}".format(type(e2).__name__, e2)
-            raise SnapAPIError(body, code, status, message)
-        except urllib.error.URLError as e:
-            raise SnapAPIError({}, 500, "Not found", e.reason)
-        return response
-
-    def get_installed_snaps(self) -> Dict:
-        """Get information about currently installed snaps."""
-        return self._request("GET", "snaps")
-
-    def get_snap_information(self, name: str) -> Dict:
-        """Query the snap server for information about single snap."""
-        return self._request("GET", "find", {"name": name})[0]
-
-    def get_installed_snap_apps(self, name: str) -> List:
-        """Query the snap server for apps belonging to a named, currently installed snap."""
-        return self._request("GET", "apps", {"names": name, "select": "service"})
-
-
-class SnapCache(Mapping):
-    """An abstraction to represent installed/available packages.
-
-    When instantiated, `SnapCache` iterates through the list of installed
-    snaps using the `snapd` HTTP API, and a list of available snaps by reading
-    the filesystem to populate the cache. Information about available snaps is lazily-loaded
-    from the `snapd` API when requested.
-    """
-
-    def __init__(self):
-        if not self.snapd_installed:
-            raise SnapError("snapd is not installed or not in /usr/bin") from None
-        self._snap_client = SnapClient()
-        self._snap_map = {}
-        if self.snapd_installed:
-            self._load_available_snaps()
-            self._load_installed_snaps()
-
-    def __contains__(self, key: str) -> bool:
-        """Check if a given snap is in the cache."""
-        return key in self._snap_map
-
-    def __len__(self) -> int:
-        """Report number of items in the snap cache."""
-        return len(self._snap_map)
-
-    def __iter__(self) -> Iterable["Snap"]:
-        """Provide iterator for the snap cache."""
-        return iter(self._snap_map.values())
-
-    def __getitem__(self, snap_name: str) -> Snap:
-        """Return either the installed version or latest version for a given snap."""
-        snap = self._snap_map.get(snap_name, None)
-        if snap is None:
-            # The snapd cache file may not have existed when _snap_map was
-            # populated.  This is normal.
-            try:
-                self._snap_map[snap_name] = self._load_info(snap_name)
-            except SnapAPIError:
-                raise SnapNotFoundError("Snap '{}' not found!".format(snap_name))
-
-        return self._snap_map[snap_name]
-
-    @property
-    def snapd_installed(self) -> bool:
-        """Check whether snapd has been installled on the system."""
-        return os.path.isfile("/usr/bin/snap")
-
-    def _load_available_snaps(self) -> None:
-        """Load the list of available snaps from disk.
-
-        Leave them empty and lazily load later if asked for.
-        """
-        if not os.path.isfile("/var/cache/snapd/names"):
-            # The snap catalog may not be populated yet; this is normal.
-            # snapd updates the cache infrequently and the cache file may not
-            # currently exist.
-            return
-
-        with open("/var/cache/snapd/names", "r") as f:
-            for line in f:
-                if line.strip():
-                    self._snap_map[line.strip()] = None
-
-    def _load_installed_snaps(self) -> None:
-        """Load the installed snaps into the dict."""
-        installed = self._snap_client.get_installed_snaps()
-
-        for i in installed:
-            snap = Snap(
-                name=i["name"],
-                state=SnapState.Latest,
-                channel=i["channel"],
-                revision=i["revision"],
-                confinement=i["confinement"],
-                apps=i.get("apps", None),
-            )
-            self._snap_map[snap.name] = snap
-
-    def _load_info(self, name) -> Snap:
-        """Load info for snaps which are not installed if requested.
-
-        Args:
-            name: a string representing the name of the snap
-        """
-        info = self._snap_client.get_snap_information(name)
-
-        return Snap(
-            name=info["name"],
-            state=SnapState.Available,
-            channel=info["channel"],
-            revision=info["revision"],
-            confinement=info["confinement"],
-            apps=None,
-        )
-
-
-@_cache_init
-def add(
-    snap_names: Union[str, List[str]],
-    state: Union[str, SnapState] = SnapState.Latest,
-    channel: Optional[str] = "",
-    classic: Optional[bool] = False,
-    cohort: Optional[str] = "",
-    revision: Optional[str] = None,
-) -> Union[Snap, List[Snap]]:
-    """Add a snap to the system.
-
-    Args:
-        snap_names: the name or names of the snaps to install
-        state: a string or `SnapState` representation of the desired state, one of
-            [`Present` or `Latest`]
-        channel: an (Optional) channel as a string. Defaults to 'latest'
-        classic: an (Optional) boolean specifying whether it should be added with classic
-            confinement. Default `False`
-        cohort: an (Optional) string specifying the snap cohort to use
-        revision: an (Optional) string specifying the snap revision to use
-
-    Raises:
-        SnapError if some snaps failed to install or were not found.
-    """
-    if not channel and not revision:
-        channel = "latest"
-
-    snap_names = [snap_names] if isinstance(snap_names, str) else snap_names
-    if not snap_names:
-        raise TypeError("Expected at least one snap to add, received zero!")
-
-    if isinstance(state, str):
-        state = SnapState(state)
-
-    return _wrap_snap_operations(snap_names, state, channel, classic, cohort, revision)
-
-
-@_cache_init
-def remove(snap_names: Union[str, List[str]]) -> Union[Snap, List[Snap]]:
-    """Remove specified snap(s) from the system.
-
-    Args:
-        snap_names: the name or names of the snaps to install
-
-    Raises:
-        SnapError if some snaps failed to install.
-    """
-    snap_names = [snap_names] if isinstance(snap_names, str) else snap_names
-    if not snap_names:
-        raise TypeError("Expected at least one snap to add, received zero!")
-
-    return _wrap_snap_operations(snap_names, SnapState.Absent, "", False)
-
-
-@_cache_init
-def ensure(
-    snap_names: Union[str, List[str]],
-    state: str,
-    channel: Optional[str] = "",
-    classic: Optional[bool] = False,
-    cohort: Optional[str] = "",
-    revision: Optional[int] = None,
-) -> Union[Snap, List[Snap]]:
-    """Ensure specified snaps are in a given state on the system.
-
-    Args:
-        snap_names: the name(s) of the snaps to operate on
-        state: a string representation of the desired state, from `SnapState`
-        channel: an (Optional) channel as a string. Defaults to 'latest'
-        classic: an (Optional) boolean specifying whether it should be added with classic
-            confinement. Default `False`
-        cohort: an (Optional) string specifying the snap cohort to use
-        revision: an (Optional) integer specifying the snap revision to use
-
-    When both channel and revision are specified, the underlying snap install/refresh
-    command will determine the precedence (revision at the time of adding this)
-
-    Raises:
-        SnapError if the snap is not in the cache.
-    """
-    if not revision and not channel:
-        channel = "latest"
-
-    if state in ("present", "latest") or revision:
-        return add(snap_names, SnapState(state), channel, classic, cohort, revision)
-    else:
-        return remove(snap_names)
-
-
-def _wrap_snap_operations(
-    snap_names: List[str],
-    state: SnapState,
-    channel: str,
-    classic: bool,
-    cohort: Optional[str] = "",
-    revision: Optional[str] = None,
-) -> Union[Snap, List[Snap]]:
-    """Wrap common operations for bare commands."""
-    snaps = {"success": [], "failed": []}
-
-    op = "remove" if state is SnapState.Absent else "install or refresh"
-
-    for s in snap_names:
-        try:
-            snap = _Cache[s]
-            if state is SnapState.Absent:
-                snap.ensure(state=SnapState.Absent)
-            else:
-                snap.ensure(
-                    state=state, classic=classic, channel=channel, cohort=cohort, revision=revision
-                )
-            snaps["success"].append(snap)
-        except SnapError as e:
-            logger.warning("Failed to {} snap {}: {}!".format(op, s, e.message))
-            snaps["failed"].append(s)
-        except SnapNotFoundError:
-            logger.warning("Snap '{}' not found in cache!".format(s))
-            snaps["failed"].append(s)
-
-    if len(snaps["failed"]):
-        raise SnapError(
-            "Failed to install or refresh snap(s): {}".format(", ".join(list(snaps["failed"])))
-        )
-
-    return snaps["success"] if len(snaps["success"]) > 1 else snaps["success"][0]
-
-
-def install_local(
-    filename: str, classic: Optional[bool] = False, dangerous: Optional[bool] = False
-) -> Snap:
-    """Perform a snap operation.
-
-    Args:
-        filename: the path to a local .snap file to install
-        classic: whether to use classic confinement
-        dangerous: whether --dangerous should be passed to install snaps without a signature
-
-    Raises:
-        SnapError if there is a problem encountered
-    """
-    args = [
-        "snap",
-        "install",
-        filename,
-    ]
-    if classic:
-        args.append("--classic")
-    if dangerous:
-        args.append("--dangerous")
-    try:
-        result = subprocess.check_output(args, universal_newlines=True).splitlines()[-1]
-        snap_name, _ = result.split(" ", 1)
-        snap_name = ansi_filter.sub("", snap_name)
-
-        c = SnapCache()
-
-        try:
-            return c[snap_name]
-        except SnapAPIError as e:
-            logger.error(
-                "Could not find snap {} when querying Snapd socket: {}".format(snap_name, e.body)
-            )
-            raise SnapError("Failed to find snap {} in Snap cache".format(snap_name))
-    except CalledProcessError as e:
-        raise SnapError("Could not install snap {}: {}".format(filename, e.output))
-
-
-def _system_set(config_item: str, value: str) -> None:
-    """Set system snapd config values.
-
-    Args:
-        config_item: name of snap system setting. E.g. 'refresh.hold'
-        value: value to assign
-    """
-    args = ["snap", "set", "system", "{}={}".format(config_item, value)]
-    try:
-        subprocess.check_call(args, universal_newlines=True)
-    except CalledProcessError:
-        raise SnapError("Failed setting system config '{}' to '{}'".format(config_item, value))
-
-
-def hold_refresh(days: int = 90, forever: bool = False) -> bool:
-    """Set the system-wide snap refresh hold.
-
-    Args:
-        days: number of days to hold system refreshes for. Maximum 90. Set to zero to remove hold.
-        forever: if True, will set a hold forever.
-    """
-    if not isinstance(forever, bool):
-        raise TypeError("forever must be a bool")
-    if not isinstance(days, int):
-        raise TypeError("days must be an int")
-    if forever:
-        _system_set("refresh.hold", "forever")
-        logger.info("Set system-wide snap refresh hold to: forever")
-    elif days == 0:
-        _system_set("refresh.hold", "")
-        logger.info("Removed system-wide snap refresh hold")
-    else:
-        # Currently the snap daemon can only hold for a maximum of 90 days
-        if not 1 <= days <= 90:
-            raise ValueError("days must be between 1 and 90")
-        # Add the number of days to current time
-        target_date = datetime.now(timezone.utc).astimezone() + timedelta(days=days)
-        # Format for the correct datetime format
-        hold_date = target_date.strftime("%Y-%m-%dT%H:%M:%S%z")
-        # Python dumps the offset in format '+0100', we need '+01:00'
-        hold_date = "{0}:{1}".format(hold_date[:-2], hold_date[-2:])
-        # Actually set the hold date
-        _system_set("refresh.hold", hold_date)
-        logger.info("Set system-wide snap refresh hold to: %s", hold_date)
diff --git a/lib/charms/ovn_central_k8s/v0/ovsdb.py b/lib/charms/ovn_central_k8s/v0/ovsdb.py
deleted file mode 100644
index ef016e2..0000000
--- a/lib/charms/ovn_central_k8s/v0/ovsdb.py
+++ /dev/null
@@ -1,218 +0,0 @@
-"""TODO: Add a proper docstring here.
-
-This is a placeholder docstring for this charm library. Docstrings are
-presented on Charmhub and updated whenever you push a new version of the
-library.
-
-Complete documentation about creating and documenting libraries can be found
-in the SDK docs at https://juju.is/docs/sdk/libraries.
-
-See `charmcraft publish-lib` and `charmcraft fetch-lib` for details of how to
-share and consume charm libraries. They serve to enhance collaboration
-between charmers. Use a charmer's libraries for classes that handle
-integration with their charm.
-
-Bear in mind that new revisions of the different major API versions (v0, v1,
-v2 etc) are maintained independently.  You can continue to update v0 and v1
-after you have pushed v3.
-
-Markdown is supported, following the CommonMark specification.
-"""
-
-import logging
-import typing
-from ops.framework import (
-    StoredState,
-    EventBase,
-    ObjectEvents,
-    EventSource,
-    Object,
-)
-
-# The unique Charmhub library identifier, never change it
-LIBID = "114b7bb1970445daa61650e451f9da62"
-
-# Increment this major API version when introducing breaking changes
-LIBAPI = 0
-
-# Increment this PATCH version before using `charmcraft publish-lib` or reset
-# to 0 if you are raising the major API version
-LIBPATCH = 3
-
-
-# TODO: add your code here! Happy coding!
-class OVSDBCMSConnectedEvent(EventBase):
-    """OVSDBCMS connected Event."""
-
-    pass
-
-
-class OVSDBCMSReadyEvent(EventBase):
-    """OVSDBCMS ready for use Event."""
-
-    pass
-
-
-class OVSDBCMSGoneAwayEvent(EventBase):
-    """OVSDBCMS relation has gone-away Event"""
-
-    pass
-
-
-class OVSDBCMSServerEvents(ObjectEvents):
-    """Events class for `on`"""
-
-    connected = EventSource(OVSDBCMSConnectedEvent)
-    ready = EventSource(OVSDBCMSReadyEvent)
-    goneaway = EventSource(OVSDBCMSGoneAwayEvent)
-
-
-class OVSDBCMSRequires(Object):
-    """
-    OVSDBCMSRequires class
-    """
-
-    on = OVSDBCMSServerEvents()
-    _stored = StoredState()
-
-    def __init__(self, charm, relation_name: str):
-        super().__init__(charm, relation_name)
-        self.charm = charm
-        self.relation_name = relation_name
-        self.framework.observe(
-            self.charm.on[relation_name].relation_joined,
-            self._on_ovsdb_cms_relation_joined,
-        )
-        self.framework.observe(
-            self.charm.on[relation_name].relation_changed,
-            self._on_ovsdb_cms_relation_changed,
-        )
-        self.framework.observe(
-            self.charm.on[relation_name].relation_departed,
-            self._on_ovsdb_cms_relation_changed,
-        )
-        self.framework.observe(
-            self.charm.on[relation_name].relation_broken,
-            self._on_ovsdb_cms_relation_broken,
-        )
-
-    def _on_ovsdb_cms_relation_joined(self, event):
-        """OVSDBCMS relation joined."""
-        logging.debug("OVSDBCMSRequires on_joined")
-        self.on.connected.emit()
-
-    def bound_hostnames(self):
-        return self.get_all_unit_values("bound-hostname")
-
-    def bound_addresses(self):
-        return self.get_all_unit_values("bound-address")
-
-    def public_address(self):
-        relation = self.framework.model.get_relation(self.relation_name)
-        data = relation.data[relation.app]
-        return data.get('public-address')
-
-    def remote_ready(self):
-        return all(self.bound_hostnames()) or all(self.bound_addresses())
-
-    def _on_ovsdb_cms_relation_changed(self, event):
-        """OVSDBCMS relation changed."""
-        logging.debug("OVSDBCMSRequires on_changed")
-        if self.remote_ready():
-            self.on.ready.emit()
-
-    def _on_ovsdb_cms_relation_broken(self, event):
-        """OVSDBCMS relation broken."""
-        logging.debug("OVSDBCMSRequires on_broken")
-        self.on.goneaway.emit()
-
-    def get_all_unit_values(self, key: str) -> typing.List[str]:
-        """Retrieve value for key from all related units."""
-        values = []
-        relation = self.framework.model.get_relation(self.relation_name)
-        if relation:
-            for unit in relation.units:
-                values.append(relation.data[unit].get(key))
-        return values
-
-
-
-class OVSDBCMSClientConnectedEvent(EventBase):
-    """OVSDBCMS connected Event."""
-
-    pass
-
-
-class OVSDBCMSClientReadyEvent(EventBase):
-    """OVSDBCMS ready for use Event."""
-
-    pass
-
-
-class OVSDBCMSClientGoneAwayEvent(EventBase):
-    """OVSDBCMS relation has gone-away Event"""
-
-    pass
-
-
-class OVSDBCMSClientEvents(ObjectEvents):
-    """Events class for `on`"""
-
-    connected = EventSource(OVSDBCMSClientConnectedEvent)
-    ready = EventSource(OVSDBCMSClientReadyEvent)
-    goneaway = EventSource(OVSDBCMSClientGoneAwayEvent)
-
-
-class OVSDBCMSProvides(Object):
-    """
-    OVSDBCMSProvides class
-    """
-
-    on = OVSDBCMSClientEvents()
-    _stored = StoredState()
-
-    def __init__(self, charm, relation_name):
-        super().__init__(charm, relation_name)
-        self.charm = charm
-        self.relation_name = relation_name
-        self.framework.observe(
-            self.charm.on[relation_name].relation_joined,
-            self._on_ovsdb_cms_relation_joined,
-        )
-        self.framework.observe(
-            self.charm.on[relation_name].relation_changed,
-            self._on_ovsdb_cms_relation_changed,
-        )
-        self.framework.observe(
-            self.charm.on[relation_name].relation_broken,
-            self._on_ovsdb_cms_relation_broken,
-        )
-
-    def _on_ovsdb_cms_relation_joined(self, event):
-        """Handle ovsdb-cms joined."""
-        logging.debug("OVSDBCMSProvides on_joined")
-        self.on.connected.emit()
-
-    def _on_ovsdb_cms_relation_changed(self, event):
-        """Handle ovsdb-cms changed."""
-        logging.debug("OVSDBCMSProvides on_changed")
-        self.on.ready.emit()
-
-    def _on_ovsdb_cms_relation_broken(self, event):
-        """Handle ovsdb-cms broken."""
-        logging.debug("OVSDBCMSProvides on_departed")
-        self.on.goneaway.emit()
-
-    def set_unit_data(self, settings: typing.Dict[str, str]) -> None:
-        """Publish settings on the peer unit data bag."""
-        relations = self.framework.model.relations[self.relation_name]
-        for relation in relations:
-            for k, v in settings.items():
-                relation.data[self.model.unit][k] = v
-
-    def set_app_data(self, settings: typing.Dict[str, str]) -> None:
-        """Publish settings on the app data bag."""
-        relations = self.framework.model.relations[self.relation_name]
-        for relation in relations:
-            for k, v in settings.items():
-                relation.data[self.charm.app][k] = v
diff --git a/lib/charms/rabbitmq_k8s/v0/rabbitmq.py b/lib/charms/rabbitmq_k8s/v0/rabbitmq.py
deleted file mode 100644
index c7df240..0000000
--- a/lib/charms/rabbitmq_k8s/v0/rabbitmq.py
+++ /dev/null
@@ -1,286 +0,0 @@
-"""RabbitMQProvides and Requires module.
-
-This library contains the Requires and Provides classes for handling
-the rabbitmq interface.
-
-Import `RabbitMQRequires` in your charm, with the charm object and the
-relation name:
-    - self
-    - "amqp"
-
-Also provide two additional parameters to the charm object:
-    - username
-    - vhost
-
-Two events are also available to respond to:
-    - connected
-    - ready
-    - goneaway
-
-A basic example showing the usage of this relation follows:
-
-```
-from charms.rabbitmq_k8s.v0.rabbitmq import RabbitMQRequires
-
-class RabbitMQClientCharm(CharmBase):
-    def __init__(self, *args):
-        super().__init__(*args)
-        # RabbitMQ Requires
-        self.amqp = RabbitMQRequires(
-            self, "amqp",
-            username="myusername",
-            vhost="vhostname"
-        )
-        self.framework.observe(
-            self.amqp.on.connected, self._on_amqp_connected)
-        self.framework.observe(
-            self.amqp.on.ready, self._on_amqp_ready)
-        self.framework.observe(
-            self.amqp.on.goneaway, self._on_amqp_goneaway)
-
-    def _on_amqp_connected(self, event):
-        '''React to the RabbitMQ connected event.
-
-        This event happens when n RabbitMQ relation is added to the
-        model before credentials etc have been provided.
-        '''
-        # Do something before the relation is complete
-        pass
-
-    def _on_amqp_ready(self, event):
-        '''React to the RabbitMQ ready event.
-
-        The RabbitMQ interface will use the provided username and vhost for the
-        request to the rabbitmq server.
-        '''
-        # RabbitMQ Relation is ready. Do something with the completed relation.
-        pass
-
-    def _on_amqp_goneaway(self, event):
-        '''React to the RabbitMQ goneaway event.
-
-        This event happens when an RabbitMQ relation is removed.
-        '''
-        # RabbitMQ Relation has goneaway. shutdown services or suchlike
-        pass
-```
-"""
-
-# The unique Charmhub library identifier, never change it
-LIBID = "45622352791142fd9cf87232e3bd6f2a"
-
-# Increment this major API version when introducing breaking changes
-LIBAPI = 0
-
-# Increment this PATCH version before using `charmcraft publish-lib` or reset
-# to 0 if you are raising the major API version
-LIBPATCH = 1
-
-import logging
-
-from ops.framework import (
-    StoredState,
-    EventBase,
-    ObjectEvents,
-    EventSource,
-    Object,
-)
-
-from ops.model import Relation
-
-from typing import List
-
-logger = logging.getLogger(__name__)
-
-
-class RabbitMQConnectedEvent(EventBase):
-    """RabbitMQ connected Event."""
-
-    pass
-
-
-class RabbitMQReadyEvent(EventBase):
-    """RabbitMQ ready for use Event."""
-
-    pass
-
-
-class RabbitMQGoneAwayEvent(EventBase):
-    """RabbitMQ relation has gone-away Event"""
-
-    pass
-
-
-class RabbitMQServerEvents(ObjectEvents):
-    """Events class for `on`"""
-
-    connected = EventSource(RabbitMQConnectedEvent)
-    ready = EventSource(RabbitMQReadyEvent)
-    goneaway = EventSource(RabbitMQGoneAwayEvent)
-
-
-class RabbitMQRequires(Object):
-    """
-    RabbitMQRequires class
-    """
-
-    on = RabbitMQServerEvents()
-
-    def __init__(self, charm, relation_name: str, username: str, vhost: str):
-        super().__init__(charm, relation_name)
-        self.charm = charm
-        self.relation_name = relation_name
-        self.username = username
-        self.vhost = vhost
-        self.framework.observe(
-            self.charm.on[relation_name].relation_joined,
-            self._on_amqp_relation_joined,
-        )
-        self.framework.observe(
-            self.charm.on[relation_name].relation_changed,
-            self._on_amqp_relation_changed,
-        )
-        self.framework.observe(
-            self.charm.on[relation_name].relation_departed,
-            self._on_amqp_relation_changed,
-        )
-        self.framework.observe(
-            self.charm.on[relation_name].relation_broken,
-            self._on_amqp_relation_broken,
-        )
-
-    def _on_amqp_relation_joined(self, event):
-        """RabbitMQ relation joined."""
-        logging.debug("RabbitMQRabbitMQRequires on_joined")
-        self.on.connected.emit()
-        self.request_access(self.username, self.vhost)
-
-    def _on_amqp_relation_changed(self, event):
-        """RabbitMQ relation changed."""
-        logging.debug("RabbitMQRabbitMQRequires on_changed/departed")
-        if self.password:
-            self.on.ready.emit()
-
-    def _on_amqp_relation_broken(self, event):
-        """RabbitMQ relation broken."""
-        logging.debug("RabbitMQRabbitMQRequires on_broken")
-        self.on.goneaway.emit()
-
-    @property
-    def _amqp_rel(self) -> Relation:
-        """The RabbitMQ relation."""
-        return self.framework.model.get_relation(self.relation_name)
-
-    @property
-    def password(self) -> str:
-        """Return the RabbitMQ password from the server side of the relation."""
-        return self._amqp_rel.data[self._amqp_rel.app].get("password")
-
-    @property
-    def hostname(self) -> str:
-        """Return the hostname from the RabbitMQ relation"""
-        return self._amqp_rel.data[self._amqp_rel.app].get("hostname")
-
-    @property
-    def ssl_port(self) -> str:
-        """Return the SSL port from the RabbitMQ relation"""
-        return self._amqp_rel.data[self._amqp_rel.app].get("ssl_port")
-
-    @property
-    def ssl_ca(self) -> str:
-        """Return the SSL port from the RabbitMQ relation"""
-        return self._amqp_rel.data[self._amqp_rel.app].get("ssl_ca")
-
-    @property
-    def hostnames(self) -> List[str]:
-        """Return a list of remote RMQ hosts from the RabbitMQ relation"""
-        _hosts = []
-        for unit in self._amqp_rel.units:
-            _hosts.append(self._amqp_rel.data[unit].get("ingress-address"))
-        return _hosts
-
-    def request_access(self, username: str, vhost: str) -> None:
-        """Request access to the RabbitMQ server."""
-        if self.model.unit.is_leader():
-            logging.debug("Requesting RabbitMQ user and vhost")
-            self._amqp_rel.data[self.charm.app]["username"] = username
-            self._amqp_rel.data[self.charm.app]["vhost"] = vhost
-
-
-class HasRabbitMQClientsEvent(EventBase):
-    """Has RabbitMQClients Event."""
-
-    pass
-
-
-class ReadyRabbitMQClientsEvent(EventBase):
-    """RabbitMQClients Ready Event."""
-
-    pass
-
-
-class RabbitMQClientEvents(ObjectEvents):
-    """Events class for `on`"""
-
-    has_amqp_clients = EventSource(HasRabbitMQClientsEvent)
-    ready_amqp_clients = EventSource(ReadyRabbitMQClientsEvent)
-
-
-class RabbitMQProvides(Object):
-    """
-    RabbitMQProvides class
-    """
-
-    on = RabbitMQClientEvents()
-
-    def __init__(self, charm, relation_name, callback):
-        super().__init__(charm, relation_name)
-        self.charm = charm
-        self.relation_name = relation_name
-        self.callback = callback
-        self.framework.observe(
-            self.charm.on[relation_name].relation_joined,
-            self._on_amqp_relation_joined,
-        )
-        self.framework.observe(
-            self.charm.on[relation_name].relation_changed,
-            self._on_amqp_relation_changed,
-        )
-        self.framework.observe(
-            self.charm.on[relation_name].relation_broken,
-            self._on_amqp_relation_broken,
-        )
-
-    def _on_amqp_relation_joined(self, event):
-        """Handle RabbitMQ joined."""
-        logging.debug("RabbitMQRabbitMQProvides on_joined data={}"
-                      .format(event.relation.data[event.relation.app]))
-        self.on.has_amqp_clients.emit()
-
-    def _on_amqp_relation_changed(self, event):
-        """Handle RabbitMQ changed."""
-        logging.debug("RabbitMQRabbitMQProvides on_changed data={}"
-                      .format(event.relation.data[event.relation.app]))
-        # Validate data on the relation
-        if self.username(event) and self.vhost(event):
-            self.on.ready_amqp_clients.emit()
-            if self.charm.unit.is_leader():
-                self.callback(event, self.username(event), self.vhost(event))
-        else:
-            logging.warning("Received RabbitMQ changed event without the "
-                            "expected keys ('username', 'vhost') in the "
-                            "application data bag.  Incompatible charm in "
-                            "other end of relation?")
-
-    def _on_amqp_relation_broken(self, event):
-        """Handle RabbitMQ broken."""
-        logging.debug("RabbitMQRabbitMQProvides on_departed")
-        # TODO clear data on the relation
-
-    def username(self, event):
-        """Return the RabbitMQ username from the client side of the relation."""
-        return event.relation.data[event.relation.app].get("username")
-
-    def vhost(self, event):
-        """Return the RabbitMQ vhost from the client side of the relation."""
-        return event.relation.data[event.relation.app].get("vhost")
diff --git a/lib/charms/tls_certificates_interface/v1/tls_certificates.py b/lib/charms/tls_certificates_interface/v1/tls_certificates.py
deleted file mode 100644
index 1eda19b..0000000
--- a/lib/charms/tls_certificates_interface/v1/tls_certificates.py
+++ /dev/null
@@ -1,1261 +0,0 @@
-# Copyright 2021 Canonical Ltd.
-# See LICENSE file for licensing details.
-
-"""Library for the tls-certificates relation.
-
-This library contains the Requires and Provides classes for handling the tls-certificates
-interface.
-
-## Getting Started
-From a charm directory, fetch the library using `charmcraft`:
-
-```shell
-charmcraft fetch-lib charms.tls_certificates_interface.v1.tls_certificates
-```
-
-Add the following libraries to the charm's `requirements.txt` file:
-- jsonschema
-- cryptography
-
-Add the following section to the charm's `charmcraft.yaml` file:
-```yaml
-parts:
-  charm:
-    build-packages:
-      - libffi-dev
-      - libssl-dev
-      - rustc
-      - cargo
-```
-
-### Provider charm
-The provider charm is the charm providing certificates to another charm that requires them. In
-this example, the provider charm is storing its private key using a peer relation interface called
-`replicas`.
-
-Example:
-```python
-from charms.tls_certificates_interface.v1.tls_certificates import (
-    CertificateCreationRequestEvent,
-    CertificateRevocationRequestEvent,
-    TLSCertificatesProvidesV1,
-    generate_private_key,
-)
-from ops.charm import CharmBase, InstallEvent
-from ops.main import main
-from ops.model import ActiveStatus, WaitingStatus
-
-
-def generate_ca(private_key: bytes, subject: str) -> str:
-    return "whatever ca content"
-
-
-def generate_certificate(ca: str, private_key: str, csr: str) -> str:
-    return "Whatever certificate"
-
-
-class ExampleProviderCharm(CharmBase):
-
-    def __init__(self, *args):
-        super().__init__(*args)
-        self.certificates = TLSCertificatesProvidesV1(self, "certificates")
-        self.framework.observe(
-            self.certificates.on.certificate_request, self._on_certificate_request
-        )
-        self.framework.observe(
-            self.certificates.on.certificate_revoked, self._on_certificate_revocation_request
-        )
-        self.framework.observe(self.on.install, self._on_install)
-
-    def _on_install(self, event: InstallEvent) -> None:
-        private_key_password = b"banana"
-        private_key = generate_private_key(password=private_key_password)
-        ca_certificate = generate_ca(private_key=private_key, subject="whatever")
-        replicas_relation = self.model.get_relation("replicas")
-        if not replicas_relation:
-            self.unit.status = WaitingStatus("Waiting for peer relation to be created")
-            event.defer()
-            return
-        replicas_relation.data[self.app].update(
-            {
-                "private_key_password": "banana",
-                "private_key": private_key,
-                "ca_certificate": ca_certificate,
-            }
-        )
-        self.unit.status = ActiveStatus()
-
-    def _on_certificate_request(self, event: CertificateCreationRequestEvent) -> None:
-        replicas_relation = self.model.get_relation("replicas")
-        if not replicas_relation:
-            self.unit.status = WaitingStatus("Waiting for peer relation to be created")
-            event.defer()
-            return
-        ca_certificate = replicas_relation.data[self.app].get("ca_certificate")
-        private_key = replicas_relation.data[self.app].get("private_key")
-        certificate = generate_certificate(
-            ca=ca_certificate,
-            private_key=private_key,
-            csr=event.certificate_signing_request,
-        )
-
-        self.certificates.set_relation_certificate(
-            certificate=certificate,
-            certificate_signing_request=event.certificate_signing_request,
-            ca=ca_certificate,
-            chain=[ca_certificate, certificate],
-            relation_id=event.relation_id,
-        )
-
-    def _on_certificate_revocation_request(self, event: CertificateRevocationRequestEvent) -> None:
-        # Do what you want to do with this information
-        pass
-
-
-if __name__ == "__main__":
-    main(ExampleProviderCharm)
-```
-
-### Requirer charm
-The requirer charm is the charm requiring certificates from another charm that provides them. In
-this example, the requirer charm is storing its certificates using a peer relation interface called
-`replicas`.
-
-Example:
-```python
-from charms.tls_certificates_interface.v1.tls_certificates import (
-    CertificateAvailableEvent,
-    CertificateExpiringEvent,
-    TLSCertificatesRequiresV1,
-    generate_csr,
-    generate_private_key,
-)
-from ops.charm import CharmBase, RelationJoinedEvent
-from ops.main import main
-from ops.model import ActiveStatus, WaitingStatus
-
-
-class ExampleRequirerCharm(CharmBase):
-
-    def __init__(self, *args):
-        super().__init__(*args)
-        self.cert_subject = "whatever"
-        self.certificates = TLSCertificatesRequiresV1(self, "certificates")
-        self.framework.observe(self.on.install, self._on_install)
-        self.framework.observe(
-            self.on.certificates_relation_joined, self._on_certificates_relation_joined
-        )
-        self.framework.observe(
-            self.certificates.on.certificate_available, self._on_certificate_available
-        )
-        self.framework.observe(
-            self.certificates.on.certificate_expiring, self._on_certificate_expiring
-        )
-
-    def _on_install(self, event) -> None:
-        private_key_password = b"banana"
-        private_key = generate_private_key(password=private_key_password)
-        replicas_relation = self.model.get_relation("replicas")
-        if not replicas_relation:
-            self.unit.status = WaitingStatus("Waiting for peer relation to be created")
-            event.defer()
-            return
-        replicas_relation.data[self.app].update(
-            {"private_key_password": "banana", "private_key": private_key.decode()}
-        )
-
-    def _on_certificates_relation_joined(self, event: RelationJoinedEvent) -> None:
-        replicas_relation = self.model.get_relation("replicas")
-        if not replicas_relation:
-            self.unit.status = WaitingStatus("Waiting for peer relation to be created")
-            event.defer()
-            return
-        private_key_password = replicas_relation.data[self.app].get("private_key_password")
-        private_key = replicas_relation.data[self.app].get("private_key")
-        csr = generate_csr(
-            private_key=private_key.encode(),
-            private_key_password=private_key_password.encode(),
-            subject=self.cert_subject,
-        )
-        replicas_relation.data[self.app].update({"csr": csr.decode()})
-        self.certificates.request_certificate_creation(certificate_signing_request=csr)
-
-    def _on_certificate_available(self, event: CertificateAvailableEvent) -> None:
-        replicas_relation = self.model.get_relation("replicas")
-        if not replicas_relation:
-            self.unit.status = WaitingStatus("Waiting for peer relation to be created")
-            event.defer()
-            return
-        replicas_relation.data[self.app].update({"certificate": event.certificate})
-        replicas_relation.data[self.app].update({"ca": event.ca})
-        replicas_relation.data[self.app].update({"chain": event.chain})
-        self.unit.status = ActiveStatus()
-
-    def _on_certificate_expiring(self, event: CertificateExpiringEvent) -> None:
-        replicas_relation = self.model.get_relation("replicas")
-        if not replicas_relation:
-            self.unit.status = WaitingStatus("Waiting for peer relation to be created")
-            event.defer()
-            return
-        old_csr = replicas_relation.data[self.app].get("csr")
-        private_key_password = replicas_relation.data[self.app].get("private_key_password")
-        private_key = replicas_relation.data[self.app].get("private_key")
-        new_csr = generate_csr(
-            private_key=private_key.encode(),
-            private_key_password=private_key_password.encode(),
-            subject=self.cert_subject,
-        )
-        self.certificates.request_certificate_renewal(
-            old_certificate_signing_request=old_csr,
-            new_certificate_signing_request=new_csr,
-        )
-        replicas_relation.data[self.app].update({"csr": new_csr.decode()})
-
-
-if __name__ == "__main__":
-    main(ExampleRequirerCharm)
-```
-"""  # noqa: D405, D410, D411, D214, D416
-
-import copy
-import json
-import logging
-import uuid
-from datetime import datetime, timedelta
-from ipaddress import IPv4Address
-from typing import Dict, List, Optional
-
-from cryptography import x509
-from cryptography.hazmat._oid import ExtensionOID
-from cryptography.hazmat.primitives import hashes, serialization
-from cryptography.hazmat.primitives.asymmetric import rsa
-from cryptography.hazmat.primitives.serialization import pkcs12
-from cryptography.x509.extensions import Extension, ExtensionNotFound
-from jsonschema import exceptions, validate  # type: ignore[import]
-from ops.charm import CharmBase, CharmEvents, RelationChangedEvent, UpdateStatusEvent
-from ops.framework import EventBase, EventSource, Handle, Object
-
-# The unique Charmhub library identifier, never change it
-LIBID = "afd8c2bccf834997afce12c2706d2ede"
-
-# Increment this major API version when introducing breaking changes
-LIBAPI = 1
-
-# Increment this PATCH version before using `charmcraft publish-lib` or reset
-# to 0 if you are raising the major API version
-LIBPATCH = 10
-
-REQUIRER_JSON_SCHEMA = {
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "$id": "https://canonical.github.io/charm-relation-interfaces/tls_certificates/v1/schemas/requirer.json",  # noqa: E501
-    "type": "object",
-    "title": "`tls_certificates` requirer root schema",
-    "description": "The `tls_certificates` root schema comprises the entire requirer databag for this interface.",  # noqa: E501
-    "examples": [
-        {
-            "certificate_signing_requests": [
-                {
-                    "certificate_signing_request": "-----BEGIN CERTIFICATE REQUEST-----\\nMIICWjCCAUICAQAwFTETMBEGA1UEAwwKYmFuYW5hLmNvbTCCASIwDQYJKoZIhvcN\\nAQEBBQADggEPADCCAQoCggEBANWlx9wE6cW7Jkb4DZZDOZoEjk1eDBMJ+8R4pyKp\\nFBeHMl1SQSDt6rAWsrfL3KOGiIHqrRY0B5H6c51L8LDuVrJG0bPmyQ6rsBo3gVke\\nDSivfSLtGvHtp8lwYnIunF8r858uYmblAR0tdXQNmnQvm+6GERvURQ6sxpgZ7iLC\\npPKDoPt+4GKWL10FWf0i82FgxWC2KqRZUtNbgKETQuARLig7etBmCnh20zmynorA\\ncY7vrpTPAaeQpGLNqqYvKV9W6yWVY08V+nqARrFrjk3vSioZSu8ZJUdZ4d9++SGl\\nbH7A6e77YDkX9i/dQ3Pa/iDtWO3tXS2MvgoxX1iSWlGNOHcCAwEAAaAAMA0GCSqG\\nSIb3DQEBCwUAA4IBAQCW1fKcHessy/ZhnIwAtSLznZeZNH8LTVOzkhVd4HA7EJW+\\nKVLBx8DnN7L3V2/uPJfHiOg4Rx7fi7LkJPegl3SCqJZ0N5bQS/KvDTCyLG+9E8Y+\\n7wqCmWiXaH1devimXZvazilu4IC2dSks2D8DPWHgsOdVks9bme8J3KjdNMQudegc\\newWZZ1Dtbd+Rn7cpKU3jURMwm4fRwGxbJ7iT5fkLlPBlyM/yFEik4SmQxFYrZCQg\\n0f3v4kBefTh5yclPy5tEH+8G0LMsbbo3dJ5mPKpAShi0QEKDLd7eR1R/712lYTK4\\ndi4XaEfqERgy68O4rvb4PGlJeRGS7AmL7Ss8wfAq\\n-----END CERTIFICATE REQUEST-----\\n"  # noqa: E501
-                },
-                {
-                    "certificate_signing_request": "-----BEGIN CERTIFICATE REQUEST-----\\nMIICWjCCAUICAQAwFTETMBEGA1UEAwwKYmFuYW5hLmNvbTCCASIwDQYJKoZIhvcN\\nAQEBBQADggEPADCCAQoCggEBAMk3raaX803cHvzlBF9LC7KORT46z4VjyU5PIaMb\\nQLIDgYKFYI0n5hf2Ra4FAHvOvEmW7bjNlHORFEmvnpcU5kPMNUyKFMTaC8LGmN8z\\nUBH3aK+0+FRvY4afn9tgj5435WqOG9QdoDJ0TJkjJbJI9M70UOgL711oU7ql6HxU\\n4d2ydFK9xAHrBwziNHgNZ72L95s4gLTXf0fAHYf15mDA9U5yc+YDubCKgTXzVySQ\\nUx73VCJLfC/XkZIh559IrnRv5G9fu6BMLEuBwAz6QAO4+/XidbKWN4r2XSq5qX4n\\n6EPQQWP8/nd4myq1kbg6Q8w68L/0YdfjCmbyf2TuoWeImdUCAwEAAaAAMA0GCSqG\\nSIb3DQEBCwUAA4IBAQBIdwraBvpYo/rl5MH1+1Um6HRg4gOdQPY5WcJy9B9tgzJz\\nittRSlRGTnhyIo6fHgq9KHrmUthNe8mMTDailKFeaqkVNVvk7l0d1/B90Kz6OfmD\\nxN0qjW53oP7y3QB5FFBM8DjqjmUnz5UePKoX4AKkDyrKWxMwGX5RoET8c/y0y9jp\\nvSq3Wh5UpaZdWbe1oVY8CqMVUEVQL2DPjtopxXFz2qACwsXkQZxWmjvZnRiP8nP8\\nbdFaEuh9Q6rZ2QdZDEtrU4AodPU3NaukFr5KlTUQt3w/cl+5//zils6G5zUWJ2pN\\ng7+t9PTvXHRkH+LnwaVnmsBFU2e05qADQbfIn7JA\\n-----END CERTIFICATE REQUEST-----\\n"  # noqa: E501
-                },
-            ]
-        }
-    ],
-    "properties": {
-        "certificate_signing_requests": {
-            "type": "array",
-            "items": {
-                "type": "object",
-                "properties": {"certificate_signing_request": {"type": "string"}},
-                "required": ["certificate_signing_request"],
-            },
-        }
-    },
-    "required": ["certificate_signing_requests"],
-    "additionalProperties": True,
-}
-
-PROVIDER_JSON_SCHEMA = {
-    "$schema": "http://json-schema.org/draft-04/schema#",
-    "$id": "https://canonical.github.io/charm-relation-interfaces/tls_certificates/v1/schemas/provider.json",  # noqa: E501
-    "type": "object",
-    "title": "`tls_certificates` provider root schema",
-    "description": "The `tls_certificates` root schema comprises the entire provider databag for this interface.",  # noqa: E501
-    "example": [
-        {
-            "certificates": [
-                {
-                    "ca": "-----BEGIN CERTIFICATE-----\\nMIIDJTCCAg2gAwIBAgIUMsSK+4FGCjW6sL/EXMSxColmKw8wDQYJKoZIhvcNAQEL\\nBQAwIDELMAkGA1UEBhMCVVMxETAPBgNVBAMMCHdoYXRldmVyMB4XDTIyMDcyOTIx\\nMTgyN1oXDTIzMDcyOTIxMTgyN1owIDELMAkGA1UEBhMCVVMxETAPBgNVBAMMCHdo\\nYXRldmVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA55N9DkgFWbJ/\\naqcdQhso7n1kFvt6j/fL1tJBvRubkiFMQJnZFtekfalN6FfRtA3jq+nx8o49e+7t\\nLCKT0xQ+wufXfOnxv6/if6HMhHTiCNPOCeztUgQ2+dfNwRhYYgB1P93wkUVjwudK\\n13qHTTZ6NtEF6EzOqhOCe6zxq6wrr422+ZqCvcggeQ5tW9xSd/8O1vNID/0MTKpy\\nET3drDtBfHmiUEIBR3T3tcy6QsIe4Rz/2sDinAcM3j7sG8uY6drh8jY3PWar9til\\nv2l4qDYSU8Qm5856AB1FVZRLRJkLxZYZNgreShAIYgEd0mcyI2EO/UvKxsIcxsXc\\nd45GhGpKkwIDAQABo1cwVTAfBgNVHQ4EGAQWBBRXBrXKh3p/aFdQjUcT/UcvICBL\\nODAhBgNVHSMEGjAYgBYEFFcGtcqHen9oV1CNRxP9Ry8gIEs4MA8GA1UdEwEB/wQF\\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAGmCEvcoFUrT9e133SHkgF/ZAgzeIziO\\nBjfAdU4fvAVTVfzaPm0yBnGqzcHyacCzbZjKQpaKVgc5e6IaqAQtf6cZJSCiJGhS\\nJYeosWrj3dahLOUAMrXRr8G/Ybcacoqc+osKaRa2p71cC3V6u2VvcHRV7HDFGJU7\\noijbdB+WhqET6Txe67rxZCJG9Ez3EOejBJBl2PJPpy7m1Ml4RR+E8YHNzB0lcBzc\\nEoiJKlDfKSO14E2CPDonnUoWBJWjEvJys3tbvKzsRj2fnLilytPFU0gH3cEjCopi\\nzFoWRdaRuNHYCqlBmso1JFDl8h4fMmglxGNKnKRar0WeGyxb4xXBGpI=\\n-----END CERTIFICATE-----\\n",  # noqa: E501
-                    "chain": [
-                        "-----BEGIN CERTIFICATE-----\\nMIIDJTCCAg2gAwIBAgIUMsSK+4FGCjW6sL/EXMSxColmKw8wDQYJKoZIhvcNAQEL\\nBQAwIDELMAkGA1UEBhMCVVMxETAPBgNVBAMMCHdoYXRldmVyMB4XDTIyMDcyOTIx\\nMTgyN1oXDTIzMDcyOTIxMTgyN1owIDELMAkGA1UEBhMCVVMxETAPBgNVBAMMCHdo\\nYXRldmVyMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEA55N9DkgFWbJ/\\naqcdQhso7n1kFvt6j/fL1tJBvRubkiFMQJnZFtekfalN6FfRtA3jq+nx8o49e+7t\\nLCKT0xQ+wufXfOnxv6/if6HMhHTiCNPOCeztUgQ2+dfNwRhYYgB1P93wkUVjwudK\\n13qHTTZ6NtEF6EzOqhOCe6zxq6wrr422+ZqCvcggeQ5tW9xSd/8O1vNID/0MTKpy\\nET3drDtBfHmiUEIBR3T3tcy6QsIe4Rz/2sDinAcM3j7sG8uY6drh8jY3PWar9til\\nv2l4qDYSU8Qm5856AB1FVZRLRJkLxZYZNgreShAIYgEd0mcyI2EO/UvKxsIcxsXc\\nd45GhGpKkwIDAQABo1cwVTAfBgNVHQ4EGAQWBBRXBrXKh3p/aFdQjUcT/UcvICBL\\nODAhBgNVHSMEGjAYgBYEFFcGtcqHen9oV1CNRxP9Ry8gIEs4MA8GA1UdEwEB/wQF\\nMAMBAf8wDQYJKoZIhvcNAQELBQADggEBAGmCEvcoFUrT9e133SHkgF/ZAgzeIziO\\nBjfAdU4fvAVTVfzaPm0yBnGqzcHyacCzbZjKQpaKVgc5e6IaqAQtf6cZJSCiJGhS\\nJYeosWrj3dahLOUAMrXRr8G/Ybcacoqc+osKaRa2p71cC3V6u2VvcHRV7HDFGJU7\\noijbdB+WhqET6Txe67rxZCJG9Ez3EOejBJBl2PJPpy7m1Ml4RR+E8YHNzB0lcBzc\\nEoiJKlDfKSO14E2CPDonnUoWBJWjEvJys3tbvKzsRj2fnLilytPFU0gH3cEjCopi\\nzFoWRdaRuNHYCqlBmso1JFDl8h4fMmglxGNKnKRar0WeGyxb4xXBGpI=\\n-----END CERTIFICATE-----\\n"  # noqa: E501, W505
-                    ],
-                    "certificate_signing_request": "-----BEGIN CERTIFICATE REQUEST-----\nMIICWjCCAUICAQAwFTETMBEGA1UEAwwKYmFuYW5hLmNvbTCCASIwDQYJKoZIhvcN\nAQEBBQADggEPADCCAQoCggEBANWlx9wE6cW7Jkb4DZZDOZoEjk1eDBMJ+8R4pyKp\nFBeHMl1SQSDt6rAWsrfL3KOGiIHqrRY0B5H6c51L8LDuVrJG0bPmyQ6rsBo3gVke\nDSivfSLtGvHtp8lwYnIunF8r858uYmblAR0tdXQNmnQvm+6GERvURQ6sxpgZ7iLC\npPKDoPt+4GKWL10FWf0i82FgxWC2KqRZUtNbgKETQuARLig7etBmCnh20zmynorA\ncY7vrpTPAaeQpGLNqqYvKV9W6yWVY08V+nqARrFrjk3vSioZSu8ZJUdZ4d9++SGl\nbH7A6e77YDkX9i/dQ3Pa/iDtWO3tXS2MvgoxX1iSWlGNOHcCAwEAAaAAMA0GCSqG\nSIb3DQEBCwUAA4IBAQCW1fKcHessy/ZhnIwAtSLznZeZNH8LTVOzkhVd4HA7EJW+\nKVLBx8DnN7L3V2/uPJfHiOg4Rx7fi7LkJPegl3SCqJZ0N5bQS/KvDTCyLG+9E8Y+\n7wqCmWiXaH1devimXZvazilu4IC2dSks2D8DPWHgsOdVks9bme8J3KjdNMQudegc\newWZZ1Dtbd+Rn7cpKU3jURMwm4fRwGxbJ7iT5fkLlPBlyM/yFEik4SmQxFYrZCQg\n0f3v4kBefTh5yclPy5tEH+8G0LMsbbo3dJ5mPKpAShi0QEKDLd7eR1R/712lYTK4\ndi4XaEfqERgy68O4rvb4PGlJeRGS7AmL7Ss8wfAq\n-----END CERTIFICATE REQUEST-----\n",  # noqa: E501
-                    "certificate": "-----BEGIN CERTIFICATE-----\nMIICvDCCAaQCFFPAOD7utDTsgFrm0vS4We18OcnKMA0GCSqGSIb3DQEBCwUAMCAx\nCzAJBgNVBAYTAlVTMREwDwYDVQQDDAh3aGF0ZXZlcjAeFw0yMjA3MjkyMTE5Mzha\nFw0yMzA3MjkyMTE5MzhaMBUxEzARBgNVBAMMCmJhbmFuYS5jb20wggEiMA0GCSqG\nSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDVpcfcBOnFuyZG+A2WQzmaBI5NXgwTCfvE\neKciqRQXhzJdUkEg7eqwFrK3y9yjhoiB6q0WNAeR+nOdS/Cw7layRtGz5skOq7Aa\nN4FZHg0or30i7Rrx7afJcGJyLpxfK/OfLmJm5QEdLXV0DZp0L5vuhhEb1EUOrMaY\nGe4iwqTyg6D7fuBili9dBVn9IvNhYMVgtiqkWVLTW4ChE0LgES4oO3rQZgp4dtM5\nsp6KwHGO766UzwGnkKRizaqmLylfVusllWNPFfp6gEaxa45N70oqGUrvGSVHWeHf\nfvkhpWx+wOnu+2A5F/Yv3UNz2v4g7Vjt7V0tjL4KMV9YklpRjTh3AgMBAAEwDQYJ\nKoZIhvcNAQELBQADggEBAChjRzuba8zjQ7NYBVas89Oy7u++MlS8xWxh++yiUsV6\nWMk3ZemsPtXc1YmXorIQohtxLxzUPm2JhyzFzU/sOLmJQ1E/l+gtZHyRCwsb20fX\nmphuJsMVd7qv/GwEk9PBsk2uDqg4/Wix0Rx5lf95juJP7CPXQJl5FQauf3+LSz0y\nwF/j+4GqvrwsWr9hKOLmPdkyKkR6bHKtzzsxL9PM8GnElk2OpaPMMnzbL/vt2IAt\nxK01ZzPxCQCzVwHo5IJO5NR/fIyFbEPhxzG17QsRDOBR9fl9cOIvDeSO04vyZ+nz\n+kA2c3fNrZFAtpIlOOmFh8Q12rVL4sAjI5mVWnNEgvI=\n-----END CERTIFICATE-----\n",  # noqa: E501
-                }
-            ]
-        }
-    ],
-    "properties": {
-        "certificates": {
-            "$id": "#/properties/certificates",
-            "type": "array",
-            "items": {
-                "$id": "#/properties/certificates/items",
-                "type": "object",
-                "required": ["certificate_signing_request", "certificate", "ca", "chain"],
-                "properties": {
-                    "certificate_signing_request": {
-                        "$id": "#/properties/certificates/items/certificate_signing_request",
-                        "type": "string",
-                    },
-                    "certificate": {
-                        "$id": "#/properties/certificates/items/certificate",
-                        "type": "string",
-                    },
-                    "ca": {"$id": "#/properties/certificates/items/ca", "type": "string"},
-                    "chain": {
-                        "$id": "#/properties/certificates/items/chain",
-                        "type": "array",
-                        "items": {
-                            "type": "string",
-                            "$id": "#/properties/certificates/items/chain/items",
-                        },
-                    },
-                },
-                "additionalProperties": True,
-            },
-        }
-    },
-    "required": ["certificates"],
-    "additionalProperties": True,
-}
-
-
-logger = logging.getLogger(__name__)
-
-
-class CertificateAvailableEvent(EventBase):
-    """Charm Event triggered when a TLS certificate is available."""
-
-    def __init__(
-        self,
-        handle: Handle,
-        certificate: str,
-        certificate_signing_request: str,
-        ca: str,
-        chain: List[str],
-    ):
-        super().__init__(handle)
-        self.certificate = certificate
-        self.certificate_signing_request = certificate_signing_request
-        self.ca = ca
-        self.chain = chain
-
-    def snapshot(self) -> dict:
-        """Returns snapshot."""
-        return {
-            "certificate": self.certificate,
-            "certificate_signing_request": self.certificate_signing_request,
-            "ca": self.ca,
-            "chain": self.chain,
-        }
-
-    def restore(self, snapshot: dict):
-        """Restores snapshot."""
-        self.certificate = snapshot["certificate"]
-        self.certificate_signing_request = snapshot["certificate_signing_request"]
-        self.ca = snapshot["ca"]
-        self.chain = snapshot["chain"]
-
-
-class CertificateExpiringEvent(EventBase):
-    """Charm Event triggered when a TLS certificate is almost expired."""
-
-    def __init__(self, handle, certificate: str, expiry: str):
-        """CertificateExpiringEvent.
-
-        Args:
-            handle (Handle): Juju framework handle
-            certificate (str): TLS Certificate
-            expiry (str): Datetime string reprensenting the time at which the certificate
-                won't be valid anymore.
-        """
-        super().__init__(handle)
-        self.certificate = certificate
-        self.expiry = expiry
-
-    def snapshot(self) -> dict:
-        """Returns snapshot."""
-        return {"certificate": self.certificate, "expiry": self.expiry}
-
-    def restore(self, snapshot: dict):
-        """Restores snapshot."""
-        self.certificate = snapshot["certificate"]
-        self.expiry = snapshot["expiry"]
-
-
-class CertificateExpiredEvent(EventBase):
-    """Charm Event triggered when a TLS certificate is expired."""
-
-    def __init__(self, handle: Handle, certificate: str):
-        super().__init__(handle)
-        self.certificate = certificate
-
-    def snapshot(self) -> dict:
-        """Returns snapshot."""
-        return {"certificate": self.certificate}
-
-    def restore(self, snapshot: dict):
-        """Restores snapshot."""
-        self.certificate = snapshot["certificate"]
-
-
-class CertificateCreationRequestEvent(EventBase):
-    """Charm Event triggered when a TLS certificate is required."""
-
-    def __init__(self, handle: Handle, certificate_signing_request: str, relation_id: int):
-        super().__init__(handle)
-        self.certificate_signing_request = certificate_signing_request
-        self.relation_id = relation_id
-
-    def snapshot(self) -> dict:
-        """Returns snapshot."""
-        return {
-            "certificate_signing_request": self.certificate_signing_request,
-            "relation_id": self.relation_id,
-        }
-
-    def restore(self, snapshot: dict):
-        """Restores snapshot."""
-        self.certificate_signing_request = snapshot["certificate_signing_request"]
-        self.relation_id = snapshot["relation_id"]
-
-
-class CertificateRevocationRequestEvent(EventBase):
-    """Charm Event triggered when a TLS certificate needs to be revoked."""
-
-    def __init__(
-        self,
-        handle: Handle,
-        certificate: str,
-        certificate_signing_request: str,
-        ca: str,
-        chain: str,
-    ):
-        super().__init__(handle)
-        self.certificate = certificate
-        self.certificate_signing_request = certificate_signing_request
-        self.ca = ca
-        self.chain = chain
-
-    def snapshot(self) -> dict:
-        """Returns snapshot."""
-        return {
-            "certificate": self.certificate,
-            "certificate_signing_request": self.certificate_signing_request,
-            "ca": self.ca,
-            "chain": self.chain,
-        }
-
-    def restore(self, snapshot: dict):
-        """Restores snapshot."""
-        self.certificate = snapshot["certificate"]
-        self.certificate_signing_request = snapshot["certificate_signing_request"]
-        self.ca = snapshot["ca"]
-        self.chain = snapshot["chain"]
-
-
-def _load_relation_data(raw_relation_data: dict) -> dict:
-    """Loads relation data from the relation data bag.
-
-    Json loads all data.
-
-    Args:
-        raw_relation_data: Relation data from the databag
-
-    Returns:
-        dict: Relation data in dict format.
-    """
-    certificate_data = dict()
-    for key in raw_relation_data:
-        try:
-            certificate_data[key] = json.loads(raw_relation_data[key])
-        except (json.decoder.JSONDecodeError, TypeError):
-            certificate_data[key] = raw_relation_data[key]
-    return certificate_data
-
-
-def generate_ca(
-    private_key: bytes,
-    subject: str,
-    private_key_password: Optional[bytes] = None,
-    validity: int = 365,
-    country: str = "US",
-) -> bytes:
-    """Generates a CA Certificate.
-
-    Args:
-        private_key (bytes): Private key
-        subject (str): Certificate subject
-        private_key_password (bytes): Private key password
-        validity (int): Certificate validity time (in days)
-        country (str): Certificate Issuing country
-
-    Returns:
-        bytes: CA Certificate.
-    """
-    private_key_object = serialization.load_pem_private_key(
-        private_key, password=private_key_password
-    )
-    subject = issuer = x509.Name(
-        [
-            x509.NameAttribute(x509.NameOID.COUNTRY_NAME, country),
-            x509.NameAttribute(x509.NameOID.COMMON_NAME, subject),
-        ]
-    )
-    subject_identifier_object = x509.SubjectKeyIdentifier.from_public_key(
-        private_key_object.public_key()  # type: ignore[arg-type]
-    )
-    subject_identifier = key_identifier = subject_identifier_object.public_bytes()
-    cert = (
-        x509.CertificateBuilder()
-        .subject_name(subject)
-        .issuer_name(issuer)
-        .public_key(private_key_object.public_key())  # type: ignore[arg-type]
-        .serial_number(x509.random_serial_number())
-        .not_valid_before(datetime.utcnow())
-        .not_valid_after(datetime.utcnow() + timedelta(days=validity))
-        .add_extension(x509.SubjectKeyIdentifier(digest=subject_identifier), critical=False)
-        .add_extension(
-            x509.AuthorityKeyIdentifier(
-                key_identifier=key_identifier,
-                authority_cert_issuer=None,
-                authority_cert_serial_number=None,
-            ),
-            critical=False,
-        )
-        .add_extension(
-            x509.BasicConstraints(ca=True, path_length=None),
-            critical=True,
-        )
-        .sign(private_key_object, hashes.SHA256())  # type: ignore[arg-type]
-    )
-    return cert.public_bytes(serialization.Encoding.PEM)
-
-
-def generate_certificate(
-    csr: bytes,
-    ca: bytes,
-    ca_key: bytes,
-    ca_key_password: Optional[bytes] = None,
-    validity: int = 365,
-    alt_names: List[str] = None,
-) -> bytes:
-    """Generates a TLS certificate based on a CSR.
-
-    Args:
-        csr (bytes): CSR
-        ca (bytes): CA Certificate
-        ca_key (bytes): CA private key
-        ca_key_password: CA private key password
-        validity (int): Certificate validity (in days)
-        alt_names (list): List of alt names to put on cert - prefer putting SANs in CSR
-
-    Returns:
-        bytes: Certificate
-    """
-    csr_object = x509.load_pem_x509_csr(csr)
-    subject = csr_object.subject
-    issuer = x509.load_pem_x509_certificate(ca).issuer
-    private_key = serialization.load_pem_private_key(ca_key, password=ca_key_password)
-
-    certificate_builder = (
-        x509.CertificateBuilder()
-        .subject_name(subject)
-        .issuer_name(issuer)
-        .public_key(csr_object.public_key())
-        .serial_number(x509.random_serial_number())
-        .not_valid_before(datetime.utcnow())
-        .not_valid_after(datetime.utcnow() + timedelta(days=validity))
-    )
-
-    extensions_list = csr_object.extensions
-    san_ext: Optional[x509.Extension] = None
-    if alt_names:
-        full_sans_dns = alt_names.copy()
-        try:
-            loaded_san_ext = csr_object.extensions.get_extension_for_class(
-                x509.SubjectAlternativeName
-            )
-            full_sans_dns.extend(loaded_san_ext.value.get_values_for_type(x509.DNSName))
-        except ExtensionNotFound:
-            pass
-        finally:
-            san_ext = Extension(
-                ExtensionOID.SUBJECT_ALTERNATIVE_NAME,
-                False,
-                x509.SubjectAlternativeName([x509.DNSName(name) for name in full_sans_dns]),
-            )
-            if not extensions_list:
-                extensions_list = x509.Extensions([san_ext])
-
-    for extension in extensions_list:
-        if extension.value.oid == ExtensionOID.SUBJECT_ALTERNATIVE_NAME and san_ext:
-            extension = san_ext
-
-        certificate_builder = certificate_builder.add_extension(
-            extension.value,
-            critical=extension.critical,
-        )
-    certificate_builder._version = x509.Version.v3
-    cert = certificate_builder.sign(private_key, hashes.SHA256())  # type: ignore[arg-type]
-    return cert.public_bytes(serialization.Encoding.PEM)
-
-
-def generate_pfx_package(
-    certificate: bytes,
-    private_key: bytes,
-    package_password: str,
-    private_key_password: Optional[bytes] = None,
-) -> bytes:
-    """Generates a PFX package to contain the TLS certificate and private key.
-
-    Args:
-        certificate (bytes): TLS certificate
-        private_key (bytes): Private key
-        package_password (str): Password to open the PFX package
-        private_key_password (bytes): Private key password
-
-    Returns:
-        bytes:
-    """
-    private_key_object = serialization.load_pem_private_key(
-        private_key, password=private_key_password
-    )
-    certificate_object = x509.load_pem_x509_certificate(certificate)
-    name = certificate_object.subject.rfc4514_string()
-    pfx_bytes = pkcs12.serialize_key_and_certificates(
-        name=name.encode(),
-        cert=certificate_object,
-        key=private_key_object,  # type: ignore[arg-type]
-        cas=None,
-        encryption_algorithm=serialization.BestAvailableEncryption(package_password.encode()),
-    )
-    return pfx_bytes
-
-
-def generate_private_key(
-    password: Optional[bytes] = None,
-    key_size: int = 2048,
-    public_exponent: int = 65537,
-) -> bytes:
-    """Generates a private key.
-
-    Args:
-        password (bytes): Password for decrypting the private key
-        key_size (int): Key size in bytes
-        public_exponent: Public exponent.
-
-    Returns:
-        bytes: Private Key
-    """
-    private_key = rsa.generate_private_key(
-        public_exponent=public_exponent,
-        key_size=key_size,
-    )
-    key_bytes = private_key.private_bytes(
-        encoding=serialization.Encoding.PEM,
-        format=serialization.PrivateFormat.TraditionalOpenSSL,
-        encryption_algorithm=serialization.BestAvailableEncryption(password)
-        if password
-        else serialization.NoEncryption(),
-    )
-    return key_bytes
-
-
-def generate_csr(
-    private_key: bytes,
-    subject: str,
-    add_unique_id_to_subject_name: bool = True,
-    organization: str = None,
-    email_address: str = None,
-    country_name: str = None,
-    private_key_password: Optional[bytes] = None,
-    sans: Optional[List[str]] = None,
-    sans_oid: Optional[List[str]] = None,
-    sans_ip: Optional[List[str]] = None,
-    sans_dns: Optional[List[str]] = None,
-    additional_critical_extensions: Optional[List] = None,
-) -> bytes:
-    """Generates a CSR using private key and subject.
-
-    Args:
-        private_key (bytes): Private key
-        subject (str): CSR Subject.
-        add_unique_id_to_subject_name (bool): Whether a unique ID must be added to the CSR's
-            subject name. Always leave to "True" when the CSR is used to request certificates
-            using the tls-certificates relation.
-        organization (str): Name of organization.
-        email_address (str): Email address.
-        country_name (str): Country Name.
-        private_key_password (bytes): Private key password
-        sans (list): Use sans_dns - this will be deprecated in a future release
-            List of DNS subject alternative names (keeping it for now for backward compatibility)
-        sans_oid (list): List of registered ID SANs
-        sans_dns (list): List of DNS subject alternative names (similar to the arg: sans)
-        sans_ip (list): List of IP subject alternative names
-        additional_critical_extensions (list): List if critical additional extension objects.
-            Object must be a x509 ExtensionType.
-
-    Returns:
-        bytes: CSR
-    """
-    signing_key = serialization.load_pem_private_key(private_key, password=private_key_password)
-    subject_name = [x509.NameAttribute(x509.NameOID.COMMON_NAME, subject)]
-    if add_unique_id_to_subject_name:
-        unique_identifier = uuid.uuid4()
-        subject_name.append(
-            x509.NameAttribute(x509.NameOID.X500_UNIQUE_IDENTIFIER, str(unique_identifier))
-        )
-    if organization:
-        subject_name.append(x509.NameAttribute(x509.NameOID.ORGANIZATION_NAME, organization))
-    if email_address:
-        subject_name.append(x509.NameAttribute(x509.NameOID.EMAIL_ADDRESS, email_address))
-    if country_name:
-        subject_name.append(x509.NameAttribute(x509.NameOID.COUNTRY_NAME, country_name))
-    csr = x509.CertificateSigningRequestBuilder(subject_name=x509.Name(subject_name))
-
-    _sans: List[x509.GeneralName] = []
-    if sans_oid:
-        _sans.extend([x509.RegisteredID(x509.ObjectIdentifier(san)) for san in sans_oid])
-    if sans_ip:
-        _sans.extend([x509.IPAddress(IPv4Address(san)) for san in sans_ip])
-    if sans:
-        _sans.extend([x509.DNSName(san) for san in sans])
-    if sans_dns:
-        _sans.extend([x509.DNSName(san) for san in sans_dns])
-    if _sans:
-        csr = csr.add_extension(x509.SubjectAlternativeName(set(_sans)), critical=False)
-
-    if additional_critical_extensions:
-        for extension in additional_critical_extensions:
-            csr = csr.add_extension(extension, critical=True)
-
-    signed_certificate = csr.sign(signing_key, hashes.SHA256())  # type: ignore[arg-type]
-    return signed_certificate.public_bytes(serialization.Encoding.PEM)
-
-
-class CertificatesProviderCharmEvents(CharmEvents):
-    """List of events that the TLS Certificates provider charm can leverage."""
-
-    certificate_creation_request = EventSource(CertificateCreationRequestEvent)
-    certificate_revocation_request = EventSource(CertificateRevocationRequestEvent)
-
-
-class CertificatesRequirerCharmEvents(CharmEvents):
-    """List of events that the TLS Certificates requirer charm can leverage."""
-
-    certificate_available = EventSource(CertificateAvailableEvent)
-    certificate_expiring = EventSource(CertificateExpiringEvent)
-    certificate_expired = EventSource(CertificateExpiredEvent)
-
-
-class TLSCertificatesProvidesV1(Object):
-    """TLS certificates provider class to be instantiated by TLS certificates providers."""
-
-    on = CertificatesProviderCharmEvents()
-
-    def __init__(self, charm: CharmBase, relationship_name: str):
-        super().__init__(charm, relationship_name)
-        self.framework.observe(
-            charm.on[relationship_name].relation_changed, self._on_relation_changed
-        )
-        self.charm = charm
-        self.relationship_name = relationship_name
-
-    def _add_certificate(
-        self,
-        relation_id: int,
-        certificate: str,
-        certificate_signing_request: str,
-        ca: str,
-        chain: List[str],
-    ) -> None:
-        """Adds certificate to relation data.
-
-        Args:
-            relation_id (int): Relation id
-            certificate (str): Certificate
-            certificate_signing_request (str): Certificate Signing Request
-            ca (str): CA Certificate
-            chain (list): CA Chain
-
-        Returns:
-            None
-        """
-        relation = self.model.get_relation(
-            relation_name=self.relationship_name, relation_id=relation_id
-        )
-        if not relation:
-            raise RuntimeError(
-                f"Relation {self.relationship_name} does not exist - "
-                f"The certificate request can't be completed"
-            )
-        new_certificate = {
-            "certificate": certificate,
-            "certificate_signing_request": certificate_signing_request,
-            "ca": ca,
-            "chain": chain,
-        }
-        provider_relation_data = _load_relation_data(relation.data[self.charm.app])
-        provider_certificates = provider_relation_data.get("certificates", [])
-        certificates = copy.deepcopy(provider_certificates)
-        if new_certificate in certificates:
-            logger.info("Certificate already in relation data - Doing nothing")
-            return
-        certificates.append(new_certificate)
-        relation.data[self.model.app]["certificates"] = json.dumps(certificates)
-
-    def _remove_certificate(
-        self,
-        relation_id: int,
-        certificate: str = None,
-        certificate_signing_request: str = None,
-    ) -> None:
-        """Removes certificate from a given relation based on user provided certificate or csr.
-
-        Args:
-            relation_id (int): Relation id
-            certificate (str): Certificate (optional)
-            certificate_signing_request: Certificate signing request (optional)
-
-        Returns:
-            None
-        """
-        relation = self.model.get_relation(
-            relation_name=self.relationship_name,
-            relation_id=relation_id,
-        )
-        if not relation:
-            raise RuntimeError(
-                f"Relation {self.relationship_name} with relation id {relation_id} does not exist"
-            )
-        provider_relation_data = _load_relation_data(relation.data[self.charm.app])
-        provider_certificates = provider_relation_data.get("certificates", [])
-        certificates = copy.deepcopy(provider_certificates)
-        for certificate_dict in certificates:
-            if certificate and certificate_dict["certificate"] == certificate:
-                certificates.remove(certificate_dict)
-            if (
-                certificate_signing_request
-                and certificate_dict["certificate_signing_request"] == certificate_signing_request
-            ):
-                certificates.remove(certificate_dict)
-        relation.data[self.model.app]["certificates"] = json.dumps(certificates)
-
-    @staticmethod
-    def _relation_data_is_valid(certificates_data: dict) -> bool:
-        """Uses JSON schema validator to validate relation data content.
-
-        Args:
-            certificates_data (dict): Certificate data dictionary as retrieved from relation data.
-
-        Returns:
-            bool: True/False depending on whether the relation data follows the json schema.
-        """
-        try:
-            validate(instance=certificates_data, schema=REQUIRER_JSON_SCHEMA)
-            return True
-        except exceptions.ValidationError:
-            return False
-
-    def revoke_all_certificates(self) -> None:
-        """Revokes all certificates of this provider.
-
-        This method is meant to be used when the Root CA has changed.
-        """
-        for relation in self.model.relations[self.relationship_name]:
-            relation.data[self.model.app]["certificates"] = json.dumps([])
-
-    def set_relation_certificate(
-        self,
-        certificate: str,
-        certificate_signing_request: str,
-        ca: str,
-        chain: List[str],
-        relation_id: int,
-    ) -> None:
-        """Adds certificates to relation data.
-
-        Args:
-            certificate (str): Certificate
-            certificate_signing_request (str): Certificate signing request
-            ca (str): CA Certificate
-            chain (list): CA Chain
-            relation_id (int): Juju relation ID
-
-        Returns:
-            None
-        """
-        certificates_relation = self.model.get_relation(
-            relation_name=self.relationship_name, relation_id=relation_id
-        )
-        if not certificates_relation:
-            raise RuntimeError(f"Relation {self.relationship_name} does not exist")
-        self._remove_certificate(
-            certificate_signing_request=certificate_signing_request.strip(),
-            relation_id=relation_id,
-        )
-        self._add_certificate(
-            relation_id=relation_id,
-            certificate=certificate.strip(),
-            certificate_signing_request=certificate_signing_request.strip(),
-            ca=ca.strip(),
-            chain=[cert.strip() for cert in chain],
-        )
-
-    def remove_certificate(self, certificate: str) -> None:
-        """Removes a given certificate from relation data.
-
-        Args:
-            certificate (str): TLS Certificate
-
-        Returns:
-            None
-        """
-        certificates_relation = self.model.relations[self.relationship_name]
-        if not certificates_relation:
-            raise RuntimeError(f"Relation {self.relationship_name} does not exist")
-        for certificate_relation in certificates_relation:
-            self._remove_certificate(certificate=certificate, relation_id=certificate_relation.id)
-
-    def _on_relation_changed(self, event: RelationChangedEvent) -> None:
-        """Handler triggerred on relation changed event.
-
-        Looks at the relation data and either emits:
-        - certificate request event: If the unit relation data contains a CSR for which
-            a certificate does not exist in the provider relation data.
-        - certificate revocation event: If the provider relation data contains a CSR for which
-            a csr does not exist in the requirer relation data.
-
-        Args:
-            event: Juju event
-
-        Returns:
-            None
-        """
-        assert event.unit is not None
-        requirer_relation_data = _load_relation_data(event.relation.data[event.unit])
-        provider_relation_data = _load_relation_data(event.relation.data[self.charm.app])
-        if not self._relation_data_is_valid(requirer_relation_data):
-            logger.warning(
-                f"Relation data did not pass JSON Schema validation: {requirer_relation_data}"
-            )
-            return
-        provider_certificates = provider_relation_data.get("certificates", [])
-        requirer_csrs = requirer_relation_data.get("certificate_signing_requests", [])
-        provider_csrs = [
-            certificate_creation_request["certificate_signing_request"]
-            for certificate_creation_request in provider_certificates
-        ]
-        requirer_unit_csrs = [
-            certificate_creation_request["certificate_signing_request"]
-            for certificate_creation_request in requirer_csrs
-        ]
-        for certificate_signing_request in requirer_unit_csrs:
-            if certificate_signing_request not in provider_csrs:
-                self.on.certificate_creation_request.emit(
-                    certificate_signing_request=certificate_signing_request,
-                    relation_id=event.relation.id,
-                )
-        self._revoke_certificates_for_which_no_csr_exists(relation_id=event.relation.id)
-
-    def _revoke_certificates_for_which_no_csr_exists(self, relation_id: int) -> None:
-        """Revokes certificates for which no unit has a CSR.
-
-        Goes through all generated certificates and compare agains the list of CSRS for all units
-        of a given relationship.
-
-        Args:
-            relation_id (int): Relation id
-
-        Returns:
-            None
-        """
-        certificates_relation = self.model.get_relation(
-            relation_name=self.relationship_name, relation_id=relation_id
-        )
-        if not certificates_relation:
-            raise RuntimeError(f"Relation {self.relationship_name} does not exist")
-        provider_relation_data = _load_relation_data(certificates_relation.data[self.charm.app])
-        list_of_csrs: List[str] = []
-        for unit in certificates_relation.units:
-            requirer_relation_data = _load_relation_data(certificates_relation.data[unit])
-            requirer_csrs = requirer_relation_data.get("certificate_signing_requests", [])
-            list_of_csrs.extend(csr["certificate_signing_request"] for csr in requirer_csrs)
-        provider_certificates = provider_relation_data.get("certificates", [])
-        for certificate in provider_certificates:
-            if certificate["certificate_signing_request"] not in list_of_csrs:
-                self.on.certificate_revocation_request.emit(
-                    certificate=certificate["certificate"],
-                    certificate_signing_request=certificate["certificate_signing_request"],
-                    ca=certificate["ca"],
-                    chain=certificate["chain"],
-                )
-                self.remove_certificate(certificate=certificate["certificate"])
-
-
-class TLSCertificatesRequiresV1(Object):
-    """TLS certificates requirer class to be instantiated by TLS certificates requirers."""
-
-    on = CertificatesRequirerCharmEvents()
-
-    def __init__(
-        self,
-        charm: CharmBase,
-        relationship_name: str,
-        expiry_notification_time: int = 168,
-    ):
-        """Generates/use private key and observes relation changed event.
-
-        Args:
-            charm: Charm object
-            relationship_name: Juju relation name
-            expiry_notification_time (int): Time difference between now and expiry (in hours).
-                Used to trigger the CertificateExpiring event. Default: 7 days.
-        """
-        super().__init__(charm, relationship_name)
-        self.relationship_name = relationship_name
-        self.charm = charm
-        self.expiry_notification_time = expiry_notification_time
-        self.framework.observe(
-            charm.on[relationship_name].relation_changed, self._on_relation_changed
-        )
-        self.framework.observe(charm.on.update_status, self._on_update_status)
-
-    @property
-    def _requirer_csrs(self) -> List[Dict[str, str]]:
-        """Returns list of requirer CSR's from relation data."""
-        relation = self.model.get_relation(self.relationship_name)
-        if not relation:
-            raise RuntimeError(f"Relation {self.relationship_name} does not exist")
-        requirer_relation_data = _load_relation_data(relation.data[self.model.unit])
-        return requirer_relation_data.get("certificate_signing_requests", [])
-
-    @property
-    def _provider_certificates(self) -> List[Dict[str, str]]:
-        """Returns list of provider CSR's from relation data."""
-        relation = self.model.get_relation(self.relationship_name)
-        if not relation:
-            raise RuntimeError(f"Relation {self.relationship_name} does not exist")
-        if not relation.app:
-            raise RuntimeError(f"Remote app for relation {self.relationship_name} does not exist")
-        provider_relation_data = _load_relation_data(relation.data[relation.app])
-        return provider_relation_data.get("certificates", [])
-
-    def _add_requirer_csr(self, csr: str) -> None:
-        """Adds CSR to relation data.
-
-        Args:
-            csr (str): Certificate Signing Request
-
-        Returns:
-            None
-        """
-        relation = self.model.get_relation(self.relationship_name)
-        if not relation:
-            raise RuntimeError(
-                f"Relation {self.relationship_name} does not exist - "
-                f"The certificate request can't be completed"
-            )
-        new_csr_dict = {"certificate_signing_request": csr}
-        if new_csr_dict in self._requirer_csrs:
-            logger.info("CSR already in relation data - Doing nothing")
-            return
-        requirer_csrs = copy.deepcopy(self._requirer_csrs)
-        requirer_csrs.append(new_csr_dict)
-        relation.data[self.model.unit]["certificate_signing_requests"] = json.dumps(requirer_csrs)
-
-    def _remove_requirer_csr(self, csr: str) -> None:
-        """Removes CSR from relation data.
-
-        Args:
-            csr (str): Certificate signing request
-
-        Returns:
-            None
-        """
-        relation = self.model.get_relation(self.relationship_name)
-        if not relation:
-            raise RuntimeError(
-                f"Relation {self.relationship_name} does not exist - "
-                f"The certificate request can't be completed"
-            )
-        requirer_csrs = copy.deepcopy(self._requirer_csrs)
-        csr_dict = {"certificate_signing_request": csr}
-        if csr_dict not in requirer_csrs:
-            logger.info("CSR not in relation data - Doing nothing")
-            return
-        requirer_csrs.remove(csr_dict)
-        relation.data[self.model.unit]["certificate_signing_requests"] = json.dumps(requirer_csrs)
-
-    def request_certificate_creation(self, certificate_signing_request: bytes) -> None:
-        """Request TLS certificate to provider charm.
-
-        Args:
-            certificate_signing_request (bytes): Certificate Signing Request
-
-        Returns:
-            None
-        """
-        relation = self.model.get_relation(self.relationship_name)
-        if not relation:
-            message = (
-                f"Relation {self.relationship_name} does not exist - "
-                f"The certificate request can't be completed"
-            )
-            logger.error(message)
-            raise RuntimeError(message)
-        self._add_requirer_csr(certificate_signing_request.decode().strip())
-        logger.info("Certificate request sent to provider")
-
-    def request_certificate_revocation(self, certificate_signing_request: bytes) -> None:
-        """Removes CSR from relation data.
-
-        The provider of this relation is then expected to remove certificates associated to this
-        CSR from the relation data as well and emit a request_certificate_revocation event for the
-        provider charm to interpret.
-
-        Args:
-            certificate_signing_request (bytes): Certificate Signing Request
-
-        Returns:
-            None
-        """
-        self._remove_requirer_csr(certificate_signing_request.decode().strip())
-        logger.info("Certificate revocation sent to provider")
-
-    def request_certificate_renewal(
-        self, old_certificate_signing_request: bytes, new_certificate_signing_request: bytes
-    ) -> None:
-        """Renews certificate.
-
-        Removes old CSR from relation data and adds new one.
-
-        Args:
-            old_certificate_signing_request: Old CSR
-            new_certificate_signing_request: New CSR
-
-        Returns:
-            None
-        """
-        try:
-            self.request_certificate_revocation(
-                certificate_signing_request=old_certificate_signing_request
-            )
-        except RuntimeError:
-            logger.warning("Certificate revocation failed.")
-        self.request_certificate_creation(
-            certificate_signing_request=new_certificate_signing_request
-        )
-        logger.info("Certificate renewal request completed.")
-
-    @staticmethod
-    def _relation_data_is_valid(certificates_data: dict) -> bool:
-        """Checks whether relation data is valid based on json schema.
-
-        Args:
-            certificates_data: Certificate data in dict format.
-
-        Returns:
-            bool: Whether relation data is valid.
-        """
-        try:
-            validate(instance=certificates_data, schema=PROVIDER_JSON_SCHEMA)
-            return True
-        except exceptions.ValidationError:
-            return False
-
-    def _on_relation_changed(self, event: RelationChangedEvent) -> None:
-        """Handler triggerred on relation changed events.
-
-        Args:
-            event: Juju event
-
-        Returns:
-            None
-        """
-        relation = self.model.get_relation(self.relationship_name)
-        if not relation:
-            logger.warning(f"No relation: {self.relationship_name}")
-            return
-        if not relation.app:
-            logger.warning(f"No remote app in relation: {self.relationship_name}")
-            return
-        provider_relation_data = _load_relation_data(relation.data[relation.app])
-        if not self._relation_data_is_valid(provider_relation_data):
-            logger.warning(
-                f"Provider relation data did not pass JSON Schema validation: "
-                f"{event.relation.data[relation.app]}"
-            )
-            return
-        requirer_csrs = [
-            certificate_creation_request["certificate_signing_request"]
-            for certificate_creation_request in self._requirer_csrs
-        ]
-        for certificate in self._provider_certificates:
-            if certificate["certificate_signing_request"] in requirer_csrs:
-                self.on.certificate_available.emit(
-                    certificate_signing_request=certificate["certificate_signing_request"],
-                    certificate=certificate["certificate"],
-                    ca=certificate["ca"],
-                    chain=certificate["chain"],
-                )
-
-    def _on_update_status(self, event: UpdateStatusEvent) -> None:
-        """Triggered on update status event.
-
-        Goes through each certificate in the "certificates" relation and checks their expiry date.
-        If they are close to expire (<7 days), emits a CertificateExpiringEvent event and if
-        they are expired, emits a CertificateExpiredEvent.
-
-        Args:
-            event (UpdateStatusEvent): Juju event
-
-        Returns:
-            None
-        """
-        relation = self.model.get_relation(self.relationship_name)
-        if not relation:
-            logger.warning(f"No relation: {self.relationship_name}")
-            return
-        if not relation.app:
-            logger.warning(f"No remote app in relation: {self.relationship_name}")
-            return
-        provider_relation_data = _load_relation_data(relation.data[relation.app])
-        if not self._relation_data_is_valid(provider_relation_data):
-            logger.warning(
-                f"Provider relation data did not pass JSON Schema validation: "
-                f"{relation.data[relation.app]}"
-            )
-            return
-        for certificate_dict in self._provider_certificates:
-            certificate = certificate_dict["certificate"]
-            try:
-                certificate_object = x509.load_pem_x509_certificate(data=certificate.encode())
-            except ValueError:
-                logger.warning("Could not load certificate.")
-                continue
-            time_difference = certificate_object.not_valid_after - datetime.utcnow()
-            if time_difference.total_seconds() < 0:
-                logger.warning("Certificate is expired")
-                self.on.certificate_expired.emit(certificate=certificate)
-                self.request_certificate_revocation(certificate.encode())
-                continue
-            if time_difference.total_seconds() < (self.expiry_notification_time * 60 * 60):
-                logger.warning("Certificate almost expired")
-                self.on.certificate_expiring.emit(
-                    certificate=certificate, expiry=certificate_object.not_valid_after.isoformat()
-                )
diff --git a/lib/charms/traefik_k8s/v1/ingress.py b/lib/charms/traefik_k8s/v1/ingress.py
deleted file mode 100644
index e1769e8..0000000
--- a/lib/charms/traefik_k8s/v1/ingress.py
+++ /dev/null
@@ -1,558 +0,0 @@
-# Copyright 2022 Canonical Ltd.
-# See LICENSE file for licensing details.
-
-r"""# Interface Library for ingress.
-
-This library wraps relation endpoints using the `ingress` interface
-and provides a Python API for both requesting and providing per-application
-ingress, with load-balancing occurring across all units.
-
-## Getting Started
-
-To get started using the library, you just need to fetch the library using `charmcraft`.
-
-```shell
-cd some-charm
-charmcraft fetch-lib charms.traefik_k8s.v1.ingress
-```
-
-In the `metadata.yaml` of the charm, add the following:
-
-```yaml
-requires:
-    ingress:
-        interface: ingress
-        limit: 1
-```
-
-Then, to initialise the library:
-
-```python
-from charms.traefik_k8s.v1.ingress import (IngressPerAppRequirer,
-  IngressPerAppReadyEvent, IngressPerAppRevokedEvent)
-
-class SomeCharm(CharmBase):
-  def __init__(self, *args):
-    # ...
-    self.ingress = IngressPerAppRequirer(self, port=80)
-    # The following event is triggered when the ingress URL to be used
-    # by this deployment of the `SomeCharm` is ready (or changes).
-    self.framework.observe(
-        self.ingress.on.ready, self._on_ingress_ready
-    )
-    self.framework.observe(
-        self.ingress.on.revoked, self._on_ingress_revoked
-    )
-
-    def _on_ingress_ready(self, event: IngressPerAppReadyEvent):
-        logger.info("This app's ingress URL: %s", event.url)
-
-    def _on_ingress_revoked(self, event: IngressPerAppRevokedEvent):
-        logger.info("This app no longer has ingress")
-"""
-
-import logging
-import socket
-import typing
-from typing import Any, Dict, Optional, Tuple, Union
-
-import yaml
-from ops.charm import CharmBase, RelationBrokenEvent, RelationEvent
-from ops.framework import EventSource, Object, ObjectEvents, StoredState
-from ops.model import ModelError, Relation
-
-# The unique Charmhub library identifier, never change it
-LIBID = "e6de2a5cd5b34422a204668f3b8f90d2"
-
-# Increment this major API version when introducing breaking changes
-LIBAPI = 1
-
-# Increment this PATCH version before using `charmcraft publish-lib` or reset
-# to 0 if you are raising the major API version
-LIBPATCH = 5
-
-DEFAULT_RELATION_NAME = "ingress"
-RELATION_INTERFACE = "ingress"
-
-log = logging.getLogger(__name__)
-
-try:
-    import jsonschema
-
-    DO_VALIDATION = True
-except ModuleNotFoundError:
-    log.warning(
-        "The `ingress` library needs the `jsonschema` package to be able "
-        "to do runtime data validation; without it, it will still work but validation "
-        "will be disabled. \n"
-        "It is recommended to add `jsonschema` to the 'requirements.txt' of your charm, "
-        "which will enable this feature."
-    )
-    DO_VALIDATION = False
-
-INGRESS_REQUIRES_APP_SCHEMA = {
-    "type": "object",
-    "properties": {
-        "model": {"type": "string"},
-        "name": {"type": "string"},
-        "host": {"type": "string"},
-        "port": {"type": "string"},
-        "strip-prefix": {"type": "string"},
-    },
-    "required": ["model", "name", "host", "port"],
-}
-
-INGRESS_PROVIDES_APP_SCHEMA = {
-    "type": "object",
-    "properties": {
-        "ingress": {"type": "object", "properties": {"url": {"type": "string"}}},
-    },
-    "required": ["ingress"],
-}
-
-try:
-    from typing import TypedDict
-except ImportError:
-    from typing_extensions import TypedDict  # py35 compat
-
-# Model of the data a unit implementing the requirer will need to provide.
-RequirerData = TypedDict(
-    "RequirerData",
-    {"model": str, "name": str, "host": str, "port": int, "strip-prefix": bool},
-    total=False,
-)
-# Provider ingress data model.
-ProviderIngressData = TypedDict("ProviderIngressData", {"url": str})
-# Provider application databag model.
-ProviderApplicationData = TypedDict("ProviderApplicationData", {"ingress": ProviderIngressData})
-
-
-def _validate_data(data, schema):
-    """Checks whether `data` matches `schema`.
-
-    Will raise DataValidationError if the data is not valid, else return None.
-    """
-    if not DO_VALIDATION:
-        return
-    try:
-        jsonschema.validate(instance=data, schema=schema)
-    except jsonschema.ValidationError as e:
-        raise DataValidationError(data, schema) from e
-
-
-class DataValidationError(RuntimeError):
-    """Raised when data validation fails on IPU relation data."""
-
-
-class _IngressPerAppBase(Object):
-    """Base class for IngressPerUnit interface classes."""
-
-    def __init__(self, charm: CharmBase, relation_name: str = DEFAULT_RELATION_NAME):
-        super().__init__(charm, relation_name)
-
-        self.charm: CharmBase = charm
-        self.relation_name = relation_name
-        self.app = self.charm.app
-        self.unit = self.charm.unit
-
-        observe = self.framework.observe
-        rel_events = charm.on[relation_name]
-        observe(rel_events.relation_created, self._handle_relation)
-        observe(rel_events.relation_joined, self._handle_relation)
-        observe(rel_events.relation_changed, self._handle_relation)
-        observe(rel_events.relation_broken, self._handle_relation_broken)
-        observe(charm.on.leader_elected, self._handle_upgrade_or_leader)
-        observe(charm.on.upgrade_charm, self._handle_upgrade_or_leader)
-
-    @property
-    def relations(self):
-        """The list of Relation instances associated with this endpoint."""
-        return list(self.charm.model.relations[self.relation_name])
-
-    def _handle_relation(self, event):
-        """Subclasses should implement this method to handle a relation update."""
-        pass
-
-    def _handle_relation_broken(self, event):
-        """Subclasses should implement this method to handle a relation breaking."""
-        pass
-
-    def _handle_upgrade_or_leader(self, event):
-        """Subclasses should implement this method to handle upgrades or leadership change."""
-        pass
-
-
-class _IPAEvent(RelationEvent):
-    __args__ = ()  # type: Tuple[str, ...]
-    __optional_kwargs__ = {}  # type: Dict[str, Any]
-
-    @classmethod
-    def __attrs__(cls):
-        return cls.__args__ + tuple(cls.__optional_kwargs__.keys())
-
-    def __init__(self, handle, relation, *args, **kwargs):
-        super().__init__(handle, relation)
-
-        if not len(self.__args__) == len(args):
-            raise TypeError("expected {} args, got {}".format(len(self.__args__), len(args)))
-
-        for attr, obj in zip(self.__args__, args):
-            setattr(self, attr, obj)
-        for attr, default in self.__optional_kwargs__.items():
-            obj = kwargs.get(attr, default)
-            setattr(self, attr, obj)
-
-    def snapshot(self) -> dict:
-        dct = super().snapshot()
-        for attr in self.__attrs__():
-            obj = getattr(self, attr)
-            try:
-                dct[attr] = obj
-            except ValueError as e:
-                raise ValueError(
-                    "cannot automagically serialize {}: "
-                    "override this method and do it "
-                    "manually.".format(obj)
-                ) from e
-
-        return dct
-
-    def restore(self, snapshot: dict) -> None:
-        super().restore(snapshot)
-        for attr, obj in snapshot.items():
-            setattr(self, attr, obj)
-
-
-class IngressPerAppDataProvidedEvent(_IPAEvent):
-    """Event representing that ingress data has been provided for an app."""
-
-    __args__ = ("name", "model", "port", "host", "strip_prefix")
-
-    if typing.TYPE_CHECKING:
-        name = None  # type: str
-        model = None  # type: str
-        port = None  # type: int
-        host = None  # type: str
-        strip_prefix = False  # type: bool
-
-
-class IngressPerAppDataRemovedEvent(RelationEvent):
-    """Event representing that ingress data has been removed for an app."""
-
-
-class IngressPerAppProviderEvents(ObjectEvents):
-    """Container for IPA Provider events."""
-
-    data_provided = EventSource(IngressPerAppDataProvidedEvent)
-    data_removed = EventSource(IngressPerAppDataRemovedEvent)
-
-
-class IngressPerAppProvider(_IngressPerAppBase):
-    """Implementation of the provider of ingress."""
-
-    on = IngressPerAppProviderEvents()
-
-    def __init__(self, charm: CharmBase, relation_name: str = DEFAULT_RELATION_NAME):
-        """Constructor for IngressPerAppProvider.
-
-        Args:
-            charm: The charm that is instantiating the instance.
-            relation_name: The name of the relation endpoint to bind to
-                (defaults to "ingress").
-        """
-        super().__init__(charm, relation_name)
-
-    def _handle_relation(self, event):
-        # created, joined or changed: if remote side has sent the required data:
-        # notify listeners.
-        if self.is_ready(event.relation):
-            data = self._get_requirer_data(event.relation)
-            self.on.data_provided.emit(
-                event.relation,
-                data["name"],
-                data["model"],
-                data["port"],
-                data["host"],
-                data.get("strip-prefix", False),
-            )
-
-    def _handle_relation_broken(self, event):
-        self.on.data_removed.emit(event.relation)
-
-    def wipe_ingress_data(self, relation: Relation):
-        """Clear ingress data from relation."""
-        assert self.unit.is_leader(), "only leaders can do this"
-        try:
-            relation.data
-        except ModelError as e:
-            log.warning(
-                "error {} accessing relation data for {!r}. "
-                "Probably a ghost of a dead relation is still "
-                "lingering around.".format(e, relation.name)
-            )
-            return
-        del relation.data[self.app]["ingress"]
-
-    def _get_requirer_data(self, relation: Relation) -> RequirerData:
-        """Fetch and validate the requirer's app databag.
-
-        For convenience, we convert 'port' to integer.
-        """
-        if not all((relation.app, relation.app.name)):
-            # Handle edge case where remote app name can be missing, e.g.,
-            # relation_broken events.
-            # FIXME https://github.com/canonical/traefik-k8s-operator/issues/34
-            return {}
-
-        databag = relation.data[relation.app]
-        remote_data = {}  # type: Dict[str, Union[int, str]]
-        for k in ("port", "host", "model", "name", "mode", "strip-prefix"):
-            v = databag.get(k)
-            if v is not None:
-                remote_data[k] = v
-        _validate_data(remote_data, INGRESS_REQUIRES_APP_SCHEMA)
-        remote_data["port"] = int(remote_data["port"])
-        remote_data["strip-prefix"] = bool(remote_data.get("strip-prefix", False))
-        return remote_data
-
-    def get_data(self, relation: Relation) -> RequirerData:
-        """Fetch the remote app's databag, i.e. the requirer data."""
-        return self._get_requirer_data(relation)
-
-    def is_ready(self, relation: Relation = None):
-        """The Provider is ready if the requirer has sent valid data."""
-        if not relation:
-            return any(map(self.is_ready, self.relations))
-
-        try:
-            return bool(self._get_requirer_data(relation))
-        except DataValidationError as e:
-            log.warning("Requirer not ready; validation error encountered: %s" % str(e))
-            return False
-
-    def _provided_url(self, relation: Relation) -> ProviderIngressData:
-        """Fetch and validate this app databag; return the ingress url."""
-        if not all((relation.app, relation.app.name, self.unit.is_leader())):
-            # Handle edge case where remote app name can be missing, e.g.,
-            # relation_broken events.
-            # Also, only leader units can read own app databags.
-            # FIXME https://github.com/canonical/traefik-k8s-operator/issues/34
-            return {}  # noqa
-
-        # fetch the provider's app databag
-        raw_data = relation.data[self.app].get("ingress")
-        if not raw_data:
-            raise RuntimeError("This application did not `publish_url` yet.")
-
-        ingress: ProviderIngressData = yaml.safe_load(raw_data)
-        _validate_data({"ingress": ingress}, INGRESS_PROVIDES_APP_SCHEMA)
-        return ingress
-
-    def publish_url(self, relation: Relation, url: str):
-        """Publish to the app databag the ingress url."""
-        ingress = {"url": url}
-        ingress_data = {"ingress": ingress}
-        _validate_data(ingress_data, INGRESS_PROVIDES_APP_SCHEMA)
-        relation.data[self.app]["ingress"] = yaml.safe_dump(ingress)
-
-    @property
-    def proxied_endpoints(self):
-        """Returns the ingress settings provided to applications by this IngressPerAppProvider.
-
-        For example, when this IngressPerAppProvider has provided the
-        `http://foo.bar/my-model.my-app` URL to the my-app application, the returned dictionary
-        will be:
-
-        ```
-        {
-            "my-app": {
-                "url": "http://foo.bar/my-model.my-app"
-            }
-        }
-        ```
-        """
-        results = {}
-
-        for ingress_relation in self.relations:
-            results[ingress_relation.app.name] = self._provided_url(ingress_relation)
-
-        return results
-
-
-class IngressPerAppReadyEvent(_IPAEvent):
-    """Event representing that ingress for an app is ready."""
-
-    __args__ = ("url",)
-    if typing.TYPE_CHECKING:
-        url = None  # type: str
-
-
-class IngressPerAppRevokedEvent(RelationEvent):
-    """Event representing that ingress for an app has been revoked."""
-
-
-class IngressPerAppRequirerEvents(ObjectEvents):
-    """Container for IPA Requirer events."""
-
-    ready = EventSource(IngressPerAppReadyEvent)
-    revoked = EventSource(IngressPerAppRevokedEvent)
-
-
-class IngressPerAppRequirer(_IngressPerAppBase):
-    """Implementation of the requirer of the ingress relation."""
-
-    on = IngressPerAppRequirerEvents()
-    # used to prevent spur1ious urls to be sent out if the event we're currently
-    # handling is a relation-broken one.
-    _stored = StoredState()
-
-    def __init__(
-        self,
-        charm: CharmBase,
-        relation_name: str = DEFAULT_RELATION_NAME,
-        *,
-        host: str = None,
-        port: int = None,
-        strip_prefix: bool = False,
-    ):
-        """Constructor for IngressRequirer.
-
-        The request args can be used to specify the ingress properties when the
-        instance is created. If any are set, at least `port` is required, and
-        they will be sent to the ingress provider as soon as it is available.
-        All request args must be given as keyword args.
-
-        Args:
-            charm: the charm that is instantiating the library.
-            relation_name: the name of the relation endpoint to bind to (defaults to `ingress`);
-                relation must be of interface type `ingress` and have "limit: 1")
-            host: Hostname to be used by the ingress provider to address the requiring
-                application; if unspecified, the default Kubernetes service name will be used.
-            strip_prefix: configure Traefik to strip the path prefix.
-
-        Request Args:
-            port: the port of the service
-        """
-        super().__init__(charm, relation_name)
-        self.charm: CharmBase = charm
-        self.relation_name = relation_name
-        self._strip_prefix = strip_prefix
-
-        self._stored.set_default(current_url=None)
-
-        # if instantiated with a port, and we are related, then
-        # we immediately publish our ingress data  to speed up the process.
-        if port:
-            self._auto_data = host, port
-        else:
-            self._auto_data = None
-
-    def _handle_relation(self, event):
-        # created, joined or changed: if we have auto data: publish it
-        self._publish_auto_data(event.relation)
-
-        if self.is_ready():
-            # Avoid spurious events, emit only when there is a NEW URL available
-            new_url = (
-                None
-                if isinstance(event, RelationBrokenEvent)
-                else self._get_url_from_relation_data()
-            )
-            if self._stored.current_url != new_url:
-                self._stored.current_url = new_url
-                self.on.ready.emit(event.relation, new_url)
-
-    def _handle_relation_broken(self, event):
-        self._stored.current_url = None
-        self.on.revoked.emit(event.relation)
-
-    def _handle_upgrade_or_leader(self, event):
-        """On upgrade/leadership change: ensure we publish the data we have."""
-        for relation in self.relations:
-            self._publish_auto_data(relation)
-
-    def is_ready(self):
-        """The Requirer is ready if the Provider has sent valid data."""
-        try:
-            return bool(self._get_url_from_relation_data())
-        except DataValidationError as e:
-            log.warning("Requirer not ready; validation error encountered: %s" % str(e))
-            return False
-
-    def _publish_auto_data(self, relation: Relation):
-        if self._auto_data and self.unit.is_leader():
-            host, port = self._auto_data
-            self.provide_ingress_requirements(host=host, port=port)
-
-    def provide_ingress_requirements(self, *, host: str = None, port: int):
-        """Publishes the data that Traefik needs to provide ingress.
-
-        NB only the leader unit is supposed to do this.
-
-        Args:
-            host: Hostname to be used by the ingress provider to address the
-             requirer unit; if unspecified, FQDN will be used instead
-            port: the port of the service (required)
-        """
-        # get only the leader to publish the data since we only
-        # require one unit to publish it -- it will not differ between units,
-        # unlike in ingress-per-unit.
-        assert self.unit.is_leader(), "only leaders should do this."
-        assert self.relation, "no relation"
-
-        if not host:
-            host = socket.getfqdn()
-
-        data = {
-            "model": self.model.name,
-            "name": self.app.name,
-            "host": host,
-            "port": str(port),
-        }
-
-        if self._strip_prefix:
-            data["strip-prefix"] = "true"
-
-        _validate_data(data, INGRESS_REQUIRES_APP_SCHEMA)
-        self.relation.data[self.app].update(data)
-
-    @property
-    def relation(self):
-        """The established Relation instance, or None."""
-        return self.relations[0] if self.relations else None
-
-    def _get_url_from_relation_data(self) -> Optional[str]:
-        """The full ingress URL to reach the current unit.
-
-        Returns None if the URL isn't available yet.
-        """
-        relation = self.relation
-        if not relation:
-            return None
-
-        # fetch the provider's app databag
-        try:
-            raw = relation.data.get(relation.app, {}).get("ingress")
-        except ModelError as e:
-            log.debug(
-                f"Error {e} attempting to read remote app data; "
-                f"probably we are in a relation_departed hook"
-            )
-            return None
-
-        if not raw:
-            return None
-
-        ingress: ProviderIngressData = yaml.safe_load(raw)
-        _validate_data({"ingress": ingress}, INGRESS_PROVIDES_APP_SCHEMA)
-        return ingress["url"]
-
-    @property
-    def url(self) -> Optional[str]:
-        """The full ingress URL to reach the current unit.
-
-        Returns None if the URL isn't available yet.
-        """
-        data = self._stored.current_url or None  # type: ignore
-        assert isinstance(data, (str, type(None)))  # for static checker
-        return data
diff --git a/metadata.yaml b/metadata.yaml
deleted file mode 100644
index c36ca46..0000000
--- a/metadata.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
-name: openstack-hypervisor
- 
-display-name: OpenStack Hypervisor
-
-summary: Deploy the OpenStack hypervisor
-
-description: |
-  Configure machine to run VMs as part of an OpenStack cloud.
-
-requires:
-  amqp:
-    interface: rabbitmq
-  identity-credentials:
-    interface: keystone-credentials
-  ovsdb-cms:
-    interface: ovsdb-cms
-  certificates:
-    interface: tls-certificates
-    optional: true
-  ceilometer-service:
-    interface: ceilometer
-    optional: true
-  ceph-access:
-    interface: cinder-ceph-key
-    optional: true
-
-provides:
-  cos-agent:
-    interface: cos_agent
-
-extra-bindings:
-  migration:
-
-# This charm has no peer relation by design. This charm needs to scale to
-# hundreds of units and this is limited by the peer relation.
-
-assumes:
-  - juju >= 3.1
diff --git a/osci.yaml b/osci.yaml
deleted file mode 100644
index 91848ef..0000000
--- a/osci.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-- project:
-    templates:
-      - charm-publish-jobs
-    vars:
-      needs_charm_build: true
-      charm_build_name: openstack-hypervisor
-      build_type: charmcraft
-      publish_charm: true
-      charmcraft_channel: 2.0/stable
-      publish_channel: 2023.2/edge
diff --git a/pyproject.toml b/pyproject.toml
deleted file mode 100644
index 3082140..0000000
--- a/pyproject.toml
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2023 Canonical Ltd.
-# See LICENSE file for licensing details.
-
-# Testing tools configuration
-[tool.coverage.run]
-branch = true
-
-[tool.coverage.report]
-show_missing = true
-
-[tool.pytest.ini_options]
-minversion = "6.0"
-log_cli_level = "INFO"
-
-# Formatting tools configuration
-[tool.black]
-line-length = 79
-
-[tool.isort]
-profile = "black"
-multi_line_output = 3
-force_grid_wrap = true
-
-# Linting tools configuration
-[tool.flake8]
-max-line-length = 79
-max-doc-length = 99
-max-complexity = 10
-exclude = [".git", "__pycache__", ".tox", "build", "dist", "*.egg_info", "venv"]
-select = ["E", "W", "F", "C", "N", "R", "D", "H"]
-# Ignore W503, E501 because using black creates errors with this
-# Ignore D107 Missing docstring in __init__
-ignore = ["W503", "E501", "D107", "E402"]
-per-file-ignores = []
-docstring-convention = "google"
-# Check for properly formatted copyright header in each file
-copyright-check = "True"
-copyright-author = "Canonical Ltd."
-copyright-regexp = "Copyright\\s\\d{4}([-,]\\d{4})*\\s+%(author)s"
diff --git a/rename.sh b/rename.sh
deleted file mode 100755
index d0c35c9..0000000
--- a/rename.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-charm=$(grep "charm_build_name" osci.yaml | awk '{print $2}')
-echo "renaming ${charm}_*.charm to ${charm}.charm"
-echo -n "pwd: "
-pwd
-ls -al
-echo "Removing bad downloaded charm maybe?"
-if [[ -e "${charm}.charm" ]];
-then
-    rm "${charm}.charm"
-fi
-echo "Renaming charm here."
-mv ${charm}_*.charm ${charm}.charm
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index 17f89a3..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-cryptography
-ops >= 1.5.0
-pyroute2
-netifaces
-jsonschema
-jinja2
-cosl==0.0.5 ; python_version >= "3.8"
-pydantic==1.10.12 ; python_version >= "3.8"
-
-git+https://opendev.org/openstack/charm-ops-sunbeam#egg=ops_sunbeam
-
-# This charm does not use lightkube* but ops_sunbeam requires it atm
-lightkube
-lightkube-models
diff --git a/src/charm.py b/src/charm.py
deleted file mode 100755
index 197b3cd..0000000
--- a/src/charm.py
+++ /dev/null
@@ -1,500 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright 2023 Canonical Ltd.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-
-"""OpenStack Hypervisor Operator Charm.
-
-This charm provide hypervisor services as part of an OpenStack deployment
-"""
-
-import base64
-import logging
-import os
-import secrets
-import socket
-import string
-from typing import (
-    List,
-    Optional,
-    Set,
-)
-
-import charms.operator_libs_linux.v2.snap as snap
-import ops.framework
-import ops_sunbeam.charm as sunbeam_charm
-import ops_sunbeam.guard as sunbeam_guard
-import ops_sunbeam.ovn.relation_handlers as ovn_relation_handlers
-import ops_sunbeam.relation_handlers as sunbeam_rhandlers
-from charms.ceilometer_k8s.v0.ceilometer_service import (
-    CeilometerConfigChangedEvent,
-    CeilometerServiceGoneAwayEvent,
-)
-from charms.grafana_agent.v0.cos_agent import (
-    COSAgentProvider,
-)
-from cryptography import (
-    x509,
-)
-from ops.charm import (
-    ActionEvent,
-)
-from ops.main import (
-    main,
-)
-
-from utils import (
-    get_local_ip_by_default_route,
-)
-
-logger = logging.getLogger(__name__)
-
-MIGRATION_BINDING = "migration"
-MTLS_USAGES = {x509.OID_SERVER_AUTH, x509.OID_CLIENT_AUTH}
-
-
-class MTlsCertificatesHandler(sunbeam_rhandlers.TlsCertificatesHandler):
-    """Handler for certificates interface."""
-
-    def update_relation_data(self):
-        """Update relation outside of relation context."""
-        relations = self.model.relations[self.relation_name]
-        if len(relations) != 1:
-            logger.debug(
-                f"Unit has wrong number of {self.relation_name!r} relations."
-            )
-            return
-        relation = relations[0]
-        csr = self._get_csr_from_relation_unit_data()
-        if not csr:
-            self._request_certificates()
-            return
-        certs = self._get_cert_from_relation_data(csr)
-        if "cert" not in certs or not self._has_certificate_mtls_extensions(
-            certs["cert"]
-        ):
-            logger.info(
-                "Requesting new certificates, current is missing mTLS extensions."
-            )
-            relation.data[self.model.unit][
-                "certificate_signing_requests"
-            ] = "[]"
-            self._request_certificates()
-
-    def _has_certificate_mtls_extensions(self, certificate: str) -> bool:
-        """Check current certificate has mTLS extensions."""
-        cert = x509.load_pem_x509_certificate(certificate.encode())
-        for extension in cert.extensions:
-            if extension.oid != x509.OID_EXTENDED_KEY_USAGE:
-                continue
-            extension_oids = {ext.dotted_string for ext in extension.value}
-            mtls_oids = {oid.dotted_string for oid in MTLS_USAGES}
-            if mtls_oids.issubset(extension_oids):
-                return True
-        return False
-
-    def _request_certificates(self):
-        """Request certificates from remote provider."""
-        # Lazy import to ensure this lib is only required if the charm
-        # has this relation.
-        from charms.tls_certificates_interface.v1.tls_certificates import (
-            generate_csr,
-        )
-
-        if self.ready:
-            logger.debug("Certificate request already complete.")
-            return
-
-        if self.private_key:
-            logger.debug("Private key found, requesting certificates")
-        else:
-            logger.debug("Cannot request certificates, private key not found")
-            return
-
-        csr = generate_csr(
-            private_key=self.private_key.encode(),
-            subject=socket.getfqdn(),
-            sans_dns=self.sans_dns,
-            sans_ip=self.sans_ips,
-            additional_critical_extensions=[
-                x509.KeyUsage(
-                    digital_signature=True,
-                    content_commitment=False,
-                    key_encipherment=True,
-                    data_encipherment=False,
-                    key_agreement=True,
-                    key_cert_sign=False,
-                    crl_sign=False,
-                    encipher_only=False,
-                    decipher_only=False,
-                ),
-                x509.ExtendedKeyUsage(MTLS_USAGES),
-            ],
-        )
-        self.certificates.request_certificate_creation(
-            certificate_signing_request=csr
-        )
-
-    def context(self) -> dict:
-        """Certificates context."""
-        csr_from_unit = self._get_csr_from_relation_unit_data()
-        if not csr_from_unit:
-            return {}
-
-        certs = self._get_cert_from_relation_data(csr_from_unit)
-        cert = certs["cert"]
-        ca_cert = certs["ca"]
-        ca_with_intermediates = certs["ca"] + "\n" + "\n".join(certs["chain"])
-
-        ctxt = {
-            "key": self.private_key,
-            "cert": cert,
-            "ca_cert": ca_cert,
-            "ca_with_intermediates": ca_with_intermediates,
-        }
-        return ctxt
-
-    @property
-    def ready(self) -> bool:
-        """Whether handler ready for use."""
-        try:
-            return super().ready
-        except KeyError:
-            return False
-
-
-class HypervisorOperatorCharm(sunbeam_charm.OSBaseOperatorCharm):
-    """Charm the service."""
-
-    _state = ops.framework.StoredState()
-    service_name = "hypervisor"
-    METADATA_SECRET_KEY = "ovn-metadata-proxy-shared-secret"
-    DEFAULT_SECRET_LENGTH = 32
-
-    mandatory_relations = {"amqp", "identity-credentials", "ovsdb-cms"}
-
-    def __init__(self, framework: ops.framework.Framework) -> None:
-        """Run constructor."""
-        super().__init__(framework)
-        self._state.set_default(metadata_secret="")
-        self.enable_monitoring = self.check_relation_exists("cos-agent")
-        # Enable telemetry when ceilometer-service relation is joined
-        self.enable_telemetry = self.check_relation_exists(
-            "ceilometer-service"
-        )
-        self.framework.observe(
-            self.on.set_hypervisor_local_settings_action,
-            self._set_hypervisor_local_settings_action,
-        )
-        self.framework.observe(
-            self.on.cos_agent_relation_joined,
-            self._on_cos_agent_relation_joined,
-        )
-        self.framework.observe(
-            self.on.cos_agent_relation_departed,
-            self._on_cos_agent_relation_departed,
-        )
-        self._grafana_agent = COSAgentProvider(
-            self,
-            metrics_endpoints=[
-                {"path": "/metrics", "port": 9177},  # libvirt exporter
-                {"path": "/metrics", "port": 9475},  # ovs exporter
-                {"path": "/metrics", "port": 12345},  # node exporter
-            ],
-        )
-
-    @property
-    def migration_address(self) -> Optional[str]:
-        """Get address from migration binding."""
-        use_binding = self.model.config.get("use-migration-binding")
-        if not use_binding:
-            return None
-        binding = self.model.get_binding(MIGRATION_BINDING)
-        if binding is None:
-            return None
-        address = binding.network.bind_address
-        if address is None:
-            return None
-        return str(address)
-
-    def check_relation_exists(self, relation_name: str) -> bool:
-        """Check if a relation exists or not."""
-        if self.model.get_relation(relation_name):
-            return True
-        return False
-
-    def _on_cos_agent_relation_joined(self, event: ops.framework.EventBase):
-        self.enable_monitoring = True
-        self.configure_charm(event)
-
-    def _on_cos_agent_relation_departed(self, event: ops.framework.EventBase):
-        self.enable_monitoring = False
-        self.configure_charm(event)
-
-    def get_relation_handlers(
-        self, handlers: List[sunbeam_rhandlers.RelationHandler] = None
-    ) -> List[sunbeam_rhandlers.RelationHandler]:
-        """Relation handlers for the service."""
-        handlers = handlers or []
-        if self.can_add_handler("ovsdb-cms", handlers):
-            self.ovsdb_cms = ovn_relation_handlers.OVSDBCMSRequiresHandler(
-                self,
-                "ovsdb-cms",
-                self.configure_charm,
-                "ovsdb-cms" in self.mandatory_relations,
-            )
-            handlers.append(self.ovsdb_cms)
-        if self.can_add_handler("ceilometer-service", handlers):
-            self.ceilometer = (
-                sunbeam_rhandlers.CeilometerServiceRequiresHandler(
-                    self,
-                    "ceilometer-service",
-                    self.handle_ceilometer_events,
-                    "ceilometer-service" in self.mandatory_relations,
-                )
-            )
-            handlers.append(self.ceilometer)
-        if self.can_add_handler("certificates", handlers):
-            self.certs = MTlsCertificatesHandler(
-                self,
-                "certificates",
-                self.configure_charm,
-                sans_dns=self.get_sans_dns(),
-                sans_ips=self.get_sans_ips(),
-                mandatory="certificates" in self.mandatory_relations,
-            )
-            handlers.append(self.certs)
-        handlers = super().get_relation_handlers(handlers)
-        return handlers
-
-    def _set_hypervisor_local_settings_action(self, event: ActionEvent):
-        """Run set_hypervisor_local_settings action."""
-        local_settings = [
-            "network.external-nic",
-            "compute.spice-proxy-address",
-            "network.ip-address",
-        ]
-        new_snap_settings = {}
-        for setting in local_settings:
-            action_param = setting.split(".")[1]
-            if event.params.get(action_param):
-                new_snap_settings[setting] = event.params.get(action_param)
-        if new_snap_settings:
-            self.set_snap_data(new_snap_settings)
-
-    def ensure_services_running(self):
-        """Ensure systemd services running."""
-        # This should taken care of by the snap
-        svcs = [
-            "snap.openstack-hypervisor.neutron-ovn-metadata-agent.service",
-            "snap.openstack-hypervisor.nova-api-metadata.service",
-            "snap.openstack-hypervisor.nova-compute.service",
-        ]
-        for svc in svcs:
-            if os.system(f"systemctl is-active --quiet {svc}") != 0:
-                os.system(f"systemctl start {svc}")
-
-    def generate_metadata_secret(self) -> str:
-        """Generate a secure secret.
-
-        :param length: length of generated secret
-        :type length: int
-        :return: string containing the generated secret
-        """
-        return "".join(
-            secrets.choice(string.ascii_letters + string.digits)
-            for i in range(self.DEFAULT_SECRET_LENGTH)
-        )
-
-    def metadata_secret(self) -> str:
-        """Retrieve or set self.METADATA_SECRET_KEY."""
-        if self._state.metadata_secret:
-            logging.debug("Found metadata secret in local db")
-            return self._state.metadata_secret
-        else:
-            logging.debug("Generating new metadata secret")
-            secret = self.generate_metadata_secret()
-            self._state.metadata_secret = secret
-            return secret
-
-    def set_snap_data(self, snap_data: dict):
-        """Set snap data on local snap."""
-        cache = snap.SnapCache()
-        hypervisor = cache["openstack-hypervisor"]
-        new_settings = {}
-        for k in sorted(snap_data.keys()):
-            try:
-                if snap_data[k] != hypervisor.get(k):
-                    new_settings[k] = snap_data[k]
-            except snap.SnapError:
-                # Trying to retrieve an unset parameter results in a snapError
-                # so assume the snap.SnapError means there is missing config
-                # that needs setting.
-                new_settings[k] = snap_data[k]
-        if new_settings:
-            logger.debug(f"Applying new snap settings {new_settings}")
-            hypervisor.set(new_settings, typed=True)
-        else:
-            logger.debug("Snap settings do not need updating")
-
-    def ensure_snap_present(self):
-        """Install snap if it is not already present."""
-        config = self.model.config.get
-        try:
-            cache = snap.SnapCache()
-            hypervisor = cache["openstack-hypervisor"]
-
-            if not hypervisor.present:
-                hypervisor.ensure(
-                    snap.SnapState.Latest, channel=config("snap-channel")
-                )
-        except snap.SnapError as e:
-            logger.error(
-                "An exception occurred when installing charmcraft. Reason: %s",
-                e.message,
-            )
-
-    def configure_unit(self, event) -> None:
-        """Run configuration on this unit."""
-        self.check_leader_ready()
-        self.check_relation_handlers_ready(event)
-        config = self.model.config.get
-        self.ensure_snap_present()
-        local_ip = get_local_ip_by_default_route()
-        try:
-            contexts = self.contexts()
-            sb_connection_strs = list(
-                contexts.ovsdb_cms.db_ingress_sb_connection_strs
-            )
-            if not sb_connection_strs:
-                raise AttributeError(name="ovsdb southbound ingress string")
-
-            snap_data = {
-                "compute.cpu-mode": "host-model",
-                "compute.spice-proxy-address": config("ip-address")
-                or local_ip,
-                "compute.virt-type": "kvm",
-                "compute.cacert": base64.b64encode(
-                    contexts.certificates.ca_cert.encode()
-                ).decode(),
-                "compute.cert": base64.b64encode(
-                    contexts.certificates.cert.encode()
-                ).decode(),
-                "compute.key": base64.b64encode(
-                    contexts.certificates.key.encode()
-                ).decode(),
-                "compute.migration-address": self.migration_address
-                or config("ip-address")
-                or local_ip,
-                "credentials.ovn-metadata-proxy-shared-secret": self.metadata_secret(),
-                "identity.admin-role": contexts.identity_credentials.admin_role,
-                "identity.auth-url": contexts.identity_credentials.internal_endpoint,
-                "identity.password": contexts.identity_credentials.password,
-                "identity.project-domain-id": contexts.identity_credentials.project_domain_id,
-                "identity.project-domain-name": contexts.identity_credentials.project_domain_name,
-                "identity.project-name": contexts.identity_credentials.project_name,
-                "identity.region-name": contexts.identity_credentials.region,
-                "identity.user-domain-id": contexts.identity_credentials.user_domain_id,
-                "identity.user-domain-name": contexts.identity_credentials.user_domain_name,
-                "identity.username": contexts.identity_credentials.username,
-                "logging.debug": config("debug"),
-                "network.dns-domain": config("dns-domain"),
-                "network.dns-servers": config("dns-servers"),
-                "network.enable-gateway": config("enable-gateway"),
-                "network.external-bridge": config("external-bridge"),
-                "network.external-bridge-address": config(
-                    "external-bridge-address"
-                )
-                or "10.20.20.1/24",
-                "network.ip-address": config("ip-address") or local_ip,
-                "network.ovn-key": base64.b64encode(
-                    contexts.certificates.key.encode()
-                ).decode(),
-                "network.ovn-cert": base64.b64encode(
-                    contexts.certificates.cert.encode()
-                ).decode(),
-                "network.ovn-cacert": base64.b64encode(
-                    contexts.certificates.ca_with_intermediates.encode()
-                ).decode(),
-                "network.ovn-sb-connection": sb_connection_strs[0],
-                "network.physnet-name": config("physnet-name"),
-                "node.fqdn": socket.getfqdn(),
-                "node.ip-address": config("ip-address") or local_ip,
-                "rabbitmq.url": contexts.amqp.transport_url,
-                "monitoring.enable": self.enable_monitoring,
-            }
-        except AttributeError as e:
-            raise sunbeam_guard.WaitingExceptionError(
-                "Data missing: {}".format(e.name)
-            )
-        # Handle optional config contexts
-        try:
-            if contexts.ceph_access.uuid:
-                snap_data.update(
-                    {
-                        "compute.rbd-user": "nova",
-                        "compute.rbd-secret-uuid": contexts.ceph_access.uuid,
-                        "compute.rbd-key": contexts.ceph_access.key,
-                    }
-                )
-        except AttributeError:
-            # If the relation has been removed it is probably less disruptive to leave the
-            # rbd setting in the snap rather than unsetting them.
-            logger.debug("ceph_access relation not integrated")
-        try:
-            if contexts.ceilometer_service.telemetry_secret:
-                snap_data.update(
-                    {
-                        "telemetry.enable": self.enable_telemetry,
-                        "telemetry.publisher-secret": contexts.ceilometer_service.telemetry_secret,
-                    }
-                )
-            else:
-                snap_data.update({"telemetry.enable": self.enable_telemetry})
-        except AttributeError:
-            logger.debug("ceilometer_service relation not integrated")
-            snap_data.update({"telemetry.enable": self.enable_telemetry})
-
-        self.set_snap_data(snap_data)
-        self.ensure_services_running()
-        self._state.unit_bootstrapped = True
-
-    def handle_ceilometer_events(self, event: ops.framework.EventBase) -> None:
-        """Handle ceilometer events."""
-        if isinstance(event, CeilometerConfigChangedEvent):
-            self.enable_telemetry = True
-            self.configure_charm(event)
-        elif isinstance(event, CeilometerServiceGoneAwayEvent):
-            self.enable_telemetry = False
-            self.configure_charm(event)
-
-    def stop_services(self, relation: Optional[Set[str]]) -> None:
-        """Stop services based on relation goneaway event."""
-        snap_data = {}
-        for relation_ in relation:
-            logger.info(f"In stop_services for relation {relation_}")
-            if relation_ == "amqp":
-                logger.debug("Resetting rabbitmq url")
-                snap_data.update({"rabbitmq.url": ""})
-            elif relation_ == "ovsdb-cms":
-                logger.debug("Resetting OVN SB connection")
-                snap_data.update({"network.ovn-sb-connection": ""})
-
-        if snap_data:
-            self.set_snap_data(snap_data)
-
-
-if __name__ == "__main__":  # pragma: no cover
-    main(HypervisorOperatorCharm)
diff --git a/src/grafana_dashboards/capacity_dashboard.json b/src/grafana_dashboards/capacity_dashboard.json
deleted file mode 100644
index aeca127..0000000
--- a/src/grafana_dashboards/capacity_dashboard.json
+++ /dev/null
@@ -1,1575 +0,0 @@
-{
-  "annotations": {
-    "list": [
-      {
-        "builtIn": 1,
-        "datasource": {
-          "type": "grafana",
-          "uid": "-- Grafana --"
-        },
-        "enable": true,
-        "hide": true,
-        "iconColor": "rgba(0, 211, 255, 1)",
-        "name": "Annotations & Alerts",
-        "target": {
-          "limit": 100,
-          "matchAny": false,
-          "tags": [],
-          "type": "dashboard"
-        },
-        "type": "dashboard"
-      }
-    ]
-  },
-  "editable": true,
-  "fiscalYearStartMonth": 0,
-  "graphTooltip": 0,
-  "id": 13,
-  "links": [],
-  "liveNow": false,
-  "panels": [
-    {
-      "collapsed": false,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 0
-      },
-      "id": 16,
-      "panels": [],
-      "title": "Capacity across hosts",
-      "type": "row"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${prometheusds}"
-      },
-      "description": "Days until  storage reaches ${resource_usage_threshold}%.\nEstimated based on the last ${days_of_estimation} days of data.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "mappings": [],
-          "noValue": "Stable",
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "red",
-                "value": null
-              },
-              {
-                "color": "green",
-                "value": 30
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 3,
-        "w": 4,
-        "x": 0,
-        "y": 1
-      },
-      "id": 18,
-      "options": {
-        "colorMode": "value",
-        "graphMode": "none",
-        "justifyMode": "auto",
-        "orientation": "auto",
-        "reduceOptions": {
-          "calcs": [
-            "lastNotNull"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "textMode": "auto"
-      },
-      "pluginVersion": "9.2.1",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${prometheusds}"
-          },
-          "editorMode": "code",
-          "expr": "min((sum by (agent_hostname) (node_filesystem_size_bytes{agent_hostname=~\"$agent_hostname\", device=~\"/dev/.*\"} * ($resource_usage_threshold / 100) - (node_filesystem_size_bytes{agent_hostname=~\"$agent_hostname\", device=~\"/dev/.*\"}-node_filesystem_avail_bytes{agent_hostname=~\"$agent_hostname\", device=~\"/dev/.*\"}))) \n/ \n((sum by (agent_hostname) (delta((node_filesystem_size_bytes{agent_hostname=~\"$agent_hostname\", device=~\"/dev/.*\"}-node_filesystem_avail_bytes{agent_hostname=~\"$agent_hostname\", device=~\"/dev/.*\"})[${days_of_estimation}d:])) > 0) / $days_of_estimation))",
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Days until  storage reaches ${resource_usage_threshold}%",
-      "type": "stat"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${prometheusds}"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "axisSoftMax": 100,
-            "axisSoftMin": 1,
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 2,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "area"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "transparent",
-                "value": null
-              },
-              {
-                "color": "#EAB839",
-                "value": 70
-              },
-              {
-                "color": "red",
-                "value": 90
-              }
-            ]
-          },
-          "unit": "percent"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 9,
-        "w": 7,
-        "x": 4,
-        "y": 1
-      },
-      "id": 24,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${prometheusds}"
-          },
-          "editorMode": "code",
-          "expr": "100 - ((sum by (agent_hostname)(node_filesystem_avail_bytes{agent_hostname=~\"$agent_hostname\", fstype!=\"tmpfs\"} / 1024^3 )\n/\nsum by (agent_hostname) (node_filesystem_size_bytes{agent_hostname=~\"$agent_hostname\", fstype!=\"tmpfs\"} / 1024^3 )) * 100)",
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Disk usage (total size: $total_disk_aggregate GB)",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${prometheusds}"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 2,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "area"
-            }
-          },
-          "mappings": [],
-          "max": 100,
-          "thresholds": {
-            "mode": "percentage",
-            "steps": [
-              {
-                "color": "transparent",
-                "value": null
-              },
-              {
-                "color": "#EAB839",
-                "value": 70
-              },
-              {
-                "color": "red",
-                "value": 90
-              },
-              {
-                "color": "transparent",
-                "value": 100
-              }
-            ]
-          },
-          "unit": "percent"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 9,
-        "w": 7,
-        "x": 11,
-        "y": 1
-      },
-      "id": 34,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${prometheusds}"
-          },
-          "editorMode": "code",
-          "expr": "((sum(((node_memory_MemUsed_percentage{agent_hostname=~\"$agent_hostname\"}/100) * on(agent_hostname) node_memory_MemTotal_bytes{agent_hostname=~\"$agent_hostname\"}))) / (sum(node_memory_MemTotal_bytes{agent_hostname=~\"$agent_hostname\"}))) * 100",
-          "legendFormat": "Total memory used",
-          "range": true,
-          "refId": "A"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${prometheusds}"
-          },
-          "editorMode": "code",
-          "expr": "((sum((node_memory_HugePages_Total{agent_hostname=~\"$agent_hostname\"} * node_memory_Hugepagesize_bytes{agent_hostname=~\"$agent_hostname\"}) / 1024^3)) / (sum(node_memory_MemTotal_bytes{agent_hostname=~\"$agent_hostname\"} / 1024^3))) * 100",
-          "hide": false,
-          "legendFormat": "Memory assigned to hugepages",
-          "range": true,
-          "refId": "B"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${prometheusds}"
-          },
-          "editorMode": "code",
-          "expr": "((sum((node_memory_HugePages_Total{agent_hostname=~\"$agent_hostname\"} * node_memory_Hugepagesize_bytes{agent_hostname=~\"$agent_hostname\"} - node_memory_HugePages_Free{agent_hostname=~\"$agent_hostname\"} * node_memory_Hugepagesize_bytes{agent_hostname=~\"$agent_hostname\"}) / 1024^3)) / (sum(node_memory_MemTotal_bytes{agent_hostname=~\"$agent_hostname\"} / 1024^3))) * 100",
-          "hide": false,
-          "legendFormat": "Used hugepages memory",
-          "range": true,
-          "refId": "C"
-        }
-      ],
-      "title": "Memory usage (total memory: $total_memory_aggregate GB)",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${prometheusds}"
-      },
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "palette-classic"
-          },
-          "custom": {
-            "axisCenteredZero": false,
-            "axisColorMode": "text",
-            "axisLabel": "",
-            "axisPlacement": "auto",
-            "axisSoftMax": 100,
-            "axisSoftMin": 0.1,
-            "barAlignment": 0,
-            "drawStyle": "line",
-            "fillOpacity": 0,
-            "gradientMode": "none",
-            "hideFrom": {
-              "legend": false,
-              "tooltip": false,
-              "viz": false
-            },
-            "lineInterpolation": "linear",
-            "lineWidth": 2,
-            "pointSize": 5,
-            "scaleDistribution": {
-              "type": "linear"
-            },
-            "showPoints": "auto",
-            "spanNulls": false,
-            "stacking": {
-              "group": "A",
-              "mode": "none"
-            },
-            "thresholdsStyle": {
-              "mode": "area"
-            }
-          },
-          "mappings": [],
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "transparent",
-                "value": null
-              },
-              {
-                "color": "#EAB839",
-                "value": 70
-              },
-              {
-                "color": "red",
-                "value": 90
-              }
-            ]
-          },
-          "unit": "percent"
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 9,
-        "w": 6,
-        "x": 18,
-        "y": 1
-      },
-      "id": 28,
-      "options": {
-        "legend": {
-          "calcs": [],
-          "displayMode": "list",
-          "placement": "bottom",
-          "showLegend": true
-        },
-        "tooltip": {
-          "mode": "single",
-          "sort": "none"
-        }
-      },
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${prometheusds}"
-          },
-          "editorMode": "code",
-          "expr": "(1 - avg by (agent_hostname)(rate(node_cpu_seconds_total{agent_hostname=~\"$agent_hostname\", mode=\"idle\"}[5m]))) * 100",
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "CPU Usage (total number of cores: $cpu_count_aggregate)",
-      "type": "timeseries"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${prometheusds}"
-      },
-      "description": "Days until memory reaches ${resource_usage_threshold}% of capacity.\nEstimated based on the last ${days_of_estimation} days of data.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "mappings": [],
-          "noValue": "Stable",
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "red",
-                "value": null
-              },
-              {
-                "color": "green",
-                "value": 30
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 3,
-        "w": 4,
-        "x": 0,
-        "y": 4
-      },
-      "id": 20,
-      "options": {
-        "colorMode": "value",
-        "graphMode": "none",
-        "justifyMode": "auto",
-        "orientation": "auto",
-        "reduceOptions": {
-          "calcs": [
-            "lastNotNull"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "textMode": "auto"
-      },
-      "pluginVersion": "9.2.1",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${prometheusds}"
-          },
-          "editorMode": "code",
-          "expr": "min((100 * ($resource_usage_threshold / 100) - (node_memory_MemUsed_percentage{agent_hostname=~\"$agent_hostname\"}))\n/ \n((delta((node_memory_MemUsed_percentage{agent_hostname=~\"$agent_hostname\"})[${days_of_estimation}d:]) > 0) / $days_of_estimation))",
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Days until memory reaches ${resource_usage_threshold}%",
-      "type": "stat"
-    },
-    {
-      "datasource": {
-        "type": "prometheus",
-        "uid": "${prometheusds}"
-      },
-      "description": "Days until CPU usage reaches ${resource_usage_threshold}% of capacity.\nEstimated based on the last ${days_of_estimation} days of data.",
-      "fieldConfig": {
-        "defaults": {
-          "color": {
-            "mode": "thresholds"
-          },
-          "mappings": [],
-          "noValue": "Stable",
-          "thresholds": {
-            "mode": "absolute",
-            "steps": [
-              {
-                "color": "red",
-                "value": null
-              },
-              {
-                "color": "green",
-                "value": 30
-              }
-            ]
-          }
-        },
-        "overrides": []
-      },
-      "gridPos": {
-        "h": 3,
-        "w": 4,
-        "x": 0,
-        "y": 7
-      },
-      "id": 22,
-      "options": {
-        "colorMode": "value",
-        "graphMode": "none",
-        "justifyMode": "auto",
-        "orientation": "auto",
-        "reduceOptions": {
-          "calcs": [
-            "lastNotNull"
-          ],
-          "fields": "",
-          "values": false
-        },
-        "textMode": "auto"
-      },
-      "pluginVersion": "9.2.1",
-      "targets": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${prometheusds}"
-          },
-          "editorMode": "code",
-          "expr": "min(avg by (agent_hostname)(1*($resource_usage_threshold / 100) - (1 - avg(rate(node_cpu_seconds_total{agent_hostname=~\"$agent_hostname\", mode=\"idle\"}[5m]))))\n/\n(avg by (agent_hostname)(delta((1 - avg(rate(node_cpu_seconds_total{agent_hostname=~\"$agent_hostname\", mode=\"idle\"}[5m])))[${days_of_estimation}d:]) > 0 ) / $days_of_estimation ))",
-          "legendFormat": "__auto",
-          "range": true,
-          "refId": "A"
-        }
-      ],
-      "title": "Days until CPU usage reaches ${resource_usage_threshold}% ",
-      "type": "stat"
-    },
-    {
-      "collapsed": true,
-      "gridPos": {
-        "h": 1,
-        "w": 24,
-        "x": 0,
-        "y": 10
-      },
-      "id": 2,
-      "panels": [
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${prometheusds}"
-          },
-          "description": "Days until  storage reaches ${resource_usage_threshold}%.\nEstimated based on the last ${days_of_estimation} days of data.",
-          "fieldConfig": {
-            "defaults": {
-              "color": {
-                "mode": "thresholds"
-              },
-              "mappings": [],
-              "noValue": "Stable",
-              "thresholds": {
-                "mode": "absolute",
-                "steps": [
-                  {
-                    "color": "red"
-                  },
-                  {
-                    "color": "green",
-                    "value": 30
-                  }
-                ]
-              }
-            },
-            "overrides": []
-          },
-          "gridPos": {
-            "h": 3,
-            "w": 4,
-            "x": 0,
-            "y": 11
-          },
-          "id": 30,
-          "options": {
-            "colorMode": "value",
-            "graphMode": "none",
-            "justifyMode": "auto",
-            "orientation": "auto",
-            "reduceOptions": {
-              "calcs": [
-                "lastNotNull"
-              ],
-              "fields": "",
-              "values": false
-            },
-            "textMode": "auto"
-          },
-          "pluginVersion": "9.2.1",
-          "targets": [
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "${prometheusds}"
-              },
-              "editorMode": "code",
-              "expr": "(sum(node_filesystem_size_bytes{agent_hostname=\"$agent_hostname\", device=~\"/dev/.*\"} * ($resource_usage_threshold / 100) - (node_filesystem_size_bytes{agent_hostname=\"$agent_hostname\", device=~\"/dev/.*\"}-node_filesystem_avail_bytes{agent_hostname=\"$agent_hostname\", device=~\"/dev/.*\"}))) \n/ \n((sum(delta((node_filesystem_size_bytes{agent_hostname=\"$agent_hostname\", device=~\"/dev/.*\"}-node_filesystem_avail_bytes{agent_hostname=\"$agent_hostname\", device=~\"/dev/.*\"})[${days_of_estimation}d:])) > 0) / $days_of_estimation)",
-              "legendFormat": "__auto",
-              "range": true,
-              "refId": "A"
-            }
-          ],
-          "title": "Days until  storage reaches ${resource_usage_threshold}%",
-          "type": "stat"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${prometheusds}"
-          },
-          "fieldConfig": {
-            "defaults": {
-              "color": {
-                "mode": "palette-classic"
-              },
-              "custom": {
-                "axisCenteredZero": false,
-                "axisColorMode": "text",
-                "axisLabel": "",
-                "axisPlacement": "auto",
-                "axisSoftMax": 100,
-                "axisSoftMin": 1,
-                "barAlignment": 0,
-                "drawStyle": "line",
-                "fillOpacity": 0,
-                "gradientMode": "none",
-                "hideFrom": {
-                  "legend": false,
-                  "tooltip": false,
-                  "viz": false
-                },
-                "lineInterpolation": "linear",
-                "lineWidth": 2,
-                "pointSize": 5,
-                "scaleDistribution": {
-                  "type": "linear"
-                },
-                "showPoints": "always",
-                "spanNulls": false,
-                "stacking": {
-                  "group": "A",
-                  "mode": "none"
-                },
-                "thresholdsStyle": {
-                  "mode": "area"
-                }
-              },
-              "mappings": [],
-              "thresholds": {
-                "mode": "absolute",
-                "steps": [
-                  {
-                    "color": "transparent"
-                  },
-                  {
-                    "color": "#EAB839",
-                    "value": 70
-                  },
-                  {
-                    "color": "red",
-                    "value": 90
-                  }
-                ]
-              },
-              "unit": "percent"
-            },
-            "overrides": []
-          },
-          "gridPos": {
-            "h": 9,
-            "w": 7,
-            "x": 4,
-            "y": 11
-          },
-          "id": 6,
-          "options": {
-            "legend": {
-              "calcs": [],
-              "displayMode": "list",
-              "placement": "bottom",
-              "showLegend": true
-            },
-            "tooltip": {
-              "mode": "single",
-              "sort": "none"
-            }
-          },
-          "targets": [
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "${prometheusds}"
-              },
-              "editorMode": "code",
-              "expr": "100 - ((node_filesystem_avail_bytes{agent_hostname=\"$agent_hostname\", fstype!=\"tmpfs\"} / 1024^3 )\n/\n(node_filesystem_size_bytes{agent_hostname=\"$agent_hostname\", fstype!=\"tmpfs\"} / 1024^3)) * 100",
-              "legendFormat": "{{device}}",
-              "range": true,
-              "refId": "A"
-            }
-          ],
-          "title": "Disk usage (total size: ${total_disk_machine} GB)",
-          "type": "timeseries"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${prometheusds}"
-          },
-          "fieldConfig": {
-            "defaults": {
-              "color": {
-                "mode": "palette-classic"
-              },
-              "custom": {
-                "axisCenteredZero": false,
-                "axisColorMode": "text",
-                "axisLabel": "",
-                "axisPlacement": "auto",
-                "barAlignment": 0,
-                "drawStyle": "line",
-                "fillOpacity": 0,
-                "gradientMode": "none",
-                "hideFrom": {
-                  "legend": false,
-                  "tooltip": false,
-                  "viz": false
-                },
-                "lineInterpolation": "linear",
-                "lineWidth": 2,
-                "pointSize": 5,
-                "scaleDistribution": {
-                  "type": "linear"
-                },
-                "showPoints": "auto",
-                "spanNulls": false,
-                "stacking": {
-                  "group": "A",
-                  "mode": "none"
-                },
-                "thresholdsStyle": {
-                  "mode": "area"
-                }
-              },
-              "mappings": [],
-              "max": 100,
-              "thresholds": {
-                "mode": "percentage",
-                "steps": [
-                  {
-                    "color": "transparent"
-                  },
-                  {
-                    "color": "#EAB839",
-                    "value": 70
-                  },
-                  {
-                    "color": "red",
-                    "value": 90
-                  },
-                  {
-                    "color": "transparent",
-                    "value": 100
-                  }
-                ]
-              },
-              "unit": "percent"
-            },
-            "overrides": []
-          },
-          "gridPos": {
-            "h": 9,
-            "w": 7,
-            "x": 11,
-            "y": 11
-          },
-          "id": 32,
-          "options": {
-            "legend": {
-              "calcs": [],
-              "displayMode": "list",
-              "placement": "bottom",
-              "showLegend": true
-            },
-            "tooltip": {
-              "mode": "single",
-              "sort": "none"
-            }
-          },
-          "targets": [
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "${prometheusds}"
-              },
-              "editorMode": "code",
-              "expr": "node_memory_MemUsed_percentage{agent_hostname=\"$agent_hostname\"}",
-              "legendFormat": "Total memory used",
-              "range": true,
-              "refId": "A"
-            },
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "${prometheusds}"
-              },
-              "editorMode": "code",
-              "expr": "((node_memory_HugePages_Total{agent_hostname=~\"$agent_hostname\"} * node_memory_Hugepagesize_bytes{agent_hostname=~\"$agent_hostname\"}) / (node_memory_MemTotal_bytes{agent_hostname=\"$agent_hostname\"})) * 100",
-              "hide": false,
-              "legendFormat": "Memory assigned to hugepages",
-              "range": true,
-              "refId": "B"
-            },
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "${prometheusds}"
-              },
-              "editorMode": "code",
-              "expr": "(((node_memory_HugePages_Total{agent_hostname=~\"$agent_hostname\"} * node_memory_Hugepagesize_bytes{agent_hostname=~\"$agent_hostname\"}) - (node_memory_HugePages_Free{agent_hostname=~\"$agent_hostname\"} * node_memory_Hugepagesize_bytes{agent_hostname=~\"$agent_hostname\"})) / (node_memory_MemTotal_bytes{agent_hostname=\"$agent_hostname\"})) * 100",
-              "hide": false,
-              "legendFormat": "Used hugepages memory",
-              "range": true,
-              "refId": "C"
-            }
-          ],
-          "title": "Memory usage (total memory: $total_memory GB)",
-          "type": "timeseries"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${prometheusds}"
-          },
-          "fieldConfig": {
-            "defaults": {
-              "color": {
-                "mode": "palette-classic"
-              },
-              "custom": {
-                "axisCenteredZero": false,
-                "axisColorMode": "text",
-                "axisLabel": "",
-                "axisPlacement": "auto",
-                "axisSoftMax": 100,
-                "axisSoftMin": 0.1,
-                "barAlignment": 0,
-                "drawStyle": "line",
-                "fillOpacity": 0,
-                "gradientMode": "none",
-                "hideFrom": {
-                  "legend": false,
-                  "tooltip": false,
-                  "viz": false
-                },
-                "lineInterpolation": "linear",
-                "lineWidth": 2,
-                "pointSize": 5,
-                "scaleDistribution": {
-                  "type": "linear"
-                },
-                "showPoints": "auto",
-                "spanNulls": false,
-                "stacking": {
-                  "group": "A",
-                  "mode": "none"
-                },
-                "thresholdsStyle": {
-                  "mode": "area"
-                }
-              },
-              "mappings": [],
-              "thresholds": {
-                "mode": "absolute",
-                "steps": [
-                  {
-                    "color": "transparent"
-                  },
-                  {
-                    "color": "#EAB839",
-                    "value": 70
-                  },
-                  {
-                    "color": "red",
-                    "value": 90
-                  }
-                ]
-              },
-              "unit": "percent"
-            },
-            "overrides": []
-          },
-          "gridPos": {
-            "h": 9,
-            "w": 6,
-            "x": 18,
-            "y": 11
-          },
-          "id": 10,
-          "options": {
-            "legend": {
-              "calcs": [],
-              "displayMode": "list",
-              "placement": "bottom",
-              "showLegend": true
-            },
-            "tooltip": {
-              "mode": "single",
-              "sort": "none"
-            }
-          },
-          "targets": [
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "${prometheusds}"
-              },
-              "editorMode": "code",
-              "expr": "label_replace((1 - avg(rate(node_cpu_seconds_total{agent_hostname=\"$agent_hostname\",mode=\"idle\"}[5m]))) * 100, \"__name__\", \"$agent_hostname\", \"__name__\", \"\")",
-              "legendFormat": "__auto",
-              "range": true,
-              "refId": "A"
-            }
-          ],
-          "title": "CPU Usage (total number of cores: $cpu_count)",
-          "type": "timeseries"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${prometheusds}"
-          },
-          "description": "Days until memory reaches ${resource_usage_threshold}% of capacity.\nEstimated based on the last ${days_of_estimation} days of data.",
-          "fieldConfig": {
-            "defaults": {
-              "color": {
-                "mode": "thresholds"
-              },
-              "mappings": [],
-              "noValue": "Stable",
-              "thresholds": {
-                "mode": "absolute",
-                "steps": [
-                  {
-                    "color": "red"
-                  },
-                  {
-                    "color": "green",
-                    "value": 30
-                  }
-                ]
-              }
-            },
-            "overrides": []
-          },
-          "gridPos": {
-            "h": 3,
-            "w": 4,
-            "x": 0,
-            "y": 14
-          },
-          "id": 12,
-          "options": {
-            "colorMode": "value",
-            "graphMode": "none",
-            "justifyMode": "auto",
-            "orientation": "auto",
-            "reduceOptions": {
-              "calcs": [
-                "lastNotNull"
-              ],
-              "fields": "",
-              "values": false
-            },
-            "textMode": "auto"
-          },
-          "pluginVersion": "9.2.1",
-          "targets": [
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "${prometheusds}"
-              },
-              "editorMode": "code",
-              "expr": "(100 * ($resource_usage_threshold / 100) - (node_memory_MemUsed_percentage{agent_hostname=\"$agent_hostname\"}))\n/ \n((delta((node_memory_MemUsed_percentage{agent_hostname=\"$agent_hostname\"})[${days_of_estimation}d:]) > 0) / $days_of_estimation)",
-              "legendFormat": "__auto",
-              "range": true,
-              "refId": "A"
-            }
-          ],
-          "title": "Days until memory reaches ${resource_usage_threshold}%",
-          "type": "stat"
-        },
-        {
-          "datasource": {
-            "type": "prometheus",
-            "uid": "${prometheusds}"
-          },
-          "description": "Days until CPU usage reaches ${resource_usage_threshold}% of capacity.\nEstimated based on the last ${days_of_estimation} days of data.",
-          "fieldConfig": {
-            "defaults": {
-              "color": {
-                "mode": "thresholds"
-              },
-              "mappings": [],
-              "noValue": "Stable",
-              "thresholds": {
-                "mode": "absolute",
-                "steps": [
-                  {
-                    "color": "red"
-                  },
-                  {
-                    "color": "green",
-                    "value": 30
-                  }
-                ]
-              }
-            },
-            "overrides": []
-          },
-          "gridPos": {
-            "h": 3,
-            "w": 4,
-            "x": 0,
-            "y": 17
-          },
-          "id": 14,
-          "options": {
-            "colorMode": "value",
-            "graphMode": "none",
-            "justifyMode": "auto",
-            "orientation": "auto",
-            "reduceOptions": {
-              "calcs": [
-                "lastNotNull"
-              ],
-              "fields": "",
-              "values": false
-            },
-            "textMode": "auto"
-          },
-          "pluginVersion": "9.2.1",
-          "targets": [
-            {
-              "datasource": {
-                "type": "prometheus",
-                "uid": "${prometheusds}"
-              },
-              "editorMode": "code",
-              "expr": "avg(1*($resource_usage_threshold / 100) - (1 - avg(rate(node_cpu_seconds_total{agent_hostname=\"$agent_hostname\", mode=\"idle\"}[5m]))))\n/\n(avg(delta((1 - avg(rate(node_cpu_seconds_total{agent_hostname=\"$agent_hostname\", mode=\"idle\"}[5m])))[${days_of_estimation}d:]) > 0) / $days_of_estimation )",
-              "legendFormat": "__auto",
-              "range": true,
-              "refId": "A"
-            }
-          ],
-          "title": "Days until CPU usage reaches ${resource_usage_threshold}% ",
-          "type": "stat"
-        }
-      ],
-      "repeat": "agent_hostname",
-      "repeatDirection": "h",
-      "title": "Host - $agent_hostname",
-      "type": "row"
-    }
-  ],
-  "schemaVersion": 37,
-  "style": "dark",
-  "tags": [],
-  "templating": {
-    "list": [
-      {
-        "current": {
-          "selected": false,
-          "text": "All",
-          "value": "$__all"
-        },
-        "hide": 2,
-        "includeAll": true,
-        "label": "Loki datasource",
-        "multi": true,
-        "name": "lokids",
-        "options": [],
-        "query": "loki",
-        "refresh": 1,
-        "regex": "",
-        "skipUrlSync": false,
-        "type": "datasource"
-      },
-      {
-        "allValue": ".*",
-        "current": {
-          "selected": false,
-          "text": "All",
-          "value": "$__all"
-        },
-        "datasource": {
-          "uid": "${prometheusds}"
-        },
-        "definition": "label_values(up{juju_model=~\"$juju_model\",juju_model_uuid=~\"$juju_model_uuid\",juju_application=~\"$juju_application\"},juju_unit)",
-        "hide": 2,
-        "includeAll": true,
-        "label": "Juju unit",
-        "multi": true,
-        "name": "juju_unit",
-        "options": [],
-        "query": {
-          "query": "label_values(up{juju_model=~\"$juju_model\",juju_model_uuid=~\"$juju_model_uuid\",juju_application=~\"$juju_application\"},juju_unit)",
-          "refId": "StandardVariableQuery"
-        },
-        "refresh": 1,
-        "regex": "",
-        "skipUrlSync": false,
-        "sort": 0,
-        "tagValuesQuery": "",
-        "tags": [],
-        "tagsQuery": "",
-        "type": "query",
-        "useTags": false
-      },
-      {
-        "allValue": ".*",
-        "current": {
-          "selected": false,
-          "text": "All",
-          "value": "$__all"
-        },
-        "datasource": {
-          "uid": "${prometheusds}"
-        },
-        "definition": "label_values(up{juju_model=~\"$juju_model\",juju_model_uuid=~\"$juju_model_uuid\"},juju_application)",
-        "hide": 2,
-        "includeAll": true,
-        "label": "Juju application",
-        "multi": true,
-        "name": "juju_application",
-        "options": [],
-        "query": {
-          "query": "label_values(up{juju_model=~\"$juju_model\",juju_model_uuid=~\"$juju_model_uuid\"},juju_application)",
-          "refId": "StandardVariableQuery"
-        },
-        "refresh": 1,
-        "regex": "",
-        "skipUrlSync": false,
-        "sort": 0,
-        "tagValuesQuery": "",
-        "tags": [],
-        "tagsQuery": "",
-        "type": "query",
-        "useTags": false
-      },
-      {
-        "allValue": ".*",
-        "current": {
-          "selected": false,
-          "text": "All",
-          "value": "$__all"
-        },
-        "datasource": {
-          "uid": "${prometheusds}"
-        },
-        "definition": "label_values(up{juju_model=~\"$juju_model\"},juju_model_uuid)",
-        "hide": 2,
-        "includeAll": true,
-        "label": "Juju model uuid",
-        "multi": true,
-        "name": "juju_model_uuid",
-        "options": [],
-        "query": {
-          "query": "label_values(up{juju_model=~\"$juju_model\"},juju_model_uuid)",
-          "refId": "StandardVariableQuery"
-        },
-        "refresh": 1,
-        "regex": "",
-        "skipUrlSync": false,
-        "sort": 0,
-        "tagValuesQuery": "",
-        "tags": [],
-        "tagsQuery": "",
-        "type": "query",
-        "useTags": false
-      },
-      {
-        "allValue": ".*",
-        "current": {
-          "selected": false,
-          "text": "All",
-          "value": "$__all"
-        },
-        "datasource": {
-          "uid": "${prometheusds}"
-        },
-        "definition": "label_values(up,juju_model)",
-        "hide": 2,
-        "includeAll": true,
-        "label": "Juju model",
-        "multi": true,
-        "name": "juju_model",
-        "options": [],
-        "query": {
-          "query": "label_values(up,juju_model)",
-          "refId": "StandardVariableQuery"
-        },
-        "refresh": 1,
-        "regex": "",
-        "skipUrlSync": false,
-        "sort": 0,
-        "tagValuesQuery": "",
-        "tags": [],
-        "tagsQuery": "",
-        "type": "query",
-        "useTags": false
-      },
-      {
-        "allValue": "",
-        "current": {
-          "selected": true,
-          "text": [
-            "All"
-          ],
-          "value": [
-            "$__all"
-          ]
-        },
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${prometheusds}"
-        },
-        "definition": "label_values(agent_hostname)",
-        "hide": 0,
-        "includeAll": true,
-        "label": "Hostname",
-        "multi": true,
-        "name": "agent_hostname",
-        "options": [],
-        "query": {
-          "query": "label_values(agent_hostname)",
-          "refId": "StandardVariableQuery"
-        },
-        "refresh": 1,
-        "regex": "",
-        "skipUrlSync": false,
-        "sort": 0,
-        "type": "query"
-      },
-      {
-        "current": {
-          "selected": false,
-          "text": "All",
-          "value": "$__all"
-        },
-        "hide": 2,
-        "includeAll": true,
-        "label": "Prometheus data source",
-        "multi": false,
-        "name": "prometheusds",
-        "options": [],
-        "query": "prometheus",
-        "queryValue": "",
-        "refresh": 1,
-        "regex": "",
-        "skipUrlSync": false,
-        "type": "datasource"
-      },
-      {
-        "current": {
-          "selected": false,
-          "text": "90",
-          "value": "90"
-        },
-        "description": "Threshold on resource usage in percentage",
-        "hide": 0,
-        "includeAll": false,
-        "label": "Resource Usage Threshold",
-        "multi": false,
-        "name": "resource_usage_threshold",
-        "options": [
-          {
-            "selected": false,
-            "text": "50",
-            "value": "50"
-          },
-          {
-            "selected": false,
-            "text": "60",
-            "value": "60"
-          },
-          {
-            "selected": false,
-            "text": "70",
-            "value": "70"
-          },
-          {
-            "selected": false,
-            "text": "80",
-            "value": "80"
-          },
-          {
-            "selected": true,
-            "text": "90",
-            "value": "90"
-          },
-          {
-            "selected": false,
-            "text": "100",
-            "value": "100"
-          }
-        ],
-        "query": "50,60,70,80,90,100",
-        "queryValue": "",
-        "skipUrlSync": false,
-        "type": "custom"
-      },
-      {
-        "current": {
-          "selected": false,
-          "text": "360",
-          "value": "360"
-        },
-        "description": "Days used to make the estimation of remaining time",
-        "hide": 0,
-        "includeAll": false,
-        "label": "Days of Estimation",
-        "multi": false,
-        "name": "days_of_estimation",
-        "options": [
-          {
-            "selected": false,
-            "text": "7",
-            "value": "7"
-          },
-          {
-            "selected": false,
-            "text": "14",
-            "value": "14"
-          },
-          {
-            "selected": false,
-            "text": "30",
-            "value": "30"
-          },
-          {
-            "selected": false,
-            "text": "90",
-            "value": "90"
-          },
-          {
-            "selected": false,
-            "text": "180",
-            "value": "180"
-          },
-          {
-            "selected": true,
-            "text": "360",
-            "value": "360"
-          }
-        ],
-        "query": "7,14,30,90,180,360",
-        "queryValue": "",
-        "skipUrlSync": false,
-        "type": "custom"
-      },
-      {
-        "current": {
-          "selected": false,
-          "text": "29.19",
-          "value": "29.19"
-        },
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${prometheusds}"
-        },
-        "definition": "query_result(round(sum by (agent_hostname)(node_memory_MemTotal_bytes{agent_hostname=~\"$agent_hostname\"}) / 1024^3, 0.01))",
-        "hide": 2,
-        "includeAll": false,
-        "label": "Total memory",
-        "multi": false,
-        "name": "total_memory",
-        "options": [],
-        "query": {
-          "query": "query_result(round(sum by (agent_hostname)(node_memory_MemTotal_bytes{agent_hostname=~\"$agent_hostname\"}) / 1024^3, 0.01))",
-          "refId": "StandardVariableQuery"
-        },
-        "refresh": 2,
-        "regex": "/.* ([^\\ ]*) .*/",
-        "skipUrlSync": false,
-        "sort": 0,
-        "type": "query"
-      },
-      {
-        "current": {
-          "selected": false,
-          "text": "87.6",
-          "value": "87.6"
-        },
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${prometheusds}"
-        },
-        "definition": "query_result(round(sum(node_memory_MemTotal_bytes{agent_hostname=~\"$agent_hostname\"}) / 1024^3, 0.1))",
-        "hide": 2,
-        "includeAll": false,
-        "label": "Total memory across hosts",
-        "multi": false,
-        "name": "total_memory_aggregate",
-        "options": [],
-        "query": {
-          "query": "query_result(round(sum(node_memory_MemTotal_bytes{agent_hostname=~\"$agent_hostname\"}) / 1024^3, 0.1))",
-          "refId": "StandardVariableQuery"
-        },
-        "refresh": 2,
-        "regex": "/.* ([^\\ ]*) .*/",
-        "skipUrlSync": false,
-        "sort": 0,
-        "type": "query"
-      },
-      {
-        "current": {
-          "selected": false,
-          "text": "104.67",
-          "value": "104.67"
-        },
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${prometheusds}"
-        },
-        "definition": "query_result(round(sum by (agent_hostname)(node_filesystem_size_bytes{agent_hostname=~\"$agent_hostname\", fstype!=\"tmpfs\"} / 1024^3), 0.01))",
-        "hide": 2,
-        "includeAll": false,
-        "label": "Total disk in a host",
-        "multi": false,
-        "name": "total_disk_machine",
-        "options": [],
-        "query": {
-          "query": "query_result(round(sum by (agent_hostname)(node_filesystem_size_bytes{agent_hostname=~\"$agent_hostname\", fstype!=\"tmpfs\"} / 1024^3), 0.01))",
-          "refId": "StandardVariableQuery"
-        },
-        "refresh": 2,
-        "regex": "/.* ([^\\ ]*) .*/",
-        "skipUrlSync": false,
-        "sort": 0,
-        "type": "query"
-      },
-      {
-        "current": {
-          "selected": false,
-          "text": "314.01",
-          "value": "314.01"
-        },
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${prometheusds}"
-        },
-        "definition": "query_result(round(sum(node_filesystem_size_bytes{agent_hostname=~\"$agent_hostname\", fstype!=\"tmpfs\"} / 1024^3), 0.01))",
-        "hide": 2,
-        "includeAll": false,
-        "label": "Total disk across hosts",
-        "multi": false,
-        "name": "total_disk_aggregate",
-        "options": [],
-        "query": {
-          "query": "query_result(round(sum(node_filesystem_size_bytes{agent_hostname=~\"$agent_hostname\", fstype!=\"tmpfs\"} / 1024^3), 0.01))",
-          "refId": "StandardVariableQuery"
-        },
-        "refresh": 2,
-        "regex": "/.* ([^\\ ]*) .*/",
-        "skipUrlSync": false,
-        "sort": 0,
-        "type": "query"
-      },
-      {
-        "current": {
-          "selected": false,
-          "text": "8",
-          "value": "8"
-        },
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${prometheusds}"
-        },
-        "definition": "query_result(count(count(node_cpu_seconds_total{agent_hostname=~\"$agent_hostname\"}) without (mode,instance,job)) without (cpu))",
-        "hide": 2,
-        "includeAll": false,
-        "label": "CPU count in a host",
-        "multi": false,
-        "name": "cpu_count",
-        "options": [],
-        "query": {
-          "query": "query_result(count(count(node_cpu_seconds_total{agent_hostname=~\"$agent_hostname\"}) without (mode,instance,job)) without (cpu))",
-          "refId": "StandardVariableQuery"
-        },
-        "refresh": 1,
-        "regex": "/.* ([^\\ ]*) .*/",
-        "skipUrlSync": false,
-        "sort": 0,
-        "type": "query"
-      },
-      {
-        "current": {
-          "selected": false,
-          "text": "24",
-          "value": "24"
-        },
-        "datasource": {
-          "type": "prometheus",
-          "uid": "${prometheusds}"
-        },
-        "definition": "query_result(sum(count(count(node_cpu_seconds_total{agent_hostname=~\"$agent_hostname\"}) without (mode,instance,job)) without (cpu)))",
-        "hide": 2,
-        "includeAll": false,
-        "label": "CPU count across host",
-        "multi": false,
-        "name": "cpu_count_aggregate",
-        "options": [],
-        "query": {
-          "query": "query_result(sum(count(count(node_cpu_seconds_total{agent_hostname=~\"$agent_hostname\"}) without (mode,instance,job)) without (cpu)))",
-          "refId": "StandardVariableQuery"
-        },
-        "refresh": 1,
-        "regex": "/.* ([^\\ ]*) .*/",
-        "skipUrlSync": false,
-        "sort": 0,
-        "type": "query"
-      }
-    ]
-  },
-  "time": {
-    "from": "now-7d",
-    "to": "now"
-  },
-  "timepicker": {},
-  "timezone": "",
-  "title": "Capacity Dashboard",
-  "uid": "6nJ1jg7Iz",
-  "version": 7,
-  "weekStart": ""
-}
diff --git a/src/prometheus_alert_rules/libvirt.yaml b/src/prometheus_alert_rules/libvirt.yaml
deleted file mode 100644
index c545d20..0000000
--- a/src/prometheus_alert_rules/libvirt.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-# Prometheus alert rules related to libvirt
-
-groups:
-- name: Libvirt
-  rules:
-
-    - alert: LibvirtdServiceDown
-      expr: libvirt_up != 1
-      for: 0m
-      labels:
-        severity: critical
-      annotations:
-        summary: Libvirtd service is down. (instance {{ $labels.instance }})
-        description: |
-          Libvirtd service is down.
-            LABELS = {{ $labels }}
diff --git a/src/prometheus_alert_rules/ovs.yaml b/src/prometheus_alert_rules/ovs.yaml
deleted file mode 100644
index 437677c..0000000
--- a/src/prometheus_alert_rules/ovs.yaml
+++ /dev/null
@@ -1,51 +0,0 @@
-# Prometheus alert rules related to ovs
-
-groups:
-- name: OVS
-  rules:
-
-    - alert: OVSServiceDown
-      expr: ovs_up != 1
-      for: 0m
-      labels:
-        severity: critical
-      annotations:
-        summary: OVS service is down. (instance {{ $labels.instance }})
-        description: |
-          OVS service is down.
-            LABELS = {{ $labels }}
-
-    - alert: OVSReqFailed
-      expr: ovs_failed_req_count > 0
-      for: 0m
-      labels:
-        severity: critical
-      annotations:
-        summary: Request(s) to OVS failed. (instance {{ $labels.instance }})
-        description: |
-          Request(s) to OVS failed.
-            LABELS = {{ $labels }}
-
-    - alert: OVSErrorLogDetected
-      expr: ovs_log_event_count{severity=~"(?i:(error))"} > 0
-      for: 0m
-      labels:
-        severity: critical
-      annotations:
-        summary: Error Log found in OVS logs. (instance {{ $labels.instance }})
-        description: |
-          Error Log found in OVS logs.
-            LOGS_COUNT = {{ $value }}
-            LABELS = {{ $labels }}
-
-    - alert: OVSWarningLogDetected
-      expr: ovs_log_event_count{severity=~"(?i:(warning))"} > 0
-      for: 0m
-      labels:
-        severity: warning
-      annotations:
-        summary: Warning Log found in OVS logs. (instance {{ $labels.instance }})
-        description: |
-          Warning Log found in OVS logs.
-            LOGS_COUNT = {{ $value }}
-            LABELS = {{ $labels }}
diff --git a/src/utils.py b/src/utils.py
deleted file mode 100644
index 60a93d0..0000000
--- a/src/utils.py
+++ /dev/null
@@ -1,109 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright 2023 Canonical Ltd.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""Utility helper functions."""
-
-
-import logging
-from typing import (
-    Optional,
-)
-
-import netifaces
-
-logger = logging.getLogger(__name__)
-
-
-def _get_default_gw_iface_fallback() -> Optional[str]:
-    """Returns the default gateway interface.
-
-    Parses the /proc/net/route table to determine the interface with a default
-    route. The interface with the default route will have a destination of 0x000000,
-    a mask of 0x000000 and will have flags indicating RTF_GATEWAY and RTF_UP.
-
-    :return Optional[str, None]: the name of the interface the default gateway or
-            None if one cannot be found.
-    """
-    # see include/uapi/linux/route.h in kernel source for more explanation
-    RTF_UP = 0x1  # noqa - route is usable
-    RTF_GATEWAY = 0x2  # noqa - destination is a gateway
-
-    iface = None
-    with open("/proc/net/route", "r") as f:
-        contents = [line.strip() for line in f.readlines() if line.strip()]
-        logger.debug(contents)
-
-        entries = []
-        # First line is a header line of the table contents. Note, we skip blank entries
-        # by default there's an extra column due to an extra \t character for the table
-        # contents to line up. This is parsing the /proc/net/route and creating a set of
-        # entries. Each entry is a dict where the keys are table header and the values
-        # are the values in the table rows.
-        header = [
-            col.strip().lower() for col in contents[0].split("\t") if col
-        ]
-        for row in contents[1:]:
-            cells = [col.strip() for col in row.split("\t") if col]
-            entries.append(dict(zip(header, cells)))
-
-        def is_up(flags: str) -> bool:
-            return int(flags, 16) & RTF_UP == RTF_UP
-
-        def is_gateway(flags: str) -> bool:
-            return int(flags, 16) & RTF_GATEWAY == RTF_GATEWAY
-
-        # Check each entry to see if it has the default gateway. The default gateway
-        # will have destination and mask set to 0x00, will be up and is noted as a
-        # gateway.
-        for entry in entries:
-            if int(entry.get("destination", 0xFF), 16) != 0:
-                continue
-            if int(entry.get("mask", 0xFF), 16) != 0:
-                continue
-            flags = entry.get("flags", 0x00)
-            if is_up(flags) and is_gateway(flags):
-                iface = entry.get("iface", None)
-                break
-
-    return iface
-
-
-def get_ifaddresses_by_default_route() -> dict:
-    """Get address configuration from interface associated with default gateway."""
-    interface = "lo"
-    ip = "127.0.0.1"
-    netmask = "255.0.0.0"
-
-    # TOCHK: Gathering only IPv4
-    default_gateways = netifaces.gateways().get("default", {})
-    if default_gateways and netifaces.AF_INET in default_gateways:
-        interface = netifaces.gateways()["default"][netifaces.AF_INET][1]
-    else:
-        # There are some cases where netifaces doesn't return the machine's default
-        # gateway, but it does exist. Let's check the /proc/net/route table to see
-        # if we can find the proper gateway.
-        interface = _get_default_gw_iface_fallback() or "lo"
-
-    ip_list = netifaces.ifaddresses(interface)[netifaces.AF_INET]
-    if len(ip_list) > 0 and "addr" in ip_list[0]:
-        return ip_list[0]
-
-    return {"addr": ip, "netmask": netmask}
-
-
-def get_local_ip_by_default_route() -> str:
-    """Get IP address of host associated with default gateway."""
-    return get_ifaddresses_by_default_route()["addr"]
diff --git a/test-requirements.txt b/test-requirements.txt
deleted file mode 100644
index 0982ac9..0000000
--- a/test-requirements.txt
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is managed centrally by release-tools and should not be modified
-# within individual charm repos.  See the 'global' dir contents for available
-# choices of *requirements.txt files for OpenStack Charms:
-#     https://github.com/openstack-charmers/release-tools
-#
-
-coverage
-mock
-flake8
-stestr
-ops
-cosl==0.0.5 ; python_version >= "3.8"
-pydantic==1.10.12 ; python_version >= "3.8"
-# Subunit 1.4.3+ requires extras
-extras
diff --git a/tests/actions.yaml b/tests/actions.yaml
deleted file mode 120000
index 9adaf92..0000000
--- a/tests/actions.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../actions.yaml
\ No newline at end of file
diff --git a/tests/integration/test_charm.py b/tests/integration/test_charm.py
deleted file mode 100644
index 06ca72f..0000000
--- a/tests/integration/test_charm.py
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/env python3
-
-# Copyright 2023 Canonical Ltd.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""Integration test for openstack hypervisor charm."""
-
-import asyncio
-import logging
-from pathlib import (
-    Path,
-)
-
-import pytest
-import yaml
-from pytest_operator.plugin import (
-    OpsTest,
-)
-
-logger = logging.getLogger(__name__)
-
-METADATA = yaml.safe_load(Path("./metadata.yaml").read_text())
-APP_NAME = METADATA["name"]
-
-
-@pytest.mark.abort_on_fail
-async def test_build_and_deploy(ops_test: OpsTest):
-    """Build the charm-under-test and deploy it together with related charms.
-
-    Assert on the unit status before any relations/configurations take place.
-    """
-    # Build and deploy charm from local source folder
-    charm = await ops_test.build_charm(".")
-    resources = {
-        "httpbin-image": METADATA["resources"]["httpbin-image"][
-            "upstream-source"
-        ]
-    }
-
-    # Deploy the charm and wait for active/idle status
-    await asyncio.gather(
-        ops_test.model.deploy(
-            await charm, resources=resources, application_name=APP_NAME
-        ),
-        ops_test.model.wait_for_idle(
-            apps=[APP_NAME],
-            status="active",
-            raise_on_blocked=True,
-            timeout=1000,
-        ),
-    )
diff --git a/tests/unit/__init__.py b/tests/unit/__init__.py
deleted file mode 100644
index d0a9734..0000000
--- a/tests/unit/__init__.py
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 2023 Canonical Ltd.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""Unit tests for charm."""
diff --git a/tests/unit/config.yaml b/tests/unit/config.yaml
deleted file mode 120000
index 82800a0..0000000
--- a/tests/unit/config.yaml
+++ /dev/null
@@ -1 +0,0 @@
-../../config.yaml
\ No newline at end of file
diff --git a/tests/unit/test_alert_rules/test_libvirt.yaml b/tests/unit/test_alert_rules/test_libvirt.yaml
deleted file mode 100644
index 5fec021..0000000
--- a/tests/unit/test_alert_rules/test_libvirt.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
-rule_files:
-  - ../../../src/prometheus_alert_rules/libvirt.yaml
-
-evaluation_interval: 1m
-
-tests:
-  - interval: 1m
-    input_series:
-      - series: libvirt_up{instance="ubuntu-0"}
-        values: '0x15'
-      - series: libvirt_up{instance="ubuntu-1"}
-        values: '1x15'
-
-    alert_rule_test:
-      - eval_time: 0m
-        alertname: LibvirtdServiceDown
-        exp_alerts:
-          - exp_labels:
-              severity: critical
-              instance: ubuntu-0
-            exp_annotations:
-              summary: Libvirtd service is down. (instance ubuntu-0)
-              description: |
-                Libvirtd service is down.
-                  LABELS = map[__name__:libvirt_up instance:ubuntu-0]
diff --git a/tests/unit/test_alert_rules/test_ovs.yaml b/tests/unit/test_alert_rules/test_ovs.yaml
deleted file mode 100644
index 1116cc2..0000000
--- a/tests/unit/test_alert_rules/test_ovs.yaml
+++ /dev/null
@@ -1,90 +0,0 @@
-rule_files:
-  - ../../../src/prometheus_alert_rules/ovs.yaml
-
-evaluation_interval: 1m
-
-tests:
-  - interval: 1m
-    input_series:
-      - series: ovs_up{instance="ubuntu-0"}
-        values: '0x15'
-      - series: ovs_up{instance="ubuntu-1"}
-        values: '1x15'
-
-    alert_rule_test:
-      - eval_time: 0m
-        alertname: OVSServiceDown
-        exp_alerts:
-          - exp_labels:
-              severity: critical
-              instance: ubuntu-0
-            exp_annotations:
-              summary: OVS service is down. (instance ubuntu-0)
-              description: |
-                OVS service is down.
-                  LABELS = map[__name__:ovs_up instance:ubuntu-0]
-
-
-  - interval: 1m
-    input_series:
-      - series: ovs_failed_req_count{instance="ubuntu-0"}
-        values: '0x15'
-      - series: ovs_failed_req_count{instance="ubuntu-1"}
-        values: '3x15'
-
-    alert_rule_test:
-      - eval_time: 0m
-        alertname: OVSReqFailed
-        exp_alerts:
-          - exp_labels:
-              severity: critical
-              instance: ubuntu-1
-            exp_annotations:
-              summary: Request(s) to OVS failed. (instance ubuntu-1)
-              description: |
-                Request(s) to OVS failed.
-                  LABELS = map[__name__:ovs_failed_req_count instance:ubuntu-1]
-
-
-  - interval: 1m
-    input_series:
-      - series: ovs_log_event_count{instance="ubuntu-0", severity="info"}
-        values: '1x15'
-      - series: ovs_log_event_count{instance="ubuntu-1", severity="warning"}
-        values: '3x15'
-
-    alert_rule_test:
-      - eval_time: 0m
-        alertname: OVSWarningLogDetected
-        exp_alerts:
-          - exp_labels:
-              severity: warning
-              instance: ubuntu-1
-            exp_annotations:
-              summary: Warning Log found in OVS logs. (instance ubuntu-1)
-              description: |
-                Warning Log found in OVS logs.
-                  LOGS_COUNT = 3
-                  LABELS = map[__name__:ovs_log_event_count instance:ubuntu-1 severity:warning]
-
-
-  - interval: 1m
-    input_series:
-      - series: ovs_log_event_count{instance="ubuntu-0", severity="info"}
-        values: '1x15'
-      - series: ovs_log_event_count{instance="ubuntu-1", severity="Error"}
-        values: '2x15'
-
-    alert_rule_test:
-      - eval_time: 0m
-        alertname: OVSErrorLogDetected
-        exp_alerts:
-          - exp_labels:
-              severity: critical
-              instance: ubuntu-1
-            exp_annotations:
-              summary: Error Log found in OVS logs. (instance ubuntu-1)
-              description: |
-                Error Log found in OVS logs.
-                  LOGS_COUNT = 2
-                  LABELS = map[__name__:ovs_log_event_count instance:ubuntu-1 severity:Error]
diff --git a/tests/unit/test_charm.py b/tests/unit/test_charm.py
deleted file mode 100644
index a3ff1d3..0000000
--- a/tests/unit/test_charm.py
+++ /dev/null
@@ -1,265 +0,0 @@
-# Copyright 2023 Canonical Ltd.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-"""Tests for Openstack hypervisor charm."""
-
-import base64
-import json
-from unittest import (
-    mock,
-)
-
-import ops_sunbeam.test_utils as test_utils
-
-import charm
-
-
-class _HypervisorOperatorCharm(charm.HypervisorOperatorCharm):
-    """Neutron test charm."""
-
-    def __init__(self, framework):
-        """Setup event logging."""
-        self.seen_events = []
-        super().__init__(framework)
-
-
-class TestCharm(test_utils.CharmTestCase):
-    """Test charm to test relations."""
-
-    PATCHES = ["socket", "snap", "get_local_ip_by_default_route", "os"]
-
-    def setUp(self):
-        """Setup OpenStack Hypervisor tests."""
-        super().setUp(charm, self.PATCHES)
-        with open("config.yaml", "r") as f:
-            config_data = f.read()
-        self.harness = test_utils.get_harness(
-            _HypervisorOperatorCharm,
-            container_calls=self.container_calls,
-            charm_config=config_data,
-        )
-        self.addCleanup(self.harness.cleanup)
-
-    def initial_setup(self):
-        """Setting up relations."""
-        rel_id = self.harness.add_relation("certificates", "vault")
-        self.harness.add_relation_unit(rel_id, "vault/0")
-        self.harness.update_config({"snap-channel": "essex/stable"})
-        self.harness.begin_with_initial_hooks()
-        csr = {"certificate_signing_request": test_utils.TEST_CSR}
-        self.harness.update_relation_data(
-            rel_id,
-            self.harness.charm.unit.name,
-            {
-                "ingress-address": "10.0.0.34",
-                "certificate_signing_requests": json.dumps([csr]),
-            },
-        )
-        test_utils.add_certificates_relation_certs(self.harness, rel_id)
-        ovs_rel_id = self.harness.add_relation("ovsdb-cms", "ovn-relay")
-        self.harness.add_relation_unit(ovs_rel_id, "ovn-relay/0")
-        self.harness.update_relation_data(
-            ovs_rel_id,
-            "ovn-relay/0",
-            {
-                "bound-address": "10.1.176.143",
-                "bound-hostname": "ovn-relay-0.ovn-relay-endpoints.openstack.svc.cluster.local",
-                "egress-subnets": "10.20.21.10/32",
-                "ingress-address": "10.20.21.10",
-                "ingress-bound-address": "10.20.21.10",
-                "private-address": "10.20.21.10",
-            },
-        )
-        ceph_rel_id = self.harness.add_relation("ceph-access", "cinder-ceph")
-        self.harness.add_relation_unit(ceph_rel_id, "cinder-ceph/0")
-
-        credentials_content = {"uuid": "ddd", "key": "eee"}
-        credentials_id = self.harness.add_model_secret(
-            "cinder-ceph", credentials_content
-        )
-
-        self.harness.grant_secret(credentials_id, self.harness.charm.app.name)
-        self.harness.update_relation_data(
-            ceph_rel_id,
-            "cinder-ceph",
-            {"access-credentials": credentials_id},
-        )
-
-    def test_mandatory_relations(self):
-        """Test all the charms relations."""
-        self.get_local_ip_by_default_route.return_value = "10.0.0.10"
-        hypervisor_snap_mock = mock.MagicMock()
-        hypervisor_snap_mock.present = False
-        self.snap.SnapState.Latest = "latest"
-        self.snap.SnapCache.return_value = {
-            "openstack-hypervisor": hypervisor_snap_mock
-        }
-        self.socket.getfqdn.return_value = "test.local"
-        self.initial_setup()
-        self.harness.set_leader()
-        test_utils.add_complete_amqp_relation(self.harness)
-        test_utils.add_complete_identity_credentials_relation(self.harness)
-        hypervisor_snap_mock.ensure.assert_any_call(
-            "latest", channel="essex/stable"
-        )
-        metadata = self.harness.charm.metadata_secret()
-        cacert = test_utils.TEST_CA
-        cacert_with_intermediates = (
-            test_utils.TEST_CA + "\n" + "\n".join(test_utils.TEST_CHAIN)
-        )
-        cacert = base64.b64encode(cacert.encode()).decode()
-        cacert_with_intermediates = base64.b64encode(
-            cacert_with_intermediates.encode()
-        ).decode()
-        private_key = base64.b64encode(
-            self.harness.charm.contexts().certificates.key.encode()
-        ).decode()
-        certificate = base64.b64encode(
-            test_utils.TEST_SERVER_CERT.encode()
-        ).decode()
-        expect_settings = {
-            "compute.cpu-mode": "host-model",
-            "compute.spice-proxy-address": "10.0.0.10",
-            "compute.virt-type": "kvm",
-            "compute.cacert": cacert,
-            "compute.cert": certificate,
-            "compute.key": private_key,
-            "compute.migration-address": "10.0.0.10",
-            "compute.rbd-user": "nova",
-            "compute.rbd-secret-uuid": "ddd",
-            "compute.rbd-key": "eee",
-            "credentials.ovn-metadata-proxy-shared-secret": metadata,
-            "identity.admin-role": None,
-            "identity.auth-url": "http://10.153.2.45:80/openstack-keystone",
-            "identity.password": "user-password",
-            "identity.project-domain-id": "pdomain-id",
-            "identity.project-domain-name": "pdomain_-ame",
-            "identity.project-name": "user-project",
-            "identity.region-name": "region12",
-            "identity.user-domain-id": "udomain-id",
-            "identity.user-domain-name": "udomain-name",
-            "identity.username": "username",
-            "logging.debug": False,
-            "monitoring.enable": False,
-            "network.dns-domain": "openstack.local",
-            "network.dns-servers": "8.8.8.8",
-            "network.enable-gateway": False,
-            "network.external-bridge": "br-ex",
-            "network.external-bridge-address": "10.20.20.1/24",
-            "network.ip-address": "10.0.0.10",
-            "network.ovn-cacert": cacert_with_intermediates,
-            "network.ovn-cert": certificate,
-            "network.ovn-key": private_key,
-            "network.ovn-sb-connection": "ssl:10.20.21.10:6642",
-            "network.physnet-name": "physnet1",
-            "node.fqdn": "test.local",
-            "node.ip-address": "10.0.0.10",
-            "rabbitmq.url": "rabbit://hypervisor:rabbit.pass@10.0.0.13:5672/openstack",
-            "telemetry.enable": False,
-        }
-        hypervisor_snap_mock.set.assert_any_call(expect_settings, typed=True)
-
-    def test_all_relations(self):
-        """Test all the charms relations."""
-        # Add cos-agent relation
-        self.harness.add_relation(
-            "cos-agent",
-            "grafana-agent",
-            unit_data={
-                "config": '{"metrics_alert_rules": {}, "log_alert_rules": {}, "dashboards": ["/Td6WFoAAATm1rRGAAAAABzfRCEftvN9AQAAAAAEWVo="], "metrics_scrape_jobs": [{"metrics_path": "/metrics", "static_configs": [{"targets": ["localhost:9177"]}]], "log_slots": []}',
-                "egress-subnets": "10.1.171.64/32",
-                "ingress-address": "10.1.171.64",
-                "private-address": "10.1.171.64",
-            },
-        )
-
-        # Add ceilometer-service relation
-        self.harness.add_relation(
-            "ceilometer-service",
-            "ceilometer",
-            app_data={"telemetry-secret": "FAKE_SECRET"},
-        )
-
-        self.get_local_ip_by_default_route.return_value = "10.0.0.10"
-        hypervisor_snap_mock = mock.MagicMock()
-        hypervisor_snap_mock.present = False
-        self.snap.SnapState.Latest = "latest"
-        self.snap.SnapCache.return_value = {
-            "openstack-hypervisor": hypervisor_snap_mock
-        }
-        self.socket.getfqdn.return_value = "test.local"
-        self.initial_setup()
-        self.harness.set_leader()
-        test_utils.add_complete_amqp_relation(self.harness)
-        test_utils.add_complete_identity_credentials_relation(self.harness)
-        hypervisor_snap_mock.ensure.assert_any_call(
-            "latest", channel="essex/stable"
-        )
-        metadata = self.harness.charm.metadata_secret()
-        cacert = test_utils.TEST_CA
-        cacert_with_intermediates = (
-            test_utils.TEST_CA + "\n" + "\n".join(test_utils.TEST_CHAIN)
-        )
-        cacert = base64.b64encode(cacert.encode()).decode()
-        cacert_with_intermediates = base64.b64encode(
-            cacert_with_intermediates.encode()
-        ).decode()
-        private_key = base64.b64encode(
-            self.harness.charm.contexts().certificates.key.encode()
-        ).decode()
-        certificate = base64.b64encode(
-            test_utils.TEST_SERVER_CERT.encode()
-        ).decode()
-        expect_settings = {
-            "compute.cpu-mode": "host-model",
-            "compute.spice-proxy-address": "10.0.0.10",
-            "compute.virt-type": "kvm",
-            "compute.cacert": cacert,
-            "compute.cert": certificate,
-            "compute.key": private_key,
-            "compute.migration-address": "10.0.0.10",
-            "compute.rbd-user": "nova",
-            "compute.rbd-secret-uuid": "ddd",
-            "compute.rbd-key": "eee",
-            "credentials.ovn-metadata-proxy-shared-secret": metadata,
-            "identity.admin-role": None,
-            "identity.auth-url": "http://10.153.2.45:80/openstack-keystone",
-            "identity.password": "user-password",
-            "identity.project-domain-id": "pdomain-id",
-            "identity.project-domain-name": "pdomain_-ame",
-            "identity.project-name": "user-project",
-            "identity.region-name": "region12",
-            "identity.user-domain-id": "udomain-id",
-            "identity.user-domain-name": "udomain-name",
-            "identity.username": "username",
-            "logging.debug": False,
-            "monitoring.enable": True,
-            "network.dns-domain": "openstack.local",
-            "network.dns-servers": "8.8.8.8",
-            "network.enable-gateway": False,
-            "network.external-bridge": "br-ex",
-            "network.external-bridge-address": "10.20.20.1/24",
-            "network.ip-address": "10.0.0.10",
-            "network.ovn-cacert": cacert_with_intermediates,
-            "network.ovn-cert": certificate,
-            "network.ovn-key": private_key,
-            "network.ovn-sb-connection": "ssl:10.20.21.10:6642",
-            "network.physnet-name": "physnet1",
-            "node.fqdn": "test.local",
-            "node.ip-address": "10.0.0.10",
-            "rabbitmq.url": "rabbit://hypervisor:rabbit.pass@10.0.0.13:5672/openstack",
-            "telemetry.enable": True,
-            "telemetry.publisher-secret": "FAKE_SECRET",
-        }
-        hypervisor_snap_mock.set.assert_any_call(expect_settings, typed=True)
diff --git a/tox.ini b/tox.ini
deleted file mode 100644
index 3880732..0000000
--- a/tox.ini
+++ /dev/null
@@ -1,168 +0,0 @@
-# Source charm: ./tox.ini
-# This file is managed centrally by release-tools and should not be modified
-# within individual charm repos.  See the 'global' dir contents for available
-# choices of tox.ini for OpenStack Charms:
-#     https://github.com/openstack-charmers/release-tools
-
-[tox]
-skipsdist = True
-envlist = pep8,py3
-sitepackages = False
-skip_missing_interpreters = False
-minversion = 3.18.0
-
-[vars]
-src_path = {toxinidir}/src/
-tst_path = {toxinidir}/tests/
-lib_path = {toxinidir}/lib/
-pyproject_toml = {toxinidir}/pyproject.toml
-all_path = {[vars]src_path} {[vars]tst_path}
-
-[testenv]
-basepython = python3
-setenv =
-  PYTHONPATH = {toxinidir}:{[vars]lib_path}:{[vars]src_path}
-passenv =
-  PYTHONPATH
-install_command =
-  pip install {opts} {packages}
-commands = stestr run --slowest {posargs}
-allowlist_externals =
-  git
-  charmcraft
-  {toxinidir}/fetch-libs.sh
-  {toxinidir}/rename.sh
-deps =
-  -r{toxinidir}/test-requirements.txt
-
-[testenv:fmt]
-description = Apply coding style standards to code
-deps =
-    black
-    isort
-commands =
-    isort {[vars]all_path} --skip-glob {[vars]lib_path} --skip {toxinidir}/.tox
-    black --config {[vars]pyproject_toml} {[vars]all_path} --exclude {[vars]lib_path}
-
-[testenv:build]
-basepython = python3
-deps =
-commands =
-  charmcraft -v pack
-  {toxinidir}/rename.sh
-
-[testenv:fetch]
-basepython = python3
-deps =
-commands =
-  {toxinidir}/fetch-libs.sh
-
-[testenv:py3]
-basepython = python3
-deps =
-  {[testenv]deps}
-  -r{toxinidir}/requirements.txt
-
-[testenv:py38]
-basepython = python3.8
-deps = {[testenv:py3]deps}
-
-[testenv:py39]
-basepython = python3.9
-deps = {[testenv:py3]deps}
-
-[testenv:py310]
-basepython = python3.10
-deps = {[testenv:py3]deps}
-
-[testenv:py311]
-basepython = python3.11
-deps = {[testenv:py3]deps}
-
-[testenv:cover]
-basepython = python3
-deps = {[testenv:py3]deps}
-setenv =
-    {[testenv]setenv}
-    PYTHON=coverage run
-commands =
-    coverage erase
-    stestr run --slowest {posargs}
-    coverage combine
-    coverage html -d cover
-    coverage xml -o cover/coverage.xml
-    coverage report
-
-[testenv:pep8]
-description = Alias for lint
-deps = {[testenv:lint]deps}
-commands = {[testenv:lint]commands}
-
-[testenv:lint]
-description = Check code against coding style standards
-deps =
-    black
-    flake8<6 # Pin version until https://github.com/savoirfairelinux/flake8-copyright/issues/19 is merged
-    flake8-docstrings
-    flake8-copyright
-    flake8-builtins
-    pyproject-flake8
-    pep8-naming
-    isort
-    codespell
-commands =
-    codespell {[vars]all_path} 
-    # pflake8 wrapper supports config from pyproject.toml
-    pflake8 --exclude {[vars]lib_path} --config {toxinidir}/pyproject.toml {[vars]all_path}
-    isort --check-only --diff {[vars]all_path} --skip-glob {[vars]lib_path}
-    black  --config {[vars]pyproject_toml} --check --diff {[vars]all_path} --exclude {[vars]lib_path}
-
-[testenv:func-noop]
-basepython = python3
-deps =
-    git+https://github.com/openstack-charmers/zaza.git@libjuju-3.1#egg=zaza
-    git+https://github.com/openstack-charmers/zaza-openstack-tests.git#egg=zaza.openstack
-    git+https://opendev.org/openstack/tempest.git#egg=tempest
-commands =
-    functest-run-suite --help
-
-[testenv:func]
-basepython = python3
-deps = {[testenv:func-noop]deps}
-commands =
-    functest-run-suite --keep-model
-
-[testenv:func-smoke]
-basepython = python3
-deps = {[testenv:func-noop]deps}
-setenv =
-    TEST_MODEL_SETTINGS = automatically-retry-hooks=true
-    TEST_MAX_RESOLVE_COUNT = 5
-commands =
-    functest-run-suite --keep-model --smoke
-
-[testenv:func-dev]
-basepython = python3
-deps = {[testenv:func-noop]deps}
-commands =
-    functest-run-suite --keep-model --dev
-
-[testenv:func-target]
-basepython = python3
-deps = {[testenv:func-noop]deps}
-commands =
-    functest-run-suite --keep-model --bundle {posargs}
-
-[coverage:run]
-branch = True
-concurrency = multiprocessing
-parallel = True
-source =
-    .
-omit =
-    .tox/*
-    tests/*
-    src/templates/*
-
-[flake8]
-ignore=E226,W504