tempest: Obey ssh_timeout config option
The patch creates a new in-tree class that overrides default value for tempest ssh.Client to the one defined by ssh_timeout config option. Change-Id: I418519866e3cbd486fe0ffec23e1553ea0891420
This commit is contained in:
parent
617fc6087b
commit
1a3cd5bae5
|
@ -0,0 +1,24 @@
|
||||||
|
# All Rights Reserved.
|
||||||
|
#
|
||||||
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
||||||
|
# not use this file except in compliance with the License. You may obtain
|
||||||
|
# a copy of the License at
|
||||||
|
#
|
||||||
|
# http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
#
|
||||||
|
# Unless required by applicable law or agreed to in writing, software
|
||||||
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||||
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||||
|
# License for the specific language governing permissions and limitations
|
||||||
|
# under the License.
|
||||||
|
|
||||||
|
from tempest.lib.common import ssh
|
||||||
|
|
||||||
|
from neutron.tests.tempest import config
|
||||||
|
|
||||||
|
|
||||||
|
class Client(ssh.Client):
|
||||||
|
def __init__(self, *args, **kwargs):
|
||||||
|
if 'timeout' not in kwargs:
|
||||||
|
kwargs['timeout'] = config.CONF.validation.ssh_timeout
|
||||||
|
super(Client, self).__init__(*args, **kwargs)
|
|
@ -17,12 +17,12 @@ import netaddr
|
||||||
from oslo_log import log
|
from oslo_log import log
|
||||||
|
|
||||||
from tempest.common import waiters
|
from tempest.common import waiters
|
||||||
from tempest.lib.common import ssh
|
|
||||||
from tempest.lib.common.utils import data_utils
|
from tempest.lib.common.utils import data_utils
|
||||||
from tempest.lib.common.utils import test_utils
|
from tempest.lib.common.utils import test_utils
|
||||||
from tempest.lib import exceptions as lib_exc
|
from tempest.lib import exceptions as lib_exc
|
||||||
|
|
||||||
from neutron.tests.tempest.api import base as base_api
|
from neutron.tests.tempest.api import base as base_api
|
||||||
|
from neutron.tests.tempest.common import ssh
|
||||||
from neutron.tests.tempest import config
|
from neutron.tests.tempest import config
|
||||||
from neutron.tests.tempest.scenario import constants
|
from neutron.tests.tempest.scenario import constants
|
||||||
|
|
||||||
|
|
|
@ -15,12 +15,12 @@
|
||||||
|
|
||||||
import netaddr
|
import netaddr
|
||||||
from tempest.common import waiters
|
from tempest.common import waiters
|
||||||
from tempest.lib.common import ssh
|
|
||||||
from tempest.lib.common.utils import data_utils
|
from tempest.lib.common.utils import data_utils
|
||||||
from tempest.lib import decorators
|
from tempest.lib import decorators
|
||||||
from tempest import test
|
from tempest import test
|
||||||
import testscenarios
|
import testscenarios
|
||||||
|
|
||||||
|
from neutron.tests.tempest.common import ssh
|
||||||
from neutron.tests.tempest import config
|
from neutron.tests.tempest import config
|
||||||
from neutron.tests.tempest.scenario import base
|
from neutron.tests.tempest.scenario import base
|
||||||
from neutron.tests.tempest.scenario import constants
|
from neutron.tests.tempest.scenario import constants
|
||||||
|
|
|
@ -17,7 +17,6 @@ import socket
|
||||||
import time
|
import time
|
||||||
|
|
||||||
from oslo_log import log as logging
|
from oslo_log import log as logging
|
||||||
from tempest.lib.common import ssh
|
|
||||||
from tempest.lib import decorators
|
from tempest.lib import decorators
|
||||||
from tempest.lib import exceptions
|
from tempest.lib import exceptions
|
||||||
from tempest import test
|
from tempest import test
|
||||||
|
@ -26,6 +25,7 @@ import testtools
|
||||||
from neutron.common import utils
|
from neutron.common import utils
|
||||||
from neutron.services.qos import qos_consts
|
from neutron.services.qos import qos_consts
|
||||||
from neutron.tests.tempest.api import base as base_api
|
from neutron.tests.tempest.api import base as base_api
|
||||||
|
from neutron.tests.tempest.common import ssh
|
||||||
from neutron.tests.tempest import config
|
from neutron.tests.tempest import config
|
||||||
from neutron.tests.tempest.scenario import base
|
from neutron.tests.tempest.scenario import base
|
||||||
from neutron.tests.tempest.scenario import constants
|
from neutron.tests.tempest.scenario import constants
|
||||||
|
|
|
@ -15,12 +15,12 @@
|
||||||
import netaddr
|
import netaddr
|
||||||
from oslo_log import log as logging
|
from oslo_log import log as logging
|
||||||
from tempest.common import waiters
|
from tempest.common import waiters
|
||||||
from tempest.lib.common import ssh
|
|
||||||
from tempest.lib.common.utils import data_utils
|
from tempest.lib.common.utils import data_utils
|
||||||
from tempest.lib import decorators
|
from tempest.lib import decorators
|
||||||
from tempest import test
|
from tempest import test
|
||||||
|
|
||||||
from neutron.common import utils
|
from neutron.common import utils
|
||||||
|
from neutron.tests.tempest.common import ssh
|
||||||
from neutron.tests.tempest import config
|
from neutron.tests.tempest import config
|
||||||
from neutron.tests.tempest.scenario import base
|
from neutron.tests.tempest.scenario import base
|
||||||
from neutron.tests.tempest.scenario import constants
|
from neutron.tests.tempest.scenario import constants
|
||||||
|
|
Loading…
Reference in New Issue