Merge pull request #20965 from rallytime/joyent_cloud_tests

Add Joyent cloud provider tests

tests/integration/cloud/providers/digital_ocean.py

@@ -12,6 +12,7 @@ import string
 from salttesting.helpers import ensure_in_syspath, expensiveTest
 
 ensure_in_syspath('../../../')
+
 # Import Salt Libs
 import integration
 from salt.config import cloud_providers_config
@@ -53,7 +54,7 @@ class DigitalOceanTest(integration.ShellCase):
                 .format(provider)
             )
 
-        # check if client_key and api_key are present
+        # check if client_key, api_key, ssh_key_file, and ssh_key_name are present
         path = os.path.join(integration.FILES,
                             'conf',
                             'cloud.providers.d',

tests/integration/cloud/providers/joyent.py

@@ -0,0 +1,115 @@
+# -*- coding: utf-8 -*-
+'''
+    :codeauthor: :email:`Nicole Thomas <nicole@saltstack.com>`
+'''
+
+# Import Python Libs
+import os
+import random
+import string
+
+# Import Salt Testing Libs
+from salttesting.helpers import ensure_in_syspath, expensiveTest
+
+ensure_in_syspath('../../../')
+
+# Import Salt Libs
+import integration
+from salt.config import cloud_providers_config
+
+
+def __random_name(size=6):
+    '''
+    Generates a random cloud instance name
+    '''
+    return 'CLOUD-TEST-' + ''.join(
+        random.choice(string.ascii_uppercase + string.digits)
+        for x in range(size)
+    )
+
+# Create the cloud instance name to be used throughout the tests
+INSTANCE_NAME = __random_name()
+
+
+class JoyentTest(integration.ShellCase):
+    '''
+    Integration tests for the Joyent cloud provider in Salt-Cloud
+    '''
+
+    @expensiveTest
+    def setUp(self):
+        '''
+        Sets up the test requirements
+        '''
+        super(JoyentTest, self).setUp()
+
+        # check if appropriate cloud provider and profile files are present
+        profile_str = 'joyent-config:'
+        provider = 'joyent'
+        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)
+            )
+
+        # check if user, password, private_key, and keyname are present
+        path = os.path.join(integration.FILES,
+                            'conf',
+                            'cloud.providers.d',
+                            provider + '.conf')
+        config = cloud_providers_config(path)
+
+        user = config['joyent-config'][provider]['user']
+        password = config['joyent-config'][provider]['password']
+        private_key = config['joyent-config'][provider]['private_key']
+        keyname = config['joyent-config'][provider]['keyname']
+
+        if user == '' or password == '' or private_key == '' or keyname == '':
+            self.skipTest(
+                'A user name, password, private_key file path, and a key name '
+                'must be provided to run these tests. Check '
+                'tests/integration/files/conf/cloud.providers.d/{0}.conf'
+                .format(provider)
+            )
+
+    def test_instance(self):
+        '''
+        Test creating and deleting instance on Joyent
+        '''
+
+        # create the instance
+        instance = self.run_cloud('-p joyent-test {0}'.format(INSTANCE_NAME))
+        ret_str = '        {0}'.format(INSTANCE_NAME)
+
+        # check if instance with salt installed returned
+        try:
+            self.assertIn(ret_str, instance)
+        except AssertionError:
+            self.run_cloud('-d {0} --assume-yes'.format(INSTANCE_NAME))
+            raise
+
+        # delete the instance
+        delete = self.run_cloud('-d {0} --assume-yes'.format(INSTANCE_NAME))
+        ret_str = '            True'
+        try:
+            self.assertIn(ret_str, delete)
+        except AssertionError:
+            raise
+
+    def tearDown(self):
+        '''
+        Clean up after tests
+        '''
+        query = self.run_cloud('--query')
+        ret_str = '        {0}:'.format(INSTANCE_NAME)
+
+        # if test instance is still present, delete it
+        if ret_str in query:
+            self.run_cloud('-d {0} --assume-yes'.format(INSTANCE_NAME))
+
+
+if __name__ == '__main__':
+    from integration import run_tests
+    run_tests(JoyentTest)

tests/integration/files/conf/cloud.profiles.d/joyent.conf

@@ -0,0 +1,5 @@
+joyent-test:
+  provider: joyent-config
+  size: Extra Small 512 MB
+  image: ubuntu-certified-14.04
+  location: us-east-1

tests/integration/files/conf/cloud.providers.d/joyent.conf

@@ -0,0 +1,6 @@
+joyent-config:
+  provider: joyent
+  user: ''
+  password: ''
+  private_key: ''
+  keyname: ''