increase monitor number in cases.

change cases to multi-monitor mode and improve monitor accuracy.

JIRA: YARDSTICK-397

Change-Id: I6840423dd83899b769df76fbee808f9bf5dc4cfd
Signed-off-by: HuanLi <lihuansse@tongji.edu.cn>
(cherry picked from commit ab7292a8e3060bf6feaa830b156089fa70854664)

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc019.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc019.yaml
index 9b720e1..7c7a0c1 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc019.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc019.yaml
@@ -28,12 +28,14 @@ scenarios:
     - monitor_type: "openstack-cmd"
       command_name: "openstack image list"
       monitor_time: 10
+      monitor_number: 3
       sla:
         max_outage_time: 5
     - monitor_type: "process"
       process_name: "nova-api"
       host: node1
       monitor_time: 20
+      monitor_number: 3
       sla:
         max_recover_time: 20
 

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc025.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc025.yaml
index ec3d1c8..4433958 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc025.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc025.yaml
@@ -26,15 +26,19 @@ scenarios:
     - monitor_type: "openstack-cmd"
       command_name: "openstack image list"
       monitor_time: 10
+      monitor_number: 3
     - monitor_type: "openstack-cmd"
       command_name: "openstack router list"
       monitor_time: 10
+      monitor_number: 3
     - monitor_type: "openstack-cmd"
       command_name: "openstack stack list"
       monitor_time: 10
+      monitor_number: 3
     - monitor_type: "openstack-cmd"
       command_name: "openstack volume list"
       monitor_time: 10
+      monitor_number: 3
 
   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 cad6c59..d851d5a 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc045.yaml
@@ -27,12 +27,14 @@ scenarios:
     - monitor_type: "openstack-cmd"
       command_name: "openstack router list"
       monitor_time: 10
+      monitor_number: 3
       sla:
         max_outage_time: 5
     - monitor_type: "process"
       process_name: "neutron-server"
       host: node1
       monitor_time: 20
+      monitor_number: 3
       sla:
         max_recover_time: 20
 

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml
index 38b4754..ad81a14 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc046.yaml
@@ -27,12 +27,14 @@ scenarios:
     - monitor_type: "openstack-cmd"
       command_name: "openstack user list"
       monitor_time: 10
+      monitor_number: 3
       sla:
         max_outage_time: 5
     - monitor_type: "process"
       process_name: "keystone"
       host: node1
       monitor_time: 20
+      monitor_number: 3
       sla:
         max_recover_time: 20
 

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml
index 53df7c6..cc99036 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc047.yaml
@@ -27,12 +27,14 @@ scenarios:
     - monitor_type: "openstack-cmd"
       command_name: "openstack image list"
       monitor_time: 10
+      monitor_number: 3
       sla:
         max_outage_time: 5
     - monitor_type: "process"
       process_name: "glance-api"
       host: node1
       monitor_time: 20
+      monitor_number: 3
       sla:
         max_recover_time: 20
 

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml
index 7457f93..237f845 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc048.yaml
@@ -27,12 +27,14 @@ scenarios:
     - monitor_type: "openstack-cmd"
       command_name: "openstack volume list"
       monitor_time: 10
+      monitor_number: 3
       sla:
         max_outage_time: 5
     - monitor_type: "process"
       process_name: "cinder-api"
       host: node1
       monitor_time: 20
+      monitor_number: 3
       sla:
         max_recover_time: 20
 

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc049.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc049.yaml
index e55345a..ff3ac75 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc049.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc049.yaml
@@ -27,12 +27,14 @@ scenarios:
     - monitor_type: "openstack-cmd"
       command_name: "swift stat"
       monitor_time: 10
+      monitor_number: 3
       sla:
         max_outage_time: 5
     - monitor_type: "process"
       process_name: "swift-proxy"
       host: node1
       monitor_time: 20
+      monitor_number: 3
       sla:
         max_recover_time: 20
 

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml
index 1296c05..0611fd2 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc050.yaml
@@ -70,6 +70,7 @@ scenarios:
           key: "nova-image-list"
           command_name: "openstack image list"
           monitor_time: 10
+          monitor_number: 3
           sla:
             max_outage_time: 5
 
@@ -78,6 +79,7 @@ scenarios:
           key: "neutron-router-list"
           command_name: "openstack router list"
           monitor_time: 10
+          monitor_number: 3
           sla:
             max_outage_time: 5
 
@@ -86,6 +88,7 @@ scenarios:
           key: "heat-stack-list"
           command_name: "openstack stack list"
           monitor_time: 10
+          monitor_number: 3
           sla:
             max_outage_time: 5
 
@@ -94,6 +97,7 @@ scenarios:
           key: "cinder-list"
           command_name: "openstack volume list"
           monitor_time: 10
+          monitor_number: 3
           sla:
             max_outage_time: 5
 

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc051.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc051.yaml
index cf2b515..3921140 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc051.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc051.yaml
@@ -32,6 +32,7 @@ scenarios:
           key: "nova-image-list"
           command_name: "openstack image list"
           monitor_time: 10
+          monitor_number: 3
           sla:
             max_outage_time: 5
 
@@ -40,6 +41,7 @@ scenarios:
           key: "neutron-router-list"
           command_name: "openstack router list"
           monitor_time: 10
+          monitor_number: 3
           sla:
             max_outage_time: 5
 
@@ -48,6 +50,7 @@ scenarios:
           key: "heat-stack-list"
           command_name: "openstack stack list"
           monitor_time: 10
+          monitor_number: 3
           sla:
             max_outage_time: 5
 
@@ -56,6 +59,7 @@ scenarios:
           key: "cinder-list"
           command_name: "openstack volume list"
           monitor_time: 10
+          monitor_number: 3
           sla:
             max_outage_time: 5
 

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc052.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc052.yaml
index 4254e79..5907eb2 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc052.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc052.yaml
@@ -32,6 +32,7 @@ scenarios:
           key: "nova-flavor-list"
           command_name: "openstack flavor list"
           monitor_time: 10
+          monitor_number: 3
           sla:
             max_outage_time: 5
 

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml
index cc5b5cd..9e05cc8 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc053.yaml
@@ -33,6 +33,7 @@ scenarios:
           process_name: "haproxy"
           host: node1
           monitor_time: 20
+          monitor_number: 3
           sla:
             max_recover_time: 20
 
@@ -41,6 +42,7 @@ scenarios:
           key: "list-images"
           command_name: "openstack image list"
           monitor_time: 10
+          monitor_number: 3
           sla:
             max_outage_time: 5
 

diff --git a/tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml b/tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml
index b9bb889..6dd17f8 100644 (file)
--- a/tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml
+++ b/tests/opnfv/test_cases/opnfv_yardstick_tc054.yaml
@@ -35,6 +35,7 @@ scenarios:
           key: "list-images"
           command_name: "openstack image list"
           monitor_time: 10
+          monitor_number: 3
           sla:
             max_outage_time: 5
 
@@ -44,6 +45,7 @@ scenarios:
           key: "vip-mgmt-status"
           host: node2
           monitor_time: 10
+          monitor_number: 3
           sla:
             max_outage_time: 5
           parameter:
@@ -55,6 +57,7 @@ scenarios:
           key: "vip-routerp-status"
           host: node2
           monitor_time: 10
+          monitor_number: 3
           sla:
             max_outage_time: 5
           parameter:
@@ -66,6 +69,7 @@ scenarios:
           key: "vip-router-status"
           host: node2
           monitor_time: 10
+          monitor_number: 3
           sla:
             max_outage_time: 5
           parameter:
@@ -77,6 +81,7 @@ scenarios:
           key: "vip-pub"
           host: node2
           monitor_time: 10
+          monitor_number: 3
           sla:
             max_outage_time: 5
           parameter: