Wire up message consumer to call the VM Metadata override

Lastly, we wire up the message consumer so that it uses the VM Metadata
instead of the image metadata.
This is important when a user uses our bespoke website, where they can
set these fields

Author: DavidFair

OpenStack-Rabbit-Consumer/rabbit_consumer/message_consumer.py

@@ -40,6 +40,9 @@ def get_aq_build_metadata(vm_data: VmData) -> AqMetadata:
     """
     image = openstack_api.get_image(vm_data)
     image_meta = AqMetadata.from_dict(image.metadata)
+
+    vm_metadata = openstack_api.get_server_metadata(vm_data)
+    image_meta.override_from_vm_meta(vm_metadata)
     return image_meta
 
 

OpenStack-Rabbit-Consumer/rabbit_consumer/openstack_api.py

@@ -71,7 +71,7 @@ def get_server_networks(vm_data: VmData) -> List[OpenstackAddress]:
     return OpenstackAddress.get_internal_networks(server.addresses)
 
 
-def get_metadata(vm_data: VmData) -> dict:
+def get_server_metadata(vm_data: VmData) -> dict:
     """
     Gets the metadata from Openstack for the virtual machine.
     """

OpenStack-Rabbit-Consumer/test/test_message_consumer.py

@@ -1,4 +1,4 @@
-from unittest.mock import Mock, NonCallableMock, patch, call
+from unittest.mock import Mock, NonCallableMock, patch, call, MagicMock
 
 import pytest
 
@@ -344,13 +344,20 @@ def test_is_aq_managed_image_missing_key(openstack_api, vm_data):
 
 @patch("rabbit_consumer.message_consumer.AqMetadata")
 @patch("rabbit_consumer.message_consumer.openstack_api")
-def test_get_aq_build_metadata(openstack_api, image_metadata, vm_data):
+def test_get_aq_build_metadata(openstack_api, aq_metadata_class, vm_data):
     """
     Test that the function returns the correct metadata
     """
-    image_meta = get_aq_build_metadata(vm_data)
+    aq_metadata_obj: MagicMock = get_aq_build_metadata(vm_data)
 
-    assert image_meta == image_metadata.from_dict.return_value
-    image_metadata.from_dict.assert_called_once_with(
+    # We should first construct from an image
+    assert aq_metadata_obj == aq_metadata_class.from_dict.return_value
+    aq_metadata_class.from_dict.assert_called_once_with(
         openstack_api.get_image.return_value.metadata
     )
+
+    # Then override with an object
+    openstack_api.get_server_metadata.assert_called_once_with(vm_data)
+    aq_metadata_obj.override_from_vm_meta.assert_called_once_with(
+        openstack_api.get_server_metadata.return_value
+    )