summaryrefslogtreecommitdiffstats
path: root/glustolibs-gluster/glustolibs/gluster/gluster_base_class.py
diff options
context:
space:
mode:
authorShwethaHP <spandura@redhat.com>2017-06-09 16:48:16 +0530
committerShwethaHPanduranga <shwetha-h-p@review.gluster.org>2017-06-27 04:55:03 +0000
commit34e07e33608f04dc935cb6a334011b0d8989e004 (patch)
tree5f9b6a7127a8914efbe00a4eb2c4b91e482a0c02 /glustolibs-gluster/glustolibs/gluster/gluster_base_class.py
parentc378972b48988d09b33d4b8e3881ecd560f0e343 (diff)
running_on_volumes, running_on_mounts should be an option
under gluster in the config file. Currently the config file has the options under gluster tag. Hence making the appropriate changes in the runs_on to parse the options correctly. Change-Id: Iec95d1884b13c349a36c4324b571a1c0f23c930a Signed-off-by: ShwethaHP <spandura@redhat.com>
Diffstat (limited to 'glustolibs-gluster/glustolibs/gluster/gluster_base_class.py')
-rw-r--r--glustolibs-gluster/glustolibs/gluster/gluster_base_class.py15
1 files changed, 10 insertions, 5 deletions
diff --git a/glustolibs-gluster/glustolibs/gluster/gluster_base_class.py b/glustolibs-gluster/glustolibs/gluster/gluster_base_class.py
index 777f9ea..cdc674f 100644
--- a/glustolibs-gluster/glustolibs/gluster/gluster_base_class.py
+++ b/glustolibs-gluster/glustolibs/gluster/gluster_base_class.py
@@ -51,11 +51,16 @@ class runs_on(g.CarteTestClass):
# these are the volume and mount options to run and set in config
# what do runs_on_volumes and runs_on_mounts need to be named????
- run_on_volumes = g.config.get('running_on_volumes',
- self.available_options[0])
- run_on_mounts = g.config.get('running_on_mounts',
- self.available_options[1])
-
+ run_on_volumes = self.available_options[0]
+ run_on_mounts = self.available_options[1]
+ if 'gluster' in g.config and g.config['gluster']:
+ if ('running_on_volumes' in g.config['gluster'] and
+ g.config['gluster']['running_on_volumes']):
+ run_on_volumes = g.config['gluster']['running_on_volumes']
+
+ if ('running_on_mounts' in g.config['gluster'] and
+ g.config['gluster']['running_on_mounts']):
+ run_on_mounts = g.config['gluster']['running_on_mounts']
# selections is the above info from the run that is intersected with
# the limits from the test script
self.selections = [run_on_volumes, run_on_mounts]