openstack
/
fuel-qa
Code Issues Proposed changes

Updating Sahara related things for Sahara system tests 

In MOS 7.0 we will have the Kilo version of Sahara. In accordance with
that we had to update OSTF for Sahara and https://review.openstack.org/#/c/191497
was successfully merged. Now we have to update Sahara system tests.

Closes-Bug: #1477521

Change-Id: I06295392fe523f22fff158b63d4909ced6256575
This commit is contained in:
Yaroslav Lobankov 2015-07-23 14:31:33 +03:00
parent 9e47320d94
commit 3b54a1a15e
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fuelweb_test/settings.py
View File

@ -257,11 +257,10 @@ SERVTEST_USERNAME = os.environ.get('SERVTEST_USERNAME', 'admin')
SERVTEST_PASSWORD = os.environ.get('SERVTEST_PASSWORD', SERVTEST_USERNAME)
SERVTEST_TENANT = os.environ.get('SERVTEST_TENANT', SERVTEST_USERNAME)
SERVTEST_SAHARA_VANILLA_2_IMAGE = ('sahara-juno-vanilla-'
'2.4.1-ubuntu-14.04.qcow2')
SERVTEST_SAHARA_VANILLA_2_IMAGE_NAME = 'sahara-juno-vanilla-2.4.1-ubuntu-14.04'
SERVTEST_SAHARA_VANILLA_2_IMAGE_MD5 = 'e32bef0d3bc4b2c906f5499e14f9b377'
SERVTEST_SAHARA_VANILLA_2_IMAGE_META = {'_sahara_tag_2.4.1': 'True',
SERVTEST_SAHARA_VANILLA_2_IMAGE = 'sahara-kilo-vanilla-2.6-ubuntu-14.04.qcow2'
SERVTEST_SAHARA_VANILLA_2_IMAGE_NAME = 'sahara-kilo-vanilla-2.6-ubuntu-14.04'
SERVTEST_SAHARA_VANILLA_2_IMAGE_MD5 = 'ebfc24a111740acddce713a991bd5607'
SERVTEST_SAHARA_VANILLA_2_IMAGE_META = {'_sahara_tag_2.6.0': 'True',
'_sahara_tag_vanilla': 'True',
'_sahara_username': 'ubuntu'}

10
fuelweb_test/tests/test_services.py
View File

@ -93,7 +93,10 @@ class SaharaHAOneController(TestBasic):
_ip = self.fuel_web.get_nailgun_node_by_name("slave-01")['ip']
checkers.verify_service(
self.env.d_env.get_ssh_to_remote(_ip),
service_name='sahara-all')
service_name='sahara-api')
checkers.verify_service(
self.env.d_env.get_ssh_to_remote(_ip),
service_name='sahara-engine')
LOGGER.debug('Run all sanity and smoke tests')
path_to_tests = 'fuel_health.tests.sanity.test_sanity_sahara.'
@ -199,7 +202,10 @@ class SaharaHA(TestBasic):
_ip = self.fuel_web.get_nailgun_node_by_name(slave)['ip']
checkers.verify_service(
self.env.d_env.get_ssh_to_remote(_ip),
service_name='sahara-all')
service_name='sahara-api')
checkers.verify_service(
self.env.d_env.get_ssh_to_remote(_ip),
service_name='sahara-engine')
LOGGER.debug('Run all sanity and smoke tests')
path_to_tests = 'fuel_health.tests.sanity.test_sanity_sahara.'