git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix positon of port number when generating interface url
[sfa.git]
/
sfa
/
server
/
interface.py
diff --git
a/sfa/server/interface.py
b/sfa/server/interface.py
index
9a1ceea
..
e923057
100644
(file)
--- a/
sfa/server/interface.py
+++ b/
sfa/server/interface.py
@@
-5,7
+5,7
@@
from sfa.util.faults import *
from sfa.util.storage import *
from sfa.util.faults import *
from sfa.util.storage import *
-from sfa.util.
namespace import *
+from sfa.util.
xrn import get_authority, hrn_to_urn
from sfa.trust.gid import GID
from sfa.util.record import SfaRecord
import traceback
from sfa.trust.gid import GID
from sfa.util.record import SfaRecord
import traceback
@@
-60,8
+60,12
@@
class Interfaces(dict):
interfaces = [self.interfaces]
# set the url and urn
for interface in interfaces:
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']
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')
interface['url'] = url
interface['urn'] = hrn_to_urn(hrn, 'authority')