etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Ignore comments in config files during loading 

Conflicts:

	tools/marvin/marvin/configGenerator.py
This commit is contained in:
Prasanna Santhanam 2012-08-09 17:37:16 +05:30
parent 3f25222e30
commit b8ca20be51
2 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
tools/marvin/marvin/configGenerator.py
View File

@ -622,17 +622,31 @@ def get_setup_config(file):
if not os.path.exists(file):
raise IOError("config file %s not found. please specify a valid config file"%file)
config = cloudstackConfiguration()
fp = open(file, 'r')
config = json.load(fp)
configLines = []
with open(file, 'r') as fp:
for line in fp:
ws = line.strip()
if not ws.startswith("#"):
configLines.append(ws)
config = json.loads("\n".join(configLines))
return jsonHelper.jsonLoader(config)
if __name__ == "__main__":
parser = OptionParser()
parser.add_option("-i", "--input", action="store", default=None , dest="inputfile", help="input file")
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.inputfile:
config = get_setup_config(options.inputfile)
if options.advanced:
config = describe_setup_in_advanced_mode()
else:
config = describe_setup_in_basic_mode()
generate_setup_config(config, options.output)

4
tools/marvin/marvin/deployDataCenter.py
View File

@ -238,7 +238,7 @@ class deployDataCenters():
dev.physicalnetworkid = phynetwrk.id
self.apiClient.addF5LoadBalancer(dev)
else:
print "Device %s doesn't match any know provider type"%device
raise cloudstackException.InvalidParameterException("Device %s doesn't match any know provider type"%device)
self.enableProvider(result.id)
def addTrafficTypes(self, physical_network_id, traffictypes):
@ -343,7 +343,7 @@ class deployDataCenters():
self.config = configGenerator.get_setup_config(self.configFile)
except:
raise cloudstackException.InvalidParameterException( \
"Failed to load config %s" %sys.exc_info())
"Failed to load config %s"%self.configFile)
mgt = self.config.mgtSvr[0]