Merge "StackTag versioned-object"

heat/objects/stack.py

@@ -22,8 +22,9 @@ from oslo_versionedobjects import fields
 
 
 from heat.db import api as db_api
-from heat import objects
 from heat.objects import fields as heat_fields
+from heat.objects import raw_template
+from heat.objects import stack_tag
 
 
 class Stack(
@@ -56,6 +57,7 @@ class Stack(
         'current_deps': heat_fields.JsonField(),
         'prev_raw_template_id': fields.IntegerField(),
         'prev_raw_template': fields.ObjectField('RawTemplate'),
+        'tag': fields.ObjectField('StackTag'),
     }
 
     @staticmethod
@@ -63,8 +65,15 @@ class Stack(
         for field in stack.fields:
             if field == 'raw_template':
                 stack['raw_template'] = (
-                    objects.raw_template.RawTemplate.get_by_id(
+                    raw_template.RawTemplate.get_by_id(
                         context, db_stack['raw_template_id']))
+            elif field == 'tag':
+                if db_stack.get(field) is not None:
+                    stack['tag'] = stack_tag.StackTag.get_obj(
+                        db_stack.get(field)
+                    )
+                else:
+                    stack['tag'] = None
             else:
                 stack[field] = db_stack.__dict__.get(field)
         stack._context = context

heat/objects/stack_tag.py

@@ -0,0 +1,46 @@
+#
+# 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.
+
+
+"""
+StackTag object
+"""
+
+from oslo_versionedobjects import base
+from oslo_versionedobjects import fields
+
+
+class StackTag(base.VersionedObject,
+               base.VersionedObjectDictCompat,
+               base.ComparableVersionedObject):
+    fields = {
+        'id': fields.IntegerField(),
+        'tag': fields.StringField(nullable=True),
+        'stack_id': fields.StringField(),
+        'created_at': fields.DateTimeField(read_only=True),
+        'updated_at': fields.DateTimeField(nullable=True),
+    }
+
+    @staticmethod
+    def _from_db_object(tag, db_tag):
+        if db_tag is None:
+            return None
+        for field in tag.fields:
+            tag[field] = db_tag[field]
+        tag.obj_reset_changes()
+        return tag
+
+    @classmethod
+    def get_obj(cls, context, tag):
+        tag_obj = cls._from_db_object(cls(context), tag)
+        return tag_obj