diff options
| author |   Cédric Ollivier <cedric.ollivier@orange.com> | 2019-09-26 17:29:32 +0200 |
|---|---|---|
| committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2019-09-28 12:12:19 +0200 |
| commit | 0837a745c81ed2a6e7df097f60d227d5997c805e (patch) | |
| tree | 9f6dd8ea9b2421e13fa8f98d83fec8c3dd56424e /functest/opnfv_tests/openstack | |
| parent | cc3405c86bf9de96b09267176d5582d4a7908f56 (diff) | |
Allow getting service via any endpoint
It overrides the default implementation provided by Shade.
Change-Id: I3ad2f8ba543be4483f108c4bd7765018dddc5b19
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
Diffstat (limited to 'functest/opnfv_tests/openstack')
| -rw-r--r-- | functest/opnfv_tests/openstack/api/connection_check.py | 10 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/rally/rally.py | 1 | ||||
| -rw-r--r-- | functest/opnfv_tests/openstack/vmtp/vmtp.py | 1 |
3 files changed, 5 insertions, 7 deletions
diff --git a/functest/opnfv_tests/openstack/api/connection_check.py b/functest/opnfv_tests/openstack/api/connection_check.py index cebb63108..927b73bfa 100644 --- a/functest/opnfv_tests/openstack/api/connection_check.py +++ b/functest/opnfv_tests/openstack/api/connection_check.py @@ -16,7 +16,6 @@ import os_client_config import shade from xtesting.core import testcase -from functest.utils import env from functest.utils import functest_utils @@ -29,7 +28,7 @@ class ConnectionCheck(testcase.TestCase): "list_endpoints", "list_floating_ip_pools", "list_floating_ips", "list_hypervisors", "list_keypairs", "list_networks", "list_ports", "list_role_assignments", "list_roles", "list_routers", "list_servers", - "list_services", "list_subnets"] + "list_subnets"] def __init__(self, **kwargs): if "case_name" not in kwargs: @@ -48,11 +47,8 @@ class ConnectionCheck(testcase.TestCase): try: assert self.cloud self.start_time = time.time() - if env.get('PUBLIC_ENDPOINT_ONLY').lower() == 'true': - self.__logger.warning( - "Listing services is skipped " - "because the admin endpoints are unreachable") - self.func_list.remove("list_services") + self.__logger.debug( + "list_services: %s", functest_utils.list_services(self.cloud)) for func in self.func_list: self.__logger.debug( "%s: %s", func, getattr(self.cloud, func)()) diff --git a/functest/opnfv_tests/openstack/rally/rally.py b/functest/opnfv_tests/openstack/rally/rally.py index 9a04f3873..d9fb1fb5c 100644 --- a/functest/opnfv_tests/openstack/rally/rally.py +++ b/functest/opnfv_tests/openstack/rally/rally.py @@ -172,6 +172,7 @@ class RallyBase(singlevm.VmReady2): @staticmethod def create_rally_deployment(environ=None): + # pylint: disable=unexpected-keyword-arg """Create new rally deployment""" # set the architecture to default pod_arch = env.get("POD_ARCH") diff --git a/functest/opnfv_tests/openstack/vmtp/vmtp.py b/functest/opnfv_tests/openstack/vmtp/vmtp.py index 317a78671..d102f6440 100644 --- a/functest/opnfv_tests/openstack/vmtp/vmtp.py +++ b/functest/opnfv_tests/openstack/vmtp/vmtp.py @@ -125,6 +125,7 @@ class Vmtp(singlevm.VmReady2): conf.write(yaml.dump(vmtp_conf)) def run_vmtp(self): + # pylint: disable=unexpected-keyword-arg """Run Vmtp and generate charts Raises: Exception on error |