Merge "Add CT tags field to the database and API"

Author: Zuul

api-ref/source/clustertemplates.inc

@@ -57,6 +57,7 @@ Request
   - dns_nameserver: dns_nameserver
   - floating_ip_enabled: floating_ip_enabled
   - hidden: hidden
+  - tags: tags
 
 Request Example
 ----------------
@@ -102,6 +103,7 @@ Response
   - master_lb_enabled: master_lb_enabled
   - dns_nameserver: dns_nameserver
   - hidden: hidden
+  - tags: tags
 
 Response Example
 ----------------
@@ -167,6 +169,7 @@ Response
   - master_lb_enabled: master_lb_enabled
   - dns_nameserver: dns_nameserver
   - hidden: hidden
+  - tags: tags
 
 Response Example
 ----------------
@@ -240,6 +243,7 @@ Response
   - master_lb_enabled: master_lb_enabled
   - dns_nameserver: dns_nameserver
   - hidden: hidden
+  - tags: tags
 
 Response Example
 ----------------
@@ -364,9 +368,10 @@ Return new cluster templates with updated attributes.
   - master_lb_enabled: master_lb_enabled
   - dns_nameserver: dns_nameserver
   - hidden: hidden
+  - tags: tags
 
 Response Example
 ----------------
 
 .. literalinclude:: samples/clustertemplate-create-resp.json
-   :language: javascript
+   :language: javascript

api-ref/source/parameters.yaml

@@ -559,6 +559,12 @@ status_reason:
   in: body
   required: true
   type: string
+tags:
+  description: |
+    Administrator tags for the cluster template.
+  in: body
+  required: false
+  type: array
 tls_disabled:
   description: |
     Transport Layer Security (TLS) is normally enabled to secure the

magnum/api/controllers/v1/baymodel.py

@@ -141,6 +141,9 @@ class BayModel(base.APIBase):
     hidden = wsme.wsattr(types.boolean, default=False)
     """Indicates whether the Baymodel is hidden or not."""
 
+    tags = wtypes.StringType(min_length=0, max_length=255)
+    """A comma separated list of tags."""
+
     def __init__(self, **kwargs):
         self.fields = []
         for field in objects.ClusterTemplate.fields:

magnum/api/controllers/v1/cluster_template.py

@@ -156,6 +156,9 @@ class ClusterTemplate(base.APIBase):
     hidden = wsme.wsattr(types.boolean, default=False)
     """Indicates whether the ClusterTemplate is hidden or not."""
 
+    tags = wtypes.StringType(min_length=0, max_length=255)
+    """A comma separated list of tags."""
+
     def __init__(self, **kwargs):
         self.fields = []
         for field in objects.ClusterTemplate.fields:

magnum/db/sqlalchemy/alembic/versions/f1d8b0ab8b8d_added_observations_to_cluster_template.py

@@ -0,0 +1,31 @@
+#    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.
+"""added_tags_to_cluster_template
+
+Revision ID: f1d8b0ab8b8d
+Revises: 95096e2334ee
+Create Date: 2020-08-26 08:38:11.567618
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = 'f1d8b0ab8b8d'
+down_revision = '95096e2334ee'
+
+from alembic import op  # noqa: E402
+import sqlalchemy as sa  # noqa: E402
+
+
+def upgrade():
+    op.add_column('cluster_template',
+                  sa.Column('tags',
+                            sa.String(length=255), nullable=True))

magnum/db/sqlalchemy/api.py

@@ -389,7 +389,8 @@ def _is_cluster_template_referenced(self, session, cluster_template_uuid):
     def _is_publishing_cluster_template(self, values):
         if (len(values) == 1 and (
                 ('public' in values and values['public'] is True) or
-                ('hidden' in values))):
+                ('hidden' in values) or
+                ('tags' in values and values['tags'] is not None))):
             return True
         return False
 

magnum/db/sqlalchemy/models.py

@@ -191,6 +191,7 @@ class ClusterTemplate(Base):
     master_lb_enabled = Column(Boolean, default=False)
     floating_ip_enabled = Column(Boolean, default=True)
     hidden = Column(Boolean, default=False)
+    tags = Column(String(255))
 
 
 class X509KeyPair(Base):

magnum/objects/cluster_template.py

@@ -43,7 +43,8 @@ class ClusterTemplate(base.MagnumPersistentObject, base.MagnumObject,
     # Version 1.17: 'coe' field type change to ClusterTypeField
     # Version 1.18: DockerStorageDriver is a StringField (was an Enum)
     # Version 1.19: Added 'hidden' field
-    VERSION = '1.19'
+    # Version 1.20: Added 'tags' field
+    VERSION = '1.20'
 
     dbapi = dbapi.get_instance()
 
@@ -80,6 +81,7 @@ class ClusterTemplate(base.MagnumPersistentObject, base.MagnumObject,
         'master_lb_enabled': fields.BooleanField(default=False),
         'floating_ip_enabled': fields.BooleanField(default=True),
         'hidden': fields.BooleanField(default=False),
+        'tags': fields.StringField(nullable=True),
     }
 
     @staticmethod

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

@@ -64,7 +64,8 @@ class TestListClusterTemplate(api_base.FunctionalTest):
                                'image_id', 'registry_enabled', 'no_proxy',
                                'keypair_id', 'https_proxy', 'tls_disabled',
                                'public', 'labels', 'master_flavor_id',
-                               'volume_driver', 'insecure_registry', 'hidden')
+                               'volume_driver', 'insecure_registry', 'hidden',
+                               'tags',)
 
     def test_empty(self):
         response = self.get_json('/clustertemplates')

magnum/tests/unit/db/utils.py

@@ -57,6 +57,7 @@ def get_test_cluster_template(**kw):
         'master_lb_enabled': kw.get('master_lb_enabled', True),
         'floating_ip_enabled': kw.get('floating_ip_enabled', True),
         'hidden': kw.get('hidden', False),
+        'tags': kw.get('tags', ""),
     }