From 478072cb8fe49752aa18a90543b49cbebcc87c3e Mon Sep 17 00:00:00 2001 From: Krista Pratico Date: Tue, 9 Mar 2021 13:36:18 -0800 Subject: [PATCH] adjust update tests for resetting data feed properties --- ...date_data_feed_by_reseting_properties.yaml | 140 ++++++++++-------- ...date_data_feed_by_reseting_properties.yaml | 139 +++++++++-------- .../async_tests/test_data_feeds_aad_async.py | 18 +-- .../async_tests/test_data_feeds_async.py | 18 +-- ...date_data_feed_by_reseting_properties.yaml | 131 +++++++++------- ...date_data_feed_by_reseting_properties.yaml | 132 ++++++++++------- .../tests/test_data_feeds.py | 18 +-- .../tests/test_data_feeds_aad.py | 18 +-- 8 files changed, 338 insertions(+), 276 deletions(-) diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/recordings/test_data_feeds_aad_async.test_update_data_feed_by_reseting_properties.yaml b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/recordings/test_data_feeds_aad_async.test_update_data_feed_by_reseting_properties.yaml index 8226d8d3f217..d328fb4faeec 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/recordings/test_data_feeds_aad_async.test_update_data_feed_by_reseting_properties.yaml +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/recordings/test_data_feeds_aad_async.test_update_data_feed_by_reseting_properties.yaml @@ -1,6 +1,6 @@ interactions: - request: - body: '{"dataSourceType": "SqlServer", "dataFeedName": "updatepgk3yhestopcmv5nnx", + body: '{"dataSourceType": "SqlServer", "dataFeedName": "updatetsx2zxk5d324qns322", "dataFeedDescription": "my first data feed", "granularityName": "Daily", "metrics": [{"metricName": "cost", "metricDisplayName": "display cost", "metricDescription": "the cost"}, {"metricName": "revenue", "metricDisplayName": "display revenue", @@ -21,21 +21,21 @@ interactions: Content-Type: - application/json User-Agent: - - azsdk-python-ai-metricsadvisor/1.0.0b3 Python/3.8.6 (Windows-10-10.0.19041-SP0) + - azsdk-python-ai-metricsadvisor/1.0.0b4 Python/3.9.0 (Windows-10-10.0.19041-SP0) method: POST uri: https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds response: body: string: '' headers: - apim-request-id: 816e3fdf-ee95-42ba-9359-9d99cf67c387 + apim-request-id: f22c58a2-f62b-4dbe-9ff5-82a1ce3474b5 content-length: '0' - date: Fri, 22 Jan 2021 01:05:48 GMT - location: https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/9abb9a33-c97f-406b-954b-82cf95171b30 + date: Tue, 09 Mar 2021 21:29:16 GMT + location: https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/672c9334-bd98-40f5-bf7d-c47c4e876b87 strict-transport-security: max-age=31536000; includeSubDomains; preload x-content-type-options: nosniff - x-envoy-upstream-service-time: '437' - x-request-id: 816e3fdf-ee95-42ba-9359-9d99cf67c387 + x-envoy-upstream-service-time: '1239' + x-request-id: f22c58a2-f62b-4dbe-9ff5-82a1ce3474b5 status: code: 201 message: Created @@ -46,117 +46,141 @@ interactions: Accept: - application/json User-Agent: - - azsdk-python-ai-metricsadvisor/1.0.0b3 Python/3.8.6 (Windows-10-10.0.19041-SP0) + - azsdk-python-ai-metricsadvisor/1.0.0b4 Python/3.9.0 (Windows-10-10.0.19041-SP0) method: GET - uri: https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/9abb9a33-c97f-406b-954b-82cf95171b30 + uri: https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/672c9334-bd98-40f5-bf7d-c47c4e876b87 response: body: - string: "{\"dataFeedId\":\"9abb9a33-c97f-406b-954b-82cf95171b30\",\"dataFeedName\":\"updatepgk3yhestopcmv5nnx\",\"metrics\":[{\"metricId\":\"103441d8-7308-4c7b-824c-4a7fb827915f\",\"metricName\":\"cost\",\"metricDisplayName\":\"display - cost\",\"metricDescription\":\"the cost\"},{\"metricId\":\"863c052c-f75b-4ac2-9e1b-64ca5d49a826\",\"metricName\":\"revenue\",\"metricDisplayName\":\"display - revenue\",\"metricDescription\":\"the revenue\"}],\"dimension\":[{\"dimensionName\":\"category\",\"dimensionDisplayName\":\"display - category\"},{\"dimensionName\":\"city\",\"dimensionDisplayName\":\"display - city\"}],\"dataStartFrom\":\"2019-10-01T00:00:00Z\",\"dataSourceType\":\"SqlServer\",\"timestampColumn\":\"Timestamp\",\"startOffsetInSeconds\":-1,\"maxQueryPerMinute\":30.0,\"granularityName\":\"Daily\",\"granularityAmount\":null,\"allUpIdentification\":null,\"needRollup\":\"NoRollup\",\"fillMissingPointType\":\"SmartFilling\",\"fillMissingPointValue\":0.0,\"rollUpMethod\":\"None\",\"rollUpColumns\":[],\"dataFeedDescription\":\"my - first data feed\",\"stopRetryAfterInSeconds\":-1,\"minRetryIntervalInSeconds\":-1,\"maxConcurrency\":0,\"viewMode\":\"Private\",\"admins\":[\"yournamehere@microsoft.com\",\"f850650c-1fcf-4489-b46f-71af2e30d360\"],\"viewers\":[\"viewers\"],\"creator\":\"f850650c-1fcf-4489-b46f-71af2e30d360\",\"status\":\"Active\",\"createdTime\":\"2021-01-22T01:05:48Z\",\"isAdmin\":true,\"actionLinkTemplate\":\"action - link template\",\"dataSourceParameter\":{\"connectionString\":\"connectionstring\",\"query\":\"select\u202F*\u202Ffrom\u202Fadsample2\u202Fwhere\u202FTimestamp\u202F=\u202F@StartTime\"}}" + string: "{\"dataFeedId\":\"672c9334-bd98-40f5-bf7d-c47c4e876b87\",\"dataFeedName\"\ + :\"updatetsx2zxk5d324qns322\",\"metrics\":[{\"metricId\":\"9328c853-42ee-4d6d-821b-2bdb7cfa2259\"\ + ,\"metricName\":\"cost\",\"metricDisplayName\":\"display cost\",\"metricDescription\"\ + :\"the cost\"},{\"metricId\":\"851b7fdd-37a9-4b32-946f-e2e4ebc80a50\",\"metricName\"\ + :\"revenue\",\"metricDisplayName\":\"display revenue\",\"metricDescription\"\ + :\"the revenue\"}],\"dimension\":[{\"dimensionName\":\"category\",\"dimensionDisplayName\"\ + :\"display category\"},{\"dimensionName\":\"city\",\"dimensionDisplayName\"\ + :\"display city\"}],\"dataStartFrom\":\"2019-10-01T00:00:00Z\",\"dataSourceType\"\ + :\"SqlServer\",\"timestampColumn\":\"Timestamp\",\"startOffsetInSeconds\"\ + :-1,\"maxQueryPerMinute\":30.0,\"granularityName\":\"Daily\",\"needRollup\"\ + :\"NoRollup\",\"fillMissingPointType\":\"SmartFilling\",\"fillMissingPointValue\"\ + :0.0,\"rollUpMethod\":\"None\",\"rollUpColumns\":[],\"dataFeedDescription\"\ + :\"my first data feed\",\"stopRetryAfterInSeconds\":-1,\"minRetryIntervalInSeconds\"\ + :-1,\"maxConcurrency\":0,\"viewMode\":\"Private\",\"admins\":[\"yournamehere@microsoft.com\"\ + ,\"f850650c-1fcf-4489-b46f-71af2e30d360\"],\"viewers\":[\"viewers\"],\"creator\"\ + :\"f850650c-1fcf-4489-b46f-71af2e30d360\",\"status\":\"Active\",\"createdTime\"\ + :\"2021-03-09T21:29:16Z\",\"isAdmin\":true,\"actionLinkTemplate\":\"action\ + \ link template\",\"dataSourceParameter\":{\"connectionString\":\"connectionstring\"\ + ,\"query\":\"select\u202F*\u202Ffrom\u202Fadsample2\u202Fwhere\u202FTimestamp\u202F\ + =\u202F@StartTime\"},\"authenticationType\":\"Basic\"}" headers: - apim-request-id: fc92fc40-15e1-43b6-abd2-be08e0348bbf - content-length: '1660' + apim-request-id: 3c12b88a-a6fa-4d9c-84ba-1dff15ae46f3 + content-length: '1637' content-type: application/json; charset=utf-8 - date: Fri, 22 Jan 2021 01:05:49 GMT + date: Tue, 09 Mar 2021 21:29:16 GMT strict-transport-security: max-age=31536000; includeSubDomains; preload x-content-type-options: nosniff - x-envoy-upstream-service-time: '87' - x-request-id: fc92fc40-15e1-43b6-abd2-be08e0348bbf + x-envoy-upstream-service-time: '277' + x-request-id: 3c12b88a-a6fa-4d9c-84ba-1dff15ae46f3 status: code: 200 message: OK - url: https://js-metrics-advisor.cognitiveservices.azure.com//metricsadvisor/v1.0/dataFeeds/9abb9a33-c97f-406b-954b-82cf95171b30 + url: https://js-metrics-advisor.cognitiveservices.azure.com//metricsadvisor/v1.0/dataFeeds/672c9334-bd98-40f5-bf7d-c47c4e876b87 - request: - body: '{"dataFeedName": "update", "dataFeedDescription": null, "timestampColumn": - null, "startOffsetInSeconds": null, "maxConcurrency": null, "minRetryIntervalInSeconds": - null, "stopRetryAfterInSeconds": null, "needRollup": null, "rollUpMethod": null, - "rollUpColumns": null, "allUpIdentification": null, "fillMissingPointType": - null, "fillMissingPointValue": null, "viewMode": null, "viewers": null, "status": - null, "actionLinkTemplate": null}' + body: '{"dataFeedName": "update", "dataFeedDescription": null, "startOffsetInSeconds": + null, "maxConcurrency": null, "minRetryIntervalInSeconds": null, "stopRetryAfterInSeconds": + null, "needRollup": null, "rollUpMethod": null, "fillMissingPointType": null, + "viewMode": null, "viewers": null, "status": null, "actionLinkTemplate": null}' headers: Accept: - application/json Content-Length: - - '436' + - '328' Content-Type: - application/merge-patch+json User-Agent: - - azsdk-python-ai-metricsadvisor/1.0.0b3 Python/3.8.6 (Windows-10-10.0.19041-SP0) + - azsdk-python-ai-metricsadvisor/1.0.0b4 Python/3.9.0 (Windows-10-10.0.19041-SP0) method: PATCH - uri: https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/9abb9a33-c97f-406b-954b-82cf95171b30 + uri: https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/672c9334-bd98-40f5-bf7d-c47c4e876b87 response: body: string: '' headers: - apim-request-id: 9fec2dc9-1962-4922-879b-d0da05124901 + apim-request-id: 30a0a280-884f-4d8e-8c2a-856ef14ececd content-length: '0' - date: Fri, 22 Jan 2021 01:05:49 GMT + date: Tue, 09 Mar 2021 21:29:17 GMT strict-transport-security: max-age=31536000; includeSubDomains; preload x-content-type-options: nosniff - x-envoy-upstream-service-time: '128' - x-request-id: 9fec2dc9-1962-4922-879b-d0da05124901 + x-envoy-upstream-service-time: '302' + x-request-id: 30a0a280-884f-4d8e-8c2a-856ef14ececd status: code: 204 message: No Content - url: https://js-metrics-advisor.cognitiveservices.azure.com//metricsadvisor/v1.0/dataFeeds/9abb9a33-c97f-406b-954b-82cf95171b30 + url: https://js-metrics-advisor.cognitiveservices.azure.com//metricsadvisor/v1.0/dataFeeds/672c9334-bd98-40f5-bf7d-c47c4e876b87 - request: body: null headers: Accept: - application/json User-Agent: - - azsdk-python-ai-metricsadvisor/1.0.0b3 Python/3.8.6 (Windows-10-10.0.19041-SP0) + - azsdk-python-ai-metricsadvisor/1.0.0b4 Python/3.9.0 (Windows-10-10.0.19041-SP0) method: GET - uri: https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/9abb9a33-c97f-406b-954b-82cf95171b30 + uri: https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/672c9334-bd98-40f5-bf7d-c47c4e876b87 response: body: - string: "{\"dataFeedId\":\"9abb9a33-c97f-406b-954b-82cf95171b30\",\"dataFeedName\":\"update\",\"metrics\":[{\"metricId\":\"103441d8-7308-4c7b-824c-4a7fb827915f\",\"metricName\":\"cost\",\"metricDisplayName\":\"display - cost\",\"metricDescription\":\"the cost\"},{\"metricId\":\"863c052c-f75b-4ac2-9e1b-64ca5d49a826\",\"metricName\":\"revenue\",\"metricDisplayName\":\"display - revenue\",\"metricDescription\":\"the revenue\"}],\"dimension\":[{\"dimensionName\":\"category\",\"dimensionDisplayName\":\"display - category\"},{\"dimensionName\":\"city\",\"dimensionDisplayName\":\"display - city\"}],\"dataStartFrom\":\"2019-10-01T00:00:00Z\",\"dataSourceType\":\"SqlServer\",\"timestampColumn\":\"Timestamp\",\"startOffsetInSeconds\":-1,\"maxQueryPerMinute\":30.0,\"granularityName\":\"Daily\",\"granularityAmount\":null,\"allUpIdentification\":null,\"needRollup\":\"NoRollup\",\"fillMissingPointType\":\"SmartFilling\",\"fillMissingPointValue\":0.0,\"rollUpMethod\":\"None\",\"rollUpColumns\":[],\"dataFeedDescription\":\"my - first data feed\",\"stopRetryAfterInSeconds\":-1,\"minRetryIntervalInSeconds\":-1,\"maxConcurrency\":0,\"viewMode\":\"Private\",\"admins\":[\"yournamehere@microsoft.com\",\"f850650c-1fcf-4489-b46f-71af2e30d360\"],\"viewers\":[\"viewers\"],\"creator\":\"f850650c-1fcf-4489-b46f-71af2e30d360\",\"status\":\"Active\",\"createdTime\":\"2021-01-22T01:05:48Z\",\"isAdmin\":true,\"actionLinkTemplate\":\"action - link template\",\"dataSourceParameter\":{\"connectionString\":\"connectionstring\",\"query\":\"select\u202F*\u202Ffrom\u202Fadsample2\u202Fwhere\u202FTimestamp\u202F=\u202F@StartTime\"}}" + string: "{\"dataFeedId\":\"672c9334-bd98-40f5-bf7d-c47c4e876b87\",\"dataFeedName\"\ + :\"update\",\"metrics\":[{\"metricId\":\"9328c853-42ee-4d6d-821b-2bdb7cfa2259\"\ + ,\"metricName\":\"cost\",\"metricDisplayName\":\"display cost\",\"metricDescription\"\ + :\"the cost\"},{\"metricId\":\"851b7fdd-37a9-4b32-946f-e2e4ebc80a50\",\"metricName\"\ + :\"revenue\",\"metricDisplayName\":\"display revenue\",\"metricDescription\"\ + :\"the revenue\"}],\"dimension\":[{\"dimensionName\":\"category\",\"dimensionDisplayName\"\ + :\"display category\"},{\"dimensionName\":\"city\",\"dimensionDisplayName\"\ + :\"display city\"}],\"dataStartFrom\":\"2019-10-01T00:00:00Z\",\"dataSourceType\"\ + :\"SqlServer\",\"timestampColumn\":\"Timestamp\",\"startOffsetInSeconds\"\ + :0,\"maxQueryPerMinute\":30.0,\"granularityName\":\"Daily\",\"needRollup\"\ + :\"NoRollup\",\"fillMissingPointType\":\"SmartFilling\",\"fillMissingPointValue\"\ + :0.0,\"rollUpMethod\":\"None\",\"rollUpColumns\":[],\"dataFeedDescription\"\ + :\"\",\"stopRetryAfterInSeconds\":-1,\"minRetryIntervalInSeconds\":-1,\"maxConcurrency\"\ + :-1,\"viewMode\":\"Private\",\"admins\":[\"yournamehere@microsoft.com\",\"\ + f850650c-1fcf-4489-b46f-71af2e30d360\"],\"viewers\":[\"viewers\"],\"creator\"\ + :\"f850650c-1fcf-4489-b46f-71af2e30d360\",\"status\":\"Active\",\"createdTime\"\ + :\"2021-03-09T21:29:16Z\",\"isAdmin\":true,\"actionLinkTemplate\":\"\",\"\ + dataSourceParameter\":{\"connectionString\":\"connectionstring\",\"query\"\ + :\"select\u202F*\u202Ffrom\u202Fadsample2\u202Fwhere\u202FTimestamp\u202F\ + =\u202F@StartTime\"},\"authenticationType\":\"Basic\"}" headers: - apim-request-id: 7339683c-6a49-4786-8bbb-39a1e2e7d8f4 - content-length: '1642' + apim-request-id: 9724a89f-a960-4191-84d4-d90630d51038 + content-length: '1581' content-type: application/json; charset=utf-8 - date: Fri, 22 Jan 2021 01:05:49 GMT + date: Tue, 09 Mar 2021 21:29:17 GMT strict-transport-security: max-age=31536000; includeSubDomains; preload x-content-type-options: nosniff - x-envoy-upstream-service-time: '80' - x-request-id: 7339683c-6a49-4786-8bbb-39a1e2e7d8f4 + x-envoy-upstream-service-time: '247' + x-request-id: 9724a89f-a960-4191-84d4-d90630d51038 status: code: 200 message: OK - url: https://js-metrics-advisor.cognitiveservices.azure.com//metricsadvisor/v1.0/dataFeeds/9abb9a33-c97f-406b-954b-82cf95171b30 + url: https://js-metrics-advisor.cognitiveservices.azure.com//metricsadvisor/v1.0/dataFeeds/672c9334-bd98-40f5-bf7d-c47c4e876b87 - request: body: null headers: Accept: - application/json User-Agent: - - azsdk-python-ai-metricsadvisor/1.0.0b3 Python/3.8.6 (Windows-10-10.0.19041-SP0) + - azsdk-python-ai-metricsadvisor/1.0.0b4 Python/3.9.0 (Windows-10-10.0.19041-SP0) method: DELETE - uri: https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/9abb9a33-c97f-406b-954b-82cf95171b30 + uri: https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/672c9334-bd98-40f5-bf7d-c47c4e876b87 response: body: string: '' headers: - apim-request-id: 2d6ea9b6-9ab6-4661-b190-9e5c7b8de3f4 + apim-request-id: dcf88b74-8d40-4a5e-b311-7cbeb5061393 content-length: '0' - date: Fri, 22 Jan 2021 01:05:49 GMT + date: Tue, 09 Mar 2021 21:29:18 GMT strict-transport-security: max-age=31536000; includeSubDomains; preload x-content-type-options: nosniff - x-envoy-upstream-service-time: '277' - x-request-id: 2d6ea9b6-9ab6-4661-b190-9e5c7b8de3f4 + x-envoy-upstream-service-time: '506' + x-request-id: dcf88b74-8d40-4a5e-b311-7cbeb5061393 status: code: 204 message: No Content - url: https://js-metrics-advisor.cognitiveservices.azure.com//metricsadvisor/v1.0/dataFeeds/9abb9a33-c97f-406b-954b-82cf95171b30 + url: https://js-metrics-advisor.cognitiveservices.azure.com//metricsadvisor/v1.0/dataFeeds/672c9334-bd98-40f5-bf7d-c47c4e876b87 version: 1 diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/recordings/test_data_feeds_async.test_update_data_feed_by_reseting_properties.yaml b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/recordings/test_data_feeds_async.test_update_data_feed_by_reseting_properties.yaml index 38b17394354b..f7b469de80ba 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/recordings/test_data_feeds_async.test_update_data_feed_by_reseting_properties.yaml +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/recordings/test_data_feeds_async.test_update_data_feed_by_reseting_properties.yaml @@ -1,6 +1,6 @@ interactions: - request: - body: '{"dataSourceType": "SqlServer", "dataFeedName": "updaterkl3ot2hc4ojiqcygv", + body: '{"dataSourceType": "SqlServer", "dataFeedName": "updategikxpt7phyvvdobr56", "dataFeedDescription": "my first data feed", "granularityName": "Daily", "metrics": [{"metricName": "cost", "metricDisplayName": "display cost", "metricDescription": "the cost"}, {"metricName": "revenue", "metricDisplayName": "display revenue", @@ -21,21 +21,21 @@ interactions: Content-Type: - application/json User-Agent: - - azsdk-python-ai-metricsadvisor/1.0.0b3 Python/3.8.6 (Windows-10-10.0.19041-SP0) + - azsdk-python-ai-metricsadvisor/1.0.0b4 Python/3.9.0 (Windows-10-10.0.19041-SP0) method: POST uri: https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds response: body: string: '' headers: - apim-request-id: 4511df88-639c-4b80-9ab5-107e41d04187 + apim-request-id: 78d2b0e9-0475-44ae-a0c7-ee3712cdfb52 content-length: '0' - date: Fri, 22 Jan 2021 01:06:25 GMT - location: https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ae3b53b9-cf3a-4a79-8a04-40fcf43277b8 + date: Tue, 09 Mar 2021 21:28:30 GMT + location: https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b6b00c1f-6a1b-4a89-9680-7bfa515f1c6b strict-transport-security: max-age=31536000; includeSubDomains; preload x-content-type-options: nosniff - x-envoy-upstream-service-time: '861' - x-request-id: 4511df88-639c-4b80-9ab5-107e41d04187 + x-envoy-upstream-service-time: '694' + x-request-id: 78d2b0e9-0475-44ae-a0c7-ee3712cdfb52 status: code: 201 message: Created @@ -46,117 +46,140 @@ interactions: Accept: - application/json User-Agent: - - azsdk-python-ai-metricsadvisor/1.0.0b3 Python/3.8.6 (Windows-10-10.0.19041-SP0) + - azsdk-python-ai-metricsadvisor/1.0.0b4 Python/3.9.0 (Windows-10-10.0.19041-SP0) method: GET - uri: https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ae3b53b9-cf3a-4a79-8a04-40fcf43277b8 + uri: https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b6b00c1f-6a1b-4a89-9680-7bfa515f1c6b response: body: - string: "{\"dataFeedId\":\"ae3b53b9-cf3a-4a79-8a04-40fcf43277b8\",\"dataFeedName\":\"updaterkl3ot2hc4ojiqcygv\",\"metrics\":[{\"metricId\":\"caf80c25-f00e-437a-9edb-e48faca36fd2\",\"metricName\":\"cost\",\"metricDisplayName\":\"display - cost\",\"metricDescription\":\"the cost\"},{\"metricId\":\"17fbb396-b76e-4ad8-8bc6-f9f7d0db7638\",\"metricName\":\"revenue\",\"metricDisplayName\":\"display - revenue\",\"metricDescription\":\"the revenue\"}],\"dimension\":[{\"dimensionName\":\"category\",\"dimensionDisplayName\":\"display - category\"},{\"dimensionName\":\"city\",\"dimensionDisplayName\":\"display - city\"}],\"dataStartFrom\":\"2019-10-01T00:00:00Z\",\"dataSourceType\":\"SqlServer\",\"timestampColumn\":\"Timestamp\",\"startOffsetInSeconds\":-1,\"maxQueryPerMinute\":30.0,\"granularityName\":\"Daily\",\"granularityAmount\":null,\"allUpIdentification\":null,\"needRollup\":\"NoRollup\",\"fillMissingPointType\":\"SmartFilling\",\"fillMissingPointValue\":0.0,\"rollUpMethod\":\"None\",\"rollUpColumns\":[],\"dataFeedDescription\":\"my - first data feed\",\"stopRetryAfterInSeconds\":-1,\"minRetryIntervalInSeconds\":-1,\"maxConcurrency\":0,\"viewMode\":\"Private\",\"admins\":[\"krpratic@microsoft.com\",\"yournamehere@microsoft.com\"],\"viewers\":[\"viewers\"],\"creator\":\"krpratic@microsoft.com\",\"status\":\"Active\",\"createdTime\":\"2021-01-22T01:06:26Z\",\"isAdmin\":true,\"actionLinkTemplate\":\"action - link template\",\"dataSourceParameter\":{\"connectionString\":\"connectionstring\",\"query\":\"select\u202F*\u202Ffrom\u202Fadsample2\u202Fwhere\u202FTimestamp\u202F=\u202F@StartTime\"}}" + string: "{\"dataFeedId\":\"b6b00c1f-6a1b-4a89-9680-7bfa515f1c6b\",\"dataFeedName\"\ + :\"updategikxpt7phyvvdobr56\",\"metrics\":[{\"metricId\":\"56488bf7-c337-49d0-bcbd-3bed10a83ea3\"\ + ,\"metricName\":\"cost\",\"metricDisplayName\":\"display cost\",\"metricDescription\"\ + :\"the cost\"},{\"metricId\":\"13a1be09-05c7-4ff0-9822-db8af526e79b\",\"metricName\"\ + :\"revenue\",\"metricDisplayName\":\"display revenue\",\"metricDescription\"\ + :\"the revenue\"}],\"dimension\":[{\"dimensionName\":\"category\",\"dimensionDisplayName\"\ + :\"display category\"},{\"dimensionName\":\"city\",\"dimensionDisplayName\"\ + :\"display city\"}],\"dataStartFrom\":\"2019-10-01T00:00:00Z\",\"dataSourceType\"\ + :\"SqlServer\",\"timestampColumn\":\"Timestamp\",\"startOffsetInSeconds\"\ + :-1,\"maxQueryPerMinute\":30.0,\"granularityName\":\"Daily\",\"needRollup\"\ + :\"NoRollup\",\"fillMissingPointType\":\"SmartFilling\",\"fillMissingPointValue\"\ + :0.0,\"rollUpMethod\":\"None\",\"rollUpColumns\":[],\"dataFeedDescription\"\ + :\"my first data feed\",\"stopRetryAfterInSeconds\":-1,\"minRetryIntervalInSeconds\"\ + :-1,\"maxConcurrency\":0,\"viewMode\":\"Private\",\"admins\":[\"krpratic@microsoft.com\"\ + ,\"yournamehere@microsoft.com\"],\"viewers\":[\"viewers\"],\"creator\":\"\ + krpratic@microsoft.com\",\"status\":\"Active\",\"createdTime\":\"2021-03-09T21:28:30Z\"\ + ,\"isAdmin\":true,\"actionLinkTemplate\":\"action link template\",\"dataSourceParameter\"\ + :{\"connectionString\":\"connectionstring\",\"query\":\"select\u202F*\u202F\ + from\u202Fadsample2\u202Fwhere\u202FTimestamp\u202F=\u202F@StartTime\"},\"\ + authenticationType\":\"Basic\"}" headers: - apim-request-id: 228e0321-4f1c-4660-b48e-11ab088c9e02 - content-length: '1632' + apim-request-id: 59f40b50-8113-446e-acff-84fe52f4043c + content-length: '1609' content-type: application/json; charset=utf-8 - date: Fri, 22 Jan 2021 01:06:26 GMT + date: Tue, 09 Mar 2021 21:28:30 GMT strict-transport-security: max-age=31536000; includeSubDomains; preload x-content-type-options: nosniff - x-envoy-upstream-service-time: '303' - x-request-id: 228e0321-4f1c-4660-b48e-11ab088c9e02 + x-envoy-upstream-service-time: '135' + x-request-id: 59f40b50-8113-446e-acff-84fe52f4043c status: code: 200 message: OK - url: https://js-metrics-advisor.cognitiveservices.azure.com//metricsadvisor/v1.0/dataFeeds/ae3b53b9-cf3a-4a79-8a04-40fcf43277b8 + url: https://js-metrics-advisor.cognitiveservices.azure.com//metricsadvisor/v1.0/dataFeeds/b6b00c1f-6a1b-4a89-9680-7bfa515f1c6b - request: - body: '{"dataFeedName": "update", "dataFeedDescription": null, "timestampColumn": - null, "startOffsetInSeconds": null, "maxConcurrency": null, "minRetryIntervalInSeconds": - null, "stopRetryAfterInSeconds": null, "needRollup": null, "rollUpMethod": null, - "rollUpColumns": null, "allUpIdentification": null, "fillMissingPointType": - null, "fillMissingPointValue": null, "viewMode": null, "viewers": null, "status": - null, "actionLinkTemplate": null}' + body: '{"dataFeedName": "update", "dataFeedDescription": null, "startOffsetInSeconds": + null, "maxConcurrency": null, "minRetryIntervalInSeconds": null, "stopRetryAfterInSeconds": + null, "needRollup": null, "rollUpMethod": null, "fillMissingPointType": null, + "viewMode": null, "viewers": null, "status": null, "actionLinkTemplate": null}' headers: Accept: - application/json Content-Length: - - '436' + - '328' Content-Type: - application/merge-patch+json User-Agent: - - azsdk-python-ai-metricsadvisor/1.0.0b3 Python/3.8.6 (Windows-10-10.0.19041-SP0) + - azsdk-python-ai-metricsadvisor/1.0.0b4 Python/3.9.0 (Windows-10-10.0.19041-SP0) method: PATCH - uri: https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ae3b53b9-cf3a-4a79-8a04-40fcf43277b8 + uri: https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b6b00c1f-6a1b-4a89-9680-7bfa515f1c6b response: body: string: '' headers: - apim-request-id: 3afd964e-7485-49cf-955b-1cf3fa5d1f4a + apim-request-id: fb9c7a42-ff1a-47d8-bea0-cdabbe543aa1 content-length: '0' - date: Fri, 22 Jan 2021 01:06:26 GMT + date: Tue, 09 Mar 2021 21:28:31 GMT strict-transport-security: max-age=31536000; includeSubDomains; preload x-content-type-options: nosniff - x-envoy-upstream-service-time: '364' - x-request-id: 3afd964e-7485-49cf-955b-1cf3fa5d1f4a + x-envoy-upstream-service-time: '169' + x-request-id: fb9c7a42-ff1a-47d8-bea0-cdabbe543aa1 status: code: 204 message: No Content - url: https://js-metrics-advisor.cognitiveservices.azure.com//metricsadvisor/v1.0/dataFeeds/ae3b53b9-cf3a-4a79-8a04-40fcf43277b8 + url: https://js-metrics-advisor.cognitiveservices.azure.com//metricsadvisor/v1.0/dataFeeds/b6b00c1f-6a1b-4a89-9680-7bfa515f1c6b - request: body: null headers: Accept: - application/json User-Agent: - - azsdk-python-ai-metricsadvisor/1.0.0b3 Python/3.8.6 (Windows-10-10.0.19041-SP0) + - azsdk-python-ai-metricsadvisor/1.0.0b4 Python/3.9.0 (Windows-10-10.0.19041-SP0) method: GET - uri: https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ae3b53b9-cf3a-4a79-8a04-40fcf43277b8 + uri: https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b6b00c1f-6a1b-4a89-9680-7bfa515f1c6b response: body: - string: "{\"dataFeedId\":\"ae3b53b9-cf3a-4a79-8a04-40fcf43277b8\",\"dataFeedName\":\"update\",\"metrics\":[{\"metricId\":\"caf80c25-f00e-437a-9edb-e48faca36fd2\",\"metricName\":\"cost\",\"metricDisplayName\":\"display - cost\",\"metricDescription\":\"the cost\"},{\"metricId\":\"17fbb396-b76e-4ad8-8bc6-f9f7d0db7638\",\"metricName\":\"revenue\",\"metricDisplayName\":\"display - revenue\",\"metricDescription\":\"the revenue\"}],\"dimension\":[{\"dimensionName\":\"category\",\"dimensionDisplayName\":\"display - category\"},{\"dimensionName\":\"city\",\"dimensionDisplayName\":\"display - city\"}],\"dataStartFrom\":\"2019-10-01T00:00:00Z\",\"dataSourceType\":\"SqlServer\",\"timestampColumn\":\"Timestamp\",\"startOffsetInSeconds\":-1,\"maxQueryPerMinute\":30.0,\"granularityName\":\"Daily\",\"granularityAmount\":null,\"allUpIdentification\":null,\"needRollup\":\"NoRollup\",\"fillMissingPointType\":\"SmartFilling\",\"fillMissingPointValue\":0.0,\"rollUpMethod\":\"None\",\"rollUpColumns\":[],\"dataFeedDescription\":\"my - first data feed\",\"stopRetryAfterInSeconds\":-1,\"minRetryIntervalInSeconds\":-1,\"maxConcurrency\":0,\"viewMode\":\"Private\",\"admins\":[\"krpratic@microsoft.com\",\"yournamehere@microsoft.com\"],\"viewers\":[\"viewers\"],\"creator\":\"krpratic@microsoft.com\",\"status\":\"Active\",\"createdTime\":\"2021-01-22T01:06:26Z\",\"isAdmin\":true,\"actionLinkTemplate\":\"action - link template\",\"dataSourceParameter\":{\"connectionString\":\"connectionstring\",\"query\":\"select\u202F*\u202Ffrom\u202Fadsample2\u202Fwhere\u202FTimestamp\u202F=\u202F@StartTime\"}}" + string: "{\"dataFeedId\":\"b6b00c1f-6a1b-4a89-9680-7bfa515f1c6b\",\"dataFeedName\"\ + :\"update\",\"metrics\":[{\"metricId\":\"56488bf7-c337-49d0-bcbd-3bed10a83ea3\"\ + ,\"metricName\":\"cost\",\"metricDisplayName\":\"display cost\",\"metricDescription\"\ + :\"the cost\"},{\"metricId\":\"13a1be09-05c7-4ff0-9822-db8af526e79b\",\"metricName\"\ + :\"revenue\",\"metricDisplayName\":\"display revenue\",\"metricDescription\"\ + :\"the revenue\"}],\"dimension\":[{\"dimensionName\":\"category\",\"dimensionDisplayName\"\ + :\"display category\"},{\"dimensionName\":\"city\",\"dimensionDisplayName\"\ + :\"display city\"}],\"dataStartFrom\":\"2019-10-01T00:00:00Z\",\"dataSourceType\"\ + :\"SqlServer\",\"timestampColumn\":\"Timestamp\",\"startOffsetInSeconds\"\ + :0,\"maxQueryPerMinute\":30.0,\"granularityName\":\"Daily\",\"needRollup\"\ + :\"NoRollup\",\"fillMissingPointType\":\"SmartFilling\",\"fillMissingPointValue\"\ + :0.0,\"rollUpMethod\":\"None\",\"rollUpColumns\":[],\"dataFeedDescription\"\ + :\"\",\"stopRetryAfterInSeconds\":-1,\"minRetryIntervalInSeconds\":-1,\"maxConcurrency\"\ + :-1,\"viewMode\":\"Private\",\"admins\":[\"krpratic@microsoft.com\",\"yournamehere@microsoft.com\"\ + ],\"viewers\":[\"viewers\"],\"creator\":\"krpratic@microsoft.com\",\"status\"\ + :\"Active\",\"createdTime\":\"2021-03-09T21:28:30Z\",\"isAdmin\":true,\"actionLinkTemplate\"\ + :\"\",\"dataSourceParameter\":{\"connectionString\":\"connectionstring\",\"\ + query\":\"select\u202F*\u202Ffrom\u202Fadsample2\u202Fwhere\u202FTimestamp\u202F\ + =\u202F@StartTime\"},\"authenticationType\":\"Basic\"}" headers: - apim-request-id: 1b008aab-9c62-4cab-8f55-7f47cddf7ce3 - content-length: '1614' + apim-request-id: b8d963f5-887d-4b02-b35c-86dc07ea9fbb + content-length: '1553' content-type: application/json; charset=utf-8 - date: Fri, 22 Jan 2021 01:06:26 GMT + date: Tue, 09 Mar 2021 21:28:31 GMT strict-transport-security: max-age=31536000; includeSubDomains; preload x-content-type-options: nosniff - x-envoy-upstream-service-time: '330' - x-request-id: 1b008aab-9c62-4cab-8f55-7f47cddf7ce3 + x-envoy-upstream-service-time: '129' + x-request-id: b8d963f5-887d-4b02-b35c-86dc07ea9fbb status: code: 200 message: OK - url: https://js-metrics-advisor.cognitiveservices.azure.com//metricsadvisor/v1.0/dataFeeds/ae3b53b9-cf3a-4a79-8a04-40fcf43277b8 + url: https://js-metrics-advisor.cognitiveservices.azure.com//metricsadvisor/v1.0/dataFeeds/b6b00c1f-6a1b-4a89-9680-7bfa515f1c6b - request: body: null headers: Accept: - application/json User-Agent: - - azsdk-python-ai-metricsadvisor/1.0.0b3 Python/3.8.6 (Windows-10-10.0.19041-SP0) + - azsdk-python-ai-metricsadvisor/1.0.0b4 Python/3.9.0 (Windows-10-10.0.19041-SP0) method: DELETE - uri: https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ae3b53b9-cf3a-4a79-8a04-40fcf43277b8 + uri: https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b6b00c1f-6a1b-4a89-9680-7bfa515f1c6b response: body: string: '' headers: - apim-request-id: d3cd9695-763e-47e8-b916-b9d559278402 + apim-request-id: dec879d0-611b-4ab5-9a5c-7de4bc79e501 content-length: '0' - date: Fri, 22 Jan 2021 01:06:27 GMT + date: Tue, 09 Mar 2021 21:28:31 GMT strict-transport-security: max-age=31536000; includeSubDomains; preload x-content-type-options: nosniff - x-envoy-upstream-service-time: '934' - x-request-id: d3cd9695-763e-47e8-b916-b9d559278402 + x-envoy-upstream-service-time: '339' + x-request-id: dec879d0-611b-4ab5-9a5c-7de4bc79e501 status: code: 204 message: No Content - url: https://js-metrics-advisor.cognitiveservices.azure.com//metricsadvisor/v1.0/dataFeeds/ae3b53b9-cf3a-4a79-8a04-40fcf43277b8 + url: https://js-metrics-advisor.cognitiveservices.azure.com//metricsadvisor/v1.0/dataFeeds/b6b00c1f-6a1b-4a89-9680-7bfa515f1c6b version: 1 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 93b235f89134..31f8b69f9480 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 @@ -1059,17 +1059,13 @@ async def test_update_data_feed_by_reseting_properties(self): data_feed.id, name="update", data_feed_description=None, - timestamp_column=None, ingestion_start_offset=None, data_source_request_concurrency=None, ingestion_retry_delay=None, stop_retry_after=None, rollup_type=None, rollup_method=None, - rollup_identification_value=None, - auto_rollup_group_by_column_names=None, fill_type=None, - custom_fill_value=None, access_mode=None, viewer_emails=None, status=None, @@ -1077,24 +1073,20 @@ async def test_update_data_feed_by_reseting_properties(self): ) 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 + self.assertEqual(updated.options.data_feed_description, "") self.assertEqual(updated.ingestion_settings.ingestion_begin_time, datetime.datetime(2019, 10, 1, tzinfo=tzutc())) - self.assertEqual(updated.ingestion_settings.ingestion_start_offset, -1) - self.assertEqual(updated.ingestion_settings.data_source_request_concurrency, 0) + self.assertEqual(updated.ingestion_settings.ingestion_start_offset, 0) + self.assertEqual(updated.ingestion_settings.data_source_request_concurrency, -1) self.assertEqual(updated.ingestion_settings.ingestion_retry_delay, -1) self.assertEqual(updated.ingestion_settings.stop_retry_after, -1) self.assertEqual(updated.options.rollup_settings.rollup_type, "NoRollup") self.assertEqual(updated.options.rollup_settings.rollup_method, "None") - self.assertEqual(updated.options.rollup_settings.rollup_identification_value, None) - self.assertEqual(updated.options.rollup_settings.auto_rollup_group_by_column_names, []) self.assertEqual(updated.options.missing_data_point_fill_settings.fill_type, "SmartFilling") - self.assertEqual(updated.options.missing_data_point_fill_settings.custom_fill_value, 0) self.assertEqual(updated.options.access_mode, "Private") - # self.assertEqual(updated.options.viewer_emails, ["viewers"]) # doesn't currently clear + self.assertEqual(updated.options.viewer_emails, ["viewers"]) self.assertEqual(updated.status, "Active") - # self.assertEqual(updated.options.action_link_template, "updated") # doesn't currently clear + self.assertEqual(updated.options.action_link_template, "") finally: await self.admin_client.delete_data_feed(data_feed.id) 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 0bda30ed90f3..e3bde938effc 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 @@ -1059,17 +1059,13 @@ async def test_update_data_feed_by_reseting_properties(self): data_feed.id, name="update", data_feed_description=None, - timestamp_column=None, ingestion_start_offset=None, data_source_request_concurrency=None, ingestion_retry_delay=None, stop_retry_after=None, rollup_type=None, rollup_method=None, - rollup_identification_value=None, - auto_rollup_group_by_column_names=None, fill_type=None, - custom_fill_value=None, access_mode=None, viewer_emails=None, status=None, @@ -1077,24 +1073,20 @@ async def test_update_data_feed_by_reseting_properties(self): ) 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 + self.assertEqual(updated.options.data_feed_description, "") self.assertEqual(updated.ingestion_settings.ingestion_begin_time, datetime.datetime(2019, 10, 1, tzinfo=tzutc())) - self.assertEqual(updated.ingestion_settings.ingestion_start_offset, -1) - self.assertEqual(updated.ingestion_settings.data_source_request_concurrency, 0) + self.assertEqual(updated.ingestion_settings.ingestion_start_offset, 0) + self.assertEqual(updated.ingestion_settings.data_source_request_concurrency, -1) self.assertEqual(updated.ingestion_settings.ingestion_retry_delay, -1) self.assertEqual(updated.ingestion_settings.stop_retry_after, -1) self.assertEqual(updated.options.rollup_settings.rollup_type, "NoRollup") self.assertEqual(updated.options.rollup_settings.rollup_method, "None") - self.assertEqual(updated.options.rollup_settings.rollup_identification_value, None) - self.assertEqual(updated.options.rollup_settings.auto_rollup_group_by_column_names, []) self.assertEqual(updated.options.missing_data_point_fill_settings.fill_type, "SmartFilling") - self.assertEqual(updated.options.missing_data_point_fill_settings.custom_fill_value, 0) self.assertEqual(updated.options.access_mode, "Private") - # self.assertEqual(updated.options.viewer_emails, ["viewers"]) # doesn't currently clear + self.assertEqual(updated.options.viewer_emails, ["viewers"]) self.assertEqual(updated.status, "Active") - # self.assertEqual(updated.options.action_link_template, "updated") # doesn't currently clear + self.assertEqual(updated.options.action_link_template, "") finally: await self.admin_client.delete_data_feed(data_feed.id) diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/recordings/test_data_feeds.test_update_data_feed_by_reseting_properties.yaml b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/recordings/test_data_feeds.test_update_data_feed_by_reseting_properties.yaml index f80f3078ee83..eda3df034d10 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/recordings/test_data_feeds.test_update_data_feed_by_reseting_properties.yaml +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/recordings/test_data_feeds.test_update_data_feed_by_reseting_properties.yaml @@ -1,6 +1,6 @@ interactions: - request: - body: '{"dataSourceType": "SqlServer", "dataFeedName": "updatekwzv433gdkde43ur6h", + body: '{"dataSourceType": "SqlServer", "dataFeedName": "updater46b6oskubp3abd2zg", "dataFeedDescription": "my first data feed", "granularityName": "Daily", "metrics": [{"metricName": "cost", "metricDisplayName": "display cost", "metricDescription": "the cost"}, {"metricName": "revenue", "metricDisplayName": "display revenue", @@ -25,7 +25,7 @@ interactions: Content-Type: - application/json User-Agent: - - azsdk-python-ai-metricsadvisor/1.0.0b3 Python/3.8.6 (Windows-10-10.0.19041-SP0) + - azsdk-python-ai-metricsadvisor/1.0.0b4 Python/3.9.0 (Windows-10-10.0.19041-SP0) method: POST uri: https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds response: @@ -33,21 +33,21 @@ interactions: string: '' headers: apim-request-id: - - d5dd33bf-7ed3-4242-afa5-ad34dfe30e57 + - a47bd9cc-4e2d-45a9-bbcb-465fb716864a content-length: - '0' date: - - Fri, 22 Jan 2021 00:57:26 GMT + - Tue, 09 Mar 2021 21:25:05 GMT location: - - https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d2cfa946-bc21-431e-80e9-75aa2b9e35ef + - https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b3429228-374e-486b-ac55-656878a091f7 strict-transport-security: - max-age=31536000; includeSubDomains; preload x-content-type-options: - nosniff x-envoy-upstream-service-time: - - '829' + - '1282' x-request-id: - - d5dd33bf-7ed3-4242-afa5-ad34dfe30e57 + - a47bd9cc-4e2d-45a9-bbcb-465fb716864a status: code: 201 message: Created @@ -61,45 +61,56 @@ interactions: Connection: - keep-alive User-Agent: - - azsdk-python-ai-metricsadvisor/1.0.0b3 Python/3.8.6 (Windows-10-10.0.19041-SP0) + - azsdk-python-ai-metricsadvisor/1.0.0b4 Python/3.9.0 (Windows-10-10.0.19041-SP0) method: GET - uri: https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d2cfa946-bc21-431e-80e9-75aa2b9e35ef + uri: https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b3429228-374e-486b-ac55-656878a091f7 response: body: - string: "{\"dataFeedId\":\"d2cfa946-bc21-431e-80e9-75aa2b9e35ef\",\"dataFeedName\":\"updatekwzv433gdkde43ur6h\",\"metrics\":[{\"metricId\":\"30738036-35a2-4a37-85f2-4d7714007013\",\"metricName\":\"cost\",\"metricDisplayName\":\"display - cost\",\"metricDescription\":\"the cost\"},{\"metricId\":\"358579d1-61fe-4f46-aa5a-be2ebafbfb92\",\"metricName\":\"revenue\",\"metricDisplayName\":\"display - revenue\",\"metricDescription\":\"the revenue\"}],\"dimension\":[{\"dimensionName\":\"category\",\"dimensionDisplayName\":\"display - category\"},{\"dimensionName\":\"city\",\"dimensionDisplayName\":\"display - city\"}],\"dataStartFrom\":\"2019-10-01T00:00:00Z\",\"dataSourceType\":\"SqlServer\",\"timestampColumn\":\"Timestamp\",\"startOffsetInSeconds\":-1,\"maxQueryPerMinute\":30.0,\"granularityName\":\"Daily\",\"granularityAmount\":null,\"allUpIdentification\":null,\"needRollup\":\"NoRollup\",\"fillMissingPointType\":\"SmartFilling\",\"fillMissingPointValue\":0.0,\"rollUpMethod\":\"None\",\"rollUpColumns\":[],\"dataFeedDescription\":\"my - first data feed\",\"stopRetryAfterInSeconds\":-1,\"minRetryIntervalInSeconds\":-1,\"maxConcurrency\":0,\"viewMode\":\"Private\",\"admins\":[\"krpratic@microsoft.com\",\"yournamehere@microsoft.com\"],\"viewers\":[\"viewers\"],\"creator\":\"krpratic@microsoft.com\",\"status\":\"Active\",\"createdTime\":\"2021-01-22T00:57:26Z\",\"isAdmin\":true,\"actionLinkTemplate\":\"action - link template\",\"dataSourceParameter\":{\"connectionString\":\"connectionstring\",\"query\":\"select\u202F*\u202Ffrom\u202Fadsample2\u202Fwhere\u202FTimestamp\u202F=\u202F@StartTime\"}}" + string: "{\"dataFeedId\":\"b3429228-374e-486b-ac55-656878a091f7\",\"dataFeedName\"\ + :\"updater46b6oskubp3abd2zg\",\"metrics\":[{\"metricId\":\"b9ee44ae-7873-4830-83c6-aff42cc35319\"\ + ,\"metricName\":\"cost\",\"metricDisplayName\":\"display cost\",\"metricDescription\"\ + :\"the cost\"},{\"metricId\":\"641dddd7-151b-4e3d-a15e-244211236370\",\"metricName\"\ + :\"revenue\",\"metricDisplayName\":\"display revenue\",\"metricDescription\"\ + :\"the revenue\"}],\"dimension\":[{\"dimensionName\":\"category\",\"dimensionDisplayName\"\ + :\"display category\"},{\"dimensionName\":\"city\",\"dimensionDisplayName\"\ + :\"display city\"}],\"dataStartFrom\":\"2019-10-01T00:00:00Z\",\"dataSourceType\"\ + :\"SqlServer\",\"timestampColumn\":\"Timestamp\",\"startOffsetInSeconds\"\ + :-1,\"maxQueryPerMinute\":30.0,\"granularityName\":\"Daily\",\"needRollup\"\ + :\"NoRollup\",\"fillMissingPointType\":\"SmartFilling\",\"fillMissingPointValue\"\ + :0.0,\"rollUpMethod\":\"None\",\"rollUpColumns\":[],\"dataFeedDescription\"\ + :\"my first data feed\",\"stopRetryAfterInSeconds\":-1,\"minRetryIntervalInSeconds\"\ + :-1,\"maxConcurrency\":0,\"viewMode\":\"Private\",\"admins\":[\"krpratic@microsoft.com\"\ + ,\"yournamehere@microsoft.com\"],\"viewers\":[\"viewers\"],\"creator\":\"\ + krpratic@microsoft.com\",\"status\":\"Active\",\"createdTime\":\"2021-03-09T21:25:05Z\"\ + ,\"isAdmin\":true,\"actionLinkTemplate\":\"action link template\",\"dataSourceParameter\"\ + :{\"connectionString\":\"connectionstring\",\"query\":\"select\u202F*\u202F\ + from\u202Fadsample2\u202Fwhere\u202FTimestamp\u202F=\u202F@StartTime\"},\"\ + authenticationType\":\"Basic\"}" headers: apim-request-id: - - d00668b2-7c63-40e0-a3d8-fa6396f1385c + - a79b3cde-e5f1-4e41-a642-ee7ebe8f41a5 content-length: - - '1632' + - '1609' content-type: - application/json; charset=utf-8 date: - - Fri, 22 Jan 2021 00:57:26 GMT + - Tue, 09 Mar 2021 21:25:05 GMT strict-transport-security: - max-age=31536000; includeSubDomains; preload x-content-type-options: - nosniff x-envoy-upstream-service-time: - - '359' + - '374' x-request-id: - - d00668b2-7c63-40e0-a3d8-fa6396f1385c + - a79b3cde-e5f1-4e41-a642-ee7ebe8f41a5 status: code: 200 message: OK - request: - body: '{"dataFeedName": "update", "dataFeedDescription": null, "timestampColumn": - null, "startOffsetInSeconds": null, "maxConcurrency": null, "minRetryIntervalInSeconds": - null, "stopRetryAfterInSeconds": null, "needRollup": null, "rollUpMethod": null, - "rollUpColumns": null, "allUpIdentification": null, "fillMissingPointType": - null, "fillMissingPointValue": null, "viewMode": null, "viewers": null, "status": - null, "actionLinkTemplate": null}' + body: '{"dataFeedName": "update", "dataFeedDescription": null, "startOffsetInSeconds": + null, "maxConcurrency": null, "minRetryIntervalInSeconds": null, "stopRetryAfterInSeconds": + null, "needRollup": null, "rollUpMethod": null, "fillMissingPointType": null, + "viewMode": null, "viewers": null, "status": null, "actionLinkTemplate": null}' headers: Accept: - application/json @@ -108,31 +119,31 @@ interactions: Connection: - keep-alive Content-Length: - - '436' + - '328' Content-Type: - application/merge-patch+json User-Agent: - - azsdk-python-ai-metricsadvisor/1.0.0b3 Python/3.8.6 (Windows-10-10.0.19041-SP0) + - azsdk-python-ai-metricsadvisor/1.0.0b4 Python/3.9.0 (Windows-10-10.0.19041-SP0) method: PATCH - uri: https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d2cfa946-bc21-431e-80e9-75aa2b9e35ef + uri: https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b3429228-374e-486b-ac55-656878a091f7 response: body: string: '' headers: apim-request-id: - - 0296442b-e5b5-4dee-95d8-0605355666e0 + - c7f874e4-566c-4b87-ba1d-e682d65c6589 content-length: - '0' date: - - Fri, 22 Jan 2021 00:57:27 GMT + - Tue, 09 Mar 2021 21:25:06 GMT strict-transport-security: - max-age=31536000; includeSubDomains; preload x-content-type-options: - nosniff x-envoy-upstream-service-time: - - '318' + - '371' x-request-id: - - 0296442b-e5b5-4dee-95d8-0605355666e0 + - c7f874e4-566c-4b87-ba1d-e682d65c6589 status: code: 204 message: No Content @@ -146,35 +157,47 @@ interactions: Connection: - keep-alive User-Agent: - - azsdk-python-ai-metricsadvisor/1.0.0b3 Python/3.8.6 (Windows-10-10.0.19041-SP0) + - azsdk-python-ai-metricsadvisor/1.0.0b4 Python/3.9.0 (Windows-10-10.0.19041-SP0) method: GET - uri: https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d2cfa946-bc21-431e-80e9-75aa2b9e35ef + uri: https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b3429228-374e-486b-ac55-656878a091f7 response: body: - string: "{\"dataFeedId\":\"d2cfa946-bc21-431e-80e9-75aa2b9e35ef\",\"dataFeedName\":\"update\",\"metrics\":[{\"metricId\":\"30738036-35a2-4a37-85f2-4d7714007013\",\"metricName\":\"cost\",\"metricDisplayName\":\"display - cost\",\"metricDescription\":\"the cost\"},{\"metricId\":\"358579d1-61fe-4f46-aa5a-be2ebafbfb92\",\"metricName\":\"revenue\",\"metricDisplayName\":\"display - revenue\",\"metricDescription\":\"the revenue\"}],\"dimension\":[{\"dimensionName\":\"category\",\"dimensionDisplayName\":\"display - category\"},{\"dimensionName\":\"city\",\"dimensionDisplayName\":\"display - city\"}],\"dataStartFrom\":\"2019-10-01T00:00:00Z\",\"dataSourceType\":\"SqlServer\",\"timestampColumn\":\"Timestamp\",\"startOffsetInSeconds\":-1,\"maxQueryPerMinute\":30.0,\"granularityName\":\"Daily\",\"granularityAmount\":null,\"allUpIdentification\":null,\"needRollup\":\"NoRollup\",\"fillMissingPointType\":\"SmartFilling\",\"fillMissingPointValue\":0.0,\"rollUpMethod\":\"None\",\"rollUpColumns\":[],\"dataFeedDescription\":\"my - first data feed\",\"stopRetryAfterInSeconds\":-1,\"minRetryIntervalInSeconds\":-1,\"maxConcurrency\":0,\"viewMode\":\"Private\",\"admins\":[\"krpratic@microsoft.com\",\"yournamehere@microsoft.com\"],\"viewers\":[\"viewers\"],\"creator\":\"krpratic@microsoft.com\",\"status\":\"Active\",\"createdTime\":\"2021-01-22T00:57:26Z\",\"isAdmin\":true,\"actionLinkTemplate\":\"action - link template\",\"dataSourceParameter\":{\"connectionString\":\"connectionstring\",\"query\":\"select\u202F*\u202Ffrom\u202Fadsample2\u202Fwhere\u202FTimestamp\u202F=\u202F@StartTime\"}}" + string: "{\"dataFeedId\":\"b3429228-374e-486b-ac55-656878a091f7\",\"dataFeedName\"\ + :\"update\",\"metrics\":[{\"metricId\":\"b9ee44ae-7873-4830-83c6-aff42cc35319\"\ + ,\"metricName\":\"cost\",\"metricDisplayName\":\"display cost\",\"metricDescription\"\ + :\"the cost\"},{\"metricId\":\"641dddd7-151b-4e3d-a15e-244211236370\",\"metricName\"\ + :\"revenue\",\"metricDisplayName\":\"display revenue\",\"metricDescription\"\ + :\"the revenue\"}],\"dimension\":[{\"dimensionName\":\"category\",\"dimensionDisplayName\"\ + :\"display category\"},{\"dimensionName\":\"city\",\"dimensionDisplayName\"\ + :\"display city\"}],\"dataStartFrom\":\"2019-10-01T00:00:00Z\",\"dataSourceType\"\ + :\"SqlServer\",\"timestampColumn\":\"Timestamp\",\"startOffsetInSeconds\"\ + :0,\"maxQueryPerMinute\":30.0,\"granularityName\":\"Daily\",\"needRollup\"\ + :\"NoRollup\",\"fillMissingPointType\":\"SmartFilling\",\"fillMissingPointValue\"\ + :0.0,\"rollUpMethod\":\"None\",\"rollUpColumns\":[],\"dataFeedDescription\"\ + :\"\",\"stopRetryAfterInSeconds\":-1,\"minRetryIntervalInSeconds\":-1,\"maxConcurrency\"\ + :-1,\"viewMode\":\"Private\",\"admins\":[\"krpratic@microsoft.com\",\"yournamehere@microsoft.com\"\ + ],\"viewers\":[\"viewers\"],\"creator\":\"krpratic@microsoft.com\",\"status\"\ + :\"Active\",\"createdTime\":\"2021-03-09T21:25:05Z\",\"isAdmin\":true,\"actionLinkTemplate\"\ + :\"\",\"dataSourceParameter\":{\"connectionString\":\"connectionstring\",\"\ + query\":\"select\u202F*\u202Ffrom\u202Fadsample2\u202Fwhere\u202FTimestamp\u202F\ + =\u202F@StartTime\"},\"authenticationType\":\"Basic\"}" headers: apim-request-id: - - d726a270-f231-4650-bb18-3b07d01bcc25 + - 91409c5f-656a-416f-b4fb-d67648e694c1 content-length: - - '1614' + - '1553' content-type: - application/json; charset=utf-8 date: - - Fri, 22 Jan 2021 00:57:27 GMT + - Tue, 09 Mar 2021 21:25:06 GMT strict-transport-security: - max-age=31536000; includeSubDomains; preload x-content-type-options: - nosniff x-envoy-upstream-service-time: - - '309' + - '282' x-request-id: - - d726a270-f231-4650-bb18-3b07d01bcc25 + - 91409c5f-656a-416f-b4fb-d67648e694c1 status: code: 200 message: OK @@ -190,27 +213,27 @@ interactions: Content-Length: - '0' User-Agent: - - azsdk-python-ai-metricsadvisor/1.0.0b3 Python/3.8.6 (Windows-10-10.0.19041-SP0) + - azsdk-python-ai-metricsadvisor/1.0.0b4 Python/3.9.0 (Windows-10-10.0.19041-SP0) method: DELETE - uri: https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/d2cfa946-bc21-431e-80e9-75aa2b9e35ef + uri: https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/b3429228-374e-486b-ac55-656878a091f7 response: body: string: '' headers: apim-request-id: - - 23acf663-d234-4a10-95b9-333139add2af + - 52cc0f7f-130b-47a0-82d6-d0c0d0ab4a24 content-length: - '0' date: - - Fri, 22 Jan 2021 00:57:28 GMT + - Tue, 09 Mar 2021 21:25:07 GMT strict-transport-security: - max-age=31536000; includeSubDomains; preload x-content-type-options: - nosniff x-envoy-upstream-service-time: - - '868' + - '530' x-request-id: - - 23acf663-d234-4a10-95b9-333139add2af + - 52cc0f7f-130b-47a0-82d6-d0c0d0ab4a24 status: code: 204 message: No Content diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/recordings/test_data_feeds_aad.test_update_data_feed_by_reseting_properties.yaml b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/recordings/test_data_feeds_aad.test_update_data_feed_by_reseting_properties.yaml index 7ae83c21c746..76e6212f0a02 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/recordings/test_data_feeds_aad.test_update_data_feed_by_reseting_properties.yaml +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/recordings/test_data_feeds_aad.test_update_data_feed_by_reseting_properties.yaml @@ -1,6 +1,6 @@ interactions: - request: - body: '{"dataSourceType": "SqlServer", "dataFeedName": "updateefk4n322e7msm3kacw", + body: '{"dataSourceType": "SqlServer", "dataFeedName": "updateap3nri7xkxuzwpgail", "dataFeedDescription": "my first data feed", "granularityName": "Daily", "metrics": [{"metricName": "cost", "metricDisplayName": "display cost", "metricDescription": "the cost"}, {"metricName": "revenue", "metricDisplayName": "display revenue", @@ -25,7 +25,7 @@ interactions: Content-Type: - application/json User-Agent: - - azsdk-python-ai-metricsadvisor/1.0.0b3 Python/3.8.6 (Windows-10-10.0.19041-SP0) + - azsdk-python-ai-metricsadvisor/1.0.0b4 Python/3.9.0 (Windows-10-10.0.19041-SP0) method: POST uri: https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds response: @@ -33,21 +33,21 @@ interactions: string: '' headers: apim-request-id: - - 0395387e-66d7-4b8a-b3e5-a9386be3ee23 + - 9f678dc6-ff3c-44ae-a85b-8c7ecd91b7f3 content-length: - '0' date: - - Fri, 22 Jan 2021 00:58:37 GMT + - Tue, 09 Mar 2021 21:25:40 GMT location: - - https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ba39c709-ae26-4d83-812d-2a077187313f + - https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/9c59ff87-b726-4c73-bd86-e5a6334ce6e6 strict-transport-security: - max-age=31536000; includeSubDomains; preload x-content-type-options: - nosniff x-envoy-upstream-service-time: - - '868' + - '597' x-request-id: - - 0395387e-66d7-4b8a-b3e5-a9386be3ee23 + - 9f678dc6-ff3c-44ae-a85b-8c7ecd91b7f3 status: code: 201 message: Created @@ -61,45 +61,56 @@ interactions: Connection: - keep-alive User-Agent: - - azsdk-python-ai-metricsadvisor/1.0.0b3 Python/3.8.6 (Windows-10-10.0.19041-SP0) + - azsdk-python-ai-metricsadvisor/1.0.0b4 Python/3.9.0 (Windows-10-10.0.19041-SP0) method: GET - uri: https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ba39c709-ae26-4d83-812d-2a077187313f + uri: https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/9c59ff87-b726-4c73-bd86-e5a6334ce6e6 response: body: - string: "{\"dataFeedId\":\"ba39c709-ae26-4d83-812d-2a077187313f\",\"dataFeedName\":\"updateefk4n322e7msm3kacw\",\"metrics\":[{\"metricId\":\"7b51b736-4b4d-4475-9ae3-a47de53aeb14\",\"metricName\":\"cost\",\"metricDisplayName\":\"display - cost\",\"metricDescription\":\"the cost\"},{\"metricId\":\"6e4c4920-9fd1-4109-a06c-44da3cb4d36d\",\"metricName\":\"revenue\",\"metricDisplayName\":\"display - revenue\",\"metricDescription\":\"the revenue\"}],\"dimension\":[{\"dimensionName\":\"category\",\"dimensionDisplayName\":\"display - category\"},{\"dimensionName\":\"city\",\"dimensionDisplayName\":\"display - city\"}],\"dataStartFrom\":\"2019-10-01T00:00:00Z\",\"dataSourceType\":\"SqlServer\",\"timestampColumn\":\"Timestamp\",\"startOffsetInSeconds\":-1,\"maxQueryPerMinute\":30.0,\"granularityName\":\"Daily\",\"granularityAmount\":null,\"allUpIdentification\":null,\"needRollup\":\"NoRollup\",\"fillMissingPointType\":\"SmartFilling\",\"fillMissingPointValue\":0.0,\"rollUpMethod\":\"None\",\"rollUpColumns\":[],\"dataFeedDescription\":\"my - first data feed\",\"stopRetryAfterInSeconds\":-1,\"minRetryIntervalInSeconds\":-1,\"maxConcurrency\":0,\"viewMode\":\"Private\",\"admins\":[\"yournamehere@microsoft.com\",\"f850650c-1fcf-4489-b46f-71af2e30d360\"],\"viewers\":[\"viewers\"],\"creator\":\"f850650c-1fcf-4489-b46f-71af2e30d360\",\"status\":\"Active\",\"createdTime\":\"2021-01-22T00:58:37Z\",\"isAdmin\":true,\"actionLinkTemplate\":\"action - link template\",\"dataSourceParameter\":{\"connectionString\":\"connectionstring\",\"query\":\"select\u202F*\u202Ffrom\u202Fadsample2\u202Fwhere\u202FTimestamp\u202F=\u202F@StartTime\"}}" + string: "{\"dataFeedId\":\"9c59ff87-b726-4c73-bd86-e5a6334ce6e6\",\"dataFeedName\"\ + :\"updateap3nri7xkxuzwpgail\",\"metrics\":[{\"metricId\":\"387fd37f-bef5-4827-8d5b-9f92e75a3c0a\"\ + ,\"metricName\":\"cost\",\"metricDisplayName\":\"display cost\",\"metricDescription\"\ + :\"the cost\"},{\"metricId\":\"9a33e001-78e7-40de-bb76-9161c0a8d585\",\"metricName\"\ + :\"revenue\",\"metricDisplayName\":\"display revenue\",\"metricDescription\"\ + :\"the revenue\"}],\"dimension\":[{\"dimensionName\":\"category\",\"dimensionDisplayName\"\ + :\"display category\"},{\"dimensionName\":\"city\",\"dimensionDisplayName\"\ + :\"display city\"}],\"dataStartFrom\":\"2019-10-01T00:00:00Z\",\"dataSourceType\"\ + :\"SqlServer\",\"timestampColumn\":\"Timestamp\",\"startOffsetInSeconds\"\ + :-1,\"maxQueryPerMinute\":30.0,\"granularityName\":\"Daily\",\"needRollup\"\ + :\"NoRollup\",\"fillMissingPointType\":\"SmartFilling\",\"fillMissingPointValue\"\ + :0.0,\"rollUpMethod\":\"None\",\"rollUpColumns\":[],\"dataFeedDescription\"\ + :\"my first data feed\",\"stopRetryAfterInSeconds\":-1,\"minRetryIntervalInSeconds\"\ + :-1,\"maxConcurrency\":0,\"viewMode\":\"Private\",\"admins\":[\"yournamehere@microsoft.com\"\ + ,\"f850650c-1fcf-4489-b46f-71af2e30d360\"],\"viewers\":[\"viewers\"],\"creator\"\ + :\"f850650c-1fcf-4489-b46f-71af2e30d360\",\"status\":\"Active\",\"createdTime\"\ + :\"2021-03-09T21:25:40Z\",\"isAdmin\":true,\"actionLinkTemplate\":\"action\ + \ link template\",\"dataSourceParameter\":{\"connectionString\":\"connectionstring\"\ + ,\"query\":\"select\u202F*\u202Ffrom\u202Fadsample2\u202Fwhere\u202FTimestamp\u202F\ + =\u202F@StartTime\"},\"authenticationType\":\"Basic\"}" headers: apim-request-id: - - 85ff44f3-1f89-4756-8a49-82d4e30c7eb1 + - 2411039b-2445-498d-88af-1f3235762137 content-length: - - '1660' + - '1637' content-type: - application/json; charset=utf-8 date: - - Fri, 22 Jan 2021 00:58:37 GMT + - Tue, 09 Mar 2021 21:25:40 GMT strict-transport-security: - max-age=31536000; includeSubDomains; preload x-content-type-options: - nosniff x-envoy-upstream-service-time: - - '74' + - '89' x-request-id: - - 85ff44f3-1f89-4756-8a49-82d4e30c7eb1 + - 2411039b-2445-498d-88af-1f3235762137 status: code: 200 message: OK - request: - body: '{"dataFeedName": "update", "dataFeedDescription": null, "timestampColumn": - null, "startOffsetInSeconds": null, "maxConcurrency": null, "minRetryIntervalInSeconds": - null, "stopRetryAfterInSeconds": null, "needRollup": null, "rollUpMethod": null, - "rollUpColumns": null, "allUpIdentification": null, "fillMissingPointType": - null, "fillMissingPointValue": null, "viewMode": null, "viewers": null, "status": - null, "actionLinkTemplate": null}' + body: '{"dataFeedName": "update", "dataFeedDescription": null, "startOffsetInSeconds": + null, "maxConcurrency": null, "minRetryIntervalInSeconds": null, "stopRetryAfterInSeconds": + null, "needRollup": null, "rollUpMethod": null, "fillMissingPointType": null, + "viewMode": null, "viewers": null, "status": null, "actionLinkTemplate": null}' headers: Accept: - application/json @@ -108,31 +119,31 @@ interactions: Connection: - keep-alive Content-Length: - - '436' + - '328' Content-Type: - application/merge-patch+json User-Agent: - - azsdk-python-ai-metricsadvisor/1.0.0b3 Python/3.8.6 (Windows-10-10.0.19041-SP0) + - azsdk-python-ai-metricsadvisor/1.0.0b4 Python/3.9.0 (Windows-10-10.0.19041-SP0) method: PATCH - uri: https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ba39c709-ae26-4d83-812d-2a077187313f + uri: https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/9c59ff87-b726-4c73-bd86-e5a6334ce6e6 response: body: string: '' headers: apim-request-id: - - a0cc6d5d-d28e-4e45-9620-ed9babad8f0b + - a1ce8596-426b-4a0b-9bae-11b9578efd58 content-length: - '0' date: - - Fri, 22 Jan 2021 00:58:37 GMT + - Tue, 09 Mar 2021 21:25:40 GMT strict-transport-security: - max-age=31536000; includeSubDomains; preload x-content-type-options: - nosniff x-envoy-upstream-service-time: - - '117' + - '109' x-request-id: - - a0cc6d5d-d28e-4e45-9620-ed9babad8f0b + - a1ce8596-426b-4a0b-9bae-11b9578efd58 status: code: 204 message: No Content @@ -146,35 +157,48 @@ interactions: Connection: - keep-alive User-Agent: - - azsdk-python-ai-metricsadvisor/1.0.0b3 Python/3.8.6 (Windows-10-10.0.19041-SP0) + - azsdk-python-ai-metricsadvisor/1.0.0b4 Python/3.9.0 (Windows-10-10.0.19041-SP0) method: GET - uri: https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ba39c709-ae26-4d83-812d-2a077187313f + uri: https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/9c59ff87-b726-4c73-bd86-e5a6334ce6e6 response: body: - string: "{\"dataFeedId\":\"ba39c709-ae26-4d83-812d-2a077187313f\",\"dataFeedName\":\"update\",\"metrics\":[{\"metricId\":\"7b51b736-4b4d-4475-9ae3-a47de53aeb14\",\"metricName\":\"cost\",\"metricDisplayName\":\"display - cost\",\"metricDescription\":\"the cost\"},{\"metricId\":\"6e4c4920-9fd1-4109-a06c-44da3cb4d36d\",\"metricName\":\"revenue\",\"metricDisplayName\":\"display - revenue\",\"metricDescription\":\"the revenue\"}],\"dimension\":[{\"dimensionName\":\"category\",\"dimensionDisplayName\":\"display - category\"},{\"dimensionName\":\"city\",\"dimensionDisplayName\":\"display - city\"}],\"dataStartFrom\":\"2019-10-01T00:00:00Z\",\"dataSourceType\":\"SqlServer\",\"timestampColumn\":\"Timestamp\",\"startOffsetInSeconds\":-1,\"maxQueryPerMinute\":30.0,\"granularityName\":\"Daily\",\"granularityAmount\":null,\"allUpIdentification\":null,\"needRollup\":\"NoRollup\",\"fillMissingPointType\":\"SmartFilling\",\"fillMissingPointValue\":0.0,\"rollUpMethod\":\"None\",\"rollUpColumns\":[],\"dataFeedDescription\":\"my - first data feed\",\"stopRetryAfterInSeconds\":-1,\"minRetryIntervalInSeconds\":-1,\"maxConcurrency\":0,\"viewMode\":\"Private\",\"admins\":[\"yournamehere@microsoft.com\",\"f850650c-1fcf-4489-b46f-71af2e30d360\"],\"viewers\":[\"viewers\"],\"creator\":\"f850650c-1fcf-4489-b46f-71af2e30d360\",\"status\":\"Active\",\"createdTime\":\"2021-01-22T00:58:37Z\",\"isAdmin\":true,\"actionLinkTemplate\":\"action - link template\",\"dataSourceParameter\":{\"connectionString\":\"connectionstring\",\"query\":\"select\u202F*\u202Ffrom\u202Fadsample2\u202Fwhere\u202FTimestamp\u202F=\u202F@StartTime\"}}" + string: "{\"dataFeedId\":\"9c59ff87-b726-4c73-bd86-e5a6334ce6e6\",\"dataFeedName\"\ + :\"update\",\"metrics\":[{\"metricId\":\"387fd37f-bef5-4827-8d5b-9f92e75a3c0a\"\ + ,\"metricName\":\"cost\",\"metricDisplayName\":\"display cost\",\"metricDescription\"\ + :\"the cost\"},{\"metricId\":\"9a33e001-78e7-40de-bb76-9161c0a8d585\",\"metricName\"\ + :\"revenue\",\"metricDisplayName\":\"display revenue\",\"metricDescription\"\ + :\"the revenue\"}],\"dimension\":[{\"dimensionName\":\"category\",\"dimensionDisplayName\"\ + :\"display category\"},{\"dimensionName\":\"city\",\"dimensionDisplayName\"\ + :\"display city\"}],\"dataStartFrom\":\"2019-10-01T00:00:00Z\",\"dataSourceType\"\ + :\"SqlServer\",\"timestampColumn\":\"Timestamp\",\"startOffsetInSeconds\"\ + :0,\"maxQueryPerMinute\":30.0,\"granularityName\":\"Daily\",\"needRollup\"\ + :\"NoRollup\",\"fillMissingPointType\":\"SmartFilling\",\"fillMissingPointValue\"\ + :0.0,\"rollUpMethod\":\"None\",\"rollUpColumns\":[],\"dataFeedDescription\"\ + :\"\",\"stopRetryAfterInSeconds\":-1,\"minRetryIntervalInSeconds\":-1,\"maxConcurrency\"\ + :-1,\"viewMode\":\"Private\",\"admins\":[\"yournamehere@microsoft.com\",\"\ + f850650c-1fcf-4489-b46f-71af2e30d360\"],\"viewers\":[\"viewers\"],\"creator\"\ + :\"f850650c-1fcf-4489-b46f-71af2e30d360\",\"status\":\"Active\",\"createdTime\"\ + :\"2021-03-09T21:25:40Z\",\"isAdmin\":true,\"actionLinkTemplate\":\"\",\"\ + dataSourceParameter\":{\"connectionString\":\"connectionstring\",\"query\"\ + :\"select\u202F*\u202Ffrom\u202Fadsample2\u202Fwhere\u202FTimestamp\u202F\ + =\u202F@StartTime\"},\"authenticationType\":\"Basic\"}" headers: apim-request-id: - - 485ebd9c-87f5-401e-9a49-c343f3c48978 + - d9595acc-2d86-418c-8e76-555bcc716cd7 content-length: - - '1642' + - '1581' content-type: - application/json; charset=utf-8 date: - - Fri, 22 Jan 2021 00:58:38 GMT + - Tue, 09 Mar 2021 21:25:40 GMT strict-transport-security: - max-age=31536000; includeSubDomains; preload x-content-type-options: - nosniff x-envoy-upstream-service-time: - - '87' + - '79' x-request-id: - - 485ebd9c-87f5-401e-9a49-c343f3c48978 + - d9595acc-2d86-418c-8e76-555bcc716cd7 status: code: 200 message: OK @@ -190,27 +214,27 @@ interactions: Content-Length: - '0' User-Agent: - - azsdk-python-ai-metricsadvisor/1.0.0b3 Python/3.8.6 (Windows-10-10.0.19041-SP0) + - azsdk-python-ai-metricsadvisor/1.0.0b4 Python/3.9.0 (Windows-10-10.0.19041-SP0) method: DELETE - uri: https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/ba39c709-ae26-4d83-812d-2a077187313f + uri: https://js-metrics-advisor.cognitiveservices.azure.com/metricsadvisor/v1.0/dataFeeds/9c59ff87-b726-4c73-bd86-e5a6334ce6e6 response: body: string: '' headers: apim-request-id: - - 921373a3-a52b-4d43-8056-6fad280cfdfe + - 82bf55cc-2cc8-4d97-9bdd-61e0f9d09f0c content-length: - '0' date: - - Fri, 22 Jan 2021 00:58:38 GMT + - Tue, 09 Mar 2021 21:25:41 GMT strict-transport-security: - max-age=31536000; includeSubDomains; preload x-content-type-options: - nosniff x-envoy-upstream-service-time: - - '292' + - '293' x-request-id: - - 921373a3-a52b-4d43-8056-6fad280cfdfe + - 82bf55cc-2cc8-4d97-9bdd-61e0f9d09f0c status: code: 204 message: No Content 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 95acaed5a1a7..132a34ea78a7 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_data_feeds.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_data_feeds.py @@ -991,17 +991,13 @@ def test_update_data_feed_by_reseting_properties(self): data_feed.id, name="update", data_feed_description=None, - timestamp_column=None, ingestion_start_offset=None, data_source_request_concurrency=None, ingestion_retry_delay=None, stop_retry_after=None, rollup_type=None, rollup_method=None, - rollup_identification_value=None, - auto_rollup_group_by_column_names=None, fill_type=None, - custom_fill_value=None, access_mode=None, viewer_emails=None, status=None, @@ -1009,24 +1005,20 @@ def test_update_data_feed_by_reseting_properties(self): ) 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 + self.assertEqual(updated.options.data_feed_description, "") self.assertEqual(updated.ingestion_settings.ingestion_begin_time, datetime.datetime(2019, 10, 1, tzinfo=tzutc())) - self.assertEqual(updated.ingestion_settings.ingestion_start_offset, -1) - self.assertEqual(updated.ingestion_settings.data_source_request_concurrency, 0) + self.assertEqual(updated.ingestion_settings.ingestion_start_offset, 0) + self.assertEqual(updated.ingestion_settings.data_source_request_concurrency, -1) self.assertEqual(updated.ingestion_settings.ingestion_retry_delay, -1) self.assertEqual(updated.ingestion_settings.stop_retry_after, -1) self.assertEqual(updated.options.rollup_settings.rollup_type, "NoRollup") self.assertEqual(updated.options.rollup_settings.rollup_method, "None") - self.assertEqual(updated.options.rollup_settings.rollup_identification_value, None) - self.assertEqual(updated.options.rollup_settings.auto_rollup_group_by_column_names, []) self.assertEqual(updated.options.missing_data_point_fill_settings.fill_type, "SmartFilling") - self.assertEqual(updated.options.missing_data_point_fill_settings.custom_fill_value, 0) self.assertEqual(updated.options.access_mode, "Private") - # self.assertEqual(updated.options.viewer_emails, ["viewers"]) # doesn't currently clear + self.assertEqual(updated.options.viewer_emails, ["viewers"]) self.assertEqual(updated.status, "Active") - # self.assertEqual(updated.options.action_link_template, "updated") # doesn't currently clear + self.assertEqual(updated.options.action_link_template, "") finally: self.admin_client.delete_data_feed(data_feed.id) 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 5dbd28d0a405..a48367b52fcb 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 @@ -991,17 +991,13 @@ def test_update_data_feed_by_reseting_properties(self): data_feed.id, name="update", data_feed_description=None, - timestamp_column=None, ingestion_start_offset=None, data_source_request_concurrency=None, ingestion_retry_delay=None, stop_retry_after=None, rollup_type=None, rollup_method=None, - rollup_identification_value=None, - auto_rollup_group_by_column_names=None, fill_type=None, - custom_fill_value=None, access_mode=None, viewer_emails=None, status=None, @@ -1009,24 +1005,20 @@ def test_update_data_feed_by_reseting_properties(self): ) 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 + self.assertEqual(updated.options.data_feed_description, "") self.assertEqual(updated.ingestion_settings.ingestion_begin_time, datetime.datetime(2019, 10, 1, tzinfo=tzutc())) - self.assertEqual(updated.ingestion_settings.ingestion_start_offset, -1) - self.assertEqual(updated.ingestion_settings.data_source_request_concurrency, 0) + self.assertEqual(updated.ingestion_settings.ingestion_start_offset, 0) + self.assertEqual(updated.ingestion_settings.data_source_request_concurrency, -1) self.assertEqual(updated.ingestion_settings.ingestion_retry_delay, -1) self.assertEqual(updated.ingestion_settings.stop_retry_after, -1) self.assertEqual(updated.options.rollup_settings.rollup_type, "NoRollup") self.assertEqual(updated.options.rollup_settings.rollup_method, "None") - self.assertEqual(updated.options.rollup_settings.rollup_identification_value, None) - self.assertEqual(updated.options.rollup_settings.auto_rollup_group_by_column_names, []) self.assertEqual(updated.options.missing_data_point_fill_settings.fill_type, "SmartFilling") - self.assertEqual(updated.options.missing_data_point_fill_settings.custom_fill_value, 0) self.assertEqual(updated.options.access_mode, "Private") - # self.assertEqual(updated.options.viewer_emails, ["viewers"]) # doesn't currently clear + self.assertEqual(updated.options.viewer_emails, ["viewers"]) self.assertEqual(updated.status, "Active") - # self.assertEqual(updated.options.action_link_template, "updated") # doesn't currently clear + self.assertEqual(updated.options.action_link_template, "") finally: self.admin_client.delete_data_feed(data_feed.id)