From 1de90260bee6f4eae487245e65f591a445a6ece3 Mon Sep 17 00:00:00 2001
From: narindergupta <narinder.gupta@canonical.com>
Date: Tue, 1 Dec 2020 14:44:24 -0600
Subject: [PATCH] added the transport type and also include certificates layer

---
 src/layer.yaml                           | 19 +++++++++++--------
 src/lib/charm/openstack/cinder_netapp.py |  9 +++++++--
 src/tests/bundles/focal-ussuri.yaml      | 11 ++++++++++-
 src/tests/bundles/focal-victoria.yaml    | 10 +++++++++-
 4 files changed, 37 insertions(+), 12 deletions(-)

diff --git a/src/layer.yaml b/src/layer.yaml
index 901fe00..06a3229 100644
--- a/src/layer.yaml
+++ b/src/layer.yaml
@@ -1,13 +1,16 @@
-includes: ['layer:openstack', 'interface:cinder-backend']
+includes:
+- "layer:openstack"
+- "interface:cinder-backend"
+- "interface:tls-certificates"
 config:
   deletes:
-      - debug
-      - verbose
-      - use-syslog
-      - use-internal-endpoints
-      - ssl_ca
-      - ssl_cert
-      - ssl_key
+  - debug
+  - verbose
+  - use-syslog
+  - use-internal-endpoints
+  - ssl_ca
+  - ssl_cert
+  - ssl_key
 options:
   basic:
     use_venv: True
diff --git a/src/lib/charm/openstack/cinder_netapp.py b/src/lib/charm/openstack/cinder_netapp.py
index b832f8d..1d59a5d 100644
--- a/src/lib/charm/openstack/cinder_netapp.py
+++ b/src/lib/charm/openstack/cinder_netapp.py
@@ -21,17 +21,23 @@ class CinderNetAppCharm(
         service = self.config.get('volume-backend-name')
         volumedriver = 'cinder.volume.drivers.netapp.common.NetAppDriver'
         driver_options_extension = []
+        driver_transport = []
         driver_options_common = [
             ('netapp_storage_family', self.config.get('netapp-storage-family')),
             ('netapp_storage_protocol', self.config.get('netapp-storage-protocol')),
             ('netapp_vserver', self.config.get('netapp-vserver')),
             ('netapp_server_hostname', self.config.get('netapp-server-hostname')),
             ('netapp_server_port', self.config.get('netapp-server-port')),
+            ('use_multipath_for_image_xfer', self.config.get('use-multipath')),
             ('netapp_login', self.config.get('netapp-login')),
             ('netapp_password', self.config.get('netapp-password')),
             ('volume_driver', volumedriver),
             ('volume_backend_name', service)]
 
+        if self.config.get('netapp-server-port') == 443:
+            driver_transport = [
+                ('netapp_transport_type', "https")]
+
         if self.config.get('netapp-storage-family') == "eseries":
             driver_options_extension = [
                 ('netapp_controller_ips', self.config.get('netapp-controller-ips')),
@@ -43,8 +49,7 @@ class CinderNetAppCharm(
             driver_options_extension = [
                 ('nfs_shares_config', self.config.get('netapp-nfs-shares-config'))]
 
-        return driver_options_common + driver_options_extension
-
+        return driver_options_common + driver_transport + driver_options_extension
 
 class CinderNetAppCharmRocky(CinderNetAppCharm):
 
diff --git a/src/tests/bundles/focal-ussuri.yaml b/src/tests/bundles/focal-ussuri.yaml
index ec6978f..99feedb 100644
--- a/src/tests/bundles/focal-ussuri.yaml
+++ b/src/tests/bundles/focal-ussuri.yaml
@@ -42,7 +42,16 @@ applications:
     series: focal
     charm: cinder-netapp
     options:
-# Add config options here
+      netapp-storage-family: ontap_cluster
+      netapp-storage-protocol: iscsi
+      netapp-vserver: 'hou-cloud'
+      netapp-server-hostname: '10.10.10.10'
+      volume-backend-name: cinder-netapp
+      netapp-server-port: 80
+      netapp-login: admin
+      netapp-password: Passw0rd
+      use-multipath: True
+
   rabbitmq-server:
     charm: cs:~openstack-charmers-next/rabbitmq-server
     num_units: 1
diff --git a/src/tests/bundles/focal-victoria.yaml b/src/tests/bundles/focal-victoria.yaml
index ec6978f..d95c659 100644
--- a/src/tests/bundles/focal-victoria.yaml
+++ b/src/tests/bundles/focal-victoria.yaml
@@ -42,7 +42,15 @@ applications:
     series: focal
     charm: cinder-netapp
     options:
-# Add config options here
+      netapp-storage-family: ontap_cluster
+      netapp-storage-protocol: iscsi
+      netapp-vserver: 'hou-cloud'
+      netapp-server-hostname: '10.10.10.10'
+      volume-backend-name: cinder-netapp
+      netapp-server-port: 80
+      netapp-login: admin
+      netapp-password: Passw0rd
+      use-multipath: True
   rabbitmq-server:
     charm: cs:~openstack-charmers-next/rabbitmq-server
     num_units: 1