Skip to content

Commit aa29c1c

Browse files
xiangyan99xiangyan99
authored
update custom_granularity_value to be more than 300 (Azure#19215)
1 parent 1df1fc9 commit aa29c1c

8 files changed

+14
-14
lines changed

‎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‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ interactions:
5656
cost\",\"metricDescription\":\"the cost\"},{\"metricId\":\"53aaa995-55a2-439e-8aca-2b4c38b6a514\",\"metricName\":\"revenue\",\"metricDisplayName\":\"display
5757
revenue\",\"metricDescription\":\"the revenue\"}],\"dimension\":[{\"dimensionName\":\"category\",\"dimensionDisplayName\":\"display
5858
category\"},{\"dimensionName\":\"city\",\"dimensionDisplayName\":\"display
59-
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
59+
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
6060
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
6161
link template\",\"dataSourceParameter\":{\"query\":\"select\u202F*\u202Ffrom\u202Fadsample2\u202Fwhere\u202FTimestamp\u202F=\u202F@StartTime\"},\"authenticationType\":\"Basic\"}"
6262
headers:

‎sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/recordings/test_data_feeds_async.test_create_data_feed_from_sql_server_with_custom_values.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ interactions:
5656
cost\",\"metricDescription\":\"the cost\"},{\"metricId\":\"95271cfb-95f5-4021-bf67-12918ef66671\",\"metricName\":\"revenue\",\"metricDisplayName\":\"display
5757
revenue\",\"metricDescription\":\"the revenue\"}],\"dimension\":[{\"dimensionName\":\"category\",\"dimensionDisplayName\":\"display
5858
category\"},{\"dimensionName\":\"city\",\"dimensionDisplayName\":\"display
59-
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
59+
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
6060
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
6161
link template\",\"dataSourceParameter\":{\"query\":\"select\u202F*\u202Ffrom\u202Fadsample2\u202Fwhere\u202FTimestamp\u202F=\u202F@StartTime\"},\"authenticationType\":\"Basic\"}"
6262
headers:

‎sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_data_feeds_aad_async.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ async def test_create_data_feed_from_sql_server_with_custom_values(self):
166166
),
167167
granularity=DataFeedGranularity(
168168
granularity_type="Custom",
169-
custom_granularity_value=20
169+
custom_granularity_value=400
170170
),
171171
schema=DataFeedSchema(
172172
metrics=[
@@ -207,7 +207,7 @@ async def test_create_data_feed_from_sql_server_with_custom_values(self):
207207
self.assertEqual(data_feed.source.data_source_type, "SqlServer")
208208
self.assertIsNotNone(data_feed.source.query)
209209
self.assertEqual(data_feed.granularity.granularity_type, "Custom")
210-
self.assertEqual(data_feed.granularity.custom_granularity_value, 20)
210+
self.assertEqual(data_feed.granularity.custom_granularity_value, 400)
211211
self.assertEqual(data_feed.schema.metrics[0].name, "cost")
212212
self.assertEqual(data_feed.schema.metrics[1].name, "revenue")
213213
self.assertEqual(data_feed.schema.metrics[0].display_name, "display cost")

‎sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_data_feeds_async.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,7 @@ async def test_create_data_feed_from_sql_server_with_custom_values(self):
166166
),
167167
granularity=DataFeedGranularity(
168168
granularity_type="Custom",
169-
custom_granularity_value=20
169+
custom_granularity_value=400
170170
),
171171
schema=DataFeedSchema(
172172
metrics=[
@@ -207,7 +207,7 @@ async def test_create_data_feed_from_sql_server_with_custom_values(self):
207207
self.assertEqual(data_feed.source.data_source_type, "SqlServer")
208208
self.assertIsNotNone(data_feed.source.query)
209209
self.assertEqual(data_feed.granularity.granularity_type, "Custom")
210-
self.assertEqual(data_feed.granularity.custom_granularity_value, 20)
210+
self.assertEqual(data_feed.granularity.custom_granularity_value, 400)
211211
self.assertEqual(data_feed.schema.metrics[0].name, "cost")
212212
self.assertEqual(data_feed.schema.metrics[1].name, "revenue")
213213
self.assertEqual(data_feed.schema.metrics[0].display_name, "display cost")

‎sdk/metricsadvisor/azure-ai-metricsadvisor/tests/recordings/test_data_feeds.test_create_data_feed_from_sql_server_with_custom_values.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
interactions:
22
- request:
33
body: '{"dataSourceType": "SqlServer", "dataFeedName": "testfeed29701d89", "dataFeedDescription":
4-
"my first data feed", "granularityName": "Custom", "granularityAmount": 20,
4+
"my first data feed", "granularityName": "Custom", "granularityAmount": 400,
55
"metrics": [{"metricName": "cost", "metricDisplayName": "display cost", "metricDescription":
66
"the cost"}, {"metricName": "revenue", "metricDisplayName": "display revenue",
77
"metricDescription": "the revenue"}], "dimension": [{"dimensionName": "category",
@@ -70,7 +70,7 @@ interactions:
7070
cost\",\"metricDescription\":\"the cost\"},{\"metricId\":\"f1e15ba1-bf52-4dc4-8e7e-a3ecaebbbcff\",\"metricName\":\"revenue\",\"metricDisplayName\":\"display
7171
revenue\",\"metricDescription\":\"the revenue\"}],\"dimension\":[{\"dimensionName\":\"category\",\"dimensionDisplayName\":\"display
7272
category\"},{\"dimensionName\":\"city\",\"dimensionDisplayName\":\"display
73-
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
73+
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
7474
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
7575
link template\",\"dataSourceParameter\":{\"query\":\"select\u202F*\u202Ffrom\u202Fadsample2\u202Fwhere\u202FTimestamp\u202F=\u202F@StartTime\"},\"authenticationType\":\"Basic\"}"
7676
headers:

‎sdk/metricsadvisor/azure-ai-metricsadvisor/tests/recordings/test_data_feeds_aad.test_create_data_feed_from_sql_server_with_custom_values.yaml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
interactions:
22
- request:
33
body: '{"dataSourceType": "SqlServer", "dataFeedName": "testfeed9c521f0e", "dataFeedDescription":
4-
"my first data feed", "granularityName": "Custom", "granularityAmount": 20,
4+
"my first data feed", "granularityName": "Custom", "granularityAmount": 400,
55
"metrics": [{"metricName": "cost", "metricDisplayName": "display cost", "metricDescription":
66
"the cost"}, {"metricName": "revenue", "metricDisplayName": "display revenue",
77
"metricDescription": "the revenue"}], "dimension": [{"dimensionName": "category",
@@ -70,7 +70,7 @@ interactions:
7070
cost\",\"metricDescription\":\"the cost\"},{\"metricId\":\"283cb875-4595-4055-9ecd-83d32e5f928f\",\"metricName\":\"revenue\",\"metricDisplayName\":\"display
7171
revenue\",\"metricDescription\":\"the revenue\"}],\"dimension\":[{\"dimensionName\":\"category\",\"dimensionDisplayName\":\"display
7272
category\"},{\"dimensionName\":\"city\",\"dimensionDisplayName\":\"display
73-
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
73+
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
7474
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
7575
link template\",\"dataSourceParameter\":{\"query\":\"select\u202F*\u202Ffrom\u202Fadsample2\u202Fwhere\u202FTimestamp\u202F=\u202F@StartTime\"},\"authenticationType\":\"Basic\"}"
7676
headers:

‎sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_data_feeds.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ def test_create_data_feed_from_sql_server_with_custom_values(self):
160160
),
161161
granularity=DataFeedGranularity(
162162
granularity_type="Custom",
163-
custom_granularity_value=20
163+
custom_granularity_value=400
164164
),
165165
schema=DataFeedSchema(
166166
metrics=[
@@ -201,7 +201,7 @@ def test_create_data_feed_from_sql_server_with_custom_values(self):
201201
self.assertEqual(data_feed.source.data_source_type, "SqlServer")
202202
self.assertIsNotNone(data_feed.source.query)
203203
self.assertEqual(data_feed.granularity.granularity_type, "Custom")
204-
self.assertEqual(data_feed.granularity.custom_granularity_value, 20)
204+
self.assertEqual(data_feed.granularity.custom_granularity_value, 400)
205205
self.assertEqual(data_feed.schema.metrics[0].name, "cost")
206206
self.assertEqual(data_feed.schema.metrics[1].name, "revenue")
207207
self.assertEqual(data_feed.schema.metrics[0].display_name, "display cost")

‎sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_data_feeds_aad.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ def test_create_data_feed_from_sql_server_with_custom_values(self):
161161
),
162162
granularity=DataFeedGranularity(
163163
granularity_type="Custom",
164-
custom_granularity_value=20
164+
custom_granularity_value=400
165165
),
166166
schema=DataFeedSchema(
167167
metrics=[
@@ -202,7 +202,7 @@ def test_create_data_feed_from_sql_server_with_custom_values(self):
202202
self.assertEqual(data_feed.source.data_source_type, "SqlServer")
203203
self.assertIsNotNone(data_feed.source.query)
204204
self.assertEqual(data_feed.granularity.granularity_type, "Custom")
205-
self.assertEqual(data_feed.granularity.custom_granularity_value, 20)
205+
self.assertEqual(data_feed.granularity.custom_granularity_value, 400)
206206
self.assertEqual(data_feed.schema.metrics[0].name, "cost")
207207
self.assertEqual(data_feed.schema.metrics[1].name, "revenue")
208208
self.assertEqual(data_feed.schema.metrics[0].display_name, "display cost")

0 commit comments

Comments
 (0)