Merge remote-tracking branch 'remotes/Azure/preview' into worm-preview

# Conflicts:
#	src/Storage/Commands.Storage/packages.config
#	tools/LocalFeed/Microsoft.Azure.PowerShell.Aks.1.0.96-preview.nupkg
#	tools/LocalFeed/Microsoft.Azure.PowerShell.Authentication.1.0.96-preview.nupkg
#	tools/LocalFeed/Microsoft.Azure.PowerShell.Authentication.Abstractions.1.0.96-preview.nupkg
#	tools/LocalFeed/Microsoft.Azure.PowerShell.Authentication.ResourceManager.1.0.96-preview.nupkg
#	tools/LocalFeed/Microsoft.Azure.PowerShell.Authorization.1.0.96-preview.nupkg
#	tools/LocalFeed/Microsoft.Azure.PowerShell.Common.1.0.96-preview.nupkg
#	tools/LocalFeed/Microsoft.Azure.PowerShell.Compute.1.0.96-preview.nupkg
#	tools/LocalFeed/Microsoft.Azure.PowerShell.Graph.Rbac.1.0.96-preview.nupkg
#	tools/LocalFeed/Microsoft.Azure.PowerShell.KeyVault.1.0.96-preview.nupkg
#	tools/LocalFeed/Microsoft.Azure.PowerShell.Network.1.0.96-preview.nupkg
#	tools/LocalFeed/Microsoft.Azure.PowerShell.ResourceManager.1.0.96-preview.nupkg
#	tools/LocalFeed/Microsoft.Azure.PowerShell.ScenarioTest.1.0.96-preview.nupkg
#	tools/LocalFeed/Microsoft.Azure.PowerShell.ScenarioTest.ResourceManager.1.0.96-preview.nupkg
#	tools/LocalFeed/Microsoft.Azure.PowerShell.ServiceManagement.1.0.96-preview.nupkg
#	tools/LocalFeed/Microsoft.Azure.PowerShell.Storage.1.0.96-preview.nupkg
#	tools/LocalFeed/Microsoft.Azure.PowerShell.Storage.Management.1.0.96-preview.nupkg
#	tools/LocalFeed/Microsoft.Azure.PowerShell.Strategies.1.0.96-preview.nupkg
#	tools/LocalFeed/Microsoft.Azure.PowerShell.Websites.1.0.96-preview.nupkg

Author: MiYanni

.travis.yml

@@ -25,7 +25,7 @@ before_install:
  # https://github.com/travis-ci/travis-ci/issues/1066#issuecomment-383489298
 script:
  - sudo dotnet msbuild build.proj /t:BuildNetcore /p:Configuration=$CONFIG || travis_terminate 1
- - sudo dotnet tools/StaticAnalysis/bin/$CONFIG/netcoreapp2.1/StaticAnalysis.Netcore.dll -p src/Package/$CONFIG -r src/Package -u
+ - sudo dotnet tools/StaticAnalysis/bin/$CONFIG/netcoreapp2.1/StaticAnalysis.Netcore.dll -p src/Package/$CONFIG -r src/Package -u || travis_terminate 1
  - sudo pwsh -NonInteractive -NoLogo -NoProfile -File tools/TestModuleLoading.ps1 || travis_terminate 1
  - sudo dotnet test src/Azure.PowerShell.Netcore.Test.sln --filter "AcceptanceType=CheckIn&RunType!=DesktopOnly" --configuration $CONFIG
 

NuGet.Config

@@ -5,5 +5,6 @@
     <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
     <add key="dotnet-core" value="https://dotnet.myget.org/F/dotnet-core/api/v3/index.json" />
     <add key="powershell-core" value="https://powershell.myget.org/F/powershell-core/api/v3/index.json" />
+    <add key="myget-azure-powershell" value="https://www.myget.org/F/azure-powershell/api/v3/index.json" />
   </packageSources>
 </configuration>

build.proj

@@ -172,7 +172,7 @@
   <PropertyGroup>
     <NuGetCommand>$(MSBuildProjectDirectory)\tools\NuGet.exe</NuGetCommand>
     <LibraryNugetPackageFolder>$(LibrarySourceFolder)\packages</LibraryNugetPackageFolder>
-    <NuGetRestoreConfigFile>$(MSBuildProjectDirectory)\restore.config</NuGetRestoreConfigFile>
+    <NuGetRestoreConfigFile>$(MSBuildProjectDirectory)\NuGet.Config</NuGetRestoreConfigFile>
     <NuGetRestoreConfigSwitch>-ConfigFile &quot;$(NuGetRestoreConfigFile)&quot;</NuGetRestoreConfigSwitch>
     <NuGetRestorePackageSetting>-PackagesDirectory $(LibraryNugetPackageFolder)</NuGetRestorePackageSetting>
     <NuGetLocalBuildTaskPackages>-PackagesDirectory $(LibraryToolsFolder)\BuildPackagesTask\packages</NuGetLocalBuildTaskPackages>
@@ -191,16 +191,6 @@
   -->
   <Target Name="RestoreNugetPackages" Condition="$(SkipNugetRestore) == 'false'">
     <Message Importance="high" Text="Restore Nuget packages..." />
-
-    <Delete Files="$(NuGetRestoreConfigFile)" />
-    <WriteLinesToFile
-      File="$(NuGetRestoreConfigFile)"
-      Lines="&lt;configuration&gt;&lt;/configuration&gt;"
-      Overwrite="true"
-      Encoding="Unicode"/>
-
-    <Exec Command="$(NuGetCommand) sources add -Name LocalFeed -Source &quot;$(LocalFeedFolder)&quot; $(NuGetRestoreConfigSwitch)"/>
-    <Exec Command="$(NuGetCommand) sources add -Name nugetRemote -Source &quot;https://api.nuget.org/v3/index.json&quot; $(NuGetRestoreConfigSwitch)"/>
     <!-- Restore packages -->
     <Exec Command="$(NuGetCommand) restore %(StackSolution.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetRestorePackageSetting)"
           Condition="'$(Scope)' == 'All' or '$(Scope)' == 'Stack'"
@@ -218,8 +208,6 @@
             ContinueOnError="false" />
     <!--Restore the xunit runner needed to run unit tests-->
     <Exec Command="$(NuGetCommand) restore $(MSBuildProjectDirectory)\packages.config -PackagesDirectory $(MSBuildProjectDirectory)\packages" />
-
-    <Delete Files="$(NuGetRestoreConfigFile)" />
   </Target>
 
   <Target Name="FilterBuild">
@@ -259,16 +247,7 @@
     <Message Text=""/>
 
     <!-- Restore packages -->
-    <Delete Files="$(NuGetRestoreConfigFile)" />
-    <WriteLinesToFile
-      File="$(NuGetRestoreConfigFile)"
-      Lines="&lt;configuration&gt;&lt;/configuration&gt;"
-      Overwrite="true"
-      Encoding="Unicode"/>
-    <Exec Command="$(NuGetCommand) sources add -Name LocalFeed -Source &quot;$(MSBuildProjectDirectory)\tools\LocalFeed&quot; $(NuGetRestoreConfigSwitch)"/>
-    <Exec Command="$(NuGetCommand) sources add -Name nugetRemote -Source &quot;https://api.nuget.org/v3/index.json&quot; $(NuGetRestoreConfigSwitch)"/>
     <Exec Command="$(NuGetCommand) restore %(CmdletSolutionsToBuild.FullPath) $(NuGetRestoreConfigSwitch) $(NuGetRestorePackageSetting)" ContinueOnError="false" />
-    <Delete Files="$(NuGetRestoreConfigFile)" />
   </Target>
 
   <!-- Build all flavors of the Cmdlets -->

src/ResourceManager/IotHub/Commands.IotHub.Test/Commands.IotHub.Test.csproj

@@ -42,12 +42,13 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Azure.Management.IotHub, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.IotHub.2.0.0\lib\net452\Microsoft.Azure.Management.IotHub.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.IotHub.2.1.0\lib\net452\Microsoft.Azure.Management.IotHub.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ScenarioTests\IotHubController.cs" />
+    <Compile Include="ScenarioTests\IotHubRoutingTests.cs" />
     <Compile Include="ScenarioTests\IotHubTests.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
@@ -57,9 +58,15 @@
     </None>
     <None Include="ScenarioTests\Assert.ps1" />
     <None Include="ScenarioTests\Common.ps1" />
+    <None Include="ScenarioTests\IotHubRoutingTests.ps1">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="ScenarioTests\IotHubTests.ps1">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.IotHub.Test.ScenarioTests.IotHubRoutingTests\TestAzureIotHubRoutingLifeCycle.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.IotHub.Test.ScenarioTests.IotHubTests\TestAzureIotHubCertificateLifeCycle.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>

src/ResourceManager/IotHub/Commands.IotHub.Test/Properties/AssemblyInfo.cs

@@ -1,6 +1,6 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using Xunit;
 
 // General Information about an assembly is controlled through the following 
 // set of attributes. Change these attribute values to modify the information
@@ -34,3 +34,4 @@
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("3.0.0")]
 [assembly: AssemblyFileVersion("3.0.0")]
+[assembly: CollectionBehavior(DisableTestParallelization = true)]

src/ResourceManager/IotHub/Commands.IotHub.Test/ScenarioTests/IotHubRoutingTests.cs

@@ -0,0 +1,48 @@
+// ----------------------------------------------------------------------------------
+//
+// 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.ServiceManagemenet.Common.Models;
+using Microsoft.Azure.Test;
+using Microsoft.WindowsAzure.Commands.ScenarioTest;
+using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Microsoft.Azure.Commands.IotHub.Test.ScenarioTests
+{
+    public class IotHubRoutingTests : RMTestBase
+    {
+        public XunitTracingInterceptor _logger;
+
+        public IotHubRoutingTests(ITestOutputHelper output)
+        {
+            _logger = new XunitTracingInterceptor(output);
+            XunitTracingInterceptor.AddToContext(_logger);
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        [Trait("Re-record", "ClientRuntime changes")]
+        public void TestAzureIotHubRoutingLifeCycle()
+        {
+            IotHubController.NewInstance.RunPsTestWorkflow(
+                 _logger,
+                () => { return new[] { "Test-AzureRmIotHubRoutingLifecycle" }; },
+                null,
+                null,
+                TestUtilities.GetCallingClass(),
+                TestUtilities.GetCurrentMethodName());
+        }
+    }
+}

src/ResourceManager/IotHub/Commands.IotHub.Test/ScenarioTests/IotHubRoutingTests.ps1

@@ -0,0 +1,125 @@
+# ----------------------------------------------------------------------------------
+#
+# 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.
+# ----------------------------------------------------------------------------------
+
+
+#################################
+## IotHub Routing Cmdlets	   ##
+#################################
+
+<#
+.SYNOPSIS
+Test all iothub routing cmdlets
+#>
+function Test-AzureRmIotHubRoutingLifecycle
+{
+	$Location = Get-Location "Microsoft.Devices" "IotHub" 
+	$IotHubName = getAssetName
+	$ResourceGroupName = getAssetName
+	$namespaceName = getAssetName 'eventHub'
+	$eventHubName = getAssetName
+	$authRuleName = getAssetName
+	$endpointName = getAssetName
+	$routeName = getAssetName
+	$Sku = "S1"
+	$EndpointTypeEventHub = [Microsoft.Azure.Commands.Management.IotHub.Models.PSEndpointType] "EventHub"
+	$RoutingSourceTwinChangeEvents = [Microsoft.Azure.Commands.Management.IotHub.Models.PSRoutingSource] "TwinChangeEvents"
+	$RoutingSourceDeviceMessages = [Microsoft.Azure.Commands.Management.IotHub.Models.PSRoutingSource] "DeviceMessages"
+
+	# Create or Update Resource Group
+	$resourceGroup = New-AzureRmResourceGroup -Name $ResourceGroupName -Location $Location 
+
+	# Create Iot Hub
+	$iothub = New-AzureRmIotHub -Name $IotHubName -ResourceGroupName $ResourceGroupName -Location $Location -SkuName $Sku -Units 1 
+
+	# Create new eventHub namespace  
+    $eventHubNamespace = New-AzureRmEventHubNamespace -ResourceGroup $ResourceGroupName -NamespaceName $namespaceName -Location $Location
+	Wait-Seconds 15
+	Assert-True {$eventHubNamespace.ProvisioningState -eq "Succeeded"}
+	$regexMatches = $eventHubNamespace.Id | Select-String -Pattern '^/subscriptions/(.*)/resourceGroups/(.*)/providers/(.*)$'
+	$eventHubSubscriptionId = $regexMatches.Matches.Groups[1].Value
+	$eventHubResourceGroup = $regexMatches.Matches.Groups[2].Value
+
+    # Create new eventHub     
+	$msgRetentionInDays = 3
+	$partionCount = 2
+    $eventHub = New-AzureRmEventHub -ResourceGroup $ResourceGroupName -NamespaceName $namespaceName -EventHubName $eventHubName -MessageRetentionInDays $msgRetentionInDays -PartitionCount $partionCount
+
+	# Create AuthRule for eventhub
+	$rights = "Listen","Send"
+	$authRule = New-AzureRmEventHubAuthorizationRule -ResourceGroup $ResourceGroupName -NamespaceName $namespaceName  -EventHubName $eventHubName -AuthorizationRuleName $authRuleName -Rights $rights
+	$keys = Get-AzureRmEventHubKey -ResourceGroup $ResourceGroupName -NamespaceName $namespaceName  -EventHubName $eventHubName -AuthorizationRuleName $authRuleName
+	$ehConnectionString = $keys.PrimaryConnectionString
+
+	# Get all routing endpoints
+	$routingEndpoints = Get-AzureRmIotHubRoutingEndpoint -ResourceGroupName $ResourceGroupName -Name $IotHubName
+	Assert-True { $routingEndpoints.Count -eq 0}
+
+	# Add event hub endpoint
+	$newRoutingEndpoint = Add-AzureRmIotHubRoutingEndpoint -ResourceGroupName $ResourceGroupName -Name $IotHubName -EndpointName $endpointName -EndpointType $EndpointTypeEventHub -EndpointResourceGroup $eventHubResourceGroup -EndpointSubscriptionId $eventHubSubscriptionId -ConnectionString $ehConnectionString
+	Assert-True { $newRoutingEndpoint.ResourceGroup -eq $eventHubResourceGroup}
+	Assert-True { $newRoutingEndpoint.SubscriptionId -eq $eventHubSubscriptionId}
+	Assert-True { $newRoutingEndpoint.Name -eq $endpointName}
+
+	# Get all routing endpoints
+	$updatedRoutingEndpoints = Get-AzureRmIotHubRoutingEndpoint -ResourceGroupName $ResourceGroupName -Name $IotHubName
+	Assert-True { $updatedRoutingEndpoints.Count -eq 1}
+	Assert-True { $updatedRoutingEndpoints[0].ResourceGroup -eq $eventHubResourceGroup}
+	Assert-True { $updatedRoutingEndpoints[0].SubscriptionId -eq $eventHubSubscriptionId}
+	Assert-True { $updatedRoutingEndpoints[0].Name -eq $endpointName}
+
+	# Get all routes
+	$routes = Get-AzureRmIotHubRoute -ResourceGroupName $ResourceGroupName -Name $IotHubName
+	Assert-True { $routingEndpoints.Count -eq 0}
+
+	# Add new route
+	$newRoute = Add-AzureRmIotHubRoute -ResourceGroupName $ResourceGroupName -Name $IotHubName -RouteName $routeName -Source $RoutingSourceDeviceMessages -EndpointName $endpointName
+	Assert-True { $newRoute.Name -eq $routeName}
+	Assert-True { $newRoute.Source -eq $RoutingSourceDeviceMessages}
+	Assert-True { $newRoute.EndpointNames -eq $endpointName}
+	Assert-False { $newRoute.IsEnabled }
+
+	# Get all routes
+	$routes = Get-AzureRmIotHubRoute -ResourceGroupName $ResourceGroupName -Name $IotHubName
+	Assert-True { $routes.Count -eq 1}
+	Assert-True { $routes[0].Name -eq $routeName}
+	Assert-True { $routes[0].Source -eq $RoutingSourceDeviceMessages}
+	Assert-True { $routes[0].EndpointNames -eq $endpointName}
+	Assert-False { $routes[0].IsEnabled }
+
+	# Set route 
+	$updatedRoute = Set-AzureRmIotHubRoute -ResourceGroupName $ResourceGroupName -Name $IotHubName -RouteName $routeName -Source $RoutingSourceTwinChangeEvents -Enabled
+	Assert-True { $updatedRoute.Name -eq $routeName}
+	Assert-True { $updatedRoute.Source -eq $RoutingSourceTwinChangeEvents}
+	Assert-True { $updatedRoute.EndpointNames -eq $endpointName}
+	Assert-True { $updatedRoute.IsEnabled }
+
+	# Test All Routes
+	$testRouteOutput = Test-AzureRmIotHubRoute -ResourceGroupName $ResourceGroupName -Name $IotHubName -Source $RoutingSourceTwinChangeEvents
+	Assert-True { $testRouteOutput.Count -eq 1}
+	Assert-True { $testRouteOutput[0].Name -eq $routeName}
+	Assert-True { $testRouteOutput[0].Source -eq $RoutingSourceTwinChangeEvents}
+	Assert-True { $testRouteOutput[0].EndpointNames -eq $endpointName}
+	Assert-True { $testRouteOutput[0].IsEnabled }
+
+	# Delete Route
+	$result = Remove-AzureRmIotHubRoute -ResourceGroupName $ResourceGroupName -Name $IotHubName -RouteName $routeName -Passthru
+	Assert-True { $result }
+
+	# Delete routing endpoint
+	$result = Remove-AzureRmIotHubRoutingEndpoint -ResourceGroupName $ResourceGroupName -Name $IotHubName -EndpointName $endpointName -Passthru
+	Assert-True { $result }
+
+	# Remove IotHub
+	Remove-AzureRmIotHub -ResourceGroupName $ResourceGroupName -Name $IotHubName
+}