X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=PLC%2FPeers.py;h=21c9dfd35dba69b2e4a36e50a6d8f0628624d2de;hb=34e1a55391f712d24f3932b98c7f26fcbd84baea;hp=393be62792e9add6428a88bba3f10b9e7123a8d3;hpb=a1da37dce637d82f9c5e6e4ec7ca82d27a18d9bd;p=plcapi.git diff --git a/PLC/Peers.py b/PLC/Peers.py index 393be62..21c9dfd 100644 --- a/PLC/Peers.py +++ b/PLC/Peers.py @@ -20,10 +20,6 @@ from PLC.SliceAttributeTypes import SliceAttributeType, SliceAttributeTypes from PLC.SliceAttributes import SliceAttribute, SliceAttributes from PLC.Slices import Slice, Slices -import xmlrpclib -from PLC.PyCurl import PyCurlTransport -from PLC.GPG import gpg_sign - class Peer(Row): """ Stores the list of peering PLCs in the peers table. @@ -32,6 +28,8 @@ class Peer(Row): table_name = 'peers' primary_key = 'peer_id' + join_tables = ['peer_site', 'peer_person', 'peer_key', 'peer_node', + 'peer_slice_attribute_type', 'peer_slice_attribute', 'peer_slice'] fields = { 'peer_id': Parameter (int, "Peer identifier"), 'peername': Parameter (str, "Peer name"), @@ -39,15 +37,24 @@ class Peer(Row): 'key': Parameter(str, "Peer GPG public key"), 'cacert': Parameter(str, "Peer SSL public certificate"), ### cross refs - 'site_ids': Parameter([int], "List of sites for this peer is authoritative"), - 'person_ids': Parameter([int], "List of users for this peer is authoritative"), + 'site_ids': Parameter([int], "List of sites for which this peer is authoritative"), + 'person_ids': Parameter([int], "List of users for which this peer is authoritative"), 'key_ids': Parameter([int], "List of keys for which this peer is authoritative"), 'node_ids': Parameter([int], "List of nodes for which this peer is authoritative"), - 'attribute_type_ids': Parameter([int], "List of slice attribute types for which this peer is authoritative"), - 'slice_attribute_ids': Parameter([int], "List of slice attributes for which this peer is authoritative"), 'slice_ids': Parameter([int], "List of slices for which this peer is authoritative"), } + def validate_peername(self, peername): + if not len(peername): + raise PLCInvalidArgument, "Peer name must be specified" + + conflicts = Peers(self.api, [peername]) + for peer in conflicts: + if 'peer_id' not in self or self['peer_id'] != peer['peer_id']: + raise PLCInvalidArgument, "Peer name already in use" + + return peername + def validate_peer_url(self, url): """ Validate URL. Must be HTTPS. @@ -68,13 +75,11 @@ class Peer(Row): # Remove all related entities for obj in \ - Sites(self.api, self['site_ids']) + \ - Persons(self.api, self['person_ids']) + \ - Keys(self.api, self['key_ids']) + \ - Nodes(self.api, self['node_ids']) + \ - SliceAttributeTypes(self.api, self['attribute_type_ids']) + \ - SliceAttributes(self.api, self['slice_attribute_ids']) + \ - Slices(self.api, self['slice_ids']): + Slices(self.api, self['slice_ids']) + \ + Keys(self.api, self['key_ids']) + \ + Persons(self.api, self['person_ids']) + \ + Nodes(self.api, self['node_ids']) + \ + Sites(self.api, self['site_ids']): assert obj['peer_id'] == self['peer_id'] obj.delete(commit = False) @@ -82,11 +87,73 @@ class Peer(Row): self['deleted'] = True self.sync(commit) + def add_site(self, site, peer_site_id, commit = True): + """ + Associate a local site entry with this peer. + """ + + add = Row.add_object(Site, 'peer_site') + add(self, site, + {'peer_id': self['peer_id'], + 'site_id': site['site_id'], + 'peer_site_id': peer_site_id}, + commit = commit) + + def add_person(self, person, peer_person_id, commit = True): + """ + Associate a local user entry with this peer. + """ + + add = Row.add_object(Person, 'peer_person') + add(self, person, + {'peer_id': self['peer_id'], + 'person_id': person['person_id'], + 'peer_person_id': peer_person_id}, + commit = commit) + + def add_key(self, key, peer_key_id, commit = True): + """ + Associate a local key entry with this peer. + """ + + add = Row.add_object(Key, 'peer_key') + add(self, key, + {'peer_id': self['peer_id'], + 'key_id': key['key_id'], + 'peer_key_id': peer_key_id}, + commit = commit) + + def add_node(self, node, peer_node_id, commit = True): + """ + Associate a local node entry with this peer. + """ + + add = Row.add_object(Node, 'peer_node') + add(self, node, + {'peer_id': self['peer_id'], + 'node_id': node['node_id'], + 'peer_node_id': peer_node_id}, + commit = commit) + + def add_slice(self, slice, peer_slice_id, commit = True): + """ + Associate a local slice entry with this peer. + """ + + add = Row.add_object(Slice, 'peer_slice') + add(self, slice, + {'peer_id': self['peer_id'], + 'slice_id': slice['slice_id'], + 'peer_slice_id': peer_slice_id}, + commit = commit) + def connect(self, **kwds): """ Connect to this peer via XML-RPC. """ + import xmlrpclib + from PLC.PyCurl import PyCurlTransport self.server = xmlrpclib.ServerProxy(self['peer_url'], PyCurlTransport(self['peer_url'], self['cacert']), allow_none = 1, **kwds) @@ -98,6 +165,7 @@ class Peer(Row): """ def wrapper(*args, **kwds): + from PLC.GPG import gpg_sign signature = gpg_sign(methodname, args, self.api.config.PLC_ROOT_GPG_KEY, self.api.config.PLC_ROOT_GPG_KEY_PUB) @@ -113,27 +181,33 @@ class Peer(Row): return wrapper - def __getattr__(self, methodname): + def __getattr__(self, attr): """ - Fetch a callable for the specified method. + Returns a callable API function if attr is the name of a + PLCAPI function; otherwise, returns the specified attribute. """ - function = getattr(self.server, methodname) - try: - # Figure out if the function is a PLCAPI function and - # requires an authentication structure as its first - # argument. + # Figure out if the specified attribute is the name of a + # PLCAPI function. If so and the function requires an + # authentication structure as its first argument, return a + # callable that automagically adds an auth struct to the + # call. + methodname = attr api_function = self.api.callable(methodname) if api_function.accepts and \ (isinstance(api_function.accepts[0], PLC.Auth.Auth) or \ (isinstance(api_function.accepts[0], Mixed) and \ - filter(lambda param: isinstance(param, Auth), func.accepts[0]))): - function = self.add_auth(function, methodname) + filter(lambda param: isinstance(param, Auth), api_function.accepts[0]))): + function = getattr(self.server, methodname) + return self.add_auth(function, methodname) except Exception, err: pass - return function + if hasattr(self, attr): + return getattr(self, attr) + else: + raise AttributeError, "type object 'Peer' has no attribute '%s'" % attr class Peers (Table): """