Implement control plane resizing with driver.

This implements spec proposed in [1] which in the base driver
defines a list of valid sizes for control plane(master) nodes.

In other drivers, this provides an interface to enable resizing
of the master nodegroup, and define any list of supported control
plane sizes.

[1] https://review.opendev.org/c/openstack/magnum-specs/+/905281

Change-Id: Iafb2e1e5c983e09ee58a3a0180051ed096268ed1

Author: dalees

magnum/api/attr_validator.py

@@ -168,9 +168,11 @@ def validate_os_resources(context, cluster_template, cluster=None):
         validate_keypair(cli, cluster['keypair'])
 
 
-def validate_master_count(cluster, cluster_template):
-    if cluster['master_count'] > 1 and \
-            not cluster['master_lb_enabled']:
+def validate_master_count(context, cluster):
+    if (
+        cluster['master_count'] > 1 and
+        not cluster['master_lb_enabled']
+    ):
         raise exception.InvalidParameterValue(_(
             "master_count must be 1 when master_lb_enabled is False"))
 

magnum/api/controllers/v1/cluster.py

@@ -475,6 +475,7 @@ def _check_cluster_quota_limit(self, context):
     @validation.ct_not_found_to_bad_request()
     @validation.enforce_cluster_type_supported()
     @validation.enforce_cluster_volume_storage_size()
+    @validation.enforce_cluster_master_size_supported()
     def post(self, cluster):
         if cluster.node_count == 0:
             raise exception.ZeroNodeCountNotSupported()
@@ -484,6 +485,7 @@ def post(self, cluster):
     @expose.expose(ClusterID, body=Cluster, status_code=202)
     @validation.enforce_cluster_type_supported()
     @validation.enforce_cluster_volume_storage_size()
+    @validation.enforce_cluster_master_size_supported()
     def post(self, cluster):  # noqa
         return self._post(cluster)
 
@@ -545,8 +547,8 @@ def _post(self, cluster):
         attr_validator.validate_os_resources(context,
                                              cluster_template.as_dict(),
                                              cluster_dict)
-        attr_validator.validate_master_count(cluster_dict,
-                                             cluster_template.as_dict())
+        attr_validator.validate_master_count(context,
+                                             cluster_dict)
 
         cluster_dict['project_id'] = context.project_id
         cluster_dict['user_id'] = context.user_id

magnum/api/controllers/v1/cluster_actions.py

@@ -20,6 +20,7 @@
 from magnum.api import utils as api_utils
 from magnum.common import exception
 from magnum.common import policy
+from magnum.drivers.common.driver import Driver
 from magnum import objects
 
 
@@ -114,22 +115,24 @@ def _resize(self, cluster_ident, cluster_resize_req):
             nodegroup = objects.NodeGroup.get(
                 context, cluster.uuid, cluster_resize_req.nodegroup)
 
-        if nodegroup.role == 'master':
-            # NOTE(ttsiouts): Restrict the resize to worker nodegroups
-            raise exception.MasterNGResizeNotSupported()
-
         # NOTE(ttsiouts): Make sure that the new node count is within
         # the configured boundaries of the selected nodegroup.
-        if nodegroup.min_node_count > cluster_resize_req.node_count:
+        if (nodegroup.role != "master" and
+           nodegroup.min_node_count > cluster_resize_req.node_count):
             raise exception.NGResizeOutBounds(
                 nodegroup=nodegroup.name, min_nc=nodegroup.min_node_count,
                 max_nc=nodegroup.max_node_count)
-        if (nodegroup.max_node_count and
+        if (nodegroup.role != "master" and nodegroup.max_node_count and
                 nodegroup.max_node_count < cluster_resize_req.node_count):
             raise exception.NGResizeOutBounds(
                 nodegroup=nodegroup.name, min_nc=nodegroup.min_node_count,
                 max_nc=nodegroup.max_node_count)
 
+        if nodegroup.role == "master":
+            cluster_driver = Driver.get_driver_for_cluster(context, cluster)
+            cluster_driver.validate_master_resize(
+                cluster_resize_req.node_count)
+
         pecan.request.rpcapi.cluster_resize_async(
             cluster,
             cluster_resize_req.node_count,

magnum/api/validation.py

@@ -90,6 +90,19 @@ def wrapper(func, *args, **kwargs):
     return wrapper
 
 
+def enforce_cluster_master_size_supported():
+    @decorator.decorator
+    def wrapper(func, *args, **kwargs):
+        cluster = args[1]
+        cluster_driver = driver.Driver.get_driver_for_cluster(
+            pecan.request.context, cluster)
+        # Call into the driver to validate initial master size
+        cluster_driver.validate_master_size(cluster.master_count)
+        return func(*args, **kwargs)
+
+    return wrapper
+
+
 def enforce_cluster_volume_storage_size():
     @decorator.decorator
     def wrapper(func, *args, **kwargs):

magnum/common/exception.py

@@ -434,8 +434,14 @@ class NodeGroupNotFound(ResourceNotFound):
     message = _("Nodegroup %(nodegroup)s could not be found.")
 
 
+class MasterNGSizeInvalid(InvalidParameterValue):
+    message = _("master nodegroup size of %(requested_size)s is invalid, "
+                "size cannot be an even number.")
+
+
 class MasterNGResizeNotSupported(NotSupported):
-    message = _("Resizing a master nodegroup is not supported.")
+    message = _("Resizing the master nodegroup is not supported "
+                "by this driver.")
 
 
 class ZeroNodeCountNotSupported(NotSupported):

magnum/conductor/utils.py

@@ -185,11 +185,9 @@ def _get_nodegroup_object(context, cluster, node_count, is_master=False):
     else:
         ng.flavor_id = cluster.flavor_id or cluster.cluster_template.flavor_id
         ng.role = "worker"
-    if (cluster.labels != wtypes.Unset and cluster.labels is not None
-       and 'min_node_count' in cluster.labels):
-        ng.min_node_count = cluster.labels['min_node_count']
-    else:
-        ng.min_node_count = 0
+        if (cluster.labels != wtypes.Unset and cluster.labels is not None
+                and 'min_node_count' in cluster.labels):
+            ng.min_node_count = cluster.labels['min_node_count']
     ng.name = "default-%s" % ng.role
     ng.is_default = True
     ng.status = fields.ClusterStatus.CREATE_IN_PROGRESS

magnum/drivers/common/driver.py

@@ -23,7 +23,6 @@
 from magnum.common import exception
 from magnum.objects import cluster_template
 
-
 CONF = cfg.CONF
 LOG = logging.getLogger(__name__)
 
@@ -219,6 +218,15 @@ def resize_cluster(self, context, cluster, resize_manager,
         raise NotImplementedError("Subclasses must implement "
                                   "'resize_cluster'.")
 
+    def validate_master_size(self, node_count):
+        if node_count % 2 == 0 or node_count < 1:
+            raise exception.MasterNGSizeInvalid(
+                requested_size=node_count)
+
+    def validate_master_resize(self, node_count):
+        # Base driver does not support resizing masters.
+        raise exception.MasterNGResizeNotSupported()
+
     @abc.abstractmethod
     def create_federation(self, context, federation):
         raise NotImplementedError("Subclasses must implement "

magnum/tests/unit/api/controllers/v1/test_cluster.py

@@ -708,7 +708,7 @@ def test_create_cluster_with_non_existent_cluster_template_name(self):
 
     def test_create_cluster_with_cluster_template_name(self):
         modelname = self.cluster_template.name
-        bdict = apiutils.cluster_post_data(cluster_template_id=modelname)
+        bdict = apiutils.cluster_post_data(name=modelname)
         response = self.post_json('/clusters', bdict, expect_errors=True)
         self.assertEqual('application/json', response.content_type)
         self.assertEqual(202, response.status_int)
@@ -767,6 +767,40 @@ def test_create_cluster_with_no_master_count(self):
         self.assertEqual('application/json', response.content_type)
         self.assertEqual(202, response.status_int)
 
+    def test_create_cluster_with_even_master_count_oldmicroversion(self):
+        bdict = apiutils.cluster_post_data()
+        bdict['master_count'] = 2
+        response = self.post_json(
+            '/clusters',
+            bdict,
+            expect_errors=True,
+            headers={"Openstack-Api-Version": "container-infra 1.9"}
+        )
+        self.assertEqual('application/json', response.content_type)
+        self.assertEqual(400, response.status_int)
+        self.assertTrue(response.json['errors'])
+
+    def test_create_cluster_with_even_master_count(self):
+        bdict = apiutils.cluster_post_data()
+        bdict['master_count'] = 2
+        response = self.post_json(
+            '/clusters',
+            bdict,
+            expect_errors=True,
+            headers={"Openstack-Api-Version": "container-infra 1.10"}
+        )
+        self.assertEqual('application/json', response.content_type)
+        self.assertEqual(400, response.status_int)
+        self.assertTrue(response.json['errors'])
+
+    def test_create_cluster_with_negative_master_count(self):
+        bdict = apiutils.cluster_post_data()
+        bdict['master_count'] = -1
+        response = self.post_json('/clusters', bdict, expect_errors=True)
+        self.assertEqual('application/json', response.content_type)
+        self.assertEqual(400, response.status_int)
+        self.assertTrue(response.json['errors'])
+
     def test_create_cluster_with_invalid_name(self):
         invalid_names = ['x' * 243, '123456', '123456test_cluster',
                          '-test_cluster', '.test_cluster', '_test_cluster', '']
@@ -874,7 +908,7 @@ def test_create_cluster_with_multi_images_same_name(self):
         self.assertTrue(self.mock_valid_os_res.called)
         self.assertEqual(409, response.status_int)
 
-    def test_create_cluster_with_on_os_distro_image(self):
+    def test_create_cluster_with_no_os_distro_image(self):
         bdict = apiutils.cluster_post_data()
         self.mock_valid_os_res.side_effect = \
             exception.OSDistroFieldNotFound('img')

magnum/tests/unit/api/controllers/v1/test_cluster_actions.py

@@ -80,8 +80,24 @@ def test_resize_with_nodegroup(self):
         self.assertEqual(self.cluster_obj.cluster_template_id,
                          response['cluster_template_id'])
 
-    def test_resize_with_master_nodegroup(self):
-        new_node_count = 6
+    def test_resize_with_master_nodegroup_even_unsupported(self):
+        new_node_count = 4
+        nodegroup = self.cluster_obj.default_ng_master
+        cluster_resize_req = {
+            "node_count": new_node_count,
+            "nodegroup": nodegroup.uuid
+        }
+        response = self.post_json('/clusters/%s/actions/resize' %
+                                  self.cluster_obj.uuid,
+                                  cluster_resize_req,
+                                  headers={"Openstack-Api-Version":
+                                           "container-infra 1.9",
+                                           "X-Roles": "member"},
+                                  expect_errors=True)
+        self.assertEqual(400, response.status_code)
+
+    def test_resize_with_master_nodegroup_odd_unsupported(self):
+        new_node_count = 3
         nodegroup = self.cluster_obj.default_ng_master
         cluster_resize_req = {
             "node_count": new_node_count,