/ - Diff - ./kamaki - Greek Research and Technology Network's projects

Revision 6aadd6e1

b/Changelog
7	7	- Restore 2nd level command syntax in shell [#3736]
8	8	- Allow copy of deleted objects by refering to older version [#3737]
9	9	- Add image.add_member missing content-length header
	10	- Do not unpublish by default in all pithos low level requests [#3780]
10	11
11	12	Changes:
12	13

                 content_disposition=None,
                 manifest=None,
                 permissions=None,
                 public=False,
                 public=None,
                 metadata=None,
                 *args, **kwargs):
             """ Full Pithos+ PUT at object level
-...
                 { 'read':[user1, group1, user2, ...],
                 'write':['user3, group2, group3, ...] }
             :param public: (bool) If true, Object is publicly accessible,
                 if false, not
             :param public: (bool) If true, Object is published, False, unpublished
             :param metadata: (dict) Optional user defined metadata in the form
                 {'meta-key-1':'meta-value-1', 'meta-key-2':'meta-value-2', ...}
-...
                             perms += ';' if perms else ''
                             perms += '%s=%s' % (perm_type, ','.join(perm_list))
                 self.set_header('X-Object-Sharing', perms)
             self.set_header('X-Object-Public', public)
             self.set_header('X-Object-Public', public, public is not None)
             if metadata:
                 for key, val in metadata.items():
                     self.set_header('X-Object-Meta-' + key, val)
-...
                 content_disposition=None,
                 source_version=None,
                 permissions=None,
                 public=False,
                 public=None,
                 metadata=None,
                 *args, **kwargs):
             """ Full Pithos+ COPY at object level
-...
                 { 'read':[user1, group1, user2, ...],
                 'write':['user3, group2, group3, ...] }
             :param public: (bool) If true, Object is publicly accessible
             :param public: (bool) If true, Object is published, False, unpublished
             :param metadata: (dict) Optional user defined metadata in the form
                 {'meta-key-1':'meta-value-1', 'meta-key-2':'meta-value-2', ...}
-...
                         perms += ';' if perms else ''
                         perms += '%s=%s' % (perm_type, ','.join(perm_list))
                 self.set_header('X-Object-Sharing', perms)
             self.set_header('X-Object-Public', public)
             self.set_header('X-Object-Public', public, public is not None)
             if metadata:
                 for key, val in metadata.items():
                     self.set_header('X-Object-Meta-' + key, val)
-...
                 content_encoding=None,
                 content_disposition=None,
                 permissions={},
                 public=False,
                 public=None,
                 metadata={},
                 *args, **kwargs):
             """ Full Pithos+ COPY at object level
-...
                 { 'read':[user1, group1, user2, ...],
                 'write':['user3, group2, group3, ...] }
             :param public: (bool) If true, Object is publicly accessible
             :param public: (bool) If true, Object is published, False, unpublished
             :param metadata: (dict) Optional user defined metadata in the form
                 {'meta-key-1':'meta-value-1', 'meta-key-2':'meta-value-2', ...}
-...
                         perms += ';' if perms else ''
                         perms += '%s=%s' % (perm_type, ','.join(perm_list))
                 self.set_header('X-Object-Sharing', perms)
             self.set_header('X-Object-Public', public)
             self.set_header('X-Object-Public', public, public is not None)
             if metadata:
                 for key, val in metadata.items():
                     self.set_header('X-Object-Meta-' + key, val)
-...
                 object_bytes=None,
                 manifest=None,
                 permissions={},
                 public=False,
                 public=None,
                 metadata={},
                 *args, **kwargs):
             """ Full Pithos+ POST at object level
-...
                 { 'read':[user1, group1, user2, ...],
                 'write':['user3, group2, group3, ...] }
             :param public: (bool) If true, Object is publicly accessible
             :param public: (bool) If true, Object is published, False, unpublished
             :param metadata: (dict) Optional user defined metadata in the form
                 {'meta-key-1':'meta-value-1', 'meta-key-2':'meta-value-2', ...}
-...
                         perms += ';' if perms else ''
                         perms += '%s=%s' % (perm_type, ','.join(perm_list))
                 self.set_header('X-Object-Sharing', perms)
             self.set_header('X-Object-Public', public)
             self.set_header('X-Object-Public', public, public is not None)
             for key, val in metadata.items():
                 self.set_header('X-Object-Meta-' + key, val)

             read_perms = ['u1', 'g1', 'u2', 'g2']
             write_perms = ['u1', 'g1']
             for kwargs in (
                     dict(read_permition=read_perms, write_permition=write_perms),
                     dict(read_permition=read_perms),
                     dict(write_permition=write_perms),
                     dict(read_permission=read_perms, write_permission=write_perms),
                     dict(read_permission=read_perms),
                     dict(write_permission=write_perms),
                     dict()):
                 self.client.set_object_sharing(obj, **kwargs)
                 kwargs['read'] = kwargs.pop('read_permition', '')
                 kwargs['write'] = kwargs.pop('write_permition', '')
                 kwargs['read'] = kwargs.pop('read_permission', '')
                 kwargs['write'] = kwargs.pop('write_permission', '')
                 self.assertEqual(
                     OP.mock_calls[-1],
                     call(obj, update=True, permissions=kwargs))

Also available in: Unified diff

Synnefo » ./kamaki

Revision 6aadd6e1