X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=osm_policy_module%2Ftests%2Funit%2Fcore%2Ftest_policy_agent.py;fp=osm_policy_module%2Ftests%2Funit%2Fcore%2Ftest_policy_agent.py;h=57b0db1f108e3f1ada126af24a02ce38e1d9962b;hb=fbb5d6d5882461137bf47c313ead6bb913f15e56;hp=7fc2dc9d1b800dd226858dce94a8b0f40e9a542d;hpb=d4a1635456ef7e4ae1f643553d827cd1b9145d6f;p=osm%2FPOL.git

diff --git a/osm_policy_module/tests/unit/core/test_policy_agent.py b/osm_policy_module/tests/unit/core/test_policy_agent.py
index 7fc2dc9..57b0db1 100644
--- a/osm_policy_module/tests/unit/core/test_policy_agent.py
+++ b/osm_policy_module/tests/unit/core/test_policy_agent.py
@@ -27,20 +27,20 @@ import unittest
 from unittest import mock
 from unittest.mock import Mock
 
-from osm_policy_module.core.agent import PolicyModuleAgent
+from osm_policy_module.autoscaling.agent import PolicyModuleAgent
+from osm_policy_module.autoscaling.service import Service
 from osm_policy_module.core.config import Config
-from osm_policy_module.core.database import DatabaseManager
 
 
 class PolicyAgentTest(unittest.TestCase):
     def setUp(self):
         self.loop = asyncio.new_event_loop()
 
-    @mock.patch('osm_policy_module.core.agent.CommonDbClient')
-    @mock.patch('osm_policy_module.core.agent.MonClient')
-    @mock.patch('osm_policy_module.core.agent.LcmClient')
-    @mock.patch.object(PolicyModuleAgent, '_configure_scaling_groups')
-    @mock.patch.object(PolicyModuleAgent, '_delete_orphaned_alarms')
+    @mock.patch('osm_policy_module.autoscaling.service.CommonDbClient')
+    @mock.patch('osm_policy_module.autoscaling.service.MonClient')
+    @mock.patch('osm_policy_module.autoscaling.service.LcmClient')
+    @mock.patch.object(Service, 'configure_scaling_groups')
+    @mock.patch.object(Service, 'delete_orphaned_alarms')
     def test_handle_instantiated(self, delete_orphaned_alarms, configure_scaling_groups, lcm_client,
                                  mon_client, db_client):
         async def mock_configure_scaling_groups(nsr_id):
@@ -77,11 +77,12 @@ class PolicyAgentTest(unittest.TestCase):
         self.loop.run_until_complete(agent._handle_instantiated(content))
         configure_scaling_groups.assert_not_called()
 
-    @mock.patch('osm_policy_module.core.agent.CommonDbClient')
-    @mock.patch('osm_policy_module.core.agent.MonClient')
-    @mock.patch('osm_policy_module.core.agent.LcmClient')
-    @mock.patch.object(DatabaseManager, 'get_alarm')
-    def test_handle_alarm_notification(self, get_alarm, lcm_client, mon_client, db_client):
+    @mock.patch('osm_policy_module.autoscaling.service.CommonDbClient')
+    @mock.patch('osm_policy_module.autoscaling.service.MonClient')
+    @mock.patch('osm_policy_module.autoscaling.service.LcmClient')
+    @mock.patch('osm_policy_module.core.database.db')
+    @mock.patch.object(Service, 'get_alarm')
+    def test_handle_alarm_notification(self, get_alarm, db, lcm_client, mon_client, db_client):
         async def mock_scale(nsr_id, scaling_group_name, vnf_member_index, action):
             pass