Fixed update of WatcherObject fields on update

I this changeset, I fixed the issue whereby object auto fields are not
being updated within the WatcherObject after an update.

Change-Id: I7e65341b386a5c0c58c2109348e39e463cf2f668
Closes-Bug: #1641955

watcher/tests/objects/test_goal.py

@@ -13,8 +13,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import datetime
+
+import iso8601
 import mock
 
+from watcher.db.sqlalchemy import api as db_api
 from watcher import objects
 from watcher.tests.db import base
 from watcher.tests.db import utils
@@ -24,115 +28,116 @@ class TestGoalObject(base.DbTestCase):
 
     def setUp(self):
         super(TestGoalObject, self).setUp()
-        self.fake_goal = utils.get_test_goal()
+        self.fake_goal = utils.get_test_goal(
+            created_at=datetime.datetime.utcnow())
 
-    def test_get_by_id(self):
+    @mock.patch.object(db_api.Connection, 'get_goal_by_id')
+    def test_get_by_id(self, mock_get_goal):
         goal_id = self.fake_goal['id']
-        with mock.patch.object(self.dbapi, 'get_goal_by_id',
-                               autospec=True) as mock_get_goal:
-            mock_get_goal.return_value = self.fake_goal
-            goal = objects.Goal.get(self.context, goal_id)
-            mock_get_goal.assert_called_once_with(self.context, goal_id)
-            self.assertEqual(self.context, goal._context)
+        mock_get_goal.return_value = self.fake_goal
+        goal = objects.Goal.get(self.context, goal_id)
+        mock_get_goal.assert_called_once_with(self.context, goal_id)
+        self.assertEqual(self.context, goal._context)
 
-    def test_get_by_uuid(self):
+    @mock.patch.object(db_api.Connection, 'get_goal_by_uuid')
+    def test_get_by_uuid(self, mock_get_goal):
         uuid = self.fake_goal['uuid']
-        with mock.patch.object(self.dbapi, 'get_goal_by_uuid',
-                               autospec=True) as mock_get_goal:
-            mock_get_goal.return_value = self.fake_goal
-            goal = objects.Goal.get(self.context, uuid)
-            mock_get_goal.assert_called_once_with(self.context, uuid)
-            self.assertEqual(self.context, goal._context)
+        mock_get_goal.return_value = self.fake_goal
+        goal = objects.Goal.get(self.context, uuid)
+        mock_get_goal.assert_called_once_with(self.context, uuid)
+        self.assertEqual(self.context, goal._context)
 
-    def test_get_by_name(self):
+    @mock.patch.object(db_api.Connection, 'get_goal_by_name')
+    def test_get_by_name(self, mock_get_goal):
         name = self.fake_goal['name']
-        with mock.patch.object(self.dbapi, 'get_goal_by_name',
-                               autospec=True) as mock_get_goal:
-            mock_get_goal.return_value = self.fake_goal
-            goal = objects.Goal.get_by_name(
-                self.context,
-                name)
-            mock_get_goal.assert_called_once_with(self.context, name)
-            self.assertEqual(self.context, goal._context)
+        mock_get_goal.return_value = self.fake_goal
+        goal = objects.Goal.get_by_name(self.context, name)
+        mock_get_goal.assert_called_once_with(self.context, name)
+        self.assertEqual(self.context, goal._context)
 
-    def test_list(self):
-        with mock.patch.object(self.dbapi, 'get_goal_list',
-                               autospec=True) as mock_get_list:
-            mock_get_list.return_value = [self.fake_goal]
-            goals = objects.Goal.list(self.context)
-            self.assertEqual(1, mock_get_list.call_count)
-            self.assertEqual(1, len(goals))
-            self.assertIsInstance(goals[0], objects.Goal)
-            self.assertEqual(self.context, goals[0]._context)
+    @mock.patch.object(db_api.Connection, 'get_goal_list')
+    def test_list(self, mock_get_list):
+        mock_get_list.return_value = [self.fake_goal]
+        goals = objects.Goal.list(self.context)
+        self.assertEqual(1, mock_get_list.call_count)
+        self.assertEqual(1, len(goals))
+        self.assertIsInstance(goals[0], objects.Goal)
+        self.assertEqual(self.context, goals[0]._context)
 
-    def test_create(self):
-        with mock.patch.object(self.dbapi, 'create_goal',
-                               autospec=True) as mock_create_goal:
-            mock_create_goal.return_value = self.fake_goal
-            goal = objects.Goal(self.context, **self.fake_goal)
-            goal.create()
-            mock_create_goal.assert_called_once_with(self.fake_goal)
-            self.assertEqual(self.context, goal._context)
+    @mock.patch.object(db_api.Connection, 'create_goal')
+    def test_create(self, mock_create_goal):
+        mock_create_goal.return_value = self.fake_goal
+        goal = objects.Goal(self.context, **self.fake_goal)
+        goal.create()
+        expected_goal = self.fake_goal.copy()
+        expected_goal['created_at'] = expected_goal['created_at'].replace(
+            tzinfo=iso8601.iso8601.Utc())
+        mock_create_goal.assert_called_once_with(expected_goal)
+        self.assertEqual(self.context, goal._context)
 
-    def test_destroy(self):
+    @mock.patch.object(db_api.Connection, 'destroy_goal')
+    @mock.patch.object(db_api.Connection, 'get_goal_by_id')
+    def test_destroy(self, mock_get_goal, mock_destroy_goal):
         goal_id = self.fake_goal['id']
-        with mock.patch.object(self.dbapi, 'get_goal_by_id',
-                               autospec=True) as mock_get_goal:
-            mock_get_goal.return_value = self.fake_goal
-            with mock.patch.object(self.dbapi, 'destroy_goal',
-                                   autospec=True) \
-                    as mock_destroy_goal:
-                goal = objects.Goal.get_by_id(self.context, goal_id)
-                goal.destroy()
-                mock_get_goal.assert_called_once_with(
-                    self.context, goal_id)
-                mock_destroy_goal.assert_called_once_with(goal_id)
-                self.assertEqual(self.context, goal._context)
+        mock_get_goal.return_value = self.fake_goal
+        goal = objects.Goal.get_by_id(self.context, goal_id)
+        goal.destroy()
+        mock_get_goal.assert_called_once_with(
+            self.context, goal_id)
+        mock_destroy_goal.assert_called_once_with(goal_id)
+        self.assertEqual(self.context, goal._context)
 
-    def test_save(self):
-        goal_id = self.fake_goal['id']
-        with mock.patch.object(self.dbapi, 'get_goal_by_id',
-                               autospec=True) as mock_get_goal:
-            mock_get_goal.return_value = self.fake_goal
-            with mock.patch.object(self.dbapi, 'update_goal',
-                                   autospec=True) as mock_update_goal:
-                goal = objects.Goal.get_by_id(self.context, goal_id)
-                goal.display_name = 'DUMMY'
-                goal.save()
+    @mock.patch.object(db_api.Connection, 'update_goal')
+    @mock.patch.object(db_api.Connection, 'get_goal_by_uuid')
+    def test_save(self, mock_get_goal, mock_update_goal):
+        mock_get_goal.return_value = self.fake_goal
+        goal_uuid = self.fake_goal['uuid']
+        fake_saved_goal = self.fake_goal.copy()
+        fake_saved_goal['updated_at'] = datetime.datetime.utcnow()
+        mock_update_goal.return_value = fake_saved_goal
 
-                mock_get_goal.assert_called_once_with(self.context, goal_id)
-                mock_update_goal.assert_called_once_with(
-                    goal_id, {'display_name': 'DUMMY'})
-                self.assertEqual(self.context, goal._context)
+        goal = objects.Goal.get_by_uuid(self.context, goal_uuid)
+        goal.display_name = 'DUMMY'
+        goal.save()
 
-    def test_refresh(self):
-        uuid = self.fake_goal['uuid']
+        mock_get_goal.assert_called_once_with(self.context, goal_uuid)
+        mock_update_goal.assert_called_once_with(
+            goal_uuid, {'display_name': 'DUMMY'})
+        self.assertEqual(self.context, goal._context)
+
+    @mock.patch.object(db_api.Connection, 'get_goal_by_uuid')
+    def test_refresh(self, mock_get_goal):
         fake_goal2 = utils.get_test_goal(name="BALANCE_LOAD")
         returns = [self.fake_goal, fake_goal2]
+        mock_get_goal.side_effect = returns
+        uuid = self.fake_goal['uuid']
         expected = [mock.call(self.context, uuid),
                     mock.call(self.context, uuid)]
-        with mock.patch.object(self.dbapi, 'get_goal_by_uuid',
-                               side_effect=returns,
-                               autospec=True) as mock_get_goal:
-            goal = objects.Goal.get(self.context, uuid)
-            self.assertEqual("TEST", goal.name)
-            goal.refresh()
-            self.assertEqual("BALANCE_LOAD", goal.name)
-            self.assertEqual(expected, mock_get_goal.call_args_list)
-            self.assertEqual(self.context, goal._context)
+        goal = objects.Goal.get(self.context, uuid)
+        self.assertEqual("TEST", goal.name)
+        goal.refresh()
+        self.assertEqual("BALANCE_LOAD", goal.name)
+        self.assertEqual(expected, mock_get_goal.call_args_list)
+        self.assertEqual(self.context, goal._context)
+
+    @mock.patch.object(db_api.Connection, 'soft_delete_goal')
+    @mock.patch.object(db_api.Connection, 'get_goal_by_uuid')
+    def test_soft_delete(self, mock_get_goal, mock_soft_delete_goal):
+        mock_get_goal.return_value = self.fake_goal
+        fake_deleted_goal = self.fake_goal.copy()
+        fake_deleted_goal['deleted_at'] = datetime.datetime.utcnow()
+        mock_soft_delete_goal.return_value = fake_deleted_goal
+
+        expected_goal = fake_deleted_goal.copy()
+        expected_goal['created_at'] = expected_goal['created_at'].replace(
+            tzinfo=iso8601.iso8601.Utc())
+        expected_goal['deleted_at'] = expected_goal['deleted_at'].replace(
+            tzinfo=iso8601.iso8601.Utc())
 
-    def test_soft_delete(self):
         uuid = self.fake_goal['uuid']
-        with mock.patch.object(self.dbapi, 'get_goal_by_uuid',
-                               autospec=True) as mock_get_goal:
-            mock_get_goal.return_value = self.fake_goal
-            with mock.patch.object(self.dbapi, 'soft_delete_goal',
-                                   autospec=True) \
-                    as mock_soft_delete_goal:
-                goal = objects.Goal.get_by_uuid(
-                    self.context, uuid)
-                goal.soft_delete()
-                mock_get_goal.assert_called_once_with(
-                    self.context, uuid)
-                mock_soft_delete_goal.assert_called_once_with(uuid)
-                self.assertEqual(self.context, goal._context)
+        goal = objects.Goal.get_by_uuid(self.context, uuid)
+        goal.soft_delete()
+        mock_get_goal.assert_called_once_with(self.context, uuid)
+        mock_soft_delete_goal.assert_called_once_with(uuid)
+        self.assertEqual(self.context, goal._context)
+        self.assertEqual(expected_goal, goal.as_dict())