Updated all delete methods to destroy to fit with convention of other drivers
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/7c27da60 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/7c27da60 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/7c27da60 Branch: refs/heads/trunk Commit: 7c27da603392794de86302db6ef4458f2574f931 Parents: 69cd184 Author: anthony-shaw <[email protected]> Authored: Mon Dec 28 21:23:15 2015 +1100 Committer: anthony-shaw <[email protected]> Committed: Mon Dec 28 21:23:15 2015 +1100 ---------------------------------------------------------------------- libcloud/container/base.py | 7 +++++-- libcloud/test/container/test_docker.py | 2 +- 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/7c27da60/libcloud/container/base.py ---------------------------------------------------------------------- diff --git a/libcloud/container/base.py b/libcloud/container/base.py index b70f1bd..b9750d4 100644 --- a/libcloud/container/base.py +++ b/libcloud/container/base.py @@ -72,8 +72,8 @@ class Container(object): def restart(self): return self.driver.restart_container(container=self) - def delete(self): - return self.driver.delete_container(container=self) + def destroy(self): + return self.driver.destroy_container(container=self) def __repr__(self): return ('<Container: id=%s, name=%s, provider=%s ' @@ -153,6 +153,9 @@ class ContainerCluster(object): def list_containers(self): return self.driver.list_containers(cluster=self) + def destroy(self): + return self.driver.destroy_cluster(cluster=self) + def __repr__(self): return ('<ContainerCluster: id=%s, name=%s, provider=%s ...>' % (self.id, self.name, self.driver.name)) http://git-wip-us.apache.org/repos/asf/libcloud/blob/7c27da60/libcloud/test/container/test_docker.py ---------------------------------------------------------------------- diff --git a/libcloud/test/container/test_docker.py b/libcloud/test/container/test_docker.py index 00af5c8..a1978f7 100644 --- a/libcloud/test/container/test_docker.py +++ b/libcloud/test/container/test_docker.py @@ -82,7 +82,7 @@ class DockerContainerDriverTestCase(unittest.TestCase): def test_delete_container(self): container = self.driver.get_container('a68c1872c74630522c7aa74b85558b06824c5e672cee334296c50fb209825303') - container.delete() + container.destroy() def test_ex_rename_container(self): container = self.driver.get_container('a68c1872c74630522c7aa74b85558b06824c5e672cee334296c50fb209825303')
