Update for stackdio 0.7

Clark Perkins · Clark Perkins · commit 7e3b417cd5a2 · 2015-11-06T15:47:57.000-06:00
diff --git a/requirements.txt b/requirements.txt
diff --git a/setup.py b/setup.py
@@ -15,54 +15,45 @@
 # limitations under the License.
 #
 
-import os
 import sys
 
 from setuptools import setup, find_packages
-from pip.req import parse_requirements
-from pip.download import PipSession
 
 
 def test_python_version():
-    if float("%d.%d" % sys.version_info[:2]) < 2.6:
-        print('Your Python version {0}.{1}.{2} is not supported.'.format(
-            *sys.version_info[:3]))
-        print('stackdio requires Python 2.6 or newer.')
+    major = sys.version_info[0]
+    minor = sys.version_info[1]
+    micro = sys.version_info[2]
+    if float('%d.%d' % (major, minor)) < 2.6:
+        err_msg = ('Your Python version {0}.{1}.{2} is not supported.\n'
+                   'stackdio-server requires Python 2.6 or newer.\n'.format(major, minor, micro))
+        sys.stderr.write(err_msg)
         sys.exit(1)
 
-
-def load_pip_requirements(fp):
-    reqs, deps = [], []
-    for r in parse_requirements(fp, session=PipSession()):
-        if r.url is not None:
-            deps.append(str(r.url))
-        reqs.append(str(r.req))
-    return reqs, deps
-
 # Set version
 __version__ = '0.0.0'  # Explicit default
-execfile("stackdio/client/version.py")
+execfile('stackdio/client/version.py')
 
 
 SHORT_DESCRIPTION = ('A cloud deployment, automation, and orchestration '
                      'platform for everyone.')
-LONG_DESCRIPTION = SHORT_DESCRIPTION
 
-# If we have a README.md file, use its contents as the long description
-if os.path.isfile('README.md'):
-    with open('README.md') as f:
-        LONG_DESCRIPTION = f.read()
+# Use the README.md as the long description
+with open('README.md') as f:
+    LONG_DESCRIPTION = f.read()
 
+requirements = [
+    'simplejson',
+    'requests>=2.4.0,<2.6.0',
+]
 
 if __name__ == "__main__":
-    # build our list of requirements and dependency links based on our
-    # requirements.txt file
-    reqs, deps = load_pip_requirements('requirements.txt')
+    test_python_version()
 
     # Call the setup method from setuptools that does all the heavy lifting
-    # of packaging stackdio
+    # of packaging stackdio-client
     setup(
-        name='stackdio',
+        name='stackdio-client',
         version=__version__,
         url='http://stackd.io',
         author='Digital Reasoning Systems, Inc.',
@@ -73,8 +64,8 @@ def load_pip_requirements(fp):
         include_package_data=True,
         packages=find_packages(),
         zip_safe=False,
-        install_requires=reqs,
-        dependency_links=deps,
+        install_requires=requirements,
+        dependency_links=[],
         classifiers=[
             'Development Status :: 3 - Alpha',
             'Environment :: Web Environment',
@@ -84,6 +75,7 @@ def load_pip_requirements(fp):
             'Intended Audience :: System Administrators',
             'License :: OSI Approved :: Apache Software License',
             'Programming Language :: Python',
+            'Programming Language :: Python :: 2',
             'Programming Language :: Python :: 2.6',
             'Programming Language :: Python :: 2.7',
             'Topic :: System :: Clustering',
diff --git a/stackdio/client/__init__.py b/stackdio/client/__init__.py
@@ -23,8 +23,8 @@
 
 from .blueprint import BlueprintMixin
 from .formula import FormulaMixin
-from .profile import ProfileMixin
-from .provider import ProviderMixin
+from .account import AccountMixin
+from .image import ImageMixin
 from .region import RegionMixin
 from .settings import SettingsMixin
 from .stack import StackMixin
@@ -34,8 +34,8 @@
 logger = logging.getLogger(__name__)
 
 
-class StackdIO(BlueprintMixin, FormulaMixin, ProfileMixin,
-               ProviderMixin, RegionMixin, StackMixin, SettingsMixin):
+class StackdIO(BlueprintMixin, FormulaMixin, AccountMixin,
+               ImageMixin, RegionMixin, StackMixin, SettingsMixin):
 
     def __init__(self, protocol="https", host="localhost", port=443,
                  base_url=None, auth=None, auth_admin=None,
diff --git a/stackdio/client/account.py b/stackdio/client/account.py
@@ -22,44 +22,41 @@
 from .version import accepted_versions, deprecated
 
 
-class ProviderMixin(HttpMixin):
+class AccountMixin(HttpMixin):
 
-    @endpoint("provider_types/")
-    def list_provider_types(self):
+    @endpoint("cloud/providers/")
+    def list_providers(self):
         """List all providers"""
         return self._get(endpoint, jsonify=True)['results']
 
-
     @accepted_versions(">=0.6.1")
-    @endpoint("provider_types/")
-    def search_provider_types(self, provider_id):
-        """List all provider_types"""
+    @endpoint("cloud/providers/")
+    def search_providers(self, provider_id):
+        """List all providers"""
         return self._get(endpoint, jsonify=True)['results']
 
-
     @deprecated
     @accepted_versions("<0.7")
-    @endpoint("provider_types/")
-    def get_provider_type_id(self, type_name):
+    @endpoint("cloud/providers/")
+    def get_provider_id(self, type_name):
         """Get the id for the provider specified by type_name"""
 
         result = self._get(endpoint, jsonify=True)
-        for provider_type in result['results']:
-            if provider_type.get("type_name") == type_name:
-                return provider_type.get("id")
+        for provider in result['results']:
+            if provider.get("type_name") == type_name:
+                return provider.get("id")
 
         raise StackException("Provider type %s not found" % type_name)
 
-
     @use_admin_auth
-    @endpoint("providers/")
-    def create_provider(self, **kwargs):
-        """Create a provider"""
+    @endpoint("cloud/accounts/")
+    def create_account(self, **kwargs):
+        """Create an account"""
 
         form_data = {
             "title": None,
             "account_id": None,
-            "provider_type": None,
+            "provider": None,
             "access_key_id": None,
             "secret_access_key": None,
             "keypair": None,
@@ -74,42 +71,37 @@ def create_provider(self, **kwargs):
 
         return self._post(endpoint, data=json.dumps(form_data), jsonify=True)
 
-
-    @endpoint("providers/")
-    def list_providers(self):
-        """List all providers"""
+    @endpoint("accounts/")
+    def list_accounts(self):
+        """List all account"""
         return self._get(endpoint, jsonify=True)['results']
 
-
-    @endpoint("providers/{provider_id}/")
-    def get_provider(self, provider_id, none_on_404=False):
-        """Return the provider that matches the given id"""
+    @endpoint("accounts/{account_id}/")
+    def get_account(self, account_id, none_on_404=False):
+        """Return the account that matches the given id"""
         return self._get(endpoint, jsonify=True, none_on_404=none_on_404)
 
-
     @accepted_versions(">=0.6.1")
-    @endpoint("providers/")
-    def search_providers(self, provider_id):
-        """List all providers"""
+    @endpoint("accounts/")
+    def search_accounts(self, account_id):
+        """List all accounts"""
         return self._get(endpoint, jsonify=True)['results']
 
-
-    @endpoint("providers/{provider_id}/")
-    def delete_provider(self, provider_id):
-        """List all providers"""
+    @endpoint("accounts/{account_id}/")
+    def delete_account(self, account_id):
+        """List all accounts"""
         return self._delete(endpoint, jsonify=True)['results']
 
-
     @deprecated
     @accepted_versions("<0.7")
-    def get_provider_id(self, slug, title=False):
-        """Get the id for a provider that matches slug. If title is True will
+    def get_account_id(self, slug, title=False):
+        """Get the id for a account that matches slug. If title is True will
         look at title instead."""
 
-        providers = self.list_providers()
+        accounts = self.list_accounts()
 
-        for provider in providers:
-            if provider.get("slug" if not title else "title") == slug:
-                return provider.get("id")
+        for account in accounts:
+            if account.get("slug" if not title else "title") == slug:
+                return account.get("id")
 
         raise StackException("Provider %s not found" % slug)
diff --git a/stackdio/client/blueprint.py b/stackdio/client/blueprint.py
@@ -28,25 +28,33 @@ class BlueprintMixin(HttpMixin):
     def create_blueprint(self, blueprint, provider="ec2"):
         """Create a blueprint"""
 
-        # check the provided blueprint to see if we need to look up any ids
-        for host in blueprint["hosts"]:
-            if isinstance(host["size"], basestring):
-                host["size"] = self.get_instance_id(host["size"], provider)
+        formula_map = {}
+
+        if 'formula_versions' in blueprint:
+            all_formulas = self.list_formulas()
 
-            # zone isn't required if you provide a subnet_id
-            if 'zone' in host and isinstance(host["zone"], basestring):
-                host["zone"] = self.get_zone_id(host["zone"], provider)
+            used_formulas = set()
 
-            if isinstance(host["cloud_profile"], basestring):
-                host["cloud_profile"] = self.get_profile_id(host["cloud_profile"])  # noqa
+            for formula_version in blueprint['formula_versions']:
+                for formula in all_formulas:
+                    if formula['uri'] == formula_version['formula']:
+                        formula['version'] = formula_version['version']
+                        used_formulas.add(formula)
+                        break
 
-            for component in host["formula_components"]:
-                if not component.get("sls_path") and isinstance(component["id"], (tuple, list)):
-                    formula_id = self.get_formula_id(component["id"][0])
+            for formula in used_formulas:
+                components = self._get(
+                    '{0}?version={1}'.format(formula['components'], formula['version']),
+                    jsonify=True,
+                )['results']
+                for component in components:
+                    formula_map[component['sls_path']] = formula['uri']
 
-                    component["id"] = self.get_component_id(
-                        self.get_formula(formula_id),
-                        component["id"][1])
+        # check the provided blueprint to see if we need to look up any ids
+        for host in blueprint['host_definitions']:
+            for component in host['formula_components']:
+                if component['sls_path'] in formula_map:
+                    component['formula'] = formula_map[component['sls_path']]
 
         return self._post(endpoint, data=json.dumps(blueprint), jsonify=True, raise_for_status=False)
 
diff --git a/stackdio/client/image.py b/stackdio/client/image.py
@@ -22,13 +22,13 @@
 from .version import accepted_versions, deprecated
 
 
-class ProfileMixin(HttpMixin):
+class ImageMixin(HttpMixin):
 
     @use_admin_auth
-    @endpoint("profile/")
-    def create_profile(self, title, image_id, ssh_user, cloud_provider,
+    @endpoint("image/")
+    def create_image(self, title, image_id, ssh_user, cloud_provider,
                        default_instance_size=None):
-        """Create a profile"""
+        """Create a image"""
         data = {
             "title": title,
             "image_id": image_id,
@@ -39,40 +39,40 @@ def create_profile(self, title, image_id, ssh_user, cloud_provider,
         return self._post(endpoint, data=json.dumps(data), jsonify=True)
 
 
-    @endpoint("profiles/")
-    def list_profiles(self):
-        """List all profiles"""
+    @endpoint("images/")
+    def list_images(self):
+        """List all images"""
         return self._get(endpoint, jsonify=True)['results']
 
 
-    @endpoint("profiles/{profile_id}/")
-    def get_profile(self, profile_id, none_on_404=False):
-        """Return the profile that matches the given id"""
+    @endpoint("images/{image_id}/")
+    def get_image(self, image_id, none_on_404=False):
+        """Return the image that matches the given id"""
         return self._get(endpoint, jsonify=True, none_on_404=none_on_404)
 
 
     @accepted_versions(">=0.6.1")
-    @endpoint("profiles/")
-    def search_profiles(self, profile_id):
-        """List all profiles"""
+    @endpoint("images/")
+    def search_images(self, image_id):
+        """List all images"""
         return self._get(endpoint, jsonify=True)['results']
 
 
-    @endpoint("profiles/{profile_id}/")
-    def delete_profile(self, profile_id):
-        """Delete the profile with the given id"""
+    @endpoint("images/{image_id}/")
+    def delete_image(self, image_id):
+        """Delete the image with the given id"""
         return self._delete(endpoint, jsonify=True)['results']
 
 
     @deprecated
     @accepted_versions("<0.7")
-    def get_profile_id(self, slug, title=False):
-        """Get the id for a profile that matches slug. If title is True will look
+    def get_image_id(self, slug, title=False):
+        """Get the id for a image that matches slug. If title is True will look
         at title instead."""
 
-        profiles = self.list_profiles()
-        for profile in profiles:
-            if profile.get("slug" if not title else "title") == slug:
-                return profile.get("id")
+        images = self.list_images()
+        for image in images:
+            if image.get("slug" if not title else "title") == slug:
+                return image.get("id")
 
         raise StackException("Profile %s not found" % slug)
diff --git a/stackdio/client/version.py b/stackdio/client/version.py
