Only pass hostname to Aq Make

Aq Manage or Aq create host should be used to manipulate the personality
/ arch / domain. This step should only make a VM, not introduce
side-effects.

Author: DavidFair

OpenStack-Rabbit-Consumer/rabbit_consumer/aq_api.py

@@ -13,8 +13,6 @@
 from rabbit_consumer.rabbit_message import RabbitMessage
 from rabbit_consumer.vm_data import VmData
 
-MAKE_SUFFIX = "/host/{0}/command/make"
-
 HOST_CHECK_SUFFIX = "/host/{0}"
 
 UPDATE_INTERFACE_SUFFIX = "/machine/{0}/interface/{1}?boot&default_route"
@@ -84,21 +82,11 @@ def setup_requests(
     return response.text
 
 
-def aq_make(addresses: List[OpenstackAddress], image_meta: AqMetadata) -> None:
+def aq_make(addresses: List[OpenstackAddress]) -> None:
     """
-    Runs AQ make against a list of addresses passed to build the default personality
+    Runs AQ make against a list of addresses passed to refresh
+    the given host
     """
-    params = {
-        "personality": image_meta.aq_personality,
-        "osversion": image_meta.aq_os_version,
-        "osname": image_meta.aq_os,
-        "archetype": image_meta.aq_archetype,
-    }
-
-    assert all(
-        i for i in params.values()
-    ), "Some fields were not set in the OS description"
-
     # Manage and make these back to default domain and personality
     address = addresses[0]
     hostname = address.hostname
@@ -107,8 +95,8 @@ def aq_make(addresses: List[OpenstackAddress], image_meta: AqMetadata) -> None:
     if not hostname or not hostname.strip():
         raise ValueError("Hostname cannot be empty")
 
-    url = ConsumerConfig().aq_url + MAKE_SUFFIX.format(hostname)
-    setup_requests(url, "post", "Make Template: ", params)
+    url = ConsumerConfig().aq_url + f"/host/{hostname}/command/make"
+    setup_requests(url, "post", "Make Template")
 
 
 def aq_manage(addresses: List[OpenstackAddress], image_meta: AqMetadata) -> None:

OpenStack-Rabbit-Consumer/rabbit_consumer/message_consumer.py

@@ -160,7 +160,7 @@ def handle_create_machine(rabbit_message: RabbitMessage) -> None:
 
     # Manage host in Aquilon
     aq_api.create_host(image_meta, network_details, machine_name)
-    aq_api.aq_make(network_details, image_meta)
+    aq_api.aq_make(network_details)
 
     add_aq_details_to_metadata(vm_data, network_details)
 

OpenStack-Rabbit-Consumer/test/test_aq_api.py

@@ -130,45 +130,17 @@ def test_setup_requests_rest_methods(_, kerb_auth, requests, rest_verb):
 
 @patch("rabbit_consumer.aq_api.setup_requests")
 @patch("rabbit_consumer.aq_api.ConsumerConfig")
-def test_aq_make_calls(config, setup, openstack_address_list, image_metadata):
+def test_aq_make_calls(config, setup, openstack_address_list):
     """
     Test that aq_make calls the correct URLs with the correct parameters
     """
     domain = "domain"
     config.return_value.aq_url = domain
 
-    aq_make(openstack_address_list, image_metadata)
-
-    expected_params = {
-        "personality": image_metadata.aq_personality,
-        "osversion": image_metadata.aq_os_version,
-        "osname": image_metadata.aq_os,
-        "archetype": image_metadata.aq_archetype,
-    }
+    aq_make(openstack_address_list)
 
     expected_url = f"{domain}/host/{openstack_address_list[0].hostname}/command/make"
-    setup.assert_called_once_with(expected_url, "post", mock.ANY, expected_params)
-
-
-@pytest.mark.parametrize(
-    "field_to_blank",
-    [
-        "aq_personality",
-        "aq_os_version",
-        "aq_os",
-    ],
-)
-def test_aq_make_missing_fields(field_to_blank, openstack_address_list, image_metadata):
-    """
-    Test that aq_make throws an exception when a required field is missing
-    """
-    with pytest.raises(AssertionError):
-        setattr(image_metadata, field_to_blank, None)
-        aq_make(openstack_address_list, image_metadata)
-
-    with pytest.raises(AssertionError):
-        setattr(image_metadata, field_to_blank, "")
-        aq_make(openstack_address_list, image_metadata)
+    setup.assert_called_once_with(expected_url, "post", mock.ANY)
 
 
 @pytest.mark.parametrize("hostname", ["  ", "", None])
@@ -185,7 +157,7 @@ def test_aq_make_none_hostname(config, setup, openstack_address, hostname):
     address.hostname = hostname
 
     with pytest.raises(ValueError):
-        aq_make([address], NonCallableMock())
+        aq_make([address])
 
     setup.assert_not_called()
 

OpenStack-Rabbit-Consumer/test/test_message_consumer.py

@@ -248,7 +248,7 @@ def test_consume_create_machine_hostnames_good_path(
     aq_api.create_host.assert_called_once_with(
         image_metadata, network_details, machine_name
     )
-    aq_api.aq_make.assert_called_once_with(network_details, image_metadata)
+    aq_api.aq_make.assert_called_once_with(network_details)
 
     # Metadata
     metadata.assert_called_once_with(vm_data, network_details)