Merge remote-tracking branch 'origin/pycurl' into planetlab-4_0-branch

[plcapi.git] / PLC / Peers.py

diff --git a/PLC/Peers.py b/PLC/Peers.py
index ed62c99..0973c3d 100644 (file)
--- a/PLC/Peers.py
+++ b/PLC/Peers.py
@@ -75,11 +75,11 @@ class Peer(Row):
 
         # Remove all related entities
         for obj in \
-                Slices(self.api, self['slice_ids'], peer_id = self['peer_id']) + \
-                Keys(self.api, self['key_ids'], peer_id = self['peer_id']) + \
-                Persons(self.api, self['person_ids'], peer_id = self['peer_id']) + \
-                Nodes(self.api, self['node_ids'], peer_id = self['peer_id']) + \
-                Sites(self.api, self['site_ids'], peer_id = self['peer_id']):
+            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)
 
@@ -135,30 +135,6 @@ class Peer(Row):
              'peer_node_id': peer_node_id},
             commit = commit)
 
-    def add_slice_attribute_type(self, slice_attribute_type, peer_attribute_type_id, commit = True):
-        """
-        Associate a local slice attribute type entry with this peer.
-        """
-
-        add = Row.add_object(SliceAttributeType, 'peer_slice_attribute_type')
-        add(self, slice_attribute_type,
-            {'peer_id': self['peer_id'],
-             'attribute_type_id': slice_attribute_type['attribute_type_id'],
-             'peer_attribute_type_id': peer_attribute_type_id},
-            commit = commit)
-
-    def add_slice_attribute(self, slice_attribute, peer_slice_attribute_id, commit = True):
-        """
-        Associate a local slice_attribute entry with this peer.
-        """
-
-        add = Row.add_object(SliceAttribute, 'peer_slice_attribute')
-        add(self, slice_attribute,
-            {'peer_id': self['peer_id'],
-             'slice_attribute_id': slice_attribute['slice_attribute_id'],
-             'peer_slice_attribute_id': peer_slice_attribute_id},
-            commit = commit)
-
     def add_slice(self, slice, peer_slice_id, commit = True):
         """
         Associate a local slice entry with this peer.
@@ -190,9 +166,10 @@ class Peer(Row):
 
         def wrapper(*args, **kwds):
             from PLC.GPG import gpg_sign
-            signature = gpg_sign(methodname, args,
+            signature = gpg_sign(args,
                                  self.api.config.PLC_ROOT_GPG_KEY,
-                                 self.api.config.PLC_ROOT_GPG_KEY_PUB)
+                                 self.api.config.PLC_ROOT_GPG_KEY_PUB,
+                                 methodname)
 
             auth = {'AuthMethod': "gpg",
                     'name': self.api.config.PLC_NAME,
@@ -250,9 +227,9 @@ class Peers (Table):
                 ints = filter(lambda x: isinstance(x, (int, long)), peer_filter)
                 strs = filter(lambda x: isinstance(x, StringTypes), peer_filter)
                 peer_filter = Filter(Peer.fields, {'peer_id': ints, 'peername': strs})
-                sql += " AND (%s)" % peer_filter.sql(api, "OR")
+                sql += " AND (%s) %s" % peer_filter.sql(api, "OR")
             elif isinstance(peer_filter, dict):
                 peer_filter = Filter(Peer.fields, peer_filter)
-                sql += " AND (%s)" % peer_filter.sql(api, "AND")
+                sql += " AND (%s) %s" % peer_filter.sql(api, "AND")
 
        self.selectall(sql)