summaryrefslogtreecommitdiffstats
path: root/docker/storperf-master/tests
diff options
context:
space:
mode:
authormbeierl <mark.beierl@dell.com>2018-01-17 11:55:56 -0500
committermbeierl <mark.beierl@dell.com>2018-01-23 21:11:59 -0500
commit0869c3a314d864d65b2d9faf98653378e411d493 (patch)
treeb80aa999247c8432393b957434046dcbbb6c56eb /docker/storperf-master/tests
parentfe3f5e7d38a10bfca274b9ce0f8c7db0510c26ad (diff)
Removes Configuration DB
Removes the configuration DB from storperf_master and replaces it with direct calls to Heat. Allows for container to discover an existing stack if it already exists. Change-Id: I32e767d5173dbfd58aa1d2127a478a1d36392592 JIRA: STORPERF-236 Signed-off-by: mbeierl <mark.beierl@dell.com>
Diffstat (limited to 'docker/storperf-master/tests')
-rw-r--r--docker/storperf-master/tests/db_tests/configuration_db_test.py71
-rw-r--r--docker/storperf-master/tests/storperf_master_test.py22
2 files changed, 0 insertions, 93 deletions
diff --git a/docker/storperf-master/tests/db_tests/configuration_db_test.py b/docker/storperf-master/tests/db_tests/configuration_db_test.py
deleted file mode 100644
index d8b021a..0000000
--- a/docker/storperf-master/tests/db_tests/configuration_db_test.py
+++ /dev/null
@@ -1,71 +0,0 @@
-##############################################################################
-# Copyright (c) 2015 EMC and others.
-#
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-
-from storperf.db.configuration_db import ConfigurationDB
-import os
-import unittest
-
-
-class ConfigurationDBTest(unittest.TestCase):
-
- def setUp(self):
- ConfigurationDB.db_name = __name__ + '.db'
- try:
- os.remove(ConfigurationDB.db_name)
- except OSError:
- pass
- self.config_db = ConfigurationDB()
-
- def tearDown(self):
- try:
- os.remove(ConfigurationDB.db_name)
- except OSError:
- pass
-
- def test_create_key(self):
- expected = "ABCDE-12345"
-
- self.config_db.set_configuration_value(
- "test", "key", expected)
-
- actual = self.config_db.get_configuration_value(
- "test", "key")
-
- self.assertEqual(
- expected, actual, "Did not expect: " + str(actual))
-
- def test_update_key(self):
- expected = "ABCDE-12345"
-
- self.config_db.set_configuration_value(
- "test", "key", "initial_value")
-
- self.config_db.set_configuration_value(
- "test", "key", expected)
-
- actual = self.config_db.get_configuration_value(
- "test", "key")
-
- self.assertEqual(
- expected, actual, "Did not expect: " + str(actual))
-
- def test_deleted_key(self):
- expected = None
-
- self.config_db.set_configuration_value(
- "test", "key", "initial_value")
-
- self.config_db.delete_configuration_value(
- "test", "key")
-
- actual = self.config_db.get_configuration_value(
- "test", "key")
-
- self.assertEqual(
- expected, actual, "Did not expect: " + str(actual))
diff --git a/docker/storperf-master/tests/storperf_master_test.py b/docker/storperf-master/tests/storperf_master_test.py
index f328982..cd0a2f3 100644
--- a/docker/storperf-master/tests/storperf_master_test.py
+++ b/docker/storperf-master/tests/storperf_master_test.py
@@ -7,32 +7,16 @@
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
-import os
import unittest
import mock
-from storperf.db.configuration_db import ConfigurationDB
from storperf.storperf_master import StorPerfMaster
-class MockStack(object):
-
- def __init__(self):
- pass
-
- def get_stack(self):
- return None
-
-
class StorPerfMasterTest(unittest.TestCase):
def setUp(self):
- ConfigurationDB.db_name = __name__ + '.db'
- try:
- os.remove(ConfigurationDB.db_name)
- except OSError:
- pass
with mock.patch("storperf.storperf_master.OSCreds"), \
mock.patch(
"storperf.storperf_master.OpenStackHeatStack") as oshs:
@@ -40,12 +24,6 @@ class StorPerfMasterTest(unittest.TestCase):
self.storperf = StorPerfMaster()
- def tearDown(self):
- try:
- os.remove(ConfigurationDB.db_name)
- except OSError:
- pass
-
def test_agent_count(self):
expected = 10