X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_policy_module%2Ftests%2Fintegration%2Ftest_policy_agent.py;h=1a9dd689e8cf2259a998f8d8b97bc43b43a145cd;hb=refs%2Ftags%2Fv8.0.0;hp=d253b74a7a52450305c24d5721d3ad04d7df380b;hpb=f7451f8879d188c9fef9c976d82aa39141601938;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 d253b74..1a9dd68 100644
--- a/osm_policy_module/tests/integration/test_policy_agent.py
+++ b/osm_policy_module/tests/integration/test_policy_agent.py
@@ -478,6 +478,13 @@ class PolicyModuleAgentTest(unittest.TestCase):
             if '2' in args[1]:
                 return vnfr_record_mocks[1]
 
+        def assert_not_called_with(*args, **kwargs):
+            try:
+                create_alarm.assert_called_with(*args, **kwargs)
+            except AssertionError:
+                return
+            raise AssertionError('Expected to not have been called.')
+
         async def _test_configure_scaling_groups_create_alarm(*args, **kwargs):
             return uuid.uuid4()
 
@@ -486,37 +493,38 @@ class PolicyModuleAgentTest(unittest.TestCase):
         get_nsr.return_value = nsr_record_mock
         get_vnfd.return_value = vnfd_record_mock
         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)
         self.loop.run_until_complete(agent.autoscaling_service.configure_scaling_groups("test_nsr_id"))
-        create_alarm.assert_any_call(metric_name='cirros_vnf_memory_util',
+        create_alarm.assert_any_call(metric_name='average_memory_utilization',
                                      ns_id='test_nsr_id',
                                      operation='GT',
                                      statistic='AVERAGE',
                                      threshold=80,
                                      vdu_name='cirros_ns-1-cirros_vnfd-VM-1',
                                      vnf_member_index='1')
-        create_alarm.assert_any_call(metric_name='cirros_vnf_memory_util',
-                                     ns_id='test_nsr_id',
-                                     operation='LT',
-                                     statistic='AVERAGE',
-                                     threshold=20,
-                                     vdu_name='cirros_ns-1-cirros_vnfd-VM-1',
-                                     vnf_member_index='1')
-        create_alarm.assert_any_call(metric_name='cirros_vnf_memory_util',
+        create_alarm.assert_not_called_with(metric_name='average_memory_utilization',
+                                            ns_id='test_nsr_id',
+                                            operation='LT',
+                                            statistic='AVERAGE',
+                                            threshold=20,
+                                            vdu_name='cirros_ns-1-cirros_vnfd-VM-1',
+                                            vnf_member_index='1')
+        create_alarm.assert_any_call(metric_name='average_memory_utilization',
                                      ns_id='test_nsr_id',
                                      operation='GT',
                                      statistic='AVERAGE',
                                      threshold=80,
                                      vdu_name='cirros_ns-2-cirros_vnfd-VM-1',
                                      vnf_member_index='2')
-        create_alarm.assert_any_call(metric_name='cirros_vnf_memory_util',
-                                     ns_id='test_nsr_id',
-                                     operation='LT',
-                                     statistic='AVERAGE',
-                                     threshold=20,
-                                     vdu_name='cirros_ns-2-cirros_vnfd-VM-1',
-                                     vnf_member_index='2')
+        create_alarm.assert_not_called_with(metric_name='average_memory_utilization',
+                                            ns_id='test_nsr_id',
+                                            operation='LT',
+                                            statistic='AVERAGE',
+                                            threshold=20,
+                                            vdu_name='cirros_ns-2-cirros_vnfd-VM-1',
+                                            vnf_member_index='2')
         scaling_record = ScalingGroup.get()
         self.assertEqual(scaling_record.name, 'scale_cirros_vnfd-VM')
         self.assertEqual(scaling_record.nsr_id, 'test_nsr_id')
@@ -545,20 +553,20 @@ class PolicyModuleAgentTest(unittest.TestCase):
         config = Config()
         agent = PolicyModuleAgent(config, self.loop)
         self.loop.run_until_complete(agent.alarming_service.configure_vnf_alarms("test_nsr_id"))
-        create_alarm.assert_any_call(metric_name='cirros_vnf_memory_util',
+        create_alarm.assert_any_call(metric_name='average_memory_utilization',
                                      ns_id='test_nsr_id',
-                                     operation='LT',
-                                     statistic='AVERAGE',
-                                     threshold=20.0,
                                      vdu_name='cirros_ns-1-cirros_vnfd-VM-1',
-                                     vnf_member_index='1')
-        create_alarm.assert_any_call(metric_name='cirros_vnf_memory_util',
-                                     ns_id='test_nsr_id',
-                                     operation='LT',
-                                     statistic='AVERAGE',
+                                     vnf_member_index='1',
                                      threshold=20.0,
+                                     operation='LT',
+                                     statistic='AVERAGE')
+        create_alarm.assert_any_call(metric_name='average_memory_utilization',
+                                     ns_id='test_nsr_id',
                                      vdu_name='cirros_ns-2-cirros_vnfd-VM-1',
-                                     vnf_member_index='2')
+                                     vnf_member_index='2',
+                                     threshold=20.0,
+                                     operation='LT',
+                                     statistic='AVERAGE')
 
 
 if __name__ == '__main__':