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

[svn-commits at oss.oracle.com]

Author: manish
Date: 2005-04-26 21:17:15 -0500 (Tue, 26 Apr 2005)
New Revision: 850

Modified:
   trunk/ocfs2console/ocfs2interface/nodeconfig.py
   trunk/ocfs2console/ocfs2interface/o2cbmodule.c
Log:
Wrap the newly exported constants from ocfs2_nodemanager.h, and use them.


Modified: trunk/ocfs2console/ocfs2interface/nodeconfig.py
===================================================================
--- trunk/ocfs2console/ocfs2interface/nodeconfig.py	2005-04-27 02:04:49 UTC (rev 849)
+++ trunk/ocfs2console/ocfs2interface/nodeconfig.py	2005-04-27 02:17:15 UTC (rev 850)
@@ -346,8 +346,7 @@
             table.attach(widget, 1, 2, row, row + 1)
 
             if field.column == COLUMN_NAME:
-                #XXX widget.set_max_length(ocfs2.MAX_NODE_NAME_LENGTH)
-                pass
+                widget.set_max_length(o2cb.NM_MAX_NAME_LEN)
             elif field.column == COLUMN_IP_PORT:
                 widget.set_numeric(True)
 

Modified: trunk/ocfs2console/ocfs2interface/o2cbmodule.c
===================================================================
--- trunk/ocfs2console/ocfs2interface/o2cbmodule.c	2005-04-27 02:04:49 UTC (rev 849)
+++ trunk/ocfs2console/ocfs2interface/o2cbmodule.c	2005-04-27 02:17:15 UTC (rev 850)
@@ -28,7 +28,9 @@
 
 #include "o2cb.h"
 #include "o2cb_abi.h"
+#include "ocfs2_nodemanager.h"
 
+/* FIXME: right now we don't wrap the init function */
 
 typedef struct {
   PyObject_HEAD
@@ -532,6 +534,18 @@
   ADD_STR_CONSTANT (HEARTBEAT_REGION_ATTR);
 
 #undef ADD_STR_CONSTANT
+
+#define ADD_INT_CONSTANT(name) \
+    PyModule_AddIntConstant (m, "NM_" #name, NM_ ## name)
+
+  ADD_INT_CONSTANT (API_VERSION);
+
+  ADD_INT_CONSTANT (MAX_NODES);
+  ADD_INT_CONSTANT (INVALID_SLOT_NUM);
+
+  ADD_INT_CONSTANT (MAX_NAME_LEN);
+
+#undef ADD_INT_CONSTANT
 }
 
 void