@@ -4,7 +4,7 @@

 #

 #    Author: Mahmoud Bassiouny <mbassiouny@vmware.com>

-from optparse import OptionParser

+from argparse import ArgumentParser

 import os.path

 import curses

 import sys

@@ -331,8 +331,8 @@ class IsoInstaller(object):

 if __name__ == '__main__':

     usage = "Usage: %prog [options]"

-    parser = OptionParser(usage)

-    parser.add_option("-j",  "--json-file", dest="options_file",  default="input.json")

+    parser = ArgumentParser(usage)

+    parser.add_argument("-j",  "--json-file", dest="options_file",  default="input.json")

-    (options,  args) = parser.parse_args()

+    options = parser.parse_args()

     curses.wrapper(IsoInstaller, options.options_file)

@@ -4,7 +4,7 @@

 #

 #    Author: Mahmoud Bassiouny <mbassiouny@vmware.com>

-from optparse import OptionParser

+from argparse import ArgumentParser

 from installer import Installer

 import crypt

 import random

@@ -169,24 +169,23 @@ def make_src_iso(working_directory, src_iso_path, rpm_list):

 if __name__ == '__main__':

     usage = "Usage: %prog [options] <config file> <tools path>"

-    parser = OptionParser(usage)

-

-    parser.add_option("-i", "--iso-path",  dest="iso_path")

-    parser.add_option("-j", "--src-iso-path",  dest="src_iso_path")

-    parser.add_option("-v", "--vmdk-path", dest="vmdk_path")

-    parser.add_option("-w",  "--working-directory",  dest="working_directory", default="/mnt/photon-root")

-    parser.add_option("-l",  "--log-path",  dest="log_path", default="../stage/LOGS")

-    parser.add_option("-r",  "--rpm-path",  dest="rpm_path", default="../stage/RPMS")

-    parser.add_option("-x",  "--srpm-path",  dest="srpm_path", default="../stage/SRPMS")

-    parser.add_option("-o", "--output-data-path", dest="output_data_path", default="../stage/common/data/")

-    parser.add_option("-f", "--force", action="store_true", dest="force", default=False)

-    parser.add_option("-p", "--package-list-file", dest="package_list_file", default="../common/data/build_install_options_all.json")

-    parser.add_option("-m", "--stage-path", dest="stage_path", default="../stage")

-    parser.add_option("-s", "--json-data-path", dest="json_data_path", default="../stage/common/data/")

-    parser.add_option("-d", "--pkg-to-rpm-map-file", dest="pkg_to_rpm_map_file", default="../stage/pkg_info.json")

-    parser.add_option("-c", "--pkg-to-be-copied-conf-file", dest="pkg_to_be_copied_conf_file")

-

-    (options,  args) = parser.parse_args()

+    parser = ArgumentParser(usage)

+    parser.add_argument("-i", "--iso-path",  dest="iso_path")

+    parser.add_argument("-j", "--src-iso-path",  dest="src_iso_path")

+    parser.add_argument("-v", "--vmdk-path", dest="vmdk_path")

+    parser.add_argument("-w",  "--working-directory",  dest="working_directory", default="/mnt/photon-root")

+    parser.add_argument("-l",  "--log-path",  dest="log_path", default="../stage/LOGS")

+    parser.add_argument("-r",  "--rpm-path",  dest="rpm_path", default="../stage/RPMS")

+    parser.add_argument("-x",  "--srpm-path",  dest="srpm_path", default="../stage/SRPMS")

+    parser.add_argument("-o", "--output-data-path", dest="output_data_path", default="../stage/common/data/")

+    parser.add_argument("-f", "--force", action="store_true", dest="force", default=False)

+    parser.add_argument("-p", "--package-list-file", dest="package_list_file", default="../common/data/build_install_options_all.json")

+    parser.add_argument("-m", "--stage-path", dest="stage_path", default="../stage")

+    parser.add_argument("-s", "--json-data-path", dest="json_data_path", default="../stage/common/data/")

+    parser.add_argument("-d", "--pkg-to-rpm-map-file", dest="pkg_to_rpm_map_file", default="../stage/pkg_info.json")

+    parser.add_argument("-c", "--pkg-to-be-copied-conf-file", dest="pkg_to_be_copied_conf_file")

+    parser.add_argument('configfile', nargs='?')

+    options = parser.parse_args()

     # Cleanup the working directory

     if not options.force:

         proceed = query_yes_no("This will remove everything under {0}. Are you sure?".format(options.working_directory))

@@ -200,7 +199,7 @@ if __name__ == '__main__':

     else:

         if options.iso_path:

             # Check the arguments

-            if (len(args)) != 0:

+            if options.configfile:

                 parser.error("Incorrect arguments")

             config = {}

             config['iso_system'] = True

@@ -209,11 +208,11 @@ if __name__ == '__main__':

         elif options.vmdk_path:

             # Check the arguments

-            if (len(args)) != 1:

+            if not options.configfile:

                 parser.error("Incorrect arguments")

             # Read the conf file

-            config = (JsonWrapper(args[0])).read()

+            config = (JsonWrapper(options.configfile)).read()

             config['disk'], success = create_vmdk_and_partition(config, options.vmdk_path)

             if not success:

                 print "Unexpected failure, please check the logs"

@@ -224,11 +223,11 @@ if __name__ == '__main__':

         else:

             # Check the arguments

-            if (len(args)) != 1:

+            if not options.configfile:

                 parser.error("Incorrect arguments")

             # Read the conf file

-            config = (JsonWrapper(args[0])).read()

+            config = (JsonWrapper(options.configfile)).read()

             config['iso_system'] = False

             config['vmdk_install'] = False

@@ -1,6 +1,6 @@

 #!/usr/bin/env python

-from optparse import OptionParser

+from argparse import ArgumentParser

 import os.path

 from CommandUtils import CommandUtils

 from Logger import Logger

@@ -16,29 +16,30 @@ from PackageInfo import PackageInfo

 def main():

     usage = "Usage: %prog [options] <package name>"

-    parser = OptionParser(usage)

-    parser.add_option("-s",  "--spec-path",  dest="specPath",  default="../../SPECS")

-    parser.add_option("-x",  "--source-path",  dest="sourcePath",  default="../../stage/SOURCES")

-    parser.add_option("-r",  "--rpm-path",  dest="rpmPath",  default="../../stage/RPMS")

-    parser.add_option("-i",  "--install-package", dest="installPackage",  default=False,  action ="store_true")

-    parser.add_option("-p",  "--publish-RPMS-path", dest="publishRPMSPath",  default="../../stage/PUBLISHRPMS")

-    parser.add_option("-l",  "--log-path", dest="logPath",  default="../../stage/LOGS")

-    parser.add_option("-z",  "--top-dir-path", dest="topDirPath",  default="/usr/src/photon")

-    parser.add_option("-b",  "--build-root-path", dest="buildRootPath",  default="/mnt")

-    parser.add_option("-t",  "--threads", dest="buildThreads",  default=1, type="int", help="Number of working threads")

-    parser.add_option("-m",  "--tool-chain-stage", dest="toolChainStage",  default="None")

-    parser.add_option("-c",  "--pullsources-config", dest="pullsourcesConfig",  default="pullsources.conf")

-    parser.add_option("-d",  "--dist", dest="dist",  default="")

-    parser.add_option("-k",  "--input-RPMS-path", dest="inputRPMSPath",   default=None)

-    parser.add_option("-n",  "--build-number", dest="buildNumber",  default="0000000")

-    parser.add_option("-v",  "--release-version", dest="releaseVersion",  default="NNNnNNN")

-    parser.add_option("-u",  "--enable-rpmcheck", dest="rpmCheck",  default=False, action ="store_true")

-    parser.add_option("-a",  "--source-rpm-path",  dest="sourceRpmPath",  default="../../stage/SRPMS")

-    parser.add_option("-w",  "--pkginfo-file",  dest="pkgInfoFile",  default="../../stage/pkg_info.json")

-    parser.add_option("-g",  "--pkg-build-option-file",  dest="pkgBuildOptionFile",  default="../../common/data/pkg_build_options.json")

-    parser.add_option("-q",  "--rpmcheck-stop-on-error", dest="rpmCheckStopOnError",  default=False, action ="store_true")

-

-    (options,  args) = parser.parse_args()

+    parser = ArgumentParser(usage)

+    parser.add_argument("-s",  "--spec-path",  dest="specPath",  default="../../SPECS")

+    parser.add_argument("-x",  "--source-path",  dest="sourcePath",  default="../../stage/SOURCES")

+    parser.add_argument("-r",  "--rpm-path",  dest="rpmPath",  default="../../stage/RPMS")

+    parser.add_argument("-i",  "--install-package", dest="installPackage",  default=False,  action ="store_true")

+    parser.add_argument("-p",  "--publish-RPMS-path", dest="publishRPMSPath",  default="../../stage/PUBLISHRPMS")

+    parser.add_argument("-l",  "--log-path", dest="logPath",  default="../../stage/LOGS")

+    parser.add_argument("-z",  "--top-dir-path", dest="topDirPath",  default="/usr/src/photon")

+    parser.add_argument("-b",  "--build-root-path", dest="buildRootPath",  default="/mnt")

+    parser.add_argument("-t",  "--threads", dest="buildThreads",  default=1, type=int, help="Number of working threads")

+    parser.add_argument("-m",  "--tool-chain-stage", dest="toolChainStage",  default="None")

+    parser.add_argument("-c",  "--pullsources-config", dest="pullsourcesConfig",  default="pullsources.conf")

+    parser.add_argument("-d",  "--dist", dest="dist",  default="")

+    parser.add_argument("-k",  "--input-RPMS-path", dest="inputRPMSPath",   default=None)

+    parser.add_argument("-n",  "--build-number", dest="buildNumber",  default="0000000")

+    parser.add_argument("-v",  "--release-version", dest="releaseVersion",  default="NNNnNNN")

+    parser.add_argument("-u",  "--enable-rpmcheck", dest="rpmCheck",  default=False, action ="store_true")

+    parser.add_argument("-a",  "--source-rpm-path",  dest="sourceRpmPath",  default="../../stage/SRPMS")

+    parser.add_argument("-w",  "--pkginfo-file",  dest="pkgInfoFile",  default="../../stage/pkg_info.json")

+    parser.add_argument("-g",  "--pkg-build-option-file",  dest="pkgBuildOptionFile",  default="../../common/data/pkg_build_options.json")

+    parser.add_argument("-q",  "--rpmcheck-stop-on-error", dest="rpmCheckStopOnError",  default=False, action ="store_true")

+

+    parser.add_argument("PackageName", nargs='?')

+    options = parser.parse_args()

     cmdUtils=CommandUtils()

     if not os.path.isdir(options.logPath):

         cmdUtils.runCommandInShell("mkdir -p "+options.logPath)

@@ -72,11 +73,11 @@ def main():

         errorFlag = True

     if options.installPackage :

-        if len(args) != 1:

+        if not options.PackageName:

             logger.error("Please provide package name")

             errorFlag = True

         else:

-            package=args[0]

+            package=options.PackageName

     if errorFlag:

         logger.error("Found some errors. Please fix input options and re-run it.")