libcloud-notifications mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From anthonys...@apache.org
Subject [10/34] libcloud git commit: update for formatting
Date Thu, 22 Jun 2017 03:11:14 GMT
update for formatting


Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/1c11d5e2
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/1c11d5e2
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/1c11d5e2

Branch: refs/heads/trunk
Commit: 1c11d5e2bcb2556dd1891ac644e7f01d788492b7
Parents: b0eb0d3
Author: andy <andymaheshw@gmail.com>
Authored: Tue Jun 13 21:10:41 2017 -0400
Committer: andy <andymaheshw@gmail.com>
Committed: Tue Jun 13 21:10:41 2017 -0400

----------------------------------------------------------------------
 libcloud/container/drivers/gke.py   | 22 ++++++++++++----------
 libcloud/test/container/test_gke.py |  4 ++--
 2 files changed, 14 insertions(+), 12 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/libcloud/blob/1c11d5e2/libcloud/container/drivers/gke.py
----------------------------------------------------------------------
diff --git a/libcloud/container/drivers/gke.py b/libcloud/container/drivers/gke.py
index 7e68b36..91f24da 100644
--- a/libcloud/container/drivers/gke.py
+++ b/libcloud/container/drivers/gke.py
@@ -81,13 +81,13 @@ class GKEContainerDriver(KubernetesContainerDriver):
     """
     GCE Node Driver class.
 
-    This is the primary driver for interacting with Google Container Engine.  It
-    contains all of the standard libcloud methods, plus additional ex_* methods
-    for more features.
+    This is the primary driver for interacting with Google Container
+    Engine. It contains all of the standard libcloud methods,
+    plus additional ex_* methods for more features.
 
     Note that many methods allow either objects or strings (or lists of
-    objects/strings).  In most cases, passing strings instead of objects will
-    result in additional GKE API calls.
+    objects/strings).  In most cases, passing strings instead of objects
+    will result in additional GKE API calls.
     """
     connectionCls = GKEConnection
     api_name = 'google'
@@ -101,7 +101,8 @@ class GKEContainerDriver(KubernetesContainerDriver):
     BACKEND_SERVICE_PROTOCOLS = ['HTTP', 'HTTPS', 'HTTP2', 'TCP', 'SSL']
 
     def __init__(self, user_id, key=None, datacenter=None, project=None,
-                 auth_type=None, scopes=None, credential_file=None, host=None, port=443,
**kwargs):
+                 auth_type=None, scopes=None, credential_file=None,
+                 host=None, port=443, **kwargs):
         """
         :param  user_id: The email address (for service accounts) or Client ID
                          (for installed apps) to be used for authentication.
@@ -147,11 +148,11 @@ class GKEContainerDriver(KubernetesContainerDriver):
         self.credential_file = credential_file or \
             GoogleOAuth2Credential.default_credential_file + '.' + self.project
 
-        super(GKEContainerDriver, self).__init__(user_id, key, secure=True, host=None,
-                 port=None, **kwargs)
+        super(GKEContainerDriver, self).__init__(user_id, key,
+                                                 secure=True, host=None,
+                                                 port=None, **kwargs)
 
-        self.base_path = '/%s/projects/%s' % (API_VERSION,
-                                                      self.project)
+        self.base_path = '/%s/projects/%s' % (API_VERSION, self.project)
         self.website = GKEContainerDriver.website
 
     def _ex_connection_class_kwargs(self):
@@ -168,6 +169,7 @@ class GKEContainerDriver(KubernetesContainerDriver):
             request = "/zones/clusters"
 
         response = self.connection.request(request, method='GET').object
+        return response
 
     def get_server_config(self, zone=None):
         """

http://git-wip-us.apache.org/repos/asf/libcloud/blob/1c11d5e2/libcloud/test/container/test_gke.py
----------------------------------------------------------------------
diff --git a/libcloud/test/container/test_gke.py b/libcloud/test/container/test_gke.py
index 25dc708..dfe7881 100644
--- a/libcloud/test/container/test_gke.py
+++ b/libcloud/test/container/test_gke.py
@@ -31,8 +31,8 @@ class GKEContainerDriverTestCase(KubernetesContainerDriverTestCase, unittest.Tes
         for version in versions:
             GKEContainerDriver.connectionCls.conn_class = \
                 KubernetesMockHttp
-            DockerMockHttp.type = None
-            DockerMockHttp.use_param = 'a'
+            KubernetesMockHttp.type = None
+            KubernetesMockHttp.use_param = 'a'
             driver = GKEContainerDriver(*CONTAINER_PARAMS_DOCKER)
             driver.version = version
             self.drivers.append(driver)


Mime
View raw message