cosmetic

[sfa.git] / sfa / server / interface.py

diff --git a/sfa/server/interface.py b/sfa/server/interface.py
index 7ae027d..32f1015 100644 (file)
--- a/sfa/server/interface.py
+++ b/sfa/server/interface.py
@@ -1,11 +1,7 @@
-#
-### $Id: interface.py 17583 2010-04-06 15:01:08Z tmack $
-### $URL: https://svn.planet-lab.org/svn/sfa/trunk/sfa/server/interface.py $
-#
 
 from sfa.util.faults import *
 from sfa.util.storage import *
-from sfa.util.namespace import get_authority, hrn_to_urn
+from sfa.util.xrn import get_authority, hrn_to_urn
 from sfa.trust.gid import GID
 from sfa.util.record import SfaRecord
 import traceback
@@ -60,8 +56,12 @@ class Interfaces(dict):
             interfaces = [self.interfaces]
         # set the url and urn 
         for interface in interfaces:
+            # port is appended onto the domain, before the path. Should look like:
+            # http://domain:port/path
             hrn, address, port = interface['hrn'], interface['addr'], interface['port']
-            url = 'http://%(address)s:%(port)s' % locals()
+            address_parts = address.split('/')
+            address_parts[0] = address_parts[0] + ":" + str(port)
+            url =  "http://%s" %  "/".join(address_parts)
             interface['url'] = url
             interface['urn'] = hrn_to_urn(hrn, 'authority')