Merge pull request #7628 from srsedate/preview

Masked Enumeration Property Fixes for ScaleAction and MetricTrigger

Author: markcowl

src/ResourceManager/Insights/Commands.Insights/ChangeLog.md

@@ -18,12 +18,13 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Fixed issue #7267 (Autoscale area)
+    - Issues with creating a new autoscale rule not properly setting enumerated parameters (would always set them to the default value).
 
 * Fixed issue #7513 [Insights] Set-AzureRMDiagnosticSetting requires explicit specification of categories during creation of setting
     - Now the cmdlet does not require explicit indication of the categories to enable during creation, i.e. it works as it is documented
 
 ## Version 5.1.4
-
 * Fixed issues #6833 and #7102 (Diagnostic Settings area)
     - Issues with the default name, i.e. "service", during creation and listing/getting of diagnostic settings
     - Issues creating diagnostic settings with categories

src/ResourceManager/Insights/Commands.Insights/TransitionalClasses/MetricTrigger.cs

@@ -25,17 +25,47 @@ public class MetricTrigger : Monitor.Models.MetricTrigger
         /// <summary>
         /// Gets or sets the OperatorProperty of the Metric Trigger
         /// </summary>
-        public new ComparisonOperationType OperatorProperty { get; set; }
+        public new ComparisonOperationType OperatorProperty
+        {
+            get
+            {
+                return (ComparisonOperationType)System.Enum.Parse(typeof(ComparisonOperationType), base.OperatorProperty.ToString());
+            }
+            set
+            {
+                base.OperatorProperty = (Monitor.Models.ComparisonOperationType)System.Enum.Parse(typeof(Monitor.Models.ComparisonOperationType), value.ToString());
+            }
+        }
 
         /// <summary>
         /// Gets or sets the Statistic of the Metric Trigger
         /// </summary>
-        public new MetricStatisticType Statistic { get; set; }
+        public new MetricStatisticType Statistic
+        {
+            get
+            {
+                return (MetricStatisticType)System.Enum.Parse(typeof(MetricStatisticType), base.Statistic.ToString());
+            }
+            set
+            {
+                base.Statistic = (Monitor.Models.MetricStatisticType)System.Enum.Parse(typeof(Monitor.Models.MetricStatisticType), value.ToString());
+            }
+        }
 
         /// <summary>
         /// Gets or sets the TimeAggregation of the Metric Trigger
         /// </summary>
-        public new TimeAggregationType TimeAggregation { get; set; }
+        public new TimeAggregationType TimeAggregation
+        {
+            get
+            {
+                return (TimeAggregationType)System.Enum.Parse(typeof(TimeAggregationType), base.TimeAggregation.ToString());
+            }
+            set
+            {
+                base.TimeAggregation = (Monitor.Models.TimeAggregationType)System.Enum.Parse(typeof(Monitor.Models.TimeAggregationType), value.ToString());
+            }
+        }
 
         /// <summary>
         /// Initializes a new instance of the MetricTrigger class.

src/ResourceManager/Insights/Commands.Insights/TransitionalClasses/ScaleAction.cs

@@ -25,12 +25,32 @@ public class ScaleAction : Monitor.Models.ScaleAction
         /// <summary>
         /// Gets or sets the ScaleType of the scale action
         /// </summary>
-        public new ScaleType Type { get; set; }
+        public new ScaleType Type
+        {
+            get
+            {
+                return (ScaleType)System.Enum.Parse(typeof(ScaleType), base.Type.ToString());
+            }
+            set
+            {
+                base.Type = (Monitor.Models.ScaleType)System.Enum.Parse(typeof(Monitor.Models.ScaleType), value.ToString());
+            }
+        }
 
         /// <summary>
         /// Gets or sets the Direction of the scale action
         /// </summary>
-        public new ScaleDirection Direction { get; set; }
+        public new ScaleDirection Direction
+        {
+            get
+            {
+                return (ScaleDirection)System.Enum.Parse(typeof(ScaleDirection), base.Direction.ToString());
+            }
+            set
+            {
+                base.Direction = (Monitor.Models.ScaleDirection)System.Enum.Parse(typeof(Monitor.Models.ScaleDirection), value.ToString());
+            }
+        }
 
         /// <summary>
         /// Initializes a new instance of the ScaleAction class.