Send 'scrub_data' parameter when destroying a DigitalOcean node.
Project: http://git-wip-us.apache.org/repos/asf/libcloud/repo Commit: http://git-wip-us.apache.org/repos/asf/libcloud/commit/067e9942 Tree: http://git-wip-us.apache.org/repos/asf/libcloud/tree/067e9942 Diff: http://git-wip-us.apache.org/repos/asf/libcloud/diff/067e9942 Branch: refs/heads/0.13.3 Commit: 067e9942e50a1abef181b863f89c498e1039797f Parents: 617f632 Author: Tomaz Muraus <[email protected]> Authored: Mon Dec 30 22:38:23 2013 +0100 Committer: Tomaz Muraus <[email protected]> Committed: Mon Dec 30 23:16:23 2013 +0100 ---------------------------------------------------------------------- libcloud/compute/drivers/digitalocean.py | 4 +++- libcloud/test/compute/test_digitalocean.py | 5 +++-- 2 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/libcloud/blob/067e9942/libcloud/compute/drivers/digitalocean.py ---------------------------------------------------------------------- diff --git a/libcloud/compute/drivers/digitalocean.py b/libcloud/compute/drivers/digitalocean.py index 0f4ee40..1e23e86 100644 --- a/libcloud/compute/drivers/digitalocean.py +++ b/libcloud/compute/drivers/digitalocean.py @@ -123,7 +123,9 @@ class DigitalOceanNodeDriver(NodeDriver): return res.status == httplib.OK def destroy_node(self, node): - res = self.connection.request('/droplets/%s/destroy/' % (node.id)) + params = {'scrub_data': 'true'} + res = self.connection.request('/droplets/%s/destroy/' % (node.id), + params=params) return res.status == httplib.OK def ex_list_ssh_keys(self): http://git-wip-us.apache.org/repos/asf/libcloud/blob/067e9942/libcloud/test/compute/test_digitalocean.py ---------------------------------------------------------------------- diff --git a/libcloud/test/compute/test_digitalocean.py b/libcloud/test/compute/test_digitalocean.py index e6d8ab3..b09017b 100644 --- a/libcloud/test/compute/test_digitalocean.py +++ b/libcloud/test/compute/test_digitalocean.py @@ -29,7 +29,7 @@ from libcloud.common.types import InvalidCredsError from libcloud.compute.drivers.digitalocean import DigitalOceanNodeDriver from libcloud.compute.types import NodeState -from libcloud.test import MockHttp +from libcloud.test import MockHttpTestCase from libcloud.test.compute import TestCaseMixin from libcloud.test.file_fixtures import ComputeFileFixtures from libcloud.test.secrets import DIGITAL_OCEAN_PARAMS @@ -107,7 +107,7 @@ class DigitalOceanTests(unittest.TestCase): self.assertTrue(result) -class DigitalOceanMockHttp(MockHttp): +class DigitalOceanMockHttp(MockHttpTestCase): fixtures = ComputeFileFixtures('digitalocean') def _regions(self, method, url, body, headers): @@ -133,6 +133,7 @@ class DigitalOceanMockHttp(MockHttp): def _droplets_119461_destroy(self, method, url, body, headers): # destroy_node + self.assertUrlContainsQueryParams(url, {'scrub_data': 'true'}) body = self.fixtures.load('destroy_node.json') return (httplib.OK, body, {}, httplib.responses[httplib.OK])
