Changeset 22

Timestamp:

01/23/09 15:06:51 (3 years ago)

Author:

lasarux

Message:

• config.py:
• config.yaml:
• misc/utils.py:
• plugins/info/info/init.py:
• plugins/zfs/zfs/init.py:
• plugins/zfs/zfs/zfs.glade: More changes in config stuff. ZFS plugin uses the current connection.

Location:

trunk

Files:

• ChangeLog (modified) (1 diff)
• config.py (modified) (1 diff)
• config.yaml (modified) (1 diff)
• misc/utils.py (modified) (1 diff)
• plugins/info/info/__init__.py (modified) (1 diff)
• plugins/zfs/zfs/__init__.py (modified) (3 diffs)
• plugins/zfs/zfs/zfs.glade (modified) (2 diffs)

trunk/ChangeLog

@@ +1 @@
+2009-01-23  Pedro Gracia,,,  <lasarux@gmail.com>
+
+        * config.py:
+        * config.yaml:
+        * misc/utils.py:
+        * plugins/info/info/__init__.py:
+        * plugins/zfs/zfs/__init__.py:
+        * plugins/zfs/zfs/zfs.glade:
+        More changes in config stuff.
+        ZFS plugin uses the current connection.         
+
 2009-01-23  Pedro Gracia,,,  <lasarux@gmail.com>
 

trunk/config.py

@@ -11 +11 @@
 REMOTE = "TERM=unix LC_ALL=C"
 
-def get_command(command, opsys):
+def get_command(command, os):
+    columns = COMMANDS[command]["columns"]
     try:
-        args = COMMANDS[command][opsys]
+        args = COMMANDS[command][os]
     except:
         args = COMMANDS[command]["default"]
-    return "%s %s" % (command, args)
-
-def send_command(command, ip, opsys):
-    rcommand = get_command(command, opsys)
-    s = pxssh.pxssh()
-    if s.login(ip, user):
-        s.sendline("%s %s " % (REMOTE, rcommand))
-        s.prompt()
-        result = s.before
-        s.logout()
-        # process data
-        regex = COMMANDS[command]["regex"]
-        headlines = int(COMMANDS[command]["headlines"])
-        p = re.compile(regex)
-        #for i in result.splitlines()[headlines+1:]:
-        #    m = p.search(i)
-        #    m.group("size")
-        return result
+    return "%s %s" % (command, args), columns

trunk/config.yaml

@@ -147 +147 @@
         default: -h
         headlines: 1
+        columns: ["Filesystem", "Size", "Used", "Avail", "Capacity", "Mounted on"]
         regex: (?P<filesystem>[\w\/\[\]<>-]+|automount -[\w]+ \[[\d]+\])\s+\
                 (?P<size>[\w,.]+)\s+\

trunk/misc/utils.py

@@ +1 @@
+# -*- coding: utf-8 -*-
 import gtk
 

trunk/plugins/info/info/__init__.py

@@ -32 +32 @@
         #textbuffer = self.info_tview.get_buffer()
         #textbuffer.set_text("Remoting...")
-        rcommand = self.main.config.get_command(command, os)
+        rcommand, columns = self.main.config.get_command(command, os)
         
         s = self.main.s

trunk/plugins/zfs/zfs/__init__.py

@@ -5 +5 @@
 import simplepanels
 import gtk
-
-TEST_ZFS_LIST=["NAME                      USED  AVAIL  REFER  MOUNTPOINT", 
-"rpool                    3,29G  11,8G    46K  /rpool",
-"rpool/ROOT               2,28G  11,8G    18K  legacy",
-"rpool/ROOT/opensolaris   2,28G  11,8G  2,22G  /",
-"rpool/dump                511M  11,8G   511M  -",
-"rpool/export             5,09M  11,8G    19K  /export",
-"rpool/export/home        5,07M  11,8G    19K  /export/home",
-"rpool/export/home/pedro  5,05M  11,8G  5,05M  /export/home/pedro",
-"rpool/swap                512M  12,3G    16K  -"]
-
-
-
 
 class ZFSPlugin(object, SimpleGladeApp):
@@ -31 +18 @@
         self.main = main
         self.root.reparent(main.zfs_vbox)
+        
+    def on_refresh_btn_clicked(self, button):
         self.show_list()
         
     def show_list(self):
         """Show 'zfs list' info"""
+        s = self.main.s
+        s.sendline("zfs list")
+        s.prompt()
+        result = s.before.split("\n")[2:]
+        
         columns = [('visible', 'str', 'Name'),
                    ('visible', 'str', 'Used'),
@@ -42 +36 @@
                    ]
         data = []
-        for i in TEST_ZFS_LIST[1:]:
-            data.append(i.split())
+        for i in result:
+            row = i.split()
+            if len(row) == len(columns):
+                data.append(row)
         
         self.t = Treeview("list", columns, data, self.list_treeview)

trunk/plugins/zfs/zfs/zfs.glade

@@ -57 +57 @@
             </child>
             <child>
-              <widget class="GtkButton" id="button3">
+              <widget class="GtkButton" id="refresh_btn">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
@@ -64 +64 @@
                 <property name="use_stock">True</property>
                 <property name="response_id">0</property>
+                <signal name="clicked" handler="on_refresh_btn_clicked"/>
               </widget>
               <packing>