Remove volume type handling

Rally scenarios don't require volume type to exist as a precondition.

Change-Id: Id735346e062af084635fd8f76f3686005b9b8add
Signed-off-by: Juha Kosonen <juha.kosonen@nokia.com>

2 files changed, 4 insertions, 101 deletions

diff --git a/functest/tests/unit/openstack/rally/test_rally.py b/functest/tests/unit/openstack/rally/test_rally.py
index 05311c3f..95222ca8 100644
--- a/functest/tests/unit/openstack/rally/test_rally.py
+++ b/functest/tests/unit/openstack/rally/test_rally.py
@@ -22,15 +22,12 @@ class OSRallyTesting(unittest.TestCase):
                 'get_nova_client', return_value=mock.Mock())
     @mock.patch('functest.opnfv_tests.openstack.rally.rally.os_utils.'
                 'get_neutron_client', return_value=mock.Mock())
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.os_utils.'
-                'get_cinder_client', return_value=mock.Mock())
-    def setUp(self, mock_func1, mock_func2, mock_func3):
+    def setUp(self, mock_func1, mock_func2):
         self.rally_base = rally.RallyBase()
         self.rally_base.network_dict['net_id'] = 'test_net_id'
         self.polling_iter = 2
         mock_func1.assert_called()
         mock_func2.assert_called()
-        mock_func3.assert_called()
 
     @mock.patch('functest.opnfv_tests.openstack.rally.rally.os_utils.'
                 'get_external_net', return_value=None)
@@ -288,51 +285,26 @@ class OSRallyTesting(unittest.TestCase):
             self.rally_base._prepare_env()
 
     @mock.patch('functest.opnfv_tests.openstack.rally.rally.os_utils.'
-                'list_volume_types', return_value=None)
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.os_utils.'
-                'create_volume_type', return_value=None)
-    def test_prepare_env_volume_creation_failed(self, mock_list, mock_create):
-        self.rally_base.TESTS = ['test1', 'test2']
-        self.rally_base.test_name = 'test1'
-        with self.assertRaises(Exception):
-            self.rally_base._prepare_env()
-        mock_list.assert_called()
-        mock_create.assert_called()
-
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.os_utils.'
-                'list_volume_types', return_value=None)
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.os_utils.'
-                'create_volume_type', return_value=mock.Mock())
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.os_utils.'
                 'get_or_create_image', return_value=(True, None))
-    def test_prepare_env_image_missing(self, mock_get_img, mock_create_vt,
-                                       mock_list_vt):
+    def test_prepare_env_image_missing(self, mock_get_img):
         self.rally_base.TESTS = ['test1', 'test2']
         self.rally_base.test_name = 'test1'
         with self.assertRaises(Exception):
             self.rally_base._prepare_env()
         mock_get_img.assert_called()
-        mock_create_vt.assert_called()
-        mock_list_vt.assert_called()
 
     @mock.patch('functest.opnfv_tests.openstack.rally.rally.os_utils.'
-                'list_volume_types', return_value=None)
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.os_utils.'
-                'create_volume_type', return_value=mock.Mock())
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.os_utils.'
                 'get_or_create_image', return_value=(True, 'image_id'))
     @mock.patch('functest.opnfv_tests.openstack.rally.rally.os_utils.'
                 'create_shared_network_full', return_value=None)
     def test_prepare_env_image_shared_network_creation_failed(
-            self, mock_create_net, mock_get_img, mock_create_vt, mock_list_vt):
+            self, mock_create_net, mock_get_img):
         self.rally_base.TESTS = ['test1', 'test2']
         self.rally_base.test_name = 'test1'
         with self.assertRaises(Exception):
             self.rally_base._prepare_env()
         mock_create_net.assert_called()
         mock_get_img.assert_called()
-        mock_create_vt.assert_called()
-        mock_list_vt.assert_called()
 
     @mock.patch('functest.opnfv_tests.openstack.rally.rally.RallyBase.'
                 '_run_task', return_value=mock.Mock())
@@ -352,18 +324,13 @@ class OSRallyTesting(unittest.TestCase):
         mock_run_task.assert_any_call('test1')
 
     @mock.patch('functest.opnfv_tests.openstack.rally.rally.os_utils.'
-                'delete_volume_type')
-    @mock.patch('functest.opnfv_tests.openstack.rally.rally.os_utils.'
                 'delete_glance_image')
-    def test_clean_up_default(self, mock_glance_method, mock_vol_method):
-        self.rally_base.volume_type = mock.Mock()
+    def test_clean_up_default(self, mock_glance_method):
         self.rally_base.cinder_client = mock.Mock()
         self.rally_base.image_exists = False
         self.rally_base.image_id = 1
         self.rally_base.nova_client = mock.Mock()
         self.rally_base._clean_up()
-        mock_vol_method.assert_any_call(self.rally_base.cinder_client,
-                                        self.rally_base.volume_type)
         mock_glance_method.assert_any_call(self.rally_base.nova_client,
                                            1)
 
diff --git a/functest/tests/unit/utils/test_openstack_utils.py b/functest/tests/unit/utils/test_openstack_utils.py
index 3bd7e3dd..307cbe37 100644
--- a/functest/tests/unit/utils/test_openstack_utils.py
+++ b/functest/tests/unit/utils/test_openstack_utils.py
@@ -135,25 +135,8 @@ class OSUtilsTesting(unittest.TestCase):
         mock_obj.configure_mock(**attrs)
         self.volume = mock_obj
 
-        mock_obj = mock.Mock()
-        attrs = {'id': 'volume_type_id',
-                 'name': 'test_volume_type',
-                 'is_public': True}
-        mock_obj.configure_mock(**attrs)
-        self.volume_types = [mock_obj]
-
-        mock_obj = mock.Mock()
-        attrs = {'id': 'volume_type_id',
-                 'name': 'test_volume_type',
-                 'is_public': False}
-        mock_obj.configure_mock(**attrs)
-        self.volume_types.append(mock_obj)
-
         self.cinder_client = mock.Mock()
         attrs = {'volumes.list.return_value': [self.volume],
-                 'volume_types.list.return_value': self.volume_types,
-                 'volume_types.create.return_value': self.volume_types[0],
-                 'volume_types.delete.return_value': mock.Mock(),
                  'quotas.update.return_value': mock.Mock(),
                  'volumes.detach.return_value': mock.Mock(),
                  'volumes.force_delete.return_value': mock.Mock(),
@@ -1525,41 +1508,6 @@ class OSUtilsTesting(unittest.TestCase):
                          None)
         self.assertTrue(mock_logger_error.called)
 
-    def test_list_volume_types_default_private(self):
-        self.assertEqual(openstack_utils.
-                         list_volume_types(self.cinder_client,
-                                           public=False,
-                                           private=True),
-                         [self.volume_types[1]])
-
-    def test_list_volume_types_default_public(self):
-        self.assertEqual(openstack_utils.
-                         list_volume_types(self.cinder_client,
-                                           public=True,
-                                           private=False),
-                         [self.volume_types[0]])
-
-    @mock.patch('functest.utils.openstack_utils.logger.error')
-    def test_list_volume_types_exception(self, mock_logger_error):
-        self.assertEqual(openstack_utils.
-                         list_volume_types(Exception),
-                         None)
-        self.assertTrue(mock_logger_error.called)
-
-    def test_create_volume_type_default(self):
-        self.assertEqual(openstack_utils.
-                         create_volume_type(self.cinder_client,
-                                            'test_volume_type'),
-                         self.volume_types[0])
-
-    @mock.patch('functest.utils.openstack_utils.logger.error')
-    def test_create_volume_type_exception(self, mock_logger_error):
-        self.assertEqual(openstack_utils.
-                         create_volume_type(Exception,
-                                            'test_volume_type'),
-                         None)
-        self.assertTrue(mock_logger_error.called)
-
     def test_update_cinder_quota_default(self):
         self.assertTrue(openstack_utils.
                         update_cinder_quota(self.cinder_client,
@@ -1597,18 +1545,6 @@ class OSUtilsTesting(unittest.TestCase):
                                        forced=True))
         self.assertTrue(mock_logger_error.called)
 
-    def test_delete_volume_type_default(self):
-        self.assertTrue(openstack_utils.
-                        delete_volume_type(self.cinder_client,
-                                           self.volume_types[0]))
-
-    @mock.patch('functest.utils.openstack_utils.logger.error')
-    def test_delete_volume_type_exception(self, mock_logger_error):
-        self.assertFalse(openstack_utils.
-                         delete_volume_type(Exception,
-                                            self.volume_types[0]))
-        self.assertTrue(mock_logger_error.called)
-
     def test_get_tenants_default(self):
         with mock.patch('functest.utils.openstack_utils.'
                         'is_keystone_v3', return_value=True):