From a5b618d08bde4e3178ad3a815e25b1d0a1236072 Mon Sep 17 00:00:00 2001
From: Chris MacNaughton <chris.macnaughton@canonical.com>
Date: Thu, 7 Nov 2019 15:13:06 +0800
Subject: [PATCH] refactor tests a bit

---
 .../charm_tests/manila_ganesha/tests.py       | 32 +++++++++----------
 zaza/openstack/configure/guest.py             |  3 ++
 2 files changed, 19 insertions(+), 16 deletions(-)

diff --git a/zaza/openstack/charm_tests/manila_ganesha/tests.py b/zaza/openstack/charm_tests/manila_ganesha/tests.py
index f7b5ade..3353517 100644
--- a/zaza/openstack/charm_tests/manila_ganesha/tests.py
+++ b/zaza/openstack/charm_tests/manila_ganesha/tests.py
@@ -31,6 +31,14 @@ class ManilaGaneshaTests(test_utils.OpenStackBaseTest):
     """Encapsulate Manila Ganesha tests."""
 
     RESOURCE_PREFIX = 'zaza-manilatests'
+    INSTANCE_USERDATA = """#cloud-config
+packages:
+- nfs-common
+write_files:
+- path: "/mnt/ceph"
+  permissions: '0600'
+  owner: root:root
+"""
 
     @classmethod
     def setUpClass(cls):
@@ -55,20 +63,19 @@ class ManilaGaneshaTests(test_utils.OpenStackBaseTest):
         share = self.manila_client.shares.create(
             share_type='cephfsnfstype', name='cephnfsshare1',
             share_proto="nfs", size=1)
+        mount_path = share.export_locations[0]
 
         # Spawn Servers
-        guest.launch_instance(
+        instance_1 = guest.launch_instance(
             glance_setup.LTS_IMAGE_NAME,
-            vm_name='{}-ins-1'.format(self.RESOURCE_PREFIX))
-        guest.launch_instance(
+            vm_name='{}-ins-1'.format(self.RESOURCE_PREFIX),
+            userdata=self.INSTANCE_USERDATA)
+        instance_2 = guest.launch_instance(
             glance_setup.LTS_IMAGE_NAME,
-            vm_name='{}-ins-2'.format(self.RESOURCE_PREFIX))
+            vm_name='{}-ins-2'.format(self.RESOURCE_PREFIX),
+            userdata=self.INSTANCE_USERDATA)
 
-        instance_1 = self.nova_client.servers.find(
-            name='{}-ins-1'.format(self.RESOURCE_PREFIX))
         fip_1 = neutron_tests.floating_ips_from_instance(instance_1)[0]
-        instance_2 = self.nova_client.servers.find(
-            name='{}-ins-2'.format(self.RESOURCE_PREFIX))
         fip_2 = neutron_tests.floating_ips_from_instance(instance_2)[0]
 
         share.allow(access_type='ip', access=fip_1, access_level='rw')
@@ -78,7 +85,6 @@ class ManilaGaneshaTests(test_utils.OpenStackBaseTest):
         username = guest.boot_tests['bionic']['username']
         password = guest.boot_tests['bionic'].get('password')
         privkey = openstack_utils.get_private_key(nova_utils.KEYPAIR_NAME)
-        mount_path = share.export_locations[0]
 
         # Write a file on instance_1
         def verify_setup(stdin, stdout, stderr):
@@ -86,9 +92,6 @@ class ManilaGaneshaTests(test_utils.OpenStackBaseTest):
             self.assertEqual(status, 0)
 
         openstack_utils.ssh_command(
-            username, fip_1, 'instance-1',
-            'sudo apt install -yq nfs-common && '
-            'sudo mkdir -p /mnt/ceph && '
             'sudo mount -t nfs -o nfsvers=4.1,proto=tcp {} /mnt/ceph && '
             'echo "test" | sudo tee /mnt/ceph/test'.format(
                 mount_path),
@@ -96,17 +99,14 @@ class ManilaGaneshaTests(test_utils.OpenStackBaseTest):
 
         # Read that file on instance_2
         openstack_utils.ssh_command(
-            username, fip_2, 'instance-2',
-            'sudo apt install -yq nfs-common && '
-            'sudo /bin/mkdir -p /mnt/ceph && '
             'sudo /bin/mount -t nfs -o nfsvers=4.1,proto=tcp {} /mnt/ceph'
             .format(mount_path),
             password=password, privkey=privkey, verify=verify_setup)
 
         def verify(stdin, stdout, stderr):
             status = stdout.channel.recv_exit_status()
+            self.assertEqual(status, 0)
             out = ""
-            print("[{}] Stdout:".format(status))
             for line in iter(stdout.readline, ""):
                 out += line
             self.assertEqual(out, "test\n")
diff --git a/zaza/openstack/configure/guest.py b/zaza/openstack/configure/guest.py
index 9418cb3..920b539 100644
--- a/zaza/openstack/configure/guest.py
+++ b/zaza/openstack/configure/guest.py
@@ -62,6 +62,8 @@ def launch_instance(instance_key, use_boot_volume=False, vm_name=None,
     :type meta: dict
     :param userdata: Configuration to use upon launch, used by cloud-init.
     :type userdata: str
+    :returns: the created instance
+    :rtype: novaclient.Server
     """
     keystone_session = openstack_utils.get_overcloud_keystone_session()
     nova_client = openstack_utils.get_nova_session_client(keystone_session)
@@ -140,3 +142,4 @@ def launch_instance(instance_key, use_boot_volume=False, vm_name=None,
         vm_name=vm_name,
         password=boot_tests[instance_key].get('password'),
         privkey=openstack_utils.get_private_key(nova_utils.KEYPAIR_NAME))
+    return instance