1.2.0

build-deb/debian/changelog

@@ -1,3 +1,9 @@
+sanji-bundle-route (1.2.0) unstable; urgency=low
+
+  * feat: Support `status` and `wan`.
+
+ -- Aeluin Chen <aeluin.chen@moxa.com>  Wed, 05 Apr 2017 16:00:35 +0800
+
 sanji-bundle-route (1.1.0) unstable; urgency=low
 
   * feat: Get interface via shell script command.

bundle.json

@@ -1,6 +1,6 @@
 {
   "name": "route",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "author": "Aeluin Chen",
   "email": "aeluin.chen@moxa.com",
   "description": "Handles the routing table",

route.py

@@ -46,7 +46,7 @@ def init(self, *args, **kwargs):
         if self.bundle_env == "debug":  # pragma: no cover
             self._path_root = "%s/tests" % self._path_root
 
-        self.interfaces = []
+        self.interfaces = {}
         try:
             self.load(self._path_root)
         except:
@@ -123,7 +123,10 @@ def list_interfaces(self):
                 inet_ip = [inet["ip"]
                            for inet in iface_info["inet"]
                            if "" != inet["ip"]]
-                if len(inet_ip):
+                if len(inet_ip) and \
+                        (iface in self.interfaces and
+                         self.interfaces[iface]["status"] is True and
+                         self.interfaces[iface]["wan"] is True):
                     data.append(iface)
         return data
 
@@ -141,6 +144,8 @@ def get_default(self):
         else:
             return default
 
+        default["wan"] = True
+        default["status"] = True
         default["gateway"] = gw[0]
         default["interface"] = gw[1]
         return default
@@ -198,6 +203,8 @@ def _try_update_default(self, routes):
         """
         ifaces = self.list_interfaces()
         if not ifaces:
+            # FIXME: keep or clean?
+            # self.update_default({})
             raise IPRouteError("Interfaces should be UP.")
 
         default = {}
@@ -210,13 +217,11 @@ def _try_update_default(self, routes):
             return
 
         # find gateway by interface
-        for iface in self.interfaces:
-            if iface["interface"] == default["interface"]:
-                default = iface
-                break
+        default.update(self.interfaces[default["interface"]])
 
         current = self.get_default()
-        if current != default:
+        if current.get("interface", "") != default.get("interface", "") or \
+                current.get("gateway", "") != default.get("gateway", ""):
             self.update_default(default)
 
     def try_update_default(self, routes):
@@ -226,7 +231,7 @@ def try_update_default(self, routes):
             except IPRouteError as e:
                 _logger.debug(e)
 
-    def update_router(self, interface):
+    def update_router(self, iface):
         """
         Save the interface name with its gateway and update the default
         gateway if needed.
@@ -237,18 +242,18 @@ def update_router(self, interface):
         Args:
             interface: dict format with interface "name" and/or "gateway".
         """
+        if "status" not in iface:
+            iface["status"] = True
+        if "wan" not in iface:
+            iface["wan"] = True
+
         # update the router information
-        for iface in self.interfaces:
-            if iface["interface"] == interface["name"]:
-                if "gateway" in interface:
-                    iface["gateway"] = interface["gateway"]
-                break
-        else:
-            iface = {}
-            iface["interface"] = interface["name"]
-            if "gateway" in interface:
-                iface["gateway"] = interface["gateway"]
-            self.interfaces.append(iface)
+        if iface["name"] not in self.interfaces:
+            self.interfaces[iface["name"]] = {}
+        self.interfaces[iface["name"]]["status"] = iface["status"]
+        self.interfaces[iface["name"]]["wan"] = iface["wan"]
+        if "gateway" in iface:
+            self.interfaces[iface["name"]]["gateway"] = iface["gateway"]
 
         # check if the default gateway need to be modified
         self.try_update_default(self._routes)