From 44d1e135eced7afe13b8772a610ae5cdae310b68 Mon Sep 17 00:00:00 2001 From: Ryota MIBU Date: Mon, 11 Sep 2017 13:45:47 +0000 Subject: fix package path and move files under doctor_tests Change-Id: Ibde6a36c43064e5fbea1a0b7a9b49349c343e42f Signed-off-by: Ryota MIBU --- tests/scenario/__init__.py | 8 ----- tests/scenario/common.py | 28 --------------- tests/scenario/network_failure.py | 71 --------------------------------------- 3 files changed, 107 deletions(-) delete mode 100644 tests/scenario/__init__.py delete mode 100644 tests/scenario/common.py delete mode 100644 tests/scenario/network_failure.py (limited to 'tests/scenario') diff --git a/tests/scenario/__init__.py b/tests/scenario/__init__.py deleted file mode 100644 index 48893ae6..00000000 --- a/tests/scenario/__init__.py +++ /dev/null @@ -1,8 +0,0 @@ -############################################################################## -# Copyright (c) 2017 ZTE Corporation and others. -# -# All rights reserved. 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 -############################################################################## diff --git a/tests/scenario/common.py b/tests/scenario/common.py deleted file mode 100644 index a33c50ff..00000000 --- a/tests/scenario/common.py +++ /dev/null @@ -1,28 +0,0 @@ -############################################################################## -# Copyright (c) 2017 ZTE Corporation and others. -# -# All rights reserved. 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 sys -from common.utils import match_rep_in_file - - -def calculate_notification_time(): - log_file = '{0}/{1}'.format(sys.path[0], 'doctor.log') - - reg = '(?<=doctor monitor detected at )\d+.\d+' - result = match_rep_in_file(reg, log_file) - if not result: - raise Exception('Can not match detected time') - detected = result.group(0) - - reg = '(?<=doctor consumer notified at )\d+.\d+' - result = match_rep_in_file(reg, log_file) - if not result: - raise Exception('Can not match notified time') - notified = result.group(0) - - return float(notified) - float(detected) \ No newline at end of file diff --git a/tests/scenario/network_failure.py b/tests/scenario/network_failure.py deleted file mode 100644 index e9a239db..00000000 --- a/tests/scenario/network_failure.py +++ /dev/null @@ -1,71 +0,0 @@ -############################################################################## -# Copyright (c) 2017 ZTE Corporation and others. -# -# All rights reserved. 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 -############################################################################## -from identity_auth import get_session -from os_clients import nova_client -from common.utils import SSHClient - -LINK_DOWN_SCRIPT = """ -#!/bin/bash -x -dev=$(sudo ip a | awk '/ {compute_ip}\//{{print $NF}}') -sleep 1 -sudo ip link set $dev down -echo "doctor set link down at" $(date "+%s.%N") -sleep 10 -sudo ip link set $dev up -sleep 1 -""" - - -class NetworkFault(object): - - def __init__(self, conf, installer, log): - self.conf = conf - self.log = log - self.installer = installer - self.nova = nova_client(self.conf.nova_version, get_session()) - self.host = None - self.GetLog = False - - def start(self, host): - self.log.info('fault inject start......') - self._set_link_down(host.ip) - self.host = host - self.log.info('fault inject end......') - - def cleanup(self): - self.log.info('fault inject cleanup......') - self.get_disable_network_log() - - def get_disable_network_log(self): - if self.GetLog: - self.log.info('Already get the disable_netork.log from down_host......') - return - if self.host is not None: - client = SSHClient(self.host.ip, - self.installer.node_user_name, - key_filename=self.installer.get_ssh_key_from_installer(), - look_for_keys=True, - log=self.log) - client.scp('disable_network.log', './disable_network.log', method='get') - self.log.info('Get the disable_netork.log from down_host(host_name:%s, host_ip:%s)' - % (self.host.name, self.host.ip)) - self.GetLog = True - - def _set_link_down(self, compute_ip): - file_name = './disable_network.sh' - with open(file_name, 'w') as file: - file.write(LINK_DOWN_SCRIPT.format(compute_ip=compute_ip)) - client = SSHClient(compute_ip, - self.installer.node_user_name, - key_filename=self.installer.get_ssh_key_from_installer(), - look_for_keys=True, - log=self.log) - client.scp('./disable_network.sh', 'disable_network.sh') - command = 'bash disable_network.sh > disable_network.log 2>&1 &' - client.ssh(command) -- cgit 1.2.3-korg