* First cut working vibnal

diff --git a/lustre/ptlrpc/events.c b/lustre/ptlrpc/events.c
index 0f6a7c4..693ee23 100644 (file)
--- a/lustre/ptlrpc/events.c
+++ b/lustre/ptlrpc/events.c
@@ -628,6 +628,7 @@ int ptlrpc_init_portals(void)
                 {GMNAL,     "gmnal"},
                 {OPENIBNAL, "openibnal"},
                 {IIBNAL,    "iibnal"},
+                {VIBNAL,    "vibnal"},
                 {TCPNAL,    "tcpnal"},
                 {LONAL,     "lonal"},
                 {RANAL,     "ranal"},

diff --git a/lustre/utils/lconf b/lustre/utils/lconf
index b746c99..25ebdf7 100755 (executable)
--- a/lustre/utils/lconf
+++ b/lustre/utils/lconf
@@ -456,13 +456,20 @@ class LCTLInterface:
   quit""" % (net_type,
              nid, hostaddr, port )
             self.run(cmds)
-        elif net_type in ('iib','vib') and not config.lctl_dump:
+        elif net_type in ('iib',) and not config.lctl_dump:
             cmds =  """
   network %s
   add_peer %s
   quit""" % (net_type,
              nid )
             self.run(cmds)
+        elif net_type in ('vib',) and not config.lctl_dump:
+            cmds =  """
+  network %s
+  add_peer %s %s
+  quit""" % (net_type,
+             nid, hostaddr )
+            self.run(cmds)
     
     def connect(self, srv):
         self.add_uuid(srv.net_type, srv.nid_uuid, srv.nid)

diff --git a/lustre/utils/lmc b/lustre/utils/lmc
index ebcf2c5..638c4f7 100755 (executable)
--- a/lustre/utils/lmc
+++ b/lustre/utils/lmc
@@ -74,7 +74,7 @@ Object creation command summary:
   --node node_name
   --nid nid
   --cluster_id 
-  --nettype tcp|elan|gm|openib|iib
+  --nettype tcp|elan|gm|openib|iib|vib
   --hostaddr ip[/netmask]
   --port port
   --tcpbuf size
@@ -163,7 +163,7 @@ lmc_options = [
     ('subsystem', "Specify which Lustre subsystems have debug output recorded in the log",  PARAM),
 
     # network 
-    ('nettype', "Specify the network type. This can be tcp/elan/gm/openib/iib.", PARAM),
+    ('nettype', "Specify the network type. This can be tcp/elan/gm/openib/iib/vib.", PARAM),
     ('nid', "Give the network ID, e.g ElanID/IP Address as used by portals.", PARAM),
     ('port', "Optional argument to specify the TCP port number.", PARAM, DEFAULT_PORT),
     ('hostaddr', "Optional argument to specify the host address.", PARAMLIST),