---
pykickstart/handlers/control.py | 79 +++++++++++++++++++++++++++++++++++++++++
pykickstart/version.py | 4 ++-
tests/version.py | 6 +++-
3 files changed, 87 insertions(+), 2 deletions(-)
diff --git a/pykickstart/handlers/control.py b/pykickstart/handlers/control.py
index a3d6408..e3b58bb 100644
--- a/pykickstart/handlers/control.py
+++ b/pykickstart/handlers/control.py
@@ -944,6 +944,66 @@ commandMap = {
"zfcp": zfcp.F14_ZFCP,
},
+ # based on f18
+ F19: {
+ "auth": authconfig.FC3_Authconfig,
+ "authconfig": authconfig.FC3_Authconfig,
+ "autopart": autopart.F18_AutoPart,
+ "autostep": autostep.FC3_AutoStep,
+ "bootloader": bootloader.F18_Bootloader,
+ "btrfs": btrfs.F17_BTRFS,
+ "cdrom": method.F18_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.F18_Reboot,
+ "harddrive": method.F18_Method,
+ "ignoredisk": ignoredisk.F14_IgnoreDisk,
+ "install": upgrade.F11_Upgrade,
+ "iscsi": iscsi.F17_Iscsi,
+ "iscsiname": iscsiname.FC6_IscsiName,
+ "keyboard": keyboard.F18_Keyboard,
+ "lang": lang.FC3_Lang,
+ "logging": logging.FC6_Logging,
+ "logvol": logvol.F18_LogVol,
+ "mediacheck": mediacheck.FC4_MediaCheck,
+ "multipath": multipath.FC6_MultiPath,
+ "network": network.F18_Network,
+ "nfs": method.F18_Method,
+ "part": partition.F18_Partition,
+ "partition": partition.F18_Partition,
+ "poweroff": reboot.F18_Reboot,
+ "raid": raid.F18_Raid,
+ "reboot": reboot.F18_Reboot,
+ "repo": repo.F15_Repo,
+ "rescue": rescue.F10_Rescue,
+ "rootpw": rootpw.F18_RootPw,
+ "selinux": selinux.FC3_SELinux,
+ "services": services.FC6_Services,
+ "shutdown": reboot.F18_Reboot,
+ "skipx": skipx.FC3_SkipX,
+ "sshpw": sshpw.F13_SshPw,
+ "text": displaymode.FC3_DisplayMode,
+ "timezone": timezone.F18_Timezone,
+ "updates": updates.F7_Updates,
+ "upgrade": upgrade.F11_Upgrade,
+ "url": method.F18_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,
@@ -1474,6 +1534,25 @@ dataMap = {
"VolGroupData": volgroup.FC16_VolGroupData,
"ZFCPData": zfcp.F14_ZFCPData,
},
+ F19: {
+ "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.F18_LogVolData,
+ "MultiPathData": multipath.FC6_MultiPathData,
+ "NetworkData": network.F16_NetworkData,
+ "PartData": partition.F18_PartData,
+ "RaidData": raid.F18_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/version.py b/pykickstart/version.py
index 75593b4..b164266 100644
--- a/pykickstart/version.py
+++ b/pykickstart/version.py
@@ -72,10 +72,11 @@ F15 = 13000
F16 = 14000
F17 = 15000
F18 = 16000
+F19 = 17000
RHEL7 = 15100
# This always points at the latest version and is the default.
-DEVEL = F18
+DEVEL = F19
# A one-to-one mapping from string representations to version numbers.
versionMap = {
@@ -83,6 +84,7 @@ versionMap = {
"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, "F18": F18,
+ "F19": F19,
"RHEL3": RHEL3, "RHEL4": RHEL4, "RHEL5": RHEL5,
"RHEL6": RHEL6,
"RHEL7": RHEL7
}
diff --git a/tests/version.py b/tests/version.py
index 6d30023..9459df1 100644
--- a/tests/version.py
+++ b/tests/version.py
@@ -87,6 +87,9 @@ class StringToVersion_TestCase(CommandTest):
# pass - F18
self.assertEqual(stringToVersion("Fedora 18"), F18)
self.assertEqual(stringToVersion("F18"), F18)
+ # pass - F19
+ self.assertEqual(stringToVersion("Fedora 19"), F19)
+ self.assertEqual(stringToVersion("F19"), F19)
# pass - RHEL3
self.assertEqual(stringToVersion("Red Hat Enterprise Linux 3"), RHEL3)
@@ -168,7 +171,8 @@ class VersionToString_TestCase(CommandTest):
self.assertEqual(versionToString(F16, skipDevel=True), "F16")
self.assertEqual(versionToString(F17, skipDevel=True), "F17")
self.assertEqual(versionToString(F18, skipDevel=True), "F18")
- self.assertEqual(versionToString(F18, skipDevel=False), "DEVEL")
+ self.assertEqual(versionToString(F19, skipDevel=True), "F19")
+ self.assertEqual(versionToString(F19, skipDevel=False), "DEVEL")
# RHEL series
self.assertEqual(versionToString(RHEL3), "RHEL3")
self.assertEqual(versionToString(RHEL4), "RHEL4")
--
1.7.11.7