Sanitize input for properties that are lists

src/ResourceManager/Network/Commands.Network/Commands.Network.csproj

@@ -280,6 +280,7 @@
     <Compile Include="Models\PSApplicationGatewaySku.cs" />
     <Compile Include="Models\PSApplicationGatewaySslCertificate.cs" />
     <Compile Include="Models\PSApplicationGatewayUrlPathMap.cs" />
+    <Compile Include="Models\PSInboundRule.cs" />
     <Compile Include="Models\PSInboundNatPool.cs" />
     <Compile Include="Models\PSExpressRouteServiveProvider.cs" />
     <Compile Include="Models\PSExpressRouteCircuitArpTable.cs" />
@@ -319,10 +320,10 @@
     <Compile Include="VirtualNetworkGateway\NewAzureVirtualNetworkGatewayCommand.cs" />
     <Compile Include="VirtualNetworkGateway\GetAzureVpnClientRootCertificateCommand.cs" />
     <Compile Include="VirtualNetworkGateway\GetAzureVpnClientRevokedCertificateCommand.cs" />
-    <Compile Include="VirtualNetworkGateway\AddAzureVpnClientRootCertificateCommand.cs" />	
-    <Compile Include="VirtualNetworkGateway\AddAzureVpnClientRevokedCertificateCommand.cs" />	
+    <Compile Include="VirtualNetworkGateway\AddAzureVpnClientRootCertificateCommand.cs" />
+    <Compile Include="VirtualNetworkGateway\AddAzureVpnClientRevokedCertificateCommand.cs" />
     <Compile Include="VirtualNetworkGateway\NewAzureVpnClientRootCertificateCommand.cs" />
-    <Compile Include="VirtualNetworkGateway\NewAzureVpnClientRevokedCertificateCommand.cs" />	
+    <Compile Include="VirtualNetworkGateway\NewAzureVpnClientRevokedCertificateCommand.cs" />
     <Compile Include="VirtualNetworkGateway\ResizeAzureVirtualNetworkGatewayCommand.cs" />
     <Compile Include="VirtualNetworkGateway\RemoveAzureVpnClientRevokedCertificateCommand.cs" />
     <Compile Include="VirtualNetworkGateway\RemoveAzureVpnClientRootCertificateCommand.cs" />

src/ResourceManager/Network/Commands.Network/Microsoft.Azure.Commands.Network.format.ps1xml

@@ -512,7 +512,7 @@
               </ListItem>
               <ListItem>
                 <Label>FrontendIPConfigurations</Label>
-                <PropertyName>FrontendIPConfigurationsText</PropertyName>
+                <PropertyName>FrontendIpConfigurationsText</PropertyName>
               </ListItem>
               <ListItem>
                 <Label>BackendAddressPools</Label>

src/ResourceManager/Network/Commands.Network/Models/PSBackendAddressPool.cs

@@ -41,5 +41,15 @@ public string LoadBalancingRulesText
         {
             get { return JsonConvert.SerializeObject(LoadBalancingRules, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); }
         }
+
+        public bool ShouldSerializeBackendIpConfigurations()
+        {
+            return !string.IsNullOrEmpty(this.Name);
+        }
+
+        public bool ShouldSerializeLoadBalancingRules()
+        {
+            return !string.IsNullOrEmpty(this.Name);
+        }
     }
 }

src/ResourceManager/Network/Commands.Network/Models/PSFrontendIpConfiguration.cs

@@ -48,5 +48,19 @@ public string InboundNatPoolsText
             get { return JsonConvert.SerializeObject(InboundNatPools, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); }
         }
 
+        public bool ShouldSerializeInboundNatRules()
+        {
+            return !string.IsNullOrEmpty(this.Name);
+        }
+
+        public bool ShouldSerializeLoadBalancingRules()
+        {
+            return !string.IsNullOrEmpty(this.Name);
+        }
+
+        public bool ShouldSerializeInboundNatPools()
+        {
+            return !string.IsNullOrEmpty(this.Name);
+        }
     }
 }

src/ResourceManager/Network/Commands.Network/Models/PSInboundNatPool.cs

@@ -17,30 +17,12 @@ namespace Microsoft.Azure.Commands.Network.Models
 {
     using Newtonsoft.Json;
 
-    public class PSInboundNatPool : PSChildResource
+    public class PSInboundNatPool : PSInboundRule
     {
-        [JsonProperty(Order = 1)]
-        public PSResourceId FrontendIPConfiguration { get; set; }
-
         [JsonProperty(Order = 1)]
         public int FrontendPortRangeStart { get; set; }
 
         [JsonProperty(Order = 1)]
         public int FrontendPortRangeEnd { get; set; }
-
-        [JsonProperty(Order = 1)]
-        public int BackendPort { get; set; }
-
-        [JsonProperty(Order = 1)]
-        public string Protocol { get; set; }
-
-        [JsonProperty(Order = 1)]
-        public string ProvisioningState { get; set; }
-
-        [JsonIgnore]
-        public string FrontendIPConfigurationText
-        {
-            get { return JsonConvert.SerializeObject(FrontendIPConfiguration, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); }
-        }
     }
 }

src/ResourceManager/Network/Commands.Network/Models/PSInboundNatRule.cs

@@ -17,42 +17,29 @@ namespace Microsoft.Azure.Commands.Network.Models
 {
     using Newtonsoft.Json;
 
-    public class PSInboundNatRule : PSChildResource
+    public class PSInboundNatRule : PSInboundRule
     {
         [JsonProperty(Order = 1)]
-        public PSResourceId FrontendIPConfiguration { get; set; }
-
-        [JsonProperty(Order = 1)]
-        public string Protocol { get; set; }
-
-        [JsonProperty(Order = 1)]
-        public int? FrontendPort { get; set; }
-
-        [JsonProperty(Order = 1)]
-        public int? BackendPort { get; set; }
+        public int FrontendPort { get; set; }
 
         [JsonProperty(Order = 1)]
         public int? IdleTimeoutInMinutes { get; set; }
 
         [JsonProperty(Order = 1)]
         public bool? EnableFloatingIP { get; set; }
 
-        [JsonProperty(Order = 1)]
-        public string ProvisioningState { get; set; }
-
         [JsonProperty(Order = 1)]
         public PSNetworkInterfaceIPConfiguration BackendIPConfiguration { get; set; }
 
         [JsonIgnore]
-        public string FrontendIPConfigurationText
+        public string BackendIPConfigurationText
         {
-            get { return JsonConvert.SerializeObject(FrontendIPConfiguration, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); }
+            get { return JsonConvert.SerializeObject(BackendIPConfiguration, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); }
         }
 
-        [JsonIgnore]
-        public string BackendIPConfigurationText
+        public bool ShouldSerializeFrontendPort()
         {
-            get { return JsonConvert.SerializeObject(BackendIPConfiguration, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); }
+            return !string.IsNullOrEmpty(this.Name);
         }
     }
 }

src/ResourceManager/Network/Commands.Network/Models/PSInboundRule.cs

@@ -0,0 +1,45 @@
+//
+// Copyright (c) Microsoft.  All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
+
+namespace Microsoft.Azure.Commands.Network.Models
+{
+    using Newtonsoft.Json;
+
+    public class PSInboundRule : PSChildResource
+    {
+        [JsonProperty(Order = 1)]
+        public PSResourceId FrontendIPConfiguration { get; set; }
+
+        [JsonProperty(Order = 1)]
+        public int BackendPort { get; set; }
+
+        [JsonProperty(Order = 1)]
+        public string Protocol { get; set; }
+
+        [JsonProperty(Order = 1)]
+        public string ProvisioningState { get; set; }
+
+        [JsonIgnore]
+        public string FrontendIPConfigurationText
+        {
+            get { return JsonConvert.SerializeObject(FrontendIPConfiguration, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); }
+        }
+
+        public bool ShouldSerializeBackendPort()
+        {
+            return !string.IsNullOrEmpty(this.Name);
+        }
+    }
+}

src/ResourceManager/Network/Commands.Network/Models/PSLoadBalancingRule.cs

@@ -17,25 +17,16 @@ namespace Microsoft.Azure.Commands.Network.Models
 {
     using Newtonsoft.Json;
 
-    public class PSLoadBalancingRule : PSChildResource
+    public class PSLoadBalancingRule : PSInboundRule
     {
-        [JsonProperty(Order = 1)]
-        public PSResourceId FrontendIPConfiguration { get; set; }
-
         [JsonProperty(Order = 1)]
         public PSResourceId BackendAddressPool { get; set; }
 
         [JsonProperty(Order = 1)]
         public PSResourceId Probe { get; set; }
 
         [JsonProperty(Order = 1)]
-        public string Protocol { get; set; }
-
-        [JsonProperty(Order = 1)]
-        public int? FrontendPort { get; set; }
-
-        [JsonProperty(Order = 1)]
-        public int? BackendPort { get; set; }
+        public int FrontendPort { get; set; }
 
         [JsonProperty(Order = 1)]
         public int? IdleTimeoutInMinutes { get; set; }
@@ -46,15 +37,6 @@ public class PSLoadBalancingRule : PSChildResource
         [JsonProperty(Order = 1)]
         public bool? EnableFloatingIP { get; set; }
 
-        [JsonProperty(Order = 1)]
-        public string ProvisioningState { get; set; }
-
-        [JsonIgnore]
-        public string FrontendIPConfigurationText
-        {
-            get { return JsonConvert.SerializeObject(FrontendIPConfiguration, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); }
-        }
-
         [JsonIgnore]
         public string BackendAddressPoolText
         {
@@ -67,5 +49,9 @@ public string ProbeText
             get { return JsonConvert.SerializeObject(Probe, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); }
         }
 
+        public bool ShouldSerializeFrontendPort()
+        {
+            return !string.IsNullOrEmpty(this.Name);
+        }
     }
 }

src/ResourceManager/Network/Commands.Network/Models/PSNetworkInterface.cs

@@ -59,5 +59,10 @@ public string NetworkSecurityGroupText
         {
             get { return JsonConvert.SerializeObject(NetworkSecurityGroup, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); }
         }
+
+        public bool ShouldSerializeIpConfigurations()
+        {
+            return !string.IsNullOrEmpty(this.Name);
+        }
     }
 }

src/ResourceManager/Network/Commands.Network/Models/PSNetworkInterfaceIpConfiguration.cs

@@ -38,5 +38,15 @@ public string LoadBalancerInboundNatRulesText
         {
             get { return JsonConvert.SerializeObject(LoadBalancerInboundNatRules, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); }
         }
+
+        public bool ShouldSerializeLoadBalancerBackendAddressPools()
+        {
+            return !string.IsNullOrEmpty(this.Name);
+        }
+
+        public bool ShouldSerializeLoadBalancerInboundNatRules()
+        {
+            return !string.IsNullOrEmpty(this.Name);
+        }
     }
 }

src/ResourceManager/Network/Commands.Network/Models/PSNetworkSecurityGroup.cs

@@ -54,5 +54,25 @@ public string SubnetsText
          {
              get { return JsonConvert.SerializeObject(Subnets, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); }
          }
+
+         public bool ShouldSerializeSecurityRules()
+         {
+             return !string.IsNullOrEmpty(this.Name);
+         }
+
+         public bool ShouldSerializeDefaultSecurityRules()
+         {
+             return !string.IsNullOrEmpty(this.Name);
+         }
+
+         public bool ShouldSerializeNetworkInterfaces()
+         {
+             return !string.IsNullOrEmpty(this.Name);
+         }
+
+         public bool ShouldSerializeSubnets()
+         {
+             return !string.IsNullOrEmpty(this.Name);
+         }
      }
 }

src/ResourceManager/Network/Commands.Network/Models/PSProbe.cs

@@ -47,5 +47,20 @@ public string LoadBalancingRulesText
         {
             get { return JsonConvert.SerializeObject(LoadBalancingRules, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); }
         }
+
+        public bool ShouldSerializePort()
+        {
+            return !string.IsNullOrEmpty(this.Name);
+        }
+
+        public bool ShouldSerializeIntervalInSeconds()
+        {
+            return !string.IsNullOrEmpty(this.Name);
+        }
+
+        public bool ShouldSerializeNumberOfProbes()
+        {
+            return !string.IsNullOrEmpty(this.Name);
+        }
     }
 }

src/ResourceManager/Network/Commands.Network/Models/PSRouteTable.cs

@@ -38,5 +38,15 @@ public string SubnetsText
          {
              get { return JsonConvert.SerializeObject(Subnets, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); }
          }
+
+         public bool ShouldSerializeSubnets()
+         {
+             return !string.IsNullOrEmpty(this.Name);
+         }
+
+         public bool ShouldSerializeRoutes()
+         {
+             return !string.IsNullOrEmpty(this.Name);
+         }
      }
 }

src/ResourceManager/Network/Commands.Network/Models/PSSubnet.cs

@@ -15,6 +15,7 @@
 namespace Microsoft.Azure.Commands.Network.Models
 {
     using System.Collections.Generic;
+    using System.Runtime.CompilerServices;
 
     using Newtonsoft.Json;
 
@@ -52,5 +53,10 @@ public string RouteTableText
         {
             get { return JsonConvert.SerializeObject(RouteTable, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); }
         }
+
+        public bool ShouldSerializeIpConfigurations()
+        {
+            return !string.IsNullOrEmpty(this.Name);
+        }
     }
 }