fixes the deployment issue on ussuri

src/config.yaml

@@ -54,7 +54,7 @@ options:
         The file referenced by this configuration option should contain a
         list of NFS shares, each on their own line, to which the driver
         should attempt to provision new Cinder volumes into.
-  netapp_controller_ips:
+  netapp-controller-ips:
     type: string
     default: !!null ""
     description: |
@@ -63,12 +63,12 @@ options:
       to the specified controllers. Specify the value of this option to be
       a comma separated list of controller hostnames or IP addresses to be
       used for provisioning.
-  netapp_array-password:
+  netapp-array-password:
     type: string
     default: !!null ""
     description: |
       Password for the NetApp E-Series storage array.
-  netapp_storage_pools:
+  netapp-storage-pools:
     type: string
     default: !!null ""
     description: "comma seperated list of pool names ie: pool1,pool2"
@@ -78,7 +78,7 @@ options:
     description: |
       Use multipath for image transfer. The volume_use_multipath
       option should be set to True in the nova.conf
-  netapp_enable_multiattach:
+  netapp-enable-multiattach:
     type: boolean
     default: False
     description: |

src/lib/charm/openstack/cinder_netapp.py

@@ -3,17 +3,18 @@ import charms_openstack.charm
 charms_openstack.charm.use_defaults('charm.default-select-release')
 
 
-class CindernetappCharm(
+class CinderNetAppCharm(
         charms_openstack.charm.CinderStoragePluginCharm):
 
     name = 'cinder_netapp'
-    release = 'ussuri'
-    stateless = True
     version_package = 'cinder-common'
+    release = 'ocata'
     packages = []
+    release_pkg = 'cinder-common'
+    stateless = True
     # Specify any config that the user *must* set.
     mandatory_config = [
-        'netapp_storage_family', 'netapp_storage_protocol', 'netapp_server_hostname',
+        'netapp-storage-family', 'netapp-storage-protocol', 'netapp-server-hostname',
         'volume-backend-name']
 
     def cinder_configuration(self):
@@ -40,15 +41,15 @@ class CindernetappCharm(
 
         if self.config.get('netapp-storage-protocol') == "nfs":
             driver_options_extension = [
-                ('nfs_shares_config', self.config.get('nfs-shares-config'))]
+                ('nfs_shares_config', self.config.get('netapp-nfs-shares-config'))]
 
         return driver_options_common + driver_options_extension
 
 
-class CindernetappCharmRocky(CindernetappCharm):
+class CinderNetAppCharmRocky(CinderNetAppCharm):
 
     # Ussuri needs py3 packages.
-    release = 'ussuri'
+    release = 'rocky'
     version_package = 'cinder-common'
     packages = []
 

src/tests/bundles/focal-victoria.yaml

@@ -0,0 +1,50 @@
+series: focal
+comment:
+- 'machines section to decide order of deployment. database sooner = faster'
+machines:
+  '0':
+    constraints: mem=3072M
+  '1':
+  '2':
+  '3':
+relations:
+- - keystone:shared-db
+  - mysql:shared-db
+- - cinder:shared-db
+  - mysql:shared-db
+- - cinder:identity-service
+  - keystone:identity-service
+- - cinder:amqp
+  - rabbitmq-server:amqp
+- - cinder:storage-backend
+  - cinder-netapp:storage-backend
+applications:
+  mysql:
+    charm: cs:~openstack-charmers-next/percona-cluster
+    num_units: 1
+    to:
+    - '0'
+  keystone:
+    charm: cs:~openstack-charmers-next/keystone
+    num_units: 1
+    options:
+      openstack-origin: distro
+    to:
+    - '1'
+  cinder:
+    charm: cs:~openstack-charmers-next/cinder
+    num_units: 1
+    options:
+      openstack-origin: distro
+    to:
+    - '2'
+  cinder-netapp:
+    series: focal
+    charm: cinder-netapp
+    options:
+# Add config options here
+  rabbitmq-server:
+    charm: cs:~openstack-charmers-next/rabbitmq-server
+    num_units: 1
+    to:
+    - '3'

unit_tests/test_lib_charm_openstack_cinder_netapp.py

@@ -19,7 +19,7 @@ import charm.openstack.cinder_netapp as cinder_netapp
 import charms_openstack.test_utils as test_utils
 
 
-class TestCindernetappCharm(test_utils.PatchHelper):
+class TestCinderNetAppCharm(test_utils.PatchHelper):
 
     def _patch_config_and_charm(self, config):
         self.patch_object(charmhelpers.core.hookenv, 'config')
@@ -30,7 +30,7 @@ class TestCindernetappCharm(test_utils.PatchHelper):
             return config
 
         self.config.side_effect = cf
-        c = cinder_netapp.CindernetappCharm()
+        c = cinder_netapp.CinderNetAppCharm()
         return c
 
     def test_cinder_base(self):