diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/CHANGELOG.md b/sdk/metricsadvisor/azure-ai-metricsadvisor/CHANGELOG.md index 25e4831e6b1d..a1ca44d1f395 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/CHANGELOG.md +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/CHANGELOG.md @@ -1,6 +1,6 @@ # Release History -## 1.0.0b3 (Unreleased) +## 1.0.0b3 (2021-02-09) **New Features** @@ -10,6 +10,8 @@ **Breaking Changes** - `list_dimension_values` has been renamed to `list_anomaly_dimension_values` +- update methods now return None +- Updated DataFeed.metric_ids to be a dict rather than a list ## 1.0.0b2 (2020-11-10) diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_metrics_advisor_administration_client.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_metrics_advisor_administration_client.py index cda8acb562fc..43619c6498d5 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_metrics_advisor_administration_client.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_metrics_advisor_administration_client.py @@ -708,7 +708,7 @@ def delete_hook(self, hook_id, **kwargs): def update_data_feed( self, data_feed, # type: Union[str, DataFeed] **kwargs # type: Any - ): # type: (...) -> DataFeed + ): # type: (...) -> None """Update a data feed. Either pass the entire DataFeed object with the chosen updates or the ID to your data feed with updates passed via keyword arguments. If you pass both the DataFeed object and keyword arguments, the keyword arguments will take precedence. @@ -754,8 +754,7 @@ def update_data_feed( AzureDataExplorerDataFeed, AzureDataLakeStorageGen2DataFeed, AzureTableDataFeed, HttpRequestDataFeed, InfluxDBDataFeed, MySqlDataFeed, PostgreSqlDataFeed, SQLServerDataFeed, MongoDBDataFeed, ElasticsearchDataFeed] - :return: DataFeed - :rtype: ~azure.ai.metricsadvisor.models.DataFeed + :rtype: None :raises ~azure.core.exceptions.HttpResponseError: .. admonition:: Example: @@ -802,8 +801,7 @@ def update_data_feed( data_feed_patch_type = DATA_FEED_PATCH[data_feed.source.data_source_type] data_feed_patch = data_feed._to_generated_patch(data_feed_patch_type, update) - self._client.update_data_feed(data_feed_id, data_feed_patch, **kwargs) - return self.get_data_feed(data_feed_id) + return self._client.update_data_feed(data_feed_id, data_feed_patch, **kwargs) @distributed_trace def update_alert_configuration( @@ -811,7 +809,7 @@ def update_alert_configuration( alert_configuration, # type: Union[str, AnomalyAlertConfiguration] **kwargs # type: Any ): - # type: (...) -> AnomalyAlertConfiguration + # type: (...) -> None """Update anomaly alerting configuration. Either pass the entire AnomalyAlertConfiguration object with the chosen updates or the ID to your alert configuration with updates passed via keyword arguments. If you pass both the AnomalyAlertConfiguration object and keyword arguments, the keyword arguments @@ -828,8 +826,7 @@ def update_alert_configuration( :paramtype cross_metrics_operator: str or ~azure.ai.metricsadvisor.models.MetricAnomalyAlertConfigurationsOperator :keyword str description: Anomaly alert configuration description. - :return: AnomalyAlertConfiguration - :rtype: ~azure.ai.metricsadvisor.models.AnomalyAlertConfiguration + :rtype: None :raises ~azure.core.exceptions.HttpResponseError: .. admonition:: Example: @@ -865,12 +862,11 @@ def update_alert_configuration( description=update.pop("description", None), ) - self._client.update_anomaly_alerting_configuration( + return self._client.update_anomaly_alerting_configuration( alert_configuration_id, alert_configuration_patch, **kwargs ) - return self.get_alert_configuration(alert_configuration_id) @distributed_trace def update_detection_configuration( @@ -878,7 +874,7 @@ def update_detection_configuration( detection_configuration, # type: Union[str, AnomalyDetectionConfiguration] **kwargs # type: Any ): - # type: (...) -> AnomalyDetectionConfiguration + # type: (...) -> None """Update anomaly metric detection configuration. Either pass the entire AnomalyDetectionConfiguration object with the chosen updates or the ID to your detection configuration with updates passed via keyword arguments. If you pass both the AnomalyDetectionConfiguration object and keyword arguments, the keyword arguments @@ -899,8 +895,7 @@ def update_detection_configuration( :keyword series_detection_conditions: detection configuration for specific series. :paramtype series_detection_conditions: list[~azure.ai.metricsadvisor.models.MetricSingleSeriesDetectionCondition] - :return: AnomalyDetectionConfiguration - :rtype: ~azure.ai.metricsadvisor.models.AnomalyDetectionConfiguration + :rtype: None :raises ~azure.core.exceptions.HttpResponseError: .. admonition:: Example: @@ -936,12 +931,11 @@ def update_detection_configuration( series_detection_conditions=update.pop("seriesOverrideConfigurations", None) ) - self._client.update_anomaly_detection_configuration( + return self._client.update_anomaly_detection_configuration( detection_configuration_id, detection_config_patch, **kwargs ) - return self.get_detection_configuration(detection_configuration_id) @distributed_trace def update_hook( @@ -949,7 +943,7 @@ def update_hook( hook, # type: Union[str, EmailNotificationHook, WebNotificationHook] **kwargs # type: Any ): - # type: (...) -> Union[NotificationHook, EmailNotificationHook, WebNotificationHook] + # type: (...) -> None """Update a hook. Either pass the entire EmailNotificationHook or WebNotificationHook object with the chosen updates, or the ID to your hook configuration with the updates passed via keyword arguments. If you pass both the hook object and keyword arguments, the keyword arguments will take precedence. @@ -970,10 +964,7 @@ def update_hook( :keyword str certificate_key: client certificate. Only should be passed to update WebNotificationHook. :keyword str certificate_password: client certificate password. Only should be passed to update WebNotificationHook. - :return: EmailNotificationHook or WebNotificationHook - :rtype: Union[~azure.ai.metricsadvisor.models.NotificationHook, - ~azure.ai.metricsadvisor.models.EmailNotificationHook, - ~azure.ai.metricsadvisor.models.WebNotificationHook] + :rtype: None :raises ~azure.core.exceptions.HttpResponseError: .. admonition:: Example: @@ -1032,12 +1023,11 @@ def update_hook( certificate_password=update.pop("certificatePassword", None) ) - self._client.update_hook( + return self._client.update_hook( hook_id, hook_patch, **kwargs ) - return self.get_hook(hook_id) @distributed_trace def list_hooks( diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/aio/_metrics_advisor_administration_client_async.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/aio/_metrics_advisor_administration_client_async.py index 0f3d762f7eb5..31cabe05a339 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/aio/_metrics_advisor_administration_client_async.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/aio/_metrics_advisor_administration_client_async.py @@ -617,7 +617,7 @@ async def delete_hook(self, hook_id: str, **kwargs: Any) -> None: async def update_data_feed( self, data_feed: Union[str, DataFeed], **kwargs: Any - ) -> DataFeed: + ) -> None: """Update a data feed. Either pass the entire DataFeed object with the chosen updates or the ID to your data feed with updates passed via keyword arguments. If you pass both the DataFeed object and keyword arguments, the keyword arguments will take precedence. @@ -663,8 +663,7 @@ async def update_data_feed( AzureDataExplorerDataFeed, AzureDataLakeStorageGen2DataFeed, AzureTableDataFeed, HttpRequestDataFeed, InfluxDBDataFeed, MySqlDataFeed, PostgreSqlDataFeed, SQLServerDataFeed, MongoDBDataFeed, ElasticsearchDataFeed] - :return: DataFeed - :rtype: ~azure.ai.metricsadvisor.models.DataFeed + :rtype: None :raises ~azure.core.exceptions.HttpResponseError: .. admonition:: Example: @@ -711,15 +710,14 @@ async def update_data_feed( data_feed_patch_type = DATA_FEED_PATCH[data_feed.source.data_source_type] data_feed_patch = data_feed._to_generated_patch(data_feed_patch_type, update) - await self._client.update_data_feed(data_feed_id, data_feed_patch, **kwargs) - return await self.get_data_feed(data_feed_id) + return await self._client.update_data_feed(data_feed_id, data_feed_patch, **kwargs) @distributed_trace_async async def update_alert_configuration( self, alert_configuration: Union[str, AnomalyAlertConfiguration], **kwargs: Any - ) -> AnomalyAlertConfiguration: + ) -> None: """Update anomaly alerting configuration. Either pass the entire AnomalyAlertConfiguration object with the chosen updates or the ID to your alert configuration with updates passed via keyword arguments. If you pass both the AnomalyAlertConfiguration object and keyword arguments, the keyword arguments @@ -736,8 +734,7 @@ async def update_alert_configuration( :paramtype cross_metrics_operator: str or ~azure.ai.metricsadvisor.models.MetricAnomalyAlertConfigurationsOperator :keyword str description: Anomaly alert configuration description. - :return: AnomalyAlertConfiguration - :rtype: ~azure.ai.metricsadvisor.models.AnomalyAlertConfiguration + :rtype: None :raises ~azure.core.exceptions.HttpResponseError: .. admonition:: Example: @@ -773,19 +770,18 @@ async def update_alert_configuration( description=update.pop("description", None), ) - await self._client.update_anomaly_alerting_configuration( + return await self._client.update_anomaly_alerting_configuration( alert_configuration_id, alert_configuration_patch, **kwargs ) - return await self.get_alert_configuration(alert_configuration_id) @distributed_trace_async async def update_detection_configuration( self, detection_configuration: Union[str, AnomalyDetectionConfiguration], **kwargs: Any - ) -> AnomalyDetectionConfiguration: + ) -> None: """Update anomaly metric detection configuration. Either pass the entire AnomalyDetectionConfiguration object with the chosen updates or the ID to your detection configuration with updates passed via keyword arguments. If you pass both the AnomalyDetectionConfiguration object and keyword arguments, the keyword arguments @@ -843,19 +839,18 @@ async def update_detection_configuration( series_detection_conditions=update.pop("seriesOverrideConfigurations", None) ) - await self._client.update_anomaly_detection_configuration( + return await self._client.update_anomaly_detection_configuration( detection_configuration_id, detection_config_patch, **kwargs ) - return await self.get_detection_configuration(detection_configuration_id) @distributed_trace_async async def update_hook( self, hook: Union[str, EmailNotificationHook, WebNotificationHook], **kwargs: Any - ) -> Union[NotificationHook, EmailNotificationHook, WebNotificationHook]: + ) -> None: """Update a hook. Either pass the entire EmailNotificationHook or WebNotificationHook object with the chosen updates, or the ID to your hook configuration with the updates passed via keyword arguments. If you pass both the hook object and keyword arguments, the keyword arguments will take precedence. @@ -876,10 +871,7 @@ async def update_hook( :keyword str certificate_key: client certificate. Only should be passed to update WebNotificationHook. :keyword str certificate_password: client certificate password. Only should be passed to update WebNotificationHook. - :return: EmailNotificationHook or WebNotificationHook - :rtype: Union[~azure.ai.metricsadvisor.models.NotificationHook, - ~azure.ai.metricsadvisor.models.EmailNotificationHook, - ~azure.ai.metricsadvisor.models.WebNotificationHook] + :rtype: None :raises ~azure.core.exceptions.HttpResponseError: .. admonition:: Example: @@ -938,12 +930,11 @@ async def update_hook( certificate_password=update.pop("certificatePassword", None) ) - await self._client.update_hook( + return await self._client.update_hook( hook_id, hook_patch, **kwargs ) - return await self.get_hook(hook_id) @distributed_trace def list_hooks( diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/models/_models.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/models/_models.py index 16ea9a8ba209..1993f2283fc0 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/models/_models.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/models/_models.py @@ -339,7 +339,7 @@ class DataFeed(object): # pylint:disable=too-many-instance-attributes :ivar ingestion_settings: Data feed ingestion settings. :vartype ingestion_settings: ~azure.ai.metricsadvisor.models.DataFeedIngestionSettings :ivar bool is_admin: Whether the query user is one of data feed administrators or not. - :ivar list[str] metric_ids: List of metric ids + :ivar dict metric_ids: metric name and metric id dict :ivar str name: Data feed name. :ivar options: Data feed options :vartype options: ~azure.ai.metricsadvisor.models.DataFeedOptions @@ -404,7 +404,7 @@ def _from_generated(cls, data_feed): stop_retry_after=data_feed.stop_retry_after_in_seconds ), is_admin=data_feed.is_admin, - metric_ids=[metric.metric_id for metric in data_feed.metrics], + metric_ids={metric.metric_name: metric.metric_id for metric in data_feed.metrics}, name=data_feed.data_feed_name, options=DataFeedOptions( admin_emails=data_feed.admins, diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/async_samples/sample_alert_configuration_async.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/async_samples/sample_alert_configuration_async.py index 3f62122ecc81..882a023eb085 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/async_samples/sample_alert_configuration_async.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/async_samples/sample_alert_configuration_async.py @@ -267,12 +267,12 @@ async def sample_update_alert_config_async(alert_config): alert_config.metric_alert_configurations.append(additional_alert) async with client: - updated = await client.update_alert_configuration( + await client.update_alert_configuration( alert_config, cross_metrics_operator="OR", description="updated alert config" ) - + updated = await client.get_alert_configuration(alert_config.id) print("Updated alert name: {}".format(updated.name)) print("Updated alert description: {}".format(updated.description)) print("Updated cross metrics operator: {}".format(updated.cross_metrics_operator)) diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/async_samples/sample_data_feeds_async.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/async_samples/sample_data_feeds_async.py index fdfd744c737c..cb26a4a73bc5 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/async_samples/sample_data_feeds_async.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/async_samples/sample_data_feeds_async.py @@ -175,13 +175,13 @@ async def sample_update_data_feed_async(data_feed): data_feed.options.data_feed_description = "updated description for data feed" async with client: - updated_data_feed = await client.update_data_feed( + await client.update_data_feed( data_feed, access_mode="Public", fill_type="CustomValue", custom_fill_value=1 ) - + updated_data_feed = await client.get_data_feed(data_feed.id) print("Updated name: {}".format(updated_data_feed.name)) print("Updated description: {}".format(updated_data_feed.options.data_feed_description)) print("Updated access mode: {}".format(updated_data_feed.options.access_mode)) diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/async_samples/sample_detection_configuration_async.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/async_samples/sample_detection_configuration_async.py index d5c55f2b8eda..2345c518545e 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/async_samples/sample_detection_configuration_async.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/async_samples/sample_detection_configuration_async.py @@ -199,7 +199,7 @@ async def sample_update_detection_config_async(detection_config): ) async with client: - updated = await client.update_detection_configuration( + await client.update_detection_configuration( detection_config, series_group_detection_conditions=[ MetricSeriesGroupDetectionCondition( @@ -214,6 +214,7 @@ async def sample_update_detection_config_async(detection_config): ) ] ) + updated = await client.get_detection_configuration(detection_config.id) print("Updated detection name: {}".format(updated.name)) print("Updated detection description: {}".format(updated.description)) print("Updated detection condition for series group: {}".format( diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/async_samples/sample_hooks_async.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/async_samples/sample_hooks_async.py index 7c49edbb147e..92d2eb84d03b 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/async_samples/sample_hooks_async.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/async_samples/sample_hooks_async.py @@ -114,10 +114,11 @@ async def sample_update_hook_async(hook): hook.description = "updated hook description" async with client: - updated = await client.update_hook( + await client.update_hook( hook, emails_to_alert=["newemail@alertme.com"] ) + updated = await client.get_hook(hook.id) print("Updated name: {}".format(updated.name)) print("Updated description: {}".format(updated.description)) print("Updated emails: {}".format(updated.emails_to_alert)) diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/sample_alert_configuration.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/sample_alert_configuration.py index c21e32a1cf16..ccdbfed78bea 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/sample_alert_configuration.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/sample_alert_configuration.py @@ -254,11 +254,12 @@ def sample_update_alert_config(alert_config): ) alert_config.metric_alert_configurations.append(additional_alert) - updated = client.update_alert_configuration( + client.update_alert_configuration( alert_config, cross_metrics_operator="OR", description="updated alert config" ) + updated = client.get_alert_configuration(alert_config.id) print("Updated alert name: {}".format(updated.name)) print("Updated alert description: {}".format(updated.description)) diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/sample_data_feeds.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/sample_data_feeds.py index a318b991c8a5..74287f3b80fc 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/sample_data_feeds.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/sample_data_feeds.py @@ -167,12 +167,13 @@ def sample_update_data_feed(data_feed): data_feed.name = "updated name" data_feed.options.data_feed_description = "updated description for data feed" - updated_data_feed = client.update_data_feed( + client.update_data_feed( data_feed, access_mode="Public", fill_type="CustomValue", custom_fill_value=1 ) + updated_data_feed = client.get_data_feed(data_feed.id) print("Updated name: {}".format(updated_data_feed.name)) print("Updated description: {}".format(updated_data_feed.options.data_feed_description)) diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/sample_detection_configuration.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/sample_detection_configuration.py index b69ca5b3cb85..11a799dd001f 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/sample_detection_configuration.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/sample_detection_configuration.py @@ -190,7 +190,7 @@ def sample_update_detection_config(detection_config): ) ) - updated = client.update_detection_configuration( + client.update_detection_configuration( detection_config, series_group_detection_conditions=[ MetricSeriesGroupDetectionCondition( @@ -205,6 +205,7 @@ def sample_update_detection_config(detection_config): ) ] ) + updated = client.get_detection_configuration(detection_config.id) print("Updated detection name: {}".format(updated.name)) print("Updated detection description: {}".format(updated.description)) print("Updated detection condition for series group: {}".format( diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/sample_hooks.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/sample_hooks.py index 537ca9659094..a02e8cca365e 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/sample_hooks.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/sample_hooks.py @@ -106,10 +106,11 @@ def sample_update_hook(hook): hook.name = "updated hook name" hook.description = "updated hook description" - updated = client.update_hook( + client.update_hook( hook, emails_to_alert=["newemail@alertme.com"] ) + updated = client.get_hook(hook.id) print("Updated name: {}".format(updated.name)) print("Updated description: {}".format(updated.description)) print("Updated emails: {}".format(updated.emails_to_alert)) diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/base_testcase_aad_async.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/base_testcase_aad_async.py index c687cf66ae25..02705a49cb41 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/base_testcase_aad_async.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/base_testcase_aad_async.py @@ -204,7 +204,7 @@ async def _create_data_feed_and_detection_config(self, name): detection_config_name = create_random_name(name) detection_config = await self.admin_client.create_detection_configuration( name=detection_config_name, - metric_id=data_feed.metric_ids[0], + metric_id=data_feed.metric_ids['cost'], description="testing", whole_series_detection_condition=MetricDetectionCondition( smart_detection_condition=SmartDetectionCondition( @@ -285,7 +285,7 @@ async def _create_alert_config_for_update(self, name): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Both", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], lower=1.0, upper=5.0 ) @@ -326,7 +326,7 @@ async def _create_detection_config_for_update(self, name): detection_config_name = create_random_name("testupdated") detection_config = await self.admin_client.create_detection_configuration( name=detection_config_name, - metric_id=data_feed.metric_ids[0], + metric_id=data_feed.metric_ids['cost'], description="My test metric anomaly detection configuration", whole_series_detection_condition=MetricDetectionCondition( cross_conditions_operator="AND", diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/base_testcase_async.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/base_testcase_async.py index 2ff2137724cb..488e75391950 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/base_testcase_async.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/base_testcase_async.py @@ -202,7 +202,7 @@ async def _create_data_feed_and_detection_config(self, name): detection_config_name = create_random_name(name) detection_config = await self.admin_client.create_detection_configuration( name=detection_config_name, - metric_id=data_feed.metric_ids[0], + metric_id=data_feed.metric_ids['cost'], description="testing", whole_series_detection_condition=MetricDetectionCondition( smart_detection_condition=SmartDetectionCondition( @@ -283,7 +283,7 @@ async def _create_alert_config_for_update(self, name): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Both", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], lower=1.0, upper=5.0 ) @@ -324,7 +324,7 @@ async def _create_detection_config_for_update(self, name): detection_config_name = create_random_name("testupdated") detection_config = await self.admin_client.create_detection_configuration( name=detection_config_name, - metric_id=data_feed.metric_ids[0], + metric_id=data_feed.metric_ids['cost'], description="My test metric anomaly detection configuration", whole_series_detection_condition=MetricDetectionCondition( cross_conditions_operator="AND", diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_alert_config_aad_async.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_alert_config_aad_async.py index 10d9420b4e2c..2422385bcec9 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_alert_config_aad_async.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_alert_config_aad_async.py @@ -45,7 +45,7 @@ async def test_create_alert_config_top_n_alert_direction_both(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Both", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], lower=1.0, upper=5.0 ) @@ -108,7 +108,7 @@ async def test_create_alert_config_top_n_alert_direction_down(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Down", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], lower=1.0, ) ) @@ -170,7 +170,7 @@ async def test_create_alert_config_top_n_alert_direction_up(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Up", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], upper=5.0, ) ) @@ -337,7 +337,7 @@ async def test_create_alert_config_whole_series_alert_direction_both(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Both", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], lower=1.0, upper=5.0 ) @@ -391,7 +391,7 @@ async def test_create_alert_config_whole_series_alert_direction_down(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Down", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], lower=1.0, ) ) @@ -444,7 +444,7 @@ async def test_create_alert_config_whole_series_alert_direction_up(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Up", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], upper=5.0, ) ) @@ -544,7 +544,7 @@ async def test_create_alert_config_series_group_alert_direction_both(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Both", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], lower=1.0, upper=5.0 ) @@ -600,7 +600,7 @@ async def test_create_alert_config_series_group_alert_direction_down(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Down", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], lower=1.0, ) ) @@ -655,7 +655,7 @@ async def test_create_alert_config_series_group_alert_direction_up(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Up", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], upper=5.0, ) ) @@ -763,7 +763,7 @@ async def test_create_alert_config_multiple_configurations(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Both", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], lower=1.0, upper=5.0 ) @@ -873,7 +873,8 @@ async def test_update_alert_config_with_model(self): lower=1 ) - updated = await self.admin_client.update_alert_configuration(alert_config) + await self.admin_client.update_alert_configuration(alert_config) + updated = await self.admin_client.get_alert_configuration(alert_config.id) self.assertEqual(updated.name, "update") self.assertEqual(updated.description, "update description") @@ -895,7 +896,7 @@ async def test_update_alert_config_with_kwargs(self): async with self.admin_client: try: alert_config, data_feed, detection_config = await self._create_alert_config_for_update("alertupdate") - updated = await self.admin_client.update_alert_configuration( + await self.admin_client.update_alert_configuration( alert_config.id, name="update", description="update description", @@ -914,7 +915,7 @@ async def test_update_alert_config_with_kwargs(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Both", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], lower=1.0, upper=5.0 ), @@ -958,7 +959,7 @@ async def test_update_alert_config_with_kwargs(self): ) ] ) - + updated = await self.admin_client.get_alert_configuration(alert_config.id) self.assertEqual(updated.name, "update") self.assertEqual(updated.description, "update description") self.assertEqual(updated.cross_metrics_operator, "OR") @@ -987,7 +988,7 @@ async def test_update_alert_config_with_model_and_kwargs(self): alert_config.metric_alert_configurations[1].alert_conditions.metric_boundary_condition = None alert_config.metric_alert_configurations[2].alert_conditions.metric_boundary_condition = None - updated = await self.admin_client.update_alert_configuration( + await self.admin_client.update_alert_configuration( alert_config, cross_metrics_operator="OR", metric_alert_configurations=[ @@ -1004,7 +1005,7 @@ async def test_update_alert_config_with_model_and_kwargs(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Both", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], lower=1.0, upper=5.0 ), @@ -1048,7 +1049,7 @@ async def test_update_alert_config_with_model_and_kwargs(self): ) ] ) - + updated = await self.admin_client.get_alert_configuration(alert_config.id) self.assertEqual(updated.name, "updateMe") self.assertEqual(updated.description, "updateMe") self.assertEqual(updated.cross_metrics_operator, "OR") @@ -1069,7 +1070,7 @@ async def test_update_anomaly_alert_by_resetting_properties(self): async with self.admin_client: try: alert_config, data_feed, detection_config = await self._create_alert_config_for_update("alertupdate") - updated = await self.admin_client.update_alert_configuration( + await self.admin_client.update_alert_configuration( alert_config.id, name="reset", description="", # can't pass None currently, bug says description is required @@ -1088,7 +1089,7 @@ async def test_update_anomaly_alert_by_resetting_properties(self): ) ] ) - + updated = await self.admin_client.get_alert_configuration(alert_config.id) self.assertEqual(updated.name, "reset") self.assertEqual(updated.description, "") self.assertEqual(updated.cross_metrics_operator, None) diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_alert_config_async.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_alert_config_async.py index 01277b34eb50..c0cc04dce9e6 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_alert_config_async.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_alert_config_async.py @@ -45,7 +45,7 @@ async def test_create_alert_config_top_n_alert_direction_both(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Both", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], lower=1.0, upper=5.0 ) @@ -108,7 +108,7 @@ async def test_create_alert_config_top_n_alert_direction_down(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Down", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], lower=1.0, ) ) @@ -170,7 +170,7 @@ async def test_create_alert_config_top_n_alert_direction_up(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Up", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], upper=5.0, ) ) @@ -337,7 +337,7 @@ async def test_create_alert_config_whole_series_alert_direction_both(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Both", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], lower=1.0, upper=5.0 ) @@ -391,7 +391,7 @@ async def test_create_alert_config_whole_series_alert_direction_down(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Down", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], lower=1.0, ) ) @@ -444,7 +444,7 @@ async def test_create_alert_config_whole_series_alert_direction_up(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Up", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], upper=5.0, ) ) @@ -544,7 +544,7 @@ async def test_create_alert_config_series_group_alert_direction_both(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Both", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], lower=1.0, upper=5.0 ) @@ -600,7 +600,7 @@ async def test_create_alert_config_series_group_alert_direction_down(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Down", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], lower=1.0, ) ) @@ -655,7 +655,7 @@ async def test_create_alert_config_series_group_alert_direction_up(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Up", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], upper=5.0, ) ) @@ -763,7 +763,7 @@ async def test_create_alert_config_multiple_configurations(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Both", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], lower=1.0, upper=5.0 ) @@ -873,8 +873,8 @@ async def test_update_alert_config_with_model(self): lower=1 ) - updated = await self.admin_client.update_alert_configuration(alert_config) - + await self.admin_client.update_alert_configuration(alert_config) + updated = await self.admin_client.get_alert_configuration(alert_config.id) self.assertEqual(updated.name, "update") self.assertEqual(updated.description, "update description") self.assertEqual(updated.cross_metrics_operator, "OR") @@ -895,7 +895,7 @@ async def test_update_alert_config_with_kwargs(self): async with self.admin_client: try: alert_config, data_feed, detection_config = await self._create_alert_config_for_update("alertupdate") - updated = await self.admin_client.update_alert_configuration( + await self.admin_client.update_alert_configuration( alert_config.id, name="update", description="update description", @@ -914,7 +914,7 @@ async def test_update_alert_config_with_kwargs(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Both", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], lower=1.0, upper=5.0 ), @@ -958,7 +958,7 @@ async def test_update_alert_config_with_kwargs(self): ) ] ) - + updated = await self.admin_client.get_alert_configuration(alert_config.id) self.assertEqual(updated.name, "update") self.assertEqual(updated.description, "update description") self.assertEqual(updated.cross_metrics_operator, "OR") @@ -987,7 +987,7 @@ async def test_update_alert_config_with_model_and_kwargs(self): alert_config.metric_alert_configurations[1].alert_conditions.metric_boundary_condition = None alert_config.metric_alert_configurations[2].alert_conditions.metric_boundary_condition = None - updated = await self.admin_client.update_alert_configuration( + await self.admin_client.update_alert_configuration( alert_config, cross_metrics_operator="OR", metric_alert_configurations=[ @@ -1004,7 +1004,7 @@ async def test_update_alert_config_with_model_and_kwargs(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Both", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], lower=1.0, upper=5.0 ), @@ -1048,7 +1048,7 @@ async def test_update_alert_config_with_model_and_kwargs(self): ) ] ) - + updated = await self.admin_client.get_alert_configuration(alert_config.id) self.assertEqual(updated.name, "updateMe") self.assertEqual(updated.description, "updateMe") self.assertEqual(updated.cross_metrics_operator, "OR") @@ -1069,7 +1069,7 @@ async def test_update_anomaly_alert_by_resetting_properties(self): async with self.admin_client: try: alert_config, data_feed, detection_config = await self._create_alert_config_for_update("alertupdate") - updated = await self.admin_client.update_alert_configuration( + await self.admin_client.update_alert_configuration( alert_config.id, name="reset", description="", # can't pass None currently, bug says description is required @@ -1088,7 +1088,7 @@ async def test_update_anomaly_alert_by_resetting_properties(self): ) ] ) - + updated = await self.admin_client.get_alert_configuration(alert_config.id) self.assertEqual(updated.name, "reset") self.assertEqual(updated.description, "") self.assertEqual(updated.cross_metrics_operator, None) diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_data_feeds_aad_async.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_data_feeds_aad_async.py index 282f00d2a795..93b235f89134 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_data_feeds_aad_async.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_data_feeds_aad_async.py @@ -892,7 +892,8 @@ async def test_update_data_feed_with_model(self): data_feed.source.connection_string = "updated" data_feed.source.query = "get data" - updated = await self.admin_client.update_data_feed(data_feed) + await self.admin_client.update_data_feed(data_feed) + updated = await self.admin_client.get_data_feed(data_feed.id) self.assertEqual(updated.name, "update") self.assertEqual(updated.options.data_feed_description, "updated") self.assertEqual(updated.schema.timestamp_column, "time") @@ -923,7 +924,7 @@ async def test_update_data_feed_with_kwargs(self): async with self.admin_client: data_feed = await self._create_data_feed_for_update("update") try: - updated = await self.admin_client.update_data_feed( + await self.admin_client.update_data_feed( data_feed.id, name="update", data_feed_description="updated", @@ -948,6 +949,7 @@ async def test_update_data_feed_with_kwargs(self): query="get data" ) ) + updated = await self.admin_client.get_data_feed(data_feed.id) self.assertEqual(updated.name, "update") self.assertEqual(updated.options.data_feed_description, "updated") self.assertEqual(updated.schema.timestamp_column, "time") @@ -999,7 +1001,7 @@ async def test_update_data_feed_with_model_and_kwargs(self): data_feed.source.connection_string = "don't update me" data_feed.source.query = "don't update me" - updated = await self.admin_client.update_data_feed( + await self.admin_client.update_data_feed( data_feed, timestamp_column="time", ingestion_begin_time=datetime.datetime(2020, 12, 10), @@ -1022,6 +1024,7 @@ async def test_update_data_feed_with_model_and_kwargs(self): query="get data" ) ) + updated = await self.admin_client.get_data_feed(data_feed.id) self.assertEqual(updated.name, "updateMe") self.assertEqual(updated.options.data_feed_description, "updateMe") self.assertEqual(updated.schema.timestamp_column, "time") @@ -1052,7 +1055,7 @@ async def test_update_data_feed_by_reseting_properties(self): async with self.admin_client: data_feed = await self._create_data_feed_for_update("update") try: - updated = await self.admin_client.update_data_feed( + await self.admin_client.update_data_feed( data_feed.id, name="update", data_feed_description=None, @@ -1072,6 +1075,7 @@ async def test_update_data_feed_by_reseting_properties(self): status=None, action_link_template=None, ) + updated = await self.admin_client.get_data_feed(data_feed.id) self.assertEqual(updated.name, "update") # self.assertEqual(updated.options.data_feed_description, "") # doesn't currently clear # self.assertEqual(updated.schema.timestamp_column, "") # doesn't currently clear diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_data_feeds_async.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_data_feeds_async.py index 6de4794f1261..0bda30ed90f3 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_data_feeds_async.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_data_feeds_async.py @@ -892,7 +892,8 @@ async def test_update_data_feed_with_model(self): data_feed.source.connection_string = "updated" data_feed.source.query = "get data" - updated = await self.admin_client.update_data_feed(data_feed) + await self.admin_client.update_data_feed(data_feed) + updated = await self.admin_client.get_data_feed(data_feed.id) self.assertEqual(updated.name, "update") self.assertEqual(updated.options.data_feed_description, "updated") self.assertEqual(updated.schema.timestamp_column, "time") @@ -923,7 +924,7 @@ async def test_update_data_feed_with_kwargs(self): async with self.admin_client: data_feed = await self._create_data_feed_for_update("update") try: - updated = await self.admin_client.update_data_feed( + await self.admin_client.update_data_feed( data_feed.id, name="update", data_feed_description="updated", @@ -948,6 +949,7 @@ async def test_update_data_feed_with_kwargs(self): query="get data" ) ) + updated = await self.admin_client.get_data_feed(data_feed.id) self.assertEqual(updated.name, "update") self.assertEqual(updated.options.data_feed_description, "updated") self.assertEqual(updated.schema.timestamp_column, "time") @@ -999,7 +1001,7 @@ async def test_update_data_feed_with_model_and_kwargs(self): data_feed.source.connection_string = "don't update me" data_feed.source.query = "don't update me" - updated = await self.admin_client.update_data_feed( + await self.admin_client.update_data_feed( data_feed, timestamp_column="time", ingestion_begin_time=datetime.datetime(2020, 12, 10), @@ -1022,6 +1024,7 @@ async def test_update_data_feed_with_model_and_kwargs(self): query="get data" ) ) + updated = await self.admin_client.get_data_feed(data_feed.id) self.assertEqual(updated.name, "updateMe") self.assertEqual(updated.options.data_feed_description, "updateMe") self.assertEqual(updated.schema.timestamp_column, "time") @@ -1052,7 +1055,7 @@ async def test_update_data_feed_by_reseting_properties(self): async with self.admin_client: data_feed = await self._create_data_feed_for_update("update") try: - updated = await self.admin_client.update_data_feed( + await self.admin_client.update_data_feed( data_feed.id, name="update", data_feed_description=None, @@ -1072,6 +1075,7 @@ async def test_update_data_feed_by_reseting_properties(self): status=None, action_link_template=None, ) + updated = await self.admin_client.get_data_feed(data_feed.id) self.assertEqual(updated.name, "update") # self.assertEqual(updated.options.data_feed_description, "") # doesn't currently clear # self.assertEqual(updated.schema.timestamp_column, "") # doesn't currently clear diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_detection_config_aad_async.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_detection_config_aad_async.py index a18942188254..c116f7b2ee19 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_detection_config_aad_async.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_detection_config_aad_async.py @@ -32,7 +32,7 @@ async def test_create_ad_config_whole_series_detection(self): detection_config_name = self.create_random_name("testdetectionconfigasync") config = await self.admin_client.create_detection_configuration( name=detection_config_name, - metric_id=data_feed.metric_ids[0], + metric_id=data_feed.metric_ids['cost'], description="My test metric anomaly detection configuration", whole_series_detection_condition=MetricDetectionCondition( cross_conditions_operator="OR", @@ -66,7 +66,7 @@ async def test_create_ad_config_whole_series_detection(self): ) ) self.assertIsNotNone(config.id) - self.assertEqual(config.metric_id, data_feed.metric_ids[0]) + self.assertEqual(config.metric_id, data_feed.metric_ids['cost']) self.assertEqual(config.description, "My test metric anomaly detection configuration") self.assertIsNotNone(config.name) self.assertIsNone(config.series_detection_conditions) @@ -112,7 +112,7 @@ async def test_create_ad_config_with_series_and_group_conds(self): detection_config_name = self.create_random_name("testdetectionconfigetasync") detection_config = await self.admin_client.create_detection_configuration( name=detection_config_name, - metric_id=data_feed.metric_ids[0], + metric_id=data_feed.metric_ids['cost'], description="My test metric anomaly detection configuration", whole_series_detection_condition=MetricDetectionCondition( cross_conditions_operator="AND", @@ -169,7 +169,7 @@ async def test_create_ad_config_with_series_and_group_conds(self): ) self.assertIsNotNone(detection_config.id) - self.assertEqual(detection_config.metric_id, data_feed.metric_ids[0]) + self.assertEqual(detection_config.metric_id, data_feed.metric_ids['cost']) self.assertEqual(detection_config.description, "My test metric anomaly detection configuration") self.assertIsNotNone(detection_config.name) self.assertEqual(detection_config.whole_series_detection_condition.cross_conditions_operator, "AND") @@ -229,7 +229,7 @@ async def test_create_ad_config_multiple_series_and_group_conds(self): detection_config_name = self.create_random_name("multipledetectionconfigsasync") detection_config = await self.admin_client.create_detection_configuration( name=detection_config_name, - metric_id=data_feed.metric_ids[0], + metric_id=data_feed.metric_ids['cost'], description="My test metric anomaly detection configuration", whole_series_detection_condition=MetricDetectionCondition( cross_conditions_operator="AND", @@ -354,7 +354,7 @@ async def test_create_ad_config_multiple_series_and_group_conds(self): ) self.assertIsNotNone(detection_config.id) - self.assertEqual(detection_config.metric_id, data_feed.metric_ids[0]) + self.assertEqual(detection_config.metric_id, data_feed.metric_ids['cost']) self.assertEqual(detection_config.description, "My test metric anomaly detection configuration") self.assertIsNotNone(detection_config.name) @@ -524,7 +524,8 @@ async def test_update_detection_config_with_model(self): detection_config.whole_series_detection_condition.change_threshold_condition = change_threshold_condition detection_config.whole_series_detection_condition.cross_conditions_operator = "OR" - updated = await self.admin_client.update_detection_configuration(detection_config) + await self.admin_client.update_detection_configuration(detection_config) + updated = await self.admin_client.get_detection_configuration(detection_config.id) self.assertEqual(updated.name, "updated") self.assertEqual(updated.description, "updated") @@ -609,7 +610,7 @@ async def test_update_detection_config_with_kwargs(self): min_ratio=2 ) ) - updated = await self.admin_client.update_detection_configuration( + await self.admin_client.update_detection_configuration( detection_config.id, name="updated", description="updated", @@ -634,7 +635,7 @@ async def test_update_detection_config_with_kwargs(self): change_threshold_condition=change_threshold_condition )] ) - + updated = await self.admin_client.get_detection_configuration(detection_config.id) self.assertEqual(updated.name, "updated") self.assertEqual(updated.description, "updated") self.assertEqual(updated.series_detection_conditions[0].change_threshold_condition.anomaly_detector_direction, "Both") @@ -723,7 +724,7 @@ async def test_update_detection_config_with_model_and_kwargs(self): detection_config.name = "updateMe" detection_config.description = "updateMe" - updated = await self.admin_client.update_detection_configuration( + await self.admin_client.update_detection_configuration( detection_config, whole_series_detection_condition=MetricDetectionCondition( cross_conditions_operator="OR", @@ -746,7 +747,7 @@ async def test_update_detection_config_with_model_and_kwargs(self): change_threshold_condition=change_threshold_condition )] ) - + updated = await self.admin_client.get_detection_configuration(detection_config.id) self.assertEqual(updated.name, "updateMe") self.assertEqual(updated.description, "updateMe") self.assertEqual(updated.series_detection_conditions[0].change_threshold_condition.anomaly_detector_direction, "Both") @@ -807,14 +808,14 @@ async def test_update_detection_config_by_resetting_properties(self): try: detection_config, data_feed = await self._create_detection_config_for_update("updatedetection") - updated = await self.admin_client.update_detection_configuration( + await self.admin_client.update_detection_configuration( detection_config.id, name="reset", description="", # series_detection_conditions=None, # series_group_detection_conditions=None ) - + updated = await self.admin_client.get_detection_configuration(detection_config.id) self.assertEqual(updated.name, "reset") self.assertEqual(updated.description, "") # currently won't update with None diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_detection_config_async.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_detection_config_async.py index 3dab875f5aa8..3b7c25326bf9 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_detection_config_async.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_detection_config_async.py @@ -32,7 +32,7 @@ async def test_create_ad_config_whole_series_detection(self): detection_config_name = self.create_random_name("testdetectionconfigasync") config = await self.admin_client.create_detection_configuration( name=detection_config_name, - metric_id=data_feed.metric_ids[0], + metric_id=data_feed.metric_ids['cost'], description="My test metric anomaly detection configuration", whole_series_detection_condition=MetricDetectionCondition( cross_conditions_operator="OR", @@ -66,7 +66,7 @@ async def test_create_ad_config_whole_series_detection(self): ) ) self.assertIsNotNone(config.id) - self.assertEqual(config.metric_id, data_feed.metric_ids[0]) + self.assertEqual(config.metric_id, data_feed.metric_ids['cost']) self.assertEqual(config.description, "My test metric anomaly detection configuration") self.assertIsNotNone(config.name) self.assertIsNone(config.series_detection_conditions) @@ -112,7 +112,7 @@ async def test_create_ad_config_with_series_and_group_conds(self): detection_config_name = self.create_random_name("testdetectionconfigetasync") detection_config = await self.admin_client.create_detection_configuration( name=detection_config_name, - metric_id=data_feed.metric_ids[0], + metric_id=data_feed.metric_ids['cost'], description="My test metric anomaly detection configuration", whole_series_detection_condition=MetricDetectionCondition( cross_conditions_operator="AND", @@ -169,7 +169,7 @@ async def test_create_ad_config_with_series_and_group_conds(self): ) self.assertIsNotNone(detection_config.id) - self.assertEqual(detection_config.metric_id, data_feed.metric_ids[0]) + self.assertEqual(detection_config.metric_id, data_feed.metric_ids['cost']) self.assertEqual(detection_config.description, "My test metric anomaly detection configuration") self.assertIsNotNone(detection_config.name) self.assertEqual(detection_config.whole_series_detection_condition.cross_conditions_operator, "AND") @@ -229,7 +229,7 @@ async def test_create_ad_config_multiple_series_and_group_conds(self): detection_config_name = self.create_random_name("multipledetectionconfigsasync") detection_config = await self.admin_client.create_detection_configuration( name=detection_config_name, - metric_id=data_feed.metric_ids[0], + metric_id=data_feed.metric_ids['cost'], description="My test metric anomaly detection configuration", whole_series_detection_condition=MetricDetectionCondition( cross_conditions_operator="AND", @@ -354,7 +354,7 @@ async def test_create_ad_config_multiple_series_and_group_conds(self): ) self.assertIsNotNone(detection_config.id) - self.assertEqual(detection_config.metric_id, data_feed.metric_ids[0]) + self.assertEqual(detection_config.metric_id, data_feed.metric_ids['cost']) self.assertEqual(detection_config.description, "My test metric anomaly detection configuration") self.assertIsNotNone(detection_config.name) @@ -524,8 +524,8 @@ async def test_update_detection_config_with_model(self): detection_config.whole_series_detection_condition.change_threshold_condition = change_threshold_condition detection_config.whole_series_detection_condition.cross_conditions_operator = "OR" - updated = await self.admin_client.update_detection_configuration(detection_config) - + await self.admin_client.update_detection_configuration(detection_config) + updated = await self.admin_client.get_detection_configuration(detection_config.id) self.assertEqual(updated.name, "updated") self.assertEqual(updated.description, "updated") self.assertEqual(updated.series_detection_conditions[0].change_threshold_condition.anomaly_detector_direction, "Both") @@ -609,7 +609,7 @@ async def test_update_detection_config_with_kwargs(self): min_ratio=2 ) ) - updated = await self.admin_client.update_detection_configuration( + await self.admin_client.update_detection_configuration( detection_config.id, name="updated", description="updated", @@ -634,7 +634,7 @@ async def test_update_detection_config_with_kwargs(self): change_threshold_condition=change_threshold_condition )] ) - + updated = await self.admin_client.get_detection_configuration(detection_config.id) self.assertEqual(updated.name, "updated") self.assertEqual(updated.description, "updated") self.assertEqual(updated.series_detection_conditions[0].change_threshold_condition.anomaly_detector_direction, "Both") @@ -723,7 +723,7 @@ async def test_update_detection_config_with_model_and_kwargs(self): detection_config.name = "updateMe" detection_config.description = "updateMe" - updated = await self.admin_client.update_detection_configuration( + await self.admin_client.update_detection_configuration( detection_config, whole_series_detection_condition=MetricDetectionCondition( cross_conditions_operator="OR", @@ -746,7 +746,7 @@ async def test_update_detection_config_with_model_and_kwargs(self): change_threshold_condition=change_threshold_condition )] ) - + updated = await self.admin_client.get_detection_configuration(detection_config.id) self.assertEqual(updated.name, "updateMe") self.assertEqual(updated.description, "updateMe") self.assertEqual(updated.series_detection_conditions[0].change_threshold_condition.anomaly_detector_direction, "Both") @@ -807,14 +807,14 @@ async def test_update_detection_config_by_resetting_properties(self): try: detection_config, data_feed = await self._create_detection_config_for_update("updatedetection") - updated = await self.admin_client.update_detection_configuration( + await self.admin_client.update_detection_configuration( detection_config.id, name="reset", description="", # series_detection_conditions=None, # series_group_detection_conditions=None ) - + updated = await self.admin_client.get_detection_configuration(detection_config.id) self.assertEqual(updated.name, "reset") self.assertEqual(updated.description, "") # currently won't update with None diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_hooks_aad_async.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_hooks_aad_async.py index 0b1872f02b2a..c64657997480 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_hooks_aad_async.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_hooks_aad_async.py @@ -88,7 +88,8 @@ async def test_update_email_hook_with_model(self): hook.external_link = "update" hook.emails_to_alert = ["myemail@m.com"] - updated = await self.admin_client.update_hook(hook) + await self.admin_client.update_hook(hook) + updated = await self.admin_client.get_hook(hook.id) self.assertEqual(updated.name, "update") self.assertEqual(updated.description, "update") @@ -104,7 +105,7 @@ async def test_update_email_hook_with_kwargs(self): async with self.admin_client: try: hook = await self._create_email_hook_for_update(name) - updated = await self.admin_client.update_hook( + await self.admin_client.update_hook( hook.id, hook_type="Email", name="update", @@ -112,7 +113,7 @@ async def test_update_email_hook_with_kwargs(self): external_link="update", emails_to_alert=["myemail@m.com"] ) - + updated = await self.admin_client.get_hook(hook.id) self.assertEqual(updated.name, "update") self.assertEqual(updated.description, "update") self.assertEqual(updated.external_link, "update") @@ -131,7 +132,7 @@ async def test_update_email_hook_with_model_and_kwargs(self): hook.name = "don't update me" hook.description = "don't update me" hook.emails_to_alert = [] - updated = await self.admin_client.update_hook( + await self.admin_client.update_hook( hook, hook_type="Email", name="update", @@ -139,7 +140,7 @@ async def test_update_email_hook_with_model_and_kwargs(self): external_link="update", emails_to_alert=["myemail@m.com"] ) - + updated = await self.admin_client.get_hook(hook.id) self.assertEqual(updated.name, "update") self.assertEqual(updated.description, "update") self.assertEqual(updated.external_link, "update") @@ -154,14 +155,14 @@ async def test_update_email_hook_by_resetting_properties(self): async with self.admin_client: try: hook = await self._create_email_hook_for_update(name) - updated = await self.admin_client.update_hook( + await self.admin_client.update_hook( hook.id, hook_type="Email", name="reset", description=None, external_link=None, ) - + updated = await self.admin_client.get_hook(hook.id) self.assertEqual(updated.name, "reset") # sending null, but not clearing properties @@ -183,8 +184,8 @@ async def test_update_web_hook_with_model(self): hook.username = "myusername" hook.password = "password" - updated = await self.admin_client.update_hook(hook) - + await self.admin_client.update_hook(hook) + updated = await self.admin_client.get_hook(hook.id) self.assertEqual(updated.name, "update") self.assertEqual(updated.description, "update") self.assertEqual(updated.external_link, "update") @@ -200,7 +201,7 @@ async def test_update_web_hook_with_kwargs(self): async with self.admin_client: try: hook = await self._create_web_hook_for_update(name) - updated = await self.admin_client.update_hook( + await self.admin_client.update_hook( hook.id, hook_type="Web", endpoint="https://httpbin.org/post", @@ -210,7 +211,7 @@ async def test_update_web_hook_with_kwargs(self): username="myusername", password="password" ) - + updated = await self.admin_client.get_hook(hook.id) self.assertEqual(updated.name, "update") self.assertEqual(updated.description, "update") self.assertEqual(updated.external_link, "update") @@ -232,7 +233,7 @@ async def test_update_web_hook_with_model_and_kwargs(self): hook.username = "don't update me" hook.password = "don't update me" hook.endpoint = "don't update me" - updated = await self.admin_client.update_hook( + await self.admin_client.update_hook( hook, hook_type="Web", endpoint="https://httpbin.org/post", @@ -241,7 +242,7 @@ async def test_update_web_hook_with_model_and_kwargs(self): username="myusername", password="password" ) - + updated = await self.admin_client.get_hook(hook.id) self.assertEqual(updated.name, "update") self.assertEqual(updated.description, "updateMe") self.assertEqual(updated.external_link, "update") @@ -257,7 +258,7 @@ async def test_update_web_hook_by_resetting_properties(self): async with self.admin_client: try: hook = await self._create_web_hook_for_update(name) - updated = await self.admin_client.update_hook( + await self.admin_client.update_hook( hook.id, hook_type="Web", name="reset", @@ -267,7 +268,7 @@ async def test_update_web_hook_by_resetting_properties(self): username="myusername", password=None ) - + updated = await self.admin_client.get_hook(hook.id) self.assertEqual(updated.name, "reset") self.assertEqual(updated.password, "") diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_hooks_async.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_hooks_async.py index 45ffdefcae96..5f92cd6c2c89 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_hooks_async.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_hooks_async.py @@ -88,8 +88,8 @@ async def test_update_email_hook_with_model(self): hook.external_link = "update" hook.emails_to_alert = ["myemail@m.com"] - updated = await self.admin_client.update_hook(hook) - + await self.admin_client.update_hook(hook) + updated = await self.admin_client.get_hook(hook.id) self.assertEqual(updated.name, "update") self.assertEqual(updated.description, "update") self.assertEqual(updated.external_link, "update") @@ -104,7 +104,7 @@ async def test_update_email_hook_with_kwargs(self): async with self.admin_client: try: hook = await self._create_email_hook_for_update(name) - updated = await self.admin_client.update_hook( + await self.admin_client.update_hook( hook.id, hook_type="Email", name="update", @@ -112,7 +112,7 @@ async def test_update_email_hook_with_kwargs(self): external_link="update", emails_to_alert=["myemail@m.com"] ) - + updated = await self.admin_client.get_hook(hook.id) self.assertEqual(updated.name, "update") self.assertEqual(updated.description, "update") self.assertEqual(updated.external_link, "update") @@ -131,7 +131,7 @@ async def test_update_email_hook_with_model_and_kwargs(self): hook.name = "don't update me" hook.description = "don't update me" hook.emails_to_alert = [] - updated = await self.admin_client.update_hook( + await self.admin_client.update_hook( hook, hook_type="Email", name="update", @@ -139,7 +139,7 @@ async def test_update_email_hook_with_model_and_kwargs(self): external_link="update", emails_to_alert=["myemail@m.com"] ) - + updated = await self.admin_client.get_hook(hook.id) self.assertEqual(updated.name, "update") self.assertEqual(updated.description, "update") self.assertEqual(updated.external_link, "update") @@ -154,14 +154,14 @@ async def test_update_email_hook_by_resetting_properties(self): async with self.admin_client: try: hook = await self._create_email_hook_for_update(name) - updated = await self.admin_client.update_hook( + await self.admin_client.update_hook( hook.id, hook_type="Email", name="reset", description=None, external_link=None, ) - + updated = await self.admin_client.get_hook(hook.id) self.assertEqual(updated.name, "reset") # sending null, but not clearing properties @@ -183,8 +183,8 @@ async def test_update_web_hook_with_model(self): hook.username = "myusername" hook.password = "password" - updated = await self.admin_client.update_hook(hook) - + await self.admin_client.update_hook(hook) + updated = await self.admin_client.get_hook(hook.id) self.assertEqual(updated.name, "update") self.assertEqual(updated.description, "update") self.assertEqual(updated.external_link, "update") @@ -200,7 +200,7 @@ async def test_update_web_hook_with_kwargs(self): async with self.admin_client: try: hook = await self._create_web_hook_for_update(name) - updated = await self.admin_client.update_hook( + await self.admin_client.update_hook( hook.id, hook_type="Web", endpoint="https://httpbin.org/post", @@ -210,7 +210,7 @@ async def test_update_web_hook_with_kwargs(self): username="myusername", password="password" ) - + updated = await self.admin_client.get_hook(hook.id) self.assertEqual(updated.name, "update") self.assertEqual(updated.description, "update") self.assertEqual(updated.external_link, "update") @@ -232,7 +232,7 @@ async def test_update_web_hook_with_model_and_kwargs(self): hook.username = "don't update me" hook.password = "don't update me" hook.endpoint = "don't update me" - updated = await self.admin_client.update_hook( + await self.admin_client.update_hook( hook, hook_type="Web", endpoint="https://httpbin.org/post", @@ -241,7 +241,7 @@ async def test_update_web_hook_with_model_and_kwargs(self): username="myusername", password="password" ) - + updated = await self.admin_client.get_hook(hook.id) self.assertEqual(updated.name, "update") self.assertEqual(updated.description, "updateMe") self.assertEqual(updated.external_link, "update") @@ -257,7 +257,7 @@ async def test_update_web_hook_by_resetting_properties(self): async with self.admin_client: try: hook = await self._create_web_hook_for_update(name) - updated = await self.admin_client.update_hook( + await self.admin_client.update_hook( hook.id, hook_type="Web", name="reset", @@ -267,7 +267,7 @@ async def test_update_web_hook_by_resetting_properties(self): username="myusername", password=None ) - + updated = await self.admin_client.get_hook(hook.id) self.assertEqual(updated.name, "reset") self.assertEqual(updated.password, "") diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/base_testcase.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/base_testcase.py index ea34d8e0444f..a608836fe7e1 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/base_testcase.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/base_testcase.py @@ -198,7 +198,7 @@ def _create_data_feed_and_detection_config(self, name): detection_config_name = create_random_name(name) detection_config = self.admin_client.create_detection_configuration( name=detection_config_name, - metric_id=data_feed.metric_ids[0], + metric_id=data_feed.metric_ids['cost'], description="testing", whole_series_detection_condition=MetricDetectionCondition( smart_detection_condition=SmartDetectionCondition( @@ -279,7 +279,7 @@ def _create_alert_config_for_update(self, name): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Both", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], lower=1.0, upper=5.0 ) @@ -320,7 +320,7 @@ def _create_detection_config_for_update(self, name): detection_config_name = create_random_name("testupdated") detection_config = self.admin_client.create_detection_configuration( name=detection_config_name, - metric_id=data_feed.metric_ids[0], + metric_id=data_feed.metric_ids['cost'], description="My test metric anomaly detection configuration", whole_series_detection_condition=MetricDetectionCondition( cross_conditions_operator="AND", diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/base_testcase_aad.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/base_testcase_aad.py index e9a9ffafc76c..86a50f4a8295 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/base_testcase_aad.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/base_testcase_aad.py @@ -200,7 +200,7 @@ def _create_data_feed_and_detection_config(self, name): detection_config_name = create_random_name(name) detection_config = self.admin_client.create_detection_configuration( name=detection_config_name, - metric_id=data_feed.metric_ids[0], + metric_id=data_feed.metric_ids['cost'], description="testing", whole_series_detection_condition=MetricDetectionCondition( smart_detection_condition=SmartDetectionCondition( @@ -281,7 +281,7 @@ def _create_alert_config_for_update(self, name): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Both", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], lower=1.0, upper=5.0 ) @@ -322,7 +322,7 @@ def _create_detection_config_for_update(self, name): detection_config_name = create_random_name("testupdated") detection_config = self.admin_client.create_detection_configuration( name=detection_config_name, - metric_id=data_feed.metric_ids[0], + metric_id=data_feed.metric_ids['cost'], description="My test metric anomaly detection configuration", whole_series_detection_condition=MetricDetectionCondition( cross_conditions_operator="AND", diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_alert_config.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_alert_config.py index 8d7809da164c..9fa3371521ae 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_alert_config.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_alert_config.py @@ -43,7 +43,7 @@ def test_create_alert_config_top_n_alert_direction_both(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Both", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], lower=1.0, upper=5.0 ) @@ -104,7 +104,7 @@ def test_create_alert_config_top_n_alert_direction_down(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Down", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], lower=1.0, ) ) @@ -164,7 +164,7 @@ def test_create_alert_config_top_n_alert_direction_up(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Up", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], upper=5.0, ) ) @@ -325,7 +325,7 @@ def test_create_alert_config_whole_series_alert_direction_both(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Both", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], lower=1.0, upper=5.0 ) @@ -377,7 +377,7 @@ def test_create_alert_config_whole_series_alert_direction_down(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Down", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], lower=1.0, ) ) @@ -428,7 +428,7 @@ def test_create_alert_config_whole_series_alert_direction_up(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Up", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], upper=5.0, ) ) @@ -524,7 +524,7 @@ def test_create_alert_config_series_group_alert_direction_both(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Both", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], lower=1.0, upper=5.0 ) @@ -578,7 +578,7 @@ def test_create_alert_config_series_group_alert_direction_down(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Down", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], lower=1.0, ) ) @@ -631,7 +631,7 @@ def test_create_alert_config_series_group_alert_direction_up(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Up", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], upper=5.0, ) ) @@ -735,7 +735,7 @@ def test_create_alert_config_multiple_configurations(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Both", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], lower=1.0, upper=5.0 ) @@ -839,7 +839,8 @@ def test_update_alert_config_with_model(self): lower=1 ) - updated = self.admin_client.update_alert_configuration(alert_config) + self.admin_client.update_alert_configuration(alert_config) + updated = self.admin_client.get_alert_configuration(alert_config.id) self.assertEqual(updated.name, "update") self.assertEqual(updated.description, "update description") @@ -859,7 +860,7 @@ def test_update_alert_config_with_model(self): def test_update_alert_config_with_kwargs(self): try: alert_config, data_feed, detection_config = self._create_alert_config_for_update("alertupdate") - updated = self.admin_client.update_alert_configuration( + self.admin_client.update_alert_configuration( alert_config.id, name="update", description="update description", @@ -878,7 +879,7 @@ def test_update_alert_config_with_kwargs(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Both", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], lower=1.0, upper=5.0 ), @@ -922,7 +923,7 @@ def test_update_alert_config_with_kwargs(self): ) ] ) - + updated = self.admin_client.get_alert_configuration(alert_config.id) self.assertEqual(updated.name, "update") self.assertEqual(updated.description, "update description") self.assertEqual(updated.cross_metrics_operator, "OR") @@ -949,7 +950,7 @@ def test_update_alert_config_with_model_and_kwargs(self): alert_config.metric_alert_configurations[1].alert_conditions.metric_boundary_condition = None alert_config.metric_alert_configurations[2].alert_conditions.metric_boundary_condition = None - updated = self.admin_client.update_alert_configuration( + self.admin_client.update_alert_configuration( alert_config, cross_metrics_operator="OR", metric_alert_configurations=[ @@ -966,7 +967,7 @@ def test_update_alert_config_with_model_and_kwargs(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Both", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], lower=1.0, upper=5.0 ), @@ -1010,7 +1011,7 @@ def test_update_alert_config_with_model_and_kwargs(self): ) ] ) - + updated = self.admin_client.get_alert_configuration(alert_config.id) self.assertEqual(updated.name, "updateMe") self.assertEqual(updated.description, "updateMe") self.assertEqual(updated.cross_metrics_operator, "OR") @@ -1029,7 +1030,7 @@ def test_update_alert_config_with_model_and_kwargs(self): def test_update_anomaly_alert_by_resetting_properties(self): try: alert_config, data_feed, detection_config = self._create_alert_config_for_update("alertupdate") - updated = self.admin_client.update_alert_configuration( + self.admin_client.update_alert_configuration( alert_config.id, name="reset", description="", # can't pass None currently, bug says description is required @@ -1048,7 +1049,7 @@ def test_update_anomaly_alert_by_resetting_properties(self): ) ] ) - + updated = self.admin_client.get_alert_configuration(alert_config.id) self.assertEqual(updated.name, "reset") self.assertEqual(updated.description, "") self.assertEqual(updated.cross_metrics_operator, None) diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_alert_config_aad.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_alert_config_aad.py index 4c1805fa6ae1..8c37cbd3324b 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_alert_config_aad.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_alert_config_aad.py @@ -43,7 +43,7 @@ def test_create_alert_config_top_n_alert_direction_both(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Both", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], lower=1.0, upper=5.0 ) @@ -104,7 +104,7 @@ def test_create_alert_config_top_n_alert_direction_down(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Down", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], lower=1.0, ) ) @@ -164,7 +164,7 @@ def test_create_alert_config_top_n_alert_direction_up(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Up", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], upper=5.0, ) ) @@ -325,7 +325,7 @@ def test_create_alert_config_whole_series_alert_direction_both(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Both", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], lower=1.0, upper=5.0 ) @@ -377,7 +377,7 @@ def test_create_alert_config_whole_series_alert_direction_down(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Down", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], lower=1.0, ) ) @@ -428,7 +428,7 @@ def test_create_alert_config_whole_series_alert_direction_up(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Up", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], upper=5.0, ) ) @@ -524,7 +524,7 @@ def test_create_alert_config_series_group_alert_direction_both(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Both", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], lower=1.0, upper=5.0 ) @@ -578,7 +578,7 @@ def test_create_alert_config_series_group_alert_direction_down(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Down", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], lower=1.0, ) ) @@ -631,7 +631,7 @@ def test_create_alert_config_series_group_alert_direction_up(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Up", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], upper=5.0, ) ) @@ -735,7 +735,7 @@ def test_create_alert_config_multiple_configurations(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Both", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], lower=1.0, upper=5.0 ) @@ -839,7 +839,8 @@ def test_update_alert_config_with_model(self): lower=1 ) - updated = self.admin_client.update_alert_configuration(alert_config) + self.admin_client.update_alert_configuration(alert_config) + updated = self.admin_client.get_alert_configuration(alert_config.id) self.assertEqual(updated.name, "update") self.assertEqual(updated.description, "update description") @@ -859,7 +860,7 @@ def test_update_alert_config_with_model(self): def test_update_alert_config_with_kwargs(self): try: alert_config, data_feed, detection_config = self._create_alert_config_for_update("alertupdate") - updated = self.admin_client.update_alert_configuration( + self.admin_client.update_alert_configuration( alert_config.id, name="update", description="update description", @@ -878,7 +879,7 @@ def test_update_alert_config_with_kwargs(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Both", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], lower=1.0, upper=5.0 ), @@ -922,7 +923,7 @@ def test_update_alert_config_with_kwargs(self): ) ] ) - + updated = self.admin_client.get_alert_configuration(alert_config.id) self.assertEqual(updated.name, "update") self.assertEqual(updated.description, "update description") self.assertEqual(updated.cross_metrics_operator, "OR") @@ -949,7 +950,7 @@ def test_update_alert_config_with_model_and_kwargs(self): alert_config.metric_alert_configurations[1].alert_conditions.metric_boundary_condition = None alert_config.metric_alert_configurations[2].alert_conditions.metric_boundary_condition = None - updated = self.admin_client.update_alert_configuration( + self.admin_client.update_alert_configuration( alert_config, cross_metrics_operator="OR", metric_alert_configurations=[ @@ -966,7 +967,7 @@ def test_update_alert_config_with_model_and_kwargs(self): alert_conditions=MetricAnomalyAlertConditions( metric_boundary_condition=MetricBoundaryCondition( direction="Both", - companion_metric_id=data_feed.metric_ids[0], + companion_metric_id=data_feed.metric_ids['cost'], lower=1.0, upper=5.0 ), @@ -1010,7 +1011,7 @@ def test_update_alert_config_with_model_and_kwargs(self): ) ] ) - + updated = self.admin_client.get_alert_configuration(alert_config.id) self.assertEqual(updated.name, "updateMe") self.assertEqual(updated.description, "updateMe") self.assertEqual(updated.cross_metrics_operator, "OR") @@ -1029,7 +1030,7 @@ def test_update_alert_config_with_model_and_kwargs(self): def test_update_anomaly_alert_by_resetting_properties(self): try: alert_config, data_feed, detection_config = self._create_alert_config_for_update("alertupdate") - updated = self.admin_client.update_alert_configuration( + self.admin_client.update_alert_configuration( alert_config.id, name="reset", description="", # can't pass None currently, bug says description is required @@ -1048,7 +1049,7 @@ def test_update_anomaly_alert_by_resetting_properties(self): ) ] ) - + updated = self.admin_client.get_alert_configuration(alert_config.id) self.assertEqual(updated.name, "reset") self.assertEqual(updated.description, "") self.assertEqual(updated.cross_metrics_operator, None) diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_data_feeds.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_data_feeds.py index 80b7c2646a4a..95acaed5a1a7 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_data_feeds.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_data_feeds.py @@ -827,7 +827,8 @@ def test_update_data_feed_with_model(self): data_feed.source.connection_string = "updated" data_feed.source.query = "get data" - updated = self.admin_client.update_data_feed(data_feed) + self.admin_client.update_data_feed(data_feed) + updated = self.admin_client.get_data_feed(data_feed.id) self.assertEqual(updated.name, "update") self.assertEqual(updated.options.data_feed_description, "updated") self.assertEqual(updated.schema.timestamp_column, "time") @@ -857,7 +858,7 @@ def test_update_data_feed_with_kwargs(self): data_feed = self._create_data_feed_for_update("update") try: - updated = self.admin_client.update_data_feed( + self.admin_client.update_data_feed( data_feed.id, name="update", data_feed_description="updated", @@ -882,6 +883,7 @@ def test_update_data_feed_with_kwargs(self): query="get data" ) ) + updated = self.admin_client.get_data_feed(data_feed.id) self.assertEqual(updated.name, "update") self.assertEqual(updated.options.data_feed_description, "updated") self.assertEqual(updated.schema.timestamp_column, "time") @@ -932,7 +934,7 @@ def test_update_data_feed_with_model_and_kwargs(self): data_feed.source.connection_string = "don't update me" data_feed.source.query = "don't update me" - updated = self.admin_client.update_data_feed( + self.admin_client.update_data_feed( data_feed, timestamp_column="time", ingestion_begin_time=datetime.datetime(2020, 12, 10), @@ -955,6 +957,7 @@ def test_update_data_feed_with_model_and_kwargs(self): query="get data" ) ) + updated = self.admin_client.get_data_feed(data_feed.id) self.assertEqual(updated.name, "updateMe") self.assertEqual(updated.options.data_feed_description, "updateMe") self.assertEqual(updated.schema.timestamp_column, "time") @@ -984,7 +987,7 @@ def test_update_data_feed_by_reseting_properties(self): data_feed = self._create_data_feed_for_update("update") try: - updated = self.admin_client.update_data_feed( + self.admin_client.update_data_feed( data_feed.id, name="update", data_feed_description=None, @@ -1004,6 +1007,7 @@ def test_update_data_feed_by_reseting_properties(self): status=None, action_link_template=None, ) + updated = self.admin_client.get_data_feed(data_feed.id) self.assertEqual(updated.name, "update") # self.assertEqual(updated.options.data_feed_description, "") # doesn't currently clear # self.assertEqual(updated.schema.timestamp_column, "") # doesn't currently clear diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_data_feeds_aad.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_data_feeds_aad.py index 6caafa7c54af..5dbd28d0a405 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_data_feeds_aad.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_data_feeds_aad.py @@ -827,7 +827,8 @@ def test_update_data_feed_with_model(self): data_feed.source.connection_string = "updated" data_feed.source.query = "get data" - updated = self.admin_client.update_data_feed(data_feed) + self.admin_client.update_data_feed(data_feed) + updated = self.admin_client.get_data_feed(data_feed.id) self.assertEqual(updated.name, "update") self.assertEqual(updated.options.data_feed_description, "updated") self.assertEqual(updated.schema.timestamp_column, "time") @@ -857,7 +858,7 @@ def test_update_data_feed_with_kwargs(self): data_feed = self._create_data_feed_for_update("update") try: - updated = self.admin_client.update_data_feed( + self.admin_client.update_data_feed( data_feed.id, name="update", data_feed_description="updated", @@ -882,6 +883,7 @@ def test_update_data_feed_with_kwargs(self): query="get data" ) ) + updated = self.admin_client.get_data_feed(data_feed.id) self.assertEqual(updated.name, "update") self.assertEqual(updated.options.data_feed_description, "updated") self.assertEqual(updated.schema.timestamp_column, "time") @@ -932,7 +934,7 @@ def test_update_data_feed_with_model_and_kwargs(self): data_feed.source.connection_string = "don't update me" data_feed.source.query = "don't update me" - updated = self.admin_client.update_data_feed( + self.admin_client.update_data_feed( data_feed, timestamp_column="time", ingestion_begin_time=datetime.datetime(2020, 12, 10), @@ -955,6 +957,7 @@ def test_update_data_feed_with_model_and_kwargs(self): query="get data" ) ) + updated = self.admin_client.get_data_feed(data_feed.id) self.assertEqual(updated.name, "updateMe") self.assertEqual(updated.options.data_feed_description, "updateMe") self.assertEqual(updated.schema.timestamp_column, "time") @@ -984,7 +987,7 @@ def test_update_data_feed_by_reseting_properties(self): data_feed = self._create_data_feed_for_update("update") try: - updated = self.admin_client.update_data_feed( + self.admin_client.update_data_feed( data_feed.id, name="update", data_feed_description=None, @@ -1004,6 +1007,7 @@ def test_update_data_feed_by_reseting_properties(self): status=None, action_link_template=None, ) + updated = self.admin_client.get_data_feed(data_feed.id) self.assertEqual(updated.name, "update") # self.assertEqual(updated.options.data_feed_description, "") # doesn't currently clear # self.assertEqual(updated.schema.timestamp_column, "") # doesn't currently clear diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_detection_config.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_detection_config.py index ef08873da31d..861d568648a6 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_detection_config.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_detection_config.py @@ -29,7 +29,7 @@ def test_create_ad_config_whole_series_detection(self): detection_config_name = self.create_random_name("testdetectionconfig") config = self.admin_client.create_detection_configuration( name=detection_config_name, - metric_id=data_feed.metric_ids[0], + metric_id=data_feed.metric_ids['cost'], description="My test metric anomaly detection configuration", whole_series_detection_condition=MetricDetectionCondition( cross_conditions_operator="OR", @@ -63,7 +63,7 @@ def test_create_ad_config_whole_series_detection(self): ) ) self.assertIsNotNone(config.id) - self.assertEqual(config.metric_id, data_feed.metric_ids[0]) + self.assertEqual(config.metric_id, data_feed.metric_ids['cost']) self.assertEqual(config.description, "My test metric anomaly detection configuration") self.assertIsNotNone(config.name) self.assertIsNone(config.series_detection_conditions) @@ -107,7 +107,7 @@ def test_create_ad_config_with_series_and_group_conds(self): detection_config_name = self.create_random_name("testdetectionconfiget") detection_config = self.admin_client.create_detection_configuration( name=detection_config_name, - metric_id=data_feed.metric_ids[0], + metric_id=data_feed.metric_ids['cost'], description="My test metric anomaly detection configuration", whole_series_detection_condition=MetricDetectionCondition( cross_conditions_operator="AND", @@ -164,7 +164,7 @@ def test_create_ad_config_with_series_and_group_conds(self): ) self.assertIsNotNone(detection_config.id) - self.assertEqual(detection_config.metric_id, data_feed.metric_ids[0]) + self.assertEqual(detection_config.metric_id, data_feed.metric_ids['cost']) self.assertEqual(detection_config.description, "My test metric anomaly detection configuration") self.assertIsNotNone(detection_config.name) self.assertEqual(detection_config.whole_series_detection_condition.cross_conditions_operator, "AND") @@ -222,7 +222,7 @@ def test_create_ad_config_multiple_series_and_group_conds(self): detection_config_name = self.create_random_name("multipledetectionconfigs") detection_config = self.admin_client.create_detection_configuration( name=detection_config_name, - metric_id=data_feed.metric_ids[0], + metric_id=data_feed.metric_ids['cost'], description="My test metric anomaly detection configuration", whole_series_detection_condition=MetricDetectionCondition( cross_conditions_operator="AND", @@ -347,7 +347,7 @@ def test_create_ad_config_multiple_series_and_group_conds(self): ) self.assertIsNotNone(detection_config.id) - self.assertEqual(detection_config.metric_id, data_feed.metric_ids[0]) + self.assertEqual(detection_config.metric_id, data_feed.metric_ids['cost']) self.assertEqual(detection_config.description, "My test metric anomaly detection configuration") self.assertIsNotNone(detection_config.name) @@ -510,7 +510,8 @@ def test_update_detection_config_with_model(self): detection_config.whole_series_detection_condition.change_threshold_condition = change_threshold_condition detection_config.whole_series_detection_condition.cross_conditions_operator = "OR" - updated = self.admin_client.update_detection_configuration(detection_config) + self.admin_client.update_detection_configuration(detection_config) + updated = self.admin_client.get_detection_configuration(detection_config.id) self.assertEqual(updated.name, "updated") self.assertEqual(updated.description, "updated") @@ -593,7 +594,7 @@ def test_update_detection_config_with_kwargs(self): min_ratio=2 ) ) - updated = self.admin_client.update_detection_configuration( + self.admin_client.update_detection_configuration( detection_config.id, name="updated", description="updated", @@ -618,7 +619,7 @@ def test_update_detection_config_with_kwargs(self): change_threshold_condition=change_threshold_condition )] ) - + updated = self.admin_client.get_detection_configuration(detection_config.id) self.assertEqual(updated.name, "updated") self.assertEqual(updated.description, "updated") self.assertEqual(updated.series_detection_conditions[0].change_threshold_condition.anomaly_detector_direction, "Both") @@ -705,7 +706,7 @@ def test_update_detection_config_with_model_and_kwargs(self): detection_config.name = "updateMe" detection_config.description = "updateMe" - updated = self.admin_client.update_detection_configuration( + self.admin_client.update_detection_configuration( detection_config, whole_series_detection_condition=MetricDetectionCondition( cross_conditions_operator="OR", @@ -728,7 +729,7 @@ def test_update_detection_config_with_model_and_kwargs(self): change_threshold_condition=change_threshold_condition )] ) - + updated = self.admin_client.get_detection_configuration(detection_config.id) self.assertEqual(updated.name, "updateMe") self.assertEqual(updated.description, "updateMe") self.assertEqual(updated.series_detection_conditions[0].change_threshold_condition.anomaly_detector_direction, "Both") @@ -787,14 +788,14 @@ def test_update_detection_config_by_resetting_properties(self): try: detection_config, data_feed = self._create_detection_config_for_update("updatedetection") - updated = self.admin_client.update_detection_configuration( + self.admin_client.update_detection_configuration( detection_config.id, name="reset", description="", # series_detection_conditions=None, # series_group_detection_conditions=None ) - + updated = self.admin_client.get_detection_configuration(detection_config.id) self.assertEqual(updated.name, "reset") self.assertEqual(updated.description, "") # currently won't update with None diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_detection_config_aad.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_detection_config_aad.py index fa928268fdb6..79a1b8b8b396 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_detection_config_aad.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_detection_config_aad.py @@ -29,7 +29,7 @@ def test_create_ad_config_whole_series_detection(self): detection_config_name = self.create_random_name("testdetectionconfig") config = self.admin_client.create_detection_configuration( name=detection_config_name, - metric_id=data_feed.metric_ids[0], + metric_id=data_feed.metric_ids['cost'], description="My test metric anomaly detection configuration", whole_series_detection_condition=MetricDetectionCondition( cross_conditions_operator="OR", @@ -63,7 +63,7 @@ def test_create_ad_config_whole_series_detection(self): ) ) self.assertIsNotNone(config.id) - self.assertEqual(config.metric_id, data_feed.metric_ids[0]) + self.assertEqual(config.metric_id, data_feed.metric_ids['cost']) self.assertEqual(config.description, "My test metric anomaly detection configuration") self.assertIsNotNone(config.name) self.assertIsNone(config.series_detection_conditions) @@ -107,7 +107,7 @@ def test_create_ad_config_with_series_and_group_conds(self): detection_config_name = self.create_random_name("testdetectionconfiget") detection_config = self.admin_client.create_detection_configuration( name=detection_config_name, - metric_id=data_feed.metric_ids[0], + metric_id=data_feed.metric_ids['cost'], description="My test metric anomaly detection configuration", whole_series_detection_condition=MetricDetectionCondition( cross_conditions_operator="AND", @@ -164,7 +164,7 @@ def test_create_ad_config_with_series_and_group_conds(self): ) self.assertIsNotNone(detection_config.id) - self.assertEqual(detection_config.metric_id, data_feed.metric_ids[0]) + self.assertEqual(detection_config.metric_id, data_feed.metric_ids['cost']) self.assertEqual(detection_config.description, "My test metric anomaly detection configuration") self.assertIsNotNone(detection_config.name) self.assertEqual(detection_config.whole_series_detection_condition.cross_conditions_operator, "AND") @@ -222,7 +222,7 @@ def test_create_ad_config_multiple_series_and_group_conds(self): detection_config_name = self.create_random_name("multipledetectionconfigs") detection_config = self.admin_client.create_detection_configuration( name=detection_config_name, - metric_id=data_feed.metric_ids[0], + metric_id=data_feed.metric_ids['cost'], description="My test metric anomaly detection configuration", whole_series_detection_condition=MetricDetectionCondition( cross_conditions_operator="AND", @@ -347,7 +347,7 @@ def test_create_ad_config_multiple_series_and_group_conds(self): ) self.assertIsNotNone(detection_config.id) - self.assertEqual(detection_config.metric_id, data_feed.metric_ids[0]) + self.assertEqual(detection_config.metric_id, data_feed.metric_ids['cost']) self.assertEqual(detection_config.description, "My test metric anomaly detection configuration") self.assertIsNotNone(detection_config.name) @@ -510,8 +510,8 @@ def test_update_detection_config_with_model(self): detection_config.whole_series_detection_condition.change_threshold_condition = change_threshold_condition detection_config.whole_series_detection_condition.cross_conditions_operator = "OR" - updated = self.admin_client.update_detection_configuration(detection_config) - + self.admin_client.update_detection_configuration(detection_config) + updated = self.admin_client.get_detection_configuration(detection_config.id) self.assertEqual(updated.name, "updated") self.assertEqual(updated.description, "updated") self.assertEqual(updated.series_detection_conditions[0].change_threshold_condition.anomaly_detector_direction, "Both") @@ -593,7 +593,7 @@ def test_update_detection_config_with_kwargs(self): min_ratio=2 ) ) - updated = self.admin_client.update_detection_configuration( + self.admin_client.update_detection_configuration( detection_config.id, name="updated", description="updated", @@ -618,7 +618,7 @@ def test_update_detection_config_with_kwargs(self): change_threshold_condition=change_threshold_condition )] ) - + updated = self.admin_client.get_detection_configuration(detection_config.id) self.assertEqual(updated.name, "updated") self.assertEqual(updated.description, "updated") self.assertEqual(updated.series_detection_conditions[0].change_threshold_condition.anomaly_detector_direction, "Both") @@ -705,7 +705,7 @@ def test_update_detection_config_with_model_and_kwargs(self): detection_config.name = "updateMe" detection_config.description = "updateMe" - updated = self.admin_client.update_detection_configuration( + self.admin_client.update_detection_configuration( detection_config, whole_series_detection_condition=MetricDetectionCondition( cross_conditions_operator="OR", @@ -728,7 +728,7 @@ def test_update_detection_config_with_model_and_kwargs(self): change_threshold_condition=change_threshold_condition )] ) - + updated = self.admin_client.get_detection_configuration(detection_config.id) self.assertEqual(updated.name, "updateMe") self.assertEqual(updated.description, "updateMe") self.assertEqual(updated.series_detection_conditions[0].change_threshold_condition.anomaly_detector_direction, "Both") @@ -787,14 +787,14 @@ def test_update_detection_config_by_resetting_properties(self): try: detection_config, data_feed = self._create_detection_config_for_update("updatedetection") - updated = self.admin_client.update_detection_configuration( + self.admin_client.update_detection_configuration( detection_config.id, name="reset", description="", # series_detection_conditions=None, # series_group_detection_conditions=None ) - + updated = self.admin_client.get_detection_configuration(detection_config.id) self.assertEqual(updated.name, "reset") self.assertEqual(updated.description, "") # currently won't update with None diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_hooks.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_hooks.py index 4d16b512a2d1..d1265aada282 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_hooks.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_hooks.py @@ -78,7 +78,8 @@ def test_update_email_hook_with_model(self): hook.external_link = "update" hook.emails_to_alert = ["myemail@m.com"] - updated = self.admin_client.update_hook(hook) + self.admin_client.update_hook(hook) + updated = self.admin_client.get_hook(hook.id) self.assertEqual(updated.name, "update") self.assertEqual(updated.description, "update") @@ -92,7 +93,7 @@ def test_update_email_hook_with_kwargs(self): name = self.create_random_name("testhook") try: hook = self._create_email_hook_for_update(name) - updated = self.admin_client.update_hook( + self.admin_client.update_hook( hook.id, hook_type="Email", name="update", @@ -100,7 +101,7 @@ def test_update_email_hook_with_kwargs(self): external_link="update", emails_to_alert=["myemail@m.com"] ) - + updated = self.admin_client.get_hook(hook.id) self.assertEqual(updated.name, "update") self.assertEqual(updated.description, "update") self.assertEqual(updated.external_link, "update") @@ -117,7 +118,7 @@ def test_update_email_hook_with_model_and_kwargs(self): hook.name = "don't update me" hook.description = "don't update me" hook.emails_to_alert = [] - updated = self.admin_client.update_hook( + self.admin_client.update_hook( hook, hook_type="Email", name="update", @@ -125,7 +126,7 @@ def test_update_email_hook_with_model_and_kwargs(self): external_link="update", emails_to_alert=["myemail@m.com"] ) - + updated = self.admin_client.get_hook(hook.id) self.assertEqual(updated.name, "update") self.assertEqual(updated.description, "update") self.assertEqual(updated.external_link, "update") @@ -138,14 +139,14 @@ def test_update_email_hook_by_resetting_properties(self): name = self.create_random_name("testhook") try: hook = self._create_email_hook_for_update(name) - updated = self.admin_client.update_hook( + self.admin_client.update_hook( hook.id, hook_type="Email", name="reset", description=None, external_link=None, ) - + updated = self.admin_client.get_hook(hook.id) self.assertEqual(updated.name, "reset") # sending null, but not clearing properties @@ -165,8 +166,8 @@ def test_update_web_hook_with_model(self): hook.username = "myusername" hook.password = "password" - updated = self.admin_client.update_hook(hook) - + self.admin_client.update_hook(hook) + updated = self.admin_client.get_hook(hook.id) self.assertEqual(updated.name, "update") self.assertEqual(updated.description, "update") self.assertEqual(updated.external_link, "update") @@ -180,7 +181,7 @@ def test_update_web_hook_with_kwargs(self): name = self.create_random_name("testwebhook") try: hook = self._create_web_hook_for_update(name) - updated = self.admin_client.update_hook( + self.admin_client.update_hook( hook.id, hook_type="Web", endpoint="https://httpbin.org/post", @@ -190,7 +191,7 @@ def test_update_web_hook_with_kwargs(self): username="myusername", password="password" ) - + updated = self.admin_client.get_hook(hook.id) self.assertEqual(updated.name, "update") self.assertEqual(updated.description, "update") self.assertEqual(updated.external_link, "update") @@ -210,7 +211,7 @@ def test_update_web_hook_with_model_and_kwargs(self): hook.username = "don't update me" hook.password = "don't update me" hook.endpoint = "don't update me" - updated = self.admin_client.update_hook( + self.admin_client.update_hook( hook, hook_type="Web", endpoint="https://httpbin.org/post", @@ -219,7 +220,7 @@ def test_update_web_hook_with_model_and_kwargs(self): username="myusername", password="password" ) - + updated = self.admin_client.get_hook(hook.id) self.assertEqual(updated.name, "update") self.assertEqual(updated.description, "updateMe") self.assertEqual(updated.external_link, "update") @@ -233,7 +234,7 @@ def test_update_web_hook_by_resetting_properties(self): name = self.create_random_name("testhook") try: hook = self._create_web_hook_for_update(name) - updated = self.admin_client.update_hook( + self.admin_client.update_hook( hook.id, hook_type="Web", name="reset", @@ -243,7 +244,7 @@ def test_update_web_hook_by_resetting_properties(self): username="myusername", password=None ) - + updated = self.admin_client.get_hook(hook.id) self.assertEqual(updated.name, "reset") self.assertEqual(updated.password, "") diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_hooks_aad.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_hooks_aad.py index 8ab11cea1ba0..1238406e7976 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_hooks_aad.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_hooks_aad.py @@ -78,8 +78,8 @@ def test_update_email_hook_with_model(self): hook.external_link = "update" hook.emails_to_alert = ["myemail@m.com"] - updated = self.admin_client.update_hook(hook) - + self.admin_client.update_hook(hook) + updated = self.admin_client.get_hook(hook.id) self.assertEqual(updated.name, "update") self.assertEqual(updated.description, "update") self.assertEqual(updated.external_link, "update") @@ -92,7 +92,7 @@ def test_update_email_hook_with_kwargs(self): name = self.create_random_name("testhook") try: hook = self._create_email_hook_for_update(name) - updated = self.admin_client.update_hook( + self.admin_client.update_hook( hook.id, hook_type="Email", name="update", @@ -100,7 +100,7 @@ def test_update_email_hook_with_kwargs(self): external_link="update", emails_to_alert=["myemail@m.com"] ) - + updated = self.admin_client.get_hook(hook.id) self.assertEqual(updated.name, "update") self.assertEqual(updated.description, "update") self.assertEqual(updated.external_link, "update") @@ -117,7 +117,7 @@ def test_update_email_hook_with_model_and_kwargs(self): hook.name = "don't update me" hook.description = "don't update me" hook.emails_to_alert = [] - updated = self.admin_client.update_hook( + self.admin_client.update_hook( hook, hook_type="Email", name="update", @@ -125,7 +125,7 @@ def test_update_email_hook_with_model_and_kwargs(self): external_link="update", emails_to_alert=["myemail@m.com"] ) - + updated = self.admin_client.get_hook(hook.id) self.assertEqual(updated.name, "update") self.assertEqual(updated.description, "update") self.assertEqual(updated.external_link, "update") @@ -138,14 +138,14 @@ def test_update_email_hook_by_resetting_properties(self): name = self.create_random_name("testhook") try: hook = self._create_email_hook_for_update(name) - updated = self.admin_client.update_hook( + self.admin_client.update_hook( hook.id, hook_type="Email", name="reset", description=None, external_link=None, ) - + updated = self.admin_client.get_hook(hook.id) self.assertEqual(updated.name, "reset") # sending null, but not clearing properties @@ -165,8 +165,8 @@ def test_update_web_hook_with_model(self): hook.username = "myusername" hook.password = "password" - updated = self.admin_client.update_hook(hook) - + self.admin_client.update_hook(hook) + updated = self.admin_client.get_hook(hook.id) self.assertEqual(updated.name, "update") self.assertEqual(updated.description, "update") self.assertEqual(updated.external_link, "update") @@ -180,7 +180,7 @@ def test_update_web_hook_with_kwargs(self): name = self.create_random_name("testwebhook") try: hook = self._create_web_hook_for_update(name) - updated = self.admin_client.update_hook( + self.admin_client.update_hook( hook.id, hook_type="Web", endpoint="https://httpbin.org/post", @@ -190,7 +190,7 @@ def test_update_web_hook_with_kwargs(self): username="myusername", password="password" ) - + updated = self.admin_client.get_hook(hook.id) self.assertEqual(updated.name, "update") self.assertEqual(updated.description, "update") self.assertEqual(updated.external_link, "update") @@ -210,7 +210,7 @@ def test_update_web_hook_with_model_and_kwargs(self): hook.username = "don't update me" hook.password = "don't update me" hook.endpoint = "don't update me" - updated = self.admin_client.update_hook( + self.admin_client.update_hook( hook, hook_type="Web", endpoint="https://httpbin.org/post", @@ -219,7 +219,7 @@ def test_update_web_hook_with_model_and_kwargs(self): username="myusername", password="password" ) - + updated = self.admin_client.get_hook(hook.id) self.assertEqual(updated.name, "update") self.assertEqual(updated.description, "updateMe") self.assertEqual(updated.external_link, "update") @@ -233,7 +233,7 @@ def test_update_web_hook_by_resetting_properties(self): name = self.create_random_name("testhook") try: hook = self._create_web_hook_for_update(name) - updated = self.admin_client.update_hook( + self.admin_client.update_hook( hook.id, hook_type="Web", name="reset", @@ -243,7 +243,7 @@ def test_update_web_hook_by_resetting_properties(self): username="myusername", password=None ) - + updated = self.admin_client.get_hook(hook.id) self.assertEqual(updated.name, "reset") self.assertEqual(updated.password, "")