Changes in tests

Author: Avijit Gupta

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

@@ -168,6 +168,7 @@ private static string GetServiceManagementUrl(string publishSettingsFile)
 
         public static void SetTestSettings()
         {
+            // Please remove this line once all tests are done
             System.Net.ServicePointManager.ServerCertificateValidationCallback +=
                 delegate(object sender, System.Security.Cryptography.X509Certificates.X509Certificate certificate,
                     System.Security.Cryptography.X509Certificates.X509Chain chain,

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

@@ -36,7 +36,7 @@ public class VirtualIPTests : ServiceManagementTest
         public static void ClassInitialize(TestContext context)
         {
             var vnetConfig = vmPowershellCmdlets.GetAzureVNetConfig(null);
-            vmPowershellCmdlets.SetAzureVNetConfig(Directory.GetCurrentDirectory() + "\\VnetconfigWithLocation.netcfg");
+            vmPowershellCmdlets.SetAzureVNetConfig(Directory.GetCurrentDirectory() + "\\Resources\\VnetconfigWithLocation.netcfg");
             var sites = vmPowershellCmdlets.GetAzureVNetSite(null);
             subNet = sites[0].Subnets.First().Name;
             vnetName = sites[0].Name;
@@ -104,7 +104,7 @@ public void TestVirtualIPLifecycle()
                 };
 
                 var updatedVM = vmPowershellCmdlets.AddAzureEndPoint(endpointInfo);
-
+                vmPowershellCmdlets.UpdateAzureVM(vmName, serviceName, updatedVM);
                 deployment = vmPowershellCmdlets.GetAzureDeployment(serviceName, DeploymentSlotType.Production);
                 retrievedVip = deployment.VirtualIPs.FirstOrDefault(vip => string.Equals(vip.Name, vipName));
                 Assert.IsNotNull(retrievedVip);
@@ -120,8 +120,9 @@ public void TestVirtualIPLifecycle()
                     Vm = updatedVM
                 };
 
-                Utilities.ExecuteAndLog(() => vmPowershellCmdlets.RemoveAzureEndPoint(endpointName, updatedVM), "Removing Azure Endpoint");
-                
+                updatedVM = vmPowershellCmdlets.RemoveAzureEndPoint(endpointName, updatedVM);
+                vmPowershellCmdlets.UpdateAzureVM(vmName, serviceName, updatedVM);
+
                 deployment = vmPowershellCmdlets.GetAzureDeployment(serviceName, DeploymentSlotType.Production);
                 retrievedVip = deployment.VirtualIPs.FirstOrDefault(vip => string.Equals(vip.Name, vipName));
                 Assert.IsNotNull(retrievedVip);