Merge lp:~therve/landscape-client/network-interface-flags into lp:~landscape/landscape-client/trunk

[Thomas Herve]

[Jamu Kakar (jkakar)]

Looks good, +1!

review: Approve

[Kevin McDermott (bigkevmcd)]

Small branches are awesome :-)

+1

review: Approve

=== modified file 'landscape/lib/network.py'
--- landscape/lib/network.py	2010-06-10 08:08:44 +0000
+++ landscape/lib/network.py	2010-06-10 09:09:33 +0000
@@ -10,6 +10,7 @@
 
 # from header /usr/include/bits/ioctls.h
 SIOCGIFCONF = 0x8912
+SIOCGIFFLAGS = 0x8913
 SIOCGIFNETMASK = 0x891b
 SIOCGIFBRDADDR = 0x8919
 SIOCGIFADDR = 0x8915
@@ -114,6 +115,18 @@
     return "".join(["%02x:" % ord(char) for char in mac_address[18:24]])[:-1]
 
 
+def get_flags(sock, interface):
+    """Return the integer value of the interface flags for the given interface.
+
+    @param sock: a socket instance.
+    @param interface: The name of the interface.
+    @see /usr/include/linux/if.h for the meaning of the flags.
+    """
+    data = fcntl.ioctl(
+        sock.fileno(), SIOCGIFFLAGS, struct.pack("256s", interface[:15]))
+    return struct.unpack("H", data[16:18])[0]
+
+
 def get_active_device_info():
     """
     Returns a dictionary containing information on each active network
@@ -128,6 +141,7 @@
         interface_info["broadcast_address"] = get_broadcast_address(sock,
                                                                     interface)
         interface_info["netmask"] = get_netmask(sock, interface)
+        interface_info["flags"] = get_flags(sock, interface)
         results.append(interface_info)
     del sock
     return results

=== modified file 'landscape/lib/tests/test_network.py'
--- landscape/lib/tests/test_network.py	2010-06-10 08:08:44 +0000
+++ landscape/lib/tests/test_network.py	2010-06-10 09:09:33 +0000
@@ -26,9 +26,18 @@
             self.assertTrue(device["interface"] in result)
             block = interface_blocks[device["interface"]]
             self.assertTrue(device["netmask"] in block)
-            self.failUnlessIn(device["ip_address"], block)
-            self.failUnlessIn(device["mac_address"].upper(), block)
-            self.failUnlessIn(device["broadcast_address"], block)
+            self.assertIn(device["ip_address"], block)
+            self.assertIn(device["mac_address"].upper(), block)
+            self.assertIn(device["broadcast_address"], block)
+            flags = device["flags"]
+            if flags & 1:
+                self.assertIn("UP", block)
+            if flags & 2:
+                self.assertIn("BROADCAST", block)
+            if flags & 64:
+                self.assertIn("RUNNING", block)
+            if flags & 4096:
+                self.assertIn("MULTICAST", block)
 
     def test_get_network_traffic(self):
         """

=== modified file 'landscape/message_schemas.py'
--- landscape/message_schemas.py	2010-05-13 10:29:37 +0000
+++ landscape/message_schemas.py	2010-06-10 09:09:33 +0000
@@ -364,7 +364,8 @@
                               "ip_address": String(),
                               "mac_address": String(),
                               "broadcast_address": String(),
-                              "netmask": String()}))})
+                              "netmask": String(),
+                              "flags": Int()}))})
 
 NETWORK_ACTIVITY = Message(
     "network-activity",

=== modified file 'landscape/monitor/tests/test_networkdevice.py'
--- landscape/monitor/tests/test_networkdevice.py	2010-05-04 17:23:45 +0000
+++ landscape/monitor/tests/test_networkdevice.py	2010-06-10 09:09:33 +0000
@@ -24,6 +24,10 @@
         self.assertTrue(message["devices"][0]["interface"], "lo")
         self.assertTrue(message["devices"][0]["ip_address"], "0.0.0.0")
         self.assertTrue(message["devices"][0]["netmask"], "255.0.0.0")
+        flags = message["devices"][0]["flags"]
+        self.assertEqual(1, flags & 1) # UP
+        self.assertEqual(8, flags & 8) # LOOPBACK
+        self.assertEqual(64, flags & 64) # RUNNING
 
     def test_no_message_with_no_changes(self):
         """If no device changes from the last message, no message is sent."""