Added audit & strategy ObjectField for ActionPlan

In this changeset, I added the "audit" and the "strategy "ObjectField
which can either be loaded by setting the new "eager" parameter as True
or not loaded (as before) by setting it to False.
The advantage of introducing this eager parameter is that this way,
we can reduce to a minimum the overhead of DB queries whenever the
related object fields is not actually needed.

Change-Id: Ieca6fa438cbf2267f5ae2ea0d059b2953e65076b
Partially-Implements: blueprint watcher-versioned-objects

watcher/tests/api/v1/test_actions.py

@@ -52,9 +52,10 @@ class TestListAction(api_base.FunctionalTest):
 
     def setUp(self):
         super(TestListAction, self).setUp()
-        obj_utils.create_test_goal(self.context)
-        obj_utils.create_test_strategy(self.context)
-        obj_utils.create_test_action_plan(self.context)
+        self.goal = obj_utils.create_test_goal(self.context)
+        self.strategy = obj_utils.create_test_strategy(self.context)
+        self.audit = obj_utils.create_test_audit(self.context)
+        self.action_plan = obj_utils.create_test_action_plan(self.context)
 
     def test_empty(self):
         response = self.get_json('/actions')
@@ -155,12 +156,9 @@ class TestListAction(api_base.FunctionalTest):
             self.assertEqual(action_plan.uuid, action['action_plan_uuid'])
 
     def test_filter_by_audit_uuid(self):
-        audit = obj_utils.create_test_audit(self.context,
-                                            uuid=utils.generate_uuid())
         action_plan_1 = obj_utils.create_test_action_plan(
             self.context,
-            uuid=utils.generate_uuid(),
-            audit_id=audit.id)
+            uuid=utils.generate_uuid())
         action_list = []
 
         for id_ in range(3):
@@ -170,8 +168,8 @@ class TestListAction(api_base.FunctionalTest):
                 uuid=utils.generate_uuid())
             action_list.append(action.uuid)
 
-        audit2 = obj_utils.create_test_audit(self.context,
-                                             uuid=utils.generate_uuid())
+        audit2 = obj_utils.create_test_audit(
+            self.context, id=2, uuid=utils.generate_uuid())
         action_plan_2 = obj_utils.create_test_action_plan(
             self.context,
             uuid=utils.generate_uuid(),
@@ -183,18 +181,15 @@ class TestListAction(api_base.FunctionalTest):
                 action_plan_id=action_plan_2.id,
                 uuid=utils.generate_uuid())
 
-        response = self.get_json('/actions?audit_uuid=%s' % audit.uuid)
+        response = self.get_json('/actions?audit_uuid=%s' % self.audit.uuid)
         self.assertEqual(len(action_list), len(response['actions']))
         for action in response['actions']:
             self.assertEqual(action_plan_1.uuid, action['action_plan_uuid'])
 
     def test_filter_by_action_plan_uuid(self):
-        audit = obj_utils.create_test_audit(self.context,
-                                            uuid=utils.generate_uuid())
         action_plan_1 = obj_utils.create_test_action_plan(
             self.context,
-            uuid=utils.generate_uuid(),
-            audit_id=audit.id)
+            uuid=utils.generate_uuid())
         action_list = []
 
         for id_ in range(3):
@@ -206,8 +201,7 @@ class TestListAction(api_base.FunctionalTest):
 
         action_plan_2 = obj_utils.create_test_action_plan(
             self.context,
-            uuid=utils.generate_uuid(),
-            audit_id=audit.id)
+            uuid=utils.generate_uuid())
 
         for id_ in range(4, 5, 6):
             obj_utils.create_test_action(
@@ -432,6 +426,9 @@ class TestPatch(api_base.FunctionalTest):
 
     def setUp(self):
         super(TestPatch, self).setUp()
+        obj_utils.create_test_goal(self.context)
+        obj_utils.create_test_strategy(self.context)
+        obj_utils.create_test_audit(self.context)
         obj_utils.create_test_action_plan(self.context)
         self.action = obj_utils.create_test_action(self.context, next=None)
         p = mock.patch.object(db_api.BaseConnection, 'update_action')
@@ -465,7 +462,9 @@ class TestDelete(api_base.FunctionalTest):
 
     def setUp(self):
         super(TestDelete, self).setUp()
-        obj_utils.create_test_action_plan(self.context)
+        self.goal = obj_utils.create_test_goal(self.context)
+        self.strategy = obj_utils.create_test_strategy(self.context)
+        self.audit = obj_utils.create_test_audit(self.context)
         self.action = obj_utils.create_test_action(self.context, next=None)
         p = mock.patch.object(db_api.BaseConnection, 'update_action')
         self.mock_action_update = p.start()

watcher/tests/api/v1/test_actions_plans.py

@@ -30,6 +30,7 @@ class TestListActionPlan(api_base.FunctionalTest):
     def setUp(self):
         super(TestListActionPlan, self).setUp()
         obj_utils.create_test_goal(self.context)
+        obj_utils.create_test_strategy(self.context)
         obj_utils.create_test_audit(self.context)
 
     def test_empty(self):
@@ -292,6 +293,9 @@ class TestDelete(api_base.FunctionalTest):
 
     def setUp(self):
         super(TestDelete, self).setUp()
+        obj_utils.create_test_goal(self.context)
+        obj_utils.create_test_strategy(self.context)
+        obj_utils.create_test_audit(self.context)
         self.action_plan = obj_utils.create_test_action_plan(
             self.context)
         p = mock.patch.object(db_api.BaseConnection, 'destroy_action_plan')
@@ -348,6 +352,9 @@ class TestPatch(api_base.FunctionalTest):
 
     def setUp(self):
         super(TestPatch, self).setUp()
+        obj_utils.create_test_goal(self.context)
+        obj_utils.create_test_strategy(self.context)
+        obj_utils.create_test_audit(self.context)
         self.action_plan = obj_utils.create_test_action_plan(
             self.context, state=objects.action_plan.State.RECOMMENDED)
         p = mock.patch.object(db_api.BaseConnection, 'update_action_plan')
@@ -487,6 +494,12 @@ class TestPatchStateTransitionDenied(api_base.FunctionalTest):
              "new_state": new_state} not in ALLOWED_TRANSITIONS
     ]
 
+    def setUp(self):
+        super(TestPatchStateTransitionDenied, self).setUp()
+        obj_utils.create_test_goal(self.context)
+        obj_utils.create_test_strategy(self.context)
+        obj_utils.create_test_audit(self.context)
+
     @mock.patch.object(
         db_api.BaseConnection, 'update_action_plan',
         mock.Mock(side_effect=lambda ap: ap.save() or ap))
@@ -520,6 +533,12 @@ class TestPatchStateTransitionOk(api_base.FunctionalTest):
         for transition in ALLOWED_TRANSITIONS
     ]
 
+    def setUp(self):
+        super(TestPatchStateTransitionOk, self).setUp()
+        obj_utils.create_test_goal(self.context)
+        obj_utils.create_test_strategy(self.context)
+        obj_utils.create_test_audit(self.context)
+
     @mock.patch.object(
         db_api.BaseConnection, 'update_action_plan',
         mock.Mock(side_effect=lambda ap: ap.save() or ap))
@@ -543,6 +562,12 @@ class TestPatchStateTransitionOk(api_base.FunctionalTest):
 
 class TestActionPlanPolicyEnforcement(api_base.FunctionalTest):
 
+    def setUp(self):
+        super(TestActionPlanPolicyEnforcement, self).setUp()
+        obj_utils.create_test_goal(self.context)
+        obj_utils.create_test_strategy(self.context)
+        obj_utils.create_test_audit(self.context)
+
     def _common_policy_check(self, rule, func, *arg, **kwarg):
         self.policy.set_rules({
             "admin_api": "(role:admin or role:administrator)",