From: John Spray <john.spray@redhat.com>
Date: Wed, 11 Nov 2015 14:22:36 +0000 (+0000)
Subject: pybind/cephfs: exception on extra init args
X-Git-Tag: v10.0.3~16^2~4
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d72ab0e49bd56b15cd08139683ef3b890847623f;p=ceph.git

pybind/cephfs: exception on extra init args

Signed-off-by: John Spray <john.spray@redhat.com>
---

diff --git a/src/pybind/cephfs.py b/src/pybind/cephfs.py
index 747f273b9722..71c0d40e74a5 100644
--- a/src/pybind/cephfs.py
+++ b/src/pybind/cephfs.py
@@ -200,6 +200,9 @@ class LibCephFS(object):
 
         self.state = "uninitialized"
         if rados_inst is not None:
+            if auth_id is not None or conffile is not None or conf is not None:
+                raise InvalidValue("May not pass RADOS instance as well as other configuration")
+
             return self.create_with_rados(rados_inst)
         else:
             return self.create(conf, conffile, auth_id)