Merge "Adds rpc_ping method to new datastores"

6 files changed, 24 insertions, 0 deletions

diff --git a/trove/guestagent/datastore/experimental/couchdb/manager.py b/trove/guestagent/datastore/experimental/couchdb/manager.py
index 5fe6ba49..766a2a32 100644
--- a/trove/guestagent/datastore/experimental/couchdb/manager.py
+++ b/trove/guestagent/datastore/experimental/couchdb/manager.py
@@ -39,6 +39,10 @@ class Manager(periodic_task.PeriodicTasks):
         self.appStatus = service.CouchDBAppStatus()
         self.app = service.CouchDBApp(self.appStatus)
 
+    def rpc_ping(self, context):
+        LOG.debug("Responding to RPC ping.")
+        return True
+
     def prepare(self, context, packages, databases, memory_mb, users,
                 device_path=None, mount_point=None, backup_info=None,
                 config_contents=None, root_password=None, overrides=None,
diff --git a/trove/guestagent/datastore/experimental/db2/manager.py b/trove/guestagent/datastore/experimental/db2/manager.py
index f2c17bf9..7bb0e970 100644
--- a/trove/guestagent/datastore/experimental/db2/manager.py
+++ b/trove/guestagent/datastore/experimental/db2/manager.py
@@ -45,6 +45,10 @@ class Manager(periodic_task.PeriodicTasks):
         """
         self.appStatus.update()
 
+    def rpc_ping(self, context):
+        LOG.debug("Responding to RPC ping.")
+        return True
+
     def prepare(self, context, packages, databases, memory_mb, users,
                 device_path=None, mount_point=None, backup_info=None,
                 config_contents=None, root_password=None, overrides=None,
diff --git a/trove/guestagent/datastore/experimental/vertica/manager.py b/trove/guestagent/datastore/experimental/vertica/manager.py
index 5aaa1eee..84c28e25 100644
--- a/trove/guestagent/datastore/experimental/vertica/manager.py
+++ b/trove/guestagent/datastore/experimental/vertica/manager.py
@@ -40,6 +40,10 @@ class Manager(periodic_task.PeriodicTasks):
         """Update the status of the Vertica service."""
         self.appStatus.update()
 
+    def rpc_ping(self, context):
+        LOG.debug("Responding to RPC ping.")
+        return True
+
     def prepare(self, context, packages, databases, memory_mb, users,
                 device_path=None, mount_point=None, backup_info=None,
                 config_contents=None, root_password=None, overrides=None,
diff --git a/trove/tests/unittests/guestagent/test_couchdb_manager.py b/trove/tests/unittests/guestagent/test_couchdb_manager.py
index 0598d1e8..edbe2af3 100644
--- a/trove/tests/unittests/guestagent/test_couchdb_manager.py
+++ b/trove/tests/unittests/guestagent/test_couchdb_manager.py
@@ -141,3 +141,7 @@ class GuestAgentCouchDBManagerTest(testtools.TestCase):
         #verification/assertion
         couchdb_service.CouchDBApp.stop_db.assert_any_call(
             do_not_start_on_reboot=False)
+
+    def test_rpc_ping(self):
+        output = self.manager.rpc_ping(self.context)
+        self.assertEqual(output, True)
diff --git a/trove/tests/unittests/guestagent/test_db2_manager.py b/trove/tests/unittests/guestagent/test_db2_manager.py
index e965d58a..a7160a85 100644
--- a/trove/tests/unittests/guestagent/test_db2_manager.py
+++ b/trove/tests/unittests/guestagent/test_db2_manager.py
@@ -203,3 +203,7 @@ class GuestAgentDB2ManagerTest(testtools.TestCase):
         users = self.manager.get_user(self.context, username, hostname)
         self.assertThat(users, Equals(['user1']))
         db2_service.DB2Admin.get_user.assert_any_call(username, hostname)
+
+    def test_rpc_ping(self):
+        output = self.manager.rpc_ping(self.context)
+        self.assertEqual(output, True)
diff --git a/trove/tests/unittests/guestagent/test_vertica_manager.py b/trove/tests/unittests/guestagent/test_vertica_manager.py
index 9fa0069e..13a08aa7 100644
--- a/trove/tests/unittests/guestagent/test_vertica_manager.py
+++ b/trove/tests/unittests/guestagent/test_vertica_manager.py
@@ -193,3 +193,7 @@ class GuestAgentManagerTest(testtools.TestCase):
         self._prepare_method("test-instance-3", "member")
         mock_set_status.assert_called_with(
             rd_instance.ServiceStatuses.BUILD_PENDING)
+
+    def test_rpc_ping(self):
+        output = self.manager.rpc_ping(self.context)
+        self.assertEqual(output, True)