change add_option to add_argument

Change-Id: Ib72744de0f70c0c476dee942d3a4df0d397e88db
Signed-off-by: biao716.wang <biao716.wang@samsung.com>

diff --git a/mic/kickstart/custom_commands/desktop.py b/mic/kickstart/custom_commands/desktop.py
index f69939b..bb65417 100644 (file)
--- a/mic/kickstart/custom_commands/desktop.py
+++ b/mic/kickstart/custom_commands/desktop.py
@@ -20,6 +20,7 @@
 from pykickstart.base import *
 from pykickstart.errors import *
 from pykickstart.options import *
+from pykickstart.version import DEVEL
 
 class Mic_Desktop(KickstartCommand):
     def __init__(self, writePriority=0,
@@ -58,28 +59,28 @@ class Mic_Desktop(KickstartCommand):
     def _getParser(self):
         try:
             #ingnore this pylit error, the lineno argument exist in olg version. using this way can compate old version.
-            op = KSOptionParser(lineno=self.lineno)  #pylint: disable=unexpected-keyword-arg
+            op = KSOptionParser(prog='desktop', description='desktop', version=DEVEL, lineno=self.lineno)  #pylint: disable=unexpected-keyword-arg
         except TypeError:
             # the latest version has not lineno argument
-            op = KSOptionParser()
+            op = KSOptionParser(prog='desktop', description='desktop', version=DEVEL)
             self.__new_version = True
 
-        op.add_option("--defaultdesktop", dest="defaultdesktop",
+        op.add_argument("--defaultdesktop", dest="defaultdesktop",
                                           action="store",
-                                          type="string",
-                                          nargs=1)
-        op.add_option("--autologinuser", dest="autologinuser",
+                                          type=str,
+                                          nargs=1, version=DEVEL, help='defaultdesktop')
+        op.add_argument("--autologinuser", dest="autologinuser",
                                          action="store",
-                                         type="string",
-                                         nargs=1)
-        op.add_option("--defaultdm", dest="defaultdm",
+                                         type=str,
+                                         nargs=1, version=DEVEL, help='autologinuser')
+        op.add_argument("--defaultdm", dest="defaultdm",
                                      action="store",
-                                     type="string",
-                                     nargs=1)
-        op.add_option("--session", dest="session",
+                                     type=str,
+                                     nargs=1, version=DEVEL, help='defaultdm')
+        op.add_argument("--session", dest="session",
                                    action="store",
-                                   type="string",
-                                   nargs=1)
+                                   type=str,
+                                   nargs=1, version=DEVEL, help='session')
         return op
 
     def parse(self, args):

diff --git a/mic/kickstart/custom_commands/installerfw.py b/mic/kickstart/custom_commands/installerfw.py
index 31d9136..51c4be2 100644 (file)
--- a/mic/kickstart/custom_commands/installerfw.py
+++ b/mic/kickstart/custom_commands/installerfw.py
@@ -18,6 +18,7 @@
 from pykickstart.base import *
 from pykickstart.options import *
 from mic import msger
+from pykickstart.version import DEVEL
 
 class Mic_installerfw(KickstartCommand):
     """ This class implements the "installerfw_plugins" KS option. The argument
@@ -49,7 +50,7 @@ class Mic_installerfw(KickstartCommand):
         return retval
 
     def _getParser(self):
-        op = KSOptionParser()
+        op = KSOptionParser(prog='installerfw', description='installerfw', version=DEVEL)
         return op
 
     def parse(self, args):

diff --git a/mic/kickstart/custom_commands/micboot.py b/mic/kickstart/custom_commands/micboot.py
index 2fa5639..d978be8 100644 (file)
--- a/mic/kickstart/custom_commands/micboot.py
+++ b/mic/kickstart/custom_commands/micboot.py
@@ -43,7 +43,7 @@ class Mic_Bootloader(F8_Bootloader):
 
     def _getParser(self):
         op = F8_Bootloader._getParser(self)
-        op.add_option("--menus", dest="menus")
-        op.add_option("--ptable", dest="ptable", type="string")
+        op.add_argument("--menus", dest="menus",version=FC4, help='menus')
+        op.add_argument("--ptable", dest="ptable", type=str, version=FC4, help='ptable')
         return op
 

diff --git a/mic/kickstart/custom_commands/micrepo.py b/mic/kickstart/custom_commands/micrepo.py
index 25cdae9..1327bb2 100644 (file)
--- a/mic/kickstart/custom_commands/micrepo.py
+++ b/mic/kickstart/custom_commands/micrepo.py
@@ -17,7 +17,7 @@
 # Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
 from pykickstart.commands.repo import F14_RepoData, F14_Repo
-
+from pykickstart.version import F14
 
 class Mic_RepoData(F14_RepoData):
     "Mic customized repo data"
@@ -64,20 +64,20 @@ class Mic_Repo(F14_Repo):
 
     def _getParser(self):
         op = F14_Repo._getParser(self)
-        op.add_option('--user')
-        op.add_option('--passwd')
-        op.add_option("--proxyuser")
-        op.add_option("--proxypasswd")
-
-        op.add_option("--save", action="store_true", default=False)
-        op.add_option("--debuginfo", action="store_true", default=False)
-        op.add_option("--source", action="store_true", default=False)
-        op.add_option("--disable", action="store_true", default=False)
-        op.add_option("--nocache", action="store_true", default=False)
-
-        op.add_option("--gpgkey")
-        op.add_option("--priority", type="int")
-        op.add_option("--ssl_verify", default=None)
+        op.add_argument('--user', version=F14, help='user')
+        op.add_argument('--passwd', version=F14, help='passwd')
+        op.add_argument("--proxyuser", version=F14, help='proxyuser')
+        op.add_argument("--proxypasswd", version=F14, help='proxypasswd')
+
+        op.add_argument("--save", action="store_true", default=False, version=F14, help='save')
+        op.add_argument("--debuginfo", action="store_true", default=False, version=F14, help='debuginfo')
+        op.add_argument("--source", action="store_true", default=False, version=F14, help='source')
+        op.add_argument("--disable", action="store_true", default=False, version=F14, help='disable')
+        op.add_argument("--nocache", action="store_true", default=False, version=F14, help='nocache')
+
+        op.add_argument("--gpgkey", version=F14, help='gpgkey')
+        op.add_argument("--priority", type=int, version=F14, help='priority')
+        op.add_argument("--ssl_verify", default=None, version=F14, help='ssl+verify')
         return op
 
 

diff --git a/mic/kickstart/custom_commands/partition.py b/mic/kickstart/custom_commands/partition.py
index 69d0d13..f8c20ea 100755 (executable)
--- a/mic/kickstart/custom_commands/partition.py
+++ b/mic/kickstart/custom_commands/partition.py
@@ -68,21 +68,21 @@ class Mic_Partition(FC4_Partition):
         op = FC4_Partition._getParser(self)
         # The alignment value is given in kBytes. e.g., value 8 means that
         # the partition is aligned to start from 8096 byte boundary.
-        op.add_option("--align", type="int", action="store", dest="align",
-                      default=None)
-        op.add_option("--extoptions", type="string", action="store", dest="extopts",
-                      default=None)
-        op.add_option("--part-type", type="string", action="store", dest="part_type",
-                      default=None)
-        op.add_option("--uuid", dest="uuid", action="store", type="string")
-        op.add_option("--exclude-from-image", action="store_true", dest="exclude_image",
-                      default=False)
-        op.add_option("--vdfsoptions", type="string", action="store", dest="vdfsopts",
-                      default=None)
-        op.add_option("--squashfsoptions", type="string", action="store", dest="squashfsopts",
-                      default=None)
-        op.add_option("--cpiooptions", type="string", action="store", dest="cpioopts",
-                      default=None)
-        op.add_option("--no-shrink", action="store_true", dest="no_shrink", default=False)
-        op.add_option("--init-expand", action="store_true", dest="init_expand", default=False)
+        op.add_argument("--align", type=int, action="store", dest="align",
+                      default=None, version=FC4, help='align')
+        op.add_argument("--extoptions", type=str, action="store", dest="extopts",
+                      default=None, version=FC4, help='extoptions')
+        op.add_argument("--part-type", type=str, action="store", dest="part_type",
+                      default=None, version=FC4, help='part-type')
+        op.add_argument("--uuid", dest="uuid", action="store", type=str, version=FC4, help='uuid')
+        op.add_argument("--exclude-from-image", action="store_true", dest="exclude_image",
+                      default=False, version=FC4, help='exclude-from-image')
+        op.add_argument("--vdfsoptions", type=str, action="store", dest="vdfsopts",
+                      default=None, version=FC4, help='vdfsoptions')
+        op.add_argument("--squashfsoptions", type=str, action="store", dest="squashfsopts",
+                      default=None, version=FC4, help='squashfsoptions')
+        op.add_argument("--cpiooptions", type=str, action="store", dest="cpioopts",
+                      default=None, version=FC4, help='cpiooptions')
+        op.add_argument("--no-shrink", action="store_true", dest="no_shrink", default=False, version=FC4, help='no-shrink')
+        op.add_argument("--init-expand", action="store_true", dest="init_expand", default=False, version=FC4, help='init-expand')
         return op