openstack: Add Nutanix AHV support

It provides only OpenStack metadata without EC2 metadata Signed-off-by: Olli Janatuinen <[email protected]>
coreos · Jan 10, 2025 · ea62546 · ea62546
1 parent 1a58f96
commit ea62546
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 12 deletions.
diff --git a/src/providers/openstack/configdrive.rs b/src/providers/openstack/configdrive.rs
@@ -144,25 +144,29 @@ impl OpenstackConfigDrive {
 impl MetadataProvider for OpenstackConfigDrive {
     fn attributes(&self) -> Result<HashMap<String, String>> {
         let mut out = HashMap::with_capacity(6);
-        let metadata_ec2: MetadataEc2JSON = self.read_metadata_ec2()?;
+
         let metadata_openstack: MetadataOpenstackJSON = self.read_metadata_openstack()?;
         if let Some(hostname) = metadata_openstack.hostname {
             out.insert("OPENSTACK_HOSTNAME".to_string(), hostname);
         }
-        if let Some(instance_id) = metadata_ec2.instance_id {
-            out.insert("OPENSTACK_INSTANCE_ID".to_string(), instance_id);
-        }
         if let Some(uuid) = metadata_openstack.uuid {
             out.insert("OPENSTACK_INSTANCE_UUID".to_string(), uuid);
         }
-        if let Some(instance_type) = metadata_ec2.instance_type {
-            out.insert("OPENSTACK_INSTANCE_TYPE".to_string(), instance_type);
-        }
-        if let Some(local_ipv4) = metadata_ec2.local_ipv4 {
-            out.insert("OPENSTACK_IPV4_LOCAL".to_string(), local_ipv4);
-        }
-        if let Some(public_ipv4) = metadata_ec2.public_ipv4 {
-            out.insert("OPENSTACK_IPV4_PUBLIC".to_string(), public_ipv4);
+
+        let ec2_result = self.read_metadata_ec2();
+        if let Ok(metadata_ec2) = ec2_result {
+            if let Some(instance_id) = metadata_ec2.instance_id {
+                out.insert("OPENSTACK_INSTANCE_ID".to_string(), instance_id);
+            }
+            if let Some(instance_type) = metadata_ec2.instance_type {
+                out.insert("OPENSTACK_INSTANCE_TYPE".to_string(), instance_type);
+            }
+            if let Some(local_ipv4) = metadata_ec2.local_ipv4 {
+                out.insert("OPENSTACK_IPV4_LOCAL".to_string(), local_ipv4);
+            }
+            if let Some(public_ipv4) = metadata_ec2.public_ipv4 {
+                out.insert("OPENSTACK_IPV4_PUBLIC".to_string(), public_ipv4);
+            }
         }
         Ok(out)
     }
@@ -254,4 +258,22 @@ mod tests {
 
         assert_eq!(parsed.public_keys.unwrap_or_default(), expect);
     }
+
+    #[test]
+    fn test_attributes_nutanix() {
+        let provider = OpenstackConfigDrive {
+            drive_path: PathBuf::from("./tests/fixtures/openstack-config-drive/nutanix"),
+            temp_dir: None,
+        };
+        let result = provider.attributes();
+        assert!(result.is_ok(), "Expected Ok, got Err: {:?}", result.err());
+        let attributes = result.unwrap();
+        assert_eq!(
+            attributes
+                .get("OPENSTACK_INSTANCE_UUID")
+                .unwrap_or(&String::new()),
+            "b3f43d9c-9198-4cd4-ac9f-bed14960794b"
+        );
+    }
+
 }
diff --git a/tests/fixtures/openstack-config-drive/nutanix/openstack/latest/meta_data.json b/tests/fixtures/openstack-config-drive/nutanix/openstack/latest/meta_data.json
@@ -0,0 +1 @@
+{"uuid": "b3f43d9c-9198-4cd4-ac9f-bed14960794b"}
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		{"uuid": "b3f43d9c-9198-4cd4-ac9f-bed14960794b"}