Merge pull request openshift#11 from caruccio/master

Handling multiple domains

Author: pruan-rht

oshift/__init__.py

@@ -261,6 +261,23 @@ def get_href(self, top_level_url, target_link, domain_name=None):
             else:
                 return(None, None)
 
+    def yield_href(self, top_level_url, target_link):
+        status, res = self.rest.request(method='GET', url=top_level_url)
+        index = target_link.upper()
+        if status == 'Authorization Required':
+            #log.error("Authorization failed. (Check your credentials)")
+            raise OpenShiftLoginException('Authorization Required')
+
+        data = self.rest.response.json()['data']
+        if data:
+            for entry in data:
+                res = entry['links'][index]
+
+                yield (res['href'], res['method'])
+        else:
+            raise OpenShiftNullDomainException("No domain has been initialized.")
+            #return ('Not Found', self.rest.response.json)
+
     ##### /user  (sshkey)
     #@conditional_decorator(timeit, DOING_PERFORMANCE_ANALYSIS)
     @conditional_decorator(timeit, DOING_PERFORMANCE_ANALYSIS)
@@ -325,6 +342,7 @@ def domain_create(self, name, rhlogin='[email protected]'):
     @conditional_decorator(timeit, DOING_PERFORMANCE_ANALYSIS)
     def domain_delete(self, domain_name=None, force=True):
         """ destroy a user's domain, if no name is given, figure it out"""
+        log.debug("Deleting domain '%s'" % domain_name)
         if domain_name is None:
             status, domain_name = self.domain_get()
 
@@ -338,6 +356,13 @@ def domain_delete(self, domain_name=None, force=True):
         else:  # problem
             return (url, self.rest.response.raw)
 
+    def domain_delete_all(self, force=True):
+        """ destroy all user's domains"""
+        results = []
+        for status, domain_name in self.domain_list():
+            results.append(self.domain_delete(domain_name, force=force))
+        return results
+
     @conditional_decorator(timeit, DOING_PERFORMANCE_ANALYSIS)
     def domain_get(self, name=None):
         log.info("Getting domain information...")
@@ -353,20 +378,51 @@ def domain_get(self, name=None):
                     domain_index_name = 'name'
                 return (status, self.rest.response.json()['data'][domain_index_name])
 
-    def domain_update(self, new_name):
+    def domain_list(self):
+        log.info("Listing domain information...")
+        domains = []
+        for url, method in self.yield_href('/domains', 'get'):
+            (status, raw_response) = self.rest.request(method=method, url=url)
+            if status == 200:
+                domain_index_name = 'id' if self.REST_API_VERSION < 1.6 else 'name'
+                domains.append((status, self.rest.response.json()['data'][domain_index_name]))
+        return domains
+
+    def domain_update(self, new_name, old_name=None):
         params = {'id': new_name}
-        url, method = self.get_href("/domains", 'update')
+        url, method = self.get_href("/domains", 'update', domain_name=old_name)
+        if url == 'Not Found':
+            return ('Not Found', None)
         (status, res) = self.rest.request(method=method, url=url, params=params)
         return (status, res)
 
-    def app_list(self):
-        url, method = self.get_href('/domains', 'list_applications')
+    def app_list(self, domain_name=None):
+        url, method = self.get_href('/domains', 'list_applications', domain_name=domain_name)
+        if url == 'Not Found':
+            return ('Not Found', None)
         (status, res) = self.rest.request(method=method, url=url)
         return (status, self.rest.response.json()['data'])
 
+    def app_list_all(self):
+        """List all user's apps over all user's domains.
+           Return format:
+           [
+             [status, [app, app, ...]],
+             [status, [app, app, ...]],
+             ...
+           ]
+        """
+        results = []
+        for url, method in self.yield_href('/domains', 'list_applications'):
+            (status, res) = self.rest.request(method=method, url=url)
+            results.append((status, self.rest.response.json()['data']))
+        return results
+
     @conditional_decorator(timeit, DOING_PERFORMANCE_ANALYSIS)
-    def app_create(self, app_name, app_type, scale='false', init_git_url=None):
-        url, method = self.get_href('/domains', 'add_application')
+    def app_create(self, app_name, app_type, scale='false', init_git_url=None, domain_name=None):
+        url, method = self.get_href('/domains', 'add_application', domain_name=domain_name)
+        if url == 'Not Found':
+            return ('Not Found', None)
         valid_options = self.rest.response.json()['data'][0]['links']['ADD_APPLICATION']['optional_params'][0]['valid_options']
         #if app_type not in valid_options:
         #    log.error("The app type you specified '%s' is not supported!" % app_type)
@@ -542,75 +598,64 @@ def app_create_scale(self, app_name, app_type, scale, init_git_url=None):
         self.app_create(app_name=app_name, app_type=app_type, scale=scale, init_git_url=init_git_url)
 
     @conditional_decorator(timeit, DOING_PERFORMANCE_ANALYSIS)
-    def app_delete(self, app_name):
-        params = {'action': 'DELETE', 'app_name': app_name}
-        return self.app_action(params)
+    def app_delete(self, app_name, domain_name=None):
+        return self.app_action('DELETE', app_name, domain_name=domain_name)
 
     @conditional_decorator(timeit, DOING_PERFORMANCE_ANALYSIS)
-    def app_start(self, app_name):
-        params = {"action": 'START', 'app_name': app_name}
-        return self.app_action(params)
+    def app_start(self, app_name, domain_name=None):
+        return self.app_action('START', app_name, domain_name=domain_name)
 
     @conditional_decorator(timeit, DOING_PERFORMANCE_ANALYSIS)
-    def app_stop(self, app_name):
-        params = {"action": 'STOP', 'app_name': app_name}
-        return self.app_action(params)
+    def app_stop(self, app_name, domain_name=None):
+        return self.app_action('STOP', app_name, domain_name=domain_name)
 
     @conditional_decorator(timeit, DOING_PERFORMANCE_ANALYSIS)
-    def app_restart(self, app_name):
-        params = {"action": 'RESTART', 'app_name': app_name}
-        return self.app_action(params)
+    def app_restart(self, app_name, domain_name=None):
+        return self.app_action('RESTART', app_name, domain_name=domain_name)
 
     @conditional_decorator(timeit, DOING_PERFORMANCE_ANALYSIS)
-    def app_force_stop(self, app_name):
-        params = {"action": 'FORCE_STOP', 'app_name': app_name}
-        return self.app_action(params)
+    def app_force_stop(self, app_name, domain_name=None):
+        return self.app_action('FORCE_STOP', app_name, domain_name=domain_name)
 
     @conditional_decorator(timeit, DOING_PERFORMANCE_ANALYSIS)
-    def app_get_descriptor(self, app_name):
-        params = {'action': 'GET', 'app_name': app_name}
-        return self.app_action(params)
+    def app_get_descriptor(self, app_name, domain_name=None):
+        return self.app_action('GET', app_name, domain_name=domain_name)
 
     #############################################################
     # event related functions
     #############################################################
-    def app_scale_up(self, app_name):
-        params = {'action': 'SCALE_UP', 'app_name': app_name}
-        return self.app_action(params)
+    def app_scale_up(self, app_name, domain_name=None):
+        return self.app_action('SCALE_UP', app_name, domain_name=domain_name)
 
-    def app_scale_down(self, app_name):
-        params = {'action': 'SCALE_DOWN', 'app_name': app_name}
-        return self.app_action(params)
+    def app_scale_down(self, app_name, domain_name=None):
+        return self.app_action('SCALE_DOWN', app_name, domain_name=domain_name)
 
-    def app_add_alias(self, app_name, alias):
-        params = {'action': 'ADD_ALIAS', 'app_name': app_name, 'alias': alias}
-        return self.app_action(params)
+    def app_add_alias(self, app_name, alias, domain_name=None):
+        return self.app_action('ADD_ALIAS', app_name, alias=alias, domain_name=domain_name)
 
-    def app_remove_alias(self, app_name, alias):
-        params = {'action': 'REMOVE_ALIAS', 'app_name': app_name, 'alias': alias}
-        return self.app_action(params)
+    def app_remove_alias(self, app_name, alias, domain_name=None):
+        return self.app_action('REMOVE_ALIAS', app_name, alias=alias, domain_name=domain_name)
 
     def app_get_estimates(self):
         url, method = self.get_href('/estimates', 'get_estimate')
+        if url == 'Not Found':
+            return ('Not Found', None)
         (status, res) = self.rest.request(method=method, url=url)
         return (status, self.rest.response.json()['data'])
 
         #params = {'action': 'GET_ESTIMATE'}
         #return self.app_action(params)
 
-    def app_action(self, params):
+    def app_action(self, action, app_name, domain_name=None, **params):
         """ generic helper function that is capable of doing all the operations
         for application
         """
-        # step1. find th url and method
-        status, res = self.app_list()
+        # step1. find url and method
+        status, res = self.app_list(domain_name)
 
+        action = action.upper()
         app_found = False
-        action = params['action']
-        if 'app_name' in params:
-            app_name = params['app_name']
-        if 'cartridge' in params:
-            cart_name = params['cartridge']
+        #cart_name = params.get('cartridge', None)
 
         for app in res:
         #for app in res['data']:
@@ -650,20 +695,16 @@ def app_action(self, params):
 
     def get_gears(self, app_name, domain_name=None):
         """ return gears information """
-        params = {"action": 'GET_GEAR_GROUPS', 'app_name': app_name}
-        return self.app_action(params)
+        return self.app_action('GET_GEAR_GROUPS', app_name, domain_name=domain_name)
 
     ################################
     # cartridges
     ################################
-    def cartridge_list(self, app_name):
-        params = {"action": 'LIST_CARTRIDGES', 'app_name': app_name}
-        return self.app_action(params)
-
-    def cartridge_add(self, app_name, cartridge):
-        params = {"action": 'ADD_CARTRIDGE', 'app_name': app_name,
-            'cartridge': cartridge}
-        status, res = self.app_action(params)
+    def cartridge_list(self, app_name, domain_name=None):
+        return self.app_action('LIST_CARTRIDGES', app_name, domain_name=domain_name)
+
+    def cartridge_add(self, app_name, cartridge, domain_name=None):
+        status, res = self.app_action('ADD_CARTRIDGE', app_name, cartridge=cartridge, domain_name=domain_name)
         return (status, self.rest.response.json()['messages'])
 
     def cartridge_delete(self, app_name, name):