Time to get rid of slave_of

Now liberty is end of life,so we can get rid of slave_of

Change-Id: I429a95018a58a92576c52e0a9bc6b1b817c408ea

2 files changed, 6 insertions, 22 deletions

diff --git a/troveclient/tests/test_instances.py b/troveclient/tests/test_instances.py
index 89028fc..21ef2d8 100644
--- a/troveclient/tests/test_instances.py
+++ b/troveclient/tests/test_instances.py
@@ -84,8 +84,7 @@ class InstancesTest(testtools.TestCase):
         super(InstancesTest, self).tearDown()
         instances.Instances.__init__ = self.orig__init
 
-    @mock.patch('warnings.warn')
-    def test_create(self, mock_warn):
+    def test_create(self):
         def side_effect_func(path, body, inst):
             return path, body, inst
 
@@ -95,7 +94,7 @@ class InstancesTest(testtools.TestCase):
                                         ['db1', 'db2'], ['u1', 'u2'],
                                         datastore="datastore",
                                         datastore_version="datastore-version",
-                                        nics=nics, slave_of='test',
+                                        nics=nics, replica_of='test',
                                         replica_count=4,
                                         modules=['mod_id'],
                                         locality='affinity')
@@ -110,11 +109,7 @@ class InstancesTest(testtools.TestCase):
                          b["instance"]["datastore"]["version"])
         self.assertEqual(nics, b["instance"]["nics"])
         self.assertEqual(103, b["instance"]["flavorRef"])
-        # Assert that slave_of is not used and if specified, there is a warning
-        # and it's value is used for replica_of.
         self.assertEqual('test', b['instance']['replica_of'])
-        self.assertNotIn('slave_of', b['instance'])
-        self.assertTrue(mock_warn.called)
         self.assertEqual([{'id': 'mod_id'}], b["instance"]["modules"])
         self.assertEqual(4, b["instance"]["replica_count"])
         self.assertEqual('affinity', b["instance"]["locality"])
diff --git a/troveclient/v1/instances.py b/troveclient/v1/instances.py
index a25b192..ab7f71a 100644
--- a/troveclient/v1/instances.py
+++ b/troveclient/v1/instances.py
@@ -16,12 +16,10 @@
 #    under the License.
 
 import os
-import warnings
 
 from troveclient import base
 from troveclient import common
 from troveclient import exceptions
-from troveclient.i18n import _LW
 from troveclient import utils
 from troveclient.v1 import modules as core_modules
 
@@ -87,12 +85,11 @@ class Instances(base.ManagerWithFind):
         return swift_client.Connection(
             auth_url, user, key, auth_version="2.0", os_options=os_options)
 
-    # TODO(mriedem): Remove slave_of after liberty-eol for Trove.
     def create(self, name, flavor_id, volume=None, databases=None, users=None,
                restorePoint=None, availability_zone=None, datastore=None,
                datastore_version=None, nics=None, configuration=None,
-               replica_of=None, slave_of=None, replica_count=None,
-               modules=None, locality=None, region_name=None):
+               replica_of=None, replica_count=None, modules=None,
+               locality=None, region_name=None):
         """Create (boot) a new instance."""
 
         body = {"instance": {
@@ -120,14 +117,8 @@ class Instances(base.ManagerWithFind):
             body["instance"]["nics"] = nics
         if configuration:
             body["instance"]["configuration"] = base.getid(configuration)
-        if replica_of or slave_of:
-            if slave_of:
-                warnings.warn(_LW("The 'slave_of' argument is deprecated in "
-                                  "favor of 'replica_of' and will be removed "
-                                  "after the Trove liberty series is end of "
-                                  "life."),
-                              category=DeprecationWarning)
-            body["instance"]["replica_of"] = base.getid(replica_of) or slave_of
+        if replica_of:
+            body["instance"]["replica_of"] = base.getid(replica_of)
         if replica_count:
             body["instance"]["replica_count"] = replica_count
         if modules:
@@ -166,8 +157,6 @@ class Instances(base.ManagerWithFind):
         if name is not None:
             body["instance"]["name"] = name
         if detach_replica_source:
-            # NOTE(mriedem): We don't send slave_of since it was removed from
-            # the trove API in mitaka.
             body["instance"]["replica_of"] = None
 
         url = "/instances/%s" % base.getid(instance)