[ServiceFabric] New Az Cmdlets for Service fabric Managed app cmdlets (App, AppType, AppTypeVersion, Service)

src/ServiceFabric/ServiceFabric.Test/ScenarioTests/Common.ps1

@@ -192,6 +192,37 @@ function WaitForClusterReadyState($clusterName, $resourceGroupName, $timeoutInSe
     return $false
 }
 
+function WaitForManagedClusterReadyStateIfRecord($clusterName, $resourceGroupName)
+{
+	if ([Microsoft.Azure.Test.HttpRecorder.HttpMockServer]::Mode -ne [Microsoft.Azure.Test.HttpRecorder.HttpRecorderMode]::Playback)
+	{
+		# Wait for Ready cluster state before updating otherwise update is going to fail
+		if (-not (WaitForManagedClusterReadyState $clusterName $resourceGroupName))
+		{
+			Assert-True $false 'Cluster is not in Ready state. Can not continue with test.'
+		}
+	}
+}
+
+function WaitForManagedClusterReadyState($clusterName, $resourceGroupName, $timeoutInSeconds = 1200)
+{
+    $timeoutTime = (Get-Date).AddSeconds($timeoutInSeconds)
+    while (-not $clusterReady -and (Get-Date) -lt $timeoutTime) {
+        $cluster = (Get-AzServiceFabricManagedCluster -ResourceGroupName $resourceGroupName -Name $clusterName)[0]
+        if ($cluster.ClusterState -eq "Ready")
+        {
+            return $true
+            break
+        }
+
+        Write-Host "Cluster state: $($cluster.ClusterState). Waiting for Ready state before continuing."
+        Start-Sleep -Seconds 15
+    }
+
+    Write-Error "WaitForClusterReadyState timed out"
+    return $false
+}
+
 function WaitForAllJob($timeoutInSeconds = 1200)
 {
     $timeoutTime = (Get-Date).AddSeconds($timeoutInSeconds)
@@ -219,6 +250,53 @@ function WaitForAllJob($timeoutInSeconds = 1200)
     return $false
 }
 
+<#
+.SYNOPSIS
+Asserts if two hashtables with simple key and value types are equal
+#>
+function Assert-HashtableEqual($h1, $h2)
+{
+  if($h1.count -ne $h2.count)
+  {
+    throw "Hashtable size not equal. Hashtable1: " + $h1.count + " Hashtable2: " + $h2.count
+  }
+
+  foreach($key in $h1.Keys)
+  {
+    if($h1[$key] -ne $h2[$key])
+    {
+      throw "Tag content not equal. Key:$key Tags1:" +  $h1[$key] + " Tags2:" + $h2[$key]
+    }
+  }
+}
+
+###################
+#
+# Verify that the actual string ends with the expected suffix
+#
+#    param [string] $expectedSuffix : The expected suffix
+#    param [string] $actual         : The actual string
+#    param [string] $message        : The message to return if the actual string does not end with the suffix
+####################
+function Assert-EndsWith
+{
+    param([string] $expectedSuffix, [string] $actual, [string] $message)
+
+  Assert-NotNull $actual
+
+  if (!$message)
+  {
+      $message = "Assertion failed because actual '$actual' does not end with '$expectedSuffix'"
+  }
+
+  if (-not $actual.EndsWith($expectedSuffix))
+  {
+      throw $message
+  }
+
+  return $true
+}
+
 # Application functions
 
 function Get-AppTypeName
@@ -249,4 +327,41 @@ function Get-AppPackageV2
 function Get-ServiceTypeName
 {
     return "CalcServiceType"
+}
+
+# Managed Application functions
+
+function Get-ManagedAppTypeName
+{
+    return "VotingType"
+}
+
+function Get-ManagedAppTypeV1Name
+{
+    return "1.0.0"
+}
+
+function Get-ManagedAppTypeV2Name
+{
+    return "2.0.0"
+}
+
+function Get-ManagedAppPackageV1
+{
+    return "https://sfmconeboxst.blob.core.windows.net/managed-application-deployment/Voting.sfpkg"
+}
+
+function Get-ManagedAppPackageV2
+{
+    return "https://sfmconeboxst.blob.core.windows.net/managed-application-deployment/Voting.2.0.0.sfpkg"
+}
+
+function Get-ManagedStatelessServiceTypeName
+{
+    return "VotingWebType"
+}
+
+function Get-ManagedStatefulServiceTypeName
+{
+    return "VotingDataType"
 }

src/ServiceFabric/ServiceFabric.Test/ScenarioTests/ServiceFabricApplicationTests.cs

@@ -30,7 +30,7 @@ public ServiceFabricApplicationTests(ITestOutputHelper output)
             _logger = new XunitTracingInterceptor(output);
             XunitTracingInterceptor.AddToContext(_logger);
 
-            ServiceFabricCommonCmdletBase.WriteVerboseIntervalInSec = 0;
+            ServiceFabricManagedCmdletBase.WriteVerboseIntervalInSec = 0;
             ServiceFabricCmdletBase.RunningTest = true;
         }
 

src/ServiceFabric/ServiceFabric.Test/ScenarioTests/ServiceFabricManagedClustersApplicationTests.cs

@@ -0,0 +1,65 @@
+// ----------------------------------------------------------------------------------
+//
+// 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 Microsoft.Azure.Commands.ServiceFabric.Commands;
+using Microsoft.Azure.ServiceManagement.Common.Models;
+using Microsoft.WindowsAzure.Commands.ScenarioTest;
+using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Microsoft.Azure.Commands.ServiceFabric.Test.ScenarioTests
+{
+    public class ServiceFabricManagedClustersApplicationTests : RMTestBase
+    {
+        public XunitTracingInterceptor _logger;
+
+        public ServiceFabricManagedClustersApplicationTests(ITestOutputHelper output)
+        {
+            _logger = new XunitTracingInterceptor(output);
+            XunitTracingInterceptor.AddToContext(_logger);
+
+            ServiceFabricCommonCmdletBase.WriteVerboseIntervalInSec = 0;
+            ServiceFabricCmdletBase.RunningTest = true;
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestManagedAppType()
+        {
+            TestController.NewInstance.RunPsTest(_logger, "Test-ManagedAppType");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestManagedAppTypeVersion()
+        {
+            TestController.NewInstance.RunPsTest(_logger, "Test-ManagedAppTypeVersion");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestManagedApp()
+        {
+            TestController.NewInstance.RunPsTest(_logger, "Test-ManagedApp");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestManagedService()
+        {
+            TestController.NewInstance.RunPsTest(_logger, "Test-ManagedService");
+        }
+    }
+}