From 210b13888632d2f63be5bbab77628a52f85cf868 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Mon, 6 Aug 2018 21:05:08 +0000 Subject: [PATCH] Generated from 1ca7f22a22e15cb8980176f25be20fd3e6f73162 [Monitor] Fix issue #3585: revert previous commit since it is a breaking change --- .../latest/modules/monitor_profile_module.rb | 4 ++ .../generated/azure_mgmt_monitor.rb | 1 + .../azure_mgmt_monitor/models/recurrence.rb | 18 +++---- .../latest/modules/monitor_profile_module.rb | 52 ++++++++++--------- 4 files changed, 42 insertions(+), 33 deletions(-) diff --git a/azure_sdk/lib/latest/modules/monitor_profile_module.rb b/azure_sdk/lib/latest/modules/monitor_profile_module.rb index e8270b5e2f..f85c0b3cb2 100644 --- a/azure_sdk/lib/latest/modules/monitor_profile_module.rb +++ b/azure_sdk/lib/latest/modules/monitor_profile_module.rb @@ -52,6 +52,7 @@ module Models ScaleDirection = Azure::Monitor::Mgmt::V2015_04_01::Models::ScaleDirection ScaleType = Azure::Monitor::Mgmt::V2015_04_01::Models::ScaleType Operation = Azure::Monitor::Mgmt::V2015_04_01::Models::Operation + RecurrenceFrequency = Azure::Monitor::Mgmt::V2015_04_01::Models::RecurrenceFrequency RuleManagementEventClaimsDataSource = Azure::Monitor::Mgmt::V2016_03_01::Models::RuleManagementEventClaimsDataSource AlertRuleResourceCollection = Azure::Monitor::Mgmt::V2016_03_01::Models::AlertRuleResourceCollection RuleDataSource = Azure::Monitor::Mgmt::V2016_03_01::Models::RuleDataSource @@ -283,6 +284,9 @@ def scale_type def operation Azure::Monitor::Mgmt::V2015_04_01::Models::Operation end + def recurrence_frequency + Azure::Monitor::Mgmt::V2015_04_01::Models::RecurrenceFrequency + end def rule_management_event_claims_data_source Azure::Monitor::Mgmt::V2016_03_01::Models::RuleManagementEventClaimsDataSource end diff --git a/management/azure_mgmt_monitor/lib/2015-04-01/generated/azure_mgmt_monitor.rb b/management/azure_mgmt_monitor/lib/2015-04-01/generated/azure_mgmt_monitor.rb index bfcb287254..3c7bf750d2 100644 --- a/management/azure_mgmt_monitor/lib/2015-04-01/generated/azure_mgmt_monitor.rb +++ b/management/azure_mgmt_monitor/lib/2015-04-01/generated/azure_mgmt_monitor.rb @@ -59,5 +59,6 @@ module Models autoload :ComparisonOperationType, '2015-04-01/generated/azure_mgmt_monitor/models/comparison_operation_type.rb' autoload :ScaleDirection, '2015-04-01/generated/azure_mgmt_monitor/models/scale_direction.rb' autoload :ScaleType, '2015-04-01/generated/azure_mgmt_monitor/models/scale_type.rb' + autoload :RecurrenceFrequency, '2015-04-01/generated/azure_mgmt_monitor/models/recurrence_frequency.rb' end end diff --git a/management/azure_mgmt_monitor/lib/2015-04-01/generated/azure_mgmt_monitor/models/recurrence.rb b/management/azure_mgmt_monitor/lib/2015-04-01/generated/azure_mgmt_monitor/models/recurrence.rb index 51f23d37a8..3074c8f008 100644 --- a/management/azure_mgmt_monitor/lib/2015-04-01/generated/azure_mgmt_monitor/models/recurrence.rb +++ b/management/azure_mgmt_monitor/lib/2015-04-01/generated/azure_mgmt_monitor/models/recurrence.rb @@ -13,12 +13,13 @@ class Recurrence include MsRestAzure - # @return [String] the recurrence frequency. How often the schedule - # profile should take effect. This value must be Week, meaning each week - # will have the same set of profiles. For example, to set a daily - # schedule, set **schedule** to every day of the week. The frequency - # property specifies that the schedule is repeated weekly. Default value: - # 'Week' . + # @return [RecurrenceFrequency] the recurrence frequency. How often the + # schedule profile should take effect. This value must be Week, meaning + # each week will have the same set of profiles. For example, to set a + # daily schedule, set **schedule** to every day of the week. The + # frequency property specifies that the schedule is repeated weekly. + # Possible values include: 'None', 'Second', 'Minute', 'Hour', 'Day', + # 'Week', 'Month', 'Year' attr_accessor :frequency # @return [RecurrentSchedule] the scheduling constraints for when the @@ -40,11 +41,10 @@ def self.mapper() model_properties: { frequency: { required: true, - is_constant: true, serialized_name: 'frequency', - default_value: 'Week', type: { - name: 'String' + name: 'Enum', + module: 'RecurrenceFrequency' } }, schedule: { diff --git a/management/azure_mgmt_monitor/lib/profiles/latest/modules/monitor_profile_module.rb b/management/azure_mgmt_monitor/lib/profiles/latest/modules/monitor_profile_module.rb index 35af15363b..d3aea5fe8f 100644 --- a/management/azure_mgmt_monitor/lib/profiles/latest/modules/monitor_profile_module.rb +++ b/management/azure_mgmt_monitor/lib/profiles/latest/modules/monitor_profile_module.rb @@ -51,6 +51,7 @@ module Models ComparisonOperationType = Azure::Monitor::Mgmt::V2015_04_01::Models::ComparisonOperationType ScaleDirection = Azure::Monitor::Mgmt::V2015_04_01::Models::ScaleDirection ScaleType = Azure::Monitor::Mgmt::V2015_04_01::Models::ScaleType + RecurrenceFrequency = Azure::Monitor::Mgmt::V2015_04_01::Models::RecurrenceFrequency RuleCondition = Azure::Monitor::Mgmt::V2016_03_01::Models::RuleCondition AlertRuleResourcePatch = Azure::Monitor::Mgmt::V2016_03_01::Models::AlertRuleResourcePatch RuleManagementEventClaimsDataSource = Azure::Monitor::Mgmt::V2016_03_01::Models::RuleManagementEventClaimsDataSource @@ -58,21 +59,22 @@ module Models RuleDataSource = Azure::Monitor::Mgmt::V2016_03_01::Models::RuleDataSource LogProfileResourcePatch = Azure::Monitor::Mgmt::V2016_03_01::Models::LogProfileResourcePatch ManagementEventAggregationCondition = Azure::Monitor::Mgmt::V2016_03_01::Models::ManagementEventAggregationCondition - Incident = Azure::Monitor::Mgmt::V2016_03_01::Models::Incident LogProfileCollection = Azure::Monitor::Mgmt::V2016_03_01::Models::LogProfileCollection + RuleAction = Azure::Monitor::Mgmt::V2016_03_01::Models::RuleAction RuleMetricDataSource = Azure::Monitor::Mgmt::V2016_03_01::Models::RuleMetricDataSource RuleManagementEventDataSource = Azure::Monitor::Mgmt::V2016_03_01::Models::RuleManagementEventDataSource ThresholdRuleCondition = Azure::Monitor::Mgmt::V2016_03_01::Models::ThresholdRuleCondition LocationThresholdRuleCondition = Azure::Monitor::Mgmt::V2016_03_01::Models::LocationThresholdRuleCondition IncidentListResult = Azure::Monitor::Mgmt::V2016_03_01::Models::IncidentListResult RuleEmailAction = Azure::Monitor::Mgmt::V2016_03_01::Models::RuleEmailAction - ManagementEventRuleCondition = Azure::Monitor::Mgmt::V2016_03_01::Models::ManagementEventRuleCondition - RuleAction = Azure::Monitor::Mgmt::V2016_03_01::Models::RuleAction - RuleWebhookAction = Azure::Monitor::Mgmt::V2016_03_01::Models::RuleWebhookAction + Incident = Azure::Monitor::Mgmt::V2016_03_01::Models::Incident AlertRuleResource = Azure::Monitor::Mgmt::V2016_03_01::Models::AlertRuleResource + RuleWebhookAction = Azure::Monitor::Mgmt::V2016_03_01::Models::RuleWebhookAction + ManagementEventRuleCondition = Azure::Monitor::Mgmt::V2016_03_01::Models::ManagementEventRuleCondition LogProfileResource = Azure::Monitor::Mgmt::V2016_03_01::Models::LogProfileResource ConditionOperator = Azure::Monitor::Mgmt::V2016_03_01::Models::ConditionOperator TimeAggregationOperator = Azure::Monitor::Mgmt::V2016_03_01::Models::TimeAggregationOperator + EnableRequest = Azure::Monitor::Mgmt::V2017_04_01::Models::EnableRequest EmailReceiver = Azure::Monitor::Mgmt::V2017_04_01::Models::EmailReceiver ActionGroupPatchBody = Azure::Monitor::Mgmt::V2017_04_01::Models::ActionGroupPatchBody WebhookReceiver = Azure::Monitor::Mgmt::V2017_04_01::Models::WebhookReceiver @@ -83,15 +85,14 @@ module Models ActivityLogAlertActionGroup = Azure::Monitor::Mgmt::V2017_04_01::Models::ActivityLogAlertActionGroup ItsmReceiver = Azure::Monitor::Mgmt::V2017_04_01::Models::ItsmReceiver ActivityLogAlertActionList = Azure::Monitor::Mgmt::V2017_04_01::Models::ActivityLogAlertActionList - SmsReceiver = Azure::Monitor::Mgmt::V2017_04_01::Models::SmsReceiver Resource = Azure::Monitor::Mgmt::V2017_04_01::Models::Resource + SmsReceiver = Azure::Monitor::Mgmt::V2017_04_01::Models::SmsReceiver ActivityLogAlertPatchBody = Azure::Monitor::Mgmt::V2017_04_01::Models::ActivityLogAlertPatchBody ActionGroupList = Azure::Monitor::Mgmt::V2017_04_01::Models::ActionGroupList ActivityLogAlertList = Azure::Monitor::Mgmt::V2017_04_01::Models::ActivityLogAlertList ActionGroupResource = Azure::Monitor::Mgmt::V2017_04_01::Models::ActionGroupResource - ActivityLogAlertResource = Azure::Monitor::Mgmt::V2017_04_01::Models::ActivityLogAlertResource ReceiverStatus = Azure::Monitor::Mgmt::V2017_04_01::Models::ReceiverStatus - EnableRequest = Azure::Monitor::Mgmt::V2017_04_01::Models::EnableRequest + ActivityLogAlertResource = Azure::Monitor::Mgmt::V2017_04_01::Models::ActivityLogAlertResource ProxyOnlyResource = Azure::Monitor::Mgmt::V2017_05_01_preview::Models::ProxyOnlyResource MetricSettings = Azure::Monitor::Mgmt::V2017_05_01_preview::Models::MetricSettings LogSettings = Azure::Monitor::Mgmt::V2017_05_01_preview::Models::LogSettings @@ -297,6 +298,9 @@ def scale_direction def scale_type Azure::Monitor::Mgmt::V2015_04_01::Models::ScaleType end + def recurrence_frequency + Azure::Monitor::Mgmt::V2015_04_01::Models::RecurrenceFrequency + end def rule_condition Azure::Monitor::Mgmt::V2016_03_01::Models::RuleCondition end @@ -318,12 +322,12 @@ def log_profile_resource_patch def management_event_aggregation_condition Azure::Monitor::Mgmt::V2016_03_01::Models::ManagementEventAggregationCondition end - def incident - Azure::Monitor::Mgmt::V2016_03_01::Models::Incident - end def log_profile_collection Azure::Monitor::Mgmt::V2016_03_01::Models::LogProfileCollection end + def rule_action + Azure::Monitor::Mgmt::V2016_03_01::Models::RuleAction + end def rule_metric_data_source Azure::Monitor::Mgmt::V2016_03_01::Models::RuleMetricDataSource end @@ -342,17 +346,17 @@ def incident_list_result def rule_email_action Azure::Monitor::Mgmt::V2016_03_01::Models::RuleEmailAction end - def management_event_rule_condition - Azure::Monitor::Mgmt::V2016_03_01::Models::ManagementEventRuleCondition + def incident + Azure::Monitor::Mgmt::V2016_03_01::Models::Incident end - def rule_action - Azure::Monitor::Mgmt::V2016_03_01::Models::RuleAction + def alert_rule_resource + Azure::Monitor::Mgmt::V2016_03_01::Models::AlertRuleResource end def rule_webhook_action Azure::Monitor::Mgmt::V2016_03_01::Models::RuleWebhookAction end - def alert_rule_resource - Azure::Monitor::Mgmt::V2016_03_01::Models::AlertRuleResource + def management_event_rule_condition + Azure::Monitor::Mgmt::V2016_03_01::Models::ManagementEventRuleCondition end def log_profile_resource Azure::Monitor::Mgmt::V2016_03_01::Models::LogProfileResource @@ -363,6 +367,9 @@ def condition_operator def time_aggregation_operator Azure::Monitor::Mgmt::V2016_03_01::Models::TimeAggregationOperator end + def enable_request + Azure::Monitor::Mgmt::V2017_04_01::Models::EnableRequest + end def email_receiver Azure::Monitor::Mgmt::V2017_04_01::Models::EmailReceiver end @@ -393,12 +400,12 @@ def itsm_receiver def activity_log_alert_action_list Azure::Monitor::Mgmt::V2017_04_01::Models::ActivityLogAlertActionList end - def sms_receiver - Azure::Monitor::Mgmt::V2017_04_01::Models::SmsReceiver - end def resource Azure::Monitor::Mgmt::V2017_04_01::Models::Resource end + def sms_receiver + Azure::Monitor::Mgmt::V2017_04_01::Models::SmsReceiver + end def activity_log_alert_patch_body Azure::Monitor::Mgmt::V2017_04_01::Models::ActivityLogAlertPatchBody end @@ -411,14 +418,11 @@ def activity_log_alert_list def action_group_resource Azure::Monitor::Mgmt::V2017_04_01::Models::ActionGroupResource end - def activity_log_alert_resource - Azure::Monitor::Mgmt::V2017_04_01::Models::ActivityLogAlertResource - end def receiver_status Azure::Monitor::Mgmt::V2017_04_01::Models::ReceiverStatus end - def enable_request - Azure::Monitor::Mgmt::V2017_04_01::Models::EnableRequest + def activity_log_alert_resource + Azure::Monitor::Mgmt::V2017_04_01::Models::ActivityLogAlertResource end def proxy_only_resource Azure::Monitor::Mgmt::V2017_05_01_preview::Models::ProxyOnlyResource