Fix hardcoded values in cinder_test

Only Fuel attaches a kdrive in all cases and then increase the device
numbers. cinder_test now leverages on VOLUME_DEVICE_NAME as tempest.

It also updates the testcase to leverage on the right scenario.

Change-Id: Ib5cd17f69411f608f1b79e704604dc481581ebe0
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

1 files changed, 46 insertions, 150 deletions

diff --git a/functest/opnfv_tests/openstack/cinder/cinder_test.py b/functest/opnfv_tests/openstack/cinder/cinder_test.py
index d4a7cf7fe..7f9401c93 100644
--- a/functest/opnfv_tests/openstack/cinder/cinder_test.py
+++ b/functest/opnfv_tests/openstack/cinder/cinder_test.py
@@ -1,6 +1,5 @@
 #!/usr/bin/env python
 
-
 # Copyright (c) 2018 Enea AB and others
 
 # This program and the accompanying materials
@@ -12,21 +11,17 @@
 """CinderCheck testcase."""
 
 import logging
-import os
-import tempfile
-import time
+
 import pkg_resources
 from scp import SCPClient
-
-import paramiko
 from xtesting.core import testcase
-from xtesting.energy import energy
 
-from functest.opnfv_tests.openstack.cinder import cinder_base
+from functest.core import singlevm
 from functest.utils import config
+from functest.utils import env
 
 
-class CinderCheck(cinder_base.CinderBase):
+class CinderCheck(singlevm.SingleVm2):
     """
     CinderCheck testcase implementation.
 
@@ -41,178 +36,79 @@ class CinderCheck(cinder_base.CinderBase):
             kwargs["case_name"] = "cinder_test"
         super(CinderCheck, self).__init__(**kwargs)
         self.logger = logging.getLogger(__name__)
-        self.vm1 = None
         self.vm2 = None
-        self.sec = None
-        self.fip1 = None
         self.fip2 = None
-        self.keypair1 = None
-        self.keypair2 = None
-        (_, self.key1_filename) = tempfile.mkstemp()
-        self.ssh = paramiko.SSHClient()
-        (_, self.key2_filename) = tempfile.mkstemp()
-
-    @energy.enable_recording
-    def run(self, **kwargs):
-        """
-        Excecute CinderCheck testcase.
+        self.ssh2 = None
+        self.volume = None
+
+    def execute(self):
+        """Execute CinderCheck testcase.
 
         Sets up the OpenStack keypair, router, security group, and VM instance
-        objects then validates the ping.
+        objects then validates cinder.
         :return: the exit code from the super.execute() method
         """
-        try:
-            assert self.cloud
-            super(CinderCheck, self).run()
-
-            # Creating key pair 1
-            kp_name1 = getattr(
-                config.CONF, 'cinder_keypair_name') + '_1' + self.guid
-            self.logger.info("Creating keypair with name: '%s'", kp_name1)
-            self.keypair1 = self.cloud.create_keypair(kp_name1)
-            self.logger.debug("keypair: %s", self.keypair1)
-            self.logger.debug("private_key: %s", self.keypair1.private_key)
-            with open(self.key1_filename, 'w') as private_key1_file:
-                private_key1_file.write(self.keypair1.private_key)
-            # Creating key pair 2
-            kp_name2 = getattr(
-                config.CONF, 'cinder_keypair_name') + '_2' + self.guid
-            self.logger.info("Creating keypair with name: '%s'", kp_name2)
-            self.keypair2 = self.cloud.create_keypair(kp_name2)
-            self.logger.debug("keypair: %s", self.keypair2)
-            self.logger.debug("private_key: %s", self.keypair2.private_key)
-            with open(self.key2_filename, 'w') as private_key2_file:
-                private_key2_file.write(self.keypair2.private_key)
-
-            # Creating security group
-            self.sec = self.cloud.create_security_group(
-                getattr(config.CONF, 'cinder_sg_name') + self.guid,
-                getattr(config.CONF, 'cinder_sg_desc'))
-            self.cloud.create_security_group_rule(
-                self.sec.id, port_range_min='22', port_range_max='22',
-                protocol='tcp', direction='ingress')
-            self.cloud.create_security_group_rule(
-                self.sec.id, port_range_min='22', port_range_max='22',
-                protocol='tcp', direction='egress')
-            self.cloud.create_security_group_rule(
-                self.sec.id, protocol='icmp', direction='ingress')
-
-            # Creating VM 1
-            vm1_name = "{}-{}-{}".format(
-                getattr(config.CONF, 'cinder_vm_name_1'), "ssh", self.guid)
-            self.logger.info(
-                "Creating VM 1 instance with name: '%s'", vm1_name)
-            self.vm1 = self.cloud.create_server(
-                vm1_name, image=self.image.id, flavor=self.flavor.id,
-                key_name=self.keypair1.id,
-                auto_ip=False, wait=True,
-                timeout=getattr(config.CONF, 'cinder_vm_boot_timeout'),
-                network=self.network.id,
-                security_groups=[self.sec.id])
-            self.logger.debug("vm1: %s", self.vm2)
-            self.fip1 = self.cloud.create_floating_ip(
-                network=self.ext_net.id, server=self.vm1)
-            self.logger.debug("floating_ip1: %s", self.fip1)
-            self.vm1 = self.cloud.wait_for_server(self.vm1, auto_ip=False)
-            self.cloud.attach_volume(self.vm1, self.volume)
-
-            # Creating VM 2
-            vm2_name = "{}-{}-{}".format(
-                getattr(config.CONF, 'cinder_vm_name_2'), "ssh", self.guid)
-            self.logger.info(
-                "Creating VM 2 instance with name: '%s'", vm2_name)
-            self.vm2 = self.cloud.create_server(
-                vm2_name, image=self.image.id, flavor=self.flavor.id,
-                key_name=self.keypair2.id,
-                auto_ip=False, wait=True,
-                timeout=getattr(config.CONF, 'cinder_vm_boot_timeout'),
-                network=self.network.id,
-                security_groups=[self.sec.id])
-            self.logger.debug("vm2: %s", self.vm2)
-            self.fip2 = self.cloud.create_floating_ip(
-                network=self.ext_net.id, server=self.vm2)
-            self.logger.debug("floating_ip2: %s", self.fip2)
-            self.vm2 = self.cloud.wait_for_server(self.vm2, auto_ip=False)
-
-            return self.execute()
-        except Exception:  # pylint: disable=broad-except
-            self.logger.exception('Unexpected error running cinder_ssh')
-            return testcase.TestCase.EX_RUN_ERROR
-
-    def write_data(self):
-        time.sleep(10)
+        return self._write_data() or self._read_data()
+
+    def prepare(self):
+        super(CinderCheck, self).prepare()
+        self.vm2 = self.boot_vm(
+            '{}-vm2_{}'.format(self.case_name, self.guid),
+            key_name=self.keypair.id,
+            security_groups=[self.sec.id])
+        (self.fip2, self.ssh2) = self.connect(self.vm2)
+        self.volume = self.cloud.create_volume(
+            name='{}-volume_{}'.format(self.case_name, self.guid), size='2')
+
+    def _write_data(self):
+        assert self.cloud
+        self.cloud.attach_volume(self.sshvm, self.volume)
         write_data_script = pkg_resources.resource_filename(
             'functest.opnfv_tests.openstack.cinder', 'write_data.sh')
-        cmd = '. ~/write_data.sh '
-        username = getattr(config.CONF, 'openstack_image_user')
-        destination_path = '/home/' + username
-        self.ssh.set_missing_host_key_policy(paramiko.client.AutoAddPolicy())
-        self.ssh.connect(
-            self.vm1.public_v4,
-            username=username,
-            key_filename=self.key1_filename,
-            timeout=getattr(config.CONF, 'cinder_vm_ssh_connect_timeout'))
         try:
             scp = SCPClient(self.ssh.get_transport())
-            scp.put(write_data_script, remote_path=destination_path)
+            scp.put(write_data_script, remote_path="~/")
         except Exception:  # pylint: disable=broad-except
             self.logger.error("File not transfered!")
             return testcase.TestCase.EX_RUN_ERROR
-
         self.logger.debug("ssh: %s", self.ssh)
-        self.ssh.exec_command('chmod +x ~/write_data.sh')
-        (_, stdout, _) = self.ssh.exec_command(cmd)
-        self.logger.debug("volume_write output: %s", stdout.read())
-
+        (_, stdout, stderr) = self.ssh.exec_command(
+            "sh ~/write_data.sh {}".format(env.get('VOLUME_DEVICE_NAME')))
+        self.logger.debug("volume_write stdout: %s", stdout.read())
+        self.logger.debug("volume_write stderr: %s", stderr.read())
+        # Detach volume from VM 1
+        self.logger.info("Detach volume from VM 1")
+        self.cloud.detach_volume(self.sshvm, self.volume)
         return stdout.channel.recv_exit_status()
 
-    def read_data(self):
+    def _read_data(self):
         assert self.cloud
-        # Detach volume from VM 1
-        self.logger.info("Detach volume from VM 1")
-        self.cloud.detach_volume(self.vm1, self.volume)
         # Attach volume to VM 2
         self.logger.info("Attach volume to VM 2")
         self.cloud.attach_volume(self.vm2, self.volume)
         # Check volume data
-        time.sleep(10)
         read_data_script = pkg_resources.resource_filename(
             'functest.opnfv_tests.openstack.cinder', 'read_data.sh')
-        cmd = '. ~/read_data.sh '
-        username = getattr(config.CONF, 'openstack_image_user')
-        destination_path = '/home/' + username
-        self.ssh.set_missing_host_key_policy(paramiko.client.AutoAddPolicy())
-        self.ssh.connect(
-            self.vm2.public_v4,
-            username=username,
-            key_filename=self.key2_filename,
-            timeout=getattr(config.CONF, 'cinder_vm_ssh_connect_timeout'))
         try:
-            scp = SCPClient(self.ssh.get_transport())
-            scp.put(read_data_script, remote_path=destination_path)
+            scp = SCPClient(self.ssh2.get_transport())
+            scp.put(read_data_script, remote_path="~/")
         except Exception:  # pylint: disable=broad-except
             self.logger.error("File not transfered!")
             return testcase.TestCase.EX_RUN_ERROR
-        self.logger.debug("ssh: %s", self.ssh)
-        self.ssh.exec_command('chmod +x ~/read_data.sh')
-        (_, stdout, _) = self.ssh.exec_command(cmd)
-        self.logger.debug("read volume output: %s", stdout.read())
-
+        self.logger.debug("ssh: %s", self.ssh2)
+        (_, stdout, stderr) = self.ssh2.exec_command(
+            "sh ~/read_data.sh {}".format(env.get('VOLUME_DEVICE_NAME')))
+        self.logger.debug("read volume stdout: %s", stdout.read())
+        self.logger.debug("read volume stderr: %s", stderr.read())
+        self.logger.info("Detach volume from VM 2")
+        self.cloud.detach_volume(self.vm2, self.volume)
         return stdout.channel.recv_exit_status()
 
     def clean(self):
         assert self.cloud
-        os.remove(self.key1_filename)
-        os.remove(self.key2_filename)
-        self.cloud.delete_server(
-            self.vm1, wait=True,
-            timeout=getattr(config.CONF, 'cinder_vm_delete_timeout'))
         self.cloud.delete_server(
             self.vm2, wait=True,
-            timeout=getattr(config.CONF, 'cinder_vm_delete_timeout'))
-        self.cloud.delete_security_group(self.sec.id)
-        self.cloud.delete_keypair(self.keypair1.id)
-        self.cloud.delete_keypair(self.keypair2.id)
-        self.cloud.delete_floating_ip(self.fip1.id)
-        self.cloud.delete_floating_ip(self.fip2.id)
+            timeout=getattr(config.CONF, 'vping_vm_delete_timeout'))
+        self.cloud.delete_floating_ip(self.fip.id)
+        self.cloud.delete_volume(self.volume.id)
         super(CinderCheck, self).clean()