Changes according to feedback

Author: Avijit Gupta

src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/VirtualIPTests.cs

@@ -62,7 +62,7 @@ public void Cleanup()
                 Utilities.ExecuteAndLog(() => CleanupService(serviceName), "Delete service");
         }
 
-        [TestMethod(), Priority(0), TestProperty("Feature", "IaaS"), TestCategory(Category.Network), Owner("avgupt"),
+        [TestMethod(), Priority(0), TestProperty("Feature", "IaaS"), TestCategory(Category.Preview), Owner("avgupt"),
          Description(
              "Test the cmdlets (Add-AzureVirtualIP, Add-AzureEndpoint, Remove-AzureEndpoint, Get-AzureDeployment,Remove-AzureVirtualIP)"
              )]
@@ -133,6 +133,10 @@ public void TestVirtualIPLifecycle()
                 deployment = vmPowershellCmdlets.GetAzureDeployment(serviceName, DeploymentSlotType.Production);
                 retrievedVip = deployment.VirtualIPs.FirstOrDefault(vip => string.Equals(vip.Name, vipName));
                 Assert.IsNull(retrievedVip);
+                cleanupIfPassed = false;
+
+                vmPowershellCmdlets.RemoveAzureDeployment(serviceName, "Production", true);
+                pass = true;
             }
             catch (Exception ex)
             {

src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Endpoints/AddAzureEndpoint.cs

@@ -100,11 +100,7 @@ public class AddAzureEndpoint : VirtualMachineConfigurationCmdletBase
 
         [Parameter(HelpMessage = "The Virtual IP Name of the Virtual IP on which the endpoint is to be added.")]
         [ValidateNotNullOrEmpty]
-        public string VirtualIPName
-        {
-            get;
-            set;
-        }
+        public string VirtualIPName { get; set;}
 
         internal void ExecuteCommand()
         {

src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Endpoints/SetAzureEndpoint.cs

@@ -163,6 +163,7 @@ internal void ExecuteCommand()
             {
                 endpoint.LoadBalancerDistribution = this.LoadBalancerDistribution;
             }
+
             if (this.ParameterSpecified("VirtualIPName"))
             {
                 endpoint.VirtualIPName = this.VirtualIPName;

src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Endpoints/SetAzureLoadBalancedEndpoint.cs

@@ -91,11 +91,7 @@ public class SetAzureLoadBalancedEndpoint : IaaSDeploymentManagementCmdletBase
 
         [Parameter(HelpMessage = "The Virtual IP Name of the Virtual IP on which the endpoint is to be added.")]
         [ValidateNotNullOrEmpty]
-        public string VirtualIPName
-        {
-            get;
-            set;
-        }
+        public string VirtualIPName { get; set; }
 
         protected override void ExecuteCommand()
         {

src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Network/AddAzureVirtualIP.cs

@@ -26,11 +26,11 @@ public class AddAzureVirtualIP : ServiceManagementBaseCmdlet
     {
         [Parameter(Position = 0, Mandatory = true, ValueFromPipelineByPropertyName = false)]
         [ValidateNotNullOrEmpty]
-        public string VirtualIPName { get; set; }
+        public string ServiceName { get; set; }
 
         [Parameter(Position = 1, Mandatory = true, ValueFromPipelineByPropertyName = false)]
         [ValidateNotNullOrEmpty]
-        public string ServiceName { get; set; }
+        public string VirtualIPName { get; set; }
 
         public override void ExecuteCmdlet()
         {

src/ServiceManagement/Compute/Commands.ServiceManagement/Model/ReservedIPContext.cs

@@ -13,7 +13,6 @@
 // ----------------------------------------------------------------------------------
 
 
-using AutoMapper.Impl;
 using Microsoft.WindowsAzure.Commands.Utilities.Common;
 
 namespace Microsoft.WindowsAzure.Commands.ServiceManagement.Model

src/ServiceManagement/Compute/Commands.ServiceManagement/RemoveAzureVirtualIP.cs

@@ -1,36 +1,38 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// 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.
+// ----------------------------------------------------------------------------------
+using System.Management.Automation;
+using Microsoft.WindowsAzure.Commands.Utilities.Common;
+using Microsoft.WindowsAzure.Management.Network;
+using Microsoft.WindowsAzure.Management.Compute;
+using Microsoft.WindowsAzure.Management.Compute.Models;
+using Microsoft.WindowsAzure.Commands.ServiceManagement.Properties;
 
 namespace Microsoft.WindowsAzure.Commands.ServiceManagement.IaaS
 {
-    using System.Management.Automation;
-    using Microsoft.WindowsAzure.Commands.Utilities.Common;
-    using Microsoft.WindowsAzure.Management.Network;
-    using Microsoft.WindowsAzure.Management.Compute;
-    using Microsoft.WindowsAzure.Management.Compute.Models;
-    using Microsoft.WindowsAzure.Commands.ServiceManagement.Properties;
-
-
     [Cmdlet(VerbsCommon.Remove, "AzureVirtualIP"), OutputType(typeof(ManagementOperationContext))]
     public class RemoveAzureVirtualIP : ServiceManagementBaseCmdlet
     {
         [Parameter(Position = 0, Mandatory = true, ValueFromPipelineByPropertyName = false)]
         [ValidateNotNullOrEmpty]
-        public string VirtualIPName { get; set; }
+        public string ServiceName { get; set; }
 
         [Parameter(Position = 1, Mandatory = true, ValueFromPipelineByPropertyName = false)]
         [ValidateNotNullOrEmpty]
-        public string ServiceName { get; set; }
+        public string VirtualIPName { get; set; }
 
         [Parameter(Position = 2, Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Do not confirm removal of Virtual IP")]
-        public SwitchParameter Force
-        {
-            get;
-            set;
-        }
+        public SwitchParameter Force { get; set; }
 
         public override void ExecuteCmdlet()
         {