Merge pull request #68 from huongpi/create_and_modify_user_with_default_placement_and_placement_tags

RGW: Create and modify user with default placement and placement tags

Author: dyarnell

rgwadmin/rgw.py

@@ -265,7 +265,7 @@ def get_users(self):
 
     def create_user(self, uid, display_name, email=None, key_type='s3',
                     access_key=None, secret_key=None, user_caps=None,
-                    generate_key=True, max_buckets=None, suspended=False):
+                    generate_key=True, max_buckets=None, suspended=False, default_placement=None, placement_tags=None):
         parameters = 'uid=%s&display-name=%s' % (uid, display_name)
         if email is not None:
             parameters += '&email=%s' % email
@@ -281,6 +281,10 @@ def create_user(self, uid, display_name, email=None, key_type='s3',
         if max_buckets is not None:
             parameters += '&max-buckets=%s' % max_buckets
         parameters += '&suspended=%s' % suspended
+        if default_placement is not None:
+            parameters += '&default-placement=%s' % default_placement
+        if placement_tags is not None:
+            parameters += '&placement-tags=%s' % placement_tags
         return self.request('put', '/%s/user?format=%s&%s' %
                             (self._admin, self._response, parameters))
 
@@ -312,7 +316,7 @@ def trim_usage(self, uid=None, start=None, end=None, remove_all=False):
 
     def modify_user(self, uid, display_name=None, email=None, key_type='s3',
                     access_key=None, secret_key=None, user_caps=None,
-                    generate_key=False, max_buckets=None, suspended=None, placement_tags=None):
+                    generate_key=False, max_buckets=None, suspended=None, default_placement=None, placement_tags=None):
         parameters = 'uid=%s' % uid
         if display_name is not None:
             parameters += '&display-name=%s' % display_name
@@ -331,6 +335,8 @@ def modify_user(self, uid, display_name=None, email=None, key_type='s3',
             parameters += '&max-buckets=%s' % max_buckets
         if suspended is not None:
             parameters += '&suspended=%s' % suspended
+        if default_placement is not None:
+            parameters += '&default-placement=%s' % default_placement
         if placement_tags is not None:
             parameters += '&placement-tags=%s' % placement_tags
         return self.request('post', '/%s/user?format=%s&%s' %