Merge "Fix adding 'unknown' to the ConsumerTypeCache"

placement/attribute_cache.py

@@ -150,6 +150,19 @@ class _AttributeCache(object):
         self._str_cache = {r[0]: r[1] for r in res}
         self._all_cache = {r[1]: r for r in res}
 
+    def _add_attribute(self, attr_id, name, created_at, updated_at):
+        """Use this to add values to the cache that are not coming from the
+        database, like defaults.
+        """
+        self._id_cache[name] = attr_id
+        self._str_cache[attr_id] = name
+        self._all_cache[name] = {
+            'id': attr_id,
+            'name': name,
+            'created_at': created_at,
+            'updated_at': updated_at,
+        }
+
 
 class ConsumerTypeCache(_AttributeCache):
     """An _AttributeCache for consumer types."""
@@ -161,8 +174,16 @@ class ConsumerTypeCache(_AttributeCache):
     def _refresh_from_db(self, ctx):
         super(ConsumerTypeCache, self)._refresh_from_db(ctx)
         # The consumer_type_id is nullable and records with a NULL (None)
-        # consumer_type_id are considered as 'unknown'.
-        self._id_cache[None] = ct_obj.NULL_CONSUMER_TYPE_ALIAS
+        # consumer_type_id are considered as 'unknown'. Also the 'unknown'
+        # consumer_type is not created in the database so we need to manually
+        # populate it in the cache here.
+        self._add_attribute(
+            attr_id=None,
+            name=ct_obj.NULL_CONSUMER_TYPE_ALIAS,
+            # should we synthesize some dates in the past instead?
+            created_at=None,
+            updated_at=None,
+        )
 
 
 class ResourceClassCache(_AttributeCache):

placement/tests/functional/gabbits/consumer-types-bug-story-2009167.yaml

@@ -26,14 +26,8 @@ tests:
   GET: /allocations/44444444-4444-4444-4444-444444444444
   request_headers:
       openstack-api-version: placement 1.38
-  # FIXME(gibi): this is bug https://storyboard.openstack.org/#!/story/2009167
-  # as placement returns error
-  status: 404
-  response_strings:
-    - "No such consumer type: None."
-  # This should be returned instead
-  # response_json_paths:
-  #     $.allocations.`len`: 1
-  #     $.allocations['$ENVIRON["RP_UUID"]'].resources.DISK_GB: 10
-  #     $.consumer_type: unknown
-  # status: 200
+  response_json_paths:
+      $.allocations.`len`: 1
+      $.allocations['$ENVIRON["RP_UUID"]'].resources.DISK_GB: 10
+      $.consumer_type: unknown
+  status: 200