Move VL connection security determination into cell.py

Move the Volume Location DB connection security handling into
cell.open_vl_server() as it's common to all vos commands.  It can be
configured directly by passing in a dictionary holding the appropriate
parameters.

Signed-off-by: David Howells <dhowells@redhat.com>

diff --git a/suite/commands/vos/listvldb.py b/suite/commands/vos/listvldb.py
index a9fd1533871ad0ea9ae9df9a9473f82e8eef5c4c..b3adfca7bd9860ad4f19d93cdcfd92c0c0784466 100644 (file)
--- a/suite/commands/vos/listvldb.py
+++ b/suite/commands/vos/listvldb.py
@@ -108,17 +108,7 @@ def print_record(params, vldb):
 def main(params):
     # Get a list of VLDB servers to query
     cell = params["cell"]
-
-    if "localauth" in params:
-        raise RuntimeError("Don't support -localauth yet")
-    elif "noauth" in params:
-        security = None
-    elif "encrypt" in params:
-        security = kafs.RXRPC_SECURITY_ENCRYPT
-    else:
-        security = None
-
-    z_conn = cell.open_vl_server(security)
+    z_conn = cell.open_vl_server(params)
     quiet = "quiet" in params
 
     if "name" in params:

diff --git a/suite/lib/cell.py b/suite/lib/cell.py
index a4938ee871d1d3cf12f464c1c858b5e5d817e912..d7bf79f9529e02e4b1feff9bb18bdbf846a03b78 100644 (file)
--- a/suite/lib/cell.py
+++ b/suite/lib/cell.py
@@ -119,19 +119,27 @@ class cell:
         return addrs
 
     # Open a VL Server connection
-    def open_vl_server(self, security=None):
+    def open_vl_server(self, params=None):
         if self.__vlconn:
             return
 
+        key = None
+        security = None
+        if params:
+            key = "afs@" + self.__name.upper()
+            if "localauth" in params:
+                raise RuntimeError("Don't support -localauth yet")
+            elif "noauth" in params:
+                security = 0
+                key = None
+            elif "encrypt" in params:
+                security = kafs.RXRPC_SECURITY_ENCRYPT
+            else:
+                security = kafs.RXRPC_SECURITY_PLAIN
+
         for vlserver in self.query_vl_addrs():
             debug("Trying", vlserver)
 
-            if security != None:
-                key = "afs@" + self.__name.upper()
-            else:
-                key = None
-                security = 0
-
             z_conn = kafs.rx_new_connection(vlserver, kafs.VL_PORT, kafs.VL_SERVICE,
                                             key, security)
             try: