Adjuts to new ops_openstack BaseCinderCharm

metadata.yaml

@@ -11,7 +11,6 @@ tags:
   - misc
 series:
   - focal
-  - bionic
 subordinate: true
 provides:
   storage-backend:

src/charm.py

@@ -15,67 +15,30 @@
 # limitations under the License.
 
 
-import json
 import uuid
 import logging
 
-from ops.charm import (ConfigChangedEvent, InstallEvent, RelationChangedEvent,
-                       UpdateStatusEvent)
-from ops_openstack.core import OSBaseCharm
-from ops.framework import StoredState
 from ops.main import main
-from ops.model import ActiveStatus, WaitingStatus
+from ops_openstack.plugins.classes import BaseCinderCharm
 
 logger = logging.getLogger(__name__)
 
 VOLUME_DRIVER = 'cinder.volume.drivers.solidfire.SolidFireDriver'
 
 
-class CinderSolidfireCharm(OSBaseCharm):
+class CinderSolidfireCharm(BaseCinderCharm):
 
-    _stored = StoredState()
     PACKAGES = ['cinder-common']
+    # Overriden from the parent. May be set depending on the charm's properties
+    stateless = False
+    active_active = False
 
     def __init__(self, *args, **kwargs):
-        """Set observables to watch"""
         super().__init__(*args, **kwargs)
-        self.framework.observe(self.on.install, self._on_install)
-        self.framework.observe(self.on.update_status, self._on_update_status)
-        self.framework.observe(self.on.config_changed, self._on_config_changed)
-        self.framework.observe(
-            self.on.storage_backend_relation_changed,
-            self._on_storage_backend_changed)
 
-    def _on_install(self, event: InstallEvent):
-        """Install ubuntu packages"""
-        self.install_pkgs()
-        self.unit.status = ActiveStatus('Unit is ready')
-
-    def _on_update_status(self, event: UpdateStatusEvent):
-        """Mantain active status if everything is okay"""
-        expected_status = WaitingStatus('Charm configuration in progress')
-        if (self.unit.status == expected_status):
-            self.unit.status = ActiveStatus('Unit is ready')
-
-    def _on_config_changed(self, event: ConfigChangedEvent):
-        """Update information to main charm on config change"""
-        for relation in self.framework.model.relations.get('storage-backend'):
-            self._set_relation_data(relation.data[self.unit])
-        self.unit.status = ActiveStatus('Unit is ready')
-
-    def _on_storage_backend_changed(self, event: RelationChangedEvent):
-        """Send information to main charm on backend relation event"""
-        self._set_relation_data(event.relation.data[self.unit])
-
-    def _set_relation_data(self, data) -> None:
-        """Send information to main charm through subordinate relation"""
-        backend_name = self.model.config['volume-backend-name']
-        data['backend-name'] = backend_name
-        data['subordinate_configuration'] = self._render_config(backend_name)
-
-    def _render_config(self, backend_name) -> str:
-        """Generate backend configuration for cinder.conf"""
-        cget = self.model.config.get
+    def cinder_configuration(self, charm_config) -> 'list[tuple]':
+        """Return the configuration to be set by the principal"""
+        cget = charm_config.get
 
         sf_volume_prefix = str(uuid.uuid4()) if cget(
             'volume-prefix') == "UUID" else cget('volume-prefix')
@@ -98,14 +61,7 @@ class CinderSolidfireCharm(OSBaseCharm):
             ('sf_volume_prefix', sf_volume_prefix)
         ]
         options = [(x, y) for x, y in raw_options if y]
-
-        return json.dumps({
-            "cinder": {
-                "/etc/cinder/cinder.conf": {
-                    "sections": {backend_name: options}
-                }
-            }
-        })
+        return options
 
 
 if __name__ == '__main__':

tests/tests.yaml

@@ -4,6 +4,6 @@ tests:
 configure:
   - zaza.openstack.charm_tests.keystone.setup.add_demo_user
 gate_bundles:
-  - bionic-queens
+  - focal-ussuri
 smoke_bundles:
-  - bionic-queens
+  - focal-ussuri