Changeset 956

Timestamp:

09/05/08 11:14:00 (3 months ago)

Author:

mariodebian

Message:

tcos-configurator (1.5)

• Now Depends on python-netifaces
• Change ifaces detection code to use netifaces module
• Hide como_boot_mode (and label) if only one method is found

Location:

trunk/tcos-configurator

Files:

• Makefile (modified) (1 diff)
• debian/changelog (modified) (1 diff)
• debian/control (modified) (1 diff)
• tcos-configurator (modified) (7 diffs)
• tcos-configurator.glade (modified) (1 diff)

trunk/tcos-configurator/Makefile

@@ -11 +11 @@
 clean:
         find -name "*~" | xargs rm -f
+        rm -f tcos-configurator.glade.bak tcos-configurator.gladep
 
 test:

trunk/tcos-configurator/debian/changelog

@@ +1 @@
+tcos-configurator (1.5) unstable; urgency=low
+
+  * Now Depends on python-netifaces
+  * Change ifaces detection code to use netifaces module
+  * Hide como_boot_mode (and label) if only one method is found
+
+ -- Mario Izquierdo (mariodebian) <mariodebian@gmail.com>  Fri, 05 Sep 2008 11:13:31 +0200
+
 tcos-configurator (1.4) unstable; urgency=low
 

trunk/tcos-configurator/debian/control

@@ -12 +12 @@
 Package: tcos-configurator
 Architecture: all
-Depends: tcosconfig, gksu, python-gtk2, python-glade2, 
+Depends: tcosconfig, gksu, python-gtk2, python-glade2, python-netifaces, 
          python-configobj, ${misc:Depends}, ${shlibs:Depends}, ${python:Depends}
 Description: PyGTK tool to configure some needed services to get a TCOS server

trunk/tcos-configurator/tcos-configurator

@@ -49 +49 @@
 from threading import Thread
 
+import netifaces
+
 import pwd
 
@@ -222 +224 @@
         for widget in ['img_logo', 'combo_interfaces', 'txt_serverip', 'txt_startip', 
                        'txt_endip', 'btn_configure_dhcp', 'combo_boot_mode', 'hbox_dynamic',
-                       'ck_static', 'btn_hostname_help', 'txt_hostname_prefix', 'lbl_dhcp']:
+                       'ck_static', 'btn_hostname_help', 'txt_hostname_prefix', 'lbl_dhcp', 'label_boot_mode']:
             self.w[widget]=self.ui.get_widget(widget)
         
@@ -235 +237 @@
         self.populate_select(self.w['combo_boot_mode'], self.BOOT_MODES)
         self.set_active_in_select(self.w['combo_boot_mode'], self.BOOT_MODES[0][0])
+        if len(self.BOOT_MODES) < 2:
+            self.w['combo_boot_mode'].hide()
+            self.w['label_boot_mode'].hide()
         
         self.interfaces=self.getNetInterfaces()
@@ -347 +352 @@
                 self.w['lbl_dhcp'].set_markup( _("WARNING:\n<b>Network interface don't have IP</b>") )
                 self.w['lbl_dhcp'].show()
-                print_debug("iface=%s don't have ip" %iface)
+                self.w['txt_serverip'].set_text('')
+                self.w['txt_startip'].set_text('')
+                self.w['txt_endip'].set_text('')
+                print_debug("iface=%s DON'T HAVE IP" %iface)
         if configured:
             self.w['lbl_dhcp'].hide()
-            self.w['hbox_dynamic'].show()
-            self.w['ck_static'].set_active(True)
+            self.w['hbox_dynamic'].hide()
+            self.w['ck_static'].set_active(False)
 
     def set_dhcp_modified(self, *args):
@@ -487 +495 @@
     def get_ip_address(self, ifname):
         print_debug("get_ip_address() ifname=%s" %(ifname) )
+        if not ifname in netifaces.interfaces():
+            return None
+        ip=netifaces.ifaddresses(ifname)
+        if ip.has_key(netifaces.AF_INET):
+            return ip[netifaces.AF_INET][0]['addr']
+        return None
+        """
+        old code
+        print_debug("get_ip_address() ifname=%s" %(ifname) )
         s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
         return socket.inet_ntoa(fcntl.ioctl(
@@ -493 +510 @@
             struct.pack('256s', ifname[:15])
         )[20:24])
+        """
 
 
     def getNetInterfaces(self):
+        interfaces=[]
+        for dev in netifaces.interfaces():
+            if dev != "lo" and dev != "sit0" and not dev.startswith("vbox") and not dev.startswith("vmnet") and not dev.startswith("wmaster"):
+                ip=self.get_ip_address(dev)
+                print_debug("getNetInterfaces() iface=%s data=%s"%(dev,ip))
+                interfaces.append( [dev, ip] )
+        return interfaces
+        """
+        old code
         interfaces=[]
         for edir in glob.glob("/sys/class/net/*"):
@@ -508 +535 @@
                 interfaces.append( [edir, IP])
         return interfaces
+        """
 
     def read_etc_network_interfaces(self):

trunk/tcos-configurator/tcos-configurator.glade

@@ -353 +353 @@
 
               <child>
-                <widget class="GtkLabel" id="label19">
+                <widget class="GtkLabel" id="label_boot_mode">
                   <property name="visible">True</property>
                   <property name="label" translatable="yes">Boot mode</property>