From: Travis Rhoden <trhoden@redhat.com>
Date: Thu, 9 Jul 2015 23:48:20 +0000 (-0700)
Subject: [RM-12168] Don't use store_true and default=None
X-Git-Tag: v1.5.26~10^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=20c025703b79f6960cba7edeb602eb0b2c84a3a2;p=ceph-deploy.git

[RM-12168] Don't use store_true and default=None

Not sure why this was ever seen as necessary.  With the store_true
action, it will be False if not present, True if passed on the CLI.

We just need to the boolean value, and there is no need to set
the flag to None instead of False when it is not present.

Fixes: #12168

Signed-off-by: Travis Rhoden <trhoden@redhat.com>
---

diff --git a/ceph_deploy/osd.py b/ceph_deploy/osd.py
index 88bbc2e..f5c0bc7 100644
--- a/ceph_deploy/osd.py
+++ b/ceph_deploy/osd.py
@@ -673,7 +673,7 @@ def make(parser):
         )
     osd_create.add_argument(
         '--zap-disk',
-        action='store_true', default=None,
+        action='store_true',
         help='destroy existing partition table and content for DISK',
         )
     osd_create.add_argument(
@@ -688,7 +688,7 @@ def make(parser):
         )
     osd_create.add_argument(
         '--dmcrypt',
-        action='store_true', default=None,
+        action='store_true',
         help='use dm-crypt on DISK',
         )
     osd_create.add_argument(
@@ -711,7 +711,7 @@ def make(parser):
         )
     osd_prepare.add_argument(
         '--zap-disk',
-        action='store_true', default=None,
+        action='store_true',
         help='destroy existing partition table and content for DISK',
         )
     osd_prepare.add_argument(
@@ -726,7 +726,7 @@ def make(parser):
         )
     osd_prepare.add_argument(
         '--dmcrypt',
-        action='store_true', default=None,
+        action='store_true',
         help='use dm-crypt on DISK',
         )
     osd_prepare.add_argument(
@@ -796,7 +796,7 @@ def make_disk(parser):
         )
     disk_prepare.add_argument(
         '--zap-disk',
-        action='store_true', default=None,
+        action='store_true',
         help='destroy existing partition table and content for DISK',
         )
     disk_prepare.add_argument(
@@ -811,7 +811,7 @@ def make_disk(parser):
         )
     disk_prepare.add_argument(
         '--dmcrypt',
-        action='store_true', default=None,
+        action='store_true',
         help='use dm-crypt on DISK',
         )
     disk_prepare.add_argument(
diff --git a/ceph_deploy/tests/parser/test_disk.py b/ceph_deploy/tests/parser/test_disk.py
index 40f8bfc..fa25423 100644
--- a/ceph_deploy/tests/parser/test_disk.py
+++ b/ceph_deploy/tests/parser/test_disk.py
@@ -57,7 +57,6 @@ class TestParserDisk(object):
         out, err = capsys.readouterr()
         assert 'usage: ceph-deploy disk prepare' in out
 
-    @pytest.mark.skipif(reason="http://tracker.ceph.com/issues/12168")
     def test_disk_prepare_zap_default_false(self):
         args = self.parser.parse_args('disk prepare host1:sdb'.split())
         assert args.zap_disk is False
@@ -80,7 +79,6 @@ class TestParserDisk(object):
         out, err = capsys.readouterr()
         assert 'invalid choice' in err
 
-    @pytest.mark.skipif(reason="http://tracker.ceph.com/issues/12168")
     def test_disk_prepare_dmcrypt_default_false(self):
         args = self.parser.parse_args('disk prepare host1:sdb'.split())
         assert args.dmcrypt is False
diff --git a/ceph_deploy/tests/parser/test_osd.py b/ceph_deploy/tests/parser/test_osd.py
index a65dbea..e994860 100644
--- a/ceph_deploy/tests/parser/test_osd.py
+++ b/ceph_deploy/tests/parser/test_osd.py
@@ -74,7 +74,6 @@ class TestParserOSD(object):
         hosts = [x[0] for x in args.disk]
         assert hosts == hostnames
 
-    @pytest.mark.skipif(reason="http://tracker.ceph.com/issues/12168")
     def test_osd_create_zap_default_false(self):
         args = self.parser.parse_args('osd create host1:sdb'.split())
         assert args.zap_disk is False
@@ -97,7 +96,6 @@ class TestParserOSD(object):
         out, err = capsys.readouterr()
         assert 'invalid choice' in err
 
-    @pytest.mark.skipif(reason="http://tracker.ceph.com/issues/12168")
     def test_osd_create_dmcrypt_default_false(self):
         args = self.parser.parse_args('osd create host1:sdb'.split())
         assert args.dmcrypt is False
@@ -120,7 +118,6 @@ class TestParserOSD(object):
         out, err = capsys.readouterr()
         assert 'usage: ceph-deploy osd prepare' in out
 
-    @pytest.mark.skipif(reason="http://tracker.ceph.com/issues/12168")
     def test_osd_prepare_zap_default_false(self):
         args = self.parser.parse_args('osd prepare host1:sdb'.split())
         assert args.zap_disk is False
@@ -143,7 +140,6 @@ class TestParserOSD(object):
         out, err = capsys.readouterr()
         assert 'invalid choice' in err
 
-    @pytest.mark.skipif(reason="http://tracker.ceph.com/issues/12168")
     def test_osd_prepare_dmcrypt_default_false(self):
         args = self.parser.parse_args('osd prepare host1:sdb'.split())
         assert args.dmcrypt is False