diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/CHANGELOG.md b/sdk/metricsadvisor/azure-ai-metricsadvisor/CHANGELOG.md index ead67dca3cfd..a5a41e06b295 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/CHANGELOG.md +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/CHANGELOG.md @@ -10,6 +10,9 @@ - `AnomalyAlert.created_on` -> `AnomalyAlert.created_time` - `AnomalyAlert.modified_on` -> `AnomalyAlert.modified_time` - `Anomaly.created_on` -> `Anomaly.created_time` + - `admin_emails` has been renamed to `admins` in `NotificationHook` + - `admin_emails` has been renamed to `admins` in `DataFeedOptions` + - `viewer_emails` has been renamed to `viewers` in `DataFeedOptions` ## 1.0.0b4 (2021-06-07) diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_helpers.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_helpers.py index fe3447cfcc7b..787cce70033c 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_helpers.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_helpers.py @@ -108,11 +108,11 @@ def convert_to_generated_data_feed_type( granularity, schema, ingestion_settings, - admin_emails=None, + admins=None, data_feed_description=None, missing_data_point_fill_settings=None, rollup_settings=None, - viewer_emails=None, + viewers=None, access_mode=None, action_link_template=None ): @@ -135,7 +135,7 @@ def convert_to_generated_data_feed_type( :type schema: ~azure.ai.metricsadvisor.models.DataFeedSchema :param ingestion_settings: The data feed ingestions settings :type ingestion_settings: ~azure.ai.metricsadvisor.models.DataFeedIngestionSettings - :param list[str] admin_emails: Data feed administrator emails. + :param list[str] admins: Data feed administrators. :param str data_feed_description: Data feed description. :param missing_data_point_fill_settings: The fill missing point type and value. :type missing_data_point_fill_settings: @@ -143,7 +143,7 @@ def convert_to_generated_data_feed_type( :param rollup_settings: The rollup settings. :type rollup_settings: ~azure.ai.metricsadvisor.models.DataFeedRollupSettings - :param list[str] viewer_emails: Data feed viewer emails. + :param list[str] viewers: Data feed viewers. :param access_mode: Data feed access mode. Possible values include: "Private", "Public". Default value: "Private". :type access_mode: str or ~azure.ai.metricsadvisor.models.DataFeedAccessMode @@ -197,9 +197,9 @@ def convert_to_generated_data_feed_type( if missing_data_point_fill_settings else None, fill_missing_point_value=missing_data_point_fill_settings.custom_fill_value if missing_data_point_fill_settings else None, - viewers=viewer_emails, + viewers=viewers, view_mode=access_mode, - admins=admin_emails, + admins=admins, action_link_template=action_link_template ) diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_metrics_advisor_administration_client.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_metrics_advisor_administration_client.py index 9259afb9cefc..f56697f41c9d 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_metrics_advisor_administration_client.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/_metrics_advisor_administration_client.py @@ -295,7 +295,7 @@ def create_data_feed( :param ingestion_settings: The data feed ingestions settings. Can be passed as a datetime to use for the ingestion begin time or as a DataFeedIngestionSettings object if additional configuration is needed. :type ingestion_settings: Union[~datetime.datetime, ~azure.ai.metricsadvisor.models.DataFeedIngestionSettings] - :keyword list[str] admin_emails: Data feed administrator emails. + :keyword list[str] admins: Data feed administrators. :keyword str data_feed_description: Data feed description. :keyword missing_data_point_fill_settings: The fill missing point type and value. :paramtype missing_data_point_fill_settings: @@ -303,7 +303,7 @@ def create_data_feed( :keyword rollup_settings: The rollup settings. :paramtype rollup_settings: ~azure.ai.metricsadvisor.models.DataFeedRollupSettings - :keyword list[str] viewer_emails: Data feed viewer emails. + :keyword list[str] viewers: Data feed viewers. :keyword access_mode: Data feed access mode. Possible values include: "Private", "Public". Default value: "Private". :paramtype access_mode: str or ~azure.ai.metricsadvisor.models.DataFeedAccessMode @@ -322,11 +322,11 @@ def create_data_feed( :caption: Create a data feed """ - admin_emails = kwargs.pop('admin_emails', None) + admins = kwargs.pop('admins', None) data_feed_description = kwargs.pop('data_feed_description', None) missing_data_point_fill_settings = kwargs.pop('missing_data_point_fill_settings', None) rollup_settings = kwargs.pop('rollup_settings', None) - viewer_emails = kwargs.pop('viewer_emails', None) + viewers = kwargs.pop('viewers', None) access_mode = kwargs.pop('access_mode', "Private") action_link_template = kwargs.pop('action_link_template', None) data_feed_type = DATA_FEED[source.data_source_type] @@ -337,11 +337,11 @@ def create_data_feed( granularity=granularity, schema=schema, ingestion_settings=ingestion_settings, - admin_emails=admin_emails, + admins=admins, data_feed_description=data_feed_description, missing_data_point_fill_settings=missing_data_point_fill_settings, rollup_settings=rollup_settings, - viewer_emails=viewer_emails, + viewers=viewers, access_mode=access_mode, action_link_template=action_link_template ) @@ -762,9 +762,9 @@ def update_data_feed( :paramtype fill_type: str or ~azure.ai.metricsadvisor.models.DatasourceMissingDataPointFillType :keyword float custom_fill_value: The value of fill missing point for anomaly detection if "CustomValue" fill type is specified. - :keyword list[str] admin_emails: Data feed administrator emails. + :keyword list[str] admins: Data feed administrators. :keyword str data_feed_description: Data feed description. - :keyword list[str] viewer_emails: Data feed viewer emails. + :keyword list[str] viewers: Data feed viewers. :keyword access_mode: Data feed access mode. Possible values include: "Private", "Public". Default value: "Private". :paramtype access_mode: str or ~azure.ai.metricsadvisor.models.DataFeedAccessMode @@ -806,8 +806,8 @@ def update_data_feed( update_kwargs["fillMissingPointType"] = kwargs.pop("fill_type", unset) update_kwargs["fillMissingPointValue"] = kwargs.pop("custom_fill_value", unset) update_kwargs["viewMode"] = kwargs.pop("access_mode", unset) - update_kwargs["admins"] = kwargs.pop("admin_emails", unset) - update_kwargs["viewers"] = kwargs.pop("viewer_emails", unset) + update_kwargs["admins"] = kwargs.pop("admins", unset) + update_kwargs["viewers"] = kwargs.pop("viewers", unset) update_kwargs["status"] = kwargs.pop("status", unset) update_kwargs["actionLinkTemplate"] = kwargs.pop("action_link_template", unset) update_kwargs["dataSourceParameter"] = kwargs.pop("source", unset) diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/aio/_metrics_advisor_administration_client_async.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/aio/_metrics_advisor_administration_client_async.py index f8e3029ff792..ed9c68ea0284 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/aio/_metrics_advisor_administration_client_async.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/aio/_metrics_advisor_administration_client_async.py @@ -194,7 +194,7 @@ async def create_data_feed( :param ingestion_settings: The data feed ingestions settings. Can be passed as a datetime to use for the ingestion begin time or as a DataFeedIngestionSettings object if additional configuration is needed. :type ingestion_settings: Union[~datetime.datetime, ~azure.ai.metricsadvisor.models.DataFeedIngestionSettings] - :keyword list[str] admin_emails: Data feed administrator emails. + :keyword list[str] admins: Data feed administrators. :keyword str data_feed_description: Data feed description. :keyword missing_data_point_fill_settings: The fill missing point type and value. :paramtype missing_data_point_fill_settings: @@ -202,7 +202,7 @@ async def create_data_feed( :keyword rollup_settings: The rollup settings. :paramtype rollup_settings: ~azure.ai.metricsadvisor.models.DataFeedRollupSettings - :keyword list[str] viewer_emails: Data feed viewer emails. + :keyword list[str] viewers: Data feed viewers. :keyword access_mode: Data feed access mode. Possible values include: "Private", "Public". Default value: "Private". :paramtype access_mode: str or ~azure.ai.metricsadvisor.models.DataFeedAccessMode @@ -221,11 +221,11 @@ async def create_data_feed( :caption: Create a data feed """ - admin_emails = kwargs.pop('admin_emails', None) + admins = kwargs.pop('admins', None) data_feed_description = kwargs.pop('data_feed_description', None) missing_data_point_fill_settings = kwargs.pop('missing_data_point_fill_settings', None) rollup_settings = kwargs.pop('rollup_settings', None) - viewer_emails = kwargs.pop('viewer_emails', None) + viewers = kwargs.pop('viewers', None) access_mode = kwargs.pop('access_mode', "Private") action_link_template = kwargs.pop('action_link_template', None) data_feed_type = DATA_FEED[source.data_source_type] @@ -236,11 +236,11 @@ async def create_data_feed( granularity=granularity, schema=schema, ingestion_settings=ingestion_settings, - admin_emails=admin_emails, + admins=admins, data_feed_description=data_feed_description, missing_data_point_fill_settings=missing_data_point_fill_settings, rollup_settings=rollup_settings, - viewer_emails=viewer_emails, + viewers=viewers, access_mode=access_mode, action_link_template=action_link_template ) @@ -663,9 +663,9 @@ async def update_data_feed( :paramtype fill_type: str or ~azure.ai.metricsadvisor.models.DatasourceMissingDataPointFillType :keyword float custom_fill_value: The value of fill missing point for anomaly detection if "CustomValue" fill type is specified. - :keyword list[str] admin_emails: Data feed administrator emails. + :keyword list[str] admins: Data feed administrators. :keyword str data_feed_description: Data feed description. - :keyword list[str] viewer_emails: Data feed viewer emails. + :keyword list[str] viewers: Data feed viewers. :keyword access_mode: Data feed access mode. Possible values include: "Private", "Public". Default value: "Private". :paramtype access_mode: str or ~azure.ai.metricsadvisor.models.DataFeedAccessMode @@ -707,8 +707,8 @@ async def update_data_feed( update_kwargs["fillMissingPointType"] = kwargs.pop("fill_type", unset) update_kwargs["fillMissingPointValue"] = kwargs.pop("custom_fill_value", unset) update_kwargs["viewMode"] = kwargs.pop("access_mode", unset) - update_kwargs["admins"] = kwargs.pop("admin_emails", unset) - update_kwargs["viewers"] = kwargs.pop("viewer_emails", unset) + update_kwargs["admins"] = kwargs.pop("admins", unset) + update_kwargs["viewers"] = kwargs.pop("viewers", unset) update_kwargs["status"] = kwargs.pop("status", unset) update_kwargs["actionLinkTemplate"] = kwargs.pop("action_link_template", unset) update_kwargs["dataSourceParameter"] = kwargs.pop("source", unset) diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/models/_models.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/models/_models.py index 47a2fe7ffb62..bdf2b16399fe 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/models/_models.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/azure/ai/metricsadvisor/models/_models.py @@ -344,7 +344,7 @@ class DataFeed(object): # pylint:disable=too-many-instance-attributes :ivar status: Data feed status. Possible values include: "Active", "Paused". Default value: "Active". :vartype status: str or ~azure.ai.metricsadvisor.models.DataFeedStatus - :ivar list[str] admin_emails: Data feed administrator emails. + :ivar list[str] admins: Data feed administrators. :ivar str data_feed_description: Data feed description. :ivar missing_data_point_fill_settings: The fill missing point type and value. :vartype missing_data_point_fill_settings: @@ -352,7 +352,7 @@ class DataFeed(object): # pylint:disable=too-many-instance-attributes :ivar rollup_settings: The rollup settings. :vartype rollup_settings: ~azure.ai.metricsadvisor.models.DataFeedRollupSettings - :ivar list[str] viewer_emails: Data feed viewer emails. + :ivar list[str] viewers: Data feed viewers. :ivar access_mode: Data feed access mode. Possible values include: "Private", "Public". Default value: "Private". :vartype access_mode: str or ~azure.ai.metricsadvisor.models.DataFeedAccessMode @@ -377,19 +377,19 @@ def __init__( self.is_admin = kwargs.get('is_admin', None) self.metric_ids = kwargs.get('metric_ids', None) self.status = kwargs.get('status', None) - self.admin_emails = kwargs.get('admin_emails', None) + self.admins = kwargs.get('admins', None) self.data_feed_description = kwargs.get('data_feed_description', None) self.missing_data_point_fill_settings = kwargs.get('missing_data_point_fill_settings', None) self.rollup_settings = kwargs.get('rollup_settings', None) - self.viewer_emails = kwargs.get('viewer_emails', None) + self.viewers = kwargs.get('viewers', None) self.access_mode = kwargs.get('access_mode', "Private") self.action_link_template = kwargs.get('action_link_template', None) def __repr__(self): return "DataFeed(created_time={}, granularity={}, id={}, ingestion_settings={}, is_admin={}, " \ - "metric_ids={}, name={}, schema={}, source={}, status={}, admin_emails={}, " \ + "metric_ids={}, name={}, schema={}, source={}, status={}, admins={}, " \ "data_feed_description={}, missing_data_point_fill_settings={}, " \ - "rollup_settings={}, viewer_emails={}, access_mode={}, action_link_template={})".format( + "rollup_settings={}, viewers={}, access_mode={}, action_link_template={})".format( self.created_time, repr(self.granularity), self.id, @@ -400,11 +400,11 @@ def __repr__(self): repr(self.schema), repr(self.source), self.status, - self.admin_emails, + self.admins, self.data_feed_description, repr(self.missing_data_point_fill_settings), repr(self.rollup_settings), - self.viewer_emails, + self.viewers, self.access_mode, self.action_link_template )[:1024] @@ -425,7 +425,7 @@ def _from_generated(cls, data_feed): is_admin=data_feed.is_admin, metric_ids={metric.metric_name: metric.metric_id for metric in data_feed.metrics}, name=data_feed.data_feed_name, - admin_emails=data_feed.admins, + admins=data_feed.admins, data_feed_description=data_feed.data_feed_description, missing_data_point_fill_settings=DataFeedMissingDataPointFillSettings( fill_type=data_feed.fill_missing_point_type, @@ -437,7 +437,7 @@ def _from_generated(cls, data_feed): auto_rollup_group_by_column_names=data_feed.roll_up_columns, rollup_method=data_feed.roll_up_method ), - viewer_emails=data_feed.viewers, + viewers=data_feed.viewers, access_mode=data_feed.view_mode, action_link_template=data_feed.action_link_template, schema=DataFeedSchema( @@ -495,11 +495,11 @@ def _to_generated_patch(self, data_source_feed_type, kwargs): or self.missing_data_point_fill_settings.custom_fill_value if self.missing_data_point_fill_settings else None, viewers=kwargs.pop("viewers", None) - or self.viewer_emails, + or self.viewers, view_mode=kwargs.pop("viewMode", None) or self.access_mode, admins=kwargs.pop("admins", None) - or self.admin_emails, + or self.admins, status=kwargs.pop("status", None) or self.status, action_link_template=kwargs.pop("actionLinkTemplate", None) or self.action_link_template, @@ -1892,7 +1892,7 @@ class NotificationHook(dict): :param str name: Hook unique name. :ivar str description: Hook description. :ivar str external_link: Hook external link. - :ivar list[str] admin_emails: Hook administrator emails. + :ivar list[str] admins: Hook administrators. :ivar str hook_type: Constant filled by server. Possible values include: "Webhook", "Email". :ivar str id: Hook unique id. @@ -1904,17 +1904,17 @@ def __init__(self, name, **kwargs): self.name = name self.description = kwargs.get('description', None) self.external_link = kwargs.get('external_link', None) - self.admin_emails = kwargs.get('admin_emails', None) + self.admins = kwargs.get('admins', None) self.hook_type = None def __repr__(self): - return "NotificationHook(id={}, name={}, description={}, external_link={}, admin_emails={}, " \ + return "NotificationHook(id={}, name={}, description={}, external_link={}, admins={}, " \ "hook_type={})".format( self.id, self.name, self.description, self.external_link, - self.admin_emails, + self.admins, self.hook_type )[:1024] @@ -1926,7 +1926,7 @@ class EmailNotificationHook(NotificationHook): :param list[str] emails_to_alert: Required. Email TO: list. :keyword str description: Hook description. :keyword str external_link: Hook external link. - :ivar list[str] admin_emails: Hook administrator emails. + :ivar list[str] admins: Hook administrators. :ivar str hook_type: Constant filled by server - "Email". :ivar str id: Hook unique id. """ @@ -1944,7 +1944,7 @@ def __repr__(self): self.name, self.description, self.external_link, - self.admin_emails, + self.admins, self.hook_type, self.emails_to_alert )[:1024] @@ -1956,7 +1956,7 @@ def _from_generated(cls, hook): name=hook.hook_name, description=hook.description, external_link=hook.external_link, - admin_emails=hook.admins, + admins=hook.admins, id=hook.hook_id ) @@ -1965,7 +1965,7 @@ def _to_generated(self): hook_name=self.name, description=self.description, external_link=self.external_link, - admins=self.admin_emails, + admins=self.admins, hook_parameter=_EmailHookParameterPatch( to_list=self.emails_to_alert ) @@ -1976,7 +1976,7 @@ def _to_generated_patch(self, name, description, external_link, emails_to_alert) hook_name=name or self.name, description=description or self.description, external_link=external_link or self.external_link, - admins=self.admin_emails, + admins=self.admins, hook_parameter=_EmailHookParameterPatch( to_list=emails_to_alert or self.emails_to_alert ) @@ -1995,7 +1995,7 @@ class WebNotificationHook(NotificationHook): :keyword str certificate_password: client certificate password. :keyword str description: Hook description. :keyword str external_link: Hook external link. - :ivar list[str] admin_emails: Hook administrator emails. + :ivar list[str] admins: Hook administrators. :ivar str hook_type: Constant filled by server - "Webhook". :ivar str id: Hook unique id. """ @@ -2011,13 +2011,13 @@ def __init__(self, name, endpoint, **kwargs): self.certificate_password = kwargs.get('certificate_password', None) def __repr__(self): - return "WebNotificationHook(id={}, name={}, description={}, external_link={}, admin_emails={}, hook_type={}, " \ + return "WebNotificationHook(id={}, name={}, description={}, external_link={}, admins={}, hook_type={}, " \ "endpoint={}, username={}, password={}, certificate_key={}, certificate_password={})".format( self.id, self.name, self.description, self.external_link, - self.admin_emails, + self.admins, self.hook_type, self.endpoint, self.username, @@ -2037,7 +2037,7 @@ def _from_generated(cls, hook): name=hook.hook_name, description=hook.description, external_link=hook.external_link, - admin_emails=hook.admins, + admins=hook.admins, id=hook.hook_id ) @@ -2046,7 +2046,7 @@ def _to_generated(self): hook_name=self.name, description=self.description, external_link=self.external_link, - admins=self.admin_emails, + admins=self.admins, hook_parameter=_WebhookHookParameterPatch( endpoint=self.endpoint, username=self.username, @@ -2070,7 +2070,7 @@ def _to_generated_patch( hook_name=name or self.name, description=description or self.description, external_link=external_link or self.external_link, - admins=self.admin_emails, + admins=self.admins, hook_parameter=_WebhookHookParameterPatch( endpoint=endpoint or self.endpoint, username=username or self.username, diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/async_samples/sample_hooks_async.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/async_samples/sample_hooks_async.py index 7c49edbb147e..f7e85a545d22 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/async_samples/sample_hooks_async.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/async_samples/sample_hooks_async.py @@ -71,7 +71,7 @@ async def sample_get_hook_async(hook_id): print("Description: {}".format(hook.description)) print("Emails to alert: {}".format(hook.emails_to_alert)) print("External link: {}".format(hook.external_link)) - print("Admins: {}".format(hook.admin_emails)) + print("Admins: {}".format(hook.admins)) # [END get_hook_async] diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/sample_hooks.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/sample_hooks.py index a02e8cca365e..16f0848c84dc 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/sample_hooks.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/samples/sample_hooks.py @@ -67,7 +67,7 @@ def sample_get_hook(hook_id): print("Description: {}".format(hook.description)) print("Emails to alert: {}".format(hook.emails_to_alert)) print("External link: {}".format(hook.external_link)) - print("Admins: {}".format(hook.admin_emails)) + print("Admins: {}".format(hook.admins)) # [END get_hook] diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/base_testcase_aad_async.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/base_testcase_aad_async.py index d11d4faace0e..7d96f9a0ba65 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/base_testcase_aad_async.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/base_testcase_aad_async.py @@ -233,7 +233,7 @@ async def _create_data_feed_for_update(self, name): ingestion_start_offset=-1, stop_retry_after=-1, ), - admin_emails=["yournamehere@microsoft.com"], + admins=["yournamehere@microsoft.com"], data_feed_description="my first data feed", missing_data_point_fill_settings=DataFeedMissingDataPointFillSettings( fill_type="SmartFilling" @@ -242,7 +242,7 @@ async def _create_data_feed_for_update(self, name): rollup_type="NoRollup", rollup_method="None", ), - viewer_emails=["viewers"], + viewers=["viewers"], access_mode="Private", action_link_template="action link template" ) diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/base_testcase_async.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/base_testcase_async.py index 925150b21127..262dcc2d2512 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/base_testcase_async.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/base_testcase_async.py @@ -231,7 +231,7 @@ async def _create_data_feed_for_update(self, name): ingestion_start_offset=-1, stop_retry_after=-1, ), - admin_emails=["yournamehere@microsoft.com"], + admins=["yournamehere@microsoft.com"], data_feed_description="my first data feed", missing_data_point_fill_settings=DataFeedMissingDataPointFillSettings( fill_type="SmartFilling" @@ -240,7 +240,7 @@ async def _create_data_feed_for_update(self, name): rollup_type="NoRollup", rollup_method="None", ), - viewer_emails=["viewers"], + viewers=["viewers"], access_mode="Private", action_link_template="action link template" ) 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 c59b361b6a65..42c83f44a370 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 @@ -98,7 +98,7 @@ async def test_create_data_feed_from_sql_server(self): ingestion_start_offset=-1, stop_retry_after=-1, ), - admin_emails=["yournamehere@microsoft.com"], + admins=["yournamehere@microsoft.com"], data_feed_description="my first data feed", missing_data_point_fill_settings=DataFeedMissingDataPointFillSettings( fill_type="SmartFilling" @@ -107,7 +107,7 @@ async def test_create_data_feed_from_sql_server(self): rollup_type="NoRollup", rollup_method="None", ), - viewer_emails=["viewers"], + viewers=["viewers"], access_mode="Private", action_link_template="action link template" ) @@ -134,12 +134,12 @@ async def test_create_data_feed_from_sql_server(self): self.assertEqual(data_feed.ingestion_settings.ingestion_retry_delay, -1) self.assertEqual(data_feed.ingestion_settings.ingestion_start_offset, -1) self.assertEqual(data_feed.ingestion_settings.stop_retry_after, -1) - self.assertIn("yournamehere@microsoft.com", data_feed.admin_emails) + self.assertIn("yournamehere@microsoft.com", data_feed.admins) self.assertEqual(data_feed.data_feed_description, "my first data feed") self.assertEqual(data_feed.missing_data_point_fill_settings.fill_type, "SmartFilling") self.assertEqual(data_feed.rollup_settings.rollup_type, "NoRollup") self.assertEqual(data_feed.rollup_settings.rollup_method, "None") - self.assertEqual(data_feed.viewer_emails, ["viewers"]) + self.assertEqual(data_feed.viewers, ["viewers"]) self.assertEqual(data_feed.access_mode, "Private") self.assertEqual(data_feed.action_link_template, "action link template") self.assertEqual(data_feed.status, "Active") @@ -186,7 +186,7 @@ async def test_create_data_feed_from_sql_server_with_custom_values(self): ingestion_start_offset=-1, stop_retry_after=-1, ), - admin_emails=["yournamehere@microsoft.com"], + admins=["yournamehere@microsoft.com"], data_feed_description="my first data feed", missing_data_point_fill_settings=DataFeedMissingDataPointFillSettings( fill_type="CustomValue", @@ -197,7 +197,7 @@ async def test_create_data_feed_from_sql_server_with_custom_values(self): rollup_method="Sum", rollup_identification_value="sumrollup" ), - viewer_emails=["viewers"], + viewers=["viewers"], access_mode="Private", action_link_template="action link template" ) @@ -224,14 +224,14 @@ async def test_create_data_feed_from_sql_server_with_custom_values(self): self.assertEqual(data_feed.ingestion_settings.ingestion_retry_delay, -1) self.assertEqual(data_feed.ingestion_settings.ingestion_start_offset, -1) self.assertEqual(data_feed.ingestion_settings.stop_retry_after, -1) - self.assertIn("yournamehere@microsoft.com", data_feed.admin_emails) + self.assertIn("yournamehere@microsoft.com", data_feed.admins) self.assertEqual(data_feed.data_feed_description, "my first data feed") self.assertEqual(data_feed.missing_data_point_fill_settings.fill_type, "CustomValue") self.assertEqual(data_feed.missing_data_point_fill_settings.custom_fill_value, 10) self.assertEqual(data_feed.rollup_settings.rollup_type, "AlreadyRollup") self.assertEqual(data_feed.rollup_settings.rollup_method, "Sum") self.assertEqual(data_feed.rollup_settings.rollup_identification_value, "sumrollup") - self.assertEqual(data_feed.viewer_emails, ["viewers"]) + self.assertEqual(data_feed.viewers, ["viewers"]) self.assertEqual(data_feed.access_mode, "Private") self.assertEqual(data_feed.action_link_template, "action link template") self.assertEqual(data_feed.status, "Active") @@ -740,7 +740,7 @@ async def test_update_data_feed_with_model(self): data_feed.missing_data_point_fill_settings.fill_type = "CustomValue" data_feed.missing_data_point_fill_settings.custom_fill_value = 2 data_feed.access_mode = "Public" - data_feed.viewer_emails = ["updated"] + data_feed.viewers = ["updated"] data_feed.status = "Paused" data_feed.action_link_template = "updated" data_feed.source.connection_string = "updated" @@ -763,7 +763,7 @@ async def test_update_data_feed_with_model(self): self.assertEqual(updated.missing_data_point_fill_settings.fill_type, "CustomValue") self.assertEqual(updated.missing_data_point_fill_settings.custom_fill_value, 2) self.assertEqual(updated.access_mode, "Public") - self.assertEqual(updated.viewer_emails, ["updated"]) + self.assertEqual(updated.viewers, ["updated"]) self.assertEqual(updated.status, "Paused") self.assertEqual(updated.action_link_template, "updated") self.assertEqual(updated.source.query, "get data") @@ -793,7 +793,7 @@ async def test_update_data_feed_with_kwargs(self): fill_type="CustomValue", custom_fill_value=2, access_mode="Public", - viewer_emails=["updated"], + viewers=["updated"], status="Paused", action_link_template="updated", source=SqlServerDataFeedSource( @@ -817,7 +817,7 @@ async def test_update_data_feed_with_kwargs(self): self.assertEqual(updated.missing_data_point_fill_settings.fill_type, "CustomValue") self.assertEqual(updated.missing_data_point_fill_settings.custom_fill_value, 2) self.assertEqual(updated.access_mode, "Public") - self.assertEqual(updated.viewer_emails, ["updated"]) + self.assertEqual(updated.viewers, ["updated"]) self.assertEqual(updated.status, "Paused") self.assertEqual(updated.action_link_template, "updated") self.assertEqual(updated.source.query, "get data") @@ -845,7 +845,7 @@ async def test_update_data_feed_with_model_and_kwargs(self): data_feed.missing_data_point_fill_settings.fill_type = "don't update me" data_feed.missing_data_point_fill_settings.custom_fill_value = 4 data_feed.access_mode = "don't update me" - data_feed.viewer_emails = ["don't update me"] + data_feed.viewers = ["don't update me"] data_feed.status = "don't update me" data_feed.action_link_template = "don't update me" data_feed.source.connection_string = "don't update me" @@ -866,7 +866,7 @@ async def test_update_data_feed_with_model_and_kwargs(self): fill_type="CustomValue", custom_fill_value=2, access_mode="Public", - viewer_emails=["updated"], + viewers=["updated"], status="Paused", action_link_template="updated", source=SqlServerDataFeedSource( @@ -890,7 +890,7 @@ async def test_update_data_feed_with_model_and_kwargs(self): self.assertEqual(updated.missing_data_point_fill_settings.fill_type, "CustomValue") self.assertEqual(updated.missing_data_point_fill_settings.custom_fill_value, 2) self.assertEqual(updated.access_mode, "Public") - self.assertEqual(updated.viewer_emails, ["updated"]) + self.assertEqual(updated.viewers, ["updated"]) self.assertEqual(updated.status, "Paused") self.assertEqual(updated.action_link_template, "updated") self.assertEqual(updated.source.query, "get data") @@ -920,7 +920,7 @@ async def test_update_data_feed_by_reseting_properties(self): fill_type=None, custom_fill_value=None, access_mode=None, - viewer_emails=None, + viewers=None, status=None, action_link_template=None, ) @@ -940,7 +940,7 @@ async def test_update_data_feed_by_reseting_properties(self): self.assertEqual(updated.missing_data_point_fill_settings.fill_type, "SmartFilling") self.assertEqual(updated.missing_data_point_fill_settings.custom_fill_value, 0) self.assertEqual(updated.access_mode, "Private") - # self.assertEqual(updated.viewer_emails, ["viewers"]) # doesn't currently clear + # self.assertEqual(updated.viewers, ["viewers"]) # doesn't currently clear self.assertEqual(updated.status, "Active") # self.assertEqual(updated.action_link_template, "updated") # doesn't currently clear diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_data_feeds_async.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_data_feeds_async.py index 6f398521c7e4..019453154133 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 @@ -98,7 +98,7 @@ async def test_create_data_feed_from_sql_server(self): ingestion_start_offset=-1, stop_retry_after=-1, ), - admin_emails=["yournamehere@microsoft.com"], + admins=["yournamehere@microsoft.com"], data_feed_description="my first data feed", missing_data_point_fill_settings=DataFeedMissingDataPointFillSettings( fill_type="SmartFilling" @@ -107,7 +107,7 @@ async def test_create_data_feed_from_sql_server(self): rollup_type="NoRollup", rollup_method="None", ), - viewer_emails=["viewers"], + viewers=["viewers"], access_mode="Private", action_link_template="action link template" ) @@ -134,12 +134,12 @@ async def test_create_data_feed_from_sql_server(self): self.assertEqual(data_feed.ingestion_settings.ingestion_retry_delay, -1) self.assertEqual(data_feed.ingestion_settings.ingestion_start_offset, -1) self.assertEqual(data_feed.ingestion_settings.stop_retry_after, -1) - self.assertIn("yournamehere@microsoft.com", data_feed.admin_emails) + self.assertIn("yournamehere@microsoft.com", data_feed.admins) self.assertEqual(data_feed.data_feed_description, "my first data feed") self.assertEqual(data_feed.missing_data_point_fill_settings.fill_type, "SmartFilling") self.assertEqual(data_feed.rollup_settings.rollup_type, "NoRollup") self.assertEqual(data_feed.rollup_settings.rollup_method, "None") - self.assertEqual(data_feed.viewer_emails, ["viewers"]) + self.assertEqual(data_feed.viewers, ["viewers"]) self.assertEqual(data_feed.access_mode, "Private") self.assertEqual(data_feed.action_link_template, "action link template") self.assertEqual(data_feed.status, "Active") @@ -186,7 +186,7 @@ async def test_create_data_feed_from_sql_server_with_custom_values(self): ingestion_start_offset=-1, stop_retry_after=-1, ), - admin_emails=["yournamehere@microsoft.com"], + admins=["yournamehere@microsoft.com"], data_feed_description="my first data feed", missing_data_point_fill_settings=DataFeedMissingDataPointFillSettings( fill_type="CustomValue", @@ -197,7 +197,7 @@ async def test_create_data_feed_from_sql_server_with_custom_values(self): rollup_method="Sum", rollup_identification_value="sumrollup" ), - viewer_emails=["viewers"], + viewers=["viewers"], access_mode="Private", action_link_template="action link template" ) @@ -224,14 +224,14 @@ async def test_create_data_feed_from_sql_server_with_custom_values(self): self.assertEqual(data_feed.ingestion_settings.ingestion_retry_delay, -1) self.assertEqual(data_feed.ingestion_settings.ingestion_start_offset, -1) self.assertEqual(data_feed.ingestion_settings.stop_retry_after, -1) - self.assertIn("yournamehere@microsoft.com", data_feed.admin_emails) + self.assertIn("yournamehere@microsoft.com", data_feed.admins) self.assertEqual(data_feed.data_feed_description, "my first data feed") self.assertEqual(data_feed.missing_data_point_fill_settings.fill_type, "CustomValue") self.assertEqual(data_feed.missing_data_point_fill_settings.custom_fill_value, 10) self.assertEqual(data_feed.rollup_settings.rollup_type, "AlreadyRollup") self.assertEqual(data_feed.rollup_settings.rollup_method, "Sum") self.assertEqual(data_feed.rollup_settings.rollup_identification_value, "sumrollup") - self.assertEqual(data_feed.viewer_emails, ["viewers"]) + self.assertEqual(data_feed.viewers, ["viewers"]) self.assertEqual(data_feed.access_mode, "Private") self.assertEqual(data_feed.action_link_template, "action link template") self.assertEqual(data_feed.status, "Active") @@ -740,7 +740,7 @@ async def test_update_data_feed_with_model(self): data_feed.missing_data_point_fill_settings.fill_type = "CustomValue" data_feed.missing_data_point_fill_settings.custom_fill_value = 2 data_feed.access_mode = "Public" - data_feed.viewer_emails = ["updated"] + data_feed.viewers = ["updated"] data_feed.status = "Paused" data_feed.action_link_template = "updated" data_feed.source.connection_string = "updated" @@ -763,7 +763,7 @@ async def test_update_data_feed_with_model(self): self.assertEqual(updated.missing_data_point_fill_settings.fill_type, "CustomValue") self.assertEqual(updated.missing_data_point_fill_settings.custom_fill_value, 2) self.assertEqual(updated.access_mode, "Public") - self.assertEqual(updated.viewer_emails, ["updated"]) + self.assertEqual(updated.viewers, ["updated"]) self.assertEqual(updated.status, "Paused") self.assertEqual(updated.action_link_template, "updated") self.assertEqual(updated.source.query, "get data") @@ -793,7 +793,7 @@ async def test_update_data_feed_with_kwargs(self): fill_type="CustomValue", custom_fill_value=2, access_mode="Public", - viewer_emails=["updated"], + viewers=["updated"], status="Paused", action_link_template="updated", source=SqlServerDataFeedSource( @@ -817,7 +817,7 @@ async def test_update_data_feed_with_kwargs(self): self.assertEqual(updated.missing_data_point_fill_settings.fill_type, "CustomValue") self.assertEqual(updated.missing_data_point_fill_settings.custom_fill_value, 2) self.assertEqual(updated.access_mode, "Public") - self.assertEqual(updated.viewer_emails, ["updated"]) + self.assertEqual(updated.viewers, ["updated"]) self.assertEqual(updated.status, "Paused") self.assertEqual(updated.action_link_template, "updated") self.assertEqual(updated.source.query, "get data") @@ -845,7 +845,7 @@ async def test_update_data_feed_with_model_and_kwargs(self): data_feed.missing_data_point_fill_settings.fill_type = "don't update me" data_feed.missing_data_point_fill_settings.custom_fill_value = 4 data_feed.access_mode = "don't update me" - data_feed.viewer_emails = ["don't update me"] + data_feed.viewers = ["don't update me"] data_feed.status = "don't update me" data_feed.action_link_template = "don't update me" data_feed.source.connection_string = "don't update me" @@ -866,7 +866,7 @@ async def test_update_data_feed_with_model_and_kwargs(self): fill_type="CustomValue", custom_fill_value=2, access_mode="Public", - viewer_emails=["updated"], + viewers=["updated"], status="Paused", action_link_template="updated", source=SqlServerDataFeedSource( @@ -890,7 +890,7 @@ async def test_update_data_feed_with_model_and_kwargs(self): self.assertEqual(updated.missing_data_point_fill_settings.fill_type, "CustomValue") self.assertEqual(updated.missing_data_point_fill_settings.custom_fill_value, 2) self.assertEqual(updated.access_mode, "Public") - self.assertEqual(updated.viewer_emails, ["updated"]) + self.assertEqual(updated.viewers, ["updated"]) self.assertEqual(updated.status, "Paused") self.assertEqual(updated.action_link_template, "updated") self.assertEqual(updated.source.query, "get data") @@ -920,7 +920,7 @@ async def test_update_data_feed_by_reseting_properties(self): fill_type=None, custom_fill_value=None, access_mode=None, - viewer_emails=None, + viewers=None, status=None, action_link_template=None, ) @@ -940,7 +940,7 @@ async def test_update_data_feed_by_reseting_properties(self): self.assertEqual(updated.missing_data_point_fill_settings.fill_type, "SmartFilling") self.assertEqual(updated.missing_data_point_fill_settings.custom_fill_value, 0) self.assertEqual(updated.access_mode, "Private") - # self.assertEqual(updated.viewer_emails, ["viewers"]) # doesn't currently clear + # self.assertEqual(updated.viewers, ["viewers"]) # doesn't currently clear self.assertEqual(updated.status, "Active") # self.assertEqual(updated.action_link_template, "updated") # doesn't currently clear diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_hooks_aad_async.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_hooks_aad_async.py index 6604ac056887..f680f4226f3b 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_hooks_aad_async.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_hooks_aad_async.py @@ -31,7 +31,7 @@ async def test_create_email_hook(self): ) self.assertIsNotNone(email_hook.id) self.assertIsNotNone(email_hook.name) - self.assertIsNotNone(email_hook.admin_emails) + self.assertIsNotNone(email_hook.admins) self.assertEqual(email_hook.emails_to_alert, ["yournamehere@microsoft.com"]) self.assertEqual(email_hook.description, "my email hook") self.assertEqual(email_hook.external_link, "external link") @@ -57,7 +57,7 @@ async def test_create_web_hook(self): ) self.assertIsNotNone(web_hook.id) self.assertIsNotNone(web_hook.name) - self.assertIsNotNone(web_hook.admin_emails) + self.assertIsNotNone(web_hook.admins) self.assertEqual(web_hook.endpoint, "https://httpbin.org/post") self.assertEqual(web_hook.description, "my web hook") self.assertEqual(web_hook.external_link, "external link") diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_hooks_async.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_hooks_async.py index ad66c116b3fd..33251feab389 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_hooks_async.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/async_tests/test_hooks_async.py @@ -31,7 +31,7 @@ async def test_create_email_hook(self): ) self.assertIsNotNone(email_hook.id) self.assertIsNotNone(email_hook.name) - self.assertIsNotNone(email_hook.admin_emails) + self.assertIsNotNone(email_hook.admins) self.assertEqual(email_hook.emails_to_alert, ["yournamehere@microsoft.com"]) self.assertEqual(email_hook.description, "my email hook") self.assertEqual(email_hook.external_link, "external link") @@ -57,7 +57,7 @@ async def test_create_web_hook(self): ) self.assertIsNotNone(web_hook.id) self.assertIsNotNone(web_hook.name) - self.assertIsNotNone(web_hook.admin_emails) + self.assertIsNotNone(web_hook.admins) self.assertEqual(web_hook.endpoint, "https://httpbin.org/post") self.assertEqual(web_hook.description, "my web hook") self.assertEqual(web_hook.external_link, "external link") diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/base_testcase.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/base_testcase.py index fb618dba3342..111d2b661c3d 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/base_testcase.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/base_testcase.py @@ -226,7 +226,7 @@ def _create_data_feed_for_update(self, name): ingestion_start_offset=-1, stop_retry_after=-1, ), - admin_emails=["yournamehere@microsoft.com"], + admins=["yournamehere@microsoft.com"], data_feed_description="my first data feed", missing_data_point_fill_settings=DataFeedMissingDataPointFillSettings( fill_type="SmartFilling" @@ -235,7 +235,7 @@ def _create_data_feed_for_update(self, name): rollup_type="NoRollup", rollup_method="None", ), - viewer_emails=["viewers"], + viewers=["viewers"], access_mode="Private", action_link_template="action link template" ) diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/base_testcase_aad.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/base_testcase_aad.py index f33debad815d..a40496c6753e 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/base_testcase_aad.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/base_testcase_aad.py @@ -228,7 +228,7 @@ def _create_data_feed_for_update(self, name): ingestion_start_offset=-1, stop_retry_after=-1, ), - admin_emails=["yournamehere@microsoft.com"], + admins=["yournamehere@microsoft.com"], data_feed_description="my first data feed", missing_data_point_fill_settings=DataFeedMissingDataPointFillSettings( fill_type="SmartFilling" @@ -237,7 +237,7 @@ def _create_data_feed_for_update(self, name): rollup_type="NoRollup", rollup_method="None", ), - viewer_emails=["viewers"], + viewers=["viewers"], access_mode="Private", action_link_template="action link template" ) 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 ebfc1f4a31af..1ced9f53c68c 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_data_feeds.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_data_feeds.py @@ -94,7 +94,7 @@ def test_create_data_feed_from_sql_server(self): ingestion_start_offset=-1, stop_retry_after=-1, ), - admin_emails=["yournamehere@microsoft.com"], + admins=["yournamehere@microsoft.com"], data_feed_description="my first data feed", missing_data_point_fill_settings=DataFeedMissingDataPointFillSettings( fill_type="SmartFilling" @@ -103,7 +103,7 @@ def test_create_data_feed_from_sql_server(self): rollup_type="NoRollup", rollup_method="None", ), - viewer_emails=["viewers"], + viewers=["viewers"], access_mode="Private", action_link_template="action link template" ) @@ -130,12 +130,12 @@ def test_create_data_feed_from_sql_server(self): self.assertEqual(data_feed.ingestion_settings.ingestion_retry_delay, -1) self.assertEqual(data_feed.ingestion_settings.ingestion_start_offset, -1) self.assertEqual(data_feed.ingestion_settings.stop_retry_after, -1) - self.assertIn("yournamehere@microsoft.com", data_feed.admin_emails) + self.assertIn("yournamehere@microsoft.com", data_feed.admins) self.assertEqual(data_feed.data_feed_description, "my first data feed") self.assertEqual(data_feed.missing_data_point_fill_settings.fill_type, "SmartFilling") self.assertEqual(data_feed.rollup_settings.rollup_type, "NoRollup") self.assertEqual(data_feed.rollup_settings.rollup_method, "None") - self.assertEqual(data_feed.viewer_emails, ["viewers"]) + self.assertEqual(data_feed.viewers, ["viewers"]) self.assertEqual(data_feed.access_mode, "Private") self.assertEqual(data_feed.action_link_template, "action link template") self.assertEqual(data_feed.status, "Active") @@ -180,7 +180,7 @@ def test_create_data_feed_from_sql_server_with_custom_values(self): ingestion_start_offset=-1, stop_retry_after=-1, ), - admin_emails=["yournamehere@microsoft.com"], + admins=["yournamehere@microsoft.com"], data_feed_description="my first data feed", missing_data_point_fill_settings=DataFeedMissingDataPointFillSettings( fill_type="CustomValue", @@ -191,7 +191,7 @@ def test_create_data_feed_from_sql_server_with_custom_values(self): rollup_method="Sum", rollup_identification_value="sumrollup" ), - viewer_emails=["viewers"], + viewers=["viewers"], access_mode="Private", action_link_template="action link template" ) @@ -218,14 +218,14 @@ def test_create_data_feed_from_sql_server_with_custom_values(self): self.assertEqual(data_feed.ingestion_settings.ingestion_retry_delay, -1) self.assertEqual(data_feed.ingestion_settings.ingestion_start_offset, -1) self.assertEqual(data_feed.ingestion_settings.stop_retry_after, -1) - self.assertIn("yournamehere@microsoft.com", data_feed.admin_emails) + self.assertIn("yournamehere@microsoft.com", data_feed.admins) self.assertEqual(data_feed.data_feed_description, "my first data feed") self.assertEqual(data_feed.missing_data_point_fill_settings.fill_type, "CustomValue") self.assertEqual(data_feed.missing_data_point_fill_settings.custom_fill_value, 10) self.assertEqual(data_feed.rollup_settings.rollup_type, "AlreadyRollup") self.assertEqual(data_feed.rollup_settings.rollup_method, "Sum") self.assertEqual(data_feed.rollup_settings.rollup_identification_value, "sumrollup") - self.assertEqual(data_feed.viewer_emails, ["viewers"]) + self.assertEqual(data_feed.viewers, ["viewers"]) self.assertEqual(data_feed.access_mode, "Private") self.assertEqual(data_feed.action_link_template, "action link template") self.assertEqual(data_feed.status, "Active") @@ -682,7 +682,7 @@ def test_update_data_feed_with_model(self): data_feed.missing_data_point_fill_settings.fill_type = "CustomValue" data_feed.missing_data_point_fill_settings.custom_fill_value = 2 data_feed.access_mode = "Public" - data_feed.viewer_emails = ["updated"] + data_feed.viewers = ["updated"] data_feed.status = "Paused" data_feed.action_link_template = "updated" data_feed.source.connection_string = "updated" @@ -705,7 +705,7 @@ def test_update_data_feed_with_model(self): self.assertEqual(updated.missing_data_point_fill_settings.fill_type, "CustomValue") self.assertEqual(updated.missing_data_point_fill_settings.custom_fill_value, 2) self.assertEqual(updated.access_mode, "Public") - self.assertEqual(updated.viewer_emails, ["updated"]) + self.assertEqual(updated.viewers, ["updated"]) self.assertEqual(updated.status, "Paused") self.assertEqual(updated.action_link_template, "updated") self.assertEqual(updated.source.query, "get data") @@ -734,7 +734,7 @@ def test_update_data_feed_with_kwargs(self): fill_type="CustomValue", custom_fill_value=2, access_mode="Public", - viewer_emails=["updated"], + viewers=["updated"], status="Paused", action_link_template="updated", source=SqlServerDataFeedSource( @@ -758,7 +758,7 @@ def test_update_data_feed_with_kwargs(self): self.assertEqual(updated.missing_data_point_fill_settings.fill_type, "CustomValue") self.assertEqual(updated.missing_data_point_fill_settings.custom_fill_value, 2) self.assertEqual(updated.access_mode, "Public") - self.assertEqual(updated.viewer_emails, ["updated"]) + self.assertEqual(updated.viewers, ["updated"]) self.assertEqual(updated.status, "Paused") self.assertEqual(updated.action_link_template, "updated") self.assertEqual(updated.source.query, "get data") @@ -785,7 +785,7 @@ def test_update_data_feed_with_model_and_kwargs(self): data_feed.missing_data_point_fill_settings.fill_type = "don't update me" data_feed.missing_data_point_fill_settings.custom_fill_value = 4 data_feed.access_mode = "don't update me" - data_feed.viewer_emails = ["don't update me"] + data_feed.viewers = ["don't update me"] data_feed.status = "don't update me" data_feed.action_link_template = "don't update me" data_feed.source.connection_string = "don't update me" @@ -806,7 +806,7 @@ def test_update_data_feed_with_model_and_kwargs(self): fill_type="CustomValue", custom_fill_value=2, access_mode="Public", - viewer_emails=["updated"], + viewers=["updated"], status="Paused", action_link_template="updated", source=SqlServerDataFeedSource( @@ -830,7 +830,7 @@ def test_update_data_feed_with_model_and_kwargs(self): self.assertEqual(updated.missing_data_point_fill_settings.fill_type, "CustomValue") self.assertEqual(updated.missing_data_point_fill_settings.custom_fill_value, 2) self.assertEqual(updated.access_mode, "Public") - self.assertEqual(updated.viewer_emails, ["updated"]) + self.assertEqual(updated.viewers, ["updated"]) self.assertEqual(updated.status, "Paused") self.assertEqual(updated.action_link_template, "updated") self.assertEqual(updated.source.query, "get data") @@ -859,7 +859,7 @@ def test_update_data_feed_by_reseting_properties(self): fill_type=None, custom_fill_value=None, access_mode=None, - viewer_emails=None, + viewers=None, status=None, action_link_template=None, ) @@ -879,7 +879,7 @@ def test_update_data_feed_by_reseting_properties(self): self.assertEqual(updated.missing_data_point_fill_settings.fill_type, "SmartFilling") self.assertEqual(updated.missing_data_point_fill_settings.custom_fill_value, 0) self.assertEqual(updated.access_mode, "Private") - # self.assertEqual(updated.viewer_emails, ["viewers"]) # doesn't currently clear + # self.assertEqual(updated.viewers, ["viewers"]) # doesn't currently clear self.assertEqual(updated.status, "Active") # self.assertEqual(updated.action_link_template, "updated") # doesn't currently clear diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_data_feeds_aad.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_data_feeds_aad.py index d365299e628c..45ec5dc6727c 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 @@ -94,7 +94,7 @@ def test_create_data_feed_from_sql_server(self): ingestion_start_offset=-1, stop_retry_after=-1, ), - admin_emails=["yournamehere@microsoft.com"], + admins=["yournamehere@microsoft.com"], data_feed_description="my first data feed", missing_data_point_fill_settings=DataFeedMissingDataPointFillSettings( fill_type="SmartFilling" @@ -103,7 +103,7 @@ def test_create_data_feed_from_sql_server(self): rollup_type="NoRollup", rollup_method="None", ), - viewer_emails=["viewers"], + viewers=["viewers"], access_mode="Private", action_link_template="action link template" ) @@ -131,12 +131,12 @@ def test_create_data_feed_from_sql_server(self): self.assertEqual(data_feed.ingestion_settings.ingestion_retry_delay, -1) self.assertEqual(data_feed.ingestion_settings.ingestion_start_offset, -1) self.assertEqual(data_feed.ingestion_settings.stop_retry_after, -1) - self.assertIn("yournamehere@microsoft.com", data_feed.admin_emails) + self.assertIn("yournamehere@microsoft.com", data_feed.admins) self.assertEqual(data_feed.data_feed_description, "my first data feed") self.assertEqual(data_feed.missing_data_point_fill_settings.fill_type, "SmartFilling") self.assertEqual(data_feed.rollup_settings.rollup_type, "NoRollup") self.assertEqual(data_feed.rollup_settings.rollup_method, "None") - self.assertEqual(data_feed.viewer_emails, ["viewers"]) + self.assertEqual(data_feed.viewers, ["viewers"]) self.assertEqual(data_feed.access_mode, "Private") self.assertEqual(data_feed.action_link_template, "action link template") self.assertEqual(data_feed.status, "Active") @@ -181,7 +181,7 @@ def test_create_data_feed_from_sql_server_with_custom_values(self): ingestion_start_offset=-1, stop_retry_after=-1, ), - admin_emails=["yournamehere@microsoft.com"], + admins=["yournamehere@microsoft.com"], data_feed_description="my first data feed", missing_data_point_fill_settings=DataFeedMissingDataPointFillSettings( fill_type="CustomValue", @@ -192,7 +192,7 @@ def test_create_data_feed_from_sql_server_with_custom_values(self): rollup_method="Sum", rollup_identification_value="sumrollup" ), - viewer_emails=["viewers"], + viewers=["viewers"], access_mode="Private", action_link_template="action link template" ) @@ -219,14 +219,14 @@ def test_create_data_feed_from_sql_server_with_custom_values(self): self.assertEqual(data_feed.ingestion_settings.ingestion_retry_delay, -1) self.assertEqual(data_feed.ingestion_settings.ingestion_start_offset, -1) self.assertEqual(data_feed.ingestion_settings.stop_retry_after, -1) - self.assertIn("yournamehere@microsoft.com", data_feed.admin_emails) + self.assertIn("yournamehere@microsoft.com", data_feed.admins) self.assertEqual(data_feed.data_feed_description, "my first data feed") self.assertEqual(data_feed.missing_data_point_fill_settings.fill_type, "CustomValue") self.assertEqual(data_feed.missing_data_point_fill_settings.custom_fill_value, 10) self.assertEqual(data_feed.rollup_settings.rollup_type, "AlreadyRollup") self.assertEqual(data_feed.rollup_settings.rollup_method, "Sum") self.assertEqual(data_feed.rollup_settings.rollup_identification_value, "sumrollup") - self.assertEqual(data_feed.viewer_emails, ["viewers"]) + self.assertEqual(data_feed.viewers, ["viewers"]) self.assertEqual(data_feed.access_mode, "Private") self.assertEqual(data_feed.action_link_template, "action link template") self.assertEqual(data_feed.status, "Active") @@ -683,7 +683,7 @@ def test_update_data_feed_with_model(self): data_feed.missing_data_point_fill_settings.fill_type = "CustomValue" data_feed.missing_data_point_fill_settings.custom_fill_value = 2 data_feed.access_mode = "Public" - data_feed.viewer_emails = ["updated"] + data_feed.viewers = ["updated"] data_feed.status = "Paused" data_feed.action_link_template = "updated" data_feed.source.connection_string = "updated" @@ -706,7 +706,7 @@ def test_update_data_feed_with_model(self): self.assertEqual(updated.missing_data_point_fill_settings.fill_type, "CustomValue") self.assertEqual(updated.missing_data_point_fill_settings.custom_fill_value, 2) self.assertEqual(updated.access_mode, "Public") - self.assertEqual(updated.viewer_emails, ["updated"]) + self.assertEqual(updated.viewers, ["updated"]) self.assertEqual(updated.status, "Paused") self.assertEqual(updated.action_link_template, "updated") self.assertEqual(updated.source.query, "get data") @@ -735,7 +735,7 @@ def test_update_data_feed_with_kwargs(self): fill_type="CustomValue", custom_fill_value=2, access_mode="Public", - viewer_emails=["updated"], + viewers=["updated"], status="Paused", action_link_template="updated", source=SqlServerDataFeedSource( @@ -759,7 +759,7 @@ def test_update_data_feed_with_kwargs(self): self.assertEqual(updated.missing_data_point_fill_settings.fill_type, "CustomValue") self.assertEqual(updated.missing_data_point_fill_settings.custom_fill_value, 2) self.assertEqual(updated.access_mode, "Public") - self.assertEqual(updated.viewer_emails, ["updated"]) + self.assertEqual(updated.viewers, ["updated"]) self.assertEqual(updated.status, "Paused") self.assertEqual(updated.action_link_template, "updated") self.assertEqual(updated.source.query, "get data") @@ -786,7 +786,7 @@ def test_update_data_feed_with_model_and_kwargs(self): data_feed.missing_data_point_fill_settings.fill_type = "don't update me" data_feed.missing_data_point_fill_settings.custom_fill_value = 4 data_feed.access_mode = "don't update me" - data_feed.viewer_emails = ["don't update me"] + data_feed.viewers = ["don't update me"] data_feed.status = "don't update me" data_feed.action_link_template = "don't update me" data_feed.source.connection_string = "don't update me" @@ -807,7 +807,7 @@ def test_update_data_feed_with_model_and_kwargs(self): fill_type="CustomValue", custom_fill_value=2, access_mode="Public", - viewer_emails=["updated"], + viewers=["updated"], status="Paused", action_link_template="updated", source=SqlServerDataFeedSource( @@ -831,7 +831,7 @@ def test_update_data_feed_with_model_and_kwargs(self): self.assertEqual(updated.missing_data_point_fill_settings.fill_type, "CustomValue") self.assertEqual(updated.missing_data_point_fill_settings.custom_fill_value, 2) self.assertEqual(updated.access_mode, "Public") - self.assertEqual(updated.viewer_emails, ["updated"]) + self.assertEqual(updated.viewers, ["updated"]) self.assertEqual(updated.status, "Paused") self.assertEqual(updated.action_link_template, "updated") self.assertEqual(updated.source.query, "get data") @@ -860,7 +860,7 @@ def test_update_data_feed_by_reseting_properties(self): fill_type=None, custom_fill_value=None, access_mode=None, - viewer_emails=None, + viewers=None, status=None, action_link_template=None, ) @@ -880,7 +880,7 @@ def test_update_data_feed_by_reseting_properties(self): self.assertEqual(updated.missing_data_point_fill_settings.fill_type, "SmartFilling") self.assertEqual(updated.missing_data_point_fill_settings.custom_fill_value, 0) self.assertEqual(updated.access_mode, "Private") - # self.assertEqual(updated.viewer_emails, ["viewers"]) # doesn't currently clear + # self.assertEqual(updated.viewers, ["viewers"]) # doesn't currently clear self.assertEqual(updated.status, "Active") # self.assertEqual(updated.action_link_template, "updated") # doesn't currently clear diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_hooks.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_hooks.py index 425c28d59015..293fea89dd6f 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_hooks.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_hooks.py @@ -30,7 +30,7 @@ def test_create_email_hook(self): ) self.assertIsNotNone(email_hook.id) self.assertIsNotNone(email_hook.name) - self.assertIsNotNone(email_hook.admin_emails) + self.assertIsNotNone(email_hook.admins) self.assertEqual(email_hook.emails_to_alert, ["yournamehere@microsoft.com"]) self.assertEqual(email_hook.description, "my email hook") self.assertEqual(email_hook.external_link, "external link") @@ -54,7 +54,7 @@ def test_create_web_hook(self): ) self.assertIsNotNone(web_hook.id) self.assertIsNotNone(web_hook.name) - self.assertIsNotNone(web_hook.admin_emails) + self.assertIsNotNone(web_hook.admins) self.assertEqual(web_hook.endpoint, "https://httpbin.org/post") self.assertEqual(web_hook.description, "my web hook") self.assertEqual(web_hook.external_link, "external link") diff --git a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_hooks_aad.py b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_hooks_aad.py index ea79ceba3366..39242a9fac7b 100644 --- a/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_hooks_aad.py +++ b/sdk/metricsadvisor/azure-ai-metricsadvisor/tests/test_hooks_aad.py @@ -30,7 +30,7 @@ def test_create_email_hook(self): ) self.assertIsNotNone(email_hook.id) self.assertIsNotNone(email_hook.name) - self.assertIsNotNone(email_hook.admin_emails) + self.assertIsNotNone(email_hook.admins) self.assertEqual(email_hook.emails_to_alert, ["yournamehere@microsoft.com"]) self.assertEqual(email_hook.description, "my email hook") self.assertEqual(email_hook.external_link, "external link") @@ -54,7 +54,7 @@ def test_create_web_hook(self): ) self.assertIsNotNone(web_hook.id) self.assertIsNotNone(web_hook.name) - self.assertIsNotNone(web_hook.admin_emails) + self.assertIsNotNone(web_hook.admins) self.assertEqual(web_hook.endpoint, "https://httpbin.org/post") self.assertEqual(web_hook.description, "my web hook") self.assertEqual(web_hook.external_link, "external link")