From cbf819bd0d4e1ccfe854bbf168169b09dd85252c Mon Sep 17 00:00:00 2001
From: Georg Kunz <georg.kunz@ericsson.com>
Date: Fri, 11 May 2018 03:24:38 +0200
Subject: Adding OpenStack controller database HA test case

Adding the OpenStack controller database HA test case (Yardstick tc090)
to Dovetail and the proposed_tests test suite.

JIRA: DOVETAIL-654

Change-Id: I4d20b907de8df2e9567891354b49e832cce13c7c
Signed-off-by: Georg Kunz <georg.kunz@ericsson.com>
---
 etc/compliance/proposed_tests.yml | 31 ++++++++++++++++---------------
 etc/conf/yardstick_config.yml     |  4 ----
 etc/testcase/ha.database.yml      | 11 +++++++++++
 3 files changed, 27 insertions(+), 19 deletions(-)
 create mode 100644 etc/testcase/ha.database.yml

(limited to 'etc')

diff --git a/etc/compliance/proposed_tests.yml b/etc/compliance/proposed_tests.yml
index d5e9eef9..5a64bc3e 100644
--- a/etc/compliance/proposed_tests.yml
+++ b/etc/compliance/proposed_tests.yml
@@ -4,24 +4,25 @@ proposed_tests:
   testcases_list:
   # proposed test cases for 2nd release
     # smoke
-#    - dovetail.tempest.compute
-#    - dovetail.tempest.identity_v2
-#    - dovetail.tempest.identity_v3
-#    - dovetail.tempest.image
-#    - dovetail.tempest.network
-#    - dovetail.tempest.orchestration
-#    - dovetail.tempest.volume
+    - dovetail.tempest.compute
+    - dovetail.tempest.identity_v2
+    - dovetail.tempest.identity_v3
+    - dovetail.tempest.image
+    - dovetail.tempest.network
+    - dovetail.tempest.orchestration
+    - dovetail.tempest.volume
     # HA
-#    - dovetail.ha.controller_restart
-#    - dovetail.ha.rabbitmq
-#    - dovetail.ha.neutron_l3_agent
+    - dovetail.ha.controller_restart
+    - dovetail.ha.rabbitmq
+    - dovetail.ha.neutron_l3_agent
+    - dovetail.ha.database
     # vnf
-#    - dovetail.vnf.vims
+    - dovetail.vnf.vims
     # stress
-#    - dovetail.stress.ping
+    - dovetail.stress.ping
     # sdnvpn
-#    - dovetail.tempest.bgpvpn
+    - dovetail.tempest.bgpvpn
     # patrole
-#    - dovetail.security.patrole
+    - dovetail.security.patrole
     # Neutron trunk port Tempest tests
-#    - dovetail.tempest.neutron_trunk_ports
+    - dovetail.tempest.neutron_trunk_ports
diff --git a/etc/conf/yardstick_config.yml b/etc/conf/yardstick_config.yml
index e318caef..7e7ab73b 100644
--- a/etc/conf/yardstick_config.yml
+++ b/etc/conf/yardstick_config.yml
@@ -32,7 +32,3 @@ yardstick:
     dir: '/tmp/yardstick'
     file_path: 'yardstick.log'
   openrc: '/etc/yardstick/openstack.creds'
-  copy_file_in_container:
-  -
-    src_file: 'pre_config/id_rsa'
-    dest_file: '/root/.ssh/id_rsa'
diff --git a/etc/testcase/ha.database.yml b/etc/testcase/ha.database.yml
new file mode 100644
index 00000000..adcac251
--- /dev/null
+++ b/etc/testcase/ha.database.yml
@@ -0,0 +1,11 @@
+---
+dovetail.ha.database:
+  name: dovetail.ha.database
+  objective: >
+    This test case verifies the high-availability of the OpenStack
+    controller database instance.
+  validate:
+    type: yardstick
+    testcase: opnfv_yardstick_tc090
+  report:
+    sub_testcase_list:
-- 
cgit 1.2.3-korg