From b25c1371f82911ea26b8c893b6612bb5ae0c8c19 Mon Sep 17 00:00:00 2001 From: SerenaFeng Date: Thu, 1 Mar 2018 20:03:59 +0800 Subject: leverage data_files to eliminate so many hardcoded abs_path_seekings 1. mv conf/ userconfig/ compliance/ patch to etc/ 2. after installation etc/ will be put under /etc/dovetail 3. leveraging /etc/dovetail in coding Change-Id: Icf9cb00ff7fc7cf35755f60d3e258b23e2c70839 Signed-off-by: SerenaFeng --- ...Yardstick-HA-test-cases-SLA-and-log-level.patch | 133 +++++++++++++++++++++ 1 file changed, 133 insertions(+) create mode 100644 etc/patch/0001-Adjust-Yardstick-HA-test-cases-SLA-and-log-level.patch (limited to 'etc/patch/0001-Adjust-Yardstick-HA-test-cases-SLA-and-log-level.patch') diff --git a/etc/patch/0001-Adjust-Yardstick-HA-test-cases-SLA-and-log-level.patch b/etc/patch/0001-Adjust-Yardstick-HA-test-cases-SLA-and-log-level.patch new file mode 100644 index 00000000..8c9589ca --- /dev/null +++ b/etc/patch/0001-Adjust-Yardstick-HA-test-cases-SLA-and-log-level.patch @@ -0,0 +1,133 @@ +From b7c13b5a7e07abdf4d3631049625461271fa5c5b Mon Sep 17 00:00:00 2001 +From: cvp +Date: Tue, 26 Sep 2017 03:59:54 +0000 +Subject: [PATCH] Adjust Yardstick HA test cases SLA and log level + +--- + tests/opnfv/test_cases/opnfv_yardstick_tc019.yaml | 4 ++-- + tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml | 4 ++-- + tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml | 4 ++-- + tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml | 4 ++-- + tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml | 4 ++-- + tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml | 4 ++-- + yardstick/__init__.py | 2 +- + 7 files changed, 13 insertions(+), 13 deletions(-) + +diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc019.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc019.yaml +index 5d3057d..c1d3645 100644 +--- a/tests/opnfv/test_cases/opnfv_yardstick_tc019.yaml ++++ b/tests/opnfv/test_cases/opnfv_yardstick_tc019.yaml +@@ -34,10 +34,10 @@ scenarios: + - monitor_type: "process" + process_name: "nova-api" + host: node1 +- monitor_time: 20 ++ monitor_time: 30 + monitor_number: 3 + sla: +- max_recover_time: 20 ++ max_recover_time: 30 + + nodes: + node1: node1.LF +diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml +index d851d5a..8c7348b 100644 +--- a/tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml ++++ b/tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml +@@ -33,10 +33,10 @@ scenarios: + - monitor_type: "process" + process_name: "neutron-server" + host: node1 +- monitor_time: 20 ++ monitor_time: 30 + monitor_number: 3 + sla: +- max_recover_time: 20 ++ max_recover_time: 30 + + nodes: + node1: node1.LF +diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml +index ad81a14..635e4d9 100644 +--- a/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml ++++ b/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml +@@ -33,10 +33,10 @@ scenarios: + - monitor_type: "process" + process_name: "keystone" + host: node1 +- monitor_time: 20 ++ monitor_time: 30 + monitor_number: 3 + sla: +- max_recover_time: 20 ++ max_recover_time: 30 + + nodes: + node1: node1.LF +diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml +index cc99036..57fa739 100644 +--- a/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml ++++ b/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml +@@ -33,10 +33,10 @@ scenarios: + - monitor_type: "process" + process_name: "glance-api" + host: node1 +- monitor_time: 20 ++ monitor_time: 30 + monitor_number: 3 + sla: +- max_recover_time: 20 ++ max_recover_time: 30 + + nodes: + node1: node1.LF +diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml +index 237f845..06ad641 100644 +--- a/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml ++++ b/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml +@@ -33,10 +33,10 @@ scenarios: + - monitor_type: "process" + process_name: "cinder-api" + host: node1 +- monitor_time: 20 ++ monitor_time: 30 + monitor_number: 3 + sla: +- max_recover_time: 20 ++ max_recover_time: 30 + + nodes: + node1: node1.LF +diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml +index 9e05cc8..e3f0934 100644 +--- a/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml ++++ b/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml +@@ -32,10 +32,10 @@ scenarios: + key: "service-status" + process_name: "haproxy" + host: node1 +- monitor_time: 20 ++ monitor_time: 30 + monitor_number: 3 + sla: +- max_recover_time: 20 ++ max_recover_time: 30 + + - + monitor_type: "openstack-cmd" +diff --git a/yardstick/__init__.py b/yardstick/__init__.py +index 2f5ae9f..973bfa2 100644 +--- a/yardstick/__init__.py ++++ b/yardstick/__init__.py +@@ -44,7 +44,7 @@ def _init_logging(): + _LOG_STREAM_HDLR.setLevel(logging.INFO) + # don't append to log file, clobber + _LOG_FILE_HDLR.setFormatter(_LOG_FORMATTER) +- _LOG_FILE_HDLR.setLevel(logging.DEBUG) ++ _LOG_FILE_HDLR.setLevel(logging.INFO) + + del logging.root.handlers[:] + logging.root.addHandler(_LOG_STREAM_HDLR) +-- +1.9.1 + -- cgit 1.2.3-korg