X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_policy_module%2Ftests%2Fintegration%2Ftest_policy_agent.py;h=54b4e7931ae5bda06397d7b3a7bdc0a78aa6919b;hb=refs%2Ftags%2Fv14.0.2;hp=0329b7cba92ba1123434fc2a70d1fb156aa9bf60;hpb=7ef2b88a9c0c6ead16861411584d017e1fe216d7;p=osm%2FPOL.git diff --git a/osm_policy_module/tests/integration/test_policy_agent.py b/osm_policy_module/tests/integration/test_policy_agent.py index 0329b7c..54b4e79 100644 --- a/osm_policy_module/tests/integration/test_policy_agent.py +++ b/osm_policy_module/tests/integration/test_policy_agent.py @@ -375,7 +375,7 @@ vnfd_record_mock = { "recovery-type": "automatic", "action-on-recovery": "REDEPLOY_ONLY", "cooldown-time": 180, - "day1": False + "day1": False, } ], } @@ -513,7 +513,7 @@ class PolicyModuleAgentTest(unittest.TestCase): create_alarm.side_effect = _test_configure_scaling_groups_create_alarm create_alarm.assert_not_called_with = assert_not_called_with config = Config() - agent = PolicyModuleAgent(config, self.loop) + agent = PolicyModuleAgent(config) self.loop.run_until_complete( agent.autoscaling_service.configure_scaling_groups("test_nsr_id") ) @@ -525,6 +525,8 @@ class PolicyModuleAgentTest(unittest.TestCase): vdu_name="cirros_ns-1-cirros_vnfd-VM-1", vnf_member_index="1", action="scale_out", + vnfr=vnfr_record_mocks[0], + vnfd=vnfd_record_mock, ) create_alarm.assert_not_called_with( metric_name="average_memory_utilization", @@ -534,6 +536,8 @@ class PolicyModuleAgentTest(unittest.TestCase): vdu_name="cirros_ns-1-cirros_vnfd-VM-1", vnf_member_index="1", action="scale_out", + vnfr=vnfr_record_mocks[0], + vnfd=vnfd_record_mock, ) create_alarm.assert_any_call( metric_name="average_memory_utilization", @@ -543,6 +547,8 @@ class PolicyModuleAgentTest(unittest.TestCase): vdu_name="cirros_ns-2-cirros_vnfd-VM-1", vnf_member_index="2", action="scale_out", + vnfr=vnfr_record_mocks[1], + vnfd=vnfd_record_mock, ) create_alarm.assert_not_called_with( metric_name="average_memory_utilization", @@ -552,6 +558,8 @@ class PolicyModuleAgentTest(unittest.TestCase): vdu_name="cirros_ns-2-cirros_vnfd-VM-1", vnf_member_index="2", action="scale_out", + vnfr=vnfr_record_mocks[1], + vnfd=vnfd_record_mock, ) scaling_record = ScalingGroup.get() self.assertEqual(scaling_record.name, "scale_cirros_vnfd-VM") @@ -581,7 +589,7 @@ class PolicyModuleAgentTest(unittest.TestCase): get_vnfd.return_value = vnfd_record_mock create_alarm.side_effect = _test_configure_vnf_alarms_create_alarm config = Config() - agent = PolicyModuleAgent(config, self.loop) + agent = PolicyModuleAgent(config) self.loop.run_until_complete( agent.alarming_service.configure_vnf_alarms("test_nsr_id") ) @@ -592,7 +600,9 @@ class PolicyModuleAgentTest(unittest.TestCase): vnf_member_index="1", threshold=20.0, operation="LT", - action="{'webhook': ['localhost:9090', 'localhost:9090', 'localhost:9090']}" + action="{'webhook': ['localhost:9090', 'localhost:9090', 'localhost:9090']}", + vnfr=vnfr_record_mocks[0], + vnfd=vnfd_record_mock, ) create_alarm.assert_any_call( metric_name="average_memory_utilization", @@ -601,7 +611,9 @@ class PolicyModuleAgentTest(unittest.TestCase): vnf_member_index="2", threshold=20.0, operation="LT", - action="{'webhook': ['localhost:9090', 'localhost:9090', 'localhost:9090']}" + action="{'webhook': ['localhost:9090', 'localhost:9090', 'localhost:9090']}", + vnfr=vnfr_record_mocks[1], + vnfd=vnfd_record_mock, ) @patch.object(DbMongo, "db_connect", Mock()) @@ -628,7 +640,7 @@ class PolicyModuleAgentTest(unittest.TestCase): get_vnfd.return_value = vnfd_record_mock create_alarm.side_effect = _test_configure_healing_alarms_create_alarm config = Config() - agent = PolicyModuleAgent(config, self.loop) + agent = PolicyModuleAgent(config) self.loop.run_until_complete( agent.healing_service.configure_healing_alarms("test_nsr_id") )