Add DHSS backend to Zaza

config.yaml

@@ -18,6 +18,18 @@ options:
     description: |
       Name of aggregate to create Vserver root volumes on. This option only
       applies when the option 'driver-handles-share-servers' is set to True.
+  enabled-share-protocols:
+    type: string
+    description: |
+      Comma-separated list of NFS protocol versions that will be enabled on
+      the Vservers from the NetApp ONTAP cluster.
+      The supported versions are:
+        * nfs3
+        * nfs4.0
+        * nfs4.1
+      This option only applies when the option 'driver-handles-share-servers'
+      is set to True.
+    default: nfs3,nfs4.0,nfs4.1
   vserver-name:
     type: string
     description: |

templates/queens/manila.conf

@@ -5,6 +5,7 @@ share_driver = manila.share.drivers.netapp.common.NetAppDriver
 driver_handles_share_servers = {{ options.driver_handles_share_servers }}
 {%- if options.driver_handles_share_servers %}
 netapp_root_volume_aggregate = {{ options.root_volume_aggregate_name }}
+netapp_enabled_share_protocols = {{ options.enabled_share_protocols }}
 {%- else %}
 netapp_vserver = {{ options.vserver_name }}
 {%- endif %}

tests/bundles/bionic-ussuri.yaml

@@ -120,8 +120,15 @@ applications:
   manila-netapp:
     charm: ../../manila-netapp.charm
     options:
+      share-backend-name: netapp-ontap
       driver-handles-share-servers: False
 
+  manila-netapp-dhss:
+    charm: ../../manila-netapp.charm
+    options:
+      share-backend-name: netapp-ontap-dhss
+      driver-handles-share-servers: True
+
 relations:
   - - 'manila:shared-db'
     - 'percona-cluster:shared-db'
@@ -131,6 +138,8 @@ relations:
     - 'keystone'
   - - 'manila:manila-plugin'
     - 'manila-netapp:manila-plugin'
+  - - 'manila:manila-plugin'
+    - 'manila-netapp-dhss:manila-plugin'
 
   - - 'keystone:shared-db'
     - 'percona-cluster:shared-db'

tests/bundles/focal-ussuri.yaml

@@ -139,8 +139,15 @@ applications:
   manila-netapp:
     charm: ../../manila-netapp.charm
     options:
+      share-backend-name: netapp-ontap
       driver-handles-share-servers: False
 
+  manila-netapp-dhss:
+    charm: ../../manila-netapp.charm
+    options:
+      share-backend-name: netapp-ontap-dhss
+      driver-handles-share-servers: True
+
 relations:
   - - 'manila:shared-db'
     - 'manila-mysql-router:shared-db'
@@ -152,6 +159,8 @@ relations:
     - 'keystone'
   - - 'manila:manila-plugin'
     - 'manila-netapp:manila-plugin'
+  - - 'manila:manila-plugin'
+    - 'manila-netapp-dhss:manila-plugin'
 
   - - 'keystone:shared-db'
     - 'keystone-mysql-router:shared-db'

tests/bundles/focal-victoria.yaml

@@ -139,8 +139,15 @@ applications:
   manila-netapp:
     charm: ../../manila-netapp.charm
     options:
+      share-backend-name: netapp-ontap
       driver-handles-share-servers: False
 
+  manila-netapp-dhss:
+    charm: ../../manila-netapp.charm
+    options:
+      share-backend-name: netapp-ontap-dhss
+      driver-handles-share-servers: True
+
 relations:
   - - 'manila:shared-db'
     - 'manila-mysql-router:shared-db'
@@ -152,6 +159,8 @@ relations:
     - 'keystone'
   - - 'manila:manila-plugin'
     - 'manila-netapp:manila-plugin'
+  - - 'manila:manila-plugin'
+    - 'manila-netapp-dhss:manila-plugin'
 
   - - 'keystone:shared-db'
     - 'keystone-mysql-router:shared-db'

tests/bundles/groovy-victoria.yaml

@@ -139,8 +139,15 @@ applications:
   manila-netapp:
     charm: ../../manila-netapp.charm
     options:
+      share-backend-name: netapp-ontap
       driver-handles-share-servers: False
 
+  manila-netapp-dhss:
+    charm: ../../manila-netapp.charm
+    options:
+      share-backend-name: netapp-ontap-dhss
+      driver-handles-share-servers: True
+
 relations:
   - - 'manila:shared-db'
     - 'manila-mysql-router:shared-db'
@@ -152,6 +159,8 @@ relations:
     - 'keystone'
   - - 'manila:manila-plugin'
     - 'manila-netapp:manila-plugin'
+  - - 'manila:manila-plugin'
+    - 'manila-netapp-dhss:manila-plugin'
 
   - - 'keystone:shared-db'
     - 'keystone-mysql-router:shared-db'

tests/bundles/overlays/local-charm-overlay.yaml.j2

@@ -5,3 +5,9 @@ applications:
       management-address: {{ TEST_MANILA_NETAPP_MANAGEMENT_ADDRESS }}
       admin-name: {{ TEST_MANILA_NETAPP_ADMIN_NAME }}
       admin-password: {{ TEST_MANILA_NETAPP_ADMIN_PASSWORD }}
+  manila-netapp-dhss:
+    options:
+      root-volume-aggregate-name: {{ TEST_MANILA_NETAPP_ROOT_VOL_AGGR_NAME }}
+      management-address: {{ TEST_MANILA_NETAPP_MANAGEMENT_ADDRESS }}
+      admin-name: {{ TEST_MANILA_NETAPP_ADMIN_NAME }}
+      admin-password: {{ TEST_MANILA_NETAPP_ADMIN_PASSWORD }}

tests/tests.yaml

@@ -17,10 +17,13 @@ configure:
   - zaza.openstack.charm_tests.nova.setup.create_flavors
   - zaza.openstack.charm_tests.nova.setup.manage_ssh_key
   - zaza.openstack.charm_tests.keystone.setup.add_demo_user
-  - zaza.openstack.charm_tests.manila_netapp.setup.setup_netapp_share_type
+  - zaza.openstack.charm_tests.manila_netapp.setup.create_netapp_share_type
+  - zaza.openstack.charm_tests.manila_netapp.setup.create_netapp_dhss_share_type
+  - zaza.openstack.charm_tests.manila_netapp.setup.create_netapp_share_network
 
 tests:
   - zaza.openstack.charm_tests.manila_netapp.tests.ManilaNetAppNFSTest
+  - zaza.openstack.charm_tests.manila_netapp.tests.ManilaNetAppDHSSNFSTest
 
 tests_options:
   force_deploy: