X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=osm_mon%2Ftest%2FOpenStack%2Ftest_metric_req.py;h=6a924d9e03d2edbdae82e5d659d55e4cd87ce2c5;hb=refs%2Fchanges%2F20%2F5920%2F1;hp=2a3cbc3d11e07c547686a7ce25b93fa65baba531;hpb=effeb7c52a650308e47ef3eb0ded8315f21f9cba;p=osm%2FMON.git diff --git a/osm_mon/test/OpenStack/test_metric_req.py b/osm_mon/test/OpenStack/test_metric_req.py index 2a3cbc3..6a924d9 100644 --- a/osm_mon/test/OpenStack/test_metric_req.py +++ b/osm_mon/test/OpenStack/test_metric_req.py @@ -43,7 +43,7 @@ class Message(object): """Initialize a mocked message instance.""" self.topic = "metric_request" self.key = None - self.value = json.dumps({"mock_message": "message_details"}) + self.value = json.dumps({"vim_uuid": "test_id", "mock_message": "message_details"}) class TestMetricReq(unittest.TestCase): @@ -52,53 +52,49 @@ class TestMetricReq(unittest.TestCase): def setUp(self): """Setup the tests for metric request keys.""" super(TestMetricReq, self).setUp() - self.common = Common() self.metrics = metric_req.Metrics() - @mock.patch.object(Common, "_authenticate") - def test_access_cred_metric_auth(self, auth): + @mock.patch.object(Common, 'get_endpoint') + @mock.patch.object(Common, "get_auth_token") + def test_access_cred_metric_auth(self, get_token, get_endpoint): """Test authentication with access credentials.""" message = Message() - self.metrics.metric_calls(message, self.common, "my_auth_token") + self.metrics.metric_calls(message) - auth.assert_not_called - self.assertEqual(self.metrics.auth_token, "my_auth_token") - - @mock.patch.object(Common, "_authenticate") - def test_env_metric_auth(self, auth): - """Test authentication with environment variables.""" - message = Message() - - self.metrics.metric_calls(message, self.common, None) - - auth.assert_called_with() + get_token.assert_called_with('test_id') + get_endpoint.assert_any_call('metric', 'test_id') + @mock.patch.object(Common, "get_auth_token", mock.Mock()) + @mock.patch.object(Common, 'get_endpoint', mock.Mock()) @mock.patch.object(metric_req.Metrics, "delete_metric") def test_delete_metric_key(self, del_metric): """Test the functionality for a delete metric request.""" # Mock a message value and key message = Message() message.key = "delete_metric_request" - message.value = json.dumps({"metric_uuid": "my_metric_id"}) + message.value = json.dumps({"vim_uuid": "test_id", "metric_uuid": "my_metric_id"}) # Call the metric functionality and check delete request - self.metrics.metric_calls(message, self.common, "my_auth_token") - + self.metrics.metric_calls(message) del_metric.assert_called_with(mock.ANY, mock.ANY, "my_metric_id") + @mock.patch.object(Common, "get_auth_token", mock.Mock()) + @mock.patch.object(Common, 'get_endpoint', mock.Mock()) @mock.patch.object(metric_req.Metrics, "list_metrics") def test_list_metric_key(self, list_metrics): """Test the functionality for a list metric request.""" # Mock a message with list metric key and value message = Message() message.key = "list_metric_request" - message.value = json.dumps({"metrics_list_request": "metric_details"}) + message.value = json.dumps({"vim_uuid": "test_id", "metrics_list_request": "metric_details"}) # Call the metric functionality and check list functionality - self.metrics.metric_calls(message, self.common, "my_auth_token") + self.metrics.metric_calls(message) list_metrics.assert_called_with(mock.ANY, mock.ANY, "metric_details") + @mock.patch.object(Common, "get_auth_token", mock.Mock()) + @mock.patch.object(Common, 'get_endpoint', mock.Mock()) @mock.patch.object(metric_req.Metrics, "read_metric_data") @mock.patch.object(metric_req.Metrics, "list_metrics") @mock.patch.object(metric_req.Metrics, "delete_metric") @@ -109,41 +105,46 @@ class TestMetricReq(unittest.TestCase): # Mock a message with update metric key and value message = Message() message.key = "update_metric_request" - message.value = json.dumps({"metric_create": - {"metric_name": "my_metric", - "resource_uuid": "my_r_id"}}) + message.value = json.dumps({"vim_uuid": "test_id", + "metric_create": + {"metric_name": "my_metric", + "resource_uuid": "my_r_id"}}) # Call metric functionality and confirm no function is called # Gnocchi does not support updating a metric configuration - self.metrics.metric_calls(message, self.common, "my_auth_token") - config_metric.assert_not_called - list_metrics.assert_not_called - delete_metric.assert_not_called - read_data.assert_not_called - + self.metrics.metric_calls(message) + config_metric.assert_not_called() + list_metrics.assert_not_called() + delete_metric.assert_not_called() + read_data.assert_not_called() + + @mock.patch.object(Common, "get_auth_token", mock.Mock()) + @mock.patch.object(Common, 'get_endpoint', mock.Mock()) @mock.patch.object(metric_req.Metrics, "configure_metric") def test_config_metric_key(self, config_metric): """Test the functionality for a create metric request.""" # Mock a message with create metric key and value message = Message() message.key = "create_metric_request" - message.value = json.dumps({"metric_create": "metric_details"}) + message.value = json.dumps({"vim_uuid": "test_id", "metric_create": "metric_details"}) # Call metric functionality and check config metric config_metric.return_value = "metric_id", "resource_id", True - self.metrics.metric_calls(message, self.common, "my_auth_token") + self.metrics.metric_calls(message) config_metric.assert_called_with(mock.ANY, mock.ANY, "metric_details") + @mock.patch.object(Common, "get_auth_token", mock.Mock()) + @mock.patch.object(Common, 'get_endpoint', mock.Mock()) @mock.patch.object(metric_req.Metrics, "read_metric_data") def test_read_data_key(self, read_data): """Test the functionality for a read metric data request.""" # Mock a message with a read data key and value message = Message() message.key = "read_metric_data_request" - message.value = json.dumps({"alarm_uuid": "alarm_id"}) + message.value = json.dumps({"vim_uuid": "test_id", "alarm_uuid": "alarm_id"}) # Call metric functionality and check read data metrics read_data.return_value = "time_stamps", "data_values" - self.metrics.metric_calls(message, self.common, "my_auth_token") + self.metrics.metric_calls(message) read_data.assert_called_with( mock.ANY, mock.ANY, json.loads(message.value))