cloud-init-dev team mailing list archive

[Robert Schweikert <rjschwei@xxxxxxxx>]

Robert Schweikert has proposed merging ~rjschwei/cloud-init:dmidecodeAARCH64 into cloud-init:master.

Requested reviews:
  cloud init development team (cloud-init-dev)

For more details, see:
https://code.launchpad.net/~rjschwei/cloud-init/+git/cloud-init/+merge/309628

aarch64 supports dmidecode
-- 
Your team cloud init development team is requested to review the proposed merge of ~rjschwei/cloud-init:dmidecodeAARCH64 into cloud-init:master.

diff --git a/cloudinit/util.py b/cloudinit/util.py
index 4b3fd0c..9a3d3cd 100644
--- a/cloudinit/util.py
+++ b/cloudinit/util.py
@@ -2342,7 +2342,8 @@ def read_dmi_data(key):
     # running dmidecode can be problematic on some arches (LP: #1243287)
     uname_arch = os.uname()[4]
     if not (uname_arch == "x86_64" or
-            (uname_arch.startswith("i") and uname_arch[2:] == "86")):
+            (uname_arch.startswith("i") and uname_arch[2:] == "86") or
+            uname_arch == 'aarch64'):
         LOG.debug("dmidata is not supported on %s", uname_arch)
         return None
 
diff --git a/tests/unittests/test_util.py b/tests/unittests/test_util.py
index 881509a..f6a8ab7 100644
--- a/tests/unittests/test_util.py
+++ b/tests/unittests/test_util.py
@@ -386,7 +386,7 @@ class TestReadDMIData(helpers.FilesystemMockingTestCase):
         dmi_name = 'use-dmidecode'
         self._configure_dmidecode_return(dmi_name, dmi_val)
 
-        expected = {'armel': None, 'aarch64': None, 'x86_64': dmi_val}
+        expected = {'armel': None, 'aarch64': dmi_val, 'x86_64': dmi_val}
         found = {}
         # we do not run the 'dmi-decode' binary on some arches
         # verify that anything requested that is not in the sysfs dir