X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Fopnfv_tests%2Fopenstack%2Fsnaps%2Fapi_check.py;h=d4204bff1f034bde27275686a27f5ca8b8b6a07f;hb=refs%2Fchanges%2F61%2F58961%2F4;hp=50f67094b077a2b3aceb83975632a1246b64eb54;hpb=70fb2675fb849e27d0494dd736b0df3b49ba03ca;p=functest.git diff --git a/functest/opnfv_tests/openstack/snaps/api_check.py b/functest/opnfv_tests/openstack/snaps/api_check.py index 50f67094b..d4204bff1 100644 --- a/functest/opnfv_tests/openstack/snaps/api_check.py +++ b/functest/opnfv_tests/openstack/snaps/api_check.py @@ -1,14 +1,18 @@ -# Copyright (c) 2015 All rights reserved +#!/usr/bin/env python + +# Copyright (c) 2017 Cable Television Laboratories, Inc. and others. +# # 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 -import unittest +"""api_check test case implementation""" -from snaps import test_suite_builder +import unittest +from functest.opnfv_tests.openstack.snaps import snaps_suite_builder from functest.opnfv_tests.openstack.snaps.snaps_test_runner import \ SnapsTestRunner @@ -26,8 +30,21 @@ class ApiCheck(SnapsTestRunner): self.suite = unittest.TestSuite() - test_suite_builder.add_openstack_api_tests( + def run(self, **kwargs): + """ + Builds the test suite then calls super.run() + :param kwargs: the arguments to pass on + :return: + """ + snaps_suite_builder.add_openstack_client_tests( suite=self.suite, os_creds=self.os_creds, ext_net_name=self.ext_net_name, use_keystone=self.use_keystone) + snaps_suite_builder.add_openstack_api_tests( + suite=self.suite, + os_creds=self.os_creds, + ext_net_name=self.ext_net_name, + use_keystone=self.use_keystone, + image_metadata=self.image_metadata) + return super(ApiCheck, self).run()