Use new optional attr in AQ Hostname create

Use the new optional sandbox attr in AQ Hostname create

Author: DavidFair

OpenStack-Rabbit-Consumer/rabbit_consumer/aq_api.py

@@ -158,14 +158,6 @@ def delete_machine(machine_name: str) -> None:
     setup_requests(url, "delete", "Delete Machine")
 
 
-def _is_sandbox(image_meta: AqMetadata) -> bool:
-    """
-    Returns True if the image is a sandbox image
-    we do a simple test for a '/' in the domain name
-    """
-    return "/" in image_meta.aq_domain
-
-
 def create_host(
     image_meta: AqMetadata, addresses: List[OpenstackAddress], machine_name: str
 ) -> None:
@@ -184,8 +176,8 @@ def create_host(
         "osversion": image_meta.aq_os_version,
     }
 
-    if _is_sandbox(image_meta):
-        params["sandbox"] = image_meta.aq_domain
+    if image_meta.aq_sandbox:
+        params["sandbox"] = image_meta.aq_sandbox
     else:
         params["domain"] = image_meta.aq_domain
 

OpenStack-Rabbit-Consumer/test/test_aq_api.py

@@ -292,7 +292,8 @@ def test_aq_create_host_with_sandbox(
     env_config = config.return_value
     env_config.aq_url = "https://example.com"
 
-    image_metadata.aq_domain = "example/sandbox"
+    image_metadata.aq_domain = "example_domain"
+    image_metadata.aq_sandbox = "example/sandbox"
 
     create_host(image_metadata, openstack_address_list, machine_name)
     address = openstack_address_list[0]
@@ -304,7 +305,7 @@ def test_aq_create_host_with_sandbox(
         "personality": image_metadata.aq_personality,
         "osname": image_metadata.aq_os,
         "osversion": image_metadata.aq_os_version,
-        "sandbox": image_metadata.aq_domain,
+        "sandbox": image_metadata.aq_sandbox,
     }
 
     expected_url = f"https://example.com/host/{address.hostname}"

OpenStack-Rabbit-Consumer/version.txt

@@ -1 +1 @@
-2.3.3
+2.3.4

charts/rabbit-consumer/Chart.yaml

@@ -6,11 +6,11 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 1.4.3
+version: 1.4.4
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "v2.3.3"
+appVersion: "v2.3.4"