Reduce log level during revert snapshot fuelweb.client.get_releases waiting
Reduce log level during revert snapshot fuelweb.client.get_releases waiting: Set logging.CRITICAL for stdout due to @logwrap on method Replace deprecated method callse by actual new in environment.py: _wait -> wait_pass _tcp_ping -> tcp_ping_ Closes-bug: #1602236 Change-Id: Ic59c4cb5a29285b19f4143a4280ea04e9093a28c
This commit is contained in:
parent
488c60b1a9
commit
6952a01a16
|
@ -12,11 +12,12 @@
|
|||
# License for the specific language governing permissions and limitations
|
||||
# under the License.
|
||||
|
||||
import logging
|
||||
import re
|
||||
import time
|
||||
|
||||
from devops.helpers.helpers import _tcp_ping
|
||||
from devops.helpers.helpers import _wait
|
||||
from devops.helpers.helpers import tcp_ping_
|
||||
from devops.helpers.helpers import wait_pass
|
||||
from devops.helpers.helpers import wait
|
||||
from devops.helpers.ntp import sync_time
|
||||
from devops.models import Environment
|
||||
|
@ -306,9 +307,9 @@ class EnvironmentModel(object):
|
|||
if not skip_timesync:
|
||||
self.sync_time()
|
||||
try:
|
||||
with QuietLogger():
|
||||
with QuietLogger(upper_log_level=logging.CRITICAL):
|
||||
# TODO(astudenov): add timeout_msg
|
||||
_wait(
|
||||
wait_pass(
|
||||
self.fuel_web.client.get_releases,
|
||||
expected=(
|
||||
exceptions.RetriableConnectionFailure,
|
||||
|
@ -322,7 +323,7 @@ class EnvironmentModel(object):
|
|||
'Unexpected exception while tried to get releases')
|
||||
if not skip_slaves_check:
|
||||
# TODO(astudenov): add timeout_msg
|
||||
_wait(lambda: self.check_slaves_are_ready(), timeout=60 * 6)
|
||||
wait_pass(lambda: self.check_slaves_are_ready(), timeout=60 * 6)
|
||||
return True
|
||||
|
||||
def set_admin_ssh_password(self):
|
||||
|
@ -451,7 +452,7 @@ class EnvironmentModel(object):
|
|||
def wait_for_provisioning(self,
|
||||
timeout=settings.WAIT_FOR_PROVISIONING_TIMEOUT):
|
||||
# TODO(astudenov): add timeout_msg
|
||||
_wait(lambda: _tcp_ping(
|
||||
wait_pass(lambda: tcp_ping_(
|
||||
self.d_env.nodes(
|
||||
).admin.get_ip_address_by_network_name
|
||||
(self.d_env.admin_net), 22), timeout=timeout)
|
||||
|
@ -463,7 +464,7 @@ class EnvironmentModel(object):
|
|||
def check_ssh_connection():
|
||||
"""Try to close fuelmenu and check ssh connection"""
|
||||
try:
|
||||
_tcp_ping(
|
||||
tcp_ping_(
|
||||
self.d_env.nodes(
|
||||
).admin.get_ip_address_by_network_name
|
||||
(self.d_env.admin_net), 22)
|
||||
|
|
Loading…
Reference in New Issue