---
pykickstart/handlers/control.py | 80 +++++++++++++++++++++++++++++++++++++++
pykickstart/handlers/f18.py | 24 ++++++++++++
pykickstart/version.py | 5 +-
tests/version.py | 6 ++-
4 files changed, 112 insertions(+), 3 deletions(-)
create mode 100644 pykickstart/handlers/f18.py
diff --git a/pykickstart/handlers/control.py b/pykickstart/handlers/control.py
index 7901ce3..ab610b9 100644
--- a/pykickstart/handlers/control.py
+++ b/pykickstart/handlers/control.py
@@ -884,6 +884,67 @@ commandMap = {
"zfcp": zfcp.F14_ZFCP,
},
+ # based on f17
+ F18: {
+ "auth": authconfig.FC3_Authconfig,
+ "authconfig": authconfig.FC3_Authconfig,
+ "autopart": autopart.F17_AutoPart,
+ "autostep": autostep.FC3_AutoStep,
+ "bootloader": bootloader.F17_Bootloader,
+ "btrfs": btrfs.F17_BTRFS,
+ "cdrom": method.F14_Method,
+ "clearpart": clearpart.F17_ClearPart,
+ "cmdline": displaymode.FC3_DisplayMode,
+ "device": device.F8_Device,
+ "deviceprobe": deviceprobe.FC3_DeviceProbe,
+ "dmraid": dmraid.FC6_DmRaid,
+ "driverdisk": driverdisk.F14_DriverDisk,
+ "fcoe": fcoe.F13_Fcoe,
+ "firewall": firewall.F14_Firewall,
+ "firstboot": firstboot.FC3_Firstboot,
+ "graphical": displaymode.FC3_DisplayMode,
+ "group": group.F12_Group,
+ "halt": reboot.FC6_Reboot,
+ "harddrive": method.F14_Method,
+ "ignoredisk": ignoredisk.F14_IgnoreDisk,
+ "install": upgrade.F11_Upgrade,
+ "iscsi": iscsi.F17_Iscsi,
+ "iscsiname": iscsiname.FC6_IscsiName,
+ "keyboard": keyboard.FC3_Keyboard,
+ "lang": lang.FC3_Lang,
+ "logging": logging.FC6_Logging,
+ "logvol": logvol.F17_LogVol,
+ "mediacheck": mediacheck.FC4_MediaCheck,
+ "monitor": monitor.F10_Monitor,
+ "multipath": multipath.FC6_MultiPath,
+ "network": network.F16_Network,
+ "nfs": method.F14_Method,
+ "part": partition.F17_Partition,
+ "partition": partition.F17_Partition,
+ "poweroff": reboot.FC6_Reboot,
+ "raid": raid.F15_Raid,
+ "reboot": reboot.FC6_Reboot,
+ "repo": repo.F15_Repo,
+ "rescue": rescue.F10_Rescue,
+ "rootpw": rootpw.F8_RootPw,
+ "selinux": selinux.FC3_SELinux,
+ "services": services.FC6_Services,
+ "shutdown": reboot.FC6_Reboot,
+ "skipx": skipx.FC3_SkipX,
+ "sshpw": sshpw.F13_SshPw,
+ "text": displaymode.FC3_DisplayMode,
+ "timezone": timezone.FC6_Timezone,
+ "updates": updates.F7_Updates,
+ "upgrade": upgrade.F11_Upgrade,
+ "url": method.F14_Method,
+ "user": user.F12_User,
+ "vnc": vnc.F9_Vnc,
+ "volgroup": volgroup.FC16_VolGroup,
+ "xconfig": xconfig.F14_XConfig,
+ "zerombr": zerombr.F9_ZeroMbr,
+ "zfcp": zfcp.F14_ZFCP,
+ },
+
# based on fc1
RHEL3: {
"auth": authconfig.FC3_Authconfig,
@@ -1394,6 +1455,25 @@ dataMap = {
"VolGroupData": volgroup.FC16_VolGroupData,
"ZFCPData": zfcp.F14_ZFCPData,
},
+ F18: {
+ "BTRFSData": btrfs.F17_BTRFSData,
+ "DriverDiskData": driverdisk.F14_DriverDiskData,
+ "DeviceData": device.F8_DeviceData,
+ "DmRaidData": dmraid.FC6_DmRaidData,
+ "FcoeData": fcoe.F13_FcoeData,
+ "GroupData": group.F12_GroupData,
+ "IscsiData": iscsi.F17_IscsiData,
+ "LogVolData": logvol.F17_LogVolData,
+ "MultiPathData": multipath.FC6_MultiPathData,
+ "NetworkData": network.F16_NetworkData,
+ "PartData": partition.F17_PartData,
+ "RaidData": raid.F15_RaidData,
+ "RepoData": repo.F15_RepoData,
+ "SshPwData": sshpw.F13_SshPwData,
+ "UserData": user.F12_UserData,
+ "VolGroupData": volgroup.FC16_VolGroupData,
+ "ZFCPData": zfcp.F14_ZFCPData,
+ },
RHEL3: {
"DriverDiskData": driverdisk.FC3_DriverDiskData,
"LogVolData": logvol.FC3_LogVolData,
diff --git a/pykickstart/handlers/f18.py b/pykickstart/handlers/f18.py
new file mode 100644
index 0000000..555c979
--- /dev/null
+++ b/pykickstart/handlers/f18.py
@@ -0,0 +1,24 @@
+#
+# Vratislav Podzimek <vpodzime@xxxxxxxxxx>
+#
+# Copyright 2012 Red Hat, Inc.
+#
+# This copyrighted material is made available to anyone wishing to use, modify,
+# copy, or redistribute it subject to the terms and conditions of the GNU
+# General Public License v.2. This program is distributed in the hope that it
+# will be useful, but WITHOUT ANY WARRANTY expressed or implied, including the
+# implied warranties of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along with
+# this program; if not, write to the Free Software Foundation, Inc., 51
+# Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. Any Red Hat
+# trademarks that are incorporated in the source code or documentation are not
+# subject to the GNU General Public License and may only be used or replicated
+# with the express permission of Red Hat, Inc.
+#
+from pykickstart.base import *
+from pykickstart.version import *
+
+class F18Handler(BaseHandler):
+ version = F18
diff --git a/pykickstart/version.py b/pykickstart/version.py
index eadbc30..75593b4 100644
--- a/pykickstart/version.py
+++ b/pykickstart/version.py
@@ -71,17 +71,18 @@ F14 = 12000
F15 = 13000
F16 = 14000
F17 = 15000
+F18 = 16000
RHEL7 = 15100
# This always points at the latest version and is the default.
-DEVEL = F17
+DEVEL = F18
# A one-to-one mapping from string representations to version numbers.
versionMap = {
"DEVEL": DEVEL,
"FC3": FC3, "FC4": FC4, "FC5": FC5, "FC6": FC6, "F7": F7, "F8": F8,
"F9": F9, "F10": F10, "F11": F11, "F12": F12, "F13": F13,
- "F14": F14, "F15": F15, "F16": F16, "F17": F17,
+ "F14": F14, "F15": F15, "F16": F16, "F17": F17, "F18": F18,
"RHEL3": RHEL3, "RHEL4": RHEL4, "RHEL5": RHEL5, "RHEL6": RHEL6,
"RHEL7": RHEL7
}
diff --git a/tests/version.py b/tests/version.py
index 02671f5..6d30023 100644
--- a/tests/version.py
+++ b/tests/version.py
@@ -84,6 +84,9 @@ class StringToVersion_TestCase(CommandTest):
# pass - F17
self.assertEqual(stringToVersion("Fedora 17"), F17)
self.assertEqual(stringToVersion("F17"), F17)
+ # pass - F18
+ self.assertEqual(stringToVersion("Fedora 18"), F18)
+ self.assertEqual(stringToVersion("F18"), F18)
# pass - RHEL3
self.assertEqual(stringToVersion("Red Hat Enterprise Linux 3"), RHEL3)
@@ -164,7 +167,8 @@ class VersionToString_TestCase(CommandTest):
self.assertEqual(versionToString(F15, skipDevel=True), "F15")
self.assertEqual(versionToString(F16, skipDevel=True), "F16")
self.assertEqual(versionToString(F17, skipDevel=True), "F17")
- self.assertEqual(versionToString(F17, skipDevel=False), "DEVEL")
+ self.assertEqual(versionToString(F18, skipDevel=True), "F18")
+ self.assertEqual(versionToString(F18, skipDevel=False), "DEVEL")
# RHEL series
self.assertEqual(versionToString(RHEL3), "RHEL3")
self.assertEqual(versionToString(RHEL4), "RHEL4")
--
1.7.4.4
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
