Merge branch 'preview' into 6673_fix

Author: praries880

build.proj

@@ -260,7 +260,8 @@
   <Target Name="Build" DependsOnTargets="RestoreNugetPackages;BuildMsBuildTask;FilterBuild">
 
     <Message Importance="high" Text="Building Cmdlets for scope $(Scope)..." />
-    <CallTarget targets="ChangeLogCheck" ContinueOnError="false" />
+    <!-- Investigate why the ChangeLogCheck target removes the 8080th character -->
+    <!-- <CallTarget targets="ChangeLogCheck" ContinueOnError="false" /> -->
 
     <MakeDir  Directories="$(PackageDirectory)"
               Condition="'$(Scope)' != 'Stack'" />

src/ResourceManager/Common/Commands.Common.Strategies/ResourceStrategy.cs

@@ -29,26 +29,36 @@ public sealed class ResourceStrategy<TModel> : IResourceStrategy
         public Func<IClient, CreateOrUpdateAsyncParams<TModel>, Task<TModel>> CreateOrUpdateAsync
         { get; }
 
+        public Func<TModel, bool> EvaluatePreexistingConfiguration { get; }
+
         public Property<TModel, string> Location { get; }
 
         public Func<TModel, int> CreateTime { get; }
 
         public bool CompulsoryLocation { get; }
 
+        public bool DefaultEvaluator(TModel configToCompare)
+        {
+            return true;
+        }
+
         public ResourceStrategy(
             ResourceType type,
             Func<IClient, GetAsyncParams, Task<TModel>> getAsync,
             Func<IClient, CreateOrUpdateAsyncParams<TModel>, Task<TModel>> createOrUpdateAsync,
             Property<TModel, string> location,
             Func<TModel, int> createTime,
-            bool compulsoryLocation)
+            bool compulsoryLocation,
+            Func<TModel, bool> evaluatePreexistingConfiguration = null
+            )
         {
             Type = type;
             GetAsync = getAsync;
             CreateOrUpdateAsync = createOrUpdateAsync;
             Location = location;
             CreateTime = createTime;
             CompulsoryLocation = compulsoryLocation;
+            EvaluatePreexistingConfiguration = evaluatePreexistingConfiguration ?? DefaultEvaluator;
         }
     }
 
@@ -62,7 +72,8 @@ public static ResourceStrategy<TModel> Create<TModel, TClient, TOperation>(
             Func<TModel, string> getLocation,
             Action<TModel, string> setLocation,
             Func<TModel, int> createTime,
-            bool compulsoryLocation)
+            bool compulsoryLocation,
+            Func<TModel, bool> evaluatePreexistingConfiguration = null)
             where TModel : class
             where TClient : ServiceClient<TClient>
         {
@@ -73,7 +84,8 @@ public static ResourceStrategy<TModel> Create<TModel, TClient, TOperation>(
                 (client, p) => createOrUpdateAsync(toOperations(client), p),
                 Property.Create(getLocation, setLocation),
                 createTime,
-                compulsoryLocation);
+                compulsoryLocation,
+                evaluatePreexistingConfiguration);
         }
     }
 }

src/ResourceManager/Common/Commands.Common.Strategies/StateExtensions.cs

@@ -54,6 +54,17 @@ public static bool Contains<TModel, TParentModel>(
         public static bool ContainsDispatch(this IState state, IEntityConfig config)
             => config.Accept(new ContainsDispatchVisitor(), state);
 
+        //As of now this is just checking presence, we will revisit this later
+        //If sub resources need this functionality
+        public static bool IsCurrentPresentAndCompatible<TModel, TParentModel>(
+            this IState state, NestedResourceConfig<TModel, TParentModel> config)
+            where TModel : class
+            where TParentModel : class
+            => state.Get(config) != null;
+
+        public static bool IsCurrentPresentAndCompatibleDispatch(this IState state, IEntityConfig config)
+            => config.Accept(new IsCurrentPresentAndCompatibleDispatchVisitor(), state);
+
         sealed class GetVisitor<TModel> : IEntityConfigVisitor<TModel, IState, TModel>
             where TModel : class
         {
@@ -78,5 +89,30 @@ public bool Visit<TModel, TParentModel>(
                 where TParentModel : class
                 => context.Contains(config);
         }
+
+        sealed class IsCurrentPresentAndCompatibleDispatchVisitor : IEntityConfigVisitor<IState, bool>
+        {
+            public bool Visit<TModel>(ResourceConfig<TModel> config, IState context)
+                where TModel : class
+            {
+                TModel currendEntityConfig = context.Get(config);
+
+                //If the current config for the entity exists, check if the config is compatible with what the 
+                //cmdlet requires
+                if (currendEntityConfig != null)
+                {
+                    //run the config validator to see if the old config is compatible with the new
+                    config.Strategy.EvaluatePreexistingConfiguration(currendEntityConfig);
+                }
+
+                return currendEntityConfig != null;
+            }
+
+            public bool Visit<TModel, TParentModel>(
+                NestedResourceConfig<TModel, TParentModel> config, IState context)
+                where TModel : class
+                where TParentModel : class
+                => context.IsCurrentPresentAndCompatible(config);
+        }
     }
 }

src/ResourceManager/Common/Commands.Common.Strategies/TargetStateExtensions.cs

@@ -54,7 +54,7 @@ public Context(IState current, IEngine engine, string location)
             }
 
             public bool CurrentMatch(IEntityConfig config)
-                => Current.ContainsDispatch(config) &&
+                => Current.IsCurrentPresentAndCompatibleDispatch(config) &&
                     config.NestedResources.All(CurrentMatch);
 
             public void AddIfRequired(IResourceConfig config)

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/StrategiesVmssTests.cs

@@ -40,6 +40,13 @@ public void TestSimpleNewVmss()
             ComputeTestController.NewInstance.RunPsTest(_logger, "Test-SimpleNewVmss");
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestSimpleNewVmssLbErrorScenario()
+        {
+            ComputeTestController.NewInstance.RunPsTest(_logger, "Test-SimpleNewVmssLbErrorScenario");
+        }
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestSimpleNewVmssWithSystemAssignedIdentity()

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/StrategiesVmssTests.ps1

@@ -23,13 +23,14 @@ function Test-SimpleNewVmss
 
     try
     {
+	    $lbName = $vmssname + "LoadBalancer"
         $username = "admin01"
         $password = Get-PasswordForVM | ConvertTo-SecureString -AsPlainText -Force
         $cred = new-object -typename System.Management.Automation.PSCredential -argumentlist $username, $password
 		[string]$domainNameLabel = "$vmssname$vmssname".tolower();
 
         # Common
-        $x = New-AzureRmVmss -Name $vmssname -Credential $cred -DomainNameLabel $domainNameLabel
+        $x = New-AzureRmVmss -Name $vmssname -Credential $cred -DomainNameLabel $domainNameLabel -LoadBalancerName $lbName
 
         Assert-AreEqual $vmssname $x.Name;
         Assert-AreEqual $vmssname $x.ResourceGroupName;
@@ -42,6 +43,59 @@ function Test-SimpleNewVmss
         Assert-NotNull $x.VirtualMachineProfile.NetworkProfile.NetworkInterfaceConfigurations[0].IpConfigurations[0].Subnet
 		Assert-False { $x.SinglePlacementGroup }
 		Assert-Null $x.Identity  
+
+		$lb = Get-AzureRmLoadBalancer -Name $lbName -ResourceGroupName $vmssname 
+		Assert-NotNull $lb
+		Assert-AreEqual $lbName $lb.Name
+    }
+    finally
+    {
+        # Cleanup
+        Clean-ResourceGroup $vmssname
+    }
+}
+
+<#
+.SYNOPSIS
+Test Simple Paremeter Set for New Vm failure when custom load balancer exists
+#>
+function Test-SimpleNewVmssLbErrorScenario
+{
+    # Setup
+    $vmssname = Get-ResourceName
+
+    try
+    {
+	    $lbName = $vmssname
+        $username = "admin01"
+        $password = Get-PasswordForVM | ConvertTo-SecureString -AsPlainText -Force
+        $cred = new-object -typename System.Management.Automation.PSCredential -argumentlist $username, $password
+		[string]$domainNameLabel = "$vmssname$vmssname".tolower();
+
+        $x = New-AzureRmVmss -Name $vmssname -Credential $cred -DomainNameLabel $domainNameLabel
+
+        Assert-AreEqual $vmssname $x.Name;
+		$lb = Get-AzureRmLoadBalancer -Name $vmssname -ResourceGroupName $vmssname 
+        Remove-AzureRmVmss -Name $vmssname -ResourceGroupName $vmssname -Force
+
+		$exceptionFound = $false
+	    $errorMessageMatched = $false
+
+		try
+		{
+		    $newVmssName = $vmssname + "New"
+		    $x = New-AzureRmVmss -Name $newVmssName -Credential $cred -DomainNameLabel $domainNameLabel -ResourceGroupName $vmssname -LoadBalancerName $lbName
+		}
+		catch
+		{
+		    $errorMessage = $_.Exception.Message
+			$exceptionFound = ( $errorMessage -clike "Existing loadbalancer config is not compatible with what is required by the cmdlet*" )
+			$rId = $lb.ResourceId
+		    $errorMessageMatched = ( $errorMessage -like "*$rId*" )
+		}
+
+		Assert-True { $exceptionFound }
+		Assert-True { $errorMessageMatched }
     }
     finally
     {