Merge "Add flavor admin support"

shade/__init__.py

@@ -4268,3 +4268,61 @@ class OperatorCloud(OpenStackCloud):
             self.log.debug("Failed to get domain", exc_info=True)
             raise OpenStackCloudException(str(e))
         return meta.obj_to_dict(domain)
+
+    def create_flavor(self, name, ram, vcpus, disk, flavorid="auto",
+                      ephemeral=0, swap=0, rxtx_factor=1.0, is_public=True):
+        """Create a new flavor.
+
+        :param name: Descriptive name of the flavor
+        :param ram: Memory in MB for the flavor
+        :param vcpus: Number of VCPUs for the flavor
+        :param disk: Size of local disk in GB
+        :param flavorid: ID for the flavor (optional)
+        :param ephemeral: Ephemeral space size in GB
+        :param swap: Swap space in MB
+        :param rxtx_factor: RX/TX factor
+        :param is_public: Make flavor accessible to the public
+
+        :returns: A dict describing the new flavor.
+
+        :raises: OpenStackCloudException on operation error.
+        """
+        try:
+            flavor = self.manager.submitTask(
+                _tasks.FlavorCreate(name=name, ram=ram, vcpus=vcpus, disk=disk,
+                                    flavorid=flavorid, ephemeral=ephemeral,
+                                    swap=swap, rxtx_factor=rxtx_factor,
+                                    is_public=is_public)
+            )
+        except Exception as e:
+            self.log.debug(
+                "Failed to create flavor {0}".format(name),
+                exc_info=True)
+            raise OpenStackCloudException(str(e))
+        return meta.obj_to_dict(flavor)
+
+    def delete_flavor(self, name_or_id):
+        """Delete a flavor
+
+        :param name_or_id: ID or name of the flavor to delete.
+
+        :returns: True if delete succeeded, False otherwise.
+
+        :raises: OpenStackCloudException on operation error.
+        """
+        flavor = self.get_flavor(name_or_id)
+        if flavor is None:
+            self.log.debug(
+                "Flavor {0} not found for deleting".format(name_or_id))
+            return False
+
+        try:
+            self.manager.submitTask(_tasks.FlavorDelete(flavor=flavor['id']))
+        except Exception as e:
+            self.log.debug("Error deleting flavor {0}".format(name_or_id),
+                           exc_info=True)
+            raise OpenStackCloudException(
+                "Unable to delete flavor {0}: {1}".format(name_or_id, e)
+            )
+
+        return True

shade/_tasks.py

@@ -42,6 +42,16 @@ class FlavorList(task_manager.Task):
         return client.nova_client.flavors.list()
 
 
+class FlavorCreate(task_manager.Task):
+    def main(self, client):
+        return client.nova_client.flavors.create(**self.args)
+
+
+class FlavorDelete(task_manager.Task):
+    def main(self, client):
+        return client.nova_client.flavors.delete(**self.args)
+
+
 class ServerList(task_manager.Task):
     def main(self, client):
         return client.nova_client.servers.list(**self.args)

shade/tests/unit/test_flavors.py

@@ -0,0 +1,61 @@
+# -*- coding: utf-8 -*-
+
+# Licensed under the Apache License, Version 2.0 (the "License"); you may
+# not use this file except in compliance with the License. You may obtain
+# a copy of the License at
+#
+#      http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+# License for the specific language governing permissions and limitations
+# under the License.
+
+
+import mock
+
+import shade
+from shade.tests import fakes
+from shade.tests.unit import base
+
+
+class TestFlavors(base.TestCase):
+
+    def setUp(self):
+        super(TestFlavors, self).setUp()
+        self.op_cloud = shade.operator_cloud()
+
+    @mock.patch.object(shade.OpenStackCloud, 'nova_client')
+    def test_create_flavor(self, mock_nova):
+        self.op_cloud.create_flavor(
+            'vanilla', 12345, 4, 100
+        )
+        mock_nova.flavors.create.assert_called_once_with(
+            name='vanilla', ram=12345, vcpus=4, disk=100,
+            flavorid='auto', ephemeral=0, swap=0, rxtx_factor=1.0,
+            is_public=True
+        )
+
+    @mock.patch.object(shade.OpenStackCloud, 'nova_client')
+    def test_delete_flavor(self, mock_nova):
+        mock_nova.flavors.list.return_value = [
+            fakes.FakeFlavor('123', 'lemon')
+        ]
+        self.assertTrue(self.op_cloud.delete_flavor('lemon'))
+        mock_nova.flavors.delete.assert_called_once_with(flavor='123')
+
+    @mock.patch.object(shade.OpenStackCloud, 'nova_client')
+    def test_delete_flavor_not_found(self, mock_nova):
+        mock_nova.flavors.list.return_value = []
+        self.assertFalse(self.op_cloud.delete_flavor('invalid'))
+        self.assertFalse(mock_nova.flavors.delete.called)
+
+    @mock.patch.object(shade.OpenStackCloud, 'nova_client')
+    def test_delete_flavor_exception(self, mock_nova):
+        mock_nova.flavors.list.return_value = [
+            fakes.FakeFlavor('123', 'lemon')
+        ]
+        mock_nova.flavors.delete.side_effect = Exception()
+        self.assertRaises(shade.OpenStackCloudException,
+                          self.op_cloud.delete_flavor, '')