Removed search_* methods, just pass kwargs to list_* methods instead

Author: Clark Perkins

stackdio/cli/mixins/blueprints.py

@@ -181,7 +181,7 @@ def create_all_blueprints(client):
 
 
 def get_blueprint_id(client, blueprint_title):
-    found_blueprints = client.search_blueprints(title=blueprint_title)
+    found_blueprints = client.list_blueprints(title=blueprint_title)
 
     if len(found_blueprints) == 0:
         raise click.Abort('Blueprint "{0}" does not exist'.format(blueprint_title))

stackdio/cli/mixins/formulas.py

@@ -43,7 +43,7 @@ def import_formula(client, uri, username, password):
 
 
 def get_formula_id(client, formula_uri):
-    found_formulas = client.search_formulas(uri=formula_uri)
+    found_formulas = client.list_formulas(uri=formula_uri)
 
     if len(found_formulas) == 0:
         raise click.Abort('Formula "{0}" does not exist'.format(formula_uri))

stackdio/cli/mixins/stacks.py

@@ -52,7 +52,7 @@ def launch_stack(client, blueprint_title, stack_title):
 
 
 def get_stack_id(client, stack_title):
-    found_stacks = client.search_stacks(title=stack_title)
+    found_stacks = client.list_stacks(title=stack_title)
 
     if len(found_stacks) == 0:
         raise click.Abort('Stack "{0}" does not exist'.format(stack_title))
@@ -73,7 +73,7 @@ def stack_history(client, stack_title, length):
     stack_id = get_stack_id(client, stack_title)
     history = client.get_stack_history(stack_id)
     for event in history[0:min(length, len(history))]:
-        click.echo('[{created}] {level} // {event} // {status}'.format(**event))
+        click.echo('[{created}] {message}'.format(**event))
 
 
 @stacks.command(name='hostnames')

stackdio/client/account.py

@@ -21,15 +21,10 @@
 class AccountMixin(HttpMixin):
 
     @get('cloud/providers/', paginate=True)
-    def list_providers(self):
+    def list_providers(self, **kwargs):
         """List all providers"""
         pass
 
-    @get('cloud/providers/', paginate=True)
-    def search_providers(self, **kwargs):
-        """Search for a provider"""
-        pass
-
     @post('cloud/accounts/')
     def create_account(self, **kwargs):
         """Create an account"""
@@ -53,7 +48,7 @@ def create_account(self, **kwargs):
         return form_data
 
     @get('cloud/accounts/', paginate=True)
-    def list_accounts(self):
+    def list_accounts(self, **kwargs):
         """List all account"""
         pass
 
@@ -62,11 +57,6 @@ def get_account(self, account_id):
         """Return the account that matches the given id"""
         pass
 
-    @get('cloud/accounts/')
-    def search_accounts(self, **kwargs):
-        """List all accounts"""
-        pass
-
     @delete('cloud/accounts/{account_id}/')
     def delete_account(self, account_id):
         """List all accounts"""

stackdio/client/blueprint.py

@@ -56,17 +56,13 @@ def create_blueprint(self, blueprint):
         return blueprint
 
     @get('blueprints/', paginate=True)
-    def list_blueprints(self):
+    def list_blueprints(self, **kwargs):
         pass
 
     @get('blueprints/{blueprint_id}/')
     def get_blueprint(self, blueprint_id):
         pass
 
-    @get('blueprints/', paginate=True)
-    def search_blueprints(self, **kwargs):
-        pass
-
     @delete('blueprints/{blueprint_id}/')
     def delete_blueprint(self, blueprint_id):
         pass

stackdio/client/formula.py

@@ -37,7 +37,7 @@ def import_formula(self, formula_uri, git_username=None, git_password=None, acce
         return data
 
     @get('formulas/', paginate=True)
-    def list_formulas(self):
+    def list_formulas(self, **kwargs):
         """Return all formulas"""
         pass
 
@@ -50,11 +50,6 @@ def get_formula(self, formula_id):
     def list_components_for_version(self, formula_id, version):
         pass
 
-    @get('formulas/', paginate=True)
-    def search_formulas(self, **kwargs):
-        """Get a formula with matching id"""
-        pass
-
     @delete('formulas/{formula_id}/')
     def delete_formula(self, formula_id):
         """Delete formula with matching id"""

stackdio/client/image.py

@@ -32,7 +32,7 @@ def create_image(self, title, image_id, ssh_user, cloud_provider, default_instan
         }
 
     @get('cloud/images/', paginate=True)
-    def list_images(self):
+    def list_images(self, **kwargs):
         """List all images"""
         pass
 
@@ -41,11 +41,6 @@ def get_image(self, image_id):
         """Return the image that matches the given id"""
         pass
 
-    @get('cloud/images/', paginate=True)
-    def search_images(self, **kwargs):
-        """List all images"""
-        pass
-
     @delete('cloud/images/{image_id}/')
     def delete_image(self, image_id):
         """Delete the image with the given id"""

stackdio/client/region.py

@@ -20,25 +20,17 @@
 
 class RegionMixin(HttpMixin):
     @get('cloud/providers/{provider_name}/regions/', paginate=True)
-    def list_regions(self, provider_name):
+    def list_regions(self, provider_name, **kwargs):
         pass
 
     @get('cloud/providers/{provider_name}/regions/{region_id}/')
     def get_region(self, provider_name, region_id):
         pass
 
-    @get('cloud/providers/{provider_name}/regions/', paginate=True)
-    def search_regions(self, provider_name, **kwargs):
-        pass
-
     @get('cloud/providers/{provider_name}/zones/', paginate=True)
-    def list_zones(self):
+    def list_zones(self, provider_name, **kwargs):
         pass
 
     @get('cloud/providers/{provider_name}/zones/{zone_id}')
     def get_zone(self, provider_name, zone_id):
         pass
-
-    @get('cloud/providers/{provider_name}/zones/', paginate=True)
-    def search_zones(self, provider_name, **kwargs):
-        pass

stackdio/client/stack.py

@@ -33,7 +33,7 @@ def create_stack(self, stack_data):
         return stack_data
 
     @get('stacks/', paginate=True)
-    def list_stacks(self):
+    def list_stacks(self, **kwargs):
         """Return a list of all stacks"""
         pass
 
@@ -42,11 +42,6 @@ def get_stack(self, stack_id):
         """Get stack info"""
         pass
 
-    @get('stacks/', paginate=True)
-    def search_stacks(self, **kwargs):
-        """Search for stacks that match the given criteria"""
-        pass
-
     @delete('stacks/{stack_id}/')
     def delete_stack(self, stack_id):
         """Destructively delete a stack forever."""
@@ -100,6 +95,10 @@ def get_stack_history(self, stack_id):
         """Get stack info"""
         pass
 
+    @get_stack_history.response
+    def get_stack_history(self, resp):
+        return list(reversed(resp))
+
     @get('stacks/{stack_id}/hosts/', paginate=True)
     def get_stack_hosts(self, stack_id):
         """Get a list of all stack hosts"""