[GNUnet-SVN] r27169 - gnunet-planetlab/gplmt/gplmt

[gnunet]

Author: wachs
Date: 2013-05-16 13:06:29 +0200 (Thu, 16 May 2013)
New Revision: 27169

Modified:
   gnunet-planetlab/gplmt/gplmt/Nodes.py
   gnunet-planetlab/gplmt/gplmt/Worker.py
Log:
- changes to -H cmd argument parsing
- debugging IPv6/v4 fallback issue


Modified: gnunet-planetlab/gplmt/gplmt/Nodes.py
===================================================================
--- gnunet-planetlab/gplmt/gplmt/Nodes.py       2013-05-16 11:05:10 UTC (rev 
27168)
+++ gnunet-planetlab/gplmt/gplmt/Nodes.py       2013-05-16 11:06:29 UTC (rev 
27169)
@@ -28,7 +28,9 @@
     import urllib
     import xmlrpclib
     import socket
+    import gplmt.Util as Util
 except ImportError: 
+    
     print "That's a bug! please check README"
     sys.exit (1) 
 
@@ -45,6 +47,8 @@
         if len(parts) > 1: #credentials supplied
             line = parts[0]
         line = line.replace(" ", "")
+        if len(line) == 0:
+            return None
         parts = line.split('@')
         hostname = None
         port = None
@@ -60,8 +64,9 @@
                 username = parts[0]
             line = parts[1]
 
-        elif len(parts) > 2:
+        elif len(parts) > 2:            
             raise Exception("Invalid node definition: " + line)
+            return None 
 
         #parse host/port
         hostport = line.split(':')
@@ -70,7 +75,7 @@
             port = int(hostport[1])
         elif len(hostport) > 2:
             raise Exception("Invalid node definition: " + line)
-
+            return None 
         return Node(hostname, port, username, password)
 
 
@@ -86,8 +91,10 @@
             fobj = open (self.filename, "r") 
             for line in fobj: 
                 line = line.strip() 
-                self.logger.log ("Found node '" + line + "'")
-                self.nodes.append(Node.parse(line))
+                node = Node.parse(line)                
+                if (None != node):
+                    self.nodes.append(node)
+                    self.logger.log ("Found node '" + 
Util.print_ssh_connection (node) + "'")
             fobj.close()
         except IOError:
             print "File " + self.filename + " not found"
@@ -103,8 +110,11 @@
         self.nodes = list ()
     def load (self):        
         self.logger.log ("Loading nodes '" + self.str + "'")
-        self.nodes.append(self.str)
-        self.logger.log ("Loaded " + str(len(self.nodes)) + " nodes")
+        node = Node.parse(self.str)
+        if (None == node):
+            return False  
+        self.nodes.append(node)
+        self.logger.log ("Loaded node '" +Util.print_ssh_connection (node)+ 
"'")
         return True    
 
 class PlanetLabNodes:

Modified: gnunet-planetlab/gplmt/gplmt/Worker.py
===================================================================
--- gnunet-planetlab/gplmt/gplmt/Worker.py      2013-05-16 11:05:10 UTC (rev 
27168)
+++ gnunet-planetlab/gplmt/gplmt/Worker.py      2013-05-16 11:06:29 UTC (rev 
27169)
@@ -35,6 +35,7 @@
 
 try:
     import gplmt.Configuration as Configuration
+    import gplmt.Util as Util
     import gplmt.Tasks as Tasks
     from gplmt.SCP import SCPClient
     from gplmt.SCP import SCPException
@@ -292,34 +293,28 @@
                 else:
                     g_logger.log (self.node.hostname + " : Not found " + 
g_configuration.ssh_keyfile)
             
+            
+            g_logger.log (self.node.hostname + " : Trying to connect to '" 
+Util.print_ssh_connection (self.node) + "'")
             if self.node.username is not None: #credentials are supplied in 
node file
                 if (self.node.password is not None):                    
-                    g_logger.log (self.node.hostname + " : Trying to connect 
to '" + 
-                                  self.node.username + "@" + 
self.node.hostname + 
-                                  "' using password '" + 
str(self.node.password))
+                    #print 'HERE 1!' +  self.node.hostname + 
str(self.node.port or 22) + self.node.username
                     ssh.connect (self.node.hostname,
                                  port=self.node.port or 22,
                                  username=self.node.username,
                                  password=self.node.password,
                                  timeout=10)
                 else:
-                    g_logger.log (self.node.hostname + " : Trying to connect 
to '" + 
-                                  self.node.username + "@" + 
self.node.hostname + "'")
+                    #print 'HERE 2!' +  self.node.hostname + 
str(self.node.port or 22) + self.node.username
                     ssh.connect (self.node.hostname,
                                  port=self.node.port or 22,
-                                 username=self.node.username,
-                                 timeout=10)                    
-                    
-
+                                 self.node.username,
+                                 timeout=10)                                   
     
             elif ("" != g_configuration.ssh_username):
-                g_logger.log (self.node.hostname + " : Trying to connect to '" 
+ 
-                          g_configuration.ssh_username + "@" + 
self.node.hostname + 
-                          "' using password '" + g_configuration.ssh_password+ 
-                          "' and private keyfile '" +str(keyfile)+ "'")
+                g_logger.log (self.node.hostname + " : Using private keyfile 
'" +str(keyfile)+ "'")
                 ssh.connect (self.node.hostname,
                        port=self.node.port or 22,
                                        username=g_configuration.ssh_username, 
-                                       password=g_configuration.ssh_password,
+                                       #password=g_configuration.ssh_password,
                                        timeout=10,
                                        key_filename=keyfile)
             else: