Merge pull request Azure#2980 from TianoMS/tiano-d2

Remove Zones support in Resource cmdlets.

Author: markcowl

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Entities/Resources/Resource.cs

@@ -90,12 +90,6 @@ public class Resource<TProperties>
         [JsonProperty(Required = Required.Default)]
         public DateTime? ChangedTime { get; set; }
 
-        /// <summary>
-        /// Gets or sets the zones.
-        /// </summary>
-        [JsonProperty(Required = Required.Default)]
-        public string[] Zones { get; set; }
-
         /// <summary>
         /// Gets or sets the tags.
         /// </summary>

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Extensions/ResourceExtensions.cs

@@ -59,8 +59,7 @@ internal static PSObject ToPsObject(this Resource<JToken> resource)
                 { "CreatedTime", resource.CreatedTime },
                 { "ChangedTime", resource.ChangedTime },
                 { "ETag", resource.ETag },
-                { "Sku", resource.Sku.ToJToken().ToPsObject() },
-                { "Zones", resource.Zones },
+                { "Sku", resource.Sku.ToJToken().ToPsObject() }
             };
 
             var resourceTypeName = resourceType == null && extensionResourceType == null

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Resource/NewAzureResourceCmdlet.cs

@@ -75,12 +75,6 @@ public sealed class NewAzureResourceCmdlet : ResourceManipulationCmdletBase
         [Parameter(Mandatory = false, HelpMessage = "A hash table which represents resource tags.")]
         public Hashtable Tag { get; set; }
 
-        /// <summary>
-        /// Gets or sets the zones.
-        /// </summary>
-        [Parameter(Mandatory = false, HelpMessage = "The zones.")]
-        public string[] Zones { get; set; }
-
         /// <summary>
         /// Gets or sets a value that indicates if the full object was passed it.
         /// </summary>
@@ -150,8 +144,7 @@ private Resource<JToken> GetResource()
                 Plan = this.Plan.ToDictionary(addValueLayer: false).ToJson().FromJson<ResourcePlan>(),
                 Sku = this.Sku.ToDictionary(addValueLayer: false).ToJson().FromJson<ResourceSku>(),
                 Tags = TagsHelper.GetTagsDictionary(this.Tag),
-                Properties = this.Properties.ToResourcePropertiesBody(),
-                Zones = this.Zones
+                Properties = this.Properties.ToResourcePropertiesBody()
             };
         }
 

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Implementation/Resource/SetAzureResourceCmdlet.cs

@@ -69,12 +69,6 @@ public sealed class SetAzureResourceCmdlet : ResourceManipulationCmdletBase
         [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "A hash table which represents resource tags.")]
         public Hashtable Tag { get; set; }
 
-        /// <summary>
-        /// Gets or sets the zones.
-        /// </summary>
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The zones.")]
-        public string[] Zones { get; set; }
-
         /// <summary>
         /// Gets or sets a value that indicates if an HTTP PATCH request needs to be made instead of PUT.
         /// </summary>
@@ -161,8 +155,7 @@ private JToken GetResourceBody()
                         Sku = this.Sku.ToDictionary(addValueLayer: false).ToJson().FromJson<ResourceSku>() ?? resource.Sku,
                         Tags = TagsHelper.GetTagsDictionary(this.Tag) ?? resource.Tags,
                         Location = resource.Location,
-                        Properties = this.Properties == null ? resource.Properties : this.Properties.ToResourcePropertiesBody(),
-                        Zones = this.Zones ?? resource.Zones
+                        Properties = this.Properties == null ? resource.Properties : this.Properties.ToResourcePropertiesBody()
                     }.ToJToken();
                 }
                 else
@@ -178,7 +171,7 @@ private JToken GetResourceBody()
         /// </summary>
         private Resource<JToken> GetPatchResourceBody()
         {
-            if (this.Properties == null && this.Plan == null && this.Kind == null && this.Sku == null && this.Tag == null && this.Zones == null)
+            if (this.Properties == null && this.Plan == null && this.Kind == null && this.Sku == null && this.Tag == null)
             {
                 return null;
             }
@@ -210,11 +203,6 @@ private Resource<JToken> GetPatchResourceBody()
                 resourceBody.Tags = TagsHelper.GetTagsDictionary(this.Tag);
             }
 
-            if (this.Zones != null)
-            {
-                resourceBody.Zones = this.Zones;
-            }
-
             return resourceBody;
         }
 

src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Microsoft.Azure.Commands.ResourceManager.Cmdlets.format.ps1xml

@@ -302,10 +302,6 @@
                 <Label>ApiVersions</Label>
                 <PropertyName>ApiVersions</PropertyName>
               </ListItem>
-              <ListItem>
-                <Label>ZoneMappings</Label>
-                <PropertyName>ZoneMappings</PropertyName>
-              </ListItem>
             </ListItems>
           </ListEntry>
         </ListEntries>
@@ -336,13 +332,6 @@
                 <Label>Locations</Label>
                 <PropertyName>Locations</PropertyName>
               </ListItem>
-              <ListItem>
-                <Label>ZoneMappings</Label>
-                <PropertyName>ZoneMappings</PropertyName>
-                <ItemSelectionCondition>
-                  <ScriptBlock>$_.ZoneMappings</ScriptBlock>
-                </ItemSelectionCondition>
-              </ListItem>
             </ListItems>
           </ListEntry>
         </ListEntries>

src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourceTests.cs

@@ -133,7 +133,7 @@ public void TestGetResourceWithCollection()
             ResourcesController.NewInstance.RunPsTest("Test-GetResourceWithCollection");
         }
 
-        [Fact]
+        [Fact(Skip = "Zones are disabled for now.")]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestManageResourceWithZones()
         {