summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--docker/Dockerfile4
-rw-r--r--docker/smoke/Dockerfile4
-rw-r--r--functest/ci/testcases.yaml17
-rw-r--r--functest/opnfv_tests/openstack/rally/rally.py23
-rw-r--r--functest/opnfv_tests/openstack/rally/scenario/full/opnfv-cinder.yaml21
-rw-r--r--functest/opnfv_tests/openstack/refstack_client/refstack_client.py7
-rw-r--r--functest/opnfv_tests/openstack/tempest/conf_utils.py12
-rw-r--r--functest/opnfv_tests/sdn/odl/odl.py17
-rw-r--r--functest/opnfv_tests/vnf/ims/cloudify_ims.py2
-rw-r--r--functest/tests/unit/odl/test_odl.py29
-rw-r--r--functest/tests/unit/openstack/rally/test_rally.py41
-rw-r--r--functest/tests/unit/openstack/refstack_client/test_refstack_client.py51
-rw-r--r--functest/tests/unit/openstack/tempest/test_conf_utils.py11
-rw-r--r--functest/tests/unit/utils/test_openstack_utils.py64
-rw-r--r--functest/utils/openstack_utils.py33
15 files changed, 84 insertions, 252 deletions
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 603bc38b9..6e5161c34 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -14,9 +14,10 @@ LABEL version="0.1" description="OPNFV Functest Docker container"
# Environment variables
ARG BRANCH=master
ARG RALLY_TAG=stable/0.9
-ARG ODL_TAG=27b7911a5c2315145f2cf06726303dadfe508940
+ARG ODL_TAG=35e415b6873b39d72775c88a337e92dac26012e2
ARG OPENSTACK_TAG=stable/ocata
ARG VIMS_TAG=stable
+ARG REFSTACK_TAG=4e187b07672dd1c41cb7c94658f1c91edebf53a2
ARG REPOS_DIR=/home/opnfv/repos
ARG FUNCTEST_BASE_DIR=/home/opnfv/functest
ARG FUNCTEST_CONF_DIR=${FUNCTEST_BASE_DIR}/conf
@@ -82,6 +83,7 @@ RUN wget -q -O- https://git.openstack.org/cgit/openstack/requirements/plain/uppe
git clone --depth 1 https://github.com/openstack/rally.git -b $RALLY_TAG /src/rally && \
update-requirements -s --source /src/openstack-requirements /src/rally && \
git clone --depth 1 https://github.com/openstack/refstack-client.git /src/refstack-client && \
+ (cd src/refstack-client && git checkout -b $REFSTACK_TAG) && \
update-requirements -s --source /src/openstack-requirements /src/refstack-client && \
pip install --src /src -cupper-constraints.txt \
-chttps://git.opnfv.org/functest/plain/upper-constraints.txt?h=$BRANCH \
diff --git a/docker/smoke/Dockerfile b/docker/smoke/Dockerfile
index 3b1e8d2e7..abf1714b4 100644
--- a/docker/smoke/Dockerfile
+++ b/docker/smoke/Dockerfile
@@ -2,14 +2,16 @@ FROM opnfv/functest-core
ARG BRANCH=master
ARG OPENSTACK_TAG=stable/ocata
-ARG ODL_TAG=27b7911a5c2315145f2cf06726303dadfe508940
+ARG ODL_TAG=35e415b6873b39d72775c88a337e92dac26012e2
ARG FDS_TAG=master
+ARG REFSTACK_TAG=4e187b07672dd1c41cb7c94658f1c91edebf53a2
COPY thirdparty-requirements.txt thirdparty-requirements.txt
RUN apk --no-cache add --virtual .build-deps --update \
python-dev build-base linux-headers libffi-dev \
openssl-dev libjpeg-turbo-dev git && \
git clone --depth 1 https://github.com/openstack/refstack-client.git /src/refstack-client && \
+ (cd src/refstack-client && git checkout -b $REFSTACK_TAG) && \
update-requirements -s --source /src/openstack-requirements /src/refstack-client/ && \
pip install --no-cache-dir --src /src \
-chttps://git.openstack.org/cgit/openstack/requirements/plain/upper-constraints.txt?h=$OPENSTACK_TAG \
diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index 8b5cb6f59..7d7c3eb12 100644
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -319,23 +319,6 @@ tiers:
cmd: 'run_sfc_tests.py'
-
- case_name: parser-basics
- enabled: false
- project_name: parser
- criteria: 100
- blocking: false
- description: >-
- Test suite from Parser project.
- dependencies:
- installer: 'fuel'
- scenario: '^((?!bgpvpn|noha).)*$'
- run:
- module: 'functest.core.feature'
- class: 'BashFeature'
- args:
- cmd: 'cd /home/opnfv/repos/parser/tests && ./functest_run.sh'
-
- -
case_name: domino-multinode
enabled: false
project_name: domino
diff --git a/functest/opnfv_tests/openstack/rally/rally.py b/functest/opnfv_tests/openstack/rally/rally.py
index 2042b2d15..8c482545d 100644
--- a/functest/opnfv_tests/openstack/rally/rally.py
+++ b/functest/opnfv_tests/openstack/rally/rally.py
@@ -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)
diff --git a/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-cinder.yaml b/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-cinder.yaml
index e844e33f6..5f46f5192 100644
--- a/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-cinder.yaml
+++ b/functest/opnfv_tests/openstack/rally/scenario/full/opnfv-cinder.yaml
@@ -101,7 +101,6 @@
CinderVolumes.create_snapshot_and_attach_volume:
-
args:
- volume_type: false
size:
min: 1
max: 5
@@ -119,26 +118,6 @@
{{ 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:
-
diff --git a/functest/opnfv_tests/openstack/refstack_client/refstack_client.py b/functest/opnfv_tests/openstack/refstack_client/refstack_client.py
index 10ffddf54..42befe221 100644
--- a/functest/opnfv_tests/openstack/refstack_client/refstack_client.py
+++ b/functest/opnfv_tests/openstack/refstack_client/refstack_client.py
@@ -1,6 +1,7 @@
#!/usr/bin/env python
+
# Copyright (c) 2017 Huawei Technologies Co.,Ltd and others.
-# matthew.lijun@huawei.com wangwulin@huawei.com
+#
# 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
@@ -10,7 +11,6 @@
from __future__ import division
-
import argparse
import logging
import os
@@ -29,6 +29,9 @@ from functest.opnfv_tests.openstack.tempest import conf_utils
from functest.utils.constants import CONST
import functest.utils.functest_utils as ft_utils
+__author__ = ("Matthew Li <matthew.lijun@huawei.com>,"
+ "Linda Wang <wangwulin@huawei.com>")
+
# logging configuration """
LOGGER = logging.getLogger(__name__)
diff --git a/functest/opnfv_tests/openstack/tempest/conf_utils.py b/functest/opnfv_tests/openstack/tempest/conf_utils.py
index 72ea5ce72..7f7db35eb 100644
--- a/functest/opnfv_tests/openstack/tempest/conf_utils.py
+++ b/functest/opnfv_tests/openstack/tempest/conf_utils.py
@@ -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():
diff --git a/functest/opnfv_tests/sdn/odl/odl.py b/functest/opnfv_tests/sdn/odl/odl.py
index ab70ba107..d09532cb0 100644
--- a/functest/opnfv_tests/sdn/odl/odl.py
+++ b/functest/opnfv_tests/sdn/odl/odl.py
@@ -157,7 +157,11 @@ class ODLTests(testcase.TestCase):
'NEUTRON:' + kwargs['neutronip'],
'OS_AUTH_URL:"' + osauthurl + '"',
'OSUSERNAME:"' + kwargs['osusername'] + '"',
+ ('OSUSERDOMAINNAME:"' +
+ kwargs['osuserdomainname'] + '"'),
'OSTENANTNAME:"' + kwargs['ostenantname'] + '"',
+ ('OSPROJECTDOMAINNAME:"' +
+ kwargs['osprojectdomainname'] + '"'),
'OSPASSWORD:"' + kwargs['ospassword'] + '"',
'ODL_SYSTEM_IP:' + kwargs['odlip'],
'PORT:' + kwargs['odlwebport'],
@@ -221,7 +225,11 @@ class ODLTests(testcase.TestCase):
if 'INSTALLER_TYPE' in os.environ:
installer_type = os.environ['INSTALLER_TYPE']
kwargs['osusername'] = os.environ['OS_USERNAME']
+ kwargs['osuserdomainname'] = os.environ.get(
+ 'OS_USER_DOMAIN_NAME', 'Default')
kwargs['ostenantname'] = os.environ['OS_TENANT_NAME']
+ kwargs['osprojectdomainname'] = os.environ.get(
+ 'OS_PROJECT_DOMAIN_NAME', 'Default')
kwargs['osauthurl'] = os.environ['OS_AUTH_URL']
kwargs['ospassword'] = os.environ['OS_PASSWORD']
if installer_type == 'fuel':
@@ -263,14 +271,21 @@ class ODLParser(object): # pylint: disable=too-few-public-methods
default='127.0.0.1')
self.parser.add_argument(
'-k', '--osauthurl', help='OS_AUTH_URL as defined by OpenStack',
- default='http://127.0.0.1:5000/v2.0')
+ default='http://127.0.0.1:5000/v3')
self.parser.add_argument(
'-a', '--osusername', help='Username for OpenStack',
default='admin')
self.parser.add_argument(
+ '-f', '--osuserdomainname', help='User domain name for OpenStack',
+ default='Default')
+ self.parser.add_argument(
'-b', '--ostenantname', help='Tenantname for OpenStack',
default='admin')
self.parser.add_argument(
+ '-g', '--osprojectdomainname',
+ help='Project domain name for OpenStack',
+ default='Default')
+ self.parser.add_argument(
'-c', '--ospassword', help='Password for OpenStack',
default='admin')
self.parser.add_argument(
diff --git a/functest/opnfv_tests/vnf/ims/cloudify_ims.py b/functest/opnfv_tests/vnf/ims/cloudify_ims.py
index c8c2c509c..f9548eb2c 100644
--- a/functest/opnfv_tests/vnf/ims/cloudify_ims.py
+++ b/functest/opnfv_tests/vnf/ims/cloudify_ims.py
@@ -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)
# ----------------------------------------------------------
diff --git a/functest/tests/unit/odl/test_odl.py b/functest/tests/unit/odl/test_odl.py
index 878d47dda..338a4e69d 100644
--- a/functest/tests/unit/odl/test_odl.py
+++ b/functest/tests/unit/odl/test_odl.py
@@ -69,7 +69,7 @@ class ODLTesting(unittest.TestCase):
_keystone_ip = "127.0.0.1"
_neutron_ip = "127.0.0.2"
_sdn_controller_ip = "127.0.0.3"
- _os_auth_url = "http://{}:5000/v2.0".format(_keystone_ip)
+ _os_auth_url = "http://{}:5000/v3".format(_keystone_ip)
_os_tenantname = "admin"
_os_username = "admin"
_os_password = "admin"
@@ -77,6 +77,8 @@ class ODLTesting(unittest.TestCase):
_odl_restconfport = "8181"
_odl_username = "admin"
_odl_password = "admin"
+ _os_userdomainname = 'Default'
+ _os_projectdomainname = 'Default'
def setUp(self):
for var in ("INSTALLER_TYPE", "SDN_CONTROLLER", "SDN_CONTROLLER_IP"):
@@ -84,15 +86,20 @@ class ODLTesting(unittest.TestCase):
del os.environ[var]
os.environ["OS_AUTH_URL"] = self._os_auth_url
os.environ["OS_USERNAME"] = self._os_username
+ os.environ["OS_USER_DOMAIN_NAME"] = self._os_userdomainname
os.environ["OS_PASSWORD"] = self._os_password
os.environ["OS_TENANT_NAME"] = self._os_tenantname
+ os.environ["OS_PROJECT_DOMAIN_NAME"] = self._os_projectdomainname
+ os.environ["OS_PASSWORD"] = self._os_password
self.test = odl.ODLTests(case_name='odl', project_name='functest')
self.defaultargs = {'odlusername': self._odl_username,
'odlpassword': self._odl_password,
'neutronip': self._keystone_ip,
'osauthurl': self._os_auth_url,
'osusername': self._os_username,
+ 'osuserdomainname': self._os_userdomainname,
'ostenantname': self._os_tenantname,
+ 'osprojectdomainname': self._os_projectdomainname,
'ospassword': self._os_password,
'odlip': self._keystone_ip,
'odlwebport': self._odl_webport,
@@ -211,7 +218,9 @@ class ODLMainTesting(ODLTesting):
'neutronip': self._neutron_ip,
'osauthurl': self._os_auth_url,
'osusername': self._os_username,
+ 'osuserdomainname': self._os_userdomainname,
'ostenantname': self._os_tenantname,
+ 'osprojectdomainname': self._os_projectdomainname,
'ospassword': self._os_password,
'odlip': self._sdn_controller_ip,
'odlwebport': self._odl_webport,
@@ -231,7 +240,11 @@ class ODLMainTesting(ODLTesting):
'NEUTRON:{}'.format(self._neutron_ip),
'OS_AUTH_URL:"{}"'.format(self._os_auth_url),
'OSUSERNAME:"{}"'.format(self._os_username),
+ 'OSUSERDOMAINNAME:"{}"'.format(
+ self._os_userdomainname),
'OSTENANTNAME:"{}"'.format(self._os_tenantname),
+ 'OSPROJECTDOMAINNAME:"{}"'.format(
+ self._os_projectdomainname),
'OSPASSWORD:"{}"'.format(self._os_password),
'ODL_SYSTEM_IP:{}'.format(self._sdn_controller_ip),
'PORT:{}'.format(self._odl_webport),
@@ -383,7 +396,9 @@ class ODLRunTesting(ODLTesting):
odlusername=self._odl_username, odlwebport=odlwebport,
osauthurl=self._os_auth_url,
ospassword=self._os_password, ostenantname=self._os_tenantname,
- osusername=self._os_username)
+ osusername=self._os_username,
+ osprojectdomainname=self._os_projectdomainname,
+ osuserdomainname=self._os_userdomainname)
def _test_multiple_suites(self, suites,
status=testcase.TestCase.EX_OK, **kwargs):
@@ -404,7 +419,9 @@ class ODLRunTesting(ODLTesting):
odlusername=self._odl_username, odlwebport=odlwebport,
osauthurl=self._os_auth_url,
ospassword=self._os_password, ostenantname=self._os_tenantname,
- osusername=self._os_username)
+ osusername=self._os_username,
+ osprojectdomainname=self._os_projectdomainname,
+ osuserdomainname=self._os_userdomainname)
def test_exc(self):
with mock.patch('functest.utils.openstack_utils.get_endpoint',
@@ -579,9 +596,15 @@ class ODLArgParserTesting(ODLTesting):
def test_osusername(self):
self._test_arg('osusername', 'foo')
+ def test_osuserdomainname(self):
+ self._test_arg('osuserdomainname', 'domain')
+
def test_ostenantname(self):
self._test_arg('ostenantname', 'foo')
+ def test_osprojectdomainname(self):
+ self._test_arg('osprojectdomainname', 'domain')
+
def test_ospassword(self):
self._test_arg('ospassword', 'foo')
diff --git a/functest/tests/unit/openstack/rally/test_rally.py b/functest/tests/unit/openstack/rally/test_rally.py
index 05311c3ff..95222ca8b 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/openstack/refstack_client/test_refstack_client.py b/functest/tests/unit/openstack/refstack_client/test_refstack_client.py
index ca0974832..61e950a6b 100644
--- a/functest/tests/unit/openstack/refstack_client/test_refstack_client.py
+++ b/functest/tests/unit/openstack/refstack_client/test_refstack_client.py
@@ -1,11 +1,14 @@
#!/usr/bin/env python
+
# Copyright (c) 2017 Huawei Technologies Co.,Ltd and others.
-# matthew.lijun@huawei.com wangwulin@huawei.com
+#
# 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
+# pylint: disable=missing-docstring
+
import logging
import mock
import pkg_resources
@@ -18,8 +21,13 @@ from functest.utils.constants import CONST
from snaps.openstack.os_credentials import OSCreds
+__author__ = ("Matthew Li <matthew.lijun@huawei.com>,"
+ "Linda Wang <wangwulin@huawei.com>")
+
class OSRefstackClientTesting(unittest.TestCase):
+ """The class testing RefstackClient """
+ # pylint: disable=missing-docstring, too-many-public-methods
_config = pkg_resources.resource_filename(
'functest',
@@ -32,13 +40,20 @@ class OSRefstackClientTesting(unittest.TestCase):
'testlist': self._testlist}
CONST.__setattr__('OS_AUTH_URL', 'https://ip:5000/v3')
CONST.__setattr__('OS_INSECURE', 'true')
+ self.case_name = 'refstack_defcore'
+ self.result = 0
self.os_creds = OSCreds(
username='user', password='pass',
auth_url='http://foo.com:5000/v3', project_name='bar')
+ self.details = {"tests": 3,
+ "failures": 1,
+ "success": ['tempest.api.compute [18.464988s]'],
+ "errors": ['tempest.api.volume [0.230334s]'],
+ "skipped": ['tempest.api.network [1.265828s]']}
@mock.patch('functest.opnfv_tests.openstack.refstack_client.tempest_conf.'
'TempestConf', return_value=mock.Mock())
- def _create_client(self, mock_conf):
+ def _create_client(self, *args):
with mock.patch('snaps.openstack.tests.openstack_tests.'
'get_credentials', return_value=self.os_creds):
return RefstackClient()
@@ -49,11 +64,11 @@ class OSRefstackClientTesting(unittest.TestCase):
testlist = 'testlist'
client = self._create_client()
with mock.patch('functest.opnfv_tests.openstack.refstack_client.'
- 'refstack_client.ft_utils.execute_command') as m:
+ 'refstack_client.ft_utils.execute_command') as m_cmd:
cmd = ("refstack-client test {0} -c {1} -v --test-list {2}"
.format(insecure, config, testlist))
client.run_defcore(config, testlist)
- m.assert_any_call(cmd)
+ m_cmd.assert_any_call(cmd)
def test_run_defcore(self):
CONST.__setattr__('OS_AUTH_URL', 'http://ip:5000/v3')
@@ -62,25 +77,22 @@ class OSRefstackClientTesting(unittest.TestCase):
testlist = 'testlist'
client = self._create_client()
with mock.patch('functest.opnfv_tests.openstack.refstack_client.'
- 'refstack_client.ft_utils.execute_command') as m:
+ 'refstack_client.ft_utils.execute_command') as m_cmd:
cmd = ("refstack-client test {0} -c {1} -v --test-list {2}"
.format(insecure, config, testlist))
client.run_defcore(config, testlist)
- m.assert_any_call(cmd)
+ m_cmd.assert_any_call(cmd)
@mock.patch('functest.opnfv_tests.openstack.refstack_client.'
'refstack_client.LOGGER.info')
@mock.patch('__builtin__.open', side_effect=Exception)
- def test_parse_refstack_result_missing_log_file(self, mock_open,
- mock_logger_info):
- self.case_name = 'refstack_defcore'
- self.result = 0
+ def test_parse_refstack_result_fail(self, *args):
self._create_client().parse_refstack_result()
- mock_logger_info.assert_called_once_with(
+ args[1].assert_called_once_with(
"Testcase %s success_rate is %s%%",
self.case_name, self.result)
- def test_parse_refstack_result_default(self):
+ def test_parse_refstack_result_ok(self):
log_file = ('''
{0} tempest.api.compute [18.464988s] ... ok
{0} tempest.api.volume [0.230334s] ... FAILED
@@ -90,11 +102,6 @@ class OSRefstackClientTesting(unittest.TestCase):
- Skipped: 1
- Failed: 1
''')
- self.details = {"tests": 3,
- "failures": 1,
- "success": ['tempest.api.compute [18.464988s]'],
- "errors": ['tempest.api.volume [0.230334s]'],
- "skipped": ['tempest.api.network [1.265828s]']}
client = self._create_client()
with mock.patch('__builtin__.open',
mock.mock_open(read_data=log_file)):
@@ -108,16 +115,6 @@ class OSRefstackClientTesting(unittest.TestCase):
del kwargs[key]
return kwargs
- def _test_main(self, status, *args):
- kwargs = self._get_main_kwargs()
- client = self._create_client()
- self.assertEqual(client.main(**kwargs), status)
- if len(args) > 0:
- args[0].assert_called_once_with(
- RefstackClient.result_dir)
- if len(args) > 1:
- args
-
def _test_main_missing_keyword(self, key):
kwargs = self._get_main_kwargs(key)
client = self._create_client()
diff --git a/functest/tests/unit/openstack/tempest/test_conf_utils.py b/functest/tests/unit/openstack/tempest/test_conf_utils.py
index 22017a7a2..50b0edc60 100644
--- a/functest/tests/unit/openstack/tempest/test_conf_utils.py
+++ b/functest/tests/unit/openstack/tempest/test_conf_utils.py
@@ -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',
diff --git a/functest/tests/unit/utils/test_openstack_utils.py b/functest/tests/unit/utils/test_openstack_utils.py
index 3bd7e3dd6..307cbe37d 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):
diff --git a/functest/utils/openstack_utils.py b/functest/utils/openstack_utils.py
index f211627a5..d8b1cf6f9 100644
--- a/functest/utils/openstack_utils.py
+++ b/functest/utils/openstack_utils.py
@@ -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
# *********************************************