[Ocfs2-tools-commits] manish commits r913 - trunk/ocfs2console/ocfs2interface

[svn-commits at oss.oracle.com]

Author: manish
Date: 2005-05-23 20:15:07 -0500 (Mon, 23 May 2005)
New Revision: 913

Modified:
   trunk/ocfs2console/ocfs2interface/console.py
   trunk/ocfs2console/ocfs2interface/general.py
   trunk/ocfs2console/ocfs2interface/menu.py
   trunk/ocfs2console/ocfs2interface/tune.py
Log:
Fix more node/slot confusion


Modified: trunk/ocfs2console/ocfs2interface/console.py
===================================================================
--- trunk/ocfs2console/ocfs2interface/console.py	2005-05-24 00:42:39 UTC (rev 912)
+++ trunk/ocfs2console/ocfs2interface/console.py	2005-05-24 01:15:07 UTC (rev 913)
@@ -26,7 +26,7 @@
 from mount import mount, unmount
 from format import format_partition
 from fsck import fsck_volume
-from tune import tune_label, tune_nodes
+from tune import tune_label, tune_slots
 from general import General
 from bosa import Browser
 from nodeconfig import node_config
@@ -128,8 +128,8 @@
     def relabel(self):
         tune_label(self, self.pv.get_device())
 
-    def node_num(self):
-        tune_nodes(self, self.pv.get_device())
+    def slot_num(self):
+        tune_slots(self, self.pv.get_device())
 
     def check(self):
         fsck_volume(self, self.pv.get_device(), check=True)

Modified: trunk/ocfs2console/ocfs2interface/general.py
===================================================================
--- trunk/ocfs2console/ocfs2interface/general.py	2005-05-24 00:42:39 UTC (rev 912)
+++ trunk/ocfs2console/ocfs2interface/general.py	2005-05-24 01:15:07 UTC (rev 913)
@@ -60,7 +60,7 @@
 
 class MaximumNodes(Field):
     def real_get_text(self):
-        return str(self.super.s_max_nodes)
+        return str(self.super.s_max_slots)
 
 class FSSize(Field):
     def real_get_text(self):

Modified: trunk/ocfs2console/ocfs2interface/menu.py
===================================================================
--- trunk/ocfs2console/ocfs2interface/menu.py	2005-05-24 00:42:39 UTC (rev 912)
+++ trunk/ocfs2console/ocfs2interface/menu.py	2005-05-24 01:15:07 UTC (rev 913)
@@ -74,9 +74,9 @@
 )
 
 task_menu_tail_data = (
-    ('/Tasks/Change _Label...',    None,         'relabel',  'refresh',
+    ('/Tasks/Change _Label...',         None,    'relabel',  'refresh',
      UNMOUNTED_ONLY),
-    ('/Tasks/_Edit Node Count...', None,         'node_num', 'refresh',
+    ('/Tasks/_Edit Node Slot Count...', None,    'slot_num', 'refresh',
      UNMOUNTED_ONLY),
 )
 

Modified: trunk/ocfs2console/ocfs2interface/tune.py
===================================================================
--- trunk/ocfs2console/ocfs2interface/tune.py	2005-05-24 00:42:39 UTC (rev 912)
+++ trunk/ocfs2console/ocfs2interface/tune.py	2005-05-24 01:15:07 UTC (rev 913)
@@ -46,7 +46,7 @@
         NumSlots.__init__(self)
 
         fs = ocfs2.Filesystem(device)
-        self.set_range(fs.fs_super.s_max_nodes, ocfs2.MAX_SLOTS)
+        self.set_range(fs.fs_super.s_max_slots, ocfs2.MAX_SLOTS)
 
     title = 'Edit Node Slot Count'
     action = 'Changing node slot count'
@@ -140,15 +140,15 @@
 def tune_label(parent, device):
     tune_action(TuneVolumeLabel, parent, device)
 
-def tune_nodes(parent, device):
-    tune_action(TuneNumNodes, parent, device)
+def tune_slots(parent, device):
+    tune_action(TuneNumSlots, parent, device)
 
 def main():
     import sys
     device = sys.argv[1]
 
     tune_label(None, device)
-    tune_nodes(None, device)
+    tune_slots(None, device)
 
 if __name__ == '__main__':
     main()