Merge pull request dcos#976 from mellenburg/revert_request_wrapper

Revert "Abstract wrapper class"

Author: cmaloney

test_util/cluster_api.py

@@ -1,4 +1,5 @@
 import copy
+import functools
 import logging
 import os
 from urllib.parse import urlparse
@@ -315,7 +316,7 @@ def get_node_url(self, node, port=None):
             netloc = '{}:{}'.format(node, port)
         return '{}://{}'.format(self.scheme, netloc)
 
-    def request_wrapper(self, request_fn, path, host_url=None, node=None, port=None, **kwargs):
+    def cluster_api_request(self, method, path, host_url=None, node=None, port=None, **kwargs):
         """
         Performs the same specialized request as ClusterApi but allows setting node
         Args:
@@ -326,26 +327,31 @@ def request_wrapper(self, request_fn, path, host_url=None, node=None, port=None,
         if node is not None:
             assert host_url is None, 'Cannot set both node and host_url'
             host_url = self.get_node_url(node, port=port)
-        return super().request_wrapper(request_fn, path, host_url=host_url, **kwargs)
-
-    def get_client(self, path):
-        new_client = test_util.helpers.ApiClient(
+        return self.api_request(method, path, host_url=host_url, **kwargs)
+
+    get = functools.partialmethod(cluster_api_request, 'get')
+    post = functools.partialmethod(cluster_api_request, 'post')
+    put = functools.partialmethod(cluster_api_request, 'put')
+    delete = functools.partialmethod(cluster_api_request, 'delete')
+    options = functools.partialmethod(cluster_api_request, 'options')
+    head = functools.partialmethod(cluster_api_request, 'head')
+    patch = functools.partialmethod(cluster_api_request, 'patch')
+    delete = functools.partialmethod(cluster_api_request, 'delete')
+
+    def get_client(self, path, default_headers=None):
+        return test_util.helpers.ApiClient(
             default_host_url=self.dcos_url,
             api_base=path,
             ca_cert_path=self.ca_cert_path,
-            default_headers=self.default_headers)
-        # give spawned clients the node= reqest option
-        new_client.request_wrapper = self.request_wrapper
+            default_headers=self.default_headers if default_headers is None else default_headers)
 
     @property
     def marathon(self):
-        marathon_client = test_util.marathon.Marathon(
+        return test_util.marathon.Marathon(
             default_host_url=self.dcos_url,
             default_os_user=self.default_os_user,
             default_headers=self.default_headers,
             ca_cert_path=self.ca_cert_path)
-        # give spawned clients the node= request option
-        marathon_client.request_wrapper = self.request_wrapper
 
     @property
     def metronome(self):

test_util/helpers.py

@@ -47,7 +47,7 @@ def authenticate(self, cluster):
         logging.info('Authentication successful')
 
 
-class ApiClient():
+class ApiClient:
 
     def __init__(self, default_host_url, api_base, default_headers=None, ca_cert_path=None):
         self.default_host_url = default_host_url
@@ -57,7 +57,7 @@ def __init__(self, default_host_url, api_base, default_headers=None, ca_cert_pat
         self.default_headers = default_headers
         self.ca_cert_path = ca_cert_path
 
-    def request_wrapper(self, request_fn, path, host_url=None, **kwargs):
+    def api_request(self, method, path, host_url=None, **kwargs):
         """
         Makes a request with default headers + user auth headers if necessary
         If self.ca_cert_path is set, this method will pass it to requests
@@ -78,25 +78,19 @@ def request_wrapper(self, request_fn, path, host_url=None, **kwargs):
 
         request_url = path_join(host_url if host_url else self.default_host_url, path)
         headers.update(kwargs.pop('headers', {}))
-        logging.info('Request method {}: {}'.format(request_fn.__name__, request_url))
+        logging.info('Request method {}: {}'.format(method, request_url))
         logging.debug('Reqeust kwargs: {}'.format(kwargs))
         logging.debug('Request headers: {}'.format(headers))
-        return request_fn(request_url, headers=headers, **kwargs)
-
-    def wrapped_request(self, request_fn, *args, **kwargs):
-        """Thin wrapper to allow wrapping requests dynamically by mapping
-        a function to self.request_wrapper
-        """
-        return self.request_wrapper(request_fn, *args, **kwargs)
-
-    get = functools.partialmethod(wrapped_request, requests.request.get)
-    post = functools.partialmethod(wrapped_request, requests.request.post)
-    put = functools.partialmethod(wrapped_request, requests.request.put)
-    delete = functools.partialmethod(wrapped_request, requests.request.delete)
-    options = functools.partialmethod(wrapped_request, requests.request.options)
-    head = functools.partialmethod(wrapped_request, requests.request.head)
-    patch = functools.partialmethod(wrapped_request, requests.request.patch)
-    delete = functools.partialmethod(wrapped_request, requests.request.delete)
+        return requests.request(method, request_url, headers=headers, **kwargs)
+
+    get = functools.partialmethod(api_request, 'get')
+    post = functools.partialmethod(api_request, 'post')
+    put = functools.partialmethod(api_request, 'put')
+    delete = functools.partialmethod(api_request, 'delete')
+    options = functools.partialmethod(api_request, 'options')
+    head = functools.partialmethod(api_request, 'head')
+    patch = functools.partialmethod(api_request, 'patch')
+    delete = functools.partialmethod(api_request, 'delete')
 
 
 def retry_boto_rate_limits(boto_fn, wait=2, timeout=60 * 60):