From: Michael Tremer Date: Sun, 13 Mar 2016 13:11:47 +0000 (+0100) Subject: fireinfo: Add Fountain Networks Duo Box X-Git-Url: http://git.ipfire.org/?p=ipfire.org.git;a=commitdiff_plain;h=50b5392da46cd8074a508509c1e10b56def99d21 fireinfo: Add Fountain Networks Duo Box Signed-off-by: Michael Tremer --- diff --git a/webapp/backend/fireinfo.py b/webapp/backend/fireinfo.py index 66335d47..74bad904 100644 --- a/webapp/backend/fireinfo.py +++ b/webapp/backend/fireinfo.py @@ -685,6 +685,7 @@ class Profile(Object): def appliance_id(self): if not hasattr(self, "_appliance_id"): appliances = ( + ("fountainnetworks-duo-box", self._appliance_test_fountainnetworks_duo_box), ("fountainnetworks-prime", self._appliance_test_fountainnetworks_prime), ("lightningwirelabs-eco-plus", self._appliance_test_lightningwirelabs_eco_plus), ("lightningwirelabs-eco", self._appliance_test_lightningwirelabs_eco), @@ -702,7 +703,10 @@ class Profile(Object): @property def appliance(self): - if self.appliance_id == "fountainnetworks-prime": + if self.appliance_id == "fountainnetworks-duo-box": + return "Fountain Networks - IPFire Duo Box" + + elif self.appliance_id == "fountainnetworks-prime": return "Fountain Networks - IPFire Prime Box" elif self.appliance_id == "lightningwirelabs-eco-plus": @@ -711,6 +715,22 @@ class Profile(Object): elif self.appliance_id == "lightningwirelabs-eco": return "Lightning Wire Labs - IPFire Eco Appliance" + def _appliance_test_fountainnetworks_duo_box(self): + if not self.processor.vendor == "Intel": + return False + + if not self.processor.model_string == "Intel(R) Celeron(R) 2957U @ 1.40GHz": + return False + + if not self.count_device("pci", "10ec", "8168") == 2: + return False + + # WiFi module + if self.count_device("usb", "148f", "5572") < 1: + return False + + return True + def _appliance_test_fountainnetworks_prime(self): if not self.system in (("SECO", None), ("SECO", "0949")): return False