From: Samuel Just <sjust@redhat.com>
Date: Mon, 4 Apr 2016 17:52:36 +0000 (-0700)
Subject: ceph_manager: extend do_put and do_get to allow a namespace
X-Git-Tag: v10.2.6~165^2^2~106^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=670ca43dfc86883c6b5328e40a473ec1fcc62fa1;p=ceph.git

ceph_manager: extend do_put and do_get to allow a namespace

Signed-off-by: Samuel Just <sjust@redhat.com>
---

diff --git a/tasks/ceph_manager.py b/tasks/ceph_manager.py
index 67b1b70ecf6..3d4d8e26aaa 100644
--- a/tasks/ceph_manager.py
+++ b/tasks/ceph_manager.py
@@ -873,26 +873,30 @@ class CephManager:
             args.append('--no-cleanup')
         return self.do_rados(self.controller, map(str, args))
 
-    def do_put(self, pool, obj, fname):
+    def do_put(self, pool, obj, fname, namespace=None):
         """
         Implement rados put operation
         """
+        args = ['-p', pool]
+        if namespace is not None:
+            args += ['-N', namespace]
+        args += [
+            'put',
+            obj,
+            fname
+        ]
         return self.do_rados(
             self.controller,
-            [
-                '-p',
-                pool,
-                'put',
-                obj,
-                fname
-                ]
+            args
             )
 
-    def do_get(self, pool, obj, fname='/dev/null'):
+    def do_get(self, pool, obj, fname='/dev/null', namespace=None):
         """
         Implement rados get operation
         """
         args = ['-p', pool]
+        if namespace is not None:
+            args += ['-N', namespace]
         args += [
             'get',
             obj,