Dcs fixes (#157)

Dcs fixes

Reviewed-by: None <None>
Reviewed-by: None <None>

Author: tischrei

doc/source/sdk/guides/dcs.rst

@@ -121,7 +121,7 @@ Change Instance Password
 This interface is used to change the login password of a DCS instance.
 
 .. literalinclude:: ../examples/dcs/change_instance_password.py
-   :lines: 16-25
+   :lines: 16-28
 
 List Statistics of all Instances
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
@@ -139,15 +139,15 @@ This interface is used to query all Config Parameters of a DCS Instance
 and to filter the output with query parameters.
 
 .. literalinclude:: ../examples/dcs/list_instance_params.py
-   :lines: 16-24
+   :lines: 16-25
 
 Update Instance Config Parameters
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 This interface is used to update config parameters of a DCS instance.
 
 .. literalinclude:: ../examples/dcs/update_instance_params.py
-   :lines: 16-27
+   :lines: 16-47
 
 Backup DCS Instance
 -------------------

examples/dcs/change_instance_password.py

@@ -19,7 +19,10 @@
 conn = openstack.connect(cloud='otc')
 
 
-instance = "instance_id_or_name"
-old_password = 'old_password'
-new_password = 'new_password'
-conn.dcs.find_instance(instance, old_password, new_password)
+instance = 'name_or_id'
+old_password = 'old_pwd'
+new_password = 'new_pwd'
+conn.dcs.change_instance_password(
+    instance=instance,
+    current_password=old_password,
+    new_password=new_password)

examples/dcs/delete_backup.py

@@ -19,10 +19,10 @@
 conn = openstack.connect(cloud='otc')
 
 
-backup = 'backup_id'
-instance = 'instance_id'
+backup_id = 'backup_id'
+instance = 'instance_name_or_id'
+instance = conn.dcs.find_instance(name_or_id=instance)
 conn.dcs.delete_instance_backup(
-    backup=backup,
+    backup=backup_id,
     instance=instance,
-    ignore_missing=True
-)
+    ignore_missing=True)

examples/dcs/list_instance_params.py

@@ -19,6 +19,7 @@
 conn = openstack.connect(cloud='otc')
 
 
-instance = 'instance_id'
+instance = 'name_or_id'
+instance = conn.dcs.find_instance(instance)
 for param in conn.dcs.instance_params(instance):
     print(param)

examples/dcs/update_instance_params.py

@@ -19,8 +19,28 @@
 conn = openstack.connect(cloud='otc')
 
 
-instance = 'instance_id'
-params = None
+params = [
+    {
+        'param_id': '1',
+        'param_name': 'timeout',
+        'default_value': '0',
+        'value_range': '0-7200',
+        'value_type': 'Interger',
+        'param_value': '11'
+    },
+    {
+        'param_id': '2',
+        'param_name': 'maxmemory-policy',
+        'default_value': 'noeviction',
+        'value_range':
+            'volatile-lru,allkeys-lru,volatile-random,'
+            'allkeys-random,volatile-ttl,noeviction',
+        'value_type': 'Enum',
+        'param_value': 'allkeys-random'
+    }
+]
+instance = 'name_or_id'
+instance = conn.dcs.find_instance(instance)
 conn.dcs.update_instance_params(
     instance=instance,
     params=params

otcextensions/sdk/dcs/v1/_proxy.py

@@ -151,7 +151,7 @@ def change_instance_password(self, instance,
         :rtype: :class:`~otcextensions.sdk.dcs.v1.instance.Instance`
         """
         res = self.find_instance(instance)
-        return res.change_password(
+        return res.change_pwd(
             self,
             current_password=current_password,
             new_password=new_password)

otcextensions/tests/unit/osclient/rds/v3/test_instance.py

@@ -187,7 +187,7 @@ def test_show(self):
                                                      ignore_missing=False)
 
         self.assertEqual(self.columns, columns)
-        self.assertItemEqual(self.data, data)
+        self.assertEqual(self.data, data)
 
 
 class TestDeleteDatabaseInstance(fakes.TestRds):

otcextensions/tests/unit/sdk/dcs/v1/test_proxy.py

@@ -156,13 +156,13 @@ def test_restart_instance(self):
 
     def test_change_pwd(self):
         self.sot = _instance.Instance()
-        self.sot.change_password = mock.Mock(return_value={})
+        self.sot.change_pwd = mock.Mock(return_value={})
         self.proxy._get = mock.Mock(return_value=self.sot)
         self.proxy._find = mock.Mock(return_value=self.sot)
         self.proxy._get_resource = mock.Mock(return_value=self.sot)
 
         self.proxy.change_instance_password(self.sot, 'curr', 'new')
-        self.sot.change_password.assert_called_with(
+        self.sot.change_pwd.assert_called_with(
             self.proxy,
             current_password='curr',
             new_password='new'