Merge "Add Docker automated build hooks for Parser"
authorCedric Ollivier <cedric.ollivier@orange.com>
Wed, 13 Sep 2017 14:02:09 +0000 (14:02 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Wed, 13 Sep 2017 14:02:09 +0000 (14:02 +0000)
20 files changed:
docker/vnf/testcases.yaml
functest/api/resources/v1/tiers.py
functest/api/server.py
functest/ci/check_deployment.py
functest/ci/download_images.sh
functest/ci/prepare_env.py
functest/ci/run_tests.py
functest/ci/testcases.yaml
functest/cli/cli_base.py
functest/opnfv_tests/openstack/rally/rally.py
functest/opnfv_tests/openstack/rally/scenario/full/opnfv-cinder.yaml
functest/opnfv_tests/openstack/tempest/conf_utils.py
functest/opnfv_tests/vnf/ims/cloudify_ims.py
functest/opnfv_tests/vnf/ims/orchestra.yaml
functest/opnfv_tests/vnf/ims/orchestra_clearwaterims.py
functest/opnfv_tests/vnf/ims/orchestra_openims.py
functest/tests/unit/openstack/rally/test_rally.py
functest/tests/unit/openstack/tempest/test_conf_utils.py
functest/tests/unit/utils/test_openstack_utils.py
functest/utils/openstack_utils.py

index dea4a1e..c0eba82 100644 (file)
@@ -23,7 +23,6 @@ tiers:
             -
                 case_name: orchestra_openims
                 project_name: functest
-                enabled: false
                 criteria: 100
                 blocking: false
                 description: >-
@@ -38,7 +37,6 @@ tiers:
             -
                 case_name: orchestra_clearwaterims
                 project_name: functest
-                enabled: false
                 criteria: 100
                 blocking: false
                 description: >-
index 4f4849e..b58ab20 100644 (file)
@@ -31,7 +31,7 @@ class V1Tiers(ApiResource):
         data = [i.strip() for i in data if i != '']
         data_dict = dict()
         for i in range(len(data) / 2):
-            one_data = {data[i * 2]: data[i * 2 + 1]}
+            one_data = {data[i * 2].lstrip('- ').rstrip(':'): data[i * 2 + 1]}
             if i == 0:
                 data_dict = one_data
             else:
@@ -45,14 +45,15 @@ class V1Tier(ApiResource):
 
     def get(self, tier_name):  # pylint: disable=no-self-use
         """ GET the info of one tier """
-        testcases = Tier().gettests(tier_name)
-        if not testcases:
+        tier_info = Tier().show(tier_name)
+        if not tier_info:
             return api_utils.result_handler(
                 status=1,
                 data="The tier with name '%s' does not exist." % tier_name)
-        tier_info = Tier().show(tier_name)
         tier_info.__dict__.pop('name')
         tier_info.__dict__.pop('tests_array')
+        tier_info.__dict__.pop('skipped_tests_array')
+        testcases = Tier().gettests(tier_name)
         result = {'tier': tier_name, 'testcases': testcases}
         result.update(tier_info.__dict__)
         return jsonify(result)
@@ -63,10 +64,11 @@ class V1TestcasesinTier(ApiResource):
 
     def get(self, tier_name):  # pylint: disable=no-self-use
         """ GET all testcases within given tier """
-        testcases = Tier().gettests(tier_name)
-        if not testcases:
+        tier_info = Tier().show(tier_name)
+        if not tier_info:
             return api_utils.result_handler(
                 status=1,
                 data="The tier with name '%s' does not exist." % tier_name)
+        testcases = Tier().gettests(tier_name)
         result = {'tier': tier_name, 'testcases': testcases}
         return jsonify(result)
index 1d47b0d..c6eb0b3 100644 (file)
@@ -97,6 +97,7 @@ def main():
     """Entry point"""
     logging.config.fileConfig(pkg_resources.resource_filename(
         'functest', 'ci/logging.ini'))
+    logging.captureWarnings(True)
     LOGGER.info('Starting Functest server')
     api_add_resource()
     init_db()
index fe20dc8..13bb4c8 100644 (file)
@@ -159,5 +159,6 @@ def main():
     """Entry point"""
     logging.config.fileConfig(pkg_resources.resource_filename(
         'functest', 'ci/logging.ini'))
+    logging.captureWarnings(True)
     deployment = CheckDeployment()
     return deployment.check_all()
index 236b763..09a3284 100644 (file)
@@ -18,6 +18,7 @@ http://download.cirros-cloud.net/daily/20161201/cirros-d161201-aarch64-kernel
 https://cloud-images.ubuntu.com/releases/14.04/release/ubuntu-14.04-server-cloudimg-arm64-uefi1.img
 http://cloud.centos.org/altarch/7/images/aarch64/CentOS-7-aarch64-GenericCloud.qcow2.xz
 https://sourceforge.net/projects/ool-opnfv/files/vyos-1.1.7.img
+http://marketplace.openbaton.org:8080/api/v1/images/52e2ccc0-1dce-4663-894d-28aab49323aa/img
 EOF
 
 xz --decompress --force --keep ${1:-/home/opnfv/functest/images}/CentOS-7-aarch64-GenericCloud.qcow2.xz
index a354dbe..36d0429 100644 (file)
@@ -37,14 +37,14 @@ pod_arch = os.getenv("POD_ARCH", None)
 arch_filter = ['aarch64']
 
 CONFIG_FUNCTEST_PATH = pkg_resources.resource_filename(
-            'functest', 'ci/config_functest.yaml')
+    'functest', 'ci/config_functest.yaml')
 CONFIG_PATCH_PATH = pkg_resources.resource_filename(
-            'functest', 'ci/config_patch.yaml')
+    'functest', 'ci/config_patch.yaml')
 CONFIG_AARCH64_PATCH_PATH = pkg_resources.resource_filename(
-            'functest', 'ci/config_aarch64_patch.yaml')
+    'functest', 'ci/config_aarch64_patch.yaml')
 RALLY_CONF_PATH = "/etc/rally/rally.conf"
 RALLY_AARCH64_PATCH_PATH = pkg_resources.resource_filename(
-            'functest', 'ci/rally_aarch64_patch.conf')
+    'functest', 'ci/rally_aarch64_patch.conf')
 
 
 class PrepareEnvParser(object):
@@ -358,6 +358,7 @@ def prepare_env(**kwargs):
 def main():
     logging.config.fileConfig(pkg_resources.resource_filename(
         'functest', 'ci/logging.ini'))
+    logging.captureWarnings(True)
     parser = PrepareEnvParser()
     args = parser.parse_args(sys.argv[1:])
     return prepare_env(**args)
index feafa89..a129ea7 100644 (file)
@@ -264,6 +264,7 @@ class Runner(object):
 def main():
     logging.config.fileConfig(pkg_resources.resource_filename(
         'functest', 'ci/logging.ini'))
+    logging.captureWarnings(True)
     parser = RunTestsParser()
     args = parser.parse_args(sys.argv[1:])
     runner = Runner()
index f9bf164..7d7c3eb 100644 (file)
@@ -432,7 +432,6 @@ tiers:
             -
                 case_name: orchestra_openims
                 project_name: functest
-                enabled: false
                 criteria: 100
                 blocking: false
                 description: >-
@@ -447,7 +446,6 @@ tiers:
             -
                 case_name: orchestra_clearwaterims
                 project_name: functest
-                enabled: false
                 criteria: 100
                 blocking: false
                 description: >-
index 54b3e72..507179b 100644 (file)
@@ -25,6 +25,7 @@ CONTEXT_SETTINGS = dict(help_option_names=['-h', '--help'])
 def cli():
     logging.config.fileConfig(pkg_resources.resource_filename(
         'functest', 'ci/logging.ini'))
+    logging.captureWarnings(True)
 
 
 _env = CliEnv()
index 2042b2d..8c48254 100644 (file)
@@ -66,7 +66,6 @@ class RallyBase(testcase.OSGCTestCase):
     BLACKLIST_FILE = os.path.join(RALLY_DIR, "blacklist.txt")
     TEMP_DIR = os.path.join(RALLY_DIR, "var")
 
-    CINDER_VOLUME_TYPE_NAME = "volume_test"
     RALLY_PRIVATE_NET_NAME = CONST.__getattribute__('rally_network_name')
     RALLY_PRIVATE_SUBNET_NAME = CONST.__getattribute__('rally_subnet_name')
     RALLY_PRIVATE_SUBNET_CIDR = CONST.__getattribute__('rally_subnet_cidr')
@@ -80,9 +79,7 @@ class RallyBase(testcase.OSGCTestCase):
         self.scenario_dir = ''
         self.nova_client = os_utils.get_nova_client()
         self.neutron_client = os_utils.get_neutron_client()
-        self.cinder_client = os_utils.get_cinder_client()
         self.network_dict = {}
-        self.volume_type = None
         self.smoke = None
         self.test_name = None
         self.image_exists = None
@@ -179,7 +176,7 @@ class RallyBase(testcase.OSGCTestCase):
 
     @staticmethod
     def live_migration_supported():
-        """Determine is live migration is supported."""
+        """Determine if live migration is supported."""
         config = iniparse.ConfigParser()
         if (config.read(RallyBase.TEMPEST_CONF_FILE) and
                 config.has_section('compute-feature-enabled') and
@@ -448,20 +445,6 @@ class RallyBase(testcase.OSGCTestCase):
         if self.test_name not in self.TESTS:
             raise Exception("Test name '%s' is invalid" % self.test_name)
 
-        volume_types = os_utils.list_volume_types(self.cinder_client,
-                                                  private=False)
-        if volume_types:
-            LOGGER.debug("Using existing volume type(s)...")
-        else:
-            LOGGER.debug('Creating volume type...')
-            self.volume_type = os_utils.create_volume_type(
-                self.cinder_client, self.CINDER_VOLUME_TYPE_NAME)
-            if self.volume_type is None:
-                raise Exception("Failed to create volume type '%s'" %
-                                self.CINDER_VOLUME_TYPE_NAME)
-            LOGGER.debug("Volume type '%s' is created succesfully.",
-                         self.CINDER_VOLUME_TYPE_NAME)
-
         LOGGER.debug('Getting or creating image...')
         self.image_exists, self.image_id = os_utils.get_or_create_image(
             self.GLANCE_IMAGE_NAME,
@@ -562,10 +545,6 @@ class RallyBase(testcase.OSGCTestCase):
                     self.case_name, success_rate)
 
     def _clean_up(self):
-        if self.volume_type:
-            LOGGER.debug("Deleting volume type '%s'...", self.volume_type)
-            os_utils.delete_volume_type(self.cinder_client, self.volume_type)
-
         if not self.image_exists:
             LOGGER.debug("Deleting image '%s' with ID '%s'...",
                          self.GLANCE_IMAGE_NAME, self.image_id)
index e844e33..5f46f51 100644 (file)
   CinderVolumes.create_snapshot_and_attach_volume:
     -
       args:
-        volume_type: false
         size:
           min: 1
           max: 5
         {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
       sla:
         {{ no_failures_sla() }}
-    -
-      args:
-          volume_type: true
-          size:
-              min: 1
-              max: 5
-      context:
-        {% call user_context(tenants_amount, users_amount, use_existing_users) %}
-        quotas:
-          {{ unlimited_volumes() }}
-        servers:
-          {{ vm_params(image_name,flavor_name,none)|indent(2,true) }}
-          servers_per_tenant: 2
-          auto_assign_nic: true
-        network: {}
-        {% endcall %}
-      runner:
-        {{ constant_runner(concurrency=concurrency, times=iterations, is_smoke=smoke) }}
-      sla:
-        {{ no_failures_sla() }}
 
   CinderVolumes.create_volume:
     -
index 72ea5ce..7f7db35 100644 (file)
@@ -115,17 +115,6 @@ def get_verifier_deployment_dir(verifier_id, deployment_id):
                         'for-deployment-{}'.format(deployment_id))
 
 
-def get_repo_tag(repo):
-    """
-    Returns last tag of current branch
-    """
-    cmd = ("git -C {0} describe --abbrev=0 HEAD".format(repo))
-    p = subprocess.Popen(cmd, stdout=subprocess.PIPE, shell=True)
-    tag = p.stdout.readline().rstrip()
-
-    return str(tag)
-
-
 def backup_tempest_config(conf_file):
     """
     Copy config file to tempest results directory
@@ -227,6 +216,7 @@ def configure_tempest_update_params(tempest_conf_file, image_id=None,
     if compute_cnt > 1:
         # enable multinode tests
         config.set('compute', 'min_compute_nodes', compute_cnt)
+        config.set('compute-feature-enabled', 'live_migration', True)
 
     config.set('identity', 'region', 'RegionOne')
     if os_utils.is_keystone_v3():
index c8c2c50..f9548eb 100644 (file)
@@ -412,7 +412,7 @@ class CloudifyIms(clearwater_ims_base.ClearwaterOnBoardingBase):
     @energy.enable_recording
     def run(self, **kwargs):
         """Execute CloudifyIms test case."""
-        super(CloudifyIms, self).run(**kwargs)
+        return super(CloudifyIms, self).run(**kwargs)
 
 
 # ----------------------------------------------------------
index 4cd18e7..457ca90 100644 (file)
@@ -29,7 +29,7 @@ mano:
 orchestra_openims:
     name: OpenIMS
     descriptor:
-        url: http://marketplace.openbaton.org:8082/api/v1/nsds/fokus/OpenImsCore/3.2.0/json
+        url: http://marketplace.openbaton.org:8080/api/v1/nsds/fokus/OpenImsCore/3.2.0/json
     requirements:
         flavor:
           name: m1.small
@@ -51,7 +51,7 @@ orchestra_openims:
 orchestra_clearwaterims:
     name: Clearwater IMS
     descriptor:
-        url: http://marketplace.openbaton.org:8082/api/v1/nsds/fokus/ClearwaterIMS/3.2.0/json
+        url: http://marketplace.openbaton.org:8080/api/v1/nsds/fokus/ClearwaterIMS/3.2.0/json
     requirements:
         flavor:
           name: m1.small
index c924a34..5b2e585 100644 (file)
@@ -130,6 +130,8 @@ def get_userdata(orchestrator=dict):
         orchestrator['gvnfm']['userdata']['url'])
     userdata += "sed -i '113i"'\ \ \ \ '"sleep 60' " \
                 "/etc/openbaton/openbaton-vnfm-generic-user-data.sh\n"
+    userdata += ("sed -i s/nfvo.marketplace.port=8082/nfvo.marketplace."
+                 "port=8080/g /etc/openbaton/openbaton-nfvo.properties\n")
     userdata += "echo \"Starting NFVO\"\n"
     userdata += "service openbaton-nfvo restart\n"
     userdata += "echo \"Starting Generic VNFM\"\n"
@@ -141,13 +143,13 @@ def get_userdata(orchestrator=dict):
 class ClearwaterImsVnf(vnf.VnfOnBoarding):
     """Clearwater IMS VNF deployed with openBaton orchestrator"""
 
-    logger = logging.getLogger(__name__)
+    logger = logging.getLogger(__name__)
 
     def __init__(self, **kwargs):
         if "case_name" not in kwargs:
             kwargs["case_name"] = "orchestra_clearwaterims"
         super(ClearwaterImsVnf, self).__init__(**kwargs)
-        self.logger = logging.getLogger("functest.ci.run_tests.orchestra")
+        self.logger = logging.getLogger("functest.ci.run_tests.orchestra")
         self.logger.info("kwargs %s", (kwargs))
 
         self.case_dir = pkg_resources.resource_filename(
index aae3514..fa70089 100644 (file)
@@ -130,6 +130,8 @@ def get_userdata(orchestrator=dict):
         orchestrator['gvnfm']['userdata']['url'])
     userdata += "sed -i '113i"'\ \ \ \ '"sleep 60' " \
                 "/etc/openbaton/openbaton-vnfm-generic-user-data.sh\n"
+    userdata += ("sed -i s/nfvo.marketplace.port=8082/nfvo.marketplace."
+                 "port=8080/g /etc/openbaton/openbaton-nfvo.properties\n")
     userdata += "echo \"Starting NFVO\"\n"
     userdata += "service openbaton-nfvo restart\n"
     userdata += "echo \"Starting Generic VNFM\"\n"
@@ -141,13 +143,13 @@ def get_userdata(orchestrator=dict):
 class OpenImsVnf(vnf.VnfOnBoarding):
     """OpenIMS VNF deployed with openBaton orchestrator"""
 
-    logger = logging.getLogger(__name__)
+    logger = logging.getLogger(__name__)
 
     def __init__(self, **kwargs):
         if "case_name" not in kwargs:
             kwargs["case_name"] = "orchestra_openims"
         super(OpenImsVnf, self).__init__(**kwargs)
-        self.logger = logging.getLogger("functest.ci.run_tests.orchestra")
+        self.logger = logging.getLogger("functest.ci.run_tests.orchestra")
         self.logger.info("kwargs %s", (kwargs))
 
         self.case_dir = pkg_resources.resource_filename(
index 05311c3..95222ca 100644 (file)
@@ -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)
@@ -287,52 +284,27 @@ class OSRallyTesting(unittest.TestCase):
         with self.assertRaises(Exception):
             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())
@@ -351,19 +323,14 @@ class OSRallyTesting(unittest.TestCase):
         self.rally_base._run_tests()
         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)
 
index 22017a7..50b0edc 100644 (file)
@@ -157,17 +157,6 @@ class OSTempestConfUtilsTesting(unittest.TestCase):
             self.assertTrue(m1.called)
             self.assertTrue(m2.called)
 
-    def test_get_repo_tag_default(self):
-        mock_popen = mock.Mock()
-        attrs = {'stdout.readline.return_value': 'test_tag'}
-        mock_popen.configure_mock(**attrs)
-
-        with mock.patch('functest.opnfv_tests.openstack.tempest.'
-                        'conf_utils.subprocess.Popen',
-                        return_value=mock_popen):
-            self.assertEqual(conf_utils.get_repo_tag('test_repo'),
-                             'test_tag')
-
     def test_backup_tempest_config_default(self):
         with mock.patch('functest.opnfv_tests.openstack.tempest.'
                         'conf_utils.os.path.exists',
index 3bd7e3d..307cbe3 100644 (file)
@@ -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):
index f211627..d8b1cf6 100644 (file)
@@ -1274,29 +1274,6 @@ def get_volumes(cinder_client):
         return None
 
 
-def list_volume_types(cinder_client, public=True, private=True):
-    try:
-        volume_types = cinder_client.volume_types.list()
-        if not public:
-            volume_types = [vt for vt in volume_types if not vt.is_public]
-        if not private:
-            volume_types = [vt for vt in volume_types if vt.is_public]
-        return volume_types
-    except Exception as e:
-        logger.error("Error [list_volume_types(cinder_client)]: %s" % e)
-        return None
-
-
-def create_volume_type(cinder_client, name):
-    try:
-        volume_type = cinder_client.volume_types.create(name)
-        return volume_type
-    except Exception as e:
-        logger.error("Error [create_volume_type(cinder_client, '%s')]: %s"
-                     % (name, e))
-        return None
-
-
 def update_cinder_quota(cinder_client, tenant_id, vols_quota,
                         snapshots_quota, gigabytes_quota):
     quotas_values = {"volumes": vols_quota,
@@ -1330,16 +1307,6 @@ def delete_volume(cinder_client, volume_id, forced=False):
         return False
 
 
-def delete_volume_type(cinder_client, volume_type):
-    try:
-        cinder_client.volume_types.delete(volume_type)
-        return True
-    except Exception as e:
-        logger.error("Error [delete_volume_type(cinder_client, '%s')]: %s"
-                     % (volume_type, e))
-        return False
-
-
 # *********************************************
 #   KEYSTONE
 # *********************************************