sim: Ignore mender artifact file on sim devices

2 files changed, 13 insertions, 2 deletions

diff --git a/mpm/python/usrp_mpm/periph_manager/base.py b/mpm/python/usrp_mpm/periph_manager/base.py
index 3feb3452a..c09cde611 100644
--- a/mpm/python/usrp_mpm/periph_manager/base.py
+++ b/mpm/python/usrp_mpm/periph_manager/base.py
@@ -169,7 +169,17 @@ class PeriphManagerBase(object):
         mboard_info["mpm_sw_version"] = version_string
 
         mboard_info["fs_version"] = get_fs_version()
-        mboard_info['mender_artifact'] = get_mender_artifact()
+        # Mender artifacts are generally not present on a machine hosting
+        # a simulated device--let it slide if not found on sim devices
+        try:
+            mboard_info['mender_artifact'] = get_mender_artifact()
+        except FileNotFoundError:
+            # Note that the simulated key will not be present for
+            # non-simulated devices, hence the use of get()
+            if mboard_info.get('simulated', '') == 'True':
+                pass
+            else:
+                raise
 
         for i,dboard_info in enumerate(dboard_infos):
             mboard_info["dboard_{}_pid".format(i)] = str(dboard_info["pid"])
diff --git a/mpm/python/usrp_mpm/periph_manager/sim.py b/mpm/python/usrp_mpm/periph_manager/sim.py
index d909bed34..ea29dd139 100644
--- a/mpm/python/usrp_mpm/periph_manager/sim.py
+++ b/mpm/python/usrp_mpm/periph_manager/sim.py
@@ -90,7 +90,8 @@ class sim(PeriphManagerBase):
         self.device_id = 1
         self.description = self.config.hardware.description
         self.mboard_info = {"type": self.config.hardware.uhd_device_type,
-                            "product": self.config.hardware.product}
+                            "product": self.config.hardware.product,
+                            "simulated": "True"}
         self.pids = {int(self.config.hardware.pid): self.config.hardware.product}
         # This uses the description, mboard_info, and pids
         super().__init__()