summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorRamesh Nachimuthu <rnachimu@redhat.com>2014-04-16 10:52:56 +0530
committerBala.FA <barumuga@redhat.com>2014-04-29 10:21:37 +0530
commit8a52346c78331d6b192a0bb2205b9a73983c9a97 (patch)
tree41f22f9999ef37dcae829cafb949d732cf88689c /tests
parent7b0612039a50d9bbe7a258bf07e0ecdb4b3e50c3 (diff)
autocof: adding volume name as part of brick services
Currently there is no way to identify the volume from brick services. Hence adding volume name as custom variable and note in brick services Change-Id: If1ef000196dca2239f713fe41d033d8a4161d6c0 Signed-off-by: Ramesh Nachimuthu <rnachimu@redhat.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/test_config_generator.py11
1 files changed, 6 insertions, 5 deletions
diff --git a/tests/test_config_generator.py b/tests/test_config_generator.py
index 1161eab..891bcbc 100644
--- a/tests/test_config_generator.py
+++ b/tests/test_config_generator.py
@@ -53,20 +53,21 @@ class TestGlusterNagiosConfManager(TestCaseBase):
self.assertEqual(config['check_command'], "")
self.assertEqual(config['use'], 'gluster-cluster')
- def createBricks(self, count):
+ def createBricks(self, count, volume):
bricks = []
for number in range(count):
brickDir = "/mnt/Brick-%s" % (number + 1)
- bricks.append({'brickpath': brickDir})
+ bricks.append({'brickpath': brickDir,
+ 'volumeName': volume})
return bricks
def __createDummyCluster(self):
cluster = {'name': 'Test-Cluster', 'hosts': [], 'volumes': []}
cluster['hosts'].append({'hostip': '10.70.43.1',
- 'bricks': self.createBricks(1)})
+ 'bricks': self.createBricks(1, "Volume1")})
cluster['hosts'].append({'hostip': '10.70.43.2',
- 'bricks': self.createBricks(2)})
- cluster['volumes'].append({'name': 'Volume1', "typeStr": "T"})
+ 'bricks': self.createBricks(2, "Volume1")})
+ cluster['volumes'].append({'name': 'Volume1', "type": "T"})
return cluster
def __getGlusterNagiosConfManager(self):