You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@libcloud.apache.org by an...@apache.org on 2016/10/11 22:42:09 UTC
[1/6] libcloud git commit: prettier error on fieldname
Repository: libcloud
Updated Branches:
refs/heads/trunk 489793358 -> 065d1919d
prettier error on fieldname
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/23b02881
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/23b02881
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/23b02881
Branch: refs/heads/trunk
Commit: 23b0288143aaa774d90828b488cb86ef846e8743
Parents: 6dce592
Author: Mario Loria <ma...@arroyonetworks.com>
Authored: Mon Oct 10 17:04:33 2016 -0400
Committer: Mario Loria <ma...@arroyonetworks.com>
Committed: Mon Oct 10 17:04:33 2016 -0400
----------------------------------------------------------------------
libcloud/container/drivers/rancher.py | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/23b02881/libcloud/container/drivers/rancher.py
----------------------------------------------------------------------
diff --git a/libcloud/container/drivers/rancher.py b/libcloud/container/drivers/rancher.py
index c0d2f9d..dbf28f2 100644
--- a/libcloud/container/drivers/rancher.py
+++ b/libcloud/container/drivers/rancher.py
@@ -39,7 +39,12 @@ class RancherResponse(JsonResponse):
def parse_error(self):
parsed = super(RancherResponse, self).parse_error()
- return "%s - %s" % (parsed['message'], parsed['detail'])
+ if 'fieldName' in parsed:
+ return "Field %s is %s: %s - %s" % (parsed['fieldName'], parsed['code'],
+ parsed['message'], parsed['detail'])
+ else:
+ return "%%s - %s" % (parsed['message'],
+ parsed['detail'])
def success(self):
return self.status in VALID_RESPONSE_CODES
[4/6] libcloud git commit: more asserts
Posted by an...@apache.org.
more asserts
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/5265ac49
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/5265ac49
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/5265ac49
Branch: refs/heads/trunk
Commit: 5265ac49372b1b9773c110ee9f2c6d4365e730ea
Parents: 296285e
Author: Mario Loria <ma...@arroyonetworks.com>
Authored: Mon Oct 10 21:17:37 2016 -0400
Committer: Mario Loria <ma...@arroyonetworks.com>
Committed: Mon Oct 10 21:17:37 2016 -0400
----------------------------------------------------------------------
libcloud/test/container/test_rancher.py | 6 ++++++
1 file changed, 6 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/5265ac49/libcloud/test/container/test_rancher.py
----------------------------------------------------------------------
diff --git a/libcloud/test/container/test_rancher.py b/libcloud/test/container/test_rancher.py
index 9a86dea..53d7b18 100644
--- a/libcloud/test/container/test_rancher.py
+++ b/libcloud/test/container/test_rancher.py
@@ -160,10 +160,14 @@ class RancherContainerDriverTestCase(unittest.TestCase):
def test_start_container(self):
container = self.driver.get_container("1i31")
container.start()
+ self.assertEqual(container.id, "1i31")
+ self.assertEqual(container.name, "newcontainer")
def test_stop_container(self):
container = self.driver.get_container("1i31")
container.stop()
+ self.assertEqual(container.id, "1i31")
+ self.assertEqual(container.name, "newcontainer")
def test_ex_search_containers(self):
containers = self.driver.ex_search_containers({"state": "running"})
@@ -172,6 +176,8 @@ class RancherContainerDriverTestCase(unittest.TestCase):
def test_destroy_container(self):
container = self.driver.get_container("1i31")
container.destroy()
+ self.assertEqual(container.id, "1i31")
+ self.assertEqual(container.name, "newcontainer")
class RancherMockHttp(MockHttp):
[5/6] libcloud git commit: a little clearer way
Posted by an...@apache.org.
a little clearer way
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/0d1a9d29
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/0d1a9d29
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/0d1a9d29
Branch: refs/heads/trunk
Commit: 0d1a9d2920340adc7cc1b10c39701d34fd0db0ae
Parents: 5265ac4
Author: Mario Loria <ma...@arroyonetworks.com>
Authored: Mon Oct 10 21:22:27 2016 -0400
Committer: Mario Loria <ma...@arroyonetworks.com>
Committed: Mon Oct 10 21:22:27 2016 -0400
----------------------------------------------------------------------
libcloud/test/container/test_rancher.py | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/0d1a9d29/libcloud/test/container/test_rancher.py
----------------------------------------------------------------------
diff --git a/libcloud/test/container/test_rancher.py b/libcloud/test/container/test_rancher.py
index 53d7b18..f0a6edb 100644
--- a/libcloud/test/container/test_rancher.py
+++ b/libcloud/test/container/test_rancher.py
@@ -159,15 +159,15 @@ class RancherContainerDriverTestCase(unittest.TestCase):
def test_start_container(self):
container = self.driver.get_container("1i31")
- container.start()
- self.assertEqual(container.id, "1i31")
- self.assertEqual(container.name, "newcontainer")
+ started = container.start()
+ self.assertEqual(started.id, "1i31")
+ self.assertEqual(started.name, "newcontainer")
def test_stop_container(self):
container = self.driver.get_container("1i31")
- container.stop()
- self.assertEqual(container.id, "1i31")
- self.assertEqual(container.name, "newcontainer")
+ stopped = container.stop()
+ self.assertEqual(stopped.id, "1i31")
+ self.assertEqual(stopped.name, "newcontainer")
def test_ex_search_containers(self):
containers = self.driver.ex_search_containers({"state": "running"})
@@ -175,9 +175,9 @@ class RancherContainerDriverTestCase(unittest.TestCase):
def test_destroy_container(self):
container = self.driver.get_container("1i31")
- container.destroy()
- self.assertEqual(container.id, "1i31")
- self.assertEqual(container.name, "newcontainer")
+ destroyed = container.destroy()
+ self.assertEqual(destroyed.id, "1i31")
+ self.assertEqual(destroyed.name, "newcontainer")
class RancherMockHttp(MockHttp):
[6/6] libcloud git commit: Merge branch 'libcloud-889' into trunk
Closes #889
Posted by an...@apache.org.
Merge branch 'libcloud-889' into trunk
Closes #889
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/065d1919
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/065d1919
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/065d1919
Branch: refs/heads/trunk
Commit: 065d1919d8cd1e651b92af6220b1408437b07563
Parents: 4897933 0d1a9d2
Author: Anthony Shaw <an...@apache.org>
Authored: Wed Oct 12 09:41:47 2016 +1100
Committer: Anthony Shaw <an...@apache.org>
Committed: Wed Oct 12 09:41:47 2016 +1100
----------------------------------------------------------------------
libcloud/container/drivers/rancher.py | 26 +++++++++++++++++++++++++-
libcloud/test/container/test_rancher.py | 14 ++++++++++++--
2 files changed, 37 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
[2/6] libcloud git commit: add start_container
Posted by an...@apache.org.
add start_container
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/f4b24f8d
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/f4b24f8d
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/f4b24f8d
Branch: refs/heads/trunk
Commit: f4b24f8dff6602f6e3b4b15f21680dba11bba21a
Parents: 23b0288
Author: Mario Loria <ma...@arroyonetworks.com>
Authored: Mon Oct 10 17:47:32 2016 -0400
Committer: Mario Loria <ma...@arroyonetworks.com>
Committed: Mon Oct 10 17:47:32 2016 -0400
----------------------------------------------------------------------
libcloud/container/drivers/rancher.py | 26 +++++++++++++++++++++++---
libcloud/test/container/test_rancher.py | 4 ++++
2 files changed, 27 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/f4b24f8d/libcloud/container/drivers/rancher.py
----------------------------------------------------------------------
diff --git a/libcloud/container/drivers/rancher.py b/libcloud/container/drivers/rancher.py
index dbf28f2..ef3b405 100644
--- a/libcloud/container/drivers/rancher.py
+++ b/libcloud/container/drivers/rancher.py
@@ -40,11 +40,13 @@ class RancherResponse(JsonResponse):
def parse_error(self):
parsed = super(RancherResponse, self).parse_error()
if 'fieldName' in parsed:
- return "Field %s is %s: %s - %s" % (parsed['fieldName'], parsed['code'],
- parsed['message'], parsed['detail'])
+ return "Field %s is %s: %s - %s" % (parsed['fieldName'],
+ parsed['code'],
+ parsed['message'],
+ parsed['detail'])
else:
return "%%s - %s" % (parsed['message'],
- parsed['detail'])
+ parsed['detail'])
def success(self):
return self.status in VALID_RESPONSE_CODES
@@ -564,6 +566,24 @@ class RancherContainerDriver(ContainerDriver):
return self._to_container(result)
+ def start_container(self, container):
+ """
+ Start a container
+
+ :param container: The container to be started
+ :type container: :class:`libcloud.container.base.Container`
+
+ :return: The container refreshed with current data
+ :rtype: :class:`libcloud.container.base.Container`
+ """
+ result = self.connection.request('%s/containers/%s?action=start' %
+ (self.baseuri, container.id),
+ method='POST')
+ if result.status in VALID_RESPONSE_CODES:
+ return self.get_container(container.id)
+ else:
+ raise RancherException(result.status, 'failed to start container')
+
def stop_container(self, container):
"""
Stop a container
http://git-wip-us.apache.org/repos/asf/libcloud/blob/f4b24f8d/libcloud/test/container/test_rancher.py
----------------------------------------------------------------------
diff --git a/libcloud/test/container/test_rancher.py b/libcloud/test/container/test_rancher.py
index f9ddc83..9a86dea 100644
--- a/libcloud/test/container/test_rancher.py
+++ b/libcloud/test/container/test_rancher.py
@@ -157,6 +157,10 @@ class RancherContainerDriverTestCase(unittest.TestCase):
self.assertEqual(container.extra['environment'],
{'STORAGE_TYPE': 'file'})
+ def test_start_container(self):
+ container = self.driver.get_container("1i31")
+ container.start()
+
def test_stop_container(self):
container = self.driver.get_container("1i31")
container.stop()
[3/6] libcloud git commit: format string fix
Posted by an...@apache.org.
format string fix
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/296285ec
Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/296285ec
Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/296285ec
Branch: refs/heads/trunk
Commit: 296285ece28a1cf523e7382bcd861016ac046248
Parents: f4b24f8
Author: Mario Loria <ma...@arroyonetworks.com>
Authored: Mon Oct 10 20:03:17 2016 -0400
Committer: Mario Loria <ma...@arroyonetworks.com>
Committed: Mon Oct 10 20:03:17 2016 -0400
----------------------------------------------------------------------
libcloud/container/drivers/rancher.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/libcloud/blob/296285ec/libcloud/container/drivers/rancher.py
----------------------------------------------------------------------
diff --git a/libcloud/container/drivers/rancher.py b/libcloud/container/drivers/rancher.py
index ef3b405..745332d 100644
--- a/libcloud/container/drivers/rancher.py
+++ b/libcloud/container/drivers/rancher.py
@@ -45,8 +45,7 @@ class RancherResponse(JsonResponse):
parsed['message'],
parsed['detail'])
else:
- return "%%s - %s" % (parsed['message'],
- parsed['detail'])
+ return "%s - %s" % (parsed['message'], parsed['detail'])
def success(self):
return self.status in VALID_RESPONSE_CODES