Updated Branches: refs/heads/master e38db6943 -> 8dd4197cd
From: Jason Bausewein [[email protected]] I would like to add an command line option to choose between advanced or basic networking configuration. This would allow me or others to choose advanced networking without having to edit the python code. Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/8dd4197c Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/8dd4197c Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/8dd4197c Branch: refs/heads/master Commit: 8dd4197cd89993929071b2de0d2d5ec4fecd13a2 Parents: e38db69 Author: Edison Su <[email protected]> Authored: Fri Jun 22 13:19:04 2012 -0700 Committer: Edison Su <[email protected]> Committed: Fri Jun 22 13:19:04 2012 -0700 ---------------------------------------------------------------------- tools/marvin/marvin/configGenerator.py | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/8dd4197c/tools/marvin/marvin/configGenerator.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/configGenerator.py b/tools/marvin/marvin/configGenerator.py index aec253b..1e84f90 100644 --- a/tools/marvin/marvin/configGenerator.py +++ b/tools/marvin/marvin/configGenerator.py @@ -389,8 +389,14 @@ def get_setup_config(file): if __name__ == "__main__": parser = OptionParser() + parser.add_option("-a", "--advanced", action="store_true", default=False, dest="advanced", help="use advanced networking") parser.add_option("-o", "--output", action="store", default="./datacenterCfg", dest="output", help="the path where the json config file generated, by default is ./datacenterCfg") (options, args) = parser.parse_args() - config = describe_setup_in_basic_mode() + + if options.advanced: + config = describe_setup_in_advanced_mode() + else: + config = describe_setup_in_basic_mode() + generate_setup_config(config, options.output)
