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
Merge branch 'master' of ssh://git.planet-lab.org/git/sfa
[sfa.git]
/
sfa
/
server
/
interface.py
diff --git
a/sfa/server/interface.py
b/sfa/server/interface.py
index
b7111e2
..
1ecee51
100644
(file)
--- a/
sfa/server/interface.py
+++ b/
sfa/server/interface.py
@@
-1,13
+1,6
@@
-import traceback
-import os.path
-
from sfa.util.faults import *
from sfa.util.storage import XmlStorage
from sfa.util.faults import *
from sfa.util.storage import XmlStorage
-from sfa.util.xrn import get_authority, hrn_to_urn
-from sfa.util.record import SfaRecord
import sfa.util.xmlrpcprotocol as xmlrpcprotocol
import sfa.util.xmlrpcprotocol as xmlrpcprotocol
-import sfa.util.soapprotocol as soapprotocol
-from sfa.trust.gid import GID
# GeniLight client support is optional
try:
# GeniLight client support is optional
try:
@@
-15,10
+8,11
@@
try:
except ImportError:
GeniClientLight = None
except ImportError:
GeniClientLight = None
-
-
class Interface:
class Interface:
-
+ """
+ Interface to another SFA service, typically a peer, or the local aggregate
+ can retrieve a xmlrpclib.ServerProxy object for issuing calls there
+ """
def __init__(self, hrn, addr, port, client_type='sfa'):
self.hrn = hrn
self.addr = addr
def __init__(self, hrn, addr, port, client_type='sfa'):
self.hrn = hrn
self.addr = addr
@@
-70,7
+64,7
@@
class Interfaces(dict):
required_fields = self.default_fields.keys()
for record in records:
required_fields = self.default_fields.keys()
for record in records:
- if not set(required_fields).issubset(record.keys()):
+ if not
record or not
set(required_fields).issubset(record.keys()):
continue
# port is appended onto the domain, before the path. Should look like:
# http://domain:port/path
continue
# port is appended onto the domain, before the path. Should look like:
# http://domain:port/path