You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by to...@apache.org on 2016/04/19 22:08:15 UTC
[1/3] libcloud git commit: Fix lint violations in the container API.
Repository: libcloud
Updated Branches:
refs/heads/trunk dc5e350a8 -> 7dd810f6d
Fix lint violations in the container API.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/982665b5
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/982665b5
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/982665b5
Branch: refs/heads/trunk
Commit: 982665b586b826c644782905f036bf204acbb997
Parents: df34f35
Author: Tomaz Muraus <to...@tomaz.me>
Authored: Tue Apr 19 22:04:19 2016 +0200
Committer: Tomaz Muraus <to...@tomaz.me>
Committed: Tue Apr 19 22:05:56 2016 +0200
----------------------------------------------------------------------
libcloud/container/drivers/docker.py | 9 ++++++---
libcloud/container/drivers/kubernetes.py | 23 ++++++++++++++---------
2 files changed, 20 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/982665b5/libcloud/container/drivers/docker.py
----------------------------------------------------------------------
diff --git a/libcloud/container/drivers/docker.py b/libcloud/container/drivers/docker.py
index d7c8419..ae360cf 100644
--- a/libcloud/container/drivers/docker.py
+++ b/libcloud/container/drivers/docker.py
@@ -275,9 +275,10 @@ class DockerContainerDriver(ContainerDriver):
result = self.connection.request(
"/containers/json%s" % (ex)).object
except Exception as exc:
- if hasattr(exc, 'errno') and exc.errno == 111:
+ errno = getattr(exc, 'errno', None)
+ if errno == 111:
raise DockerException(
- exc.errno,
+ errno,
'Make sure docker host is accessible'
'and the API port is correct')
raise
@@ -351,7 +352,8 @@ class DockerContainerDriver(ContainerDriver):
result = self.connection.request('/containers/create', data=data,
params=params, method='POST')
except Exception as e:
- if e.message.startswith('No such image:'):
+ message = e.message or str(e)
+ if message.startswith('No such image:'):
raise DockerException(None, 'No such image: %s' % image.name)
else:
raise DockerException(None, e)
@@ -642,6 +644,7 @@ class DockerContainerDriver(ContainerDriver):
Get the docker API version information
"""
result = self.connection.request('/version').object
+ result = result or {}
api_version = result.get('ApiVersion')
return api_version
http://git-wip-us.apache.org/repos/asf/libcloud/blob/982665b5/libcloud/container/drivers/kubernetes.py
----------------------------------------------------------------------
diff --git a/libcloud/container/drivers/kubernetes.py b/libcloud/container/drivers/kubernetes.py
index 426a5ef..526ad76 100644
--- a/libcloud/container/drivers/kubernetes.py
+++ b/libcloud/container/drivers/kubernetes.py
@@ -159,9 +159,10 @@ class KubernetesContainerDriver(ContainerDriver):
result = self.connection.request(
ROOT_URL + "v1/pods").object
except Exception as exc:
- if hasattr(exc, 'errno') and exc.errno == 111:
+ errno = getattr(exc, 'errno', None)
+ if errno == 111:
raise KubernetesException(
- exc.errno,
+ errno,
'Make sure kube host is accessible'
'and the API port is correct')
raise
@@ -181,10 +182,12 @@ class KubernetesContainerDriver(ContainerDriver):
:rtype: :class:`libcloud.container.base.Container`
"""
- result = self.connection.request(ROOT_URL + "v1/nodes/%s" %
- id).object
+ # result = self.connection.request(ROOT_URL + "v1/nodes/%s" %
+ # id).object
- return self._to_container(result)
+ # TODO: Fixme
+ # return self._to_container(result)
+ return None
def list_clusters(self):
"""
@@ -199,9 +202,10 @@ class KubernetesContainerDriver(ContainerDriver):
result = self.connection.request(
ROOT_URL + "v1/namespaces/").object
except Exception as exc:
- if hasattr(exc, 'errno') and exc.errno == 111:
+ errno = getattr(exc, 'errno', None)
+ if errno == 111:
raise KubernetesException(
- exc.errno,
+ errno,
'Make sure kube host is accessible'
'and the API port is correct')
raise
@@ -313,8 +317,8 @@ class KubernetesContainerDriver(ContainerDriver):
:rtype: ``bool``
"""
- return self.ex_delete_pod(container.extra['namespace'],
- container.extra['pod'])
+ return self.ex_destroy_pod(container.extra['namespace'],
+ container.extra['pod'])
def ex_list_pods(self):
"""
@@ -391,6 +395,7 @@ class KubernetesContainerDriver(ContainerDriver):
Get the docker API version information
"""
result = self.connection.request('/version').object
+ result = result or {}
api_version = result.get('ApiVersion')
return api_version
[3/3] libcloud git commit: Merge branch 'trunk' of
https://git-wip-us.apache.org/repos/asf/libcloud into trunk
Posted by to...@apache.org.
Merge branch 'trunk' of https://git-wip-us.apache.org/repos/asf/libcloud into trunk
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/7dd810f6
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/7dd810f6
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/7dd810f6
Branch: refs/heads/trunk
Commit: 7dd810f6d2d3a8483ffbb5d99722720b5a28cfec
Parents: ca875b3 dc5e350
Author: Tomaz Muraus <to...@tomaz.me>
Authored: Tue Apr 19 22:08:05 2016 +0200
Committer: Tomaz Muraus <to...@tomaz.me>
Committed: Tue Apr 19 22:08:05 2016 +0200
----------------------------------------------------------------------
libcloud/loadbalancer/drivers/dimensiondata.py | 1 -
1 file changed, 1 deletion(-)
----------------------------------------------------------------------
[2/3] libcloud git commit: Run pylint on libcloud/container/
Posted by to...@apache.org.
Run pylint on libcloud/container/
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/ca875b3d
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/ca875b3d
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/ca875b3d
Branch: refs/heads/trunk
Commit: ca875b3d88e7707fb4676e921a5d9a3c2ed3692e
Parents: 982665b
Author: Tomaz Muraus <to...@tomaz.me>
Authored: Tue Apr 19 22:06:00 2016 +0200
Committer: Tomaz Muraus <to...@tomaz.me>
Committed: Tue Apr 19 22:06:00 2016 +0200
----------------------------------------------------------------------
tox.ini | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/ca875b3d/tox.ini
----------------------------------------------------------------------
diff --git a/tox.ini b/tox.ini
index 0cf1201..dbf4714 100644
--- a/tox.ini
+++ b/tox.ini
@@ -84,6 +84,7 @@ commands = python contrib/scrape-ec2-prices.py
deps = -r{toxinidir}/requirements-tests.txt
backports.ssl_match_hostname
commands = pylint -E --rcfile=./.pylintrc libcloud/common/
+ pylint -E --rcfile=./.pylintrc libcloud/container/
pylint -E --rcfile=./.pylintrc libcloud/dns/
[testenv:lint]