Refactoring of QoSSettings to extend QoSConfig

QoSSettings and cinder_utils have a runtime cyclical
dependency. This patch reduces this dependency and
deprecates the QoSSettings class.

JIRA: SNAPS-222

Change-Id: I6385717b78db413c496b15b8c4b76ffabe9797c1
Signed-off-by: spisarski <s.pisarski@cablelabs.com>

1 files changed, 17 insertions, 16 deletions

diff --git a/snaps/openstack/tests/create_qos_tests.py b/snaps/openstack/tests/create_qos_tests.py
index 6c0a056..68737f8 100644
--- a/snaps/openstack/tests/create_qos_tests.py
+++ b/snaps/openstack/tests/create_qos_tests.py
@@ -12,6 +12,8 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
+from snaps.config.qos import Consumer, QoSConfigError, QoSConfig
+from snaps.openstack.create_qos import Consumer as Consumer_old
 
 try:
     from urllib.request import URLError
@@ -23,8 +25,7 @@ import unittest
 import uuid
 
 from snaps.openstack import create_qos
-from snaps.openstack.create_qos import (QoSSettings, QoSSettingsError,
-                                        Consumer)
+from snaps.openstack.create_qos import QoSSettings
 from snaps.openstack.tests.os_source_file_test import OSIntegrationTestCase
 from snaps.openstack.utils import cinder_utils
 
@@ -39,64 +40,64 @@ class QoSSettingsUnitTests(unittest.TestCase):
     """
 
     def test_no_params(self):
-        with self.assertRaises(QoSSettingsError):
+        with self.assertRaises(QoSConfigError):
             QoSSettings()
 
     def test_empty_config(self):
-        with self.assertRaises(QoSSettingsError):
+        with self.assertRaises(QoSConfigError):
             QoSSettings(**dict())
 
     def test_name_only(self):
-        with self.assertRaises(QoSSettingsError):
+        with self.assertRaises(QoSConfigError):
             QoSSettings(name='foo')
 
     def test_config_with_name_only(self):
-        with self.assertRaises(QoSSettingsError):
+        with self.assertRaises(QoSConfigError):
             QoSSettings(**{'name': 'foo'})
 
     def test_invalid_consumer(self):
-        with self.assertRaises(QoSSettingsError):
+        with self.assertRaises(QoSConfigError):
             QoSSettings(name='foo', consumer='bar')
 
     def test_config_with_invalid_consumer(self):
-        with self.assertRaises(QoSSettingsError):
+        with self.assertRaises(QoSConfigError):
             QoSSettings(**{'name': 'foo', 'consumer': 'bar'})
 
     def test_name_consumer(self):
-        settings = QoSSettings(name='foo', consumer=Consumer.front_end)
+        settings = QoSSettings(name='foo', consumer=Consumer_old.front_end)
 
         self.assertEqual('foo', settings.name)
-        self.assertEqual(Consumer.front_end, settings.consumer)
+        self.assertEqual(Consumer_old.front_end.value, settings.consumer.value)
         self.assertEqual(dict(), settings.specs)
 
     def test_name_consumer_front_end_strings(self):
         settings = QoSSettings(name='foo', consumer='front-end')
 
         self.assertEqual('foo', settings.name)
-        self.assertEqual(Consumer.front_end, settings.consumer)
+        self.assertEqual(Consumer_old.front_end.value, settings.consumer.value)
         self.assertEqual(dict(), settings.specs)
 
     def test_name_consumer_back_end_strings(self):
         settings = QoSSettings(name='foo', consumer='back-end')
 
         self.assertEqual('foo', settings.name)
-        self.assertEqual(Consumer.back_end, settings.consumer)
+        self.assertEqual(Consumer_old.back_end.value, settings.consumer.value)
         self.assertEqual(dict(), settings.specs)
 
     def test_name_consumer_both_strings(self):
         settings = QoSSettings(name='foo', consumer='both')
 
         self.assertEqual('foo', settings.name)
-        self.assertEqual(Consumer.both, settings.consumer)
+        self.assertEqual(Consumer_old.both.value, settings.consumer.value)
         self.assertEqual(dict(), settings.specs)
 
     def test_all(self):
         specs = {'spec1': 'val1', 'spec2': 'val2'}
-        settings = QoSSettings(name='foo', consumer=Consumer.both,
+        settings = QoSSettings(name='foo', consumer=Consumer_old.both,
                                specs=specs)
 
         self.assertEqual('foo', settings.name)
-        self.assertEqual(Consumer.both, settings.consumer)
+        self.assertEqual(Consumer_old.both.value, settings.consumer.value)
         self.assertEqual(specs, settings.specs)
 
     def test_config_all(self):
@@ -121,7 +122,7 @@ class CreateQoSTests(OSIntegrationTestCase):
         super(self.__class__, self).__start__()
 
         guid = uuid.uuid4()
-        self.qos_settings = QoSSettings(
+        self.qos_settings = QoSConfig(
             name=self.__class__.__name__ + '-' + str(guid),
             consumer=Consumer.both)