[rhel7-branch][pykickstart] Add clearpart --cdl option. (#1232849)
Samantha N. Bueno
sbueno+anaconda at redhat.com
Fri Jun 19 14:59:31 UTC 2015
Specifying this option in a ks file will ensure that any LDL DASDs
will be (re)formatted to CDL format.
Resolves: rhbz#1232849
---
pykickstart/commands/clearpart.py | 5 +++++
tests/commands/clearpart.py | 6 ++++++
2 files changed, 11 insertions(+)
diff --git a/pykickstart/commands/clearpart.py b/pykickstart/commands/clearpart.py
index 0164215..a63b258 100644
--- a/pykickstart/commands/clearpart.py
+++ b/pykickstart/commands/clearpart.py
@@ -113,16 +113,21 @@ class F21_ClearPart(F17_ClearPart):
def __init__(self, *args, **kwargs):
super(F21_ClearPart, self).__init__(*args, **kwargs)
self.disklabel = kwargs.get("disklabel", "")
+ self.cdl = kwargs.get("cdl", False)
def __str__(self):
s = super(F21_ClearPart, self).__str__()
if s and self.disklabel:
s = s.rstrip()
s += " --disklabel=%s\n" % self.disklabel
+ if s and self.cdl:
+ s = s.rstrip()
+ s += " --cdl\n"
return s
def _getParser(self):
op = F17_ClearPart._getParser(self)
op.add_option("--disklabel", dest="disklabel", default="")
+ op.add_option("--cdl", dest="cdl", action="store_true", default=False)
return op
diff --git a/tests/commands/clearpart.py b/tests/commands/clearpart.py
index e044085..0b493c8 100644
--- a/tests/commands/clearpart.py
+++ b/tests/commands/clearpart.py
@@ -43,5 +43,11 @@ class F21_TestCase(F17_TestCase):
"clearpart --all --initlabel --disklabel=gpt\n")
self.assert_parse_error("clearpart --all --disklabel")
+ self.assert_parse("clearpart --all --cdl", "clearpart --all --cdl \n")
+ self.assert_parse("clearpart --all --cdl --drives=dasda,dasdb,dasdc", "clearpart --all --cdl --drives=dasda,dasdb,dasdc \n")
+
+ # cdl should not take a value
+ self.assert_parse_error("clearpart --cdl=foo")
+
if __name__ == "__main__":
unittest.main()
--
1.9.3
More information about the anaconda-patches
mailing list