[PATCH rhel6-branch pykickstart] Add support for fcoe --autovlan option (#813998)

Radek Vykydal rvykydal at redhat.com
Fri Oct 12 14:50:16 UTC 2012


Resolves: rhbz#813998
---
 pykickstart/commands/fcoe.py    |   25 +++++++++++++++++++++++++
 pykickstart/handlers/control.py |    4 ++--
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/pykickstart/commands/fcoe.py b/pykickstart/commands/fcoe.py
index 3320849..cf0ff04 100644
--- a/pykickstart/commands/fcoe.py
+++ b/pykickstart/commands/fcoe.py
@@ -64,6 +64,22 @@ class F13_FcoeData(F12_FcoeData):
 
         return retval
 
+class RHEL6_FcoeData(F13_FcoeData):
+    removedKeywords = F13_FcoeData.removedKeywords
+    removedAttrs = F13_FcoeData.removedAttrs
+
+    def __init__(self, *args, **kwargs):
+        F13_FcoeData.__init__(self, *args, **kwargs)
+        self.autovlan = kwargs.get("autovlan", False)
+
+    def _getArgsAsStr(self):
+        retval = F13_FcoeData._getArgsAsStr(self)
+
+        if self.autovlan:
+            retval += " --autovlan"
+
+        return retval
+
 class F12_Fcoe(KickstartCommand):
     removedKeywords = KickstartCommand.removedKeywords
     removedAttrs = KickstartCommand.removedAttrs
@@ -112,3 +128,12 @@ class F13_Fcoe(F12_Fcoe):
         op = F12_Fcoe._getParser(self)
         op.add_option("--dcb", dest="dcb", action="store_true", default=False)
         return op
+
+class RHEL6_Fcoe(F13_Fcoe):
+    removedKeywords = F13_Fcoe.removedKeywords
+    removedAttrs = F13_Fcoe.removedAttrs
+
+    def _getParser(self):
+        op = F13_Fcoe._getParser(self)
+        op.add_option("--autovlan", dest="autovlan", action="store_true", default=False)
+        return op
diff --git a/pykickstart/handlers/control.py b/pykickstart/handlers/control.py
index cf24586..3f9ebe7 100644
--- a/pykickstart/handlers/control.py
+++ b/pykickstart/handlers/control.py
@@ -823,7 +823,7 @@ commandMap = {
         "deviceprobe": deviceprobe.FC3_DeviceProbe,
         "dmraid": dmraid.FC6_DmRaid,
         "driverdisk": driverdisk.F12_DriverDisk,
-        "fcoe": fcoe.F13_Fcoe,
+        "fcoe": fcoe.RHEL6_Fcoe,
         "firewall": firewall.F10_Firewall,
         "firstboot": firstboot.FC3_Firstboot,
         "graphical": displaymode.FC3_DisplayMode,
@@ -1066,7 +1066,7 @@ dataMap = {
         "DriverDiskData": driverdisk.F12_DriverDiskData,
         "DeviceData": device.F8_DeviceData,
         "DmRaidData": dmraid.FC6_DmRaidData,
-        "FcoeData": fcoe.F13_FcoeData,
+        "FcoeData": fcoe.RHEL6_FcoeData,
         "GroupData": group.F12_GroupData,
         "IscsiData": iscsi.RHEL6_IscsiData,
         "LogVolData": logvol.RHEL6_LogVolData,
-- 
1.7.4



More information about the anaconda-patches mailing list