openstack/fuel-qa
Code Issues Proposed changes

Remove mentions about RedHat from system tests

Browse Source 
Clear settings and test files when we use condition for
    rhel release

Change-Id: I712b090c9e587b2f07150918389f1fc260c60eda
Closes-bug: #1456552
This commit is contained in:
Dmitry Tyzhnenko 2015-06-25 16:48:01 +03:00
parent 34600a3527
commit 5cab3281d9
9 changed files with 0 additions and 83 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
fuelweb_test/models/fuel_web_client.py
View File

@ -1242,31 +1242,6 @@ class FuelWebClient(object):
size += volume['size']
return size
@logwrap
def update_redhat_credentials(
self, license_type=help_data.REDHAT_LICENSE_TYPE,
username=help_data.REDHAT_USERNAME,
password=help_data.REDHAT_PASSWORD,
satellite_host=help_data.REDHAT_SATELLITE_HOST,
activation_key=help_data.REDHAT_ACTIVATION_KEY):
# release name is in environment variable OPENSTACK_RELEASE
release_id = self.client.get_release_id('RHOS')
self.client.update_redhat_setup({
"release_id": release_id,
"username": username,
"license_type": license_type,
"satellite": satellite_host,
"password": password,
"activation_key": activation_key})
tasks = self.client.get_tasks()
# wait for 'redhat_setup' task only. Front-end works same way
for task in tasks:
if task['name'] == 'redhat_setup' \
and task['result']['release_info']['release_id'] \
== release_id:
return self.task_wait(task, 60 * 120)
@logwrap
def update_vlan_network_fixed(
self, cluster_id, amount=1, network_size=256):

5
fuelweb_test/models/nailgun_client.py
View File

@ -309,11 +309,6 @@ class NailgunClient(object):
def get_notifications(self):
return self.client.get("/api/notifications")
@logwrap
@json_parse
def update_redhat_setup(self, data):
return self.client.post("/api/redhat/setup", data=data)
@logwrap
@json_parse
def generate_logs(self):

7
fuelweb_test/settings.py
View File

@ -38,16 +38,9 @@ PUBLIC_TEST_IP = os.environ.get('PUBLIC_TEST_IP', '8.8.8.8')
OPENSTACK_RELEASE_CENTOS = 'centos'
OPENSTACK_RELEASE_UBUNTU = 'ubuntu'
OPENSTACK_RELEASE_REDHAT = 'rhos 3.0 for rhel 6.4'
OPENSTACK_RELEASE = os.environ.get(
'OPENSTACK_RELEASE', OPENSTACK_RELEASE_UBUNTU).lower()
REDHAT_LICENSE_TYPE = os.environ.get('REDHAT_LICENSE_TYPE')
REDHAT_USERNAME = os.environ.get('REDHAT_USERNAME')
REDHAT_PASSWORD = os.environ.get('REDHAT_PASSWORD')
REDHAT_SATELLITE_HOST = os.environ.get('REDHAT_SATELLITE_HOST')
REDHAT_ACTIVATION_KEY = os.environ.get('REDHAT_ACTIVATION_KEY')
DEPLOYMENT_MODE_SIMPLE = "multinode"
DEPLOYMENT_MODE_HA = "ha_compact"
DEPLOYMENT_MODE = os.environ.get("DEPLOYMENT_MODE", DEPLOYMENT_MODE_HA)

8
fuelweb_test/tests/base_test_case.py
View File

@ -18,8 +18,6 @@ from proboscis import test
from fuelweb_test.helpers.decorators import log_snapshot_after_test
from fuelweb_test.helpers.utils import timestat
from fuelweb_test.models.environment import EnvironmentModel
from fuelweb_test.settings import OPENSTACK_RELEASE
from fuelweb_test.settings import OPENSTACK_RELEASE_REDHAT
from fuelweb_test.settings import REPLACE_DEFAULT_REPOS
@ -97,12 +95,6 @@ class SetupEnvironment(TestBasic):
self.check_run("ready")
self.env.revert_snapshot("empty", skip_timesync=True)
if OPENSTACK_RELEASE == OPENSTACK_RELEASE_REDHAT:
self.fuel_web.update_redhat_credentials()
self.fuel_web.assert_release_state(
OPENSTACK_RELEASE_REDHAT,
state='available'
)
self.fuel_web.get_nailgun_version()
self.env.make_snapshot("ready", is_make=True)

7
fuelweb_test/tests/test_ceph.py
View File

@ -12,7 +12,6 @@
# License for the specific language governing permissions and limitations
# under the License.
import proboscis
from six import BytesIO
import time
@ -525,9 +524,6 @@ class VmBackedWithCephMigrationBasic(TestBasic):
Snapshot vm_backed_with_ceph_live_migration
"""
if settings.OPENSTACK_RELEASE == settings.OPENSTACK_RELEASE_REDHAT:
raise proboscis.SkipTest()
self.env.revert_snapshot("ready_with_3_slaves")
cluster_id = self.fuel_web.create_cluster(
@ -745,9 +741,6 @@ class CheckCephPartitionsAfterReboot(TestBasic):
Snapshot check_ceph_partitions_after_reboot
"""
if settings.OPENSTACK_RELEASE == settings.OPENSTACK_RELEASE_REDHAT:
raise proboscis.SkipTest()
self.env.revert_snapshot("ready_with_3_slaves")
cluster_id = self.fuel_web.create_cluster(

6
fuelweb_test/tests/test_pullrequest.py
View File

@ -12,13 +12,10 @@
# License for the specific language governing permissions and limitations
# under the License.
from proboscis import SkipTest
from proboscis import test
from fuelweb_test.helpers.decorators import log_snapshot_after_test
from fuelweb_test.settings import DEPLOYMENT_MODE, NEUTRON_ENABLE
from fuelweb_test.settings import OPENSTACK_RELEASE
from fuelweb_test.settings import OPENSTACK_RELEASE_REDHAT
from fuelweb_test.tests.base_test_case import SetupEnvironment
from fuelweb_test.tests.base_test_case import TestBasic
@ -43,9 +40,6 @@ class TestPullRequest(TestBasic):
Snapshot: deploy_pr_ha
"""
if OPENSTACK_RELEASE == OPENSTACK_RELEASE_REDHAT:
raise SkipTest()
self.env.revert_snapshot("ready_with_3_slaves")
settings = None

10
fuelweb_test/tests/test_services.py
View File

@ -15,7 +15,6 @@
from __future__ import division
from proboscis import asserts
from proboscis import SkipTest
from proboscis import test
from proboscis.asserts import assert_equal
@ -53,9 +52,6 @@ class SaharaHAOneController(TestBasic):
Duration 65m
Snapshot: deploy_sahara_ha_one_controller_gre
"""
if settings.OPENSTACK_RELEASE == settings.OPENSTACK_RELEASE_REDHAT:
raise SkipTest()
LOGGER.debug('Check MD5 sum of Vanilla2 image')
check_image = checkers.check_image(
settings.SERVTEST_SAHARA_VANILLA_2_IMAGE,
@ -159,9 +155,6 @@ class SaharaHA(TestBasic):
Snapshot: deploy_sahara_ha_gre
"""
if settings.OPENSTACK_RELEASE == settings.OPENSTACK_RELEASE_REDHAT:
raise SkipTest()
LOGGER.debug('Check MD5 sum of Vanilla2 image')
check_image = checkers.check_image(
settings.SERVTEST_SAHARA_VANILLA_2_IMAGE,
@ -265,9 +258,6 @@ class MuranoHAOneController(TestBasic):
Duration 40m
Snapshot: deploy_murano_ha_one_controller_gre
"""
if settings.OPENSTACK_RELEASE == settings.OPENSTACK_RELEASE_REDHAT:
raise SkipTest()
self.env.revert_snapshot("ready_with_3_slaves")
data = {

7
fuelweb_test/tests/tests_strength/test_huge_environments.py
View File

@ -12,7 +12,6 @@
# License for the specific language governing permissions and limitations
# under the License.
from proboscis import SkipTest
from proboscis import test
from fuelweb_test.helpers.decorators import log_snapshot_after_test
@ -43,9 +42,6 @@ class HugeEnvironments(base_test_case.TestBasic):
Duration 150m
"""
if settings.OPENSTACK_RELEASE == settings.OPENSTACK_RELEASE_REDHAT:
raise SkipTest()
self.env.revert_snapshot("ready_with_9_slaves")
cluster_id = self.fuel_web.create_cluster(
@ -107,9 +103,6 @@ class HugeEnvironments(base_test_case.TestBasic):
Duration 100m
"""
if settings.OPENSTACK_RELEASE == settings.OPENSTACK_RELEASE_REDHAT:
raise SkipTest()
self.env.revert_snapshot("ready_with_9_slaves")
cluster_id = self.fuel_web.create_cluster(

8
fuelweb_test/tests/tests_strength/test_restart.py
View File

@ -16,13 +16,11 @@ import time
from fuelweb_test.helpers.decorators import log_snapshot_after_test
from fuelweb_test import logger
from fuelweb_test import ostf_test_mapping as map_ostf
from fuelweb_test import settings
from fuelweb_test.settings import DEPLOYMENT_MODE
from fuelweb_test.tests.base_test_case import SetupEnvironment
from fuelweb_test.tests.base_test_case import TestBasic
from devops.helpers.helpers import wait
from proboscis import SkipTest
from proboscis import test
@ -48,9 +46,6 @@ class CephRestart(TestBasic):
Duration 90m
Snapshot None
"""
if settings.OPENSTACK_RELEASE == settings.OPENSTACK_RELEASE_REDHAT:
raise SkipTest()
self.env.revert_snapshot("ceph_ha_one_controller_with_cinder")
cluster_id = self.fuel_web.get_last_created_cluster()
@ -113,9 +108,6 @@ class CephRestart(TestBasic):
Snapshot ceph_ha_restart
"""
if settings.OPENSTACK_RELEASE == settings.OPENSTACK_RELEASE_REDHAT:
raise SkipTest()
self.env.revert_snapshot("ceph_ha")
# Wait until MySQL Galera is UP on some controller