From 177648d906d522e7ddb6d282f43c5648e93b09fb Mon Sep 17 00:00:00 2001
From: Lingxian Kong <anlin.kong@gmail.com>
Date: Thu, 16 Jul 2020 10:57:26 +1200
Subject: [PATCH] Add config database_restore_timeout

Change-Id: I0da6b5376b4dd97606bfb75dae0fe0791cf8c47e
---
 trove_tempest_plugin/config.py                     |  6 ++++++
 trove_tempest_plugin/tests/scenario/base_backup.py | 10 ++++++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/trove_tempest_plugin/config.py b/trove_tempest_plugin/config.py
index f1cdb9a..5640099 100644
--- a/trove_tempest_plugin/config.py
+++ b/trove_tempest_plugin/config.py
@@ -46,6 +46,12 @@ DatabaseGroup = [
                default=1800,
                help='Timeout in seconds to wait for a database instance to '
                     'build.'),
+    cfg.IntOpt(
+        'database_restore_timeout',
+        default=3600,
+        help='Timeout in seconds to wait for a database instance to '
+             'be restored.'
+    ),
     cfg.IntOpt(
         'backup_wait_timeout',
         default=600,
diff --git a/trove_tempest_plugin/tests/scenario/base_backup.py b/trove_tempest_plugin/tests/scenario/base_backup.py
index 03909c9..57a29d0 100644
--- a/trove_tempest_plugin/tests/scenario/base_backup.py
+++ b/trove_tempest_plugin/tests/scenario/base_backup.py
@@ -68,7 +68,10 @@ class TestBackupBase(trove_base.BaseTroveTest):
             datastore_version=self.backup['datastore']['version'],
             backup_id=self.backup['id']
         )
-        self.wait_for_instance_status(restore_instance['id'])
+        self.wait_for_instance_status(
+            restore_instance['id'],
+            timeout=CONF.database.database_restore_timeout)
+
         restore_instance = self.client.get_resource(
             "instances", restore_instance['id'])['instance']
         restore_instance_ip = self.get_instance_ip(restore_instance)
@@ -107,7 +110,10 @@ class TestBackupBase(trove_base.BaseTroveTest):
             datastore_version=backup_inc['datastore']['version'],
             backup_id=backup_inc['id']
         )
-        self.wait_for_instance_status(restore_instance['id'])
+        self.wait_for_instance_status(
+            restore_instance['id'],
+            timeout=CONF.database.database_restore_timeout)
+
         restore_instance = self.client.get_resource(
             "instances", restore_instance['id'])['instance']
         restore_instance_ip = self.get_instance_ip(restore_instance)