Rename providers to clouds to respect naming convention

Also, move rackspace openstack-based tests to test_openstack.py

tests/integration/cloud/clouds/test_openstack.py

@@ -6,26 +6,43 @@ Tests for the Openstack Cloud Provider
 # Import python libs
 from __future__ import absolute_import, print_function, unicode_literals
 import logging
+import os
 
 # Import Salt Testing libs
-from tests.support.case import ModuleCase
+from tests.support.case import ModuleCase, ShellCase
+from tests.support.paths import FILES
 from tests.support.unit import skipIf
-from tests.support.helpers import destructiveTest
+from tests.support.helpers import destructiveTest, expensiveTest, generate_random_name
 from tests.support.mixins import SaltReturnAssertsMixin
 
+# Import Salt Libs
+from salt.config import cloud_providers_config
+
 log = logging.getLogger(__name__)
 
-NO_KEYSTONE = False
 try:
     import keystoneclient  # pylint: disable=import-error,unused-import
     from libcloud.common.openstack_identity import OpenStackIdentity_3_0_Connection
     from libcloud.common.openstack_identity import OpenStackIdentityTokenScope
+    HAS_KEYSTONE = True
 except ImportError:
-    NO_KEYSTONE = True
+    HAS_KEYSTONE = True
+
+# Import Third-Party Libs
+try:
+    import shade  # pylint: disable=unused-import
+    HAS_SHADE = True
+except ImportError:
+    HAS_SHADE = False
+
+# Create the cloud instance name to be used throughout the tests
+INSTANCE_NAME = generate_random_name('CLOUD-TEST-')
+PROVIDER_NAME = 'openstack'
+DRIVER_NAME = 'openstack'
 
 
 @skipIf(
-    NO_KEYSTONE,
+    not HAS_KEYSTONE,
     'Please install keystoneclient and a keystone server before running'
     'openstack integration tests.'
 )
@@ -156,3 +173,82 @@ class OpenstackTest(ModuleCase, SaltReturnAssertsMixin):
                                                   tenant_name='admin')
         driver.authenticate()
         self.assertTrue(driver.auth_token)
+
+
+
+@skipIf(not HAS_SHADE, 'openstack driver requires `shade`')
+class RackspaceTest(ShellCase):
+    '''
+    Integration tests for the Rackspace cloud provider using the Openstack driver
+    '''
+
+    @expensiveTest
+    def setUp(self):
+        '''
+        Sets up the test requirements
+        '''
+        super(RackspaceTest, self).setUp()
+
+        # check if appropriate cloud provider and profile files are present
+        profile_str = 'openstack-config'
+        providers = self.run_cloud('--list-providers')
+        if profile_str + ':' not in providers:
+            self.skipTest(
+                'Configuration file for {0} was not found. Check {0}.conf files '
+                'in tests/integration/files/conf/cloud.*.d/ to run these tests.'
+                .format(PROVIDER_NAME)
+            )
+
+        # check if personal access token, ssh_key_file, and ssh_key_names are present
+        config = cloud_providers_config(
+            os.path.join(
+                FILES,
+                'conf',
+                'cloud.providers.d',
+                PROVIDER_NAME + '.conf'
+            )
+        )
+
+        region_name = config[profile_str][DRIVER_NAME].get('region_name')
+        auth = config[profile_str][DRIVER_NAME].get('auth')
+        cloud = config[profile_str][DRIVER_NAME].get('cloud')
+        if not region_name or not (auth or cloud):
+            self.skipTest(
+                'A region_name and (auth or cloud) must be provided to run these '
+                'tests. Check tests/integration/files/conf/cloud.providers.d/{0}.conf'
+                .format(PROVIDER_NAME)
+            )
+
+    def test_instance(self):
+        '''
+        Test creating an instance on rackspace with the openstack driver
+        '''
+        # check if instance with salt installed returned
+        try:
+            self.assertIn(
+                INSTANCE_NAME,
+                [i.strip() for i in self.run_cloud('-p rackspace-test {0}'.format(INSTANCE_NAME), timeout=500)]
+            )
+        except AssertionError:
+            self.run_cloud('-d {0} --assume-yes'.format(INSTANCE_NAME), timeout=500)
+            raise
+
+        # delete the instance
+        try:
+            self.assertIn(
+                INSTANCE_NAME + ':',
+                [i.strip() for i in self.run_cloud('-d {0} --assume-yes'.format(INSTANCE_NAME), timeout=500)]
+            )
+        except AssertionError:
+            raise
+
+    def tearDown(self):
+        '''
+        Clean up after tests
+        '''
+        query = self.run_cloud('--query')
+        ret = '        {0}:'.format(INSTANCE_NAME)
+
+        # if test instance is still present, delete it
+        if ret in query:
+            self.run_cloud('-d {0} --assume-yes'.format(INSTANCE_NAME), timeout=500)