Remove deprecated root_disk_size

Change-Id: I647edc2bde4f78994dce57b4db2bb51fc099c056

metalsmith/_provisioner.py

@@ -204,7 +204,7 @@ class Provisioner(object):
     def provision_node(self, node, image, nics=None, root_size_gb=None,
                        swap_size_mb=None, config=None, hostname=None,
                        netboot=False, capabilities=None, traits=None,
-                       wait=None, root_disk_size=None):
+                       wait=None):
         """Provision the node with the given image.
 
         Example::
@@ -245,7 +245,6 @@ class Provisioner(object):
             :meth:`reserve_node` for that.
         :param wait: How many seconds to wait for the deployment to finish,
             None to return immediately.
-        :param root_disk_size: DEPRECATED, use ``root_size_gb``.
         :return: :py:class:`metalsmith.Instance` object with the current
             status of provisioning. If ``wait`` is not ``None``, provisioning
             is already finished.
@@ -255,10 +254,6 @@ class Provisioner(object):
             config = _config.InstanceConfig()
         if isinstance(image, six.string_types):
             image = sources.GlanceImage(image)
-        if root_disk_size is not None:
-            warnings.warn("root_disk_size is deprecated, use root_size_gb "
-                          "instead", DeprecationWarning)
-            root_size_gb = root_disk_size
 
         node = self._check_node_for_deploy(node)
         nics = _nics.NICs(self._api, node, nics)

metalsmith/test/test_provisioner.py

@@ -707,25 +707,6 @@ abcd  image
         self.assertFalse(self.api.release_node.called)
         self.assertFalse(self.conn.network.delete_port.called)
 
-    def test_with_deprecated_root_size(self):
-        self.updates['/instance_info/root_gb'] = 50
-
-        self.pr.provision_node(self.node, 'image', [{'network': 'network'}],
-                               root_disk_size=50)
-
-        self.conn.network.create_port.assert_called_once_with(
-            network_id=self.conn.network.find_network.return_value.id)
-        self.api.attach_port_to_node.assert_called_once_with(
-            self.node.uuid, self.conn.network.create_port.return_value.id)
-        self.api.update_node.assert_called_once_with(self.node, self.updates)
-        self.api.validate_node.assert_called_once_with(self.node,
-                                                       validate_deploy=True)
-        self.api.node_action.assert_called_once_with(self.node, 'active',
-                                                     configdrive=mock.ANY)
-        self.assertFalse(self.wait_mock.called)
-        self.assertFalse(self.api.release_node.called)
-        self.assertFalse(self.conn.network.delete_port.called)
-
     def test_with_swap_size(self):
         self.updates['/instance_info/swap_mb'] = 4096
 
@@ -1152,15 +1133,15 @@ abcd  and-not-image-again
         self.assertFalse(self.api.node_action.called)
         self.api.release_node.assert_called_with(self.node)
 
-    def test_invalid_root_disk_size(self):
+    def test_invalid_root_size_gb(self):
         self.assertRaises(TypeError,
                           self.pr.provision_node,
                           self.node, 'image', [{'network': 'network'}],
-                          root_disk_size={})
+                          root_size_gb={})
         self.assertRaises(ValueError,
                           self.pr.provision_node,
                           self.node, 'image', [{'network': 'network'}],
-                          root_disk_size=0)
+                          root_size_gb=0)
         self.assertFalse(self.conn.network.create_port.called)
         self.assertFalse(self.api.node_action.called)
         self.api.release_node.assert_called_with(self.node)