proxy update database changes

TerryHowe · TerryHowe · commit e49a632a2758 · 2015-05-04T16:34:05.000-06:00
Change-Id: Ia11b3fe8907923f3361b7c43babab52e98707b24
diff --git a/openstack/database/v1/_proxy.py b/openstack/database/v1/_proxy.py
@@ -31,7 +31,7 @@ def delete_database(self, value, ignore_missing=True):
                     :class:`~openstack.exceptions.ResourceNotFound` will be
                     raised when the database does not exist.
                     When set to ``True``, no exception will be set when
-                    attempting to delete a nonexistent server.
+                    attempting to delete a nonexistent database.
 
         :returns: ``None``
         """
@@ -64,7 +64,7 @@ def delete_instance(self, value, ignore_missing=True):
                     :class:`~openstack.exceptions.ResourceNotFound` will be
                     raised when the instance does not exist.
                     When set to ``True``, no exception will be set when
-                    attempting to delete a nonexistent server.
+                    attempting to delete a nonexistent instance.
 
         :returns: ``None``
         """
@@ -79,8 +79,19 @@ def get_instance(self, **data):
     def list_instance(self):
         return instance.Instance.list(self.session)
 
-    def update_instance(self, **data):
-        return instance.Instance(data).update(self.session)
+    def update_instance(self, value, **attrs):
+        """Update a instance
+
+        :param value: Either the id of a instance or a
+                      :class:`~openstack.compute.v2.instance.Instance`
+                      instance.
+        :attrs kwargs: The attributes to update on the instance represented
+                       by ``value``.
+
+        :returns: The updated instance
+        :rtype: :class:`~openstack.compute.v2.instance.Instance`
+        """
+        return self._update(instance.Instance, value, **attrs)
 
     def create_user(self, **data):
         return user.User(data).create(self.session)
@@ -94,7 +105,7 @@ def delete_user(self, value, ignore_missing=True):
                     :class:`~openstack.exceptions.ResourceNotFound` will be
                     raised when the user does not exist.
                     When set to ``True``, no exception will be set when
-                    attempting to delete a nonexistent server.
+                    attempting to delete a nonexistent user.
 
         :returns: ``None``
         """
diff --git a/openstack/tests/unit/database/v1/test_proxy.py b/openstack/tests/unit/database/v1/test_proxy.py
@@ -79,8 +79,14 @@ def test_instance_list(self):
                          self.proxy.list_instance)
 
     def test_instance_update(self):
-        self.verify_update('openstack.database.v1.instance.Instance.update',
-                           self.proxy.update_instance)
+        kwargs = {"x": 1, "y": 2, "z": 3}
+        self.verify_update2('openstack.proxy.BaseProxy._update',
+                            self.proxy.update_instance,
+                            method_args=["resource_or_id"],
+                            method_kwargs=kwargs,
+                            expected_args=[instance.Instance,
+                                           "resource_or_id"],
+                            expected_kwargs=kwargs)
 
     def test_user_create(self):
         self.verify_create('openstack.database.v1.user.User.create',
