From 57991580217d955984c68cd899d9031736182be0 Mon Sep 17 00:00:00 2001 From: Shwetha-H-Panduranga Date: Tue, 13 Dec 2011 17:07:12 +0530 Subject: Changes made to volume info. This is to support multiple 'volumetypes' and counts --- libs/parser/parser.py | 27 +++++++++++++++++++-------- 1 file changed, 19 insertions(+), 8 deletions(-) (limited to 'libs/parser/parser.py') diff --git a/libs/parser/parser.py b/libs/parser/parser.py index 70619c9..51c960d 100644 --- a/libs/parser/parser.py +++ b/libs/parser/parser.py @@ -233,17 +233,28 @@ def parse_testenv_configfile(filename): return 1 elif re.match('volume', result): - necessary_options = ["volumename", "volumetype", - "count", "transporttype", - "bricks"] + necessary_options = ["volumename", "bricks"] if verify_necessary_options(cp, section, necessary_options): volumename = items.pop('volumename') - volumetype = items.pop('volumetype') - count = items.pop('count') - transporttype = items.pop('transporttype') bricks = items.pop('bricks') - function(section, volumename, volumetype, - count, transporttype, bricks) + if (items.has_key('replica') and items['replica']): + replica = items.pop('replica') + else: + replica = None + + if (items.has_key('stripe') and items['stripe']): + stripe = items.pop('stripe') + else: + stripe = None + + if (items.has_key('transporttype') and + items['transporttype']): + transporttype = items.pop('transporttype') + else: + transporttype = None + + function(section, volumename, replica, + stripe, transporttype, bricks) else: return 1 -- cgit