5313: Revert Node Manager's GCE boot disk destroy code.

After upgrading to libcloud>=0.16, it's redundant to create a node
with ex_disk_auto_delete=True, then destroy the node with
destory_boot_disk=True.  During the destroy process, libcloud will
fail to destroy the boot disk, because Google has already deleted it.
ex_disk_auto_delete is closer to what we want, so just rely on that.

diff --git a/services/nodemanager/arvnodeman/computenode/driver/gce.py b/services/nodemanager/arvnodeman/computenode/driver/gce.py
index 689105caa4e4ad69a885d1a79d11e71681ef7e2a..280de98c96c898e1b4aa637c1c0f698cbd83e4c1 100644 (file)
--- a/services/nodemanager/arvnodeman/computenode/driver/gce.py
+++ b/services/nodemanager/arvnodeman/computenode/driver/gce.py
@@ -84,10 +84,6 @@ class ComputeNodeDriver(BaseComputeNodeDriver):
                 super(ComputeNodeDriver, self).list_nodes()
                 if self.node_tags.issubset(node.extra.get('tags', []))]
 
-    def destroy_node(self, cloud_node):
-        return super(ComputeNodeDriver, self).destroy_node(
-            cloud_node, destroy_boot_disk=True)
-
     @classmethod
     def _find_metadata(cls, metadata_items, key):
         # Given a list of two-item metadata dictonaries, return the one with

diff --git a/services/nodemanager/tests/test_computenode_driver_gce.py b/services/nodemanager/tests/test_computenode_driver_gce.py
index fbb0c82e7e03bb1a59b79f1aacb97ba67abafba3..080c9bb618d4de014ebe1e3d1b054413251a4adf 100644 (file)
--- a/services/nodemanager/tests/test_computenode_driver_gce.py
+++ b/services/nodemanager/tests/test_computenode_driver_gce.py
@@ -73,12 +73,6 @@ class GCEComputeNodeDriverTestCase(testutil.DriverTestMixin, unittest.TestCase):
         driver = self.new_driver(list_kwargs={'tags': 'good, great'})
         self.assertItemsEqual(['5', '6'], [n.id for n in driver.list_nodes()])
 
-    def test_destroy_node_destroys_disk(self):
-        driver = self.new_driver()
-        driver.destroy_node(testutil.cloud_node_mock())
-        self.assertTrue(self.driver_mock().destroy_node.call_args[1].get(
-                'destroy_boot_disk'))
-
     def build_gce_metadata(self, metadata_dict):
         # Convert a plain metadata dictionary to the GCE data structure.
         return {