diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/recordings/test_data_feeds_aad_async.test_create_data_feed_from_sql_server_with_custom_values.yaml b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/recordings/test_data_feeds_aad_async.test_create_data_feed_from_sql_server_with_custom_values.yaml index 5e6fdf849d2e..5916a85033ee 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/recordings/test_data_feeds_aad_async.test_create_data_feed_from_sql_server_with_custom_values.yaml +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/recordings/test_data_feeds_aad_async.test_create_data_feed_from_sql_server_with_custom_values.yaml @@ -56,7 +56,7 @@ interactions: cost\",\"metricDescription\":\"the cost\"},{\"metricId\":\"53aaa995-55a2-439e-8aca-2b4c38b6a514\",\"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\":\"Custom\",\"granularityAmount\":20,\"allUpIdentification\":\"sumrollup\",\"needRollup\":\"AlreadyRollup\",\"fillMissingPointType\":\"CustomValue\",\"fillMissingPointValue\":10.0,\"rollUpMethod\":\"Sum\",\"dataFeedDescription\":\"my + city\"}],\"dataStartFrom\":\"2019-10-01T00:00:00Z\",\"dataSourceType\":\"SqlServer\",\"timestampColumn\":\"Timestamp\",\"startOffsetInSeconds\":-1,\"maxQueryPerMinute\":30.0,\"granularityName\":\"Custom\",\"granularityAmount\":400,\"allUpIdentification\":\"sumrollup\",\"needRollup\":\"AlreadyRollup\",\"fillMissingPointType\":\"CustomValue\",\"fillMissingPointValue\":10.0,\"rollUpMethod\":\"Sum\",\"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-05-21T21:18:51Z\",\"isAdmin\":true,\"actionLinkTemplate\":\"action link template\",\"dataSourceParameter\":{\"query\":\"select\u202F*\u202Ffrom\u202Fadsample2\u202Fwhere\u202FTimestamp\u202F=\u202F@StartTime\"},\"authenticationType\":\"Basic\"}" headers: diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/recordings/test_data_feeds_async.test_create_data_feed_from_sql_server_with_custom_values.yaml b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/recordings/test_data_feeds_async.test_create_data_feed_from_sql_server_with_custom_values.yaml index 2260a40476da..4b3f22fce0fc 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/recordings/test_data_feeds_async.test_create_data_feed_from_sql_server_with_custom_values.yaml +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/recordings/test_data_feeds_async.test_create_data_feed_from_sql_server_with_custom_values.yaml @@ -56,7 +56,7 @@ interactions: cost\",\"metricDescription\":\"the cost\"},{\"metricId\":\"95271cfb-95f5-4021-bf67-12918ef66671\",\"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\":\"Custom\",\"granularityAmount\":20,\"allUpIdentification\":\"sumrollup\",\"needRollup\":\"AlreadyRollup\",\"fillMissingPointType\":\"CustomValue\",\"fillMissingPointValue\":10.0,\"rollUpMethod\":\"Sum\",\"dataFeedDescription\":\"my + city\"}],\"dataStartFrom\":\"2019-10-01T00:00:00Z\",\"dataSourceType\":\"SqlServer\",\"timestampColumn\":\"Timestamp\",\"startOffsetInSeconds\":-1,\"maxQueryPerMinute\":30.0,\"granularityName\":\"Custom\",\"granularityAmount\":400,\"allUpIdentification\":\"sumrollup\",\"needRollup\":\"AlreadyRollup\",\"fillMissingPointType\":\"CustomValue\",\"fillMissingPointValue\":10.0,\"rollUpMethod\":\"Sum\",\"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-05-21T21:20:55Z\",\"isAdmin\":true,\"actionLinkTemplate\":\"action link template\",\"dataSourceParameter\":{\"query\":\"select\u202F*\u202Ffrom\u202Fadsample2\u202Fwhere\u202FTimestamp\u202F=\u202F@StartTime\"},\"authenticationType\":\"Basic\"}" headers: 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 c881debcdd66..c59b361b6a65 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 @@ -166,7 +166,7 @@ async def test_create_data_feed_from_sql_server_with_custom_values(self): ), granularity=DataFeedGranularity( granularity_type="Custom", - custom_granularity_value=20 + custom_granularity_value=400 ), schema=DataFeedSchema( metrics=[ @@ -207,7 +207,7 @@ async def test_create_data_feed_from_sql_server_with_custom_values(self): self.assertEqual(data_feed.source.data_source_type, "SqlServer") self.assertIsNotNone(data_feed.source.query) self.assertEqual(data_feed.granularity.granularity_type, "Custom") - self.assertEqual(data_feed.granularity.custom_granularity_value, 20) + self.assertEqual(data_feed.granularity.custom_granularity_value, 400) self.assertEqual(data_feed.schema.metrics[0].name, "cost") self.assertEqual(data_feed.schema.metrics[1].name, "revenue") self.assertEqual(data_feed.schema.metrics[0].display_name, "display cost") 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 7c24e7387956..6f398521c7e4 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 @@ -166,7 +166,7 @@ async def test_create_data_feed_from_sql_server_with_custom_values(self): ), granularity=DataFeedGranularity( granularity_type="Custom", - custom_granularity_value=20 + custom_granularity_value=400 ), schema=DataFeedSchema( metrics=[ @@ -207,7 +207,7 @@ async def test_create_data_feed_from_sql_server_with_custom_values(self): self.assertEqual(data_feed.source.data_source_type, "SqlServer") self.assertIsNotNone(data_feed.source.query) self.assertEqual(data_feed.granularity.granularity_type, "Custom") - self.assertEqual(data_feed.granularity.custom_granularity_value, 20) + self.assertEqual(data_feed.granularity.custom_granularity_value, 400) self.assertEqual(data_feed.schema.metrics[0].name, "cost") self.assertEqual(data_feed.schema.metrics[1].name, "revenue") self.assertEqual(data_feed.schema.metrics[0].display_name, "display cost") diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/recordings/test_data_feeds.test_create_data_feed_from_sql_server_with_custom_values.yaml b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/recordings/test_data_feeds.test_create_data_feed_from_sql_server_with_custom_values.yaml index 836bb9797871..440c260d1c9c 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/recordings/test_data_feeds.test_create_data_feed_from_sql_server_with_custom_values.yaml +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/recordings/test_data_feeds.test_create_data_feed_from_sql_server_with_custom_values.yaml @@ -1,7 +1,7 @@ interactions: - request: body: '{"dataSourceType": "SqlServer", "dataFeedName": "testfeed29701d89", "dataFeedDescription": - "my first data feed", "granularityName": "Custom", "granularityAmount": 20, + "my first data feed", "granularityName": "Custom", "granularityAmount": 400, "metrics": [{"metricName": "cost", "metricDisplayName": "display cost", "metricDescription": "the cost"}, {"metricName": "revenue", "metricDisplayName": "display revenue", "metricDescription": "the revenue"}], "dimension": [{"dimensionName": "category", @@ -70,7 +70,7 @@ interactions: cost\",\"metricDescription\":\"the cost\"},{\"metricId\":\"f1e15ba1-bf52-4dc4-8e7e-a3ecaebbbcff\",\"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\":\"Custom\",\"granularityAmount\":20,\"allUpIdentification\":\"sumrollup\",\"needRollup\":\"AlreadyRollup\",\"fillMissingPointType\":\"CustomValue\",\"fillMissingPointValue\":10.0,\"rollUpMethod\":\"Sum\",\"dataFeedDescription\":\"my + city\"}],\"dataStartFrom\":\"2019-10-01T00:00:00Z\",\"dataSourceType\":\"SqlServer\",\"timestampColumn\":\"Timestamp\",\"startOffsetInSeconds\":-1,\"maxQueryPerMinute\":30.0,\"granularityName\":\"Custom\",\"granularityAmount\":400,\"allUpIdentification\":\"sumrollup\",\"needRollup\":\"AlreadyRollup\",\"fillMissingPointType\":\"CustomValue\",\"fillMissingPointValue\":10.0,\"rollUpMethod\":\"Sum\",\"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-05-21T19:46:38Z\",\"isAdmin\":true,\"actionLinkTemplate\":\"action link template\",\"dataSourceParameter\":{\"query\":\"select\u202F*\u202Ffrom\u202Fadsample2\u202Fwhere\u202FTimestamp\u202F=\u202F@StartTime\"},\"authenticationType\":\"Basic\"}" headers: diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/recordings/test_data_feeds_aad.test_create_data_feed_from_sql_server_with_custom_values.yaml b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/recordings/test_data_feeds_aad.test_create_data_feed_from_sql_server_with_custom_values.yaml index d4728eccae35..2828c31d505a 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/recordings/test_data_feeds_aad.test_create_data_feed_from_sql_server_with_custom_values.yaml +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/recordings/test_data_feeds_aad.test_create_data_feed_from_sql_server_with_custom_values.yaml @@ -1,7 +1,7 @@ interactions: - request: body: '{"dataSourceType": "SqlServer", "dataFeedName": "testfeed9c521f0e", "dataFeedDescription": - "my first data feed", "granularityName": "Custom", "granularityAmount": 20, + "my first data feed", "granularityName": "Custom", "granularityAmount": 400, "metrics": [{"metricName": "cost", "metricDisplayName": "display cost", "metricDescription": "the cost"}, {"metricName": "revenue", "metricDisplayName": "display revenue", "metricDescription": "the revenue"}], "dimension": [{"dimensionName": "category", @@ -70,7 +70,7 @@ interactions: cost\",\"metricDescription\":\"the cost\"},{\"metricId\":\"283cb875-4595-4055-9ecd-83d32e5f928f\",\"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\":\"Custom\",\"granularityAmount\":20,\"allUpIdentification\":\"sumrollup\",\"needRollup\":\"AlreadyRollup\",\"fillMissingPointType\":\"CustomValue\",\"fillMissingPointValue\":10.0,\"rollUpMethod\":\"Sum\",\"dataFeedDescription\":\"my + city\"}],\"dataStartFrom\":\"2019-10-01T00:00:00Z\",\"dataSourceType\":\"SqlServer\",\"timestampColumn\":\"Timestamp\",\"startOffsetInSeconds\":-1,\"maxQueryPerMinute\":30.0,\"granularityName\":\"Custom\",\"granularityAmount\":400,\"allUpIdentification\":\"sumrollup\",\"needRollup\":\"AlreadyRollup\",\"fillMissingPointType\":\"CustomValue\",\"fillMissingPointValue\":10.0,\"rollUpMethod\":\"Sum\",\"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-05-21T19:56:40Z\",\"isAdmin\":true,\"actionLinkTemplate\":\"action link template\",\"dataSourceParameter\":{\"query\":\"select\u202F*\u202Ffrom\u202Fadsample2\u202Fwhere\u202FTimestamp\u202F=\u202F@StartTime\"},\"authenticationType\":\"Basic\"}" headers: 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 31d1c5c07b2a..ebfc1f4a31af 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_data_feeds.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_data_feeds.py @@ -160,7 +160,7 @@ def test_create_data_feed_from_sql_server_with_custom_values(self): ), granularity=DataFeedGranularity( granularity_type="Custom", - custom_granularity_value=20 + custom_granularity_value=400 ), schema=DataFeedSchema( metrics=[ @@ -201,7 +201,7 @@ def test_create_data_feed_from_sql_server_with_custom_values(self): self.assertEqual(data_feed.source.data_source_type, "SqlServer") self.assertIsNotNone(data_feed.source.query) self.assertEqual(data_feed.granularity.granularity_type, "Custom") - self.assertEqual(data_feed.granularity.custom_granularity_value, 20) + self.assertEqual(data_feed.granularity.custom_granularity_value, 400) self.assertEqual(data_feed.schema.metrics[0].name, "cost") self.assertEqual(data_feed.schema.metrics[1].name, "revenue") self.assertEqual(data_feed.schema.metrics[0].display_name, "display cost") 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 09bed2116835..d365299e628c 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 @@ -161,7 +161,7 @@ def test_create_data_feed_from_sql_server_with_custom_values(self): ), granularity=DataFeedGranularity( granularity_type="Custom", - custom_granularity_value=20 + custom_granularity_value=400 ), schema=DataFeedSchema( metrics=[ @@ -202,7 +202,7 @@ def test_create_data_feed_from_sql_server_with_custom_values(self): self.assertEqual(data_feed.source.data_source_type, "SqlServer") self.assertIsNotNone(data_feed.source.query) self.assertEqual(data_feed.granularity.granularity_type, "Custom") - self.assertEqual(data_feed.granularity.custom_granularity_value, 20) + self.assertEqual(data_feed.granularity.custom_granularity_value, 400) self.assertEqual(data_feed.schema.metrics[0].name, "cost") self.assertEqual(data_feed.schema.metrics[1].name, "revenue") self.assertEqual(data_feed.schema.metrics[0].display_name, "display cost")