From: Vicente Cheng <freeze.bilsted@gmail.com>
Date: Fri, 18 Sep 2015 02:23:19 +0000 (+0800)
Subject: tests: ceph-disk: modified the destroy_osd test function.
X-Git-Tag: v10.0.1~53^2~9
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=06aeec9e5e1207fcbbd55072d993333f44c4b281;p=ceph.git

tests: ceph-disk: modified the destroy_osd test function.

  - use the new implementation (ceph-disk deactivate/destroy) instead of step by step remove

Signed-off-by: Vicente Cheng <freeze.bilsted@gmail.com>
---

diff --git a/qa/workunits/ceph-disk/ceph-disk-test.py b/qa/workunits/ceph-disk/ceph-disk-test.py
index a4cb5620a6ce..53f46128fd6d 100644
--- a/qa/workunits/ceph-disk/ceph-disk-test.py
+++ b/qa/workunits/ceph-disk/ceph-disk-test.py
@@ -134,10 +134,8 @@ class CephDisk:
         except:
             pass
         self.sh("""
-        ceph osd down {id}
-        ceph osd rm {id}
-        ceph auth del osd.{id}
-        ceph osd crush rm osd.{id}
+        ceph-disk deactivate --deactivate-by-id {id}
+        ceph-disk destroy --destroy-by-id {id}
         """.format(id=id))
 
     @staticmethod