From e997647870e6f194eeaf9a29da05af862de48934 Mon Sep 17 00:00:00 2001
From: "camille.rodriguez" <camille.rodriguez@canonical.com>
Date: Mon, 27 Jul 2020 15:47:21 -0500
Subject: [PATCH] Add CHAP auth to tests

---
 zaza/openstack/charm_tests/iscsi-connector/setup.py | 9 +++++++--
 zaza/openstack/charm_tests/iscsi-connector/tests.py | 5 +++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/zaza/openstack/charm_tests/iscsi-connector/setup.py b/zaza/openstack/charm_tests/iscsi-connector/setup.py
index d016a36..dbfc6f0 100644
--- a/zaza/openstack/charm_tests/iscsi-connector/setup.py
+++ b/zaza/openstack/charm_tests/iscsi-connector/setup.py
@@ -49,9 +49,14 @@ def configure_iscsi_target():
     lun = 'iqn.2020-07.canonical.com:lun1'
     backing_store = 'dev/vdb'
     initiator_address = zaza.model.get_app_ips('ubuntu')[0]
+    username = 'iscsi-user'
+    password = 'password123'
+    username_in = 'iscsi-target'
+    password_in = 'secretpass'
     write_file = (
-        """echo -e '<target {}>\n\tbacking-store {}\n\tinitiator-address {}\n</target>' | """
-        """sudo tee /etc/tgt/conf.d/iscsi.conf""".format(lun, backing_store,initiator_address)
+        """echo -e '<target {}>\n\tbacking-store {}\n\tinitiator-address {}\n\tincominguser {} {}\n\t"""
+        """outgoinguser {} {}</target>' | sudo tee /etc/tgt/conf.d/iscsi.conf""".format(lun, backing_store,
+        initiator_address, username, password, username_in, password_in)
     )
     logging.info('Writing target iscsi.conf')
     zaza.model.run_on_unit('ubuntu-target/0', write_file)
diff --git a/zaza/openstack/charm_tests/iscsi-connector/tests.py b/zaza/openstack/charm_tests/iscsi-connector/tests.py
index bbd4e87..0507b81 100644
--- a/zaza/openstack/charm_tests/iscsi-connector/tests.py
+++ b/zaza/openstack/charm_tests/iscsi-connector/tests.py
@@ -40,6 +40,11 @@ class ISCSIConnectorTest(test_utils.BaseCharmTest):
             'initiator-dictionary': initiator_dictionary,
             'target': target_ip,
             'port': '3260',
+            'iscsi-node-session-auth-authmethod': 'CHAP',
+            'iscsi-node-session-auth-username': 'iscsi-user',
+            'iscsi-node-session-auth-password': 'password123',
+            'iscsi-node-session-auth-username_in': 'iscsi-target',
+            'iscsi-node-session-auth-password_in': 'secretpass',
         }
         zaza.model.set_application_config('iscsi-connector', conf)