Fix distribution credentials

problem with /register creating the wrong url for authz creds, and the creation of the credz for the distribution destination had a syntax error. TODO: distribution test needed for this. Signed-off-by: Jim Klo <jim.klo@sri.com>
jimklo · May 18, 2012 · 209e4fc · 209e4fc
1 parent fc7a30f
commit 209e4fc
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/LR/lr/controllers/distribute.py b/LR/lr/controllers/distribute.py
@@ -183,7 +183,7 @@ def doDistribution(connectionInfo, server, sourceUrl):
 
             credential = sourceLRNode.getDistributeCredentialFor(destinationUrl)
             if credential is not None:
-                parsedUrl = urlparse.urlparse()
+                parsedUrl = urlparse.urlparse(destinationUrl)
                 destinationUrl = destinationUrl.replace(parsedUrl.netloc, "{0}:{1}@{2}".format(
                                                 credential['username'], credential['password'], parsedUrl.netloc))
 

diff --git a/LR/lr/controllers/register.py b/LR/lr/controllers/register.py
@@ -31,7 +31,7 @@ def _publishConnection(self,destUrl,username,password,contact):
             urllib2.urlopen(destUrl)
             conn = NodeConnectivityModel(connectionInfo)
             result = conn.save()
-            destinationURL = urlparse.urljoin(destUrl.strip(),"destination")
+            destinationURL = urlparse.urljoin(destUrl.strip(),"incoming")
             if bool(username) and bool(password):
                 sourceLRNode.addDistributeCredentialFor(destinationURL,username,password)
             if result["OK"]: