From a829b372e0d6c5bb3e759a40b84e83ac56e409ee Mon Sep 17 00:00:00 2001
From: Liam Young <liam.young@canonical.com>
Date: Tue, 7 Jul 2020 09:56:25 +0000
Subject: [PATCH 1/5] Use model tmpdor for key storage

Use the model specific tmp dir to store the test ssh private key.
This avoids the key being overwritten in CMR tests.

Depends-On: https://github.com/openstack-charmers/zaza/pull/371
---
 zaza/openstack/utilities/openstack.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/zaza/openstack/utilities/openstack.py b/zaza/openstack/utilities/openstack.py
index 28ba29a..034cae3 100644
--- a/zaza/openstack/utilities/openstack.py
+++ b/zaza/openstack/utilities/openstack.py
@@ -2202,7 +2202,8 @@ def get_private_key_file(keypair_name):
     :returns: Path to file containing key
     :rtype: str
     """
-    return 'tests/id_rsa_{}'.format(keypair_name)
+    tmp_dir = deployment_env.get_tmpdir()
+    return '{}/id_rsa_{}'.format(tmp_dir, keypair_name)
 
 
 def write_private_key(keypair_name, key):

From 76fdb61e0f1b364713a4ecbc474fd3f8b900deb9 Mon Sep 17 00:00:00 2001
From: Liam Young <liam.young@canonical.com>
Date: Tue, 7 Jul 2020 12:18:01 +0000
Subject: [PATCH 2/5] Fix up unit tests

---
 .../.test_zaza_utilities_openstack.py.swp       | Bin 0 -> 73728 bytes
 .../utilities/test_zaza_utilities_openstack.py  |  10 ++++++++--
 zaza/openstack/utilities/.openstack.py.swp      | Bin 0 -> 16384 bytes
 3 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 unit_tests/utilities/.test_zaza_utilities_openstack.py.swp
 create mode 100644 zaza/openstack/utilities/.openstack.py.swp

diff --git a/unit_tests/utilities/.test_zaza_utilities_openstack.py.swp b/unit_tests/utilities/.test_zaza_utilities_openstack.py.swp
new file mode 100644
index 0000000000000000000000000000000000000000..2ef70f74efe45a7a7db302b8b0e7266b3d9ec4d8
GIT binary patch
literal 73728
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%0AjUXHRl4eUJnLYj8_^v1
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

literal 0
HcmV?d00001

diff --git a/unit_tests/utilities/test_zaza_utilities_openstack.py b/unit_tests/utilities/test_zaza_utilities_openstack.py
index a6aa190..b0d76b0 100644
--- a/unit_tests/utilities/test_zaza_utilities_openstack.py
+++ b/unit_tests/utilities/test_zaza_utilities_openstack.py
@@ -581,17 +581,23 @@ class TestOpenStackUtils(ut_utils.BaseTestCase):
         nova_mock.keypairs.create.assert_called_once_with(name='mykeys')
 
     def test_get_private_key_file(self):
+        self.patch_object(openstack_utils.deployment_env, 'get_tmpdir',
+                          return_value=False)
+        self.get_tmpdir.return_value = '/tmp/zaza-model1'
         self.assertEqual(
             openstack_utils.get_private_key_file('mykeys'),
-            'tests/id_rsa_mykeys')
+            '/tmp/zaza-model1/id_rsa_mykeys')
 
     def test_write_private_key(self):
+        self.patch_object(openstack_utils.deployment_env, 'get_tmpdir',
+                          return_value=False)
+        self.get_tmpdir.return_value = '/tmp/zaza-model1'
         m = mock.mock_open()
         with mock.patch(
             'zaza.openstack.utilities.openstack.open', m, create=False
         ):
             openstack_utils.write_private_key('mykeys', 'keycontents')
-        m.assert_called_once_with('tests/id_rsa_mykeys', 'w')
+        m.assert_called_once_with('/tmp/zaza-model1/id_rsa_mykeys', 'w')
         handle = m()
         handle.write.assert_called_once_with('keycontents')
 
diff --git a/zaza/openstack/utilities/.openstack.py.swp b/zaza/openstack/utilities/.openstack.py.swp
new file mode 100644
index 0000000000000000000000000000000000000000..8928f8e097d100e8cc7cc6552fcb436d622ccf75
GIT binary patch
literal 16384
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

literal 0
HcmV?d00001


From 9b706b8eaa6f699463e45685e49da7476b00efdc Mon Sep 17 00:00:00 2001
From: Liam Young <liam.young@canonical.com>
Date: Tue, 7 Jul 2020 12:24:32 +0000
Subject: [PATCH 3/5] Remove swap files

---
 .../.test_zaza_utilities_openstack.py.swp       | Bin 73728 -> 0 bytes
 zaza/openstack/utilities/.openstack.py.swp      | Bin 16384 -> 0 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 unit_tests/utilities/.test_zaza_utilities_openstack.py.swp
 delete mode 100644 zaza/openstack/utilities/.openstack.py.swp

diff --git a/unit_tests/utilities/.test_zaza_utilities_openstack.py.swp b/unit_tests/utilities/.test_zaza_utilities_openstack.py.swp
deleted file mode 100644
index 2ef70f74efe45a7a7db302b8b0e7266b3d9ec4d8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 73728
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%0AjUXHRl4eUJnLYj8_^v1
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

diff --git a/zaza/openstack/utilities/.openstack.py.swp b/zaza/openstack/utilities/.openstack.py.swp
deleted file mode 100644
index 8928f8e097d100e8cc7cc6552fcb436d622ccf75..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16384
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


From ed2aded7f9fb80b8be911a8c2cb643d689e24ec7 Mon Sep 17 00:00:00 2001
From: Liam Young <liam.young@canonical.com>
Date: Tue, 7 Jul 2020 12:32:54 +0000
Subject: [PATCH 4/5] Fix another unit test

---
 unit_tests/utilities/test_zaza_utilities_openstack.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/unit_tests/utilities/test_zaza_utilities_openstack.py b/unit_tests/utilities/test_zaza_utilities_openstack.py
index b0d76b0..0b504b1 100644
--- a/unit_tests/utilities/test_zaza_utilities_openstack.py
+++ b/unit_tests/utilities/test_zaza_utilities_openstack.py
@@ -582,16 +582,14 @@ class TestOpenStackUtils(ut_utils.BaseTestCase):
 
     def test_get_private_key_file(self):
         self.patch_object(openstack_utils.deployment_env, 'get_tmpdir',
-                          return_value=False)
-        self.get_tmpdir.return_value = '/tmp/zaza-model1'
+                          return_value='/tmp/zaza-model1')
         self.assertEqual(
             openstack_utils.get_private_key_file('mykeys'),
             '/tmp/zaza-model1/id_rsa_mykeys')
 
     def test_write_private_key(self):
         self.patch_object(openstack_utils.deployment_env, 'get_tmpdir',
-                          return_value=False)
-        self.get_tmpdir.return_value = '/tmp/zaza-model1'
+                          return_value='/tmp/zaza-model1')
         m = mock.mock_open()
         with mock.patch(
             'zaza.openstack.utilities.openstack.open', m, create=False
@@ -602,6 +600,8 @@ class TestOpenStackUtils(ut_utils.BaseTestCase):
         handle.write.assert_called_once_with('keycontents')
 
     def test_get_private_key(self):
+        self.patch_object(openstack_utils.deployment_env, 'get_tmpdir',
+                          return_value='/tmp/zaza-model1')
         self.patch_object(openstack_utils.os.path, "isfile",
                           return_value=True)
         m = mock.mock_open(read_data='myprivkey')

From 7f122b8611198fc8b36f9a8ce6942e7224b1197c Mon Sep 17 00:00:00 2001
From: Liam Young <liam.young@canonical.com>
Date: Tue, 7 Jul 2020 12:38:18 +0000
Subject: [PATCH 5/5] Last unit test fix (passing locally, was failing in
 travis)

---
 unit_tests/utilities/test_zaza_utilities_openstack.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/unit_tests/utilities/test_zaza_utilities_openstack.py b/unit_tests/utilities/test_zaza_utilities_openstack.py
index 0b504b1..549ed71 100644
--- a/unit_tests/utilities/test_zaza_utilities_openstack.py
+++ b/unit_tests/utilities/test_zaza_utilities_openstack.py
@@ -613,6 +613,8 @@ class TestOpenStackUtils(ut_utils.BaseTestCase):
                 'myprivkey')
 
     def test_get_private_key_file_missing(self):
+        self.patch_object(openstack_utils.deployment_env, 'get_tmpdir',
+                          return_value='/tmp/zaza-model1')
         self.patch_object(openstack_utils.os.path, "isfile",
                           return_value=False)
         self.assertIsNone(openstack_utils.get_private_key('mykeys'))