From a4028e2b81c10336aef9a14270b13671ea127c23 Mon Sep 17 00:00:00 2001
From: Liam Young <liam.young@canonical.com>
Date: Thu, 3 Feb 2022 14:22:36 +0000
Subject: [PATCH] General fixes for aso update

---
 charms/neutron-k8s/charmcraft.yaml                          | 2 --
 charms/neutron-k8s/lib/charms/sunbeam_mysql_k8s/v0/mysql.py | 3 +--
 charms/neutron-k8s/requirements.txt                         | 3 +--
 charms/neutron-k8s/src/charm.py                             | 5 +----
 4 files changed, 3 insertions(+), 10 deletions(-)

diff --git a/charms/neutron-k8s/charmcraft.yaml b/charms/neutron-k8s/charmcraft.yaml
index 65ce9525..08ce6ba5 100644
--- a/charms/neutron-k8s/charmcraft.yaml
+++ b/charms/neutron-k8s/charmcraft.yaml
@@ -1,5 +1,3 @@
-# Learn more about charmcraft.yaml configuration at:
-# https://juju.is/docs/sdk/charmcraft-config
 type: "charm"
 bases:
   - build-on:
diff --git a/charms/neutron-k8s/lib/charms/sunbeam_mysql_k8s/v0/mysql.py b/charms/neutron-k8s/lib/charms/sunbeam_mysql_k8s/v0/mysql.py
index 69d4833f..10ecacb8 100644
--- a/charms/neutron-k8s/lib/charms/sunbeam_mysql_k8s/v0/mysql.py
+++ b/charms/neutron-k8s/lib/charms/sunbeam_mysql_k8s/v0/mysql.py
@@ -35,7 +35,6 @@ to get the relevant information from the relation data.
 import json
 import uuid
 import logging
-from ops.relation import ConsumerBase
 
 from ops.framework import (
     StoredState,
@@ -53,7 +52,7 @@ 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
+LIBPATCH = 2
 
 logger = logging.getLogger(__name__)
 
diff --git a/charms/neutron-k8s/requirements.txt b/charms/neutron-k8s/requirements.txt
index ee96a036..24ef8bde 100644
--- a/charms/neutron-k8s/requirements.txt
+++ b/charms/neutron-k8s/requirements.txt
@@ -1,6 +1,5 @@
-# ops >= 1.2.0
+ops
 jinja2
-git+https://github.com/canonical/operator@2875e73e#egg=ops
 git+https://opendev.org/openstack/charm-ops-openstack#egg=ops_openstack
 git+https://github.com/openstack-charmers/advanced-sunbeam-openstack#egg=advanced_sunbeam_openstack
 lightkube
diff --git a/charms/neutron-k8s/src/charm.py b/charms/neutron-k8s/src/charm.py
index 0423b6f0..a4786bae 100755
--- a/charms/neutron-k8s/src/charm.py
+++ b/charms/neutron-k8s/src/charm.py
@@ -10,11 +10,9 @@ from typing import List
 from ops.framework import StoredState
 from ops.main import main
 
-import advanced_sunbeam_openstack.cprocess as sunbeam_cprocess
 import advanced_sunbeam_openstack.charm as sunbeam_charm
 import advanced_sunbeam_openstack.core as sunbeam_core
 import advanced_sunbeam_openstack.container_handlers as sunbeam_chandlers
-import advanced_sunbeam_openstack.relation_handlers as sunbeam_rhandlers
 import advanced_sunbeam_openstack.config_contexts as sunbeam_ctxts
 
 from charms.observability_libs.v0.kubernetes_service_patch \
@@ -155,6 +153,7 @@ class OVNContext(sunbeam_ctxts.ConfigContext):
             'ovn_cert': '/etc/neutron/plugins/ml2/cert_host',
             'ovn_ca_cert': '/etc/neutron/plugins/ml2/neutron-ovn.crt'}
 
+
 class NeutronServerOVNPebbleHandler(sunbeam_chandlers.ServicePebbleHandler):
 
     def default_container_configs(self):
@@ -186,7 +185,6 @@ class NeutronServerOVNPebbleHandler(sunbeam_chandlers.ServicePebbleHandler):
                 'root')]
 
 
-
 class NeutronOVNOperatorCharm(NeutronOperatorCharm):
 
     @property
@@ -212,7 +210,6 @@ class NeutronOVNOperatorCharm(NeutronOperatorCharm):
         ]
 
 
-
 class NeutronOVNWallabyOperatorCharm(NeutronOVNOperatorCharm):
 
     openstack_release = 'wallaby'