openstack
/
fuel-qa
Code Issues Proposed changes

Implement version check via api 

Fuel client doesn't support ssl
and `fuel fuel-version` fails when
ssl is enabled for master node

Change-Id: I249b1c6400d2041bbcf22ce2b994ffe5f7c0aec3
Closes-Bug:1657764
This commit is contained in:
Alexander Kurenyshev 2017-01-19 17:58:05 +03:00
parent 95c3e710b1
commit b3e5d55228
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fuelweb_test/tests/base_test_case.py
View File

@ -360,9 +360,7 @@ class TestBasic(object):
self.fuel_post_install_actions()
def check_fuel_version(self):
admin_ip = self.env.get_admin_node_ip()
cmd = "fuel fuel-version --json"
output = self.ssh_manager.check_call(admin_ip, cmd).stdout_json
output = self.fuel_web.client.get_api_version()
fuel_release = output['release']
err_msg = "Fuel version should be `{}` but it is `{}`".format(
settings.FUEL_RELEASE_VERSION, fuel_release)

6
fuelweb_test/tests/test_ssl.py
View File

@ -12,6 +12,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from proboscis import SkipTest
from proboscis import test
from proboscis.asserts import assert_equal
# pylint: disable=import-error
@ -83,7 +84,10 @@ class SSL_Tests(TestBasic):
self.show_step(2)
self.show_step(3)
self.show_step(4)
self.env.revert_snapshot("master_node_with_https_only")
snapshot_name = 'master_node_with_https_only'
if not self.env.d_env.has_snapshot(snapshot_name):
raise SkipTest('Snapshot {} not found'.format(snapshot_name))
self.env.revert_snapshot(snapshot_name)
self.show_step(5)
cluster_id = self.fuel_web.create_cluster(
name=self.__class__.__name__,