diff --git a/AzurePowershell.Test.targets b/AzurePowershell.Test.targets index 62daee482588..88192f2bec24 100644 --- a/AzurePowershell.Test.targets +++ b/AzurePowershell.Test.targets @@ -42,34 +42,7 @@ 100000000 - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -77,17 +50,56 @@ Command="MSTest.exe /testcontainer:$(_testAssembly) /testsettings:$(_testSettings) /category:$(_testFilter) /resultsfile:$(_testResult)" ContinueOnError="false" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + Timeout="$(TestTimeout)" ContinueOnError="false" Condition=" @(XUnitTests) != '' "/> - + - diff --git a/build.proj b/build.proj index b49b13d339c6..b3aecfbbdfda 100644 --- a/build.proj +++ b/build.proj @@ -18,7 +18,12 @@ /p:CodeSign=True;DelaySign=True Test the code sign workflow locally. - + + /p:Scope + 'Azure': service management + 'AzureStorage': storage data plane cmdlets + 'Subfolder under src\ResourceManager': An individual cmdlet module + By default, it builds all --> @@ -36,11 +41,13 @@ $(PublishDirectory)\Setup $(PublishDirectory)\TestResults true - http://psget/PSGallery/api/v2/ + http://psget/PSGallery/api/v2/ - - + + + @@ -64,28 +71,19 @@ - - - + + ContinueOnError="false" + Condition=" '$(Scope)' == '' "/> @@ -113,7 +111,7 @@ - $(MSBuildProjectDirectory)\src\.nuget\NuGet.exe + $(MSBuildProjectDirectory)\tools\NuGet.exe $(MSBuildProjectDirectory)\restore.config -ConfigFile "$(NuGetRestoreConfigFile)" C:\Windows\System32\WindowsPowerShell\v1.0\powershell.exe @@ -140,9 +138,9 @@ - - - + + @@ -153,15 +151,11 @@ - + BuildInParallel="$(BuildInParallel)" + ContinueOnError="false" /> @@ -170,14 +164,18 @@ Projects="@(SetupPowershellGetSln)" Targets="Build" Properties="Configuration=$(Configuration);Platform=Any CPU" - ContinueOnError="false" /> + ContinueOnError="false" + Condition=" '$(Scope)' == '' "/> + + ContinueOnError="false" + Condition=" '$(Scope)' == '' "/> - + @@ -205,6 +203,10 @@ + + @@ -256,6 +258,10 @@ + + @@ -292,8 +298,7 @@ - - + @@ -305,7 +310,7 @@ - + diff --git a/setup-powershellget/Setup/ShortcutStartup.ps1 b/setup-powershellget/Setup/ShortcutStartup.ps1 index fed332e89acc..9c5e77b44433 100644 --- a/setup-powershellget/Setup/ShortcutStartup.ps1 +++ b/setup-powershellget/Setup/ShortcutStartup.ps1 @@ -26,27 +26,35 @@ Finalizing installation of Azure PowerShell. Installing Azure Modules from PowerShell Gallery. This may take some time... "@ + $env:PSModulePath = "$env:USERPROFILE\Documents\WindowsPowerShell\Modules;$env:ProgramFiles\WindowsPowerShell\Modules;$env:SystemRoot\system32\WindowsPowerShell\v1.0\Modules\" + Import-Module PackageManagement - Get-PackageProvider -Name NuGet -ForceBootstrap + + $result = Get-PackageProvider -Name NuGet -ForceBootstrap + + Import-Module PowerShellGet - $NuGetPublishingSource = $env:NuGetPublishingSource - if ([string]::IsNullOrWhiteSpace($NuGetPublishingSource)) { - Install-Module AzureRM -Repository $NuGetPublishingSource - } else { - Install-Module AzureRM - } + Install-Module AzureRM + Write-Output "AzureRM $((Get-InstalledModule -Name AzureRM)[0].Version) installed..." + Update-AzureRM } else { cd c:\ $welcomeMessage = @" For a list of all Azure cmdlets type 'help azure'. For a list of Azure Pack cmdlets type 'Get-Command *wapack*'. + +To use Azure Service Management cmdlets please execute the following cmdlet: + Install-Module Azure "@ Write-Output $welcomeMessage $VerbosePreference = "Continue" } } -catch { Write-Output $error } -if ($error) { - Read-Host -Prompt "An error occured during installation. Press any key..." +catch +{ +Write-Output "An error occured during installation." +Write-Output $error +Write-Output "Press any key..." +$host.UI.RawUI.ReadKey("NoEcho,IncludeKeyDown") } \ No newline at end of file diff --git a/setup-powershellget/azurecmd.wxs b/setup-powershellget/azurecmd.wxs index fc9f5f12c862..bca2e41bc536 100644 --- a/setup-powershellget/azurecmd.wxs +++ b/setup-powershellget/azurecmd.wxs @@ -1,6 +1,6 @@  - + @@ -28,8 +28,6 @@ - - @@ -60,19 +58,16 @@ - + + - - - - - @@ -83,7 +78,7 @@ @@ -92,15 +87,14 @@ - - + diff --git a/src/.nuget/NuGet.Config b/src/.nuget/NuGet.Config deleted file mode 100644 index 67524b49b980..000000000000 --- a/src/.nuget/NuGet.Config +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/src/.nuget/NuGet.targets b/src/.nuget/NuGet.targets deleted file mode 100644 index 2d11ba558f2b..000000000000 --- a/src/.nuget/NuGet.targets +++ /dev/null @@ -1,153 +0,0 @@ - - - - $(MSBuildProjectDirectory)\..\ - - - false - - - false - - - true - - - false - - - - - - - - - - - $([System.IO.Path]::Combine($(SolutionDir), ".nuget")) - $([System.IO.Path]::Combine($(ProjectDir), "packages.config")) - $([System.IO.Path]::Combine($(SolutionDir), "packages")) - - - - - $(SolutionDir).nuget - packages.config - $(SolutionDir)packages - - - - - $(NuGetToolsPath)\nuget.exe - @(PackageSource) - - "$(NuGetExePath)" - mono --runtime=v4.0.30319 $(NuGetExePath) - - $(TargetDir.Trim('\\')) - - -RequireConsent - - $(NuGetCommand) install "$(PackagesConfig)" -source "$(PackageSources)" $(RequireConsentSwitch) -o "$(PackagesDir)" - $(NuGetCommand) pack "$(ProjectPath)" -p Configuration=$(Configuration) -o "$(PackageOutputDir)" -symbols - - - - RestorePackages; - $(BuildDependsOn); - - - - - $(BuildDependsOn); - BuildPackage; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/Common/Commands.Common.Storage/Commands.Common.Storage.csproj b/src/Common/Commands.Common.Storage/Commands.Common.Storage.csproj index 44f3ed04871c..8dbda6b0aea0 100644 --- a/src/Common/Commands.Common.Storage/Commands.Common.Storage.csproj +++ b/src/Common/Commands.Common.Storage/Commands.Common.Storage.csproj @@ -12,7 +12,6 @@ v4.5 512 - ..\..\ true /assemblyCompareMode:StrongNameIgnoringVersion @@ -57,7 +56,7 @@ ..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -182,6 +181,5 @@ - \ No newline at end of file diff --git a/src/Common/Commands.Common.Storage/packages.config b/src/Common/Commands.Common.Storage/packages.config index dad781bcb501..bc1a6455a430 100644 --- a/src/Common/Commands.Common.Storage/packages.config +++ b/src/Common/Commands.Common.Storage/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/Common/AzurePSCmdlet.cs b/src/Common/Commands.Common/AzurePSCmdlet.cs similarity index 100% rename from src/Common/AzurePSCmdlet.cs rename to src/Common/Commands.Common/AzurePSCmdlet.cs diff --git a/src/Common/Commands.Common/Commands.Common.csproj b/src/Common/Commands.Common/Commands.Common.csproj index cdc01e00f5a1..5696d4a1fcce 100644 --- a/src/Common/Commands.Common/Commands.Common.csproj +++ b/src/Common/Commands.Common/Commands.Common.csproj @@ -12,7 +12,6 @@ v4.5 512 - ..\..\ true /assemblyCompareMode:StrongNameIgnoringVersion 06e19c11 @@ -64,7 +63,7 @@ ..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -143,12 +142,9 @@ - - AzurePSCmdlet.cs - + - @@ -157,8 +153,6 @@ Resources.resx - - @@ -167,25 +161,9 @@ - - - - - - - - - - - - - - - - @@ -203,6 +181,5 @@ - \ No newline at end of file diff --git a/src/Common/Commands.Common/ProfileClient.cs b/src/Common/Commands.Common/ProfileClient.cs index b0bff4a9d6b8..528674fc4352 100644 --- a/src/Common/Commands.Common/ProfileClient.cs +++ b/src/Common/Commands.Common/ProfileClient.cs @@ -22,7 +22,7 @@ using Hyak.Common; using Microsoft.Azure.Common.Authentication.Factories; using Microsoft.Azure.Common.Authentication.Models; -using Microsoft.Azure.Common.Authentication.Properties; +using Microsoft.WindowsAzure.Commands.Common.Properties; using Microsoft.WindowsAzure.Subscriptions; namespace Microsoft.Azure.Common.Authentication diff --git a/src/Common/Commands.Common/Properties/Resources.Designer.cs b/src/Common/Commands.Common/Properties/Resources.Designer.cs index 14275289ba96..f6602baf5d1d 100644 --- a/src/Common/Commands.Common/Properties/Resources.Designer.cs +++ b/src/Common/Commands.Common/Properties/Resources.Designer.cs @@ -1,17 +1,17 @@ //------------------------------------------------------------------------------ // // This code was generated by a tool. -// Runtime Version:4.0.30319.0 +// Runtime Version:4.0.30319.42000 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. // //------------------------------------------------------------------------------ -namespace Microsoft.WindowsAzure.Commands.Common.Properties -{ - - +namespace Microsoft.WindowsAzure.Commands.Common.Properties { + using System; + + /// /// A strongly-typed resource class, for looking up localized strings, etc. /// @@ -231,6 +231,15 @@ public static string AddTrafficManagerEndpointFailed { } } + /// + /// Looks up a localized string similar to [Common.Authentication]: Authenticating for account {0} with single tenant {1}.. + /// + public static string AuthenticatingForSingleTenant { + get { + return ResourceManager.GetString("AuthenticatingForSingleTenant", resourceCulture); + } + } + /// /// Looks up a localized string similar to Windows Azure Powershell\. /// @@ -564,6 +573,15 @@ public static string ChangeSettingsElementMessage { } } + /// + /// Looks up a localized string similar to Changing public environment is not supported.. + /// + public static string ChangingDefaultEnvironmentNotSupported { + get { + return ResourceManager.GetString("ChangingDefaultEnvironmentNotSupported", resourceCulture); + } + } + /// /// Looks up a localized string similar to Choose which publish settings file to use:. /// @@ -945,6 +963,33 @@ public static string EnvironmentNameDoesntMatchSubscription { } } + /// + /// Looks up a localized string similar to Environment name needs to be specified.. + /// + public static string EnvironmentNameNeedsToBeSpecified { + get { + return ResourceManager.GetString("EnvironmentNameNeedsToBeSpecified", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Environment needs to be specified.. + /// + public static string EnvironmentNeedsToBeSpecified { + get { + return ResourceManager.GetString("EnvironmentNeedsToBeSpecified", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The environment name '{0}' is not found.. + /// + public static string EnvironmentNotFound { + get { + return ResourceManager.GetString("EnvironmentNotFound", resourceCulture); + } + } + /// /// Looks up a localized string similar to environments.xml. /// @@ -990,6 +1035,15 @@ public static string FailedJobErrorMessage { } } + /// + /// Looks up a localized string similar to File path is not valid.. + /// + public static string FilePathIsNotValid { + get { + return ResourceManager.GetString("FilePathIsNotValid", resourceCulture); + } + } + /// /// Looks up a localized string similar to The HTTP request was forbidden with client authentication scheme 'Anonymous'.. /// @@ -1472,6 +1526,15 @@ public static string InvalidSubscriptionId { } } + /// + /// Looks up a localized string similar to Must specify a non-null subscription name.. + /// + public static string InvalidSubscriptionName { + get { + return ResourceManager.GetString("InvalidSubscriptionName", resourceCulture); + } + } + /// /// Looks up a localized string similar to A valid subscription name is required. This can be provided using the -Subscription parameter or by setting the subscription via the Set-AzureSubscription cmdlet. /// @@ -2702,6 +2765,15 @@ public static string RemoveAzureServiceWaitMessage { } } + /// + /// Looks up a localized string similar to The default subscription is being removed. Use Select-AzureSubscription -Default <subscriptionName> to select a new default subscription.. + /// + public static string RemoveDefaultSubscription { + get { + return ResourceManager.GetString("RemoveDefaultSubscription", resourceCulture); + } + } + /// /// Looks up a localized string similar to Removing {0} deployment for {1} service. /// @@ -2954,6 +3026,15 @@ public static string RemoveWebsiteWarning { } } + /// + /// Looks up a localized string similar to Removing public environment is not supported.. + /// + public static string RemovingDefaultEnvironmentsNotSupported { + get { + return ResourceManager.GetString("RemovingDefaultEnvironmentsNotSupported", resourceCulture); + } + } + /// /// Looks up a localized string similar to Deleting namespace. /// @@ -3693,6 +3774,15 @@ public static string SubscriptionDataFileNotFound { } } + /// + /// Looks up a localized string similar to The subscription id {0} doesn't exist.. + /// + public static string SubscriptionIdNotFoundMessage { + get { + return ResourceManager.GetString("SubscriptionIdNotFoundMessage", resourceCulture); + } + } + /// /// Looks up a localized string similar to Subscription must not be null. /// @@ -3702,6 +3792,33 @@ public static string SubscriptionMustNotBeNull { } } + /// + /// Looks up a localized string similar to Subscription name needs to be specified.. + /// + public static string SubscriptionNameNeedsToBeSpecified { + get { + return ResourceManager.GetString("SubscriptionNameNeedsToBeSpecified", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to The subscription name {0} doesn't exist.. + /// + public static string SubscriptionNameNotFoundMessage { + get { + return ResourceManager.GetString("SubscriptionNameNotFoundMessage", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Subscription needs to be specified.. + /// + public static string SubscriptionNeedsToBeSpecified { + get { + return ResourceManager.GetString("SubscriptionNeedsToBeSpecified", resourceCulture); + } + } + /// /// Looks up a localized string similar to Suspend. /// @@ -3774,6 +3891,24 @@ public static string UpdatedSettings { } } + /// + /// Looks up a localized string similar to User name is not valid.. + /// + public static string UserNameIsNotValid { + get { + return ResourceManager.GetString("UserNameIsNotValid", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to User name needs to be specified.. + /// + public static string UserNameNeedsToBeSpecified { + get { + return ResourceManager.GetString("UserNameNeedsToBeSpecified", resourceCulture); + } + } + /// /// Looks up a localized string similar to A value for the VLan Id has to be provided.. /// diff --git a/src/Common/Commands.Common/Properties/Resources.resx b/src/Common/Commands.Common/Properties/Resources.resx index 98ebeec2c58d..33e5c44cf6f7 100644 --- a/src/Common/Commands.Common/Properties/Resources.resx +++ b/src/Common/Commands.Common/Properties/Resources.resx @@ -1496,4 +1496,49 @@ Select Y to enable data collection [Y/N]: The setting profile has been saved to the following path '{0}'. + + [Common.Authentication]: Authenticating for account {0} with single tenant {1}. + + + Changing public environment is not supported. + + + Environment name needs to be specified. + + + Environment needs to be specified. + + + The environment name '{0}' is not found. + + + File path is not valid. + + + Must specify a non-null subscription name. + + + The default subscription is being removed. Use Select-AzureSubscription -Default <subscriptionName> to select a new default subscription. + + + Removing public environment is not supported. + + + The subscription id {0} doesn't exist. + + + Subscription name needs to be specified. + + + The subscription name {0} doesn't exist. + + + Subscription needs to be specified. + + + User name is not valid. + + + User name needs to be specified. + \ No newline at end of file diff --git a/src/Common/Commands.Common/packages.config b/src/Common/Commands.Common/packages.config index 8b3394fd6012..357c4f26f18d 100644 --- a/src/Common/Commands.Common/packages.config +++ b/src/Common/Commands.Common/packages.config @@ -4,7 +4,7 @@ - + diff --git a/src/Common/Commands.ScenarioTests.Common/Commands.ScenarioTests.Common.csproj b/src/Common/Commands.ScenarioTests.Common/Commands.ScenarioTests.Common.csproj index 7e37ef305660..5f1e76cfdaf9 100644 --- a/src/Common/Commands.ScenarioTests.Common/Commands.ScenarioTests.Common.csproj +++ b/src/Common/Commands.ScenarioTests.Common/Commands.ScenarioTests.Common.csproj @@ -155,30 +155,15 @@ + + {cff09e81-1e31-444e-b4d4-a21e946c29e2} + Commands.ServiceManagement.Common + {5ee72c53-1720-4309-b54b-5fb79703195f} Commands.Common - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - \ No newline at end of file diff --git a/src/Common/Storage/Azure.Storage.psd1 b/src/Common/Storage/Azure.Storage.psd1 index d8088f9b1a3f..54f4e2bea750 100644 --- a/src/Common/Storage/Azure.Storage.psd1 +++ b/src/Common/Storage/Azure.Storage.psd1 @@ -79,7 +79,7 @@ VariablesToExport = '*' # Aliases to export from this module AliasesToExport = @( - 'Get-AzureRMStorageContainerAcl', + 'Get-AzureStorageContainerAcl', 'Start-CopyAzureStorageBlob', 'Stop-CopyAzureStorageBlob' ) diff --git a/src/Common/Storage/Commands.Storage.MsTest2/Commands.Storage.MsTest2.csproj b/src/Common/Storage/Commands.Storage.MsTest2/Commands.Storage.MsTest2.csproj index b9d524e04086..ad83697aeb5a 100644 --- a/src/Common/Storage/Commands.Storage.MsTest2/Commands.Storage.MsTest2.csproj +++ b/src/Common/Storage/Commands.Storage.MsTest2/Commands.Storage.MsTest2.csproj @@ -61,18 +61,4 @@ - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/src/Common/Storage/Commands.Storage.MsTestLib/Commands.Storage.MsTestLib.csproj b/src/Common/Storage/Commands.Storage.MsTestLib/Commands.Storage.MsTestLib.csproj index fc03eb031fb0..66ed265773c3 100644 --- a/src/Common/Storage/Commands.Storage.MsTestLib/Commands.Storage.MsTestLib.csproj +++ b/src/Common/Storage/Commands.Storage.MsTestLib/Commands.Storage.MsTestLib.csproj @@ -70,18 +70,4 @@ - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/src/Common/Storage/Commands.Storage.ScenarioTest/Commands.Storage.ScenarioTest.csproj b/src/Common/Storage/Commands.Storage.ScenarioTest/Commands.Storage.ScenarioTest.csproj index bdd0e1477fc5..ba7d2757b27d 100644 --- a/src/Common/Storage/Commands.Storage.ScenarioTest/Commands.Storage.ScenarioTest.csproj +++ b/src/Common/Storage/Commands.Storage.ScenarioTest/Commands.Storage.ScenarioTest.csproj @@ -239,19 +239,5 @@ - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/src/Common/Storage/Commands.Storage.StorageTestLib/Commands.Storage.StorageTestLib.csproj b/src/Common/Storage/Commands.Storage.StorageTestLib/Commands.Storage.StorageTestLib.csproj index 5910418946bc..39cbf00d1f00 100644 --- a/src/Common/Storage/Commands.Storage.StorageTestLib/Commands.Storage.StorageTestLib.csproj +++ b/src/Common/Storage/Commands.Storage.StorageTestLib/Commands.Storage.StorageTestLib.csproj @@ -99,18 +99,4 @@ - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/src/Common/Storage/Commands.Storage.Test/Commands.Storage.Test.csproj b/src/Common/Storage/Commands.Storage.Test/Commands.Storage.Test.csproj index d1c662acd1c2..83389c210171 100644 --- a/src/Common/Storage/Commands.Storage.Test/Commands.Storage.Test.csproj +++ b/src/Common/Storage/Commands.Storage.Test/Commands.Storage.Test.csproj @@ -239,6 +239,10 @@ {c1bda476-a5cc-4394-914d-48b0ec31a710} Commands.ScenarioTests.Common + + {cff09e81-1e31-444e-b4d4-a21e946c29e2} + Commands.ServiceManagement.Common + {08cf7da7-0392-4a19-b79b-e1ff67cdb81a} Commands.Storage @@ -276,19 +280,5 @@ - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/src/Common/Storage/Commands.Storage/Commands.Storage.csproj b/src/Common/Storage/Commands.Storage/Commands.Storage.csproj index 1f96ef72944b..0c08503c0dd3 100644 --- a/src/Common/Storage/Commands.Storage/Commands.Storage.csproj +++ b/src/Common/Storage/Commands.Storage/Commands.Storage.csproj @@ -50,7 +50,7 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -280,6 +280,10 @@ {5ee72c53-1720-4309-b54b-5fb79703195f} Commands.Common + + {cff09e81-1e31-444e-b4d4-a21e946c29e2} + Commands.ServiceManagement.Common + @@ -314,9 +318,8 @@ - - + powershell.exe -ExecutionPolicy Unrestricted -File "$(ProjectDir)\PostBuild.ps1" "..\..\..\ResourceManager\AzureResourceManager" \ No newline at end of file diff --git a/src/Common/Storage/Commands.Storage/Common/StorageNouns.cs b/src/Common/Storage/Commands.Storage/Common/StorageNouns.cs index 396734e23e02..1c7bb28e2ed7 100644 --- a/src/Common/Storage/Commands.Storage/Common/StorageNouns.cs +++ b/src/Common/Storage/Commands.Storage/Common/StorageNouns.cs @@ -22,27 +22,27 @@ public static class StorageNouns /// /// Blob cmdlet name /// - public const string Blob = "AzureRMStorageBlob"; + public const string Blob = "AzureStorageBlob"; /// /// Blobcontent cmdlet name /// - public const string BlobContent = "AzureRMStorageBlobContent"; + public const string BlobContent = "AzureStorageBlobContent"; /// /// blob snapshot cmdlet name /// - public const string BlobSnapshot = "AzureRMStorageBlobSnapshot"; + public const string BlobSnapshot = "AzureStorageBlobSnapshot"; /// /// Container cmdlet name /// - public const string Container = "AzureRMStorageContainer"; + public const string Container = "AzureStorageContainer"; /// /// Container acl cmdlet name /// - public const string ContainerAcl = "AzureRMStorageContainerAcl"; + public const string ContainerAcl = "AzureStorageContainerAcl"; /// /// Http protocol @@ -57,12 +57,12 @@ public static class StorageNouns /// /// Queue cmdlet name /// - public const string Queue = "AzureRMStorageQueue"; + public const string Queue = "AzureStorageQueue"; /// /// Storage context cmdlet name /// - public const string StorageContext = "AzureRMStorageContext"; + public const string StorageContext = "AzureStorageContext"; /// /// Storage account name @@ -72,12 +72,12 @@ public static class StorageNouns /// /// Table cmdlet name /// - public const string Table = "AzureRMStorageTable"; + public const string Table = "AzureStorageTable"; /// /// Copy azure storage blob /// - public const string CopyBlob = "AzureRMStorageBlobCopy"; + public const string CopyBlob = "AzureStorageBlobCopy"; /// /// Copy azure storage blob deprecated name @@ -87,78 +87,78 @@ public static class StorageNouns /// /// Copy status for azure storage blob /// - public const string CopyBlobStatus = "AzureRMStorageBlobCopyState"; + public const string CopyBlobStatus = "AzureStorageBlobCopyState"; /// /// Azure storage service hour metrics /// - public const string StorageServiceMetrics = "AzureRMStorageServiceMetricsProperty"; + public const string StorageServiceMetrics = "AzureStorageServiceMetricsProperty"; /// /// Azure storage service logging /// - public const string StorageServiceLogging = "AzureRMStorageServiceLoggingProperty"; + public const string StorageServiceLogging = "AzureStorageServiceLoggingProperty"; /// /// Azure storage CORS rule /// - public const string StorageCORSRule = "AzureRMStorageCORSRule"; + public const string StorageCORSRule = "AzureStorageCORSRule"; /// /// Azure storage container sas /// - public const string ContainerSas = "AzureRMStorageContainerSASToken"; + public const string ContainerSas = "AzureStorageContainerSASToken"; /// /// Azure storage blob sas /// - public const string BlobSas = "AzureRMStorageBlobSASToken"; + public const string BlobSas = "AzureStorageBlobSASToken"; /// /// Azure storage file share sas /// - public const string ShareSas = "AzureRMStorageShareSASToken"; + public const string ShareSas = "AzureStorageShareSASToken"; /// /// Azure storage file sas /// - public const string FileSas = "AzureRMStorageFileSASToken"; + public const string FileSas = "AzureStorageFileSASToken"; /// /// Azure storage table sas /// - public const string TableSas = "AzureRMStorageTableSASToken"; + public const string TableSas = "AzureStorageTableSASToken"; /// /// Azure storage queue sas /// - public const string QueueSas = "AzureRMStorageQueueSASToken"; + public const string QueueSas = "AzureStorageQueueSASToken"; /// /// Azure storage table stored access policy /// - public const string TableStoredAccessPolicy = "AzureRMStorageTableStoredAccessPolicy"; + public const string TableStoredAccessPolicy = "AzureStorageTableStoredAccessPolicy"; /// /// Azure storage share stored access policy /// - public const string ShareStoredAccessPolicy = "AzureRMStorageShareStoredAccessPolicy"; + public const string ShareStoredAccessPolicy = "AzureStorageShareStoredAccessPolicy"; /// /// Azure storage container stored access policy /// - public const string ContainerStoredAccessPolicy = "AzureRMStorageContainerStoredAccessPolicy"; + public const string ContainerStoredAccessPolicy = "AzureStorageContainerStoredAccessPolicy"; /// /// Azure storage container stored access policy /// - public const string QueueStoredAccessPolicy = "AzureRMStorageQueueStoredAccessPolicy"; + public const string QueueStoredAccessPolicy = "AzureStorageQueueStoredAccessPolicy"; /// /// Azure storage share quota /// - public const string ShareQuota = "AzureRMStorageShareQuota"; + public const string ShareQuota = "AzureStorageShareQuota"; /// /// Default service metrics version diff --git a/src/Common/Storage/Commands.Storage/File/Constants.cs b/src/Common/Storage/Commands.Storage/File/Constants.cs index 200595ced7a5..f7e3b8e67a43 100644 --- a/src/Common/Storage/Commands.Storage/File/Constants.cs +++ b/src/Common/Storage/Commands.Storage/File/Constants.cs @@ -34,37 +34,37 @@ internal static class Constants /// /// Cmdlet name for storage context. /// - public const string StorageContextCmdletName = "AzureRMStorageContext"; + public const string StorageContextCmdletName = "AzureStorageContext"; /// /// Cmdlet name for file share. /// - public const string ShareCmdletName = "AzureRMStorageShare"; + public const string ShareCmdletName = "AzureStorageShare"; /// /// Cmdlet name for file directory. /// - public const string FileDirectoryCmdletName = "AzureRMStorageDirectory"; + public const string FileDirectoryCmdletName = "AzureStorageDirectory"; /// /// Cmdlet name for file. /// - public const string FileCmdletName = "AzureRMStorageFile"; + public const string FileCmdletName = "AzureStorageFile"; /// /// Cmdlet name for file content. /// - public const string FileContentCmdletName = "AzureRMStorageFileContent"; + public const string FileContentCmdletName = "AzureStorageFileContent"; /// /// Cmdlet name for file copy. /// - public const string FileCopyCmdletName = "AzureRMStorageFileCopy"; + public const string FileCopyCmdletName = "AzureStorageFileCopy"; /// /// Cmdlet name for file copy state. /// - public const string FileCopyCmdletStateName = "AzureRMStorageFileCopyState"; + public const string FileCopyCmdletStateName = "AzureStorageFileCopyState"; /// /// Stores the default endpoint suffix for storage accounts. diff --git a/src/Common/Storage/Commands.Storage/packages.config b/src/Common/Storage/Commands.Storage/packages.config index 12121d290ef4..0274f35be288 100644 --- a/src/Common/Storage/Commands.Storage/packages.config +++ b/src/Common/Storage/Commands.Storage/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/ResourceManager.sln b/src/ResourceManager.ForRefactoringOnly.sln similarity index 98% rename from src/ResourceManager.sln rename to src/ResourceManager.ForRefactoringOnly.sln index 8f6a6175ac94..c5a317407933 100644 --- a/src/ResourceManager.sln +++ b/src/ResourceManager.ForRefactoringOnly.sln @@ -1,6 +1,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.30723.0 +VisualStudioVersion = 12.0.31101.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8531411A-0137-4E27-9C5E-49E07C245048}" ProjectSection(SolutionItems) = preProject @@ -121,6 +121,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common", "Common\C EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage", "Common\Storage\Commands.Storage\Commands.Storage.csproj", "{08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ServiceManagement.Common", "ServiceManagement\Common\Commands.ServiceManagement.Common\Commands.ServiceManagement.Common.csproj", "{CFF09E81-1E31-444E-B4D4-A21E946C29E2}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -347,6 +349,10 @@ Global {08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}.Debug|Any CPU.Build.0 = Debug|Any CPU {08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}.Release|Any CPU.ActiveCfg = Release|Any CPU {08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}.Release|Any CPU.Build.0 = Release|Any CPU + {CFF09E81-1E31-444E-B4D4-A21E946C29E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CFF09E81-1E31-444E-B4D4-A21E946C29E2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CFF09E81-1E31-444E-B4D4-A21E946C29E2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CFF09E81-1E31-444E-B4D4-A21E946C29E2}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/ResourceManager/ApiManagement/ApiManagement.sln b/src/ResourceManager/ApiManagement/ApiManagement.sln new file mode 100644 index 000000000000..509ae32588a3 --- /dev/null +++ b/src/ResourceManager/ApiManagement/ApiManagement.sln @@ -0,0 +1,106 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.31101.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{95C16AED-FD57-42A0-86C3-2CF4300A4817}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ResourceManager.Common", "..\Common\Commands.ResourceManager.Common\Commands.ResourceManager.Common.csproj", "{3819D8A7-C62C-4C47-8DDD-0332D9CE1252}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ApiManagement", "Commands.ApiManagement\Commands.ApiManagement.csproj", "{DC0A9742-DF36-48C9-BD2F-68D01AED6257}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common.Storage", "..\..\Common\Commands.Common.Storage\Commands.Common.Storage.csproj", "{65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ApiManagement.Test", "Commands.ApiManagement.Test\Commands.ApiManagement.Test.csproj", "{BEC9ECE9-A3D6-4B24-A682-1FA890647D9D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ApiManagement.ServiceManagement", "Commands.ApiManagement.ServiceManagement\Commands.ApiManagement.ServiceManagement.csproj", "{ED8BA708-AF42-4C08-9F4E-DAA1037797D5}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ApiManagement.ServiceManagement.Test", "Commands.SMAPI.Test\Commands.ApiManagement.ServiceManagement.Test.csproj", "{6448E795-3D02-4BDD-B0C7-AD0A2AFE3C8B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ScenarioTests.ResourceManager.Common", "..\Common\Commands.ScenarioTests.ResourceManager.Common\Commands.ScenarioTests.ResourceManager.Common.csproj", "{3436A126-EDC9-4060-8952-9A1BE34CDD95}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Profile", "..\Profile\Commands.Profile\Commands.Profile.csproj", "{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Resources", "..\Resources\Commands.Resources\Commands.Resources.csproj", "{E1F5201D-6067-430E-B303-4E367652991B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Management.Storage", "..\Storage\Commands.Management.Storage\Commands.Management.Storage.csproj", "{A50AB133-5C04-4A17-9054-F8343683EC23}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Resources.Rest", "..\Resources\Commands.ResourceManager\Cmdlets\Commands.Resources.Rest.csproj", "{8058D403-06E3-4BED-8924-D166CE303961}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage", "..\..\Common\Storage\Commands.Storage\Commands.Storage.csproj", "{08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common", "..\..\Common\Commands.Common\Commands.Common.csproj", "{5EE72C53-1720-4309-B54B-5FB79703195F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ServiceManagement.Common", "..\..\ServiceManagement\Common\Commands.ServiceManagement.Common\Commands.ServiceManagement.Common.csproj", "{CFF09E81-1E31-444E-B4D4-A21E946C29E2}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.Build.0 = Release|Any CPU + {DC0A9742-DF36-48C9-BD2F-68D01AED6257}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DC0A9742-DF36-48C9-BD2F-68D01AED6257}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DC0A9742-DF36-48C9-BD2F-68D01AED6257}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DC0A9742-DF36-48C9-BD2F-68D01AED6257}.Release|Any CPU.Build.0 = Release|Any CPU + {65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Release|Any CPU.Build.0 = Release|Any CPU + {BEC9ECE9-A3D6-4B24-A682-1FA890647D9D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {BEC9ECE9-A3D6-4B24-A682-1FA890647D9D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {BEC9ECE9-A3D6-4B24-A682-1FA890647D9D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {BEC9ECE9-A3D6-4B24-A682-1FA890647D9D}.Release|Any CPU.Build.0 = Release|Any CPU + {ED8BA708-AF42-4C08-9F4E-DAA1037797D5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {ED8BA708-AF42-4C08-9F4E-DAA1037797D5}.Debug|Any CPU.Build.0 = Debug|Any CPU + {ED8BA708-AF42-4C08-9F4E-DAA1037797D5}.Release|Any CPU.ActiveCfg = Release|Any CPU + {ED8BA708-AF42-4C08-9F4E-DAA1037797D5}.Release|Any CPU.Build.0 = Release|Any CPU + {6448E795-3D02-4BDD-B0C7-AD0A2AFE3C8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6448E795-3D02-4BDD-B0C7-AD0A2AFE3C8B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6448E795-3D02-4BDD-B0C7-AD0A2AFE3C8B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6448E795-3D02-4BDD-B0C7-AD0A2AFE3C8B}.Release|Any CPU.Build.0 = Release|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Release|Any CPU.Build.0 = Release|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.Build.0 = Release|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Release|Any CPU.Build.0 = Release|Any CPU + {A50AB133-5C04-4A17-9054-F8343683EC23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A50AB133-5C04-4A17-9054-F8343683EC23}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A50AB133-5C04-4A17-9054-F8343683EC23}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A50AB133-5C04-4A17-9054-F8343683EC23}.Release|Any CPU.Build.0 = Release|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Release|Any CPU.Build.0 = Release|Any CPU + {08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}.Release|Any CPU.Build.0 = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.Build.0 = Release|Any CPU + {CFF09E81-1E31-444E-B4D4-A21E946C29E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CFF09E81-1E31-444E-B4D4-A21E946C29E2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CFF09E81-1E31-444E-B4D4-A21E946C29E2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CFF09E81-1E31-444E-B4D4-A21E946C29E2}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {BEC9ECE9-A3D6-4B24-A682-1FA890647D9D} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} + {6448E795-3D02-4BDD-B0C7-AD0A2AFE3C8B} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} + {3436A126-EDC9-4060-8952-9A1BE34CDD95} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} + EndGlobalSection +EndGlobal diff --git a/src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands.ApiManagement.ServiceManagement.csproj b/src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands.ApiManagement.ServiceManagement.csproj index adcb747e2c1f..8fdef0af0cf4 100644 --- a/src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands.ApiManagement.ServiceManagement.csproj +++ b/src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/Commands.ApiManagement.ServiceManagement.csproj @@ -60,7 +60,7 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -237,6 +237,10 @@ {65C3A86A-716D-4E7D-AB67-1DB00B3BF72D} Commands.Common.Storage + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common @@ -258,23 +262,5 @@ - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - \ No newline at end of file diff --git a/src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/packages.config b/src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/packages.config index 5fcdc5862226..7cbc29f96364 100644 --- a/src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/packages.config +++ b/src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/packages.config @@ -3,7 +3,7 @@ - + diff --git a/src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/Commands.ApiManagement.Test.csproj b/src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/Commands.ApiManagement.Test.csproj index 6eb66cc1db04..894b5566d560 100644 --- a/src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/Commands.ApiManagement.Test.csproj +++ b/src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/Commands.ApiManagement.Test.csproj @@ -42,7 +42,7 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -51,7 +51,7 @@ False - ..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\AzureRM.Resources\Microsoft.Azure.Gallery.dll + ..\..\..\packages\Microsoft.Azure.Gallery.2.6.2-preview\lib\net40\Microsoft.Azure.Gallery.dll False @@ -59,7 +59,7 @@ False - ..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\AzureRM.Resources\Microsoft.Azure.Management.Authorization.dll + ..\..\..\packages\Microsoft.Azure.Management.Authorization.1.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll ..\..\..\packages\Microsoft.Azure.Management.Storage.2.4.0-preview\lib\net40\Microsoft.Azure.Management.Storage.dll @@ -157,17 +157,15 @@ {3436a126-edc9-4060-8952-9a1be34cdd95} Commands.ScenarioTests.ResourceManager.Common - - {e1f5201d-6067-430e-b303-4e367652991b} - Commands.Resources - {dc0a9742-df36-48c9-bd2f-68d01aed6257} Commands.ApiManagement - + + Designer + PreserveNewest @@ -201,22 +199,5 @@ - - xcopy "$(SolutionDir)Package\$(ConfigurationName)\*.*" $(TargetDir) /Y /E - - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/ScenarioTests/ApiManagementTests.cs b/src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/ScenarioTests/ApiManagementTests.cs index b2a44a4a77c0..f3df67152b36 100644 --- a/src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/ScenarioTests/ApiManagementTests.cs +++ b/src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/ScenarioTests/ApiManagementTests.cs @@ -16,7 +16,6 @@ namespace Microsoft.Azure.Commands.ApiManagement.Test.ScenarioTests { - using System; using Microsoft.Azure.Common.Authentication; using Microsoft.Azure.Gallery; using Microsoft.Azure.Management.Authorization; @@ -159,7 +158,14 @@ private void RunPowerShellTest(params string[] scripts) SetupManagementClients(); _helper.SetupEnvironment(AzureModule.AzureResourceManager); - _helper.SetupModules(AzureModule.AzureResourceManager, "ScenarioTests\\Common.ps1", "ScenarioTests\\" + GetType().Name + ".ps1"); + _helper.SetupModules(AzureModule.AzureResourceManager, + "ScenarioTests\\Common.ps1", + "ScenarioTests\\" + GetType().Name + ".ps1", + _helper.RMProfileModule, + _helper.RMResourceModule, + _helper.RMStorageDataPlaneModule, + _helper.RMStorageModule, + _helper.GetRMModulePath("AzureRM.ApiManagement.psd1")); _helper.RunPowerShellTest(scripts); } diff --git a/src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/ScenarioTests/ApiManagementTests.ps1 b/src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/ScenarioTests/ApiManagementTests.ps1 index 5a1848a0d541..149706f26558 100644 --- a/src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/ScenarioTests/ApiManagementTests.ps1 +++ b/src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/ScenarioTests/ApiManagementTests.ps1 @@ -129,7 +129,7 @@ function Test-BackupRestoreApiManagement New-AzureRmStorageAccount -StorageAccountName $storageAccountName -Location $storageLocation -ResourceGroupName $resourceGroupName -Type Standard_LRS $storageKey = (Get-AzureRmStorageAccountKey -ResourceGroupName $resourceGroupName -StorageAccountName $storageAccountName).Key1 - $storageContext = New-AzureRmStorageContext -StorageAccountName $storageAccountName -StorageAccountKey $storageKey + $storageContext = New-AzureStorageContext -StorageAccountName $storageAccountName -StorageAccountKey $storageKey $apiManagementName = Get-ApiManagementServiceName $organization = "apimpowershellorg" diff --git a/src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/packages.config b/src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/packages.config index 9d3b0d8c923a..40d4a4883355 100644 --- a/src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/packages.config +++ b/src/ResourceManager/ApiManagement/Commands.ApiManagement.Test/packages.config @@ -2,10 +2,12 @@ - + + + diff --git a/src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands.ApiManagement.csproj b/src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands.ApiManagement.csproj index c1459687453a..bfbaca53714f 100644 --- a/src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands.ApiManagement.csproj +++ b/src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands.ApiManagement.csproj @@ -59,7 +59,7 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -206,6 +206,10 @@ {65C3A86A-716D-4E7D-AB67-1DB00B3BF72D} Commands.Common.Storage + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common @@ -229,23 +233,5 @@ - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - \ No newline at end of file diff --git a/src/ResourceManager/ApiManagement/Commands.ApiManagement/packages.config b/src/ResourceManager/ApiManagement/Commands.ApiManagement/packages.config index 5fcdc5862226..7cbc29f96364 100644 --- a/src/ResourceManager/ApiManagement/Commands.ApiManagement/packages.config +++ b/src/ResourceManager/ApiManagement/Commands.ApiManagement/packages.config @@ -3,7 +3,7 @@ - + diff --git a/src/ResourceManager/ApiManagement/Commands.SMAPI.Test/Commands.ApiManagement.ServiceManagement.Test.csproj b/src/ResourceManager/ApiManagement/Commands.SMAPI.Test/Commands.ApiManagement.ServiceManagement.Test.csproj index 995a8446fcb7..0c4d6aaa3376 100644 --- a/src/ResourceManager/ApiManagement/Commands.SMAPI.Test/Commands.ApiManagement.ServiceManagement.Test.csproj +++ b/src/ResourceManager/ApiManagement/Commands.SMAPI.Test/Commands.ApiManagement.ServiceManagement.Test.csproj @@ -42,7 +42,7 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -51,7 +51,7 @@ False - ..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\AzureRM.Resources\Microsoft.Azure.Gallery.dll + ..\..\..\packages\Microsoft.Azure.Gallery.2.6.2-preview\lib\net40\Microsoft.Azure.Gallery.dll False @@ -59,7 +59,7 @@ False - ..\..\..\Package\$(Configuration)\ResourceManager\AzureResourceManager\AzureRM.Resources\Microsoft.Azure.Management.Authorization.dll + ..\..\..\packages\Microsoft.Azure.Management.Authorization.1.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll ..\..\..\packages\Microsoft.Azure.Management.Storage.2.4.0-preview\lib\net40\Microsoft.Azure.Management.Storage.dll @@ -160,17 +160,15 @@ {3436a126-edc9-4060-8952-9a1be34cdd95} Commands.ScenarioTests.ResourceManager.Common - - {e1f5201d-6067-430e-b303-4e367652991b} - Commands.Resources - {ed8ba708-af42-4c08-9f4e-daa1037797d5} Commands.ApiManagement.ServiceManagement - + + Designer + PreserveNewest @@ -242,22 +240,5 @@ - - xcopy "$(SolutionDir)Package\$(ConfigurationName)\*.*" $(TargetDir) /Y /E - - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/src/ResourceManager/ApiManagement/Commands.SMAPI.Test/ScenarioTests/ApiManagementTests.cs b/src/ResourceManager/ApiManagement/Commands.SMAPI.Test/ScenarioTests/ApiManagementTests.cs index 9cfd732a8db6..1d0eb9f14e4b 100644 --- a/src/ResourceManager/ApiManagement/Commands.SMAPI.Test/ScenarioTests/ApiManagementTests.cs +++ b/src/ResourceManager/ApiManagement/Commands.SMAPI.Test/ScenarioTests/ApiManagementTests.cs @@ -14,8 +14,6 @@ namespace Microsoft.Azure.Commands.ApiManagement.ServiceManagement.Test.ScenarioTests { - using System; - using System.Management.Automation; using Microsoft.Azure.Common.Authentication; using Microsoft.Azure.Gallery; using Microsoft.Azure.Management.ApiManagement; @@ -177,7 +175,11 @@ private void RunPowerShellTest(params string[] scripts) SetupManagementClients(); _helper.SetupEnvironment(AzureModule.AzureResourceManager); - _helper.SetupModules(AzureModule.AzureResourceManager, "ScenarioTests\\Common.ps1", "ScenarioTests\\" + GetType().Name + ".ps1"); + _helper.SetupModules(AzureModule.AzureResourceManager, + "ScenarioTests\\Common.ps1", + "ScenarioTests\\" + GetType().Name + ".ps1", + _helper.RMProfileModule, + _helper.GetRMModulePath(@"AzureRM.ApiManagement.psd1")); _helper.RunPowerShellTest(scripts); } diff --git a/src/ResourceManager/ApiManagement/Commands.SMAPI.Test/packages.config b/src/ResourceManager/ApiManagement/Commands.SMAPI.Test/packages.config index 96be623f83fb..5e525d1021d7 100644 --- a/src/ResourceManager/ApiManagement/Commands.SMAPI.Test/packages.config +++ b/src/ResourceManager/ApiManagement/Commands.SMAPI.Test/packages.config @@ -2,10 +2,12 @@ - + + + diff --git a/src/ResourceManager/ApiManagement/NuGet.Config b/src/ResourceManager/ApiManagement/NuGet.Config new file mode 100644 index 000000000000..2de911013532 --- /dev/null +++ b/src/ResourceManager/ApiManagement/NuGet.Config @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/ResourceManager/Automation/Automation.sln b/src/ResourceManager/Automation/Automation.sln new file mode 100644 index 000000000000..9376fc4f5b00 --- /dev/null +++ b/src/ResourceManager/Automation/Automation.sln @@ -0,0 +1,57 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.31101.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{95C16AED-FD57-42A0-86C3-2CF4300A4817}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ResourceManager.Common", "..\Common\Commands.ResourceManager.Common\Commands.ResourceManager.Common.csproj", "{3819D8A7-C62C-4C47-8DDD-0332D9CE1252}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Automation", "Commands.Automation\Commands.Automation.csproj", "{90DEF35A-F7FF-40D0-B008-F489A4C092DB}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Automation.Test", "Commands.Automation.Test\Commands.Automation.Test.csproj", "{59D1B5DC-9175-43EC-90C6-CBA601B3565F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Profile", "..\Profile\Commands.Profile\Commands.Profile.csproj", "{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ScenarioTests.ResourceManager.Common", "..\Common\Commands.ScenarioTests.ResourceManager.Common\Commands.ScenarioTests.ResourceManager.Common.csproj", "{3436A126-EDC9-4060-8952-9A1BE34CDD95}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common", "..\..\Common\Commands.Common\Commands.Common.csproj", "{5EE72C53-1720-4309-B54B-5FB79703195F}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.Build.0 = Release|Any CPU + {90DEF35A-F7FF-40D0-B008-F489A4C092DB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {90DEF35A-F7FF-40D0-B008-F489A4C092DB}.Debug|Any CPU.Build.0 = Debug|Any CPU + {90DEF35A-F7FF-40D0-B008-F489A4C092DB}.Release|Any CPU.ActiveCfg = Release|Any CPU + {90DEF35A-F7FF-40D0-B008-F489A4C092DB}.Release|Any CPU.Build.0 = Release|Any CPU + {59D1B5DC-9175-43EC-90C6-CBA601B3565F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {59D1B5DC-9175-43EC-90C6-CBA601B3565F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {59D1B5DC-9175-43EC-90C6-CBA601B3565F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {59D1B5DC-9175-43EC-90C6-CBA601B3565F}.Release|Any CPU.Build.0 = Release|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.Build.0 = Release|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Release|Any CPU.Build.0 = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {59D1B5DC-9175-43EC-90C6-CBA601B3565F} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} + {3436A126-EDC9-4060-8952-9A1BE34CDD95} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} + EndGlobalSection +EndGlobal diff --git a/src/ResourceManager/Automation/Commands.Automation.Test/Commands.Automation.Test.csproj b/src/ResourceManager/Automation/Commands.Automation.Test/Commands.Automation.Test.csproj index 6e42d00691b0..6f6cd9271d6e 100644 --- a/src/ResourceManager/Automation/Commands.Automation.Test/Commands.Automation.Test.csproj +++ b/src/ResourceManager/Automation/Commands.Automation.Test/Commands.Automation.Test.csproj @@ -57,7 +57,7 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -124,6 +124,14 @@ ..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll + + ..\..\..\packages\xunit.1.9.2\lib\net20\xunit.dll + True + + + ..\..\..\packages\xunit.extensions.1.9.2\lib\net20\xunit.extensions.dll + True + @@ -166,6 +174,10 @@ + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common @@ -184,19 +196,5 @@ - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/src/ResourceManager/Automation/Commands.Automation.Test/UnitTests/NewAzureAutomationConnectionTest.cs b/src/ResourceManager/Automation/Commands.Automation.Test/UnitTests/NewAzureAutomationConnectionTest.cs index 733a9bded07a..4ba8308eb8e3 100644 --- a/src/ResourceManager/Automation/Commands.Automation.Test/UnitTests/NewAzureAutomationConnectionTest.cs +++ b/src/ResourceManager/Automation/Commands.Automation.Test/UnitTests/NewAzureAutomationConnectionTest.cs @@ -51,7 +51,6 @@ public void NewAzureAutomationConnectionByNameSuccessfull() string accountName = "automation"; string connectionName = "connection"; string connectionTypeName = "connectiontype"; - string password = "password"; string description = "desc"; this.mockAutomationClient.Setup( diff --git a/src/ResourceManager/Automation/Commands.Automation.Test/packages.config b/src/ResourceManager/Automation/Commands.Automation.Test/packages.config index 2dce1ac7e52f..8b5713e969f3 100644 --- a/src/ResourceManager/Automation/Commands.Automation.Test/packages.config +++ b/src/ResourceManager/Automation/Commands.Automation.Test/packages.config @@ -2,7 +2,7 @@ - + @@ -17,4 +17,7 @@ + + + \ No newline at end of file diff --git a/src/ResourceManager/Automation/Commands.Automation/Commands.Automation.csproj b/src/ResourceManager/Automation/Commands.Automation/Commands.Automation.csproj index bbfeb59afe5d..1b116341b5fc 100644 --- a/src/ResourceManager/Automation/Commands.Automation/Commands.Automation.csproj +++ b/src/ResourceManager/Automation/Commands.Automation/Commands.Automation.csproj @@ -60,7 +60,7 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -266,19 +266,15 @@ + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common - - \ No newline at end of file diff --git a/src/ResourceManager/Automation/Commands.Automation/packages.config b/src/ResourceManager/Automation/Commands.Automation/packages.config index 94bde317b5e4..e35b6970d9d3 100644 --- a/src/ResourceManager/Automation/Commands.Automation/packages.config +++ b/src/ResourceManager/Automation/Commands.Automation/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/ResourceManager/Automation/NuGet.Config b/src/ResourceManager/Automation/NuGet.Config new file mode 100644 index 000000000000..2de911013532 --- /dev/null +++ b/src/ResourceManager/Automation/NuGet.Config @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/ResourceManager/AzureBackup/AzureBackup.sln b/src/ResourceManager/AzureBackup/AzureBackup.sln new file mode 100644 index 000000000000..287471331331 --- /dev/null +++ b/src/ResourceManager/AzureBackup/AzureBackup.sln @@ -0,0 +1,57 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.31101.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{95C16AED-FD57-42A0-86C3-2CF4300A4817}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ResourceManager.Common", "..\Common\Commands.ResourceManager.Common\Commands.ResourceManager.Common.csproj", "{3819D8A7-C62C-4C47-8DDD-0332D9CE1252}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.AzureBackup", "Commands.AzureBackup\Commands.AzureBackup.csproj", "{6C8D2337-C9D1-4F52-94B3-AB63A19F3453}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.AzureBackup.Test", "Commands.AzureBackup.Test\Commands.AzureBackup.Test.csproj", "{678AE95D-2364-47D7-888C-3FFA6D412CC8}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ScenarioTests.ResourceManager.Common", "..\Common\Commands.ScenarioTests.ResourceManager.Common\Commands.ScenarioTests.ResourceManager.Common.csproj", "{3436A126-EDC9-4060-8952-9A1BE34CDD95}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Profile", "..\Profile\Commands.Profile\Commands.Profile.csproj", "{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common", "..\..\Common\Commands.Common\Commands.Common.csproj", "{5EE72C53-1720-4309-B54B-5FB79703195F}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.Build.0 = Release|Any CPU + {6C8D2337-C9D1-4F52-94B3-AB63A19F3453}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6C8D2337-C9D1-4F52-94B3-AB63A19F3453}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6C8D2337-C9D1-4F52-94B3-AB63A19F3453}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6C8D2337-C9D1-4F52-94B3-AB63A19F3453}.Release|Any CPU.Build.0 = Release|Any CPU + {678AE95D-2364-47D7-888C-3FFA6D412CC8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {678AE95D-2364-47D7-888C-3FFA6D412CC8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {678AE95D-2364-47D7-888C-3FFA6D412CC8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {678AE95D-2364-47D7-888C-3FFA6D412CC8}.Release|Any CPU.Build.0 = Release|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Release|Any CPU.Build.0 = Release|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.Build.0 = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {678AE95D-2364-47D7-888C-3FFA6D412CC8} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} + {3436A126-EDC9-4060-8952-9A1BE34CDD95} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} + EndGlobalSection +EndGlobal diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/Commands.AzureBackup.Test.csproj b/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/Commands.AzureBackup.Test.csproj index c6528d68aec7..3e5033a2462f 100644 --- a/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/Commands.AzureBackup.Test.csproj +++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/Commands.AzureBackup.Test.csproj @@ -36,7 +36,7 @@ - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -245,20 +245,5 @@ - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - \ No newline at end of file diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/ScenarioTests/AzureBackupTestBase.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/ScenarioTests/AzureBackupTestBase.cs index 031ff5b7ca26..893fa0bbed43 100644 --- a/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/ScenarioTests/AzureBackupTestBase.cs +++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/ScenarioTests/AzureBackupTestBase.cs @@ -65,8 +65,11 @@ protected void RunPowerShellTest(params string[] scripts) SetupManagementClients(); helper.SetupEnvironment(AzureModule.AzureResourceManager); - helper.SetupModules(AzureModule.AzureResourceManager, "ScenarioTests\\" + this.GetType().Name + ".ps1"); - + helper.SetupModules(AzureModule.AzureResourceManager, + "ScenarioTests\\" + this.GetType().Name + ".ps1", + helper.RMProfileModule, + helper.GetRMModulePath("AzureRM.Backup.psd1") + ); helper.RunPowerShellTest(scripts); } } diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/packages.config b/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/packages.config index 0b57d52d9656..24eeae4af6aa 100644 --- a/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/packages.config +++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Commands.AzureBackup.csproj b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Commands.AzureBackup.csproj index 1055d2a70c14..c6a6460dfc96 100644 --- a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Commands.AzureBackup.csproj +++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Commands.AzureBackup.csproj @@ -50,7 +50,7 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -221,6 +221,10 @@ + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common @@ -228,6 +232,5 @@ - - + \ No newline at end of file diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/packages.config b/src/ResourceManager/AzureBackup/Commands.AzureBackup/packages.config index 370e6034616d..ec875e2b5092 100644 --- a/src/ResourceManager/AzureBackup/Commands.AzureBackup/packages.config +++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/ResourceManager/AzureBackup/NuGet.Config b/src/ResourceManager/AzureBackup/NuGet.Config new file mode 100644 index 000000000000..2de911013532 --- /dev/null +++ b/src/ResourceManager/AzureBackup/NuGet.Config @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/ResourceManager/AzureBatch/AzureBatch.sln b/src/ResourceManager/AzureBatch/AzureBatch.sln new file mode 100644 index 000000000000..344a94efde20 --- /dev/null +++ b/src/ResourceManager/AzureBatch/AzureBatch.sln @@ -0,0 +1,75 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.31101.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{95C16AED-FD57-42A0-86C3-2CF4300A4817}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ResourceManager.Common", "..\Common\Commands.ResourceManager.Common\Commands.ResourceManager.Common.csproj", "{3819D8A7-C62C-4C47-8DDD-0332D9CE1252}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Batch", "Commands.Batch\Commands.Batch.csproj", "{D470E50A-9607-48D6-A924-4F9F86502704}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Batch.Test", "Commands.Batch.Test\Commands.Batch.Test.csproj", "{F4ABAD68-64A5-4B23-B09C-42559A7524DE}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Profile", "..\Profile\Commands.Profile\Commands.Profile.csproj", "{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ScenarioTests.ResourceManager.Common", "..\Common\Commands.ScenarioTests.ResourceManager.Common\Commands.ScenarioTests.ResourceManager.Common.csproj", "{3436A126-EDC9-4060-8952-9A1BE34CDD95}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Resources", "..\Resources\Commands.Resources\Commands.Resources.csproj", "{E1F5201D-6067-430E-B303-4E367652991B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Resources.Rest", "..\Resources\Commands.ResourceManager\Cmdlets\Commands.Resources.Rest.csproj", "{8058D403-06E3-4BED-8924-D166CE303961}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common", "..\..\Common\Commands.Common\Commands.Common.csproj", "{5EE72C53-1720-4309-B54B-5FB79703195F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Tags", "..\Tags\Commands.Tags\Commands.Tags.csproj", "{2493A8F7-1949-4F29-8D53-9D459046C3B8}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.Build.0 = Release|Any CPU + {D470E50A-9607-48D6-A924-4F9F86502704}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D470E50A-9607-48D6-A924-4F9F86502704}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D470E50A-9607-48D6-A924-4F9F86502704}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D470E50A-9607-48D6-A924-4F9F86502704}.Release|Any CPU.Build.0 = Release|Any CPU + {F4ABAD68-64A5-4B23-B09C-42559A7524DE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F4ABAD68-64A5-4B23-B09C-42559A7524DE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F4ABAD68-64A5-4B23-B09C-42559A7524DE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F4ABAD68-64A5-4B23-B09C-42559A7524DE}.Release|Any CPU.Build.0 = Release|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.Build.0 = Release|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Release|Any CPU.Build.0 = Release|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Release|Any CPU.Build.0 = Release|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Release|Any CPU.Build.0 = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.Build.0 = Release|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {F4ABAD68-64A5-4B23-B09C-42559A7524DE} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} + {3436A126-EDC9-4060-8952-9A1BE34CDD95} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} + EndGlobalSection +EndGlobal diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/BatchTestHelpers.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/BatchTestHelpers.cs index 4ad820aa28e4..c1ee935411bd 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/BatchTestHelpers.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/BatchTestHelpers.cs @@ -12,26 +12,16 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using System.IO; using System.Linq; using System.Net; -using System.Net.Http; using System.Threading.Tasks; using Microsoft.Azure.Batch; -using Microsoft.Azure.Batch.Common; using Microsoft.Azure.Batch.Protocol; -using Microsoft.Azure.Commands.Batch.Models; -using Microsoft.Azure.Commands.Batch.Test.ScenarioTests; -using Microsoft.Azure.Management.Batch; using Microsoft.Azure.Management.Batch.Models; using System; using System.Collections; using System.Collections.Generic; using System.Reflection; -using Microsoft.Azure.Management.Resources; -using Microsoft.Azure.Management.Resources.Models; -using Microsoft.Azure.Test.HttpRecorder; -using Microsoft.WindowsAzure.Storage.Shared.Protocol; using Xunit; using ProxyModels = Microsoft.Azure.Batch.Protocol.Models; @@ -114,16 +104,22 @@ public static void AssertBatchAccountContextsAreEqual(BatchAccountContext contex /// Creates a RequestInterceptor that does not contact the Batch Service but instead uses the supplied response body. /// /// The response the interceptor should return. If none is specified, then a new instance of the response type is instantiated. + /// An action to perform on the request. /// The type of the request parameters. /// The type of the expected response. - public static RequestInterceptor CreateNoOpInterceptor(TResponse responseToUse = null) + public static RequestInterceptor CreateFakeServiceResponseInterceptor(TResponse responseToUse = null, + Action> requestAction = null) where TParameters : ProxyModels.BatchParameters where TResponse : ProxyModels.BatchOperationResponse, new() { RequestInterceptor interceptor = new RequestInterceptor((baseRequest) => { - BatchRequest request = - (BatchRequest)baseRequest; + BatchRequest request = (BatchRequest)baseRequest; + + if (requestAction != null) + { + requestAction(request); + } request.ServiceRequestFunc = (cancellationToken) => { @@ -140,12 +136,12 @@ public static RequestInterceptor CreateNoOpInterceptor(T /// The interceptor must handle both request types since it's possible for one OM node file method to perform both REST APIs. /// /// The name of the file to put in the response body. - public static RequestInterceptor CreateNoOpGetFileAndPropertiesInterceptor(string fileName) + public static RequestInterceptor CreateFakGetFileAndPropertiesResponseInterceptor(string fileName) { RequestInterceptor interceptor = new RequestInterceptor((baseRequest) => { BatchRequest fileRequest = baseRequest as - BatchRequest; + BatchRequest; if (fileRequest != null) { @@ -401,6 +397,106 @@ public static ProxyModels.NodeFileListResponse CreateNodeFileListResponse(IEnume return response; } + /// + /// Fabricates a CloudJob that's in the bound state + /// + public static CloudJob CreateFakeBoundJob(BatchAccountContext context) + { + string jobId = "testJob"; + + RequestInterceptor interceptor = new RequestInterceptor((baseRequest) => + { + BatchRequest request = + (BatchRequest)baseRequest; + + request.ServiceRequestFunc = (cancellationToken) => + { + ProxyModels.CloudJobGetResponse response = new ProxyModels.CloudJobGetResponse(); + response.Job = new ProxyModels.CloudJob(jobId, new ProxyModels.PoolInformation()); + + Task task = Task.FromResult(response); + return task; + }; + }); + + return context.BatchOMClient.JobOperations.GetJob(jobId, additionalBehaviors: new BatchClientBehavior[] { interceptor }); + } + + /// + /// Fabricates a CloudJobSchedule that's in the bound state + /// + public static CloudJobSchedule CreateFakeBoundJobSchedule(BatchAccountContext context) + { + string jobScheduleId = "testJobSchedule"; + + RequestInterceptor interceptor = new RequestInterceptor((baseRequest) => + { + BatchRequest request = + (BatchRequest)baseRequest; + + request.ServiceRequestFunc = (cancellationToken) => + { + ProxyModels.CloudJobScheduleGetResponse response = new ProxyModels.CloudJobScheduleGetResponse(); + response.JobSchedule = new ProxyModels.CloudJobSchedule(jobScheduleId, new ProxyModels.Schedule(), new ProxyModels.JobSpecification()); + + Task task = Task.FromResult(response); + return task; + }; + }); + + return context.BatchOMClient.JobScheduleOperations.GetJobSchedule(jobScheduleId, additionalBehaviors: new BatchClientBehavior[] { interceptor }); + } + + /// + /// Fabricates a CloudPool that's in the bound state + /// + public static CloudPool CreateFakeBoundPool(BatchAccountContext context) + { + string poolId = "testPool"; + + RequestInterceptor interceptor = new RequestInterceptor((baseRequest) => + { + BatchRequest request = + (BatchRequest)baseRequest; + + request.ServiceRequestFunc = (cancellationToken) => + { + ProxyModels.CloudPoolGetResponse response = new ProxyModels.CloudPoolGetResponse(); + response.Pool = new ProxyModels.CloudPool(poolId, "small", "4"); + + Task task = Task.FromResult(response); + return task; + }; + }); + + return context.BatchOMClient.PoolOperations.GetPool(poolId, additionalBehaviors: new BatchClientBehavior[] { interceptor }); + } + + /// + /// Fabricates a CloudTask that's in the bound state + /// + public static CloudTask CreateFakeBoundTask(BatchAccountContext context) + { + string taskId = "testTask"; + + RequestInterceptor interceptor = new RequestInterceptor((baseRequest) => + { + BatchRequest request = + (BatchRequest)baseRequest; + + request.ServiceRequestFunc = (cancellationToken) => + { + ProxyModels.CloudTaskGetResponse response = new ProxyModels.CloudTaskGetResponse(); + response.Task = new ProxyModels.CloudTask(taskId, "cmd /c dir /s"); + + Task task = Task.FromResult(response); + return task; + }; + }); + + return context.BatchOMClient.JobOperations.GetTask("jobId", taskId, additionalBehaviors: new BatchClientBehavior[] { interceptor }); + } + /// /// Uses Reflection to set a property value on an object. Can be used to bypass restricted set accessors. /// diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Commands.Batch.Test.csproj b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Commands.Batch.Test.csproj index 43152a12633a..30baf1aaffef 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Commands.Batch.Test.csproj +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Commands.Batch.Test.csproj @@ -51,7 +51,7 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -178,17 +178,20 @@ + + + @@ -196,6 +199,7 @@ + @@ -220,6 +224,7 @@ + @@ -311,6 +316,9 @@ Always + + Always + Always @@ -395,6 +403,9 @@ Always + + Always + Always @@ -428,6 +439,9 @@ Always + + Always + Always @@ -485,6 +499,9 @@ PreserveNewest + + Always + Always @@ -512,8 +529,15 @@ Always + + Always + + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common @@ -535,20 +559,5 @@ - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - \ No newline at end of file diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ComputeNodeUsers/NewBatchComputeNodeUserCommandTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ComputeNodeUsers/NewBatchComputeNodeUserCommandTests.cs index dd8be1685bb9..460c990c4a53 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ComputeNodeUsers/NewBatchComputeNodeUserCommandTests.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ComputeNodeUsers/NewBatchComputeNodeUserCommandTests.cs @@ -62,7 +62,7 @@ public void NewBatchComputeNodeUserParametersTest() cmdlet.Password = "Password1234"; // Don't go to the service on an Add ComputeNodeUser call - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Verify no exceptions when required parameters are set diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ComputeNodeUsers/RemoveBatchComputeNodeUserCommandTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ComputeNodeUsers/RemoveBatchComputeNodeUserCommandTests.cs index c6a7400f2446..2eca0e574188 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ComputeNodeUsers/RemoveBatchComputeNodeUserCommandTests.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ComputeNodeUsers/RemoveBatchComputeNodeUserCommandTests.cs @@ -61,7 +61,7 @@ public void RemoveBatchComputeNodeUserParametersTest() cmdlet.Name = "testUser"; // Don't go to the service on a Delete ComputeNodeUser call - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Verify no exceptions when required parameters are set diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ComputeNodeUsers/SetBatchComputeNoderUserCommandTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ComputeNodeUsers/SetBatchComputeNoderUserCommandTests.cs new file mode 100644 index 000000000000..4e47b5dfee99 --- /dev/null +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ComputeNodeUsers/SetBatchComputeNoderUserCommandTests.cs @@ -0,0 +1,103 @@ +// ---------------------------------------------------------------------------------- +// +// 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; +using System.Threading.Tasks; +using Microsoft.Azure.Batch; +using Microsoft.Azure.Batch.Protocol; +using Microsoft.Azure.Batch.Protocol.Models; +using Microsoft.WindowsAzure.Commands.ScenarioTest; +using Moq; +using System.Collections.Generic; +using System.Management.Automation; +using Xunit; +using BatchClient = Microsoft.Azure.Commands.Batch.Models.BatchClient; + +namespace Microsoft.Azure.Commands.Batch.Test.ComputeNodeUsers +{ + public class SetBatchComputeNodeUserCommandTests + { + private SetBatchComputeNodeUserCommand cmdlet; + private Mock batchClientMock; + private Mock commandRuntimeMock; + + public SetBatchComputeNodeUserCommandTests() + { + batchClientMock = new Mock(); + commandRuntimeMock = new Mock(); + cmdlet = new SetBatchComputeNodeUserCommand() + { + CommandRuntime = commandRuntimeMock.Object, + BatchClient = batchClientMock.Object, + }; + } + + [Fact] + [Trait(Category.AcceptanceType, Category.CheckIn)] + public void SetBatchComputeNodeUserParametersTest() + { + // Setup cmdlet without the required parameters + BatchAccountContext context = BatchTestHelpers.CreateBatchContextWithKeys(); + cmdlet.BatchContext = context; + + Assert.Throws(() => cmdlet.ExecuteCmdlet()); + + cmdlet.PoolId = "testPool"; + cmdlet.ComputeNodeId = "computeNode1"; + + Assert.Throws(() => cmdlet.ExecuteCmdlet()); + + cmdlet.Name = "testUser"; + + // Don't go to the service on an Update ComputeNodeUser call + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(); + cmdlet.AdditionalBehaviors = new List() { interceptor }; + + // Verify no exceptions when required parameters are set + cmdlet.ExecuteCmdlet(); + } + + [Fact] + [Trait(Category.AcceptanceType, Category.CheckIn)] + public void SetBatchComputeNodeUserRequestTest() + { + BatchAccountContext context = BatchTestHelpers.CreateBatchContextWithKeys(); + cmdlet.BatchContext = context; + cmdlet.PoolId = "testPool"; + cmdlet.ComputeNodeId = "computeNode1"; + cmdlet.Name = "testUser"; + cmdlet.Password = "Password1234"; + cmdlet.ExpiryTime = DateTime.Now.AddDays(1); + + string requestPassword = null; + DateTime requestExpiryTime = DateTime.Now; + + // Don't go to the service on an Update ComputeNodeUser call + Action> extractUserUpdateParametersAction = + (request) => + { + requestPassword = request.TypedParameters.Password; + requestExpiryTime = request.TypedParameters.ExpiryTime.Value; + }; + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(requestAction: extractUserUpdateParametersAction); + cmdlet.AdditionalBehaviors = new List() { interceptor }; + + cmdlet.ExecuteCmdlet(); + + // Verify the request parameters match expectations + Assert.Equal(cmdlet.Password, requestPassword); + Assert.Equal(cmdlet.ExpiryTime, requestExpiryTime); + } + } +} diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ComputeNodes/GetBatchComputeNodeCommandTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ComputeNodes/GetBatchComputeNodeCommandTests.cs index bc50b520cb26..d4c9999bb166 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ComputeNodes/GetBatchComputeNodeCommandTests.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ComputeNodes/GetBatchComputeNodeCommandTests.cs @@ -56,7 +56,7 @@ public void GetBatchComputeNodeTest() // Build a compute node instead of querying the service on a Get ComputeNode call ComputeNodeGetResponse response = BatchTestHelpers.CreateComputeNodeGetResponse(cmdlet.Id); - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(response); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(response); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Setup the cmdlet to write pipeline output to a list that can be examined later @@ -85,7 +85,7 @@ public void ListBatchComputeNodesByODataFilterTest() // Build some compute nodes instead of querying the service on a List ComputeNodes call ComputeNodeListResponse response = BatchTestHelpers.CreateComputeNodeListResponse(idsOfConstructedComputeNodes); - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(response); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(response); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Setup the cmdlet to write pipeline output to a list that can be examined later @@ -122,7 +122,7 @@ public void ListBatchComputeNodesWithoutFiltersTest() // Build some compute nodes instead of querying the service on a List ComputeNodes call ComputeNodeListResponse response = BatchTestHelpers.CreateComputeNodeListResponse(idsOfConstructedComputeNodes); - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(response); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(response); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Setup the cmdlet to write pipeline output to a list that can be examined later @@ -164,7 +164,7 @@ public void ListComputeNodesMaxCountTest() // Build some compute nodes instead of querying the service on a List ComputeNodes call ComputeNodeListResponse response = BatchTestHelpers.CreateComputeNodeListResponse(idsOfConstructedComputeNodes); - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(response); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(response); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Setup the cmdlet to write pipeline output to a list that can be examined later diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ComputeNodes/ResetBatchComputeNodeCommandTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ComputeNodes/ResetBatchComputeNodeCommandTests.cs index 93ff5dee6f11..8df0bc630cab 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ComputeNodes/ResetBatchComputeNodeCommandTests.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ComputeNodes/ResetBatchComputeNodeCommandTests.cs @@ -61,7 +61,7 @@ public void ResetBatchComputeNodeParametersTest() cmdlet.Id = "computeNode1"; // Don't go to the service on a Reimage ComputeNode call - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Verify no exceptions when required parameter is set diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ComputeNodes/RestartBatchComputeNodeCommandTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ComputeNodes/RestartBatchComputeNodeCommandTests.cs index fb44eb63feaf..912727edec42 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ComputeNodes/RestartBatchComputeNodeCommandTests.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ComputeNodes/RestartBatchComputeNodeCommandTests.cs @@ -61,7 +61,7 @@ public void RestartBatchComputeNodeParametersTest() cmdlet.Id = "computeNode1"; // Don't go to the service on a Reboot ComputeNode call - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Verify no exceptions when required parameter is set diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Files/GetBatchNodeFileCommandTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Files/GetBatchNodeFileCommandTests.cs index 3751e165b1f0..9e620de46633 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Files/GetBatchNodeFileCommandTests.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Files/GetBatchNodeFileCommandTests.cs @@ -59,7 +59,7 @@ public void GetBatchNodeFileByTaskParametersTest() // Build a NodeFile instead of querying the service on a List NodeFile call NodeFileListResponse response = BatchTestHelpers.CreateNodeFileListResponse(new string[] {cmdlet.Name}); - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(response); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(response); cmdlet.AdditionalBehaviors = new List() { interceptor }; Assert.Throws(() => cmdlet.ExecuteCmdlet()); @@ -92,7 +92,7 @@ public void GetBatchNodeFileByTaskTest() // Build a NodeFile instead of querying the service on a Get NodeFile Properties call NodeFileGetPropertiesResponse response = BatchTestHelpers.CreateNodeFileGetPropertiesResponse(cmdlet.Name); - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(response); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(response); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Setup the cmdlet to write pipeline output to a list that can be examined later @@ -122,7 +122,7 @@ public void ListBatchNodeFilesByTaskByODataFilterTest() // Build some NodeFiles instead of querying the service on a List NodeFiles call NodeFileListResponse response = BatchTestHelpers.CreateNodeFileListResponse(namesOfConstructedNodeFiles); - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(response); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(response); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Setup the cmdlet to write pipeline output to a list that can be examined later @@ -160,7 +160,7 @@ public void ListBatchNodeFilesByTaskWithoutFiltersTest() // Build some NodeFiles instead of querying the service on a List NodeFiles call NodeFileListResponse response = BatchTestHelpers.CreateNodeFileListResponse(namesOfConstructedNodeFiles); - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(response); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(response); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Setup the cmdlet to write pipeline output to a list that can be examined later @@ -203,7 +203,7 @@ public void ListNodeFilesByTaskMaxCountTest() // Build some NodeFiles instead of querying the service on a List NodeFiles call NodeFileListResponse response = BatchTestHelpers.CreateNodeFileListResponse(namesOfConstructedNodeFiles); - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(response); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(response); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Setup the cmdlet to write pipeline output to a list that can be examined later @@ -240,7 +240,7 @@ public void GetBatchNodeFileByComputeNodeParametersTest() // Build a NodeFile instead of querying the service on a List NodeFile call NodeFileListResponse response = BatchTestHelpers.CreateNodeFileListResponse(new string[] {cmdlet.Name}); - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(response); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(response); cmdlet.AdditionalBehaviors = new List() { interceptor }; Assert.Throws(() => cmdlet.ExecuteCmdlet()); @@ -266,7 +266,7 @@ public void GetBatchNodeFileByComputeNodeTest() // Build a NodeFile instead of querying the service on a Get NodeFile Properties call NodeFileGetPropertiesResponse response = BatchTestHelpers.CreateNodeFileGetPropertiesResponse(cmdlet.Name); - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(response); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(response); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Setup the cmdlet to write pipeline output to a list that can be examined later @@ -296,7 +296,7 @@ public void ListBatchNodeFilesByComputeNodeByODataFilterTest() // Build some NodeFiles instead of querying the service on a List NodeFiles call NodeFileListResponse response = BatchTestHelpers.CreateNodeFileListResponse(namesOfConstructedNodeFiles); - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(response); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(response); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Setup the cmdlet to write pipeline output to a list that can be examined later @@ -334,7 +334,7 @@ public void ListBatchNodeFilesByComputeNodeWithoutFiltersTest() // Build some NodeFiles instead of querying the service on a List NodeFiles call NodeFileListResponse response = BatchTestHelpers.CreateNodeFileListResponse(namesOfConstructedNodeFiles); - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(response); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(response); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Setup the cmdlet to write pipeline output to a list that can be examined later @@ -377,7 +377,7 @@ public void ListNodeFilesByComputeNodeMaxCountTest() // Build some NodeFiles instead of querying the service on a List NodeFiles call NodeFileListResponse response = BatchTestHelpers.CreateNodeFileListResponse(namesOfConstructedNodeFiles); - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(response); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(response); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Setup the cmdlet to write pipeline output to a list that can be examined later diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Files/GetBatchNodeFileContentCommandTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Files/GetBatchNodeFileContentCommandTests.cs index b64b0d0c7743..4862ecba06ef 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Files/GetBatchNodeFileContentCommandTests.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Files/GetBatchNodeFileContentCommandTests.cs @@ -58,7 +58,7 @@ public void GetBatchNodeFileByTaskParametersTest() string fileName = "stdout.txt"; // Don't go to the service on a Get NodeFile call or Get NodeFile Properties call - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpGetFileAndPropertiesInterceptor(cmdlet.Name); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakGetFileAndPropertiesResponseInterceptor(cmdlet.Name); cmdlet.AdditionalBehaviors = new List() { interceptor }; using (MemoryStream memStream = new MemoryStream()) @@ -94,7 +94,7 @@ public void GetBatchNodeFileByComputeNodeContentParametersTest() string fileName = "startup\\stdout.txt"; // Don't go to the service on a Get NodeFile call or Get NodeFile Properties call - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpGetFileAndPropertiesInterceptor(cmdlet.Name); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakGetFileAndPropertiesResponseInterceptor(cmdlet.Name); cmdlet.AdditionalBehaviors = new List() { interceptor }; using (MemoryStream memStream = new MemoryStream()) diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Files/GetBatchRemoteDesktopProtocolFileCommandTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Files/GetBatchRemoteDesktopProtocolFileCommandTests.cs index 30a2f289f43d..77b8077811c3 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Files/GetBatchRemoteDesktopProtocolFileCommandTests.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Files/GetBatchRemoteDesktopProtocolFileCommandTests.cs @@ -56,7 +56,7 @@ public void GetBatchRemoteDesktopProtocolFileParametersTest() cmdlet.DestinationPath = null; // Don't go to the service on a Get ComputeNode Remote Desktop call - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(); cmdlet.AdditionalBehaviors = new List() { interceptor }; using (MemoryStream memStream = new MemoryStream()) diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/JobSchedules/DisableBatchJobScheduleCommandTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/JobSchedules/DisableBatchJobScheduleCommandTests.cs index a3064ccfb000..416326ad61eb 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/JobSchedules/DisableBatchJobScheduleCommandTests.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/JobSchedules/DisableBatchJobScheduleCommandTests.cs @@ -55,7 +55,7 @@ public void DisableJobScheduleParametersTest() cmdlet.Id = "testJobSchedule"; // Don't go to the service on a Disable CloudJobSchedule call - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Verify no exceptions when required parameter is set diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/JobSchedules/EnableBatchJobScheduleCommandTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/JobSchedules/EnableBatchJobScheduleCommandTests.cs index 487e4dabc89e..5279e7b6f503 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/JobSchedules/EnableBatchJobScheduleCommandTests.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/JobSchedules/EnableBatchJobScheduleCommandTests.cs @@ -56,7 +56,7 @@ public void EnableJobScheduleParametersTest() cmdlet.Id = "testJobSchedule"; // Don't go to the service on an Enable CloudJobSchedule call - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Verify no exceptions when required parameter is set diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/JobSchedules/GetBatchJobScheduleCommandTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/JobSchedules/GetBatchJobScheduleCommandTests.cs index 93edb04cec5a..0f18fed55185 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/JobSchedules/GetBatchJobScheduleCommandTests.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/JobSchedules/GetBatchJobScheduleCommandTests.cs @@ -55,7 +55,7 @@ public void GetBatchJobScheduleTest() // Build a CloudJobSchedule instead of querying the service on a Get CloudJobSchedule call CloudJobScheduleGetResponse response = BatchTestHelpers.CreateCloudJobScheduleGetResponse(cmdlet.Id); - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(response); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(response); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Setup the cmdlet to write pipeline output to a list that can be examined later @@ -83,7 +83,7 @@ public void ListBatchJobScheduleByODataFilterTest() // Build some CloudJobSchedules instead of querying the service on a List CloudJobSchedules call CloudJobScheduleListResponse response = BatchTestHelpers.CreateCloudJobScheduleListResponse(idsOfConstructedJobSchedules); - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(response); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(response); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Setup the cmdlet to write pipeline output to a list that can be examined later @@ -119,7 +119,7 @@ public void ListBatchJobSchedulesWithoutFiltersTest() // Build some CloudJobSchedules instead of querying the service on a List CloudJobSchedules call CloudJobScheduleListResponse response = BatchTestHelpers.CreateCloudJobScheduleListResponse(idsOfConstructedJobSchedules); - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(response); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(response); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Setup the cmdlet to write pipeline output to a list that can be examined later @@ -160,7 +160,7 @@ public void ListJobSchedulesMaxCountTest() // Build some CloudJobSchedules instead of querying the service on a List CloudJobSchedules call CloudJobScheduleListResponse response = BatchTestHelpers.CreateCloudJobScheduleListResponse(idsOfConstructedJobSchedules); - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(response); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(response); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Setup the cmdlet to write pipeline output to a list that can be examined later diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/JobSchedules/NewBatchJobScheduleCommandTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/JobSchedules/NewBatchJobScheduleCommandTests.cs index 7c83018e061b..019de849c7be 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/JobSchedules/NewBatchJobScheduleCommandTests.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/JobSchedules/NewBatchJobScheduleCommandTests.cs @@ -55,7 +55,7 @@ public void NewBatchJobScheduleParametersTest() cmdlet.Id = "testJobSchedule"; // Don't go to the service on an Add CloudJobSchedule call - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Verify no exceptions when required parameters are set diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/JobSchedules/RemoveBatchJobScheduleCommandTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/JobSchedules/RemoveBatchJobScheduleCommandTests.cs index b2398a33c8f5..5193ced0d128 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/JobSchedules/RemoveBatchJobScheduleCommandTests.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/JobSchedules/RemoveBatchJobScheduleCommandTests.cs @@ -59,7 +59,7 @@ public void RemoveBatchJobScheduleParametersTest() cmdlet.Id = "testJobSchedule"; // Don't go to the service on a Delete CloudJobSchedule call - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Verify no exceptions when required parameters are set diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/JobSchedules/SetBatchJobScheduleCommandTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/JobSchedules/SetBatchJobScheduleCommandTests.cs new file mode 100644 index 000000000000..d24ea2f4cd2a --- /dev/null +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/JobSchedules/SetBatchJobScheduleCommandTests.cs @@ -0,0 +1,64 @@ +// ---------------------------------------------------------------------------------- +// +// 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; +using Microsoft.Azure.Batch; +using Microsoft.Azure.Batch.Protocol; +using Microsoft.Azure.Batch.Protocol.Models; +using Microsoft.Azure.Commands.Batch.Models; +using Microsoft.WindowsAzure.Commands.ScenarioTest; +using Moq; +using System.Management.Automation; +using Xunit; +using BatchClient = Microsoft.Azure.Commands.Batch.Models.BatchClient; + +namespace Microsoft.Azure.Commands.Batch.Test.JobSchedules +{ + public class SetBatchJobScheduleCommandTests + { + private SetBatchJobScheduleCommand cmdlet; + private Mock batchClientMock; + private Mock commandRuntimeMock; + + public SetBatchJobScheduleCommandTests() + { + batchClientMock = new Mock(); + commandRuntimeMock = new Mock(); + cmdlet = new SetBatchJobScheduleCommand() + { + CommandRuntime = commandRuntimeMock.Object, + BatchClient = batchClientMock.Object, + }; + } + + [Fact] + [Trait(Category.AcceptanceType, Category.CheckIn)] + public void SetBatchJobScheduleParametersTest() + { + // Setup cmdlet without the required parameters + BatchAccountContext context = BatchTestHelpers.CreateBatchContextWithKeys(); + cmdlet.BatchContext = context; + + Assert.Throws(() => cmdlet.ExecuteCmdlet()); + + cmdlet.JobSchedule = new PSCloudJobSchedule(BatchTestHelpers.CreateFakeBoundJobSchedule(context)); + + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(); + cmdlet.AdditionalBehaviors = new BatchClientBehavior[] { interceptor }; + + // Verify that no exceptions occur + cmdlet.ExecuteCmdlet(); + } + } +} diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/JobSchedules/StopBatchJobScheduleCommandTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/JobSchedules/StopBatchJobScheduleCommandTests.cs index 58922ca34a39..4ad66f16d723 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/JobSchedules/StopBatchJobScheduleCommandTests.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/JobSchedules/StopBatchJobScheduleCommandTests.cs @@ -55,7 +55,7 @@ public void StopJobScheduleParametersTest() cmdlet.Id = "testJobSchedule"; // Don't go to the service on a Terminate CloudJobSchedule call - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Verify no exceptions when required parameter is set diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Jobs/DisableBatchJobCommandTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Jobs/DisableBatchJobCommandTests.cs index 0687853dd13f..81aa5ecc9a9d 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Jobs/DisableBatchJobCommandTests.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Jobs/DisableBatchJobCommandTests.cs @@ -21,7 +21,6 @@ using Moq; using System.Collections.Generic; using System.Management.Automation; -using System.Threading.Tasks; using Xunit; using BatchClient = Microsoft.Azure.Commands.Batch.Models.BatchClient; @@ -58,7 +57,7 @@ public void DisableJobParametersTest() cmdlet.DisableJobOption = DisableJobOption.Terminate; // Don't go to the service on a Disable CloudJob call - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Verify no exceptions when required parameter is set @@ -78,22 +77,13 @@ public void DisableJobRequestTest() cmdlet.Id = "testJob"; cmdlet.DisableJobOption = disableOption; - // Don't go to the service on an Enable AutoScale call - RequestInterceptor interceptor = new RequestInterceptor((baseRequest) => - { - BatchRequest request = - (BatchRequest)baseRequest; - - // Grab the disable option off the outgoing request. - requestDisableOption = request.TypedParameters.DisableJobOption; - - request.ServiceRequestFunc = (cancellationToken) => + // Don't go to the service on a Disable CloudJob call + Action> extractDisableOptionAction = + (request) => { - CloudJobDisableResponse response = new CloudJobDisableResponse(); - Task task = Task.FromResult(response); - return task; + requestDisableOption = request.TypedParameters.DisableJobOption; }; - }); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(requestAction: extractDisableOptionAction); cmdlet.AdditionalBehaviors = new List() { interceptor }; cmdlet.ExecuteCmdlet(); diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Jobs/EnableBatchJobCommandTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Jobs/EnableBatchJobCommandTests.cs index 2f7e9c5435b9..6f423362a7b0 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Jobs/EnableBatchJobCommandTests.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Jobs/EnableBatchJobCommandTests.cs @@ -55,7 +55,7 @@ public void EnableJobParametersTest() cmdlet.Id = "testJob"; // Don't go to the service on an Enable CloudJob call - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Verify no exceptions when required parameter is set diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Jobs/GetBatchJobCommandTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Jobs/GetBatchJobCommandTests.cs index d1b1a2488ef0..8711daf704a4 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Jobs/GetBatchJobCommandTests.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Jobs/GetBatchJobCommandTests.cs @@ -55,7 +55,7 @@ public void GetBatchJobTest() // Build a CloudJob instead of querying the service on a Get CloudJob call CloudJobGetResponse response = BatchTestHelpers.CreateCloudJobGetResponse(cmdlet.Id); - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(response); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(response); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Setup the cmdlet to write pipeline output to a list that can be examined later @@ -84,7 +84,7 @@ public void ListBatchJobsByODataFilterTest() // Build some CloudJobs instead of querying the service on a List CloudJobs call CloudJobListResponse response = BatchTestHelpers.CreateCloudJobListResponse(idsOfConstructedJobs); - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(response); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(response); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Setup the cmdlet to write pipeline output to a list that can be examined later @@ -121,7 +121,7 @@ public void ListBatchJobsWithoutFiltersTest() // Build some CloudJobs instead of querying the service on a List CloudJobs call CloudJobListResponse response = BatchTestHelpers.CreateCloudJobListResponse(idsOfConstructedJobs); - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(response); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(response); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Setup the cmdlet to write pipeline output to a list that can be examined later @@ -163,7 +163,7 @@ public void ListJobsMaxCountTest() // Build some CloudJobs instead of querying the service on a List CloudJobs call CloudJobListResponse response = BatchTestHelpers.CreateCloudJobListResponse(idsOfConstructedJobs); - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(response); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(response); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Setup the cmdlet to write pipeline output to a list that can be examined later diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Jobs/NewBatchJobCommandTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Jobs/NewBatchJobCommandTests.cs index 270d4fdf20be..2c69a1fe4c38 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Jobs/NewBatchJobCommandTests.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Jobs/NewBatchJobCommandTests.cs @@ -55,7 +55,7 @@ public void NewBatchJobParametersTest() cmdlet.Id = "testJob"; // Don't go to the service on an Add CloudJob call - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Verify no exceptions when required parameters are set diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Jobs/RemoveBatchJobCommandTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Jobs/RemoveBatchJobCommandTests.cs index 23a561df6363..77f41c41c178 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Jobs/RemoveBatchJobCommandTests.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Jobs/RemoveBatchJobCommandTests.cs @@ -59,7 +59,7 @@ public void RemoveBatchJobParametersTest() cmdlet.Id = "job-1"; // Don't go to the service on a Delete CloudJob call - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Verify no exceptions when required parameters are set diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Jobs/SetBatchJobCommandTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Jobs/SetBatchJobCommandTests.cs new file mode 100644 index 000000000000..e54a2543ec4e --- /dev/null +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Jobs/SetBatchJobCommandTests.cs @@ -0,0 +1,64 @@ +// ---------------------------------------------------------------------------------- +// +// 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; +using Microsoft.Azure.Batch; +using Microsoft.Azure.Batch.Protocol; +using Microsoft.Azure.Batch.Protocol.Models; +using Microsoft.Azure.Commands.Batch.Models; +using Microsoft.WindowsAzure.Commands.ScenarioTest; +using Moq; +using System.Management.Automation; +using Xunit; +using BatchClient = Microsoft.Azure.Commands.Batch.Models.BatchClient; + +namespace Microsoft.Azure.Commands.Batch.Test.Jobs +{ + public class SetBatchJobCommandTests + { + private SetBatchJobCommand cmdlet; + private Mock batchClientMock; + private Mock commandRuntimeMock; + + public SetBatchJobCommandTests() + { + batchClientMock = new Mock(); + commandRuntimeMock = new Mock(); + cmdlet = new SetBatchJobCommand() + { + CommandRuntime = commandRuntimeMock.Object, + BatchClient = batchClientMock.Object, + }; + } + + [Fact] + [Trait(Category.AcceptanceType, Category.CheckIn)] + public void SetBatchJobParametersTest() + { + // Setup cmdlet without the required parameters + BatchAccountContext context = BatchTestHelpers.CreateBatchContextWithKeys(); + cmdlet.BatchContext = context; + + Assert.Throws(() => cmdlet.ExecuteCmdlet()); + + cmdlet.Job = new PSCloudJob(BatchTestHelpers.CreateFakeBoundJob(context)); + + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(); + cmdlet.AdditionalBehaviors = new BatchClientBehavior[] {interceptor}; + + // Verify that no exceptions occur + cmdlet.ExecuteCmdlet(); + } + } +} diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Jobs/StopBatchJobCommandTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Jobs/StopBatchJobCommandTests.cs index 90f57972cccb..0a099508bb41 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Jobs/StopBatchJobCommandTests.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Jobs/StopBatchJobCommandTests.cs @@ -20,7 +20,6 @@ using Moq; using System.Collections.Generic; using System.Management.Automation; -using System.Threading.Tasks; using Xunit; using BatchClient = Microsoft.Azure.Commands.Batch.Models.BatchClient; @@ -56,7 +55,7 @@ public void StopJobParametersTest() cmdlet.Id = "testJob"; // Don't go to the service on a Terminate CloudJob call - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Verify no exceptions when required parameter is set @@ -77,21 +76,12 @@ public void StopJobRequestTest() cmdlet.TerminateReason = terminateReason; // Don't go to the service on a Terminate CloudJob call - RequestInterceptor interceptor = new RequestInterceptor((baseRequest) => - { - BatchRequest request = - (BatchRequest)baseRequest; - - // Grab the terminate reason off the outgoing request - requestTerminateReason = request.TypedParameters.TerminateReason; - - request.ServiceRequestFunc = (cancellationToken) => + Action> extractTerminateReasponAction = + (request) => { - CloudJobTerminateResponse response = new CloudJobTerminateResponse(); - Task task = Task.FromResult(response); - return task; + requestTerminateReason = request.TypedParameters.TerminateReason; }; - }); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(requestAction: extractTerminateReasponAction); cmdlet.AdditionalBehaviors = new List() { interceptor }; cmdlet.ExecuteCmdlet(); diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Pools/DisableBatchAutoScaleCommandTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Pools/DisableBatchAutoScaleCommandTests.cs index 8d91defea029..be27c988687c 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Pools/DisableBatchAutoScaleCommandTests.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Pools/DisableBatchAutoScaleCommandTests.cs @@ -55,7 +55,7 @@ public void DisableAutoScaleParametersTest() cmdlet.Id = "testPool"; // Don't go to the service on an Disable AutoScale call - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Verify no exceptions when required parameter is set diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Pools/EnableBatchAutoScaleCommandTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Pools/EnableBatchAutoScaleCommandTests.cs index 1f9c1611a5ec..9ce1294d31de 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Pools/EnableBatchAutoScaleCommandTests.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Pools/EnableBatchAutoScaleCommandTests.cs @@ -20,7 +20,6 @@ using Moq; using System.Collections.Generic; using System.Management.Automation; -using System.Threading.Tasks; using Xunit; using BatchClient = Microsoft.Azure.Commands.Batch.Models.BatchClient; @@ -60,7 +59,7 @@ public void EnableAutoScaleParametersTest() cmdlet.AutoScaleFormula = "formula"; // Don't go to the service on an Enable AutoScale call - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Verify no exceptions when required parameter is set @@ -81,21 +80,12 @@ public void EnableAutoScaleRequestTest() cmdlet.AutoScaleFormula = formula; // Don't go to the service on an Enable AutoScale call - RequestInterceptor interceptor = new RequestInterceptor((baseRequest) => - { - BatchRequest request = - (BatchRequest)baseRequest; - - // Grab the formula off the outgoing request - requestFormula = request.TypedParameters.AutoScaleFormula; - - request.ServiceRequestFunc = (cancellationToken) => + Action> extractFormulaAction = + (request) => { - CloudPoolEnableAutoScaleResponse response = new CloudPoolEnableAutoScaleResponse(); - Task task = Task.FromResult(response); - return task; + requestFormula = request.TypedParameters.AutoScaleFormula; }; - }); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(requestAction: extractFormulaAction); cmdlet.AdditionalBehaviors = new List() { interceptor }; cmdlet.ExecuteCmdlet(); diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Pools/GetBatchPoolCommandTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Pools/GetBatchPoolCommandTests.cs index 24b905f7a4df..6604ce3a489b 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Pools/GetBatchPoolCommandTests.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Pools/GetBatchPoolCommandTests.cs @@ -55,7 +55,7 @@ public void GetBatchPoolTest() // Build a CloudPool instead of querying the service on a Get CloudPool call CloudPoolGetResponse response = BatchTestHelpers.CreateCloudPoolGetResponse(cmdlet.Id); - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(response); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(response); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Setup the cmdlet to write pipeline output to a list that can be examined later @@ -83,7 +83,7 @@ public void ListBatchPoolByODataFilterTest() // Build some CloudPools instead of querying the service on a List CloudPools call CloudPoolListResponse response = BatchTestHelpers.CreateCloudPoolListResponse(idsOfConstructedPools); - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(response); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(response); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Setup the cmdlet to write pipeline output to a list that can be examined later @@ -119,7 +119,7 @@ public void ListBatchPoolWithoutFiltersTest() // Build some CloudPools instead of querying the service on a List CloudPools call CloudPoolListResponse response = BatchTestHelpers.CreateCloudPoolListResponse(idsOfConstructedPools); - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(response); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(response); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Setup the cmdlet to write pipeline output to a list that can be examined later @@ -160,7 +160,7 @@ public void ListPoolsMaxCountTest() // Build some CloudPools instead of querying the service on a List CloudPools call CloudPoolListResponse response = BatchTestHelpers.CreateCloudPoolListResponse(idsOfConstructedPools); - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(response); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(response); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Setup the cmdlet to write pipeline output to a list that can be examined later diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Pools/NewBatchPoolCommandTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Pools/NewBatchPoolCommandTests.cs index b56337a06acd..a6fe62afe584 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Pools/NewBatchPoolCommandTests.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Pools/NewBatchPoolCommandTests.cs @@ -57,7 +57,7 @@ public void NewBatchPoolParametersTest() cmdlet.OSFamily = "4"; // Don't go to the service on an Add CloudPool call - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Verify no exceptions when required parameters are set diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Pools/RemoveBatchPoolCommandTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Pools/RemoveBatchPoolCommandTests.cs index 2a03fd3c857e..6e46a6acae83 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Pools/RemoveBatchPoolCommandTests.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Pools/RemoveBatchPoolCommandTests.cs @@ -59,7 +59,7 @@ public void RemoveBatchPoolParametersTest() cmdlet.Id = "testPool"; // Don't go to the service on a Delete CloudPool call - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Verify no exceptions when required parameters are set diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Pools/SetBatchPoolCommandTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Pools/SetBatchPoolCommandTests.cs new file mode 100644 index 000000000000..5a4a7836293c --- /dev/null +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Pools/SetBatchPoolCommandTests.cs @@ -0,0 +1,64 @@ +// ---------------------------------------------------------------------------------- +// +// 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; +using Microsoft.Azure.Batch; +using Microsoft.Azure.Batch.Protocol; +using Microsoft.Azure.Batch.Protocol.Models; +using Microsoft.Azure.Commands.Batch.Models; +using Microsoft.WindowsAzure.Commands.ScenarioTest; +using Moq; +using System.Management.Automation; +using Xunit; +using BatchClient = Microsoft.Azure.Commands.Batch.Models.BatchClient; + +namespace Microsoft.Azure.Commands.Batch.Test.Pools +{ + public class SetBatchPoolCommandTests + { + private SetBatchPoolCommand cmdlet; + private Mock batchClientMock; + private Mock commandRuntimeMock; + + public SetBatchPoolCommandTests() + { + batchClientMock = new Mock(); + commandRuntimeMock = new Mock(); + cmdlet = new SetBatchPoolCommand() + { + CommandRuntime = commandRuntimeMock.Object, + BatchClient = batchClientMock.Object, + }; + } + + [Fact] + [Trait(Category.AcceptanceType, Category.CheckIn)] + public void SetBatchPoolParametersTest() + { + // Setup cmdlet without the required parameters + BatchAccountContext context = BatchTestHelpers.CreateBatchContextWithKeys(); + cmdlet.BatchContext = context; + + Assert.Throws(() => cmdlet.ExecuteCmdlet()); + + cmdlet.Pool = new PSCloudPool(BatchTestHelpers.CreateFakeBoundPool(context)); + + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(); + cmdlet.AdditionalBehaviors = new BatchClientBehavior[] { interceptor }; + + // Verify that no exceptions occur + cmdlet.ExecuteCmdlet(); + } + } +} diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Pools/SetBatchPoolOSVersionCommandTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Pools/SetBatchPoolOSVersionCommandTests.cs index b1130243ad23..13c490f90342 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Pools/SetBatchPoolOSVersionCommandTests.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Pools/SetBatchPoolOSVersionCommandTests.cs @@ -60,7 +60,7 @@ public void SetPoolOSVersionParametersTest() cmdlet.TargetOSVersion = "targetOS"; // Don't go to the service on an Upgrade OS call - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Verify no exceptions when required parameter is set diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Pools/StartBatchPoolResizeCommandTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Pools/StartBatchPoolResizeCommandTests.cs index 5fb517cd1eea..83e9a0001c79 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Pools/StartBatchPoolResizeCommandTests.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Pools/StartBatchPoolResizeCommandTests.cs @@ -55,7 +55,7 @@ public void StartPoolResizeParametersTest() cmdlet.Id = "testPool"; // Don't go to the service on a Resize CloudPool call - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Verify no exceptions when required parameter is set diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Pools/StopBatchPoolResizeCommandTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Pools/StopBatchPoolResizeCommandTests.cs index 44897d23cb55..24abb03d74ed 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Pools/StopBatchPoolResizeCommandTests.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Pools/StopBatchPoolResizeCommandTests.cs @@ -55,7 +55,7 @@ public void StopPoolResizeParametersTest() cmdlet.Id = "testPool"; // Don't go to the service on a StopResize CloudPool call - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Verify no exceptions when required parameter is set diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Pools/TestBatchAutoScaleCommandTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Pools/TestBatchAutoScaleCommandTests.cs index b19496a91359..a425e53cdad3 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Pools/TestBatchAutoScaleCommandTests.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Pools/TestBatchAutoScaleCommandTests.cs @@ -20,7 +20,6 @@ using Moq; using System.Collections.Generic; using System.Management.Automation; -using System.Threading.Tasks; using Xunit; using BatchClient = Microsoft.Azure.Commands.Batch.Models.BatchClient; @@ -60,7 +59,7 @@ public void TestAutoScaleParametersTest() cmdlet.AutoScaleFormula = "formula"; // Don't go to the service on an Evaluate AutoScale call - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Verify no exceptions when required parameter is set @@ -81,21 +80,12 @@ public void TestAutoScaleRequestTest() cmdlet.AutoScaleFormula = formula; // Don't go to the service on an Evaluate AutoScale call - RequestInterceptor interceptor = new RequestInterceptor((baseRequest) => - { - BatchRequest request = - (BatchRequest)baseRequest; - - // Grab the formula off the outgoing request. - requestFormula = request.TypedParameters.AutoScaleFormula; - - request.ServiceRequestFunc = (cancellationToken) => + Action> extractFormulaAction = + (request) => { - CloudPoolEvaluateAutoScaleResponse response = new CloudPoolEvaluateAutoScaleResponse(); - Task task = Task.FromResult(response); - return task; + requestFormula = request.TypedParameters.AutoScaleFormula; }; - }); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(requestAction: extractFormulaAction); cmdlet.AdditionalBehaviors = new List() { interceptor }; cmdlet.ExecuteCmdlet(); diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/BatchController.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/BatchController.cs index 52ba1de3bb70..86ccfbb2ecbf 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/BatchController.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/BatchController.cs @@ -88,12 +88,13 @@ public void RunPsTestWorkflow( var callingClassName = callingClassType .Split(new[] { "." }, StringSplitOptions.RemoveEmptyEntries) .Last(); - helper.SetupModules( - AzureModule.AzureResourceManager, - "ScenarioTests\\Common.ps1", - "ScenarioTests\\" + callingClassName + ".ps1", - "Microsoft.Azure.Commands.Batch.Test.dll" - ); + helper.SetupModules(AzureModule.AzureResourceManager, + "ScenarioTests\\Common.ps1", + "ScenarioTests\\" + callingClassName + ".ps1", + "Microsoft.Azure.Commands.Batch.Test.dll", + helper.RMProfileModule, + helper.RMResourceModule, + helper.GetRMModulePath("AzureRM.Batch.psd1")); try { diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/ComputeNodeUserTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/ComputeNodeUserTests.cs index 6f38bbd48e02..f838953cab6d 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/ComputeNodeUserTests.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/ComputeNodeUserTests.cs @@ -72,6 +72,30 @@ public void TestCreateComputeNodeUserPipeline() } + [Fact] + [Trait(Category.AcceptanceType, Category.CheckIn)] + public void TestUpdateComputeNodeUser() + { + BatchController controller = BatchController.NewInstance; + BatchAccountContext context = null; + string computeNodeId = null; + string userName = "updateuser"; + controller.RunPsTestWorkflow( + () => { return new string[] { string.Format("Test-UpdateComputeNodeUser '{0}' '{1}' '{2}' '{3}'", accountName, poolId, computeNodeId, userName) }; }, + () => + { + context = ScenarioTestHelpers.GetBatchAccountContextWithKeys(controller, accountName); + computeNodeId = ScenarioTestHelpers.GetComputeNodeId(controller, context, poolId); + ScenarioTestHelpers.CreateComputeNodeUser(controller, context, poolId, computeNodeId, userName); + }, + () => + { + ScenarioTestHelpers.DeleteComputeNodeUser(controller, context, poolId, computeNodeId, userName); + }, + TestUtilities.GetCallingClass(), + TestUtilities.GetCurrentMethodName()); + } + [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDeleteComputeNodeUser() @@ -114,4 +138,14 @@ protected override void ProcessRecord() base.ProcessRecord(); } } + + [Cmdlet(VerbsCommon.Set, "AzureBatchComputeNodeUser_ST")] + public class SetBatchComputeNodeUserScenarioTestCommand : SetBatchComputeNodeUserCommand + { + protected override void ProcessRecord() + { + AdditionalBehaviors = new List() { ScenarioTestHelpers.CreateHttpRecordingInterceptor() }; + base.ProcessRecord(); + } + } } diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/ComputeNodeUserTests.ps1 b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/ComputeNodeUserTests.ps1 index db5105bc5eb7..d09ffbb343ef 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/ComputeNodeUserTests.ps1 +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/ComputeNodeUserTests.ps1 @@ -41,6 +41,21 @@ function Test-CreateComputeNodeUser Remove-AzureBatchComputeNodeUser_ST -PoolId $poolId -ComputeNodeId $computeNodeId -Name $userName -Force -BatchContext $context } +<# +.SYNOPSIS +Tests updating a compute node user +#> +function Test-UpdateComputeNodeUser +{ + param([string]$accountName, [string]$poolId, [string]$computeNodeId, [string]$userName) + + $context = Get-AzureRmBatchAccountKeys -Name $accountName + + # Basically just validating that we can set the parameters and execute the cmdlet without error. + # If a Get user API is added, we can validate that the properties were actually updated. + Set-AzureBatchComputeNodeUser_ST $poolId $computeNodeId $userName "Abcdefghijk1234!" -ExpiryTime ([DateTime]::Now.AddDays(5)) -BatchContext $context +} + <# .SYNOPSIS Tests deleting a compute node user diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/JobScheduleTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/JobScheduleTests.cs index 48042073901e..dd55ac4e7984 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/JobScheduleTests.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/JobScheduleTests.cs @@ -144,6 +144,29 @@ public void TestListAllJobSchedules() TestUtilities.GetCurrentMethodName()); } + [Fact] + [Trait(Category.AcceptanceType, Category.CheckIn)] + public void TestUpdateJobSchedule() + { + BatchController controller = BatchController.NewInstance; + string jobScheduleId = "testUpdateJobSchedule"; + + BatchAccountContext context = null; + controller.RunPsTestWorkflow( + () => { return new string[] { string.Format("Test-UpdateJobSchedule '{0}' '{1}'", accountName, jobScheduleId) }; }, + () => + { + context = ScenarioTestHelpers.GetBatchAccountContextWithKeys(controller, accountName); + ScenarioTestHelpers.CreateTestJobSchedule(controller, context, jobScheduleId, null); + }, + () => + { + ScenarioTestHelpers.DeleteJobSchedule(controller, context, jobScheduleId); + }, + TestUtilities.GetCallingClass(), + TestUtilities.GetCurrentMethodName()); + } + [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDeleteJobSchedule() @@ -302,4 +325,14 @@ protected override void ProcessRecord() base.ProcessRecord(); } } + + [Cmdlet(VerbsCommon.Set, "AzureBatchJobSchedule_ST")] + public class SetBatchJobScheduleScenarioTestCommand : SetBatchJobScheduleCommand + { + protected override void ProcessRecord() + { + AdditionalBehaviors = new List() { ScenarioTestHelpers.CreateHttpRecordingInterceptor() }; + base.ProcessRecord(); + } + } } diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/JobScheduleTests.ps1 b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/JobScheduleTests.ps1 index ea242f0848bf..24d61fd55cdd 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/JobScheduleTests.ps1 +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/JobScheduleTests.ps1 @@ -328,6 +328,252 @@ function Test-ListAllJobSchedules Assert-AreEqual $count $jobSchedules.Length } +<# +.SYNOPSIS +Tests updating a job schedule +#> +function Test-UpdateJobSchedule +{ + param([string]$accountName, [string]$jobScheduleId) + + $context = Get-AzureRmBatchAccountKeys -Name $accountName + + $jobSchedule = Get-AzureBatchJobSchedule_ST $jobScheduleId -BatchContext $context + + # Define new Schedule properties + $schedule = New-Object Microsoft.Azure.Commands.Batch.Models.PSSchedule + $schedule.DoNotRunUntil = $doNotRunUntil = New-Object DateTime -ArgumentList @(2020,01,01,12,0,0) + $schedule.DoNotRunAfter = $doNotRunAfter = New-Object DateTime -ArgumentList @(2025,01,01,12,0,0) + $schedule.StartWindow = $startWindow = [TimeSpan]::FromHours(1) + $schedule.RecurrenceInterval = $recurrence = [TimeSpan]::FromDays(1) + + # Define new JobSpecification properties + + $startTask = New-Object Microsoft.Azure.Commands.Batch.Models.PSStartTask + $startTaskCmd = "cmd /c dir /s" + $startTask.CommandLine = $startTaskCmd + + $poolSpec = New-Object Microsoft.Azure.Commands.Batch.Models.PSPoolSpecification + $poolSpec.TargetDedicated = $targetDedicated = 3 + $poolSpec.VirtualMachineSize = $vmSize = "small" + $poolSpec.OSFamily = $osFamily = "4" + $poolSpec.TargetOSVersion = $targetOS = "*" + $poolSpec.StartTask = $startTask + + $poolSpec.CertificateReferences = new-object System.Collections.Generic.List``1[Microsoft.Azure.Commands.Batch.Models.PSCertificateReference] + $certRef = New-Object Microsoft.Azure.Commands.Batch.Models.PSCertificateReference + $certRef.StoreLocation = $storeLocation = ([Microsoft.Azure.Batch.Common.CertStoreLocation]::LocalMachine) + $certRef.StoreName = $storeName = "certStore" + $certRef.Thumbprint = $thumbprint = "0123456789ABCDEF" + $certRef.ThumbprintAlgorithm = $thumbprintAlgorithm = "sha1" + $certRef.Visibility = $visibility = ([Microsoft.Azure.Batch.Common.CertificateVisibility]::StartTask) + $poolSpec.CertificateReferences.Add($certRef) + $certRefCount = $poolSpec.CertificateReferences.Count + + $autoPoolSpec = New-Object Microsoft.Azure.Commands.Batch.Models.PSAutoPoolSpecification + $autoPoolSpec.PoolSpecification = $poolSpec + $autoPoolSpec.AutoPoolIdPrefix = $autoPoolIdPrefix = "TestSpecPrefix" + $autoPoolSpec.KeepAlive = $keepAlive = $false + $autoPoolSpec.PoolLifeTimeOption = $poolLifeTime = ([Microsoft.Azure.Batch.Common.PoolLifeTimeOption]::JobSchedule) + + $poolInfo = New-Object Microsoft.Azure.Commands.Batch.Models.PSPoolInformation + $poolInfo.AutoPoolSpecification = $autoPoolSpec + + $jobMgr = New-Object Microsoft.Azure.Commands.Batch.Models.PSJobManagerTask + $jobMgr.CommandLine = $jobMgrCmd = "cmd /c dir /s" + $jobMgr.EnvironmentSettings = New-Object System.Collections.Generic.List``1[Microsoft.Azure.Commands.Batch.Models.PSEnvironmentSetting] + $env1 = New-Object Microsoft.Azure.Commands.Batch.Models.PSEnvironmentSetting -ArgumentList "name1","value1" + $env2 = New-Object Microsoft.Azure.Commands.Batch.Models.PSEnvironmentSetting -ArgumentList "name2","value2" + $env1Name = $env1.Name + $env1Value = $env1.Value + $env2Name = $env2.Name + $env2Value = $env2.Value + $jobMgr.EnvironmentSettings.Add($env1) + $jobMgr.EnvironmentSettings.Add($env2) + $envCount = $jobMgr.EnvironmentSettings.Count + $jobMgr.ResourceFiles = new-object System.Collections.Generic.List``1[Microsoft.Azure.Commands.Batch.Models.PSResourceFile] + $r1 = New-Object Microsoft.Azure.Commands.Batch.Models.PSResourceFile -ArgumentList "https://testacct.blob.core.windows.net/","filePath" + $blobSource = $r1.BlobSource + $filePath = $r1.FilePath + $jobMgr.ResourceFiles.Add($r1) + $resourceFileCount = $jobMgr.ResourceFiles.Count + $jobMgr.KillJobOnCompletion = $killOnCompletion = $false + $jobMgr.Id = $jobMgrId = "jobManager" + $jobMgr.DisplayName = $jobMgrDisplay = "jobManagerDisplay" + $jobMgr.RunElevated = $runElevated = $false + $jobMgrMaxWallClockTime = [TimeSpan]::FromHours(1) + $jobMgr.Constraints = New-Object Microsoft.Azure.Commands.Batch.Models.PSTaskConstraints -ArgumentList @($jobMgrMaxWallClockTime,$null,$null) + + $jobPrep = New-Object Microsoft.Azure.Commands.Batch.Models.PSJobPreparationTask + $jobPrep.CommandLine = $jobPrepCmd = "cmd /c dir /s" + $jobPrep.EnvironmentSettings = New-Object System.Collections.Generic.List``1[Microsoft.Azure.Commands.Batch.Models.PSEnvironmentSetting] + $jobPrepEnv1 = New-Object Microsoft.Azure.Commands.Batch.Models.PSEnvironmentSetting -ArgumentList "jobPrepName1","jobPrepValue1" + $jobPrepEnv2 = New-Object Microsoft.Azure.Commands.Batch.Models.PSEnvironmentSetting -ArgumentList "jobPrepName2","jobPrepValue2" + $jobPrepEnv1Name = $jobPrepEnv1.Name + $jobPrepEnv1Value = $jobPrepEnv1.Value + $jobPrepEnv2Name = $jobPrepEnv2.Name + $jobPrepEnv2Value = $jobPrepEnv2.Value + $jobPrep.EnvironmentSettings.Add($jobPrepEnv1) + $jobPrep.EnvironmentSettings.Add($jobPrepEnv2) + $jobPrepEnvCount = $jobPrep.EnvironmentSettings.Count + $jobPrep.ResourceFiles = new-object System.Collections.Generic.List``1[Microsoft.Azure.Commands.Batch.Models.PSResourceFile] + $jobPrepR1 = New-Object Microsoft.Azure.Commands.Batch.Models.PSResourceFile -ArgumentList "https://testacct.blob.core.windows.net/","jobPrepFilePath" + $jobPrepBlobSource = $jobPrepR1.BlobSource + $jobPrepFilePath = $jobPrepR1.FilePath + $jobPrep.ResourceFiles.Add($jobPrepR1) + $jobPrepResourceFileCount = $jobPrep.ResourceFiles.Count + $jobPrep.Id = $jobPrepId = "jobPrep" + $jobPrep.RunElevated = $jobPrepRunElevated = $false + $jobPrepRetryCount = 2 + $jobPrep.Constraints = New-Object Microsoft.Azure.Commands.Batch.Models.PSTaskConstraints -ArgumentList @($null,$null,$jobPrepRetryCount) + + $jobRelease = New-Object Microsoft.Azure.Commands.Batch.Models.PSJobReleaseTask + $jobRelease.CommandLine = $jobReleaseCmd = "cmd /c dir /s" + $jobRelease.EnvironmentSettings = New-Object System.Collections.Generic.List``1[Microsoft.Azure.Commands.Batch.Models.PSEnvironmentSetting] + $jobReleaseEnv1 = New-Object Microsoft.Azure.Commands.Batch.Models.PSEnvironmentSetting -ArgumentList "jobReleaseName1","jobReleaseValue1" + $jobReleaseEnv2 = New-Object Microsoft.Azure.Commands.Batch.Models.PSEnvironmentSetting -ArgumentList "jobReleaseName2","jobReleaseValue2" + $jobReleaseEnv1Name = $jobReleaseEnv1.Name + $jobReleaseEnv1Value = $jobReleaseEnv1.Value + $jobReleaseEnv2Name = $jobReleaseEnv2.Name + $jobReleaseEnv2Value = $jobReleaseEnv2.Value + $jobRelease.EnvironmentSettings.Add($jobReleaseEnv1) + $jobRelease.EnvironmentSettings.Add($jobReleaseEnv2) + $jobReleaseEnvCount = $jobRelease.EnvironmentSettings.Count + $jobRelease.ResourceFiles = new-object System.Collections.Generic.List``1[Microsoft.Azure.Commands.Batch.Models.PSResourceFile] + $jobReleaseR1 = New-Object Microsoft.Azure.Commands.Batch.Models.PSResourceFile -ArgumentList "https://testacct.blob.core.windows.net/","jobReleaseFilePath" + $jobReleaseBlobSource = $jobReleaseR1.BlobSource + $jobReleaseFilePath = $jobReleaseR1.FilePath + $jobRelease.ResourceFiles.Add($jobReleaseR1) + $jobReleaseResourceFileCount = $jobRelease.ResourceFiles.Count + $jobRelease.Id = $jobReleaseId = "jobRelease" + $jobRelease.RunElevated = $jobReleaseRunElevated = $false + + $jobConstraints = New-Object Microsoft.Azure.Commands.Batch.Models.PSJobConstraints -ArgumentList @([TimeSpan]::FromDays(1),5) + $maxWallClockTime = $jobConstraints.MaxWallClockTime + $maxTaskRetry = $jobConstraints.MaxTaskRetryCount + + $jobSpec = New-Object Microsoft.Azure.Commands.Batch.Models.PSJobSpecification + $jobSpec.JobManagerTask = $jobMgr + $jobSpec.JobPreparationTask = $jobPrep + $jobSpec.JobReleaseTask = $jobRelease + $jobSpec.Constraints = $jobConstraints + $jobSpec.PoolInformation = $poolInfo + $jobSpec.CommonEnvironmentSettings = New-Object System.Collections.Generic.List``1[Microsoft.Azure.Commands.Batch.Models.PSEnvironmentSetting] + $commonEnv1 = New-Object Microsoft.Azure.Commands.Batch.Models.PSEnvironmentSetting -ArgumentList "commonName1","commonValue1" + $commonEnv2 = New-Object Microsoft.Azure.Commands.Batch.Models.PSEnvironmentSetting -ArgumentList "commonName2","commonValue2" + $commonEnv1Name = $commonEnv1.Name + $commonEnv1Value = $commonEnv1.Value + $commonEnv2Name = $commonEnv2.Name + $commonEnv2Value = $commonEnv2.Value + $jobSpec.CommonEnvironmentSettings.Add($commonEnv1) + $jobSpec.CommonEnvironmentSettings.Add($commonEnv2) + $commonEnvCount = $jobSpec.CommonEnvironmentSettings.Count + $jobSpec.DisplayName = $jobSpecDisplayName = "jobSpecDisplayName" + $jobSpec.Priority = $jobSpecPri = 1 + $jobSpec.Metadata = New-Object System.Collections.Generic.List``1[Microsoft.Azure.Commands.Batch.Models.PSMetadataItem] + $jobSpecMeta1 = New-Object Microsoft.Azure.Commands.Batch.Models.PSMetadataItem -ArgumentList "specMeta1","specMetaValue1" + $jobSpecMeta2 = New-Object Microsoft.Azure.Commands.Batch.Models.PSMetadataItem -ArgumentList "specMeta2","specMetaValue2" + $jobSpecMeta1Name = $jobSpecMeta1.Name + $jobSpecMeta1Value = $jobSpecMeta1.Value + $jobSpecMeta2Name = $jobSpecMeta2.Name + $jobSpecMeta2Value = $jobSpecMeta2.Value + $jobSpec.Metadata.Add($jobSpecMeta1) + $jobSpec.Metadata.Add($jobSpecMeta2) + $jobSpecMetaCount = $jobSpec.Metadata.Count + + # Define new metadata + $metadata = New-Object System.Collections.Generic.List``1[Microsoft.Azure.Commands.Batch.Models.PSMetadataItem] + $metadataItem1 = New-Object Microsoft.Azure.Commands.Batch.Models.PSMetadataItem -ArgumentList "jobScheduleMeta1","jobScheduleValue1" + $metadata.Add($metadataItem1) + + # Update job schedule + $jobSchedule.Schedule = $schedule + $jobSchedule.JobSpecification = $jobSpec + $jobSchedule.Metadata = $metadata + + $jobSchedule | Set-AzureBatchJobSchedule_ST -BatchContext $context + + # Refresh the job schedule to verify it was updated + $jobSchedule = Get-AzureBatchJobSchedule_ST -BatchContext $context + + # Verify Schedule was updated + Assert-AreEqual $doNotRunUntil $jobSchedule.Schedule.DoNotRunUntil + Assert-AreEqual $doNotRunAfter $jobSchedule.Schedule.DoNotRunAfter + Assert-AreEqual $recurrence $jobSchedule.Schedule.RecurrenceInterval + Assert-AreEqual $startWindow $jobSchedule.Schedule.StartWindow + + Assert-AreEqual $autoPoolIdPrefix $jobSchedule.JobSpecification.PoolInformation.AutoPoolSpecification.AutoPoolIdPrefix + Assert-AreEqual $keepAlive $jobSchedule.JobSpecification.PoolInformation.AutoPoolSpecification.KeepAlive + Assert-AreEqual $poolLifeTime $jobSchedule.JobSpecification.PoolInformation.AutoPoolSpecification.PoolLifeTimeOption + Assert-AreEqual $targetDedicated $jobSchedule.JobSpecification.PoolInformation.AutoPoolSpecification.PoolSpecification.TargetDedicated + Assert-AreEqual $vmSize $jobSchedule.JobSpecification.PoolInformation.AutoPoolSpecification.PoolSpecification.VirtualMachineSize + Assert-AreEqual $osFamily $jobSchedule.JobSpecification.PoolInformation.AutoPoolSpecification.PoolSpecification.OSFamily + Assert-AreEqual $targetOS $jobSchedule.JobSpecification.PoolInformation.AutoPoolSpecification.PoolSpecification.TargetOSVersion + Assert-AreEqual $certRefCount $jobSchedule.JobSpecification.PoolInformation.AutoPoolSpecification.PoolSpecification.CertificateReferences.Count + Assert-AreEqual $storeLocation $jobSchedule.JobSpecification.PoolInformation.AutoPoolSpecification.PoolSpecification.CertificateReferences[0].StoreLocation + Assert-AreEqual $storeName $jobSchedule.JobSpecification.PoolInformation.AutoPoolSpecification.PoolSpecification.CertificateReferences[0].StoreName + Assert-AreEqual $thumbprint $jobSchedule.JobSpecification.PoolInformation.AutoPoolSpecification.PoolSpecification.CertificateReferences[0].Thumbprint + Assert-AreEqual $thumbprintAlgorithm $jobSchedule.JobSpecification.PoolInformation.AutoPoolSpecification.PoolSpecification.CertificateReferences[0].ThumbprintAlgorithm + Assert-AreEqual $visibility $jobSchedule.JobSpecification.PoolInformation.AutoPoolSpecification.PoolSpecification.CertificateReferences[0].Visibility + Assert-AreEqual $startTaskCmd $jobSchedule.JobSpecification.PoolInformation.AutoPoolSpecification.PoolSpecification.StartTask.CommandLine + Assert-AreEqual $commonEnvCount $jobSchedule.JobSpecification.CommonEnvironmentSettings.Count + Assert-AreEqual $commonEnv1Name $jobSchedule.JobSpecification.CommonEnvironmentSettings[0].Name + Assert-AreEqual $commonEnv1Value $jobSchedule.JobSpecification.CommonEnvironmentSettings[0].Value + Assert-AreEqual $commonEnv2Name $jobSchedule.JobSpecification.CommonEnvironmentSettings[1].Name + Assert-AreEqual $commonEnv2Value $jobSchedule.JobSpecification.CommonEnvironmentSettings[1].Value + Assert-AreEqual $jobSpecDisplayName $jobSchedule.JobSpecification.DisplayName + Assert-AreEqual $jobMgrCmd $jobSchedule.JobSpecification.JobManagerTask.CommandLine + Assert-AreEqual $envCount $jobSchedule.JobSpecification.JobManagerTask.EnvironmentSettings.Count + Assert-AreEqual $env1Name $jobSchedule.JobSpecification.JobManagerTask.EnvironmentSettings[0].Name + Assert-AreEqual $env1Value $jobSchedule.JobSpecification.JobManagerTask.EnvironmentSettings[0].Value + Assert-AreEqual $env2Name $jobSchedule.JobSpecification.JobManagerTask.EnvironmentSettings[1].Name + Assert-AreEqual $env2Value $jobSchedule.JobSpecification.JobManagerTask.EnvironmentSettings[1].Value + Assert-AreEqual $resourceFileCount $jobSchedule.JobSpecification.JobManagerTask.ResourceFiles.Count + Assert-AreEqual $blobSource $jobSchedule.JobSpecification.JobManagerTask.ResourceFiles[0].BlobSource + Assert-AreEqual $filePath $jobSchedule.JobSpecification.JobManagerTask.ResourceFiles[0].FilePath + Assert-AreEqual $killOnCompletion $jobSchedule.JobSpecification.JobManagerTask.KillJobOnCompletion + Assert-AreEqual $jobMgrId $jobSchedule.JobSpecification.JobManagerTask.Id + Assert-AreEqual $jobMgrDisplay $jobSchedule.JobSpecification.JobManagerTask.DisplayName + Assert-AreEqual $runElevated $jobSchedule.JobSpecification.JobManagerTask.RunElevated + Assert-AreEqual $jobMgrMaxWallClockTime $jobSchedule.JobSpecification.JobManagerTask.Constraints.MaxWallClockTime + Assert-AreEqual $jobPrepCmd $jobSchedule.JobSpecification.JobPreparationTask.CommandLine + Assert-AreEqual $jobPrepEnvCount $jobSchedule.JobSpecification.JobPreparationTask.EnvironmentSettings.Count + Assert-AreEqual $jobPrepEnv1Name $jobSchedule.JobSpecification.JobPreparationTask.EnvironmentSettings[0].Name + Assert-AreEqual $jobPrepEnv1Value $jobSchedule.JobSpecification.JobPreparationTask.EnvironmentSettings[0].Value + Assert-AreEqual $jobPrepEnv2Name $jobSchedule.JobSpecification.JobPreparationTask.EnvironmentSettings[1].Name + Assert-AreEqual $jobPrepEnv2Value $jobSchedule.JobSpecification.JobPreparationTask.EnvironmentSettings[1].Value + Assert-AreEqual $jobPrepResourceFileCount $jobSchedule.JobSpecification.JobPreparationTask.ResourceFiles.Count + Assert-AreEqual $jobPrepBlobSource $jobSchedule.JobSpecification.JobPreparationTask.ResourceFiles[0].BlobSource + Assert-AreEqual $jobPrepFilePath $jobSchedule.JobSpecification.JobPreparationTask.ResourceFiles[0].FilePath + Assert-AreEqual $jobPrepId $jobSchedule.JobSpecification.JobPreparationTask.Id + Assert-AreEqual $jobPrepRunElevated $jobSchedule.JobSpecification.JobPreparationTask.RunElevated + Assert-AreEqual $jobPrepRetryCount $jobSchedule.JobSpecification.JobPreparationTask.Constraints.MaxTaskRetryCount + Assert-AreEqual $jobReleaseCmd $jobSchedule.JobSpecification.JobReleaseTask.CommandLine + Assert-AreEqual $jobReleaseEnvCount $jobSchedule.JobSpecification.JobReleaseTask.EnvironmentSettings.Count + Assert-AreEqual $jobReleaseEnv1Name $jobSchedule.JobSpecification.JobReleaseTask.EnvironmentSettings[0].Name + Assert-AreEqual $jobReleaseEnv1Value $jobSchedule.JobSpecification.JobReleaseTask.EnvironmentSettings[0].Value + Assert-AreEqual $jobReleaseEnv2Name $jobSchedule.JobSpecification.JobReleaseTask.EnvironmentSettings[1].Name + Assert-AreEqual $jobReleaseEnv2Value $jobSchedule.JobSpecification.JobReleaseTask.EnvironmentSettings[1].Value + Assert-AreEqual $jobReleaseResourceFileCount $jobSchedule.JobSpecification.JobReleaseTask.ResourceFiles.Count + Assert-AreEqual $jobReleaseBlobSource $jobSchedule.JobSpecification.JobReleaseTask.ResourceFiles[0].BlobSource + Assert-AreEqual $jobReleaseFilePath $jobSchedule.JobSpecification.JobReleaseTask.ResourceFiles[0].FilePath + Assert-AreEqual $jobReleaseId $jobSchedule.JobSpecification.JobReleaseTask.Id + Assert-AreEqual $jobReleaseRunElevated $jobSchedule.JobSpecification.JobReleaseTask.RunElevated + Assert-AreEqual $maxTaskRetry $jobSchedule.JobSpecification.Constraints.MaxTaskRetryCount + Assert-AreEqual $maxWallClockTime $jobSchedule.JobSpecification.Constraints.MaxWallClockTime + Assert-AreEqual $jobSpecMetaCount $jobSchedule.JobSpecification.Metadata.Count + Assert-AreEqual $jobSpecMeta1Name $jobSchedule.JobSpecification.Metadata[0].Name + Assert-AreEqual $jobSpecMeta1Value $jobSchedule.JobSpecification.Metadata[0].Value + Assert-AreEqual $jobSpecMeta2Name $jobSchedule.JobSpecification.Metadata[1].Name + Assert-AreEqual $jobSpecMeta2Value $jobSchedule.JobSpecification.Metadata[1].Value + Assert-AreEqual $jobSpecPri $jobSchedule.JobSpecification.Priority + + # Verify Metadata was updated + Assert-AreEqual $metadata.Count $jobSchedule.Metadata.Count + Assert-AreEqual $metadata[0].Name $jobSchedule.Metadata[0].Name + Assert-AreEqual $metadata[0].Value $jobSchedule.Metadata[0].Value +} + <# .SYNOPSIS Tests deleting a job schedule diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/JobTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/JobTests.cs index c2150acd1050..af3e45330fb3 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/JobTests.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/JobTests.cs @@ -181,6 +181,15 @@ public void TestListJobsUnderSchedule() TestUtilities.GetCurrentMethodName()); } + [Fact] + [Trait(Category.AcceptanceType, Category.CheckIn)] + public void TestUpdateJob() + { + BatchController controller = BatchController.NewInstance; + string jobId = "updateJobTest"; + controller.RunPsTest(string.Format("Test-UpdateJob '{0}' '{1}'", accountName, jobId)); + } + [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDeleteJob() @@ -300,6 +309,16 @@ protected override void ProcessRecord() } } + [Cmdlet(VerbsCommon.Set, "AzureBatchJob_ST")] + public class SetBatchJobScenarioTestCommand : SetBatchJobCommand + { + protected override void ProcessRecord() + { + AdditionalBehaviors = new List() { ScenarioTestHelpers.CreateHttpRecordingInterceptor() }; + base.ProcessRecord(); + } + } + [Cmdlet(VerbsCommon.Remove, "AzureBatchJob_ST")] public class RemoveBatchJobScenarioTestCommand : RemoveBatchJobCommand { diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/JobTests.ps1 b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/JobTests.ps1 index 239ff8001b2b..b4856c028c7d 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/JobTests.ps1 +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/JobTests.ps1 @@ -325,6 +325,80 @@ function Test-ListJobsUnderSchedule Assert-AreEqual $jobId $job.Id } +<# +.SYNOPSIS +Tests updating a job +#> +function Test-UpdateJob +{ + param([string]$accountName, [string]$jobId) + + $context = Get-AzureRmBatchAccountKeys -Name $accountName + + # Create the job with an auto pool + $poolSpec = New-Object Microsoft.Azure.Commands.Batch.Models.PSPoolSpecification + $poolSpec.TargetDedicated = 3 + $poolSpec.VirtualMachineSize = "small" + $poolSpec.OSFamily = "4" + $poolSpec.TargetOSVersion = "*" + $poolSpec.Metadata = New-Object System.Collections.Generic.List``1[Microsoft.Azure.Commands.Batch.Models.PSMetadataItem] + $poolSpecMetaItem = New-Object Microsoft.Azure.Commands.Batch.Models.PSMetadataItem -ArgumentList "meta1","value1" + $poolSpec.Metadata.Add($poolSpecMetaItem) + + $autoPoolSpec = New-Object Microsoft.Azure.Commands.Batch.Models.PSAutoPoolSpecification + $autoPoolSpec.PoolSpecification = $poolSpec + $autoPoolSpec.AutoPoolIdPrefix = $autoPoolIdPrefix = "TestSpecPrefix" + $autoPoolSpec.KeepAlive = $keepAlive = $true + $autoPoolSpec.PoolLifeTimeOption = ([Microsoft.Azure.Batch.Common.PoolLifeTimeOption]::Job) + + $poolInformation = New-Object Microsoft.Azure.Commands.Batch.Models.PSPoolInformation + $poolInformation.AutoPoolSpecification = $autoPoolSpec + + try + { + New-AzureBatchJob_ST -Id $jobId -PoolInformation $poolInformation -BatchContext $context + + # Update the job. On the PoolInformation property, only the AutoPoolSpecification.KeepAlive property can be updated, and only when the job is Disabled. + $job = Get-AzureBatchJob_ST $jobId -BatchContext $context + $job | Disable-AzureBatchJob_ST -DisableJobOption Terminate -BatchContext $context + + $priority = 3 + $newKeepAlive = !$keepAlive + $jobConstraints = New-Object Microsoft.Azure.Commands.Batch.Models.PSJobConstraints -ArgumentList @([TimeSpan]::FromDays(1),5) + $maxWallClockTime = $jobConstraints.MaxWallClockTime + $maxTaskRetry = $jobConstraints.MaxTaskRetryCount + $jobMetadata = New-Object System.Collections.Generic.List``1[Microsoft.Azure.Commands.Batch.Models.PSMetadataItem] + $jobMetadataItem = New-Object Microsoft.Azure.Commands.Batch.Models.PSMetadataItem -ArgumentList "jobMeta1","jobValue1" + $jobMetadata.Add($jobMetadataItem) + + $job.Priority = $priority + $job.Constraints = $jobConstraints + $job.PoolInformation.AutoPoolSpecification.KeepAlive = $newKeepAlive + $job.Metadata = $jobMetadata + + $job | Set-AzureBatchJob_ST -BatchContext $context + + # Verify the job was updated + $job = Get-AzureBatchJob_ST -BatchContext $context + + Assert-AreEqual $priority $job.Priority + Assert-AreEqual $newKeepAlive $job.PoolInformation.AutoPoolSpecification.KeepAlive + Assert-AreEqual $maxWallClockTime $job.Constraints.MaxWallClockTime + Assert-AreEqual $maxTaskRetry $job.Constraints.MaxTaskRetryCount + Assert-AreEqual $jobMetadata.Count $job.Metadata.Count + Assert-AreEqual $jobMetadata[0].Name $job.Metadata[0].Name + Assert-AreEqual $jobMetadata[0].Value $job.Metadata[0].Value + } + finally + { + # Cleanup job and autopool + Remove-AzureBatchJob_ST $jobId -Force -BatchContext $context + Get-AzureBatchPool_ST -Filter "startswith(id,'$autoPoolIdPrefix')" -BatchContext $context | Remove-AzureBatchPool_ST -Force -BatchContext $context + } + +} + + <# .SYNOPSIS Tests deleting a job diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/PoolTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/PoolTests.cs index b974f62384ba..a8407f5f40b2 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/PoolTests.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/PoolTests.cs @@ -149,6 +149,29 @@ public void TestListAllPools() TestUtilities.GetCurrentMethodName()); } + [Fact] + [Trait(Category.AcceptanceType, Category.CheckIn)] + public void TestUpdatePool() + { + BatchController controller = BatchController.NewInstance; + string poolId = "testUpdate"; + + BatchAccountContext context = null; + controller.RunPsTestWorkflow( + () => { return new string[] { string.Format("Test-UpdatePool '{0}' '{1}'", commonAccountName, poolId) }; }, + () => + { + context = ScenarioTestHelpers.GetBatchAccountContextWithKeys(controller, commonAccountName); + ScenarioTestHelpers.CreateTestPool(controller, context, poolId, 0); + }, + () => + { + ScenarioTestHelpers.DeletePool(controller, context, poolId); + }, + TestUtilities.GetCallingClass(), + TestUtilities.GetCurrentMethodName()); + } + [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDeletePool() @@ -441,6 +464,16 @@ protected override void ProcessRecord() } } + [Cmdlet(VerbsCommon.Set, "AzureBatchPool_ST")] + public class SetBatchPoolScenarioTestCommand : SetBatchPoolCommand + { + protected override void ProcessRecord() + { + AdditionalBehaviors = new List() { ScenarioTestHelpers.CreateHttpRecordingInterceptor() }; + base.ProcessRecord(); + } + } + [Cmdlet(VerbsCommon.Remove, "AzureBatchPool_ST")] public class RemoveBatchPoolScenarioTestCommand : RemoveBatchPoolCommand { diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/PoolTests.ps1 b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/PoolTests.ps1 index 7c0e70bd8a21..d777942ed99a 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/PoolTests.ps1 +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/PoolTests.ps1 @@ -164,6 +164,67 @@ function Test-ListAllPools Assert-AreEqual $count $pools.Length } +<# +.SYNOPSIS +Tests updating a pool +#> +function Test-UpdatePool +{ + param([string]$accountName, [string]$poolId) + + $context = Get-AzureRmBatchAccountKeys -Name $accountName + + $pool = Get-AzureBatchPool_ST $poolId -BatchContext $context + + # Define new Start Task + $startTask = New-Object Microsoft.Azure.Commands.Batch.Models.PSStartTask + $startTaskCmd = "cmd /c dir /s" + $startTask.CommandLine = $startTaskCmd + $startTask.ResourceFiles = New-Object System.Collections.Generic.List``1[Microsoft.Azure.Commands.Batch.Models.PSResourceFile] + $blobSource1 = "https://testacct1.blob.core.windows.net/" + $filePath1 = "filePath1" + $blobSource2 = "https://testacct2.blob.core.windows.net/" + $filePath2 = "filePath2" + $r1 = New-Object Microsoft.Azure.Commands.Batch.Models.PSResourceFile -ArgumentList @($blobSource1,$filePath1) + $r2 = New-Object Microsoft.Azure.Commands.Batch.Models.PSResourceFile -ArgumentList @($blobSource2,$filePath2) + $startTask.ResourceFiles.Add($r1) + $startTask.ResourceFiles.Add($r2) + $resourceFileCount = $startTask.ResourceFiles.Count + $startTask.EnvironmentSettings = New-Object System.Collections.Generic.List``1[Microsoft.Azure.Commands.Batch.Models.PSEnvironmentSetting] + $envSetting = New-Object Microsoft.Azure.Commands.Batch.Models.PSEnvironmentSetting -ArgumentList "envName","envVal" + $startTask.EnvironmentSettings.Add($envSetting) + + # Define new Metadata + $metadata = New-Object System.Collections.Generic.List``1[Microsoft.Azure.Commands.Batch.Models.PSMetadataItem] + $metadataItem = New-Object Microsoft.Azure.Commands.Batch.Models.PSMetadataItem -ArgumentList "poolMetaName","poolMetaValue" + $metadata.Add($metadataItem) + + # TODO: Also set cert refs when the cert cmdlets are implemented + + # Update and refresh pool + $pool.StartTask = $startTask + $pool.Metadata = $metadata + + $pool | Set-AzureBatchPool_ST -BatchContext $context + $pool = Get-AzureBatchPool_ST $poolId -BatchContext $context + + # Verify Start Task was updated + Assert-AreEqual $startTaskCmd $pool.StartTask.CommandLine + Assert-AreEqual $resourceFileCount $pool.StartTask.ResourceFiles.Count + Assert-AreEqual $blobSource1 $pool.StartTask.ResourceFiles[0].BlobSource + Assert-AreEqual $filePath1 $pool.StartTask.ResourceFiles[0].FilePath + Assert-AreEqual $blobSource2 $pool.StartTask.ResourceFiles[1].BlobSource + Assert-AreEqual $filePath2 $pool.StartTask.ResourceFiles[1].FilePath + Assert-AreEqual 1 $pool.StartTask.EnvironmentSettings.Count + Assert-AreEqual $envSetting.Name $pool.StartTask.EnvironmentSettings[0].Name + Assert-AreEqual $envSetting.Value $pool.StartTask.EnvironmentSettings[0].Value + + # Verify Metadata was updated + Assert-AreEqual 1 $pool.Metadata.Count + Assert-AreEqual $metadataItem.Name $pool.Metadata[0].Name + Assert-AreEqual $metadataItem.Value $pool.Metadata[0].Value +} + <# .SYNOPSIS Tests deleting a pool diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/ScenarioTestHelpers.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/ScenarioTestHelpers.cs index 5cc38aee23f4..12da852f6b86 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/ScenarioTestHelpers.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/ScenarioTestHelpers.cs @@ -12,30 +12,20 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using System.Collections; using System.Collections.Generic; -using System.IO; using System.Linq; -using System.Net; using System.Net.Http; -using System.Net.Http.Headers; -using System.Text; using System.Threading; -using System.Threading.Tasks; using Microsoft.Azure.Batch; -using Microsoft.Azure.Batch.Auth; using Microsoft.Azure.Batch.Common; using Microsoft.Azure.Batch.Protocol; -using Microsoft.Azure.Batch.Protocol.Models; using Microsoft.Azure.Commands.Batch.Models; using Microsoft.Azure.Management.Batch; using Microsoft.Azure.Management.Batch.Models; using System; -using System.Reflection; using Microsoft.Azure.Management.Resources; using Microsoft.Azure.Management.Resources.Models; using Microsoft.Azure.Test.HttpRecorder; -using Moq; using BatchClient = Microsoft.Azure.Commands.Batch.Models.BatchClient; using Constants = Microsoft.Azure.Commands.Batch.Utils.Constants; @@ -428,7 +418,7 @@ public static void WaitForIdleComputeNode(BatchController controller, BatchAccou } /// - /// Creates a test user for use in Scenario tests. + /// Creates a compute node user for use in Scenario tests. /// public static void CreateComputeNodeUser(BatchController controller, BatchAccountContext context, string poolId, string computeNodeId, string computeNodeUserName) { @@ -445,6 +435,21 @@ public static void CreateComputeNodeUser(BatchController controller, BatchAccoun client.CreateComputeNodeUser(parameters); } + /// + /// Deletes a compute node user for use in Scenario tests. + /// + public static void DeleteComputeNodeUser(BatchController controller, BatchAccountContext context, string poolId, string computeNodeId, string computeNodeUserName) + { + RequestInterceptor interceptor = CreateHttpRecordingInterceptor(); + BatchClientBehavior[] behaviors = new BatchClientBehavior[] { interceptor }; + BatchClient client = new BatchClient(controller.BatchManagementClient, controller.ResourceManagementClient); + + ComputeNodeUserOperationParameters parameters = new ComputeNodeUserOperationParameters(context, poolId, computeNodeId, computeNodeUserName, behaviors); + + client.DeleteComputeNodeUser(parameters); + } + + /// /// Creates an interceptor that can be used to support the HTTP recorder scenario tests. /// Since the BatchRestClient is not generated from the test infrastructure, the HTTP diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/TaskTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/TaskTests.cs index 9292fe5afc09..d0842066e21f 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/TaskTests.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/TaskTests.cs @@ -186,6 +186,32 @@ public void TestListTaskPipeline() TestUtilities.GetCurrentMethodName()); } + [Fact] + [Trait(Category.AcceptanceType, Category.CheckIn)] + public void TestUpdateTask() + { + BatchController controller = BatchController.NewInstance; + string jobId = "updateTaskJob"; + string taskId = "testTask"; + + BatchAccountContext context = null; + controller.RunPsTestWorkflow( + () => { return new string[] { string.Format("Test-UpdateTask '{0}' '{1}' '{2}'", accountName, jobId, taskId) }; }, + () => + { + context = ScenarioTestHelpers.GetBatchAccountContextWithKeys(controller, accountName); + ScenarioTestHelpers.CreateTestJob(controller, context, jobId); + // Make the task long running so the constraints can be updated + ScenarioTestHelpers.CreateTestTask(controller, context, jobId, taskId, "ping -t localhost -w 60"); + }, + () => + { + ScenarioTestHelpers.DeleteJob(controller, context, jobId); + }, + TestUtilities.GetCallingClass(), + TestUtilities.GetCurrentMethodName()); + } + [Fact] [Trait(Category.AcceptanceType, Category.CheckIn)] public void TestDeleteTask() @@ -284,6 +310,16 @@ protected override void ProcessRecord() } } + [Cmdlet(VerbsCommon.Set, "AzureBatchTask_ST")] + public class SetBatchTaskScenarioTestCommand : SetBatchTaskCommand + { + protected override void ProcessRecord() + { + AdditionalBehaviors = new List() { ScenarioTestHelpers.CreateHttpRecordingInterceptor() }; + base.ProcessRecord(); + } + } + [Cmdlet(VerbsCommon.Remove, "AzureBatchTask_ST")] public class RemoveBatchTaskScenarioTestCommand : RemoveBatchTaskCommand { diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/TaskTests.ps1 b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/TaskTests.ps1 index e82dfca2babe..b1a0a15559cb 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/TaskTests.ps1 +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/ScenarioTests/TaskTests.ps1 @@ -175,6 +175,35 @@ function Test-ListTaskPipeline Assert-AreEqual $taskId $task.Id } +<# +.SYNOPSIS +Tests updating a task +#> +function Test-UpdateTask +{ + param([string]$accountName, [string]$jobId, [string]$taskId) + + $context = Get-AzureRmBatchAccountKeys -Name $accountName + + $task = Get-AzureBatchTask_ST $jobId $taskId -BatchContext $context + + # Define new task constraints + $constraints = New-Object Microsoft.Azure.Commands.Batch.Models.PSTaskConstraints -ArgumentList @([TimeSpan]::FromDays(10),[TimeSpan]::FromDays(2),5) + $maxWallClockTime = $constraints.MaxWallClockTime + $retentionTime = $constraints.RetentionTime + $maxRetryCount = $constraints.MaxRetryCount + + # Update and refresh task + $task.Constraints = $constraints + $task | Set-AzureBatchTask_ST -BatchContext $context + $task = Get-AzureBatchTask_ST $jobId $taskId -BatchContext $context + + # Verify task was updated + Assert-AreEqual $maxWallClockTime $task.Constraints.MaxWallClockTime + Assert-AreEqual $retentionTime $task.Constraints.RetentionTime + Assert-AreEqual $maxRetryCount $constraints.MaxRetryCount +} + <# .SYNOPSIS Tests deleting a task diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/SessionRecords/Microsoft.Azure.Commands.Batch.Test.ScenarioTests.ComputeNodeUserTests/TestUpdateComputeNodeUser.json b/src/ResourceManager/AzureBatch/Commands.Batch.Test/SessionRecords/Microsoft.Azure.Commands.Batch.Test.ScenarioTests.ComputeNodeUserTests/TestUpdateComputeNodeUser.json new file mode 100644 index 000000000000..c2d52aebf2be --- /dev/null +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/SessionRecords/Microsoft.Azure.Commands.Batch.Test.ScenarioTests.ComputeNodeUserTests/TestUpdateComputeNodeUser.json @@ -0,0 +1,702 @@ +{ + "Entries": [ + { + "RequestUri": "/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resources?$filter=resourceType%20eq%20'Microsoft.Batch%2FbatchAccounts'&api-version=2014-04-01-preview", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNjM2OGVkMzgtMzU3MC00ODFmLWI0ZmEtMWQwYTZlOGQzZjNiL3Jlc291cmNlcz8kZmlsdGVyPXJlc291cmNlVHlwZSUyMGVxJTIwJ01pY3Jvc29mdC5CYXRjaCUyRmJhdGNoQWNjb3VudHMnJmFwaS12ZXJzaW9uPTIwMTQtMDQtMDEtcHJldmlldw==", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "User-Agent": [ + "Microsoft.Azure.Management.Resources.ResourceManagementClient/2.0.0.0" + ] + }, + "ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"id\": \"/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resourceGroups/default-azurebatch-eastus/providers/Microsoft.Batch/batchAccounts/pstests\",\r\n \"name\": \"pstests\",\r\n \"type\": \"Microsoft.Batch/batchAccounts\",\r\n \"location\": \"eastus\"\r\n },\r\n {\r\n \"id\": \"/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resourceGroups/Default-AzureBatch-WestUS/providers/Microsoft.Batch/batchAccounts/jaschneibatchtest\",\r\n \"name\": \"jaschneibatchtest\",\r\n \"type\": \"Microsoft.Batch/batchAccounts\",\r\n \"location\": \"westus\"\r\n }\r\n ]\r\n}", + "ResponseHeaders": { + "Content-Length": [ + "483" + ], + "Content-Type": [ + "application/json; charset=utf-8" + ], + "Expires": [ + "-1" + ], + "Pragma": [ + "no-cache" + ], + "x-ms-ratelimit-remaining-subscription-reads": [ + "14982" + ], + "x-ms-request-id": [ + "9a2d1ff8-d7a9-439b-95a2-85345398d455" + ], + "x-ms-correlation-request-id": [ + "9a2d1ff8-d7a9-439b-95a2-85345398d455" + ], + "x-ms-routing-request-id": [ + "WESTUS:20150904T232232Z:9a2d1ff8-d7a9-439b-95a2-85345398d455" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "Cache-Control": [ + "no-cache" + ], + "Date": [ + "Fri, 04 Sep 2015 23:22:32 GMT" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resources?$filter=resourceType%20eq%20'Microsoft.Batch%2FbatchAccounts'&api-version=2014-04-01-preview", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNjM2OGVkMzgtMzU3MC00ODFmLWI0ZmEtMWQwYTZlOGQzZjNiL3Jlc291cmNlcz8kZmlsdGVyPXJlc291cmNlVHlwZSUyMGVxJTIwJ01pY3Jvc29mdC5CYXRjaCUyRmJhdGNoQWNjb3VudHMnJmFwaS12ZXJzaW9uPTIwMTQtMDQtMDEtcHJldmlldw==", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "User-Agent": [ + "Microsoft.Azure.Management.Resources.ResourceManagementClient/2.0.0.0" + ] + }, + "ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"id\": \"/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resourceGroups/default-azurebatch-eastus/providers/Microsoft.Batch/batchAccounts/pstests\",\r\n \"name\": \"pstests\",\r\n \"type\": \"Microsoft.Batch/batchAccounts\",\r\n \"location\": \"eastus\"\r\n },\r\n {\r\n \"id\": \"/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resourceGroups/Default-AzureBatch-WestUS/providers/Microsoft.Batch/batchAccounts/jaschneibatchtest\",\r\n \"name\": \"jaschneibatchtest\",\r\n \"type\": \"Microsoft.Batch/batchAccounts\",\r\n \"location\": \"westus\"\r\n }\r\n ]\r\n}", + "ResponseHeaders": { + "Content-Length": [ + "483" + ], + "Content-Type": [ + "application/json; charset=utf-8" + ], + "Expires": [ + "-1" + ], + "Pragma": [ + "no-cache" + ], + "x-ms-ratelimit-remaining-subscription-reads": [ + "14981" + ], + "x-ms-request-id": [ + "11114821-1b6c-430b-b9e0-1bce5c768245" + ], + "x-ms-correlation-request-id": [ + "11114821-1b6c-430b-b9e0-1bce5c768245" + ], + "x-ms-routing-request-id": [ + "WESTUS:20150904T232236Z:11114821-1b6c-430b-b9e0-1bce5c768245" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "Cache-Control": [ + "no-cache" + ], + "Date": [ + "Fri, 04 Sep 2015 23:22:35 GMT" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resourceGroups/default-azurebatch-eastus/providers/Microsoft.Batch/batchAccounts/pstests?api-version=2015-07-01", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNjM2OGVkMzgtMzU3MC00ODFmLWI0ZmEtMWQwYTZlOGQzZjNiL3Jlc291cmNlR3JvdXBzL2RlZmF1bHQtYXp1cmViYXRjaC1lYXN0dXMvcHJvdmlkZXJzL01pY3Jvc29mdC5CYXRjaC9iYXRjaEFjY291bnRzL3BzdGVzdHM/YXBpLXZlcnNpb249MjAxNS0wNy0wMQ==", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "x-ms-version": [ + "2015-07-01" + ], + "User-Agent": [ + "Microsoft.Azure.Management.Batch.BatchManagementClient/1.0.0.0" + ] + }, + "ResponseBody": "{\r\n \"name\": \"pstests\",\r\n \"location\": \"eastus\",\r\n \"properties\": {\r\n \"accountEndpoint\": \"pstests.eastus.batch.azure.com\",\r\n \"provisioningState\": \"Succeeded\"\r\n },\r\n \"id\": \"/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resourceGroups/default-azurebatch-eastus/providers/Microsoft.Batch/batchAccounts/pstests\",\r\n \"type\": \"Microsoft.Batch/batchAccounts\"\r\n}", + "ResponseHeaders": { + "Content-Length": [ + "323" + ], + "Content-Type": [ + "application/json; charset=utf-8" + ], + "Expires": [ + "-1" + ], + "Last-Modified": [ + "Fri, 04 Sep 2015 23:22:34 GMT" + ], + "Pragma": [ + "no-cache" + ], + "request-id": [ + "0db0e271-d16a-4f26-8fc2-b996b9faaa89" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "x-ms-ratelimit-remaining-subscription-reads": [ + "14961" + ], + "x-ms-request-id": [ + "07d11d90-9fd0-4a5c-8c40-00f5194a4988" + ], + "x-ms-correlation-request-id": [ + "07d11d90-9fd0-4a5c-8c40-00f5194a4988" + ], + "x-ms-routing-request-id": [ + "WESTUS:20150904T232233Z:07d11d90-9fd0-4a5c-8c40-00f5194a4988" + ], + "Cache-Control": [ + "no-cache" + ], + "Date": [ + "Fri, 04 Sep 2015 23:22:33 GMT" + ], + "ETag": [ + "0x8D2B57FB6C7DB91" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resourceGroups/default-azurebatch-eastus/providers/Microsoft.Batch/batchAccounts/pstests?api-version=2015-07-01", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNjM2OGVkMzgtMzU3MC00ODFmLWI0ZmEtMWQwYTZlOGQzZjNiL3Jlc291cmNlR3JvdXBzL2RlZmF1bHQtYXp1cmViYXRjaC1lYXN0dXMvcHJvdmlkZXJzL01pY3Jvc29mdC5CYXRjaC9iYXRjaEFjY291bnRzL3BzdGVzdHM/YXBpLXZlcnNpb249MjAxNS0wNy0wMQ==", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "x-ms-version": [ + "2015-07-01" + ], + "User-Agent": [ + "Microsoft.Azure.Management.Batch.BatchManagementClient/1.0.0.0" + ] + }, + "ResponseBody": "{\r\n \"name\": \"pstests\",\r\n \"location\": \"eastus\",\r\n \"properties\": {\r\n \"accountEndpoint\": \"pstests.eastus.batch.azure.com\",\r\n \"provisioningState\": \"Succeeded\"\r\n },\r\n \"id\": \"/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resourceGroups/default-azurebatch-eastus/providers/Microsoft.Batch/batchAccounts/pstests\",\r\n \"type\": \"Microsoft.Batch/batchAccounts\"\r\n}", + "ResponseHeaders": { + "Content-Length": [ + "323" + ], + "Content-Type": [ + "application/json; charset=utf-8" + ], + "Expires": [ + "-1" + ], + "Last-Modified": [ + "Fri, 04 Sep 2015 23:22:36 GMT" + ], + "Pragma": [ + "no-cache" + ], + "request-id": [ + "6bcd0700-64cc-4993-a954-c2d15f613db5" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "x-ms-ratelimit-remaining-subscription-reads": [ + "14960" + ], + "x-ms-request-id": [ + "7406a3ee-56aa-4be9-9768-515419f26373" + ], + "x-ms-correlation-request-id": [ + "7406a3ee-56aa-4be9-9768-515419f26373" + ], + "x-ms-routing-request-id": [ + "WESTUS:20150904T232236Z:7406a3ee-56aa-4be9-9768-515419f26373" + ], + "Cache-Control": [ + "no-cache" + ], + "Date": [ + "Fri, 04 Sep 2015 23:22:35 GMT" + ], + "ETag": [ + "0x8D2B57FB8211BF8" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resourceGroups/default-azurebatch-eastus/providers/Microsoft.Batch/batchAccounts/pstests/listKeys?api-version=2015-07-01", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNjM2OGVkMzgtMzU3MC00ODFmLWI0ZmEtMWQwYTZlOGQzZjNiL3Jlc291cmNlR3JvdXBzL2RlZmF1bHQtYXp1cmViYXRjaC1lYXN0dXMvcHJvdmlkZXJzL01pY3Jvc29mdC5CYXRjaC9iYXRjaEFjY291bnRzL3BzdGVzdHMvbGlzdEtleXM/YXBpLXZlcnNpb249MjAxNS0wNy0wMQ==", + "RequestMethod": "POST", + "RequestBody": "", + "RequestHeaders": { + "x-ms-version": [ + "2015-07-01" + ], + "User-Agent": [ + "Microsoft.Azure.Management.Batch.BatchManagementClient/1.0.0.0" + ] + }, + "ResponseBody": "{\r\n \"accountName\": \"pstests\",\r\n \"primary\": \"XXFZ+jAijJoB8YsqvHU7t0es8xUSVpgCoQ2sK1MxOWPFiMkBl1NhQ2TdzkmA9dH3YfXTaE26kMRRvYG1gax9gw==\",\r\n \"secondary\": \"Wk38jkxm7UKVR3Yp7x5IhHvPdLuzOEwVEXlwrF9DvTp0YhkP8zvG0Kc0BM4kMJP0wu9IEOHMwklmykjgikTchg==\"\r\n}", + "ResponseHeaders": { + "Content-Length": [ + "229" + ], + "Content-Type": [ + "application/json; charset=utf-8" + ], + "Expires": [ + "-1" + ], + "Pragma": [ + "no-cache" + ], + "request-id": [ + "fd185aec-ac5b-4a97-9962-2cad31d3b1a6" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "x-ms-ratelimit-remaining-subscription-writes": [ + "1197" + ], + "x-ms-request-id": [ + "2e08b09b-efc6-43b2-9201-55a75ecb6e05" + ], + "x-ms-correlation-request-id": [ + "2e08b09b-efc6-43b2-9201-55a75ecb6e05" + ], + "x-ms-routing-request-id": [ + "WESTUS:20150904T232234Z:2e08b09b-efc6-43b2-9201-55a75ecb6e05" + ], + "Cache-Control": [ + "no-cache" + ], + "Date": [ + "Fri, 04 Sep 2015 23:22:33 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resourceGroups/default-azurebatch-eastus/providers/Microsoft.Batch/batchAccounts/pstests/listKeys?api-version=2015-07-01", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNjM2OGVkMzgtMzU3MC00ODFmLWI0ZmEtMWQwYTZlOGQzZjNiL3Jlc291cmNlR3JvdXBzL2RlZmF1bHQtYXp1cmViYXRjaC1lYXN0dXMvcHJvdmlkZXJzL01pY3Jvc29mdC5CYXRjaC9iYXRjaEFjY291bnRzL3BzdGVzdHMvbGlzdEtleXM/YXBpLXZlcnNpb249MjAxNS0wNy0wMQ==", + "RequestMethod": "POST", + "RequestBody": "", + "RequestHeaders": { + "x-ms-version": [ + "2015-07-01" + ], + "User-Agent": [ + "Microsoft.Azure.Management.Batch.BatchManagementClient/1.0.0.0" + ] + }, + "ResponseBody": "{\r\n \"accountName\": \"pstests\",\r\n \"primary\": \"XXFZ+jAijJoB8YsqvHU7t0es8xUSVpgCoQ2sK1MxOWPFiMkBl1NhQ2TdzkmA9dH3YfXTaE26kMRRvYG1gax9gw==\",\r\n \"secondary\": \"Wk38jkxm7UKVR3Yp7x5IhHvPdLuzOEwVEXlwrF9DvTp0YhkP8zvG0Kc0BM4kMJP0wu9IEOHMwklmykjgikTchg==\"\r\n}", + "ResponseHeaders": { + "Content-Length": [ + "229" + ], + "Content-Type": [ + "application/json; charset=utf-8" + ], + "Expires": [ + "-1" + ], + "Pragma": [ + "no-cache" + ], + "request-id": [ + "8aeb4a33-928f-437e-b88f-2a0424965318" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "x-ms-ratelimit-remaining-subscription-writes": [ + "1196" + ], + "x-ms-request-id": [ + "889eaba1-73fd-4104-8f31-467901e7b5b4" + ], + "x-ms-correlation-request-id": [ + "889eaba1-73fd-4104-8f31-467901e7b5b4" + ], + "x-ms-routing-request-id": [ + "WESTUS:20150904T232236Z:889eaba1-73fd-4104-8f31-467901e7b5b4" + ], + "Cache-Control": [ + "no-cache" + ], + "Date": [ + "Fri, 04 Sep 2015 23:22:35 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/pools/testPool/nodes?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L3Bvb2xzL3Rlc3RQb29sL25vZGVzP2FwaS12ZXJzaW9uPTIwMTUtMDYtMDEuMi4wJnRpbWVvdXQ9MzA=", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "5f430d06-72ed-44c7-be02-4e25f07fef69" + ], + "ocp-date": [ + "Fri, 04 Sep 2015 23:22:34 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "{\r\n \"odata.metadata\": \"https://pstests.eastus.batch.azure.com/$metadata#nodes\",\r\n \"value\": [\r\n {\r\n \"id\": \"tvm-3257026573_1-20150904t230807z\",\r\n \"url\": \"https://pstests.eastus.batch.azure.com/pools/testPool/nodes/tvm-3257026573_1-20150904t230807z\",\r\n \"state\": \"idle\",\r\n \"stateTransitionTime\": \"2015-09-04T23:12:07.3859341Z\",\r\n \"lastBootTime\": \"2015-09-04T23:12:07.2579351Z\",\r\n \"allocationTime\": \"2015-09-04T23:08:07.1967906Z\",\r\n \"ipAddress\": \"100.64.102.54\",\r\n \"affinityId\": \"TVM:tvm-3257026573_1-20150904t230807z\",\r\n \"vmSize\": \"small\",\r\n \"totalTasksRun\": 0,\r\n \"startTask\": {\r\n \"commandLine\": \"cmd /c echo hello\",\r\n \"runElevated\": false,\r\n \"maxTaskRetryCount\": 0,\r\n \"waitForSuccess\": false\r\n },\r\n \"startTaskInfo\": {\r\n \"state\": \"completed\",\r\n \"startTime\": \"2015-09-04T23:12:07.498937Z\",\r\n \"endTime\": \"2015-09-04T23:12:09.2449474Z\",\r\n \"exitCode\": 0,\r\n \"retryCount\": 0\r\n }\r\n },\r\n {\r\n \"id\": \"tvm-3257026573_2-20150904t230807z\",\r\n \"url\": \"https://pstests.eastus.batch.azure.com/pools/testPool/nodes/tvm-3257026573_2-20150904t230807z\",\r\n \"state\": \"idle\",\r\n \"stateTransitionTime\": \"2015-09-04T23:12:07.5096893Z\",\r\n \"lastBootTime\": \"2015-09-04T23:12:07.3976943Z\",\r\n \"allocationTime\": \"2015-09-04T23:08:07.1967906Z\",\r\n \"ipAddress\": \"100.64.118.109\",\r\n \"affinityId\": \"TVM:tvm-3257026573_2-20150904t230807z\",\r\n \"vmSize\": \"small\",\r\n \"totalTasksRun\": 0,\r\n \"startTask\": {\r\n \"commandLine\": \"cmd /c echo hello\",\r\n \"runElevated\": false,\r\n \"maxTaskRetryCount\": 0,\r\n \"waitForSuccess\": false\r\n },\r\n \"startTaskInfo\": {\r\n \"state\": \"completed\",\r\n \"startTime\": \"2015-09-04T23:12:07.5566878Z\",\r\n \"endTime\": \"2015-09-04T23:12:08.8916092Z\",\r\n \"exitCode\": 0,\r\n \"retryCount\": 0\r\n }\r\n },\r\n {\r\n \"id\": \"tvm-3257026573_3-20150904t230807z\",\r\n \"url\": \"https://pstests.eastus.batch.azure.com/pools/testPool/nodes/tvm-3257026573_3-20150904t230807z\",\r\n \"state\": \"idle\",\r\n \"stateTransitionTime\": \"2015-09-04T23:12:43.5013417Z\",\r\n \"lastBootTime\": \"2015-09-04T23:12:43.4243457Z\",\r\n \"allocationTime\": \"2015-09-04T23:08:07.1967906Z\",\r\n \"ipAddress\": \"100.64.90.4\",\r\n \"affinityId\": \"TVM:tvm-3257026573_3-20150904t230807z\",\r\n \"vmSize\": \"small\",\r\n \"totalTasksRun\": 0,\r\n \"startTask\": {\r\n \"commandLine\": \"cmd /c echo hello\",\r\n \"runElevated\": false,\r\n \"maxTaskRetryCount\": 0,\r\n \"waitForSuccess\": false\r\n },\r\n \"startTaskInfo\": {\r\n \"state\": \"completed\",\r\n \"startTime\": \"2015-09-04T23:12:43.5293414Z\",\r\n \"endTime\": \"2015-09-04T23:12:44.4623112Z\",\r\n \"exitCode\": 0,\r\n \"retryCount\": 0\r\n }\r\n }\r\n ]\r\n}", + "ResponseHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "f135d8c1-7638-4468-ae26-ee7c7b501f1e" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "5f430d06-72ed-44c7-be02-4e25f07fef69" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Fri, 04 Sep 2015 23:22:34 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/pools/testPool/nodes/tvm-3257026573_1-20150904t230807z/users?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L3Bvb2xzL3Rlc3RQb29sL25vZGVzL3R2bS0zMjU3MDI2NTczXzEtMjAxNTA5MDR0MjMwODA3ei91c2Vycz9hcGktdmVyc2lvbj0yMDE1LTA2LTAxLjIuMCZ0aW1lb3V0PTMw", + "RequestMethod": "POST", + "RequestBody": "{\r\n \"name\": \"updateuser\",\r\n \"isAdmin\": false,\r\n \"expiryTime\": \"0001-01-01T00:00:00\",\r\n \"password\": \"Password1234!\"\r\n}", + "RequestHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Content-Length": [ + "121" + ], + "client-request-id": [ + "6cb1a18c-b76b-4980-97b4-8ae8028a3805" + ], + "ocp-date": [ + "Fri, 04 Sep 2015 23:22:34 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "fe799d1a-0db2-4b24-9b33-18b954326a7b" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "6cb1a18c-b76b-4980-97b4-8ae8028a3805" + ], + "DataServiceVersion": [ + "3.0" + ], + "DataServiceId": [ + "https://pstests.eastus.batch.azure.com/pools/testPool/nodes/tvm-3257026573_1-20150904t230807z/users/updateuser" + ], + "Date": [ + "Fri, 04 Sep 2015 23:22:34 GMT" + ], + "Location": [ + "https://pstests.eastus.batch.azure.com/pools/testPool/nodes/tvm-3257026573_1-20150904t230807z/users/updateuser" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 201 + }, + { + "RequestUri": "/pools/testPool/nodes/tvm-3257026573_1-20150904t230807z/users?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L3Bvb2xzL3Rlc3RQb29sL25vZGVzL3R2bS0zMjU3MDI2NTczXzEtMjAxNTA5MDR0MjMwODA3ei91c2Vycz9hcGktdmVyc2lvbj0yMDE1LTA2LTAxLjIuMCZ0aW1lb3V0PTMw", + "RequestMethod": "POST", + "RequestBody": "{\r\n \"name\": \"updateuser\",\r\n \"isAdmin\": false,\r\n \"expiryTime\": \"0001-01-01T00:00:00\",\r\n \"password\": \"Password1234!\"\r\n}", + "RequestHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Content-Length": [ + "121" + ], + "client-request-id": [ + "6cb1a18c-b76b-4980-97b4-8ae8028a3805" + ], + "ocp-date": [ + "Fri, 04 Sep 2015 23:22:34 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "fe799d1a-0db2-4b24-9b33-18b954326a7b" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "6cb1a18c-b76b-4980-97b4-8ae8028a3805" + ], + "DataServiceVersion": [ + "3.0" + ], + "DataServiceId": [ + "https://pstests.eastus.batch.azure.com/pools/testPool/nodes/tvm-3257026573_1-20150904t230807z/users/updateuser" + ], + "Date": [ + "Fri, 04 Sep 2015 23:22:34 GMT" + ], + "Location": [ + "https://pstests.eastus.batch.azure.com/pools/testPool/nodes/tvm-3257026573_1-20150904t230807z/users/updateuser" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 201 + }, + { + "RequestUri": "/pools/testPool/nodes/tvm-3257026573_1-20150904t230807z/users/updateuser?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L3Bvb2xzL3Rlc3RQb29sL25vZGVzL3R2bS0zMjU3MDI2NTczXzEtMjAxNTA5MDR0MjMwODA3ei91c2Vycy91cGRhdGV1c2VyP2FwaS12ZXJzaW9uPTIwMTUtMDYtMDEuMi4wJnRpbWVvdXQ9MzA=", + "RequestMethod": "PUT", + "RequestBody": "{\r\n \"password\": \"Abcdefghijk1234!\",\r\n \"expiryTime\": \"2015-09-09T16:22:36.258907-07:00\"\r\n}", + "RequestHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Content-Length": [ + "91" + ], + "client-request-id": [ + "6fdddc8c-217b-42ac-ae03-ff0783c944dc" + ], + "ocp-date": [ + "Fri, 04 Sep 2015 23:22:36 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "e0e77cc9-e8c0-4187-9762-0422f6a31cd4" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "6fdddc8c-217b-42ac-ae03-ff0783c944dc" + ], + "DataServiceVersion": [ + "3.0" + ], + "DataServiceId": [ + "https://pstests.eastus.batch.azure.com/pools/testPool/nodes/tvm-3257026573_1-20150904t230807z/users/updateuser" + ], + "Date": [ + "Fri, 04 Sep 2015 23:22:37 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/pools/testPool/nodes/tvm-3257026573_1-20150904t230807z/users/updateuser?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L3Bvb2xzL3Rlc3RQb29sL25vZGVzL3R2bS0zMjU3MDI2NTczXzEtMjAxNTA5MDR0MjMwODA3ei91c2Vycy91cGRhdGV1c2VyP2FwaS12ZXJzaW9uPTIwMTUtMDYtMDEuMi4wJnRpbWVvdXQ9MzA=", + "RequestMethod": "DELETE", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "43f72bf5-cb3d-4578-90e8-1f69af67f3f4" + ], + "ocp-date": [ + "Fri, 04 Sep 2015 23:22:36 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "8da81b4f-1148-46e8-a419-793b17a07960" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "43f72bf5-cb3d-4578-90e8-1f69af67f3f4" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Fri, 04 Sep 2015 23:22:36 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/pools/testPool/nodes/tvm-3257026573_1-20150904t230807z/users/updateuser?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L3Bvb2xzL3Rlc3RQb29sL25vZGVzL3R2bS0zMjU3MDI2NTczXzEtMjAxNTA5MDR0MjMwODA3ei91c2Vycy91cGRhdGV1c2VyP2FwaS12ZXJzaW9uPTIwMTUtMDYtMDEuMi4wJnRpbWVvdXQ9MzA=", + "RequestMethod": "DELETE", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "43f72bf5-cb3d-4578-90e8-1f69af67f3f4" + ], + "ocp-date": [ + "Fri, 04 Sep 2015 23:22:36 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "8da81b4f-1148-46e8-a419-793b17a07960" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "43f72bf5-cb3d-4578-90e8-1f69af67f3f4" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Fri, 04 Sep 2015 23:22:36 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/pools/testPool/nodes/tvm-3257026573_1-20150904t230807z/users/updateuser?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L3Bvb2xzL3Rlc3RQb29sL25vZGVzL3R2bS0zMjU3MDI2NTczXzEtMjAxNTA5MDR0MjMwODA3ei91c2Vycy91cGRhdGV1c2VyP2FwaS12ZXJzaW9uPTIwMTUtMDYtMDEuMi4wJnRpbWVvdXQ9MzA=", + "RequestMethod": "DELETE", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "43f72bf5-cb3d-4578-90e8-1f69af67f3f4" + ], + "ocp-date": [ + "Fri, 04 Sep 2015 23:22:36 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "8da81b4f-1148-46e8-a419-793b17a07960" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "43f72bf5-cb3d-4578-90e8-1f69af67f3f4" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Fri, 04 Sep 2015 23:22:36 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + } + ], + "Names": {}, + "Variables": { + "SubscriptionId": "6368ed38-3570-481f-b4fa-1d0a6e8d3f3b" + } +} \ No newline at end of file diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/SessionRecords/Microsoft.Azure.Commands.Batch.Test.ScenarioTests.JobScheduleTests/TestUpdateJobSchedule.json b/src/ResourceManager/AzureBatch/Commands.Batch.Test/SessionRecords/Microsoft.Azure.Commands.Batch.Test.ScenarioTests.JobScheduleTests/TestUpdateJobSchedule.json new file mode 100644 index 000000000000..3d303c59c398 --- /dev/null +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/SessionRecords/Microsoft.Azure.Commands.Batch.Test.ScenarioTests.JobScheduleTests/TestUpdateJobSchedule.json @@ -0,0 +1,824 @@ +{ + "Entries": [ + { + "RequestUri": "/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resources?$filter=resourceType%20eq%20'Microsoft.Batch%2FbatchAccounts'&api-version=2014-04-01-preview", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNjM2OGVkMzgtMzU3MC00ODFmLWI0ZmEtMWQwYTZlOGQzZjNiL3Jlc291cmNlcz8kZmlsdGVyPXJlc291cmNlVHlwZSUyMGVxJTIwJ01pY3Jvc29mdC5CYXRjaCUyRmJhdGNoQWNjb3VudHMnJmFwaS12ZXJzaW9uPTIwMTQtMDQtMDEtcHJldmlldw==", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "User-Agent": [ + "Microsoft.Azure.Management.Resources.ResourceManagementClient/2.0.0.0" + ] + }, + "ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"id\": \"/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resourceGroups/default-azurebatch-eastus/providers/Microsoft.Batch/batchAccounts/pstests\",\r\n \"name\": \"pstests\",\r\n \"type\": \"Microsoft.Batch/batchAccounts\",\r\n \"location\": \"eastus\"\r\n },\r\n {\r\n \"id\": \"/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resourceGroups/Default-AzureBatch-WestUS/providers/Microsoft.Batch/batchAccounts/jaschneibatchtest\",\r\n \"name\": \"jaschneibatchtest\",\r\n \"type\": \"Microsoft.Batch/batchAccounts\",\r\n \"location\": \"westus\"\r\n }\r\n ]\r\n}", + "ResponseHeaders": { + "Content-Length": [ + "483" + ], + "Content-Type": [ + "application/json; charset=utf-8" + ], + "Expires": [ + "-1" + ], + "Pragma": [ + "no-cache" + ], + "x-ms-ratelimit-remaining-subscription-reads": [ + "14969" + ], + "x-ms-request-id": [ + "4fc3c138-c679-4b12-8110-f774609b96ce" + ], + "x-ms-correlation-request-id": [ + "4fc3c138-c679-4b12-8110-f774609b96ce" + ], + "x-ms-routing-request-id": [ + "WESTUS:20150904T235302Z:4fc3c138-c679-4b12-8110-f774609b96ce" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "Cache-Control": [ + "no-cache" + ], + "Date": [ + "Fri, 04 Sep 2015 23:53:01 GMT" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resources?$filter=resourceType%20eq%20'Microsoft.Batch%2FbatchAccounts'&api-version=2014-04-01-preview", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNjM2OGVkMzgtMzU3MC00ODFmLWI0ZmEtMWQwYTZlOGQzZjNiL3Jlc291cmNlcz8kZmlsdGVyPXJlc291cmNlVHlwZSUyMGVxJTIwJ01pY3Jvc29mdC5CYXRjaCUyRmJhdGNoQWNjb3VudHMnJmFwaS12ZXJzaW9uPTIwMTQtMDQtMDEtcHJldmlldw==", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "User-Agent": [ + "Microsoft.Azure.Management.Resources.ResourceManagementClient/2.0.0.0" + ] + }, + "ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"id\": \"/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resourceGroups/default-azurebatch-eastus/providers/Microsoft.Batch/batchAccounts/pstests\",\r\n \"name\": \"pstests\",\r\n \"type\": \"Microsoft.Batch/batchAccounts\",\r\n \"location\": \"eastus\"\r\n },\r\n {\r\n \"id\": \"/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resourceGroups/Default-AzureBatch-WestUS/providers/Microsoft.Batch/batchAccounts/jaschneibatchtest\",\r\n \"name\": \"jaschneibatchtest\",\r\n \"type\": \"Microsoft.Batch/batchAccounts\",\r\n \"location\": \"westus\"\r\n }\r\n ]\r\n}", + "ResponseHeaders": { + "Content-Length": [ + "483" + ], + "Content-Type": [ + "application/json; charset=utf-8" + ], + "Expires": [ + "-1" + ], + "Pragma": [ + "no-cache" + ], + "x-ms-ratelimit-remaining-subscription-reads": [ + "14968" + ], + "x-ms-request-id": [ + "3e20ea86-f1b3-4a0c-96a8-f9cabc5cee48" + ], + "x-ms-correlation-request-id": [ + "3e20ea86-f1b3-4a0c-96a8-f9cabc5cee48" + ], + "x-ms-routing-request-id": [ + "WESTUS:20150904T235305Z:3e20ea86-f1b3-4a0c-96a8-f9cabc5cee48" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "Cache-Control": [ + "no-cache" + ], + "Date": [ + "Fri, 04 Sep 2015 23:53:04 GMT" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resourceGroups/default-azurebatch-eastus/providers/Microsoft.Batch/batchAccounts/pstests?api-version=2015-07-01", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNjM2OGVkMzgtMzU3MC00ODFmLWI0ZmEtMWQwYTZlOGQzZjNiL3Jlc291cmNlR3JvdXBzL2RlZmF1bHQtYXp1cmViYXRjaC1lYXN0dXMvcHJvdmlkZXJzL01pY3Jvc29mdC5CYXRjaC9iYXRjaEFjY291bnRzL3BzdGVzdHM/YXBpLXZlcnNpb249MjAxNS0wNy0wMQ==", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "x-ms-version": [ + "2015-07-01" + ], + "User-Agent": [ + "Microsoft.Azure.Management.Batch.BatchManagementClient/1.0.0.0" + ] + }, + "ResponseBody": "{\r\n \"name\": \"pstests\",\r\n \"location\": \"eastus\",\r\n \"properties\": {\r\n \"accountEndpoint\": \"pstests.eastus.batch.azure.com\",\r\n \"provisioningState\": \"Succeeded\"\r\n },\r\n \"id\": \"/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resourceGroups/default-azurebatch-eastus/providers/Microsoft.Batch/batchAccounts/pstests\",\r\n \"type\": \"Microsoft.Batch/batchAccounts\"\r\n}", + "ResponseHeaders": { + "Content-Length": [ + "323" + ], + "Content-Type": [ + "application/json; charset=utf-8" + ], + "Expires": [ + "-1" + ], + "Last-Modified": [ + "Fri, 04 Sep 2015 23:53:03 GMT" + ], + "Pragma": [ + "no-cache" + ], + "request-id": [ + "3073ea85-1e71-4aea-ba8f-f41ae95808c3" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "x-ms-ratelimit-remaining-subscription-reads": [ + "14990" + ], + "x-ms-request-id": [ + "fd86f335-96ae-4d9c-9a2e-d48116762fd9" + ], + "x-ms-correlation-request-id": [ + "fd86f335-96ae-4d9c-9a2e-d48116762fd9" + ], + "x-ms-routing-request-id": [ + "WESTUS:20150904T235303Z:fd86f335-96ae-4d9c-9a2e-d48116762fd9" + ], + "Cache-Control": [ + "no-cache" + ], + "Date": [ + "Fri, 04 Sep 2015 23:53:03 GMT" + ], + "ETag": [ + "0x8D2B583F92BE6DD" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resourceGroups/default-azurebatch-eastus/providers/Microsoft.Batch/batchAccounts/pstests?api-version=2015-07-01", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNjM2OGVkMzgtMzU3MC00ODFmLWI0ZmEtMWQwYTZlOGQzZjNiL3Jlc291cmNlR3JvdXBzL2RlZmF1bHQtYXp1cmViYXRjaC1lYXN0dXMvcHJvdmlkZXJzL01pY3Jvc29mdC5CYXRjaC9iYXRjaEFjY291bnRzL3BzdGVzdHM/YXBpLXZlcnNpb249MjAxNS0wNy0wMQ==", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "x-ms-version": [ + "2015-07-01" + ], + "User-Agent": [ + "Microsoft.Azure.Management.Batch.BatchManagementClient/1.0.0.0" + ] + }, + "ResponseBody": "{\r\n \"name\": \"pstests\",\r\n \"location\": \"eastus\",\r\n \"properties\": {\r\n \"accountEndpoint\": \"pstests.eastus.batch.azure.com\",\r\n \"provisioningState\": \"Succeeded\"\r\n },\r\n \"id\": \"/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resourceGroups/default-azurebatch-eastus/providers/Microsoft.Batch/batchAccounts/pstests\",\r\n \"type\": \"Microsoft.Batch/batchAccounts\"\r\n}", + "ResponseHeaders": { + "Content-Length": [ + "323" + ], + "Content-Type": [ + "application/json; charset=utf-8" + ], + "Expires": [ + "-1" + ], + "Last-Modified": [ + "Fri, 04 Sep 2015 23:53:05 GMT" + ], + "Pragma": [ + "no-cache" + ], + "request-id": [ + "5ea90b44-82c1-4f22-a2a0-c9409b332009" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "x-ms-ratelimit-remaining-subscription-reads": [ + "14989" + ], + "x-ms-request-id": [ + "b39acad2-216f-4532-b98e-8d1d73d346ea" + ], + "x-ms-correlation-request-id": [ + "b39acad2-216f-4532-b98e-8d1d73d346ea" + ], + "x-ms-routing-request-id": [ + "WESTUS:20150904T235305Z:b39acad2-216f-4532-b98e-8d1d73d346ea" + ], + "Cache-Control": [ + "no-cache" + ], + "Date": [ + "Fri, 04 Sep 2015 23:53:05 GMT" + ], + "ETag": [ + "0x8D2B583FA6EBE60" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resourceGroups/default-azurebatch-eastus/providers/Microsoft.Batch/batchAccounts/pstests/listKeys?api-version=2015-07-01", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNjM2OGVkMzgtMzU3MC00ODFmLWI0ZmEtMWQwYTZlOGQzZjNiL3Jlc291cmNlR3JvdXBzL2RlZmF1bHQtYXp1cmViYXRjaC1lYXN0dXMvcHJvdmlkZXJzL01pY3Jvc29mdC5CYXRjaC9iYXRjaEFjY291bnRzL3BzdGVzdHMvbGlzdEtleXM/YXBpLXZlcnNpb249MjAxNS0wNy0wMQ==", + "RequestMethod": "POST", + "RequestBody": "", + "RequestHeaders": { + "x-ms-version": [ + "2015-07-01" + ], + "User-Agent": [ + "Microsoft.Azure.Management.Batch.BatchManagementClient/1.0.0.0" + ] + }, + "ResponseBody": "{\r\n \"accountName\": \"pstests\",\r\n \"primary\": \"XXFZ+jAijJoB8YsqvHU7t0es8xUSVpgCoQ2sK1MxOWPFiMkBl1NhQ2TdzkmA9dH3YfXTaE26kMRRvYG1gax9gw==\",\r\n \"secondary\": \"Wk38jkxm7UKVR3Yp7x5IhHvPdLuzOEwVEXlwrF9DvTp0YhkP8zvG0Kc0BM4kMJP0wu9IEOHMwklmykjgikTchg==\"\r\n}", + "ResponseHeaders": { + "Content-Length": [ + "229" + ], + "Content-Type": [ + "application/json; charset=utf-8" + ], + "Expires": [ + "-1" + ], + "Pragma": [ + "no-cache" + ], + "request-id": [ + "f62de15b-aa94-420e-ab2b-0d93df7f0186" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "x-ms-ratelimit-remaining-subscription-writes": [ + "1196" + ], + "x-ms-request-id": [ + "7575a28f-a29d-4c5d-b426-94d5a57871c8" + ], + "x-ms-correlation-request-id": [ + "7575a28f-a29d-4c5d-b426-94d5a57871c8" + ], + "x-ms-routing-request-id": [ + "WESTUS:20150904T235303Z:7575a28f-a29d-4c5d-b426-94d5a57871c8" + ], + "Cache-Control": [ + "no-cache" + ], + "Date": [ + "Fri, 04 Sep 2015 23:53:03 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resourceGroups/default-azurebatch-eastus/providers/Microsoft.Batch/batchAccounts/pstests/listKeys?api-version=2015-07-01", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNjM2OGVkMzgtMzU3MC00ODFmLWI0ZmEtMWQwYTZlOGQzZjNiL3Jlc291cmNlR3JvdXBzL2RlZmF1bHQtYXp1cmViYXRjaC1lYXN0dXMvcHJvdmlkZXJzL01pY3Jvc29mdC5CYXRjaC9iYXRjaEFjY291bnRzL3BzdGVzdHMvbGlzdEtleXM/YXBpLXZlcnNpb249MjAxNS0wNy0wMQ==", + "RequestMethod": "POST", + "RequestBody": "", + "RequestHeaders": { + "x-ms-version": [ + "2015-07-01" + ], + "User-Agent": [ + "Microsoft.Azure.Management.Batch.BatchManagementClient/1.0.0.0" + ] + }, + "ResponseBody": "{\r\n \"accountName\": \"pstests\",\r\n \"primary\": \"XXFZ+jAijJoB8YsqvHU7t0es8xUSVpgCoQ2sK1MxOWPFiMkBl1NhQ2TdzkmA9dH3YfXTaE26kMRRvYG1gax9gw==\",\r\n \"secondary\": \"Wk38jkxm7UKVR3Yp7x5IhHvPdLuzOEwVEXlwrF9DvTp0YhkP8zvG0Kc0BM4kMJP0wu9IEOHMwklmykjgikTchg==\"\r\n}", + "ResponseHeaders": { + "Content-Length": [ + "229" + ], + "Content-Type": [ + "application/json; charset=utf-8" + ], + "Expires": [ + "-1" + ], + "Pragma": [ + "no-cache" + ], + "request-id": [ + "338e2e07-a258-4db4-8cb1-3b6c565c530f" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "x-ms-ratelimit-remaining-subscription-writes": [ + "1195" + ], + "x-ms-request-id": [ + "34d9e96c-e09f-4ed8-af33-dac342983b4c" + ], + "x-ms-correlation-request-id": [ + "34d9e96c-e09f-4ed8-af33-dac342983b4c" + ], + "x-ms-routing-request-id": [ + "WESTUS:20150904T235305Z:34d9e96c-e09f-4ed8-af33-dac342983b4c" + ], + "Cache-Control": [ + "no-cache" + ], + "Date": [ + "Fri, 04 Sep 2015 23:53:05 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/jobschedules?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L2pvYnNjaGVkdWxlcz9hcGktdmVyc2lvbj0yMDE1LTA2LTAxLjIuMCZ0aW1lb3V0PTMw", + "RequestMethod": "POST", + "RequestBody": "{\r\n \"id\": \"testUpdateJobSchedule\",\r\n \"schedule\": {},\r\n \"jobSpecification\": {\r\n \"commonEnvironmentSettings\": [],\r\n \"poolInfo\": {\r\n \"poolId\": \"testPool\"\r\n }\r\n }\r\n}", + "RequestHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Content-Length": [ + "179" + ], + "client-request-id": [ + "c5661fa0-1888-45dd-89a9-577abb0d2982" + ], + "ocp-date": [ + "Fri, 04 Sep 2015 23:53:03 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Last-Modified": [ + "Fri, 04 Sep 2015 23:53:05 GMT" + ], + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "fd9d541d-b4af-4266-9f39-fa87f4ec705b" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "c5661fa0-1888-45dd-89a9-577abb0d2982" + ], + "DataServiceVersion": [ + "3.0" + ], + "DataServiceId": [ + "https://pstests.eastus.batch.azure.com/jobschedules/testUpdateJobSchedule" + ], + "Date": [ + "Fri, 04 Sep 2015 23:53:05 GMT" + ], + "ETag": [ + "0x8D2B583FA0BBFA3" + ], + "Location": [ + "https://pstests.eastus.batch.azure.com/jobschedules/testUpdateJobSchedule" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 201 + }, + { + "RequestUri": "/jobschedules/testUpdateJobSchedule?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L2pvYnNjaGVkdWxlcy90ZXN0VXBkYXRlSm9iU2NoZWR1bGU/YXBpLXZlcnNpb249MjAxNS0wNi0wMS4yLjAmdGltZW91dD0zMA==", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "cf423126-b1c8-46b5-8bc2-6986a0bf4574" + ], + "ocp-date": [ + "Fri, 04 Sep 2015 23:53:05 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "{\r\n \"odata.metadata\": \"https://pstests.eastus.batch.azure.com/$metadata#jobschedules/@Element\",\r\n \"id\": \"testUpdateJobSchedule\",\r\n \"url\": \"https://pstests.eastus.batch.azure.com/jobschedules/testUpdateJobSchedule\",\r\n \"eTag\": \"0x8D2B583FA0BBFA3\",\r\n \"lastModified\": \"2015-09-04T23:53:05.3078435Z\",\r\n \"creationTime\": \"2015-09-04T23:53:05.3078435Z\",\r\n \"state\": \"active\",\r\n \"stateTransitionTime\": \"2015-09-04T23:53:05.3078435Z\",\r\n \"jobSpecification\": {\r\n \"priority\": 0,\r\n \"constraints\": {\r\n \"maxWallClockTime\": \"P10675199DT2H48M5.4775807S\",\r\n \"maxTaskRetryCount\": 0\r\n },\r\n \"poolInfo\": {\r\n \"poolId\": \"testPool\"\r\n }\r\n },\r\n \"executionInfo\": {\r\n \"recentJob\": {\r\n \"url\": \"https://pstests.eastus.batch.azure.com/jobs/testUpdateJobSchedule:job-1\",\r\n \"id\": \"testUpdateJobSchedule:job-1\"\r\n }\r\n }\r\n}", + "ResponseHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Last-Modified": [ + "Fri, 04 Sep 2015 23:53:05 GMT" + ], + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "21c13e2e-7c5f-4686-a783-7978e67918a4" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "cf423126-b1c8-46b5-8bc2-6986a0bf4574" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Fri, 04 Sep 2015 23:53:07 GMT" + ], + "ETag": [ + "0x8D2B583FA0BBFA3" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/jobschedules/testUpdateJobSchedule?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L2pvYnNjaGVkdWxlcy90ZXN0VXBkYXRlSm9iU2NoZWR1bGU/YXBpLXZlcnNpb249MjAxNS0wNi0wMS4yLjAmdGltZW91dD0zMA==", + "RequestMethod": "PUT", + "RequestBody": "{\r\n \"schedule\": {\r\n \"doNotRunUntil\": \"2020-01-01T12:00:00\",\r\n \"doNotRunAfter\": \"2025-01-01T12:00:00\",\r\n \"startWindow\": \"PT1H\",\r\n \"recurrenceInterval\": \"P1D\"\r\n },\r\n \"jobSpecification\": {\r\n \"priority\": 1,\r\n \"displayName\": \"jobSpecDisplayName\",\r\n \"constraints\": {\r\n \"maxWallClockTime\": \"P1D\",\r\n \"maxTaskRetryCount\": 5\r\n },\r\n \"jobManagerTask\": {\r\n \"id\": \"jobManager\",\r\n \"displayName\": \"jobManagerDisplay\",\r\n \"commandLine\": \"cmd /c dir /s\",\r\n \"resourceFiles\": [\r\n {\r\n \"blobSource\": \"https://testacct.blob.core.windows.net/\",\r\n \"filePath\": \"filePath\"\r\n }\r\n ],\r\n \"environmentSettings\": [\r\n {\r\n \"name\": \"name1\",\r\n \"value\": \"value1\"\r\n },\r\n {\r\n \"name\": \"name2\",\r\n \"value\": \"value2\"\r\n }\r\n ],\r\n \"constraints\": {\r\n \"maxWallClockTime\": \"PT1H\"\r\n },\r\n \"killJobOnCompletion\": false,\r\n \"runElevated\": false\r\n },\r\n \"jobPreparationTask\": {\r\n \"id\": \"jobPrep\",\r\n \"commandLine\": \"cmd /c dir /s\",\r\n \"resourceFiles\": [\r\n {\r\n \"blobSource\": \"https://testacct.blob.core.windows.net/\",\r\n \"filePath\": \"jobPrepFilePath\"\r\n }\r\n ],\r\n \"environmentSettings\": [\r\n {\r\n \"name\": \"jobPrepName1\",\r\n \"value\": \"jobPrepValue1\"\r\n },\r\n {\r\n \"name\": \"jobPrepName2\",\r\n \"value\": \"jobPrepValue2\"\r\n }\r\n ],\r\n \"constraints\": {\r\n \"maxTaskRetryCount\": 2\r\n },\r\n \"runElevated\": false\r\n },\r\n \"jobReleaseTask\": {\r\n \"id\": \"jobRelease\",\r\n \"commandLine\": \"cmd /c dir /s\",\r\n \"resourceFiles\": [\r\n {\r\n \"blobSource\": \"https://testacct.blob.core.windows.net/\",\r\n \"filePath\": \"jobReleaseFilePath\"\r\n }\r\n ],\r\n \"environmentSettings\": [\r\n {\r\n \"name\": \"jobReleaseName1\",\r\n \"value\": \"jobReleaseValue1\"\r\n },\r\n {\r\n \"name\": \"jobReleaseName2\",\r\n \"value\": \"jobReleaseValue2\"\r\n }\r\n ],\r\n \"runElevated\": false\r\n },\r\n \"commonEnvironmentSettings\": [\r\n {\r\n \"name\": \"commonName1\",\r\n \"value\": \"commonValue1\"\r\n },\r\n {\r\n \"name\": \"commonName2\",\r\n \"value\": \"commonValue2\"\r\n }\r\n ],\r\n \"poolInfo\": {\r\n \"autoPoolSpecification\": {\r\n \"autoPoolIdPrefix\": \"TestSpecPrefix\",\r\n \"poolLifetimeOption\": \"jobschedule\",\r\n \"keepAlive\": false,\r\n \"pool\": {\r\n \"vmSize\": \"small\",\r\n \"osFamily\": \"4\",\r\n \"targetOSVersion\": \"*\",\r\n \"targetDedicated\": 3,\r\n \"startTask\": {\r\n \"commandLine\": \"cmd /c dir /s\"\r\n },\r\n \"certificateReferences\": [\r\n {\r\n \"thumbprint\": \"0123456789ABCDEF\",\r\n \"thumbprintAlgorithm\": \"sha1\",\r\n \"storeLocation\": \"localmachine\",\r\n \"storeName\": \"certStore\",\r\n \"visibility\": \"starttask\"\r\n }\r\n ]\r\n }\r\n }\r\n },\r\n \"metadata\": [\r\n {\r\n \"name\": \"specMeta1\",\r\n \"value\": \"specMetaValue1\"\r\n },\r\n {\r\n \"name\": \"specMeta2\",\r\n \"value\": \"specMetaValue2\"\r\n }\r\n ]\r\n },\r\n \"metadata\": [\r\n {\r\n \"name\": \"jobScheduleMeta1\",\r\n \"value\": \"jobScheduleValue1\"\r\n }\r\n ]\r\n}", + "RequestHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Content-Length": [ + "3380" + ], + "client-request-id": [ + "f5f057f7-f7f1-4916-912f-c949cf67d8c2" + ], + "ocp-date": [ + "Fri, 04 Sep 2015 23:53:06 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Last-Modified": [ + "Fri, 04 Sep 2015 23:53:07 GMT" + ], + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "5c7ad423-22fa-43c2-8c9e-f8126ae95dff" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "f5f057f7-f7f1-4916-912f-c949cf67d8c2" + ], + "DataServiceVersion": [ + "3.0" + ], + "DataServiceId": [ + "https://pstests.eastus.batch.azure.com/jobschedules/testUpdateJobSchedule" + ], + "Date": [ + "Fri, 04 Sep 2015 23:53:07 GMT" + ], + "ETag": [ + "0x8D2B583FB81DC5F" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/jobschedules/testUpdateJobSchedule?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L2pvYnNjaGVkdWxlcy90ZXN0VXBkYXRlSm9iU2NoZWR1bGU/YXBpLXZlcnNpb249MjAxNS0wNi0wMS4yLjAmdGltZW91dD0zMA==", + "RequestMethod": "PUT", + "RequestBody": "{\r\n \"schedule\": {\r\n \"doNotRunUntil\": \"2020-01-01T12:00:00\",\r\n \"doNotRunAfter\": \"2025-01-01T12:00:00\",\r\n \"startWindow\": \"PT1H\",\r\n \"recurrenceInterval\": \"P1D\"\r\n },\r\n \"jobSpecification\": {\r\n \"priority\": 1,\r\n \"displayName\": \"jobSpecDisplayName\",\r\n \"constraints\": {\r\n \"maxWallClockTime\": \"P1D\",\r\n \"maxTaskRetryCount\": 5\r\n },\r\n \"jobManagerTask\": {\r\n \"id\": \"jobManager\",\r\n \"displayName\": \"jobManagerDisplay\",\r\n \"commandLine\": \"cmd /c dir /s\",\r\n \"resourceFiles\": [\r\n {\r\n \"blobSource\": \"https://testacct.blob.core.windows.net/\",\r\n \"filePath\": \"filePath\"\r\n }\r\n ],\r\n \"environmentSettings\": [\r\n {\r\n \"name\": \"name1\",\r\n \"value\": \"value1\"\r\n },\r\n {\r\n \"name\": \"name2\",\r\n \"value\": \"value2\"\r\n }\r\n ],\r\n \"constraints\": {\r\n \"maxWallClockTime\": \"PT1H\"\r\n },\r\n \"killJobOnCompletion\": false,\r\n \"runElevated\": false\r\n },\r\n \"jobPreparationTask\": {\r\n \"id\": \"jobPrep\",\r\n \"commandLine\": \"cmd /c dir /s\",\r\n \"resourceFiles\": [\r\n {\r\n \"blobSource\": \"https://testacct.blob.core.windows.net/\",\r\n \"filePath\": \"jobPrepFilePath\"\r\n }\r\n ],\r\n \"environmentSettings\": [\r\n {\r\n \"name\": \"jobPrepName1\",\r\n \"value\": \"jobPrepValue1\"\r\n },\r\n {\r\n \"name\": \"jobPrepName2\",\r\n \"value\": \"jobPrepValue2\"\r\n }\r\n ],\r\n \"constraints\": {\r\n \"maxTaskRetryCount\": 2\r\n },\r\n \"runElevated\": false\r\n },\r\n \"jobReleaseTask\": {\r\n \"id\": \"jobRelease\",\r\n \"commandLine\": \"cmd /c dir /s\",\r\n \"resourceFiles\": [\r\n {\r\n \"blobSource\": \"https://testacct.blob.core.windows.net/\",\r\n \"filePath\": \"jobReleaseFilePath\"\r\n }\r\n ],\r\n \"environmentSettings\": [\r\n {\r\n \"name\": \"jobReleaseName1\",\r\n \"value\": \"jobReleaseValue1\"\r\n },\r\n {\r\n \"name\": \"jobReleaseName2\",\r\n \"value\": \"jobReleaseValue2\"\r\n }\r\n ],\r\n \"runElevated\": false\r\n },\r\n \"commonEnvironmentSettings\": [\r\n {\r\n \"name\": \"commonName1\",\r\n \"value\": \"commonValue1\"\r\n },\r\n {\r\n \"name\": \"commonName2\",\r\n \"value\": \"commonValue2\"\r\n }\r\n ],\r\n \"poolInfo\": {\r\n \"autoPoolSpecification\": {\r\n \"autoPoolIdPrefix\": \"TestSpecPrefix\",\r\n \"poolLifetimeOption\": \"jobschedule\",\r\n \"keepAlive\": false,\r\n \"pool\": {\r\n \"vmSize\": \"small\",\r\n \"osFamily\": \"4\",\r\n \"targetOSVersion\": \"*\",\r\n \"targetDedicated\": 3,\r\n \"startTask\": {\r\n \"commandLine\": \"cmd /c dir /s\"\r\n },\r\n \"certificateReferences\": [\r\n {\r\n \"thumbprint\": \"0123456789ABCDEF\",\r\n \"thumbprintAlgorithm\": \"sha1\",\r\n \"storeLocation\": \"localmachine\",\r\n \"storeName\": \"certStore\",\r\n \"visibility\": \"starttask\"\r\n }\r\n ]\r\n }\r\n }\r\n },\r\n \"metadata\": [\r\n {\r\n \"name\": \"specMeta1\",\r\n \"value\": \"specMetaValue1\"\r\n },\r\n {\r\n \"name\": \"specMeta2\",\r\n \"value\": \"specMetaValue2\"\r\n }\r\n ]\r\n },\r\n \"metadata\": [\r\n {\r\n \"name\": \"jobScheduleMeta1\",\r\n \"value\": \"jobScheduleValue1\"\r\n }\r\n ]\r\n}", + "RequestHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Content-Length": [ + "3380" + ], + "client-request-id": [ + "f5f057f7-f7f1-4916-912f-c949cf67d8c2" + ], + "ocp-date": [ + "Fri, 04 Sep 2015 23:53:06 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Last-Modified": [ + "Fri, 04 Sep 2015 23:53:07 GMT" + ], + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "5c7ad423-22fa-43c2-8c9e-f8126ae95dff" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "f5f057f7-f7f1-4916-912f-c949cf67d8c2" + ], + "DataServiceVersion": [ + "3.0" + ], + "DataServiceId": [ + "https://pstests.eastus.batch.azure.com/jobschedules/testUpdateJobSchedule" + ], + "Date": [ + "Fri, 04 Sep 2015 23:53:07 GMT" + ], + "ETag": [ + "0x8D2B583FB81DC5F" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/jobschedules?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L2pvYnNjaGVkdWxlcz9hcGktdmVyc2lvbj0yMDE1LTA2LTAxLjIuMCZ0aW1lb3V0PTMw", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "e99f5214-71bf-4424-8610-b6b7b2fb70de" + ], + "ocp-date": [ + "Fri, 04 Sep 2015 23:53:06 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "{\r\n \"odata.metadata\": \"https://pstests.eastus.batch.azure.com/$metadata#jobschedules\",\r\n \"value\": [\r\n {\r\n \"id\": \"testUpdateJobSchedule\",\r\n \"url\": \"https://pstests.eastus.batch.azure.com/jobschedules/testUpdateJobSchedule\",\r\n \"eTag\": \"0x8D2B583FB81DC5F\",\r\n \"lastModified\": \"2015-09-04T23:53:07.7596255Z\",\r\n \"creationTime\": \"2015-09-04T23:53:05.3078435Z\",\r\n \"state\": \"active\",\r\n \"stateTransitionTime\": \"2015-09-04T23:53:05.3078435Z\",\r\n \"schedule\": {\r\n \"doNotRunUntil\": \"2020-01-01T12:00:00Z\",\r\n \"doNotRunAfter\": \"2025-01-01T12:00:00Z\",\r\n \"startWindow\": \"PT1H\",\r\n \"recurrenceInterval\": \"P1D\"\r\n },\r\n \"jobSpecification\": {\r\n \"displayName\": \"jobSpecDisplayName\",\r\n \"priority\": 1,\r\n \"constraints\": {\r\n \"maxWallClockTime\": \"P1D\",\r\n \"maxTaskRetryCount\": 5\r\n },\r\n \"jobManagerTask\": {\r\n \"id\": \"jobManager\",\r\n \"displayName\": \"jobManagerDisplay\",\r\n \"commandLine\": \"cmd /c dir /s\",\r\n \"resourceFiles\": [\r\n {\r\n \"blobSource\": \"https://testacct.blob.core.windows.net/\",\r\n \"filePath\": \"filePath\"\r\n }\r\n ],\r\n \"environmentSettings\": [\r\n {\r\n \"name\": \"name1\",\r\n \"value\": \"value1\"\r\n },\r\n {\r\n \"name\": \"name2\",\r\n \"value\": \"value2\"\r\n }\r\n ],\r\n \"constraints\": {\r\n \"maxWallClockTime\": \"PT1H\",\r\n \"retentionTime\": \"P10675199DT2H48M5.4775807S\",\r\n \"maxTaskRetryCount\": 5\r\n },\r\n \"runElevated\": false,\r\n \"runExclusive\": true,\r\n \"killJobOnCompletion\": false\r\n },\r\n \"jobPreparationTask\": {\r\n \"id\": \"jobPrep\",\r\n \"commandLine\": \"cmd /c dir /s\",\r\n \"resourceFiles\": [\r\n {\r\n \"blobSource\": \"https://testacct.blob.core.windows.net/\",\r\n \"filePath\": \"jobPrepFilePath\"\r\n }\r\n ],\r\n \"environmentSettings\": [\r\n {\r\n \"name\": \"jobPrepName1\",\r\n \"value\": \"jobPrepValue1\"\r\n },\r\n {\r\n \"name\": \"jobPrepName2\",\r\n \"value\": \"jobPrepValue2\"\r\n }\r\n ],\r\n \"constraints\": {\r\n \"maxWallClockTime\": \"P10675199DT2H48M5.4775807S\",\r\n \"retentionTime\": \"P10675199DT2H48M5.4775807S\",\r\n \"maxTaskRetryCount\": 2\r\n },\r\n \"runElevated\": false,\r\n \"waitForSuccess\": true,\r\n \"rerunOnNodeRebootAfterSuccess\": true\r\n },\r\n \"jobReleaseTask\": {\r\n \"id\": \"jobRelease\",\r\n \"commandLine\": \"cmd /c dir /s\",\r\n \"resourceFiles\": [\r\n {\r\n \"blobSource\": \"https://testacct.blob.core.windows.net/\",\r\n \"filePath\": \"jobReleaseFilePath\"\r\n }\r\n ],\r\n \"environmentSettings\": [\r\n {\r\n \"name\": \"jobReleaseName1\",\r\n \"value\": \"jobReleaseValue1\"\r\n },\r\n {\r\n \"name\": \"jobReleaseName2\",\r\n \"value\": \"jobReleaseValue2\"\r\n }\r\n ],\r\n \"maxWallClockTime\": \"PT15M\",\r\n \"retentionTime\": \"P10675199DT2H48M5.4775807S\",\r\n \"runElevated\": false\r\n },\r\n \"commonEnvironmentSettings\": [\r\n {\r\n \"name\": \"commonName1\",\r\n \"value\": \"commonValue1\"\r\n },\r\n {\r\n \"name\": \"commonName2\",\r\n \"value\": \"commonValue2\"\r\n }\r\n ],\r\n \"poolInfo\": {\r\n \"autoPoolSpecification\": {\r\n \"autoPoolIdPrefix\": \"TestSpecPrefix\",\r\n \"poolLifetimeOption\": \"jobschedule\",\r\n \"keepAlive\": false,\r\n \"pool\": {\r\n \"osFamily\": \"4\",\r\n \"targetOSVersion\": \"*\",\r\n \"vmSize\": \"small\",\r\n \"maxTasksPerNode\": 1,\r\n \"taskSchedulingPolicy\": {\r\n \"nodeFillType\": \"Spread\"\r\n },\r\n \"resizeTimeout\": \"PT5M\",\r\n \"targetDedicated\": 3,\r\n \"enableAutoScale\": false,\r\n \"enableInterNodeCommunication\": false,\r\n \"startTask\": {\r\n \"commandLine\": \"cmd /c dir /s\",\r\n \"runElevated\": false,\r\n \"maxTaskRetryCount\": 0,\r\n \"waitForSuccess\": false\r\n },\r\n \"certificateReferences\": [\r\n {\r\n \"thumbprint\": \"0123456789abcdef\",\r\n \"thumbprintAlgorithm\": \"sha1\",\r\n \"storeLocation\": \"LocalMachine\",\r\n \"storeName\": \"certStore\",\r\n \"visibility\": \"starttask\"\r\n }\r\n ]\r\n }\r\n }\r\n },\r\n \"metadata\": [\r\n {\r\n \"name\": \"specMeta1\",\r\n \"value\": \"specMetaValue1\"\r\n },\r\n {\r\n \"name\": \"specMeta2\",\r\n \"value\": \"specMetaValue2\"\r\n }\r\n ]\r\n },\r\n \"executionInfo\": {\r\n \"nextRunTime\": \"2015-09-06T12:00:00Z\",\r\n \"recentJob\": {\r\n \"url\": \"https://pstests.eastus.batch.azure.com/jobs/testUpdateJobSchedule:job-1\",\r\n \"id\": \"testUpdateJobSchedule:job-1\"\r\n }\r\n },\r\n \"metadata\": [\r\n {\r\n \"name\": \"jobScheduleMeta1\",\r\n \"value\": \"jobScheduleValue1\"\r\n }\r\n ]\r\n }\r\n ]\r\n}", + "ResponseHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "c9be8f48-b1d0-4711-b15b-30480d460609" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "e99f5214-71bf-4424-8610-b6b7b2fb70de" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Fri, 04 Sep 2015 23:53:07 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/jobschedules?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L2pvYnNjaGVkdWxlcz9hcGktdmVyc2lvbj0yMDE1LTA2LTAxLjIuMCZ0aW1lb3V0PTMw", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "e99f5214-71bf-4424-8610-b6b7b2fb70de" + ], + "ocp-date": [ + "Fri, 04 Sep 2015 23:53:06 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "{\r\n \"odata.metadata\": \"https://pstests.eastus.batch.azure.com/$metadata#jobschedules\",\r\n \"value\": [\r\n {\r\n \"id\": \"testUpdateJobSchedule\",\r\n \"url\": \"https://pstests.eastus.batch.azure.com/jobschedules/testUpdateJobSchedule\",\r\n \"eTag\": \"0x8D2B583FB81DC5F\",\r\n \"lastModified\": \"2015-09-04T23:53:07.7596255Z\",\r\n \"creationTime\": \"2015-09-04T23:53:05.3078435Z\",\r\n \"state\": \"active\",\r\n \"stateTransitionTime\": \"2015-09-04T23:53:05.3078435Z\",\r\n \"schedule\": {\r\n \"doNotRunUntil\": \"2020-01-01T12:00:00Z\",\r\n \"doNotRunAfter\": \"2025-01-01T12:00:00Z\",\r\n \"startWindow\": \"PT1H\",\r\n \"recurrenceInterval\": \"P1D\"\r\n },\r\n \"jobSpecification\": {\r\n \"displayName\": \"jobSpecDisplayName\",\r\n \"priority\": 1,\r\n \"constraints\": {\r\n \"maxWallClockTime\": \"P1D\",\r\n \"maxTaskRetryCount\": 5\r\n },\r\n \"jobManagerTask\": {\r\n \"id\": \"jobManager\",\r\n \"displayName\": \"jobManagerDisplay\",\r\n \"commandLine\": \"cmd /c dir /s\",\r\n \"resourceFiles\": [\r\n {\r\n \"blobSource\": \"https://testacct.blob.core.windows.net/\",\r\n \"filePath\": \"filePath\"\r\n }\r\n ],\r\n \"environmentSettings\": [\r\n {\r\n \"name\": \"name1\",\r\n \"value\": \"value1\"\r\n },\r\n {\r\n \"name\": \"name2\",\r\n \"value\": \"value2\"\r\n }\r\n ],\r\n \"constraints\": {\r\n \"maxWallClockTime\": \"PT1H\",\r\n \"retentionTime\": \"P10675199DT2H48M5.4775807S\",\r\n \"maxTaskRetryCount\": 5\r\n },\r\n \"runElevated\": false,\r\n \"runExclusive\": true,\r\n \"killJobOnCompletion\": false\r\n },\r\n \"jobPreparationTask\": {\r\n \"id\": \"jobPrep\",\r\n \"commandLine\": \"cmd /c dir /s\",\r\n \"resourceFiles\": [\r\n {\r\n \"blobSource\": \"https://testacct.blob.core.windows.net/\",\r\n \"filePath\": \"jobPrepFilePath\"\r\n }\r\n ],\r\n \"environmentSettings\": [\r\n {\r\n \"name\": \"jobPrepName1\",\r\n \"value\": \"jobPrepValue1\"\r\n },\r\n {\r\n \"name\": \"jobPrepName2\",\r\n \"value\": \"jobPrepValue2\"\r\n }\r\n ],\r\n \"constraints\": {\r\n \"maxWallClockTime\": \"P10675199DT2H48M5.4775807S\",\r\n \"retentionTime\": \"P10675199DT2H48M5.4775807S\",\r\n \"maxTaskRetryCount\": 2\r\n },\r\n \"runElevated\": false,\r\n \"waitForSuccess\": true,\r\n \"rerunOnNodeRebootAfterSuccess\": true\r\n },\r\n \"jobReleaseTask\": {\r\n \"id\": \"jobRelease\",\r\n \"commandLine\": \"cmd /c dir /s\",\r\n \"resourceFiles\": [\r\n {\r\n \"blobSource\": \"https://testacct.blob.core.windows.net/\",\r\n \"filePath\": \"jobReleaseFilePath\"\r\n }\r\n ],\r\n \"environmentSettings\": [\r\n {\r\n \"name\": \"jobReleaseName1\",\r\n \"value\": \"jobReleaseValue1\"\r\n },\r\n {\r\n \"name\": \"jobReleaseName2\",\r\n \"value\": \"jobReleaseValue2\"\r\n }\r\n ],\r\n \"maxWallClockTime\": \"PT15M\",\r\n \"retentionTime\": \"P10675199DT2H48M5.4775807S\",\r\n \"runElevated\": false\r\n },\r\n \"commonEnvironmentSettings\": [\r\n {\r\n \"name\": \"commonName1\",\r\n \"value\": \"commonValue1\"\r\n },\r\n {\r\n \"name\": \"commonName2\",\r\n \"value\": \"commonValue2\"\r\n }\r\n ],\r\n \"poolInfo\": {\r\n \"autoPoolSpecification\": {\r\n \"autoPoolIdPrefix\": \"TestSpecPrefix\",\r\n \"poolLifetimeOption\": \"jobschedule\",\r\n \"keepAlive\": false,\r\n \"pool\": {\r\n \"osFamily\": \"4\",\r\n \"targetOSVersion\": \"*\",\r\n \"vmSize\": \"small\",\r\n \"maxTasksPerNode\": 1,\r\n \"taskSchedulingPolicy\": {\r\n \"nodeFillType\": \"Spread\"\r\n },\r\n \"resizeTimeout\": \"PT5M\",\r\n \"targetDedicated\": 3,\r\n \"enableAutoScale\": false,\r\n \"enableInterNodeCommunication\": false,\r\n \"startTask\": {\r\n \"commandLine\": \"cmd /c dir /s\",\r\n \"runElevated\": false,\r\n \"maxTaskRetryCount\": 0,\r\n \"waitForSuccess\": false\r\n },\r\n \"certificateReferences\": [\r\n {\r\n \"thumbprint\": \"0123456789abcdef\",\r\n \"thumbprintAlgorithm\": \"sha1\",\r\n \"storeLocation\": \"LocalMachine\",\r\n \"storeName\": \"certStore\",\r\n \"visibility\": \"starttask\"\r\n }\r\n ]\r\n }\r\n }\r\n },\r\n \"metadata\": [\r\n {\r\n \"name\": \"specMeta1\",\r\n \"value\": \"specMetaValue1\"\r\n },\r\n {\r\n \"name\": \"specMeta2\",\r\n \"value\": \"specMetaValue2\"\r\n }\r\n ]\r\n },\r\n \"executionInfo\": {\r\n \"nextRunTime\": \"2015-09-06T12:00:00Z\",\r\n \"recentJob\": {\r\n \"url\": \"https://pstests.eastus.batch.azure.com/jobs/testUpdateJobSchedule:job-1\",\r\n \"id\": \"testUpdateJobSchedule:job-1\"\r\n }\r\n },\r\n \"metadata\": [\r\n {\r\n \"name\": \"jobScheduleMeta1\",\r\n \"value\": \"jobScheduleValue1\"\r\n }\r\n ]\r\n }\r\n ]\r\n}", + "ResponseHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "c9be8f48-b1d0-4711-b15b-30480d460609" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "e99f5214-71bf-4424-8610-b6b7b2fb70de" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Fri, 04 Sep 2015 23:53:07 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/jobschedules?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L2pvYnNjaGVkdWxlcz9hcGktdmVyc2lvbj0yMDE1LTA2LTAxLjIuMCZ0aW1lb3V0PTMw", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "e99f5214-71bf-4424-8610-b6b7b2fb70de" + ], + "ocp-date": [ + "Fri, 04 Sep 2015 23:53:06 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "{\r\n \"odata.metadata\": \"https://pstests.eastus.batch.azure.com/$metadata#jobschedules\",\r\n \"value\": [\r\n {\r\n \"id\": \"testUpdateJobSchedule\",\r\n \"url\": \"https://pstests.eastus.batch.azure.com/jobschedules/testUpdateJobSchedule\",\r\n \"eTag\": \"0x8D2B583FB81DC5F\",\r\n \"lastModified\": \"2015-09-04T23:53:07.7596255Z\",\r\n \"creationTime\": \"2015-09-04T23:53:05.3078435Z\",\r\n \"state\": \"active\",\r\n \"stateTransitionTime\": \"2015-09-04T23:53:05.3078435Z\",\r\n \"schedule\": {\r\n \"doNotRunUntil\": \"2020-01-01T12:00:00Z\",\r\n \"doNotRunAfter\": \"2025-01-01T12:00:00Z\",\r\n \"startWindow\": \"PT1H\",\r\n \"recurrenceInterval\": \"P1D\"\r\n },\r\n \"jobSpecification\": {\r\n \"displayName\": \"jobSpecDisplayName\",\r\n \"priority\": 1,\r\n \"constraints\": {\r\n \"maxWallClockTime\": \"P1D\",\r\n \"maxTaskRetryCount\": 5\r\n },\r\n \"jobManagerTask\": {\r\n \"id\": \"jobManager\",\r\n \"displayName\": \"jobManagerDisplay\",\r\n \"commandLine\": \"cmd /c dir /s\",\r\n \"resourceFiles\": [\r\n {\r\n \"blobSource\": \"https://testacct.blob.core.windows.net/\",\r\n \"filePath\": \"filePath\"\r\n }\r\n ],\r\n \"environmentSettings\": [\r\n {\r\n \"name\": \"name1\",\r\n \"value\": \"value1\"\r\n },\r\n {\r\n \"name\": \"name2\",\r\n \"value\": \"value2\"\r\n }\r\n ],\r\n \"constraints\": {\r\n \"maxWallClockTime\": \"PT1H\",\r\n \"retentionTime\": \"P10675199DT2H48M5.4775807S\",\r\n \"maxTaskRetryCount\": 5\r\n },\r\n \"runElevated\": false,\r\n \"runExclusive\": true,\r\n \"killJobOnCompletion\": false\r\n },\r\n \"jobPreparationTask\": {\r\n \"id\": \"jobPrep\",\r\n \"commandLine\": \"cmd /c dir /s\",\r\n \"resourceFiles\": [\r\n {\r\n \"blobSource\": \"https://testacct.blob.core.windows.net/\",\r\n \"filePath\": \"jobPrepFilePath\"\r\n }\r\n ],\r\n \"environmentSettings\": [\r\n {\r\n \"name\": \"jobPrepName1\",\r\n \"value\": \"jobPrepValue1\"\r\n },\r\n {\r\n \"name\": \"jobPrepName2\",\r\n \"value\": \"jobPrepValue2\"\r\n }\r\n ],\r\n \"constraints\": {\r\n \"maxWallClockTime\": \"P10675199DT2H48M5.4775807S\",\r\n \"retentionTime\": \"P10675199DT2H48M5.4775807S\",\r\n \"maxTaskRetryCount\": 2\r\n },\r\n \"runElevated\": false,\r\n \"waitForSuccess\": true,\r\n \"rerunOnNodeRebootAfterSuccess\": true\r\n },\r\n \"jobReleaseTask\": {\r\n \"id\": \"jobRelease\",\r\n \"commandLine\": \"cmd /c dir /s\",\r\n \"resourceFiles\": [\r\n {\r\n \"blobSource\": \"https://testacct.blob.core.windows.net/\",\r\n \"filePath\": \"jobReleaseFilePath\"\r\n }\r\n ],\r\n \"environmentSettings\": [\r\n {\r\n \"name\": \"jobReleaseName1\",\r\n \"value\": \"jobReleaseValue1\"\r\n },\r\n {\r\n \"name\": \"jobReleaseName2\",\r\n \"value\": \"jobReleaseValue2\"\r\n }\r\n ],\r\n \"maxWallClockTime\": \"PT15M\",\r\n \"retentionTime\": \"P10675199DT2H48M5.4775807S\",\r\n \"runElevated\": false\r\n },\r\n \"commonEnvironmentSettings\": [\r\n {\r\n \"name\": \"commonName1\",\r\n \"value\": \"commonValue1\"\r\n },\r\n {\r\n \"name\": \"commonName2\",\r\n \"value\": \"commonValue2\"\r\n }\r\n ],\r\n \"poolInfo\": {\r\n \"autoPoolSpecification\": {\r\n \"autoPoolIdPrefix\": \"TestSpecPrefix\",\r\n \"poolLifetimeOption\": \"jobschedule\",\r\n \"keepAlive\": false,\r\n \"pool\": {\r\n \"osFamily\": \"4\",\r\n \"targetOSVersion\": \"*\",\r\n \"vmSize\": \"small\",\r\n \"maxTasksPerNode\": 1,\r\n \"taskSchedulingPolicy\": {\r\n \"nodeFillType\": \"Spread\"\r\n },\r\n \"resizeTimeout\": \"PT5M\",\r\n \"targetDedicated\": 3,\r\n \"enableAutoScale\": false,\r\n \"enableInterNodeCommunication\": false,\r\n \"startTask\": {\r\n \"commandLine\": \"cmd /c dir /s\",\r\n \"runElevated\": false,\r\n \"maxTaskRetryCount\": 0,\r\n \"waitForSuccess\": false\r\n },\r\n \"certificateReferences\": [\r\n {\r\n \"thumbprint\": \"0123456789abcdef\",\r\n \"thumbprintAlgorithm\": \"sha1\",\r\n \"storeLocation\": \"LocalMachine\",\r\n \"storeName\": \"certStore\",\r\n \"visibility\": \"starttask\"\r\n }\r\n ]\r\n }\r\n }\r\n },\r\n \"metadata\": [\r\n {\r\n \"name\": \"specMeta1\",\r\n \"value\": \"specMetaValue1\"\r\n },\r\n {\r\n \"name\": \"specMeta2\",\r\n \"value\": \"specMetaValue2\"\r\n }\r\n ]\r\n },\r\n \"executionInfo\": {\r\n \"nextRunTime\": \"2015-09-06T12:00:00Z\",\r\n \"recentJob\": {\r\n \"url\": \"https://pstests.eastus.batch.azure.com/jobs/testUpdateJobSchedule:job-1\",\r\n \"id\": \"testUpdateJobSchedule:job-1\"\r\n }\r\n },\r\n \"metadata\": [\r\n {\r\n \"name\": \"jobScheduleMeta1\",\r\n \"value\": \"jobScheduleValue1\"\r\n }\r\n ]\r\n }\r\n ]\r\n}", + "ResponseHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "c9be8f48-b1d0-4711-b15b-30480d460609" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "e99f5214-71bf-4424-8610-b6b7b2fb70de" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Fri, 04 Sep 2015 23:53:07 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/jobschedules/testUpdateJobSchedule?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L2pvYnNjaGVkdWxlcy90ZXN0VXBkYXRlSm9iU2NoZWR1bGU/YXBpLXZlcnNpb249MjAxNS0wNi0wMS4yLjAmdGltZW91dD0zMA==", + "RequestMethod": "DELETE", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "5324d150-90b5-4c02-ae3a-1edf35bfcdec" + ], + "ocp-date": [ + "Fri, 04 Sep 2015 23:53:07 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "8f36f1b2-5d56-4ce2-a0c7-ae1be8932ecb" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "5324d150-90b5-4c02-ae3a-1edf35bfcdec" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Fri, 04 Sep 2015 23:53:08 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 202 + }, + { + "RequestUri": "/jobschedules/testUpdateJobSchedule?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L2pvYnNjaGVkdWxlcy90ZXN0VXBkYXRlSm9iU2NoZWR1bGU/YXBpLXZlcnNpb249MjAxNS0wNi0wMS4yLjAmdGltZW91dD0zMA==", + "RequestMethod": "DELETE", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "5324d150-90b5-4c02-ae3a-1edf35bfcdec" + ], + "ocp-date": [ + "Fri, 04 Sep 2015 23:53:07 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "8f36f1b2-5d56-4ce2-a0c7-ae1be8932ecb" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "5324d150-90b5-4c02-ae3a-1edf35bfcdec" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Fri, 04 Sep 2015 23:53:08 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 202 + } + ], + "Names": {}, + "Variables": { + "SubscriptionId": "6368ed38-3570-481f-b4fa-1d0a6e8d3f3b" + } +} \ No newline at end of file diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/SessionRecords/Microsoft.Azure.Commands.Batch.Test.ScenarioTests.JobTests/TestUpdateJob.json b/src/ResourceManager/AzureBatch/Commands.Batch.Test/SessionRecords/Microsoft.Azure.Commands.Batch.Test.ScenarioTests.JobTests/TestUpdateJob.json new file mode 100644 index 000000000000..d47e94003761 --- /dev/null +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/SessionRecords/Microsoft.Azure.Commands.Batch.Test.ScenarioTests.JobTests/TestUpdateJob.json @@ -0,0 +1,2009 @@ +{ + "Entries": [ + { + "RequestUri": "/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resources?$filter=resourceType%20eq%20'Microsoft.Batch%2FbatchAccounts'&api-version=2014-04-01-preview", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNjM2OGVkMzgtMzU3MC00ODFmLWI0ZmEtMWQwYTZlOGQzZjNiL3Jlc291cmNlcz8kZmlsdGVyPXJlc291cmNlVHlwZSUyMGVxJTIwJ01pY3Jvc29mdC5CYXRjaCUyRmJhdGNoQWNjb3VudHMnJmFwaS12ZXJzaW9uPTIwMTQtMDQtMDEtcHJldmlldw==", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "User-Agent": [ + "Microsoft.Azure.Management.Resources.ResourceManagementClient/2.0.0.0" + ] + }, + "ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"id\": \"/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resourceGroups/default-azurebatch-eastus/providers/Microsoft.Batch/batchAccounts/pstests\",\r\n \"name\": \"pstests\",\r\n \"type\": \"Microsoft.Batch/batchAccounts\",\r\n \"location\": \"eastus\"\r\n },\r\n {\r\n \"id\": \"/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resourceGroups/Default-AzureBatch-WestUS/providers/Microsoft.Batch/batchAccounts/jaschneibatchtest\",\r\n \"name\": \"jaschneibatchtest\",\r\n \"type\": \"Microsoft.Batch/batchAccounts\",\r\n \"location\": \"westus\"\r\n }\r\n ]\r\n}", + "ResponseHeaders": { + "Content-Length": [ + "483" + ], + "Content-Type": [ + "application/json; charset=utf-8" + ], + "Expires": [ + "-1" + ], + "Pragma": [ + "no-cache" + ], + "x-ms-ratelimit-remaining-subscription-reads": [ + "14986" + ], + "x-ms-request-id": [ + "4e931d30-e7d8-4b76-96cc-11a239faa35e" + ], + "x-ms-correlation-request-id": [ + "4e931d30-e7d8-4b76-96cc-11a239faa35e" + ], + "x-ms-routing-request-id": [ + "WESTUS:20150908T170456Z:4e931d30-e7d8-4b76-96cc-11a239faa35e" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "Cache-Control": [ + "no-cache" + ], + "Date": [ + "Tue, 08 Sep 2015 17:04:56 GMT" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resourceGroups/default-azurebatch-eastus/providers/Microsoft.Batch/batchAccounts/pstests?api-version=2015-07-01", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNjM2OGVkMzgtMzU3MC00ODFmLWI0ZmEtMWQwYTZlOGQzZjNiL3Jlc291cmNlR3JvdXBzL2RlZmF1bHQtYXp1cmViYXRjaC1lYXN0dXMvcHJvdmlkZXJzL01pY3Jvc29mdC5CYXRjaC9iYXRjaEFjY291bnRzL3BzdGVzdHM/YXBpLXZlcnNpb249MjAxNS0wNy0wMQ==", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "x-ms-version": [ + "2015-07-01" + ], + "User-Agent": [ + "Microsoft.Azure.Management.Batch.BatchManagementClient/1.0.0.0" + ] + }, + "ResponseBody": "{\r\n \"name\": \"pstests\",\r\n \"location\": \"eastus\",\r\n \"properties\": {\r\n \"accountEndpoint\": \"pstests.eastus.batch.azure.com\",\r\n \"provisioningState\": \"Succeeded\"\r\n },\r\n \"id\": \"/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resourceGroups/default-azurebatch-eastus/providers/Microsoft.Batch/batchAccounts/pstests\",\r\n \"type\": \"Microsoft.Batch/batchAccounts\"\r\n}", + "ResponseHeaders": { + "Content-Length": [ + "323" + ], + "Content-Type": [ + "application/json; charset=utf-8" + ], + "Expires": [ + "-1" + ], + "Last-Modified": [ + "Tue, 08 Sep 2015 17:04:58 GMT" + ], + "Pragma": [ + "no-cache" + ], + "request-id": [ + "70f21b85-8ac2-4730-b2ce-ee5981b73ff5" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "x-ms-ratelimit-remaining-subscription-reads": [ + "14981" + ], + "x-ms-request-id": [ + "a4d05947-4cd4-4971-b74c-64d4036ddff0" + ], + "x-ms-correlation-request-id": [ + "a4d05947-4cd4-4971-b74c-64d4036ddff0" + ], + "x-ms-routing-request-id": [ + "WESTUS:20150908T170458Z:a4d05947-4cd4-4971-b74c-64d4036ddff0" + ], + "Cache-Control": [ + "no-cache" + ], + "Date": [ + "Tue, 08 Sep 2015 17:04:57 GMT" + ], + "ETag": [ + "0x8D2B86FA0924C44" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resourceGroups/default-azurebatch-eastus/providers/Microsoft.Batch/batchAccounts/pstests/listKeys?api-version=2015-07-01", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNjM2OGVkMzgtMzU3MC00ODFmLWI0ZmEtMWQwYTZlOGQzZjNiL3Jlc291cmNlR3JvdXBzL2RlZmF1bHQtYXp1cmViYXRjaC1lYXN0dXMvcHJvdmlkZXJzL01pY3Jvc29mdC5CYXRjaC9iYXRjaEFjY291bnRzL3BzdGVzdHMvbGlzdEtleXM/YXBpLXZlcnNpb249MjAxNS0wNy0wMQ==", + "RequestMethod": "POST", + "RequestBody": "", + "RequestHeaders": { + "x-ms-version": [ + "2015-07-01" + ], + "User-Agent": [ + "Microsoft.Azure.Management.Batch.BatchManagementClient/1.0.0.0" + ] + }, + "ResponseBody": "{\r\n \"accountName\": \"pstests\",\r\n \"primary\": \"XXFZ+jAijJoB8YsqvHU7t0es8xUSVpgCoQ2sK1MxOWPFiMkBl1NhQ2TdzkmA9dH3YfXTaE26kMRRvYG1gax9gw==\",\r\n \"secondary\": \"Wk38jkxm7UKVR3Yp7x5IhHvPdLuzOEwVEXlwrF9DvTp0YhkP8zvG0Kc0BM4kMJP0wu9IEOHMwklmykjgikTchg==\"\r\n}", + "ResponseHeaders": { + "Content-Length": [ + "229" + ], + "Content-Type": [ + "application/json; charset=utf-8" + ], + "Expires": [ + "-1" + ], + "Pragma": [ + "no-cache" + ], + "request-id": [ + "3aaf09bd-9e2a-4cfe-8650-d591ff38a709" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "x-ms-ratelimit-remaining-subscription-writes": [ + "1199" + ], + "x-ms-request-id": [ + "58915c40-8994-449b-a4ee-75198ee415f4" + ], + "x-ms-correlation-request-id": [ + "58915c40-8994-449b-a4ee-75198ee415f4" + ], + "x-ms-routing-request-id": [ + "WESTUS:20150908T170458Z:58915c40-8994-449b-a4ee-75198ee415f4" + ], + "Cache-Control": [ + "no-cache" + ], + "Date": [ + "Tue, 08 Sep 2015 17:04:57 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/jobs?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L2pvYnM/YXBpLXZlcnNpb249MjAxNS0wNi0wMS4yLjAmdGltZW91dD0zMA==", + "RequestMethod": "POST", + "RequestBody": "{\r\n \"id\": \"updateJobTest\",\r\n \"priority\": 0,\r\n \"poolInfo\": {\r\n \"autoPoolSpecification\": {\r\n \"autoPoolIdPrefix\": \"TestSpecPrefix\",\r\n \"poolLifetimeOption\": \"job\",\r\n \"keepAlive\": true,\r\n \"pool\": {\r\n \"vmSize\": \"small\",\r\n \"osFamily\": \"4\",\r\n \"targetOSVersion\": \"*\",\r\n \"targetDedicated\": 3,\r\n \"metadata\": [\r\n {\r\n \"name\": \"meta1\",\r\n \"value\": \"value1\"\r\n }\r\n ]\r\n }\r\n }\r\n }\r\n}", + "RequestHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Content-Length": [ + "481" + ], + "client-request-id": [ + "eab01adb-2cc6-4e2f-b003-f430e8aeed9d" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 17:04:58 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Last-Modified": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "ce744f59-1ae6-4d27-98ee-3d71e27bd205" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "eab01adb-2cc6-4e2f-b003-f430e8aeed9d" + ], + "DataServiceVersion": [ + "3.0" + ], + "DataServiceId": [ + "https://pstests.eastus.batch.azure.com/jobs/job-1" + ], + "Date": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "ETag": [ + "0x8D2B86FA16EE474" + ], + "Location": [ + "https://pstests.eastus.batch.azure.com/jobs/job-1" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 201 + }, + { + "RequestUri": "/jobs/updateJobTest?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L2pvYnMvdXBkYXRlSm9iVGVzdD9hcGktdmVyc2lvbj0yMDE1LTA2LTAxLjIuMCZ0aW1lb3V0PTMw", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "adee3342-268a-430e-aad8-d503f880c7a6" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 17:04:59 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "{\r\n \"odata.metadata\": \"https://pstests.eastus.batch.azure.com/$metadata#jobs/@Element\",\r\n \"id\": \"updateJobTest\",\r\n \"url\": \"https://pstests.eastus.batch.azure.com/jobs/updateJobTest\",\r\n \"eTag\": \"0x8D2B86FA16EE474\",\r\n \"lastModified\": \"2015-09-08T17:05:00.1941108Z\",\r\n \"creationTime\": \"2015-09-08T17:05:00.1750687Z\",\r\n \"state\": \"active\",\r\n \"stateTransitionTime\": \"2015-09-08T17:05:00.1941108Z\",\r\n \"priority\": 0,\r\n \"constraints\": {\r\n \"maxWallClockTime\": \"P10675199DT2H48M5.4775807S\",\r\n \"maxTaskRetryCount\": 0\r\n },\r\n \"poolInfo\": {\r\n \"autoPoolSpecification\": {\r\n \"autoPoolIdPrefix\": \"TestSpecPrefix\",\r\n \"poolLifetimeOption\": \"job\",\r\n \"keepAlive\": true,\r\n \"pool\": {\r\n \"osFamily\": \"4\",\r\n \"targetOSVersion\": \"*\",\r\n \"vmSize\": \"small\",\r\n \"maxTasksPerNode\": 1,\r\n \"taskSchedulingPolicy\": {\r\n \"nodeFillType\": \"Spread\"\r\n },\r\n \"resizeTimeout\": \"PT5M\",\r\n \"targetDedicated\": 3,\r\n \"enableAutoScale\": false,\r\n \"enableInterNodeCommunication\": false,\r\n \"metadata\": [\r\n {\r\n \"name\": \"meta1\",\r\n \"value\": \"value1\"\r\n }\r\n ]\r\n }\r\n }\r\n },\r\n \"executionInfo\": {\r\n \"startTime\": \"2015-09-08T17:05:00.1941108Z\",\r\n \"poolId\": \"TestSpecPrefix_AFE1F60C-4CDF-4183-8584-6745BB85AE4C\"\r\n }\r\n}", + "ResponseHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Last-Modified": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "9d726e04-6c29-4aa2-a963-a250f291056f" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "adee3342-268a-430e-aad8-d503f880c7a6" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "ETag": [ + "0x8D2B86FA16EE474" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/jobs/updateJobTest?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L2pvYnMvdXBkYXRlSm9iVGVzdD9hcGktdmVyc2lvbj0yMDE1LTA2LTAxLjIuMCZ0aW1lb3V0PTMw", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "adee3342-268a-430e-aad8-d503f880c7a6" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 17:04:59 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "{\r\n \"odata.metadata\": \"https://pstests.eastus.batch.azure.com/$metadata#jobs/@Element\",\r\n \"id\": \"updateJobTest\",\r\n \"url\": \"https://pstests.eastus.batch.azure.com/jobs/updateJobTest\",\r\n \"eTag\": \"0x8D2B86FA16EE474\",\r\n \"lastModified\": \"2015-09-08T17:05:00.1941108Z\",\r\n \"creationTime\": \"2015-09-08T17:05:00.1750687Z\",\r\n \"state\": \"active\",\r\n \"stateTransitionTime\": \"2015-09-08T17:05:00.1941108Z\",\r\n \"priority\": 0,\r\n \"constraints\": {\r\n \"maxWallClockTime\": \"P10675199DT2H48M5.4775807S\",\r\n \"maxTaskRetryCount\": 0\r\n },\r\n \"poolInfo\": {\r\n \"autoPoolSpecification\": {\r\n \"autoPoolIdPrefix\": \"TestSpecPrefix\",\r\n \"poolLifetimeOption\": \"job\",\r\n \"keepAlive\": true,\r\n \"pool\": {\r\n \"osFamily\": \"4\",\r\n \"targetOSVersion\": \"*\",\r\n \"vmSize\": \"small\",\r\n \"maxTasksPerNode\": 1,\r\n \"taskSchedulingPolicy\": {\r\n \"nodeFillType\": \"Spread\"\r\n },\r\n \"resizeTimeout\": \"PT5M\",\r\n \"targetDedicated\": 3,\r\n \"enableAutoScale\": false,\r\n \"enableInterNodeCommunication\": false,\r\n \"metadata\": [\r\n {\r\n \"name\": \"meta1\",\r\n \"value\": \"value1\"\r\n }\r\n ]\r\n }\r\n }\r\n },\r\n \"executionInfo\": {\r\n \"startTime\": \"2015-09-08T17:05:00.1941108Z\",\r\n \"poolId\": \"TestSpecPrefix_AFE1F60C-4CDF-4183-8584-6745BB85AE4C\"\r\n }\r\n}", + "ResponseHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Last-Modified": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "9d726e04-6c29-4aa2-a963-a250f291056f" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "adee3342-268a-430e-aad8-d503f880c7a6" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "ETag": [ + "0x8D2B86FA16EE474" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/jobs/updateJobTest?disable&api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L2pvYnMvdXBkYXRlSm9iVGVzdD9kaXNhYmxlJmFwaS12ZXJzaW9uPTIwMTUtMDYtMDEuMi4wJnRpbWVvdXQ9MzA=", + "RequestMethod": "POST", + "RequestBody": "{\r\n \"disableTasks\": \"terminate\"\r\n}", + "RequestHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Content-Length": [ + "35" + ], + "client-request-id": [ + "61a5ee63-f701-47ff-a038-45ccddc18137" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 17:04:59 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Last-Modified": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "73c15663-9b1d-4a1a-9daa-c4d5e767b35a" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "61a5ee63-f701-47ff-a038-45ccddc18137" + ], + "DataServiceVersion": [ + "3.0" + ], + "DataServiceId": [ + "https://pstests.eastus.batch.azure.com/jobs/updateJobTest" + ], + "Date": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "ETag": [ + "0x8D2B86FA1A27E9C" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 202 + }, + { + "RequestUri": "/jobs/updateJobTest?disable&api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L2pvYnMvdXBkYXRlSm9iVGVzdD9kaXNhYmxlJmFwaS12ZXJzaW9uPTIwMTUtMDYtMDEuMi4wJnRpbWVvdXQ9MzA=", + "RequestMethod": "POST", + "RequestBody": "{\r\n \"disableTasks\": \"terminate\"\r\n}", + "RequestHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Content-Length": [ + "35" + ], + "client-request-id": [ + "61a5ee63-f701-47ff-a038-45ccddc18137" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 17:04:59 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Last-Modified": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "73c15663-9b1d-4a1a-9daa-c4d5e767b35a" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "61a5ee63-f701-47ff-a038-45ccddc18137" + ], + "DataServiceVersion": [ + "3.0" + ], + "DataServiceId": [ + "https://pstests.eastus.batch.azure.com/jobs/updateJobTest" + ], + "Date": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "ETag": [ + "0x8D2B86FA1A27E9C" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 202 + }, + { + "RequestUri": "/jobs/updateJobTest?disable&api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L2pvYnMvdXBkYXRlSm9iVGVzdD9kaXNhYmxlJmFwaS12ZXJzaW9uPTIwMTUtMDYtMDEuMi4wJnRpbWVvdXQ9MzA=", + "RequestMethod": "POST", + "RequestBody": "{\r\n \"disableTasks\": \"terminate\"\r\n}", + "RequestHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Content-Length": [ + "35" + ], + "client-request-id": [ + "61a5ee63-f701-47ff-a038-45ccddc18137" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 17:04:59 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Last-Modified": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "73c15663-9b1d-4a1a-9daa-c4d5e767b35a" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "61a5ee63-f701-47ff-a038-45ccddc18137" + ], + "DataServiceVersion": [ + "3.0" + ], + "DataServiceId": [ + "https://pstests.eastus.batch.azure.com/jobs/updateJobTest" + ], + "Date": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "ETag": [ + "0x8D2B86FA1A27E9C" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 202 + }, + { + "RequestUri": "/jobs/updateJobTest?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L2pvYnMvdXBkYXRlSm9iVGVzdD9hcGktdmVyc2lvbj0yMDE1LTA2LTAxLjIuMCZ0aW1lb3V0PTMw", + "RequestMethod": "PUT", + "RequestBody": "{\r\n \"priority\": 3,\r\n \"constraints\": {\r\n \"maxWallClockTime\": \"P1D\",\r\n \"maxTaskRetryCount\": 5\r\n },\r\n \"poolInfo\": {\r\n \"autoPoolSpecification\": {\r\n \"autoPoolIdPrefix\": \"TestSpecPrefix\",\r\n \"poolLifetimeOption\": \"job\",\r\n \"keepAlive\": false,\r\n \"pool\": {\r\n \"vmSize\": \"small\",\r\n \"osFamily\": \"4\",\r\n \"targetOSVersion\": \"*\",\r\n \"maxTasksPerNode\": 1,\r\n \"taskSchedulingPolicy\": {\r\n \"nodeFillType\": \"Spread\"\r\n },\r\n \"resizeTimeout\": \"PT5M\",\r\n \"targetDedicated\": 3,\r\n \"enableAutoScale\": false,\r\n \"enableInterNodeCommunication\": false,\r\n \"metadata\": [\r\n {\r\n \"name\": \"meta1\",\r\n \"value\": \"value1\"\r\n }\r\n ]\r\n }\r\n }\r\n },\r\n \"metadata\": [\r\n {\r\n \"name\": \"jobMeta1\",\r\n \"value\": \"jobValue1\"\r\n }\r\n ]\r\n}", + "RequestHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Content-Length": [ + "865" + ], + "client-request-id": [ + "490e488b-28b7-4752-abc1-b9659ca9c967" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 17:04:59 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Last-Modified": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "1812287e-8824-44fc-a29f-8304d959e243" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "490e488b-28b7-4752-abc1-b9659ca9c967" + ], + "DataServiceVersion": [ + "3.0" + ], + "DataServiceId": [ + "https://pstests.eastus.batch.azure.com/jobs/updateJobTest" + ], + "Date": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "ETag": [ + "0x8D2B86FA1D6F1EA" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/jobs/updateJobTest?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L2pvYnMvdXBkYXRlSm9iVGVzdD9hcGktdmVyc2lvbj0yMDE1LTA2LTAxLjIuMCZ0aW1lb3V0PTMw", + "RequestMethod": "PUT", + "RequestBody": "{\r\n \"priority\": 3,\r\n \"constraints\": {\r\n \"maxWallClockTime\": \"P1D\",\r\n \"maxTaskRetryCount\": 5\r\n },\r\n \"poolInfo\": {\r\n \"autoPoolSpecification\": {\r\n \"autoPoolIdPrefix\": \"TestSpecPrefix\",\r\n \"poolLifetimeOption\": \"job\",\r\n \"keepAlive\": false,\r\n \"pool\": {\r\n \"vmSize\": \"small\",\r\n \"osFamily\": \"4\",\r\n \"targetOSVersion\": \"*\",\r\n \"maxTasksPerNode\": 1,\r\n \"taskSchedulingPolicy\": {\r\n \"nodeFillType\": \"Spread\"\r\n },\r\n \"resizeTimeout\": \"PT5M\",\r\n \"targetDedicated\": 3,\r\n \"enableAutoScale\": false,\r\n \"enableInterNodeCommunication\": false,\r\n \"metadata\": [\r\n {\r\n \"name\": \"meta1\",\r\n \"value\": \"value1\"\r\n }\r\n ]\r\n }\r\n }\r\n },\r\n \"metadata\": [\r\n {\r\n \"name\": \"jobMeta1\",\r\n \"value\": \"jobValue1\"\r\n }\r\n ]\r\n}", + "RequestHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Content-Length": [ + "865" + ], + "client-request-id": [ + "490e488b-28b7-4752-abc1-b9659ca9c967" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 17:04:59 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Last-Modified": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "1812287e-8824-44fc-a29f-8304d959e243" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "490e488b-28b7-4752-abc1-b9659ca9c967" + ], + "DataServiceVersion": [ + "3.0" + ], + "DataServiceId": [ + "https://pstests.eastus.batch.azure.com/jobs/updateJobTest" + ], + "Date": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "ETag": [ + "0x8D2B86FA1D6F1EA" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/jobs/updateJobTest?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L2pvYnMvdXBkYXRlSm9iVGVzdD9hcGktdmVyc2lvbj0yMDE1LTA2LTAxLjIuMCZ0aW1lb3V0PTMw", + "RequestMethod": "PUT", + "RequestBody": "{\r\n \"priority\": 3,\r\n \"constraints\": {\r\n \"maxWallClockTime\": \"P1D\",\r\n \"maxTaskRetryCount\": 5\r\n },\r\n \"poolInfo\": {\r\n \"autoPoolSpecification\": {\r\n \"autoPoolIdPrefix\": \"TestSpecPrefix\",\r\n \"poolLifetimeOption\": \"job\",\r\n \"keepAlive\": false,\r\n \"pool\": {\r\n \"vmSize\": \"small\",\r\n \"osFamily\": \"4\",\r\n \"targetOSVersion\": \"*\",\r\n \"maxTasksPerNode\": 1,\r\n \"taskSchedulingPolicy\": {\r\n \"nodeFillType\": \"Spread\"\r\n },\r\n \"resizeTimeout\": \"PT5M\",\r\n \"targetDedicated\": 3,\r\n \"enableAutoScale\": false,\r\n \"enableInterNodeCommunication\": false,\r\n \"metadata\": [\r\n {\r\n \"name\": \"meta1\",\r\n \"value\": \"value1\"\r\n }\r\n ]\r\n }\r\n }\r\n },\r\n \"metadata\": [\r\n {\r\n \"name\": \"jobMeta1\",\r\n \"value\": \"jobValue1\"\r\n }\r\n ]\r\n}", + "RequestHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Content-Length": [ + "865" + ], + "client-request-id": [ + "490e488b-28b7-4752-abc1-b9659ca9c967" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 17:04:59 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Last-Modified": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "1812287e-8824-44fc-a29f-8304d959e243" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "490e488b-28b7-4752-abc1-b9659ca9c967" + ], + "DataServiceVersion": [ + "3.0" + ], + "DataServiceId": [ + "https://pstests.eastus.batch.azure.com/jobs/updateJobTest" + ], + "Date": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "ETag": [ + "0x8D2B86FA1D6F1EA" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/jobs/updateJobTest?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L2pvYnMvdXBkYXRlSm9iVGVzdD9hcGktdmVyc2lvbj0yMDE1LTA2LTAxLjIuMCZ0aW1lb3V0PTMw", + "RequestMethod": "PUT", + "RequestBody": "{\r\n \"priority\": 3,\r\n \"constraints\": {\r\n \"maxWallClockTime\": \"P1D\",\r\n \"maxTaskRetryCount\": 5\r\n },\r\n \"poolInfo\": {\r\n \"autoPoolSpecification\": {\r\n \"autoPoolIdPrefix\": \"TestSpecPrefix\",\r\n \"poolLifetimeOption\": \"job\",\r\n \"keepAlive\": false,\r\n \"pool\": {\r\n \"vmSize\": \"small\",\r\n \"osFamily\": \"4\",\r\n \"targetOSVersion\": \"*\",\r\n \"maxTasksPerNode\": 1,\r\n \"taskSchedulingPolicy\": {\r\n \"nodeFillType\": \"Spread\"\r\n },\r\n \"resizeTimeout\": \"PT5M\",\r\n \"targetDedicated\": 3,\r\n \"enableAutoScale\": false,\r\n \"enableInterNodeCommunication\": false,\r\n \"metadata\": [\r\n {\r\n \"name\": \"meta1\",\r\n \"value\": \"value1\"\r\n }\r\n ]\r\n }\r\n }\r\n },\r\n \"metadata\": [\r\n {\r\n \"name\": \"jobMeta1\",\r\n \"value\": \"jobValue1\"\r\n }\r\n ]\r\n}", + "RequestHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Content-Length": [ + "865" + ], + "client-request-id": [ + "490e488b-28b7-4752-abc1-b9659ca9c967" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 17:04:59 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Last-Modified": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "1812287e-8824-44fc-a29f-8304d959e243" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "490e488b-28b7-4752-abc1-b9659ca9c967" + ], + "DataServiceVersion": [ + "3.0" + ], + "DataServiceId": [ + "https://pstests.eastus.batch.azure.com/jobs/updateJobTest" + ], + "Date": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "ETag": [ + "0x8D2B86FA1D6F1EA" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/jobs?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L2pvYnM/YXBpLXZlcnNpb249MjAxNS0wNi0wMS4yLjAmdGltZW91dD0zMA==", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "44886d99-3c47-40c6-8ef3-cb52bd71cc41" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "{\r\n \"odata.metadata\": \"https://pstests.eastus.batch.azure.com/$metadata#jobs\",\r\n \"value\": [\r\n {\r\n \"id\": \"updateJobTest\",\r\n \"url\": \"https://pstests.eastus.batch.azure.com/jobs/updateJobTest\",\r\n \"eTag\": \"0x8D2B86FA1D6F1EA\",\r\n \"lastModified\": \"2015-09-08T17:05:00.8760298Z\",\r\n \"creationTime\": \"2015-09-08T17:05:00.1750687Z\",\r\n \"state\": \"disabled\",\r\n \"stateTransitionTime\": \"2015-09-08T17:05:00.6823291Z\",\r\n \"previousState\": \"active\",\r\n \"previousStateTransitionTime\": \"2015-09-08T17:05:00.1941108Z\",\r\n \"priority\": 3,\r\n \"constraints\": {\r\n \"maxWallClockTime\": \"P1D\",\r\n \"maxTaskRetryCount\": 5\r\n },\r\n \"poolInfo\": {\r\n \"autoPoolSpecification\": {\r\n \"autoPoolIdPrefix\": \"TestSpecPrefix\",\r\n \"poolLifetimeOption\": \"job\",\r\n \"keepAlive\": false,\r\n \"pool\": {\r\n \"osFamily\": \"4\",\r\n \"targetOSVersion\": \"*\",\r\n \"vmSize\": \"small\",\r\n \"maxTasksPerNode\": 1,\r\n \"taskSchedulingPolicy\": {\r\n \"nodeFillType\": \"Spread\"\r\n },\r\n \"resizeTimeout\": \"PT5M\",\r\n \"targetDedicated\": 3,\r\n \"enableAutoScale\": false,\r\n \"enableInterNodeCommunication\": false,\r\n \"metadata\": [\r\n {\r\n \"name\": \"meta1\",\r\n \"value\": \"value1\"\r\n }\r\n ]\r\n }\r\n }\r\n },\r\n \"metadata\": [\r\n {\r\n \"name\": \"jobMeta1\",\r\n \"value\": \"jobValue1\"\r\n }\r\n ],\r\n \"executionInfo\": {\r\n \"startTime\": \"2015-09-08T17:05:00.1941108Z\",\r\n \"poolId\": \"TestSpecPrefix_AFE1F60C-4CDF-4183-8584-6745BB85AE4C\"\r\n }\r\n }\r\n ]\r\n}", + "ResponseHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "473bb7cb-3b3a-4c55-b04e-91eaa243645c" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "44886d99-3c47-40c6-8ef3-cb52bd71cc41" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/jobs?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L2pvYnM/YXBpLXZlcnNpb249MjAxNS0wNi0wMS4yLjAmdGltZW91dD0zMA==", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "44886d99-3c47-40c6-8ef3-cb52bd71cc41" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "{\r\n \"odata.metadata\": \"https://pstests.eastus.batch.azure.com/$metadata#jobs\",\r\n \"value\": [\r\n {\r\n \"id\": \"updateJobTest\",\r\n \"url\": \"https://pstests.eastus.batch.azure.com/jobs/updateJobTest\",\r\n \"eTag\": \"0x8D2B86FA1D6F1EA\",\r\n \"lastModified\": \"2015-09-08T17:05:00.8760298Z\",\r\n \"creationTime\": \"2015-09-08T17:05:00.1750687Z\",\r\n \"state\": \"disabled\",\r\n \"stateTransitionTime\": \"2015-09-08T17:05:00.6823291Z\",\r\n \"previousState\": \"active\",\r\n \"previousStateTransitionTime\": \"2015-09-08T17:05:00.1941108Z\",\r\n \"priority\": 3,\r\n \"constraints\": {\r\n \"maxWallClockTime\": \"P1D\",\r\n \"maxTaskRetryCount\": 5\r\n },\r\n \"poolInfo\": {\r\n \"autoPoolSpecification\": {\r\n \"autoPoolIdPrefix\": \"TestSpecPrefix\",\r\n \"poolLifetimeOption\": \"job\",\r\n \"keepAlive\": false,\r\n \"pool\": {\r\n \"osFamily\": \"4\",\r\n \"targetOSVersion\": \"*\",\r\n \"vmSize\": \"small\",\r\n \"maxTasksPerNode\": 1,\r\n \"taskSchedulingPolicy\": {\r\n \"nodeFillType\": \"Spread\"\r\n },\r\n \"resizeTimeout\": \"PT5M\",\r\n \"targetDedicated\": 3,\r\n \"enableAutoScale\": false,\r\n \"enableInterNodeCommunication\": false,\r\n \"metadata\": [\r\n {\r\n \"name\": \"meta1\",\r\n \"value\": \"value1\"\r\n }\r\n ]\r\n }\r\n }\r\n },\r\n \"metadata\": [\r\n {\r\n \"name\": \"jobMeta1\",\r\n \"value\": \"jobValue1\"\r\n }\r\n ],\r\n \"executionInfo\": {\r\n \"startTime\": \"2015-09-08T17:05:00.1941108Z\",\r\n \"poolId\": \"TestSpecPrefix_AFE1F60C-4CDF-4183-8584-6745BB85AE4C\"\r\n }\r\n }\r\n ]\r\n}", + "ResponseHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "473bb7cb-3b3a-4c55-b04e-91eaa243645c" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "44886d99-3c47-40c6-8ef3-cb52bd71cc41" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/jobs?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L2pvYnM/YXBpLXZlcnNpb249MjAxNS0wNi0wMS4yLjAmdGltZW91dD0zMA==", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "44886d99-3c47-40c6-8ef3-cb52bd71cc41" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "{\r\n \"odata.metadata\": \"https://pstests.eastus.batch.azure.com/$metadata#jobs\",\r\n \"value\": [\r\n {\r\n \"id\": \"updateJobTest\",\r\n \"url\": \"https://pstests.eastus.batch.azure.com/jobs/updateJobTest\",\r\n \"eTag\": \"0x8D2B86FA1D6F1EA\",\r\n \"lastModified\": \"2015-09-08T17:05:00.8760298Z\",\r\n \"creationTime\": \"2015-09-08T17:05:00.1750687Z\",\r\n \"state\": \"disabled\",\r\n \"stateTransitionTime\": \"2015-09-08T17:05:00.6823291Z\",\r\n \"previousState\": \"active\",\r\n \"previousStateTransitionTime\": \"2015-09-08T17:05:00.1941108Z\",\r\n \"priority\": 3,\r\n \"constraints\": {\r\n \"maxWallClockTime\": \"P1D\",\r\n \"maxTaskRetryCount\": 5\r\n },\r\n \"poolInfo\": {\r\n \"autoPoolSpecification\": {\r\n \"autoPoolIdPrefix\": \"TestSpecPrefix\",\r\n \"poolLifetimeOption\": \"job\",\r\n \"keepAlive\": false,\r\n \"pool\": {\r\n \"osFamily\": \"4\",\r\n \"targetOSVersion\": \"*\",\r\n \"vmSize\": \"small\",\r\n \"maxTasksPerNode\": 1,\r\n \"taskSchedulingPolicy\": {\r\n \"nodeFillType\": \"Spread\"\r\n },\r\n \"resizeTimeout\": \"PT5M\",\r\n \"targetDedicated\": 3,\r\n \"enableAutoScale\": false,\r\n \"enableInterNodeCommunication\": false,\r\n \"metadata\": [\r\n {\r\n \"name\": \"meta1\",\r\n \"value\": \"value1\"\r\n }\r\n ]\r\n }\r\n }\r\n },\r\n \"metadata\": [\r\n {\r\n \"name\": \"jobMeta1\",\r\n \"value\": \"jobValue1\"\r\n }\r\n ],\r\n \"executionInfo\": {\r\n \"startTime\": \"2015-09-08T17:05:00.1941108Z\",\r\n \"poolId\": \"TestSpecPrefix_AFE1F60C-4CDF-4183-8584-6745BB85AE4C\"\r\n }\r\n }\r\n ]\r\n}", + "ResponseHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "473bb7cb-3b3a-4c55-b04e-91eaa243645c" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "44886d99-3c47-40c6-8ef3-cb52bd71cc41" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/jobs?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L2pvYnM/YXBpLXZlcnNpb249MjAxNS0wNi0wMS4yLjAmdGltZW91dD0zMA==", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "44886d99-3c47-40c6-8ef3-cb52bd71cc41" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "{\r\n \"odata.metadata\": \"https://pstests.eastus.batch.azure.com/$metadata#jobs\",\r\n \"value\": [\r\n {\r\n \"id\": \"updateJobTest\",\r\n \"url\": \"https://pstests.eastus.batch.azure.com/jobs/updateJobTest\",\r\n \"eTag\": \"0x8D2B86FA1D6F1EA\",\r\n \"lastModified\": \"2015-09-08T17:05:00.8760298Z\",\r\n \"creationTime\": \"2015-09-08T17:05:00.1750687Z\",\r\n \"state\": \"disabled\",\r\n \"stateTransitionTime\": \"2015-09-08T17:05:00.6823291Z\",\r\n \"previousState\": \"active\",\r\n \"previousStateTransitionTime\": \"2015-09-08T17:05:00.1941108Z\",\r\n \"priority\": 3,\r\n \"constraints\": {\r\n \"maxWallClockTime\": \"P1D\",\r\n \"maxTaskRetryCount\": 5\r\n },\r\n \"poolInfo\": {\r\n \"autoPoolSpecification\": {\r\n \"autoPoolIdPrefix\": \"TestSpecPrefix\",\r\n \"poolLifetimeOption\": \"job\",\r\n \"keepAlive\": false,\r\n \"pool\": {\r\n \"osFamily\": \"4\",\r\n \"targetOSVersion\": \"*\",\r\n \"vmSize\": \"small\",\r\n \"maxTasksPerNode\": 1,\r\n \"taskSchedulingPolicy\": {\r\n \"nodeFillType\": \"Spread\"\r\n },\r\n \"resizeTimeout\": \"PT5M\",\r\n \"targetDedicated\": 3,\r\n \"enableAutoScale\": false,\r\n \"enableInterNodeCommunication\": false,\r\n \"metadata\": [\r\n {\r\n \"name\": \"meta1\",\r\n \"value\": \"value1\"\r\n }\r\n ]\r\n }\r\n }\r\n },\r\n \"metadata\": [\r\n {\r\n \"name\": \"jobMeta1\",\r\n \"value\": \"jobValue1\"\r\n }\r\n ],\r\n \"executionInfo\": {\r\n \"startTime\": \"2015-09-08T17:05:00.1941108Z\",\r\n \"poolId\": \"TestSpecPrefix_AFE1F60C-4CDF-4183-8584-6745BB85AE4C\"\r\n }\r\n }\r\n ]\r\n}", + "ResponseHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "473bb7cb-3b3a-4c55-b04e-91eaa243645c" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "44886d99-3c47-40c6-8ef3-cb52bd71cc41" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/jobs?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L2pvYnM/YXBpLXZlcnNpb249MjAxNS0wNi0wMS4yLjAmdGltZW91dD0zMA==", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "44886d99-3c47-40c6-8ef3-cb52bd71cc41" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "{\r\n \"odata.metadata\": \"https://pstests.eastus.batch.azure.com/$metadata#jobs\",\r\n \"value\": [\r\n {\r\n \"id\": \"updateJobTest\",\r\n \"url\": \"https://pstests.eastus.batch.azure.com/jobs/updateJobTest\",\r\n \"eTag\": \"0x8D2B86FA1D6F1EA\",\r\n \"lastModified\": \"2015-09-08T17:05:00.8760298Z\",\r\n \"creationTime\": \"2015-09-08T17:05:00.1750687Z\",\r\n \"state\": \"disabled\",\r\n \"stateTransitionTime\": \"2015-09-08T17:05:00.6823291Z\",\r\n \"previousState\": \"active\",\r\n \"previousStateTransitionTime\": \"2015-09-08T17:05:00.1941108Z\",\r\n \"priority\": 3,\r\n \"constraints\": {\r\n \"maxWallClockTime\": \"P1D\",\r\n \"maxTaskRetryCount\": 5\r\n },\r\n \"poolInfo\": {\r\n \"autoPoolSpecification\": {\r\n \"autoPoolIdPrefix\": \"TestSpecPrefix\",\r\n \"poolLifetimeOption\": \"job\",\r\n \"keepAlive\": false,\r\n \"pool\": {\r\n \"osFamily\": \"4\",\r\n \"targetOSVersion\": \"*\",\r\n \"vmSize\": \"small\",\r\n \"maxTasksPerNode\": 1,\r\n \"taskSchedulingPolicy\": {\r\n \"nodeFillType\": \"Spread\"\r\n },\r\n \"resizeTimeout\": \"PT5M\",\r\n \"targetDedicated\": 3,\r\n \"enableAutoScale\": false,\r\n \"enableInterNodeCommunication\": false,\r\n \"metadata\": [\r\n {\r\n \"name\": \"meta1\",\r\n \"value\": \"value1\"\r\n }\r\n ]\r\n }\r\n }\r\n },\r\n \"metadata\": [\r\n {\r\n \"name\": \"jobMeta1\",\r\n \"value\": \"jobValue1\"\r\n }\r\n ],\r\n \"executionInfo\": {\r\n \"startTime\": \"2015-09-08T17:05:00.1941108Z\",\r\n \"poolId\": \"TestSpecPrefix_AFE1F60C-4CDF-4183-8584-6745BB85AE4C\"\r\n }\r\n }\r\n ]\r\n}", + "ResponseHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "473bb7cb-3b3a-4c55-b04e-91eaa243645c" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "44886d99-3c47-40c6-8ef3-cb52bd71cc41" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/jobs/updateJobTest?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L2pvYnMvdXBkYXRlSm9iVGVzdD9hcGktdmVyc2lvbj0yMDE1LTA2LTAxLjIuMCZ0aW1lb3V0PTMw", + "RequestMethod": "DELETE", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "9dc2ddcb-a79b-4526-a8e7-9701b2d1b901" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "9544fdde-61d5-453b-ae44-dd6dbbf6fa95" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "9dc2ddcb-a79b-4526-a8e7-9701b2d1b901" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Tue, 08 Sep 2015 17:05:01 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 202 + }, + { + "RequestUri": "/jobs/updateJobTest?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L2pvYnMvdXBkYXRlSm9iVGVzdD9hcGktdmVyc2lvbj0yMDE1LTA2LTAxLjIuMCZ0aW1lb3V0PTMw", + "RequestMethod": "DELETE", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "9dc2ddcb-a79b-4526-a8e7-9701b2d1b901" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "9544fdde-61d5-453b-ae44-dd6dbbf6fa95" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "9dc2ddcb-a79b-4526-a8e7-9701b2d1b901" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Tue, 08 Sep 2015 17:05:01 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 202 + }, + { + "RequestUri": "/jobs/updateJobTest?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L2pvYnMvdXBkYXRlSm9iVGVzdD9hcGktdmVyc2lvbj0yMDE1LTA2LTAxLjIuMCZ0aW1lb3V0PTMw", + "RequestMethod": "DELETE", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "9dc2ddcb-a79b-4526-a8e7-9701b2d1b901" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "9544fdde-61d5-453b-ae44-dd6dbbf6fa95" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "9dc2ddcb-a79b-4526-a8e7-9701b2d1b901" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Tue, 08 Sep 2015 17:05:01 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 202 + }, + { + "RequestUri": "/jobs/updateJobTest?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L2pvYnMvdXBkYXRlSm9iVGVzdD9hcGktdmVyc2lvbj0yMDE1LTA2LTAxLjIuMCZ0aW1lb3V0PTMw", + "RequestMethod": "DELETE", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "9dc2ddcb-a79b-4526-a8e7-9701b2d1b901" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "9544fdde-61d5-453b-ae44-dd6dbbf6fa95" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "9dc2ddcb-a79b-4526-a8e7-9701b2d1b901" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Tue, 08 Sep 2015 17:05:01 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 202 + }, + { + "RequestUri": "/jobs/updateJobTest?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L2pvYnMvdXBkYXRlSm9iVGVzdD9hcGktdmVyc2lvbj0yMDE1LTA2LTAxLjIuMCZ0aW1lb3V0PTMw", + "RequestMethod": "DELETE", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "9dc2ddcb-a79b-4526-a8e7-9701b2d1b901" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "9544fdde-61d5-453b-ae44-dd6dbbf6fa95" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "9dc2ddcb-a79b-4526-a8e7-9701b2d1b901" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Tue, 08 Sep 2015 17:05:01 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 202 + }, + { + "RequestUri": "/jobs/updateJobTest?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L2pvYnMvdXBkYXRlSm9iVGVzdD9hcGktdmVyc2lvbj0yMDE1LTA2LTAxLjIuMCZ0aW1lb3V0PTMw", + "RequestMethod": "DELETE", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "9dc2ddcb-a79b-4526-a8e7-9701b2d1b901" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "9544fdde-61d5-453b-ae44-dd6dbbf6fa95" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "9dc2ddcb-a79b-4526-a8e7-9701b2d1b901" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Tue, 08 Sep 2015 17:05:01 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 202 + }, + { + "RequestUri": "/pools?$filter=startswith(id%2C'TestSpecPrefix')&api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L3Bvb2xzPyRmaWx0ZXI9c3RhcnRzd2l0aCUyOGlkJTJDJTI3VGVzdFNwZWNQcmVmaXglMjclMjkmYXBpLXZlcnNpb249MjAxNS0wNi0wMS4yLjAmdGltZW91dD0zMA==", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "5e207251-c88c-4513-b0d3-2e28885806d8" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "{\r\n \"odata.metadata\": \"https://pstests.eastus.batch.azure.com/$metadata#pools\",\r\n \"value\": [\r\n {\r\n \"id\": \"TestSpecPrefix_AFE1F60C-4CDF-4183-8584-6745BB85AE4C\",\r\n \"url\": \"https://pstests.eastus.batch.azure.com/pools/TestSpecPrefix_AFE1F60C-4CDF-4183-8584-6745BB85AE4C\",\r\n \"eTag\": \"0x8D2B86FA13FE576\",\r\n \"lastModified\": \"2015-09-08T17:04:59.8861174Z\",\r\n \"creationTime\": \"2015-09-08T17:04:59.8861174Z\",\r\n \"state\": \"active\",\r\n \"stateTransitionTime\": \"2015-09-08T17:04:59.8861174Z\",\r\n \"allocationState\": \"resizing\",\r\n \"allocationStateTransitionTime\": \"2015-09-08T17:04:59.8861174Z\",\r\n \"osFamily\": \"4\",\r\n \"targetOSVersion\": \"*\",\r\n \"currentOSVersion\": \"*\",\r\n \"vmSize\": \"small\",\r\n \"resizeTimeout\": \"PT5M\",\r\n \"currentDedicated\": 0,\r\n \"targetDedicated\": 3,\r\n \"enableAutoScale\": false,\r\n \"enableInterNodeCommunication\": false,\r\n \"metadata\": [\r\n {\r\n \"name\": \"meta1\",\r\n \"value\": \"value1\"\r\n }\r\n ],\r\n \"maxTasksPerNode\": 1,\r\n \"taskSchedulingPolicy\": {\r\n \"nodeFillType\": \"Spread\"\r\n }\r\n }\r\n ]\r\n}", + "ResponseHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "7f60428f-12c0-46a7-9681-d66b8a6d3a91" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "5e207251-c88c-4513-b0d3-2e28885806d8" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Tue, 08 Sep 2015 17:05:01 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/pools?$filter=startswith(id%2C'TestSpecPrefix')&api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L3Bvb2xzPyRmaWx0ZXI9c3RhcnRzd2l0aCUyOGlkJTJDJTI3VGVzdFNwZWNQcmVmaXglMjclMjkmYXBpLXZlcnNpb249MjAxNS0wNi0wMS4yLjAmdGltZW91dD0zMA==", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "5e207251-c88c-4513-b0d3-2e28885806d8" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "{\r\n \"odata.metadata\": \"https://pstests.eastus.batch.azure.com/$metadata#pools\",\r\n \"value\": [\r\n {\r\n \"id\": \"TestSpecPrefix_AFE1F60C-4CDF-4183-8584-6745BB85AE4C\",\r\n \"url\": \"https://pstests.eastus.batch.azure.com/pools/TestSpecPrefix_AFE1F60C-4CDF-4183-8584-6745BB85AE4C\",\r\n \"eTag\": \"0x8D2B86FA13FE576\",\r\n \"lastModified\": \"2015-09-08T17:04:59.8861174Z\",\r\n \"creationTime\": \"2015-09-08T17:04:59.8861174Z\",\r\n \"state\": \"active\",\r\n \"stateTransitionTime\": \"2015-09-08T17:04:59.8861174Z\",\r\n \"allocationState\": \"resizing\",\r\n \"allocationStateTransitionTime\": \"2015-09-08T17:04:59.8861174Z\",\r\n \"osFamily\": \"4\",\r\n \"targetOSVersion\": \"*\",\r\n \"currentOSVersion\": \"*\",\r\n \"vmSize\": \"small\",\r\n \"resizeTimeout\": \"PT5M\",\r\n \"currentDedicated\": 0,\r\n \"targetDedicated\": 3,\r\n \"enableAutoScale\": false,\r\n \"enableInterNodeCommunication\": false,\r\n \"metadata\": [\r\n {\r\n \"name\": \"meta1\",\r\n \"value\": \"value1\"\r\n }\r\n ],\r\n \"maxTasksPerNode\": 1,\r\n \"taskSchedulingPolicy\": {\r\n \"nodeFillType\": \"Spread\"\r\n }\r\n }\r\n ]\r\n}", + "ResponseHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "7f60428f-12c0-46a7-9681-d66b8a6d3a91" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "5e207251-c88c-4513-b0d3-2e28885806d8" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Tue, 08 Sep 2015 17:05:01 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/pools?$filter=startswith(id%2C'TestSpecPrefix')&api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L3Bvb2xzPyRmaWx0ZXI9c3RhcnRzd2l0aCUyOGlkJTJDJTI3VGVzdFNwZWNQcmVmaXglMjclMjkmYXBpLXZlcnNpb249MjAxNS0wNi0wMS4yLjAmdGltZW91dD0zMA==", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "5e207251-c88c-4513-b0d3-2e28885806d8" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "{\r\n \"odata.metadata\": \"https://pstests.eastus.batch.azure.com/$metadata#pools\",\r\n \"value\": [\r\n {\r\n \"id\": \"TestSpecPrefix_AFE1F60C-4CDF-4183-8584-6745BB85AE4C\",\r\n \"url\": \"https://pstests.eastus.batch.azure.com/pools/TestSpecPrefix_AFE1F60C-4CDF-4183-8584-6745BB85AE4C\",\r\n \"eTag\": \"0x8D2B86FA13FE576\",\r\n \"lastModified\": \"2015-09-08T17:04:59.8861174Z\",\r\n \"creationTime\": \"2015-09-08T17:04:59.8861174Z\",\r\n \"state\": \"active\",\r\n \"stateTransitionTime\": \"2015-09-08T17:04:59.8861174Z\",\r\n \"allocationState\": \"resizing\",\r\n \"allocationStateTransitionTime\": \"2015-09-08T17:04:59.8861174Z\",\r\n \"osFamily\": \"4\",\r\n \"targetOSVersion\": \"*\",\r\n \"currentOSVersion\": \"*\",\r\n \"vmSize\": \"small\",\r\n \"resizeTimeout\": \"PT5M\",\r\n \"currentDedicated\": 0,\r\n \"targetDedicated\": 3,\r\n \"enableAutoScale\": false,\r\n \"enableInterNodeCommunication\": false,\r\n \"metadata\": [\r\n {\r\n \"name\": \"meta1\",\r\n \"value\": \"value1\"\r\n }\r\n ],\r\n \"maxTasksPerNode\": 1,\r\n \"taskSchedulingPolicy\": {\r\n \"nodeFillType\": \"Spread\"\r\n }\r\n }\r\n ]\r\n}", + "ResponseHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "7f60428f-12c0-46a7-9681-d66b8a6d3a91" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "5e207251-c88c-4513-b0d3-2e28885806d8" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Tue, 08 Sep 2015 17:05:01 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/pools?$filter=startswith(id%2C'TestSpecPrefix')&api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L3Bvb2xzPyRmaWx0ZXI9c3RhcnRzd2l0aCUyOGlkJTJDJTI3VGVzdFNwZWNQcmVmaXglMjclMjkmYXBpLXZlcnNpb249MjAxNS0wNi0wMS4yLjAmdGltZW91dD0zMA==", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "5e207251-c88c-4513-b0d3-2e28885806d8" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "{\r\n \"odata.metadata\": \"https://pstests.eastus.batch.azure.com/$metadata#pools\",\r\n \"value\": [\r\n {\r\n \"id\": \"TestSpecPrefix_AFE1F60C-4CDF-4183-8584-6745BB85AE4C\",\r\n \"url\": \"https://pstests.eastus.batch.azure.com/pools/TestSpecPrefix_AFE1F60C-4CDF-4183-8584-6745BB85AE4C\",\r\n \"eTag\": \"0x8D2B86FA13FE576\",\r\n \"lastModified\": \"2015-09-08T17:04:59.8861174Z\",\r\n \"creationTime\": \"2015-09-08T17:04:59.8861174Z\",\r\n \"state\": \"active\",\r\n \"stateTransitionTime\": \"2015-09-08T17:04:59.8861174Z\",\r\n \"allocationState\": \"resizing\",\r\n \"allocationStateTransitionTime\": \"2015-09-08T17:04:59.8861174Z\",\r\n \"osFamily\": \"4\",\r\n \"targetOSVersion\": \"*\",\r\n \"currentOSVersion\": \"*\",\r\n \"vmSize\": \"small\",\r\n \"resizeTimeout\": \"PT5M\",\r\n \"currentDedicated\": 0,\r\n \"targetDedicated\": 3,\r\n \"enableAutoScale\": false,\r\n \"enableInterNodeCommunication\": false,\r\n \"metadata\": [\r\n {\r\n \"name\": \"meta1\",\r\n \"value\": \"value1\"\r\n }\r\n ],\r\n \"maxTasksPerNode\": 1,\r\n \"taskSchedulingPolicy\": {\r\n \"nodeFillType\": \"Spread\"\r\n }\r\n }\r\n ]\r\n}", + "ResponseHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "7f60428f-12c0-46a7-9681-d66b8a6d3a91" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "5e207251-c88c-4513-b0d3-2e28885806d8" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Tue, 08 Sep 2015 17:05:01 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/pools?$filter=startswith(id%2C'TestSpecPrefix')&api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L3Bvb2xzPyRmaWx0ZXI9c3RhcnRzd2l0aCUyOGlkJTJDJTI3VGVzdFNwZWNQcmVmaXglMjclMjkmYXBpLXZlcnNpb249MjAxNS0wNi0wMS4yLjAmdGltZW91dD0zMA==", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "5e207251-c88c-4513-b0d3-2e28885806d8" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "{\r\n \"odata.metadata\": \"https://pstests.eastus.batch.azure.com/$metadata#pools\",\r\n \"value\": [\r\n {\r\n \"id\": \"TestSpecPrefix_AFE1F60C-4CDF-4183-8584-6745BB85AE4C\",\r\n \"url\": \"https://pstests.eastus.batch.azure.com/pools/TestSpecPrefix_AFE1F60C-4CDF-4183-8584-6745BB85AE4C\",\r\n \"eTag\": \"0x8D2B86FA13FE576\",\r\n \"lastModified\": \"2015-09-08T17:04:59.8861174Z\",\r\n \"creationTime\": \"2015-09-08T17:04:59.8861174Z\",\r\n \"state\": \"active\",\r\n \"stateTransitionTime\": \"2015-09-08T17:04:59.8861174Z\",\r\n \"allocationState\": \"resizing\",\r\n \"allocationStateTransitionTime\": \"2015-09-08T17:04:59.8861174Z\",\r\n \"osFamily\": \"4\",\r\n \"targetOSVersion\": \"*\",\r\n \"currentOSVersion\": \"*\",\r\n \"vmSize\": \"small\",\r\n \"resizeTimeout\": \"PT5M\",\r\n \"currentDedicated\": 0,\r\n \"targetDedicated\": 3,\r\n \"enableAutoScale\": false,\r\n \"enableInterNodeCommunication\": false,\r\n \"metadata\": [\r\n {\r\n \"name\": \"meta1\",\r\n \"value\": \"value1\"\r\n }\r\n ],\r\n \"maxTasksPerNode\": 1,\r\n \"taskSchedulingPolicy\": {\r\n \"nodeFillType\": \"Spread\"\r\n }\r\n }\r\n ]\r\n}", + "ResponseHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "7f60428f-12c0-46a7-9681-d66b8a6d3a91" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "5e207251-c88c-4513-b0d3-2e28885806d8" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Tue, 08 Sep 2015 17:05:01 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/pools?$filter=startswith(id%2C'TestSpecPrefix')&api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L3Bvb2xzPyRmaWx0ZXI9c3RhcnRzd2l0aCUyOGlkJTJDJTI3VGVzdFNwZWNQcmVmaXglMjclMjkmYXBpLXZlcnNpb249MjAxNS0wNi0wMS4yLjAmdGltZW91dD0zMA==", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "5e207251-c88c-4513-b0d3-2e28885806d8" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "{\r\n \"odata.metadata\": \"https://pstests.eastus.batch.azure.com/$metadata#pools\",\r\n \"value\": [\r\n {\r\n \"id\": \"TestSpecPrefix_AFE1F60C-4CDF-4183-8584-6745BB85AE4C\",\r\n \"url\": \"https://pstests.eastus.batch.azure.com/pools/TestSpecPrefix_AFE1F60C-4CDF-4183-8584-6745BB85AE4C\",\r\n \"eTag\": \"0x8D2B86FA13FE576\",\r\n \"lastModified\": \"2015-09-08T17:04:59.8861174Z\",\r\n \"creationTime\": \"2015-09-08T17:04:59.8861174Z\",\r\n \"state\": \"active\",\r\n \"stateTransitionTime\": \"2015-09-08T17:04:59.8861174Z\",\r\n \"allocationState\": \"resizing\",\r\n \"allocationStateTransitionTime\": \"2015-09-08T17:04:59.8861174Z\",\r\n \"osFamily\": \"4\",\r\n \"targetOSVersion\": \"*\",\r\n \"currentOSVersion\": \"*\",\r\n \"vmSize\": \"small\",\r\n \"resizeTimeout\": \"PT5M\",\r\n \"currentDedicated\": 0,\r\n \"targetDedicated\": 3,\r\n \"enableAutoScale\": false,\r\n \"enableInterNodeCommunication\": false,\r\n \"metadata\": [\r\n {\r\n \"name\": \"meta1\",\r\n \"value\": \"value1\"\r\n }\r\n ],\r\n \"maxTasksPerNode\": 1,\r\n \"taskSchedulingPolicy\": {\r\n \"nodeFillType\": \"Spread\"\r\n }\r\n }\r\n ]\r\n}", + "ResponseHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "7f60428f-12c0-46a7-9681-d66b8a6d3a91" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "5e207251-c88c-4513-b0d3-2e28885806d8" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Tue, 08 Sep 2015 17:05:01 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/pools?$filter=startswith(id%2C'TestSpecPrefix')&api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L3Bvb2xzPyRmaWx0ZXI9c3RhcnRzd2l0aCUyOGlkJTJDJTI3VGVzdFNwZWNQcmVmaXglMjclMjkmYXBpLXZlcnNpb249MjAxNS0wNi0wMS4yLjAmdGltZW91dD0zMA==", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "5e207251-c88c-4513-b0d3-2e28885806d8" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "{\r\n \"odata.metadata\": \"https://pstests.eastus.batch.azure.com/$metadata#pools\",\r\n \"value\": [\r\n {\r\n \"id\": \"TestSpecPrefix_AFE1F60C-4CDF-4183-8584-6745BB85AE4C\",\r\n \"url\": \"https://pstests.eastus.batch.azure.com/pools/TestSpecPrefix_AFE1F60C-4CDF-4183-8584-6745BB85AE4C\",\r\n \"eTag\": \"0x8D2B86FA13FE576\",\r\n \"lastModified\": \"2015-09-08T17:04:59.8861174Z\",\r\n \"creationTime\": \"2015-09-08T17:04:59.8861174Z\",\r\n \"state\": \"active\",\r\n \"stateTransitionTime\": \"2015-09-08T17:04:59.8861174Z\",\r\n \"allocationState\": \"resizing\",\r\n \"allocationStateTransitionTime\": \"2015-09-08T17:04:59.8861174Z\",\r\n \"osFamily\": \"4\",\r\n \"targetOSVersion\": \"*\",\r\n \"currentOSVersion\": \"*\",\r\n \"vmSize\": \"small\",\r\n \"resizeTimeout\": \"PT5M\",\r\n \"currentDedicated\": 0,\r\n \"targetDedicated\": 3,\r\n \"enableAutoScale\": false,\r\n \"enableInterNodeCommunication\": false,\r\n \"metadata\": [\r\n {\r\n \"name\": \"meta1\",\r\n \"value\": \"value1\"\r\n }\r\n ],\r\n \"maxTasksPerNode\": 1,\r\n \"taskSchedulingPolicy\": {\r\n \"nodeFillType\": \"Spread\"\r\n }\r\n }\r\n ]\r\n}", + "ResponseHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "7f60428f-12c0-46a7-9681-d66b8a6d3a91" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "5e207251-c88c-4513-b0d3-2e28885806d8" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Tue, 08 Sep 2015 17:05:01 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/pools/TestSpecPrefix_AFE1F60C-4CDF-4183-8584-6745BB85AE4C?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L3Bvb2xzL1Rlc3RTcGVjUHJlZml4X0FGRTFGNjBDLTRDREYtNDE4My04NTg0LTY3NDVCQjg1QUU0Qz9hcGktdmVyc2lvbj0yMDE1LTA2LTAxLjIuMCZ0aW1lb3V0PTMw", + "RequestMethod": "DELETE", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "08588cbb-fe11-470f-bdde-1bbb7c21674b" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "4c8b95f7-1aa5-46a7-a37b-60636d8452cf" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "08588cbb-fe11-470f-bdde-1bbb7c21674b" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Tue, 08 Sep 2015 17:05:01 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 202 + }, + { + "RequestUri": "/pools/TestSpecPrefix_AFE1F60C-4CDF-4183-8584-6745BB85AE4C?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L3Bvb2xzL1Rlc3RTcGVjUHJlZml4X0FGRTFGNjBDLTRDREYtNDE4My04NTg0LTY3NDVCQjg1QUU0Qz9hcGktdmVyc2lvbj0yMDE1LTA2LTAxLjIuMCZ0aW1lb3V0PTMw", + "RequestMethod": "DELETE", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "08588cbb-fe11-470f-bdde-1bbb7c21674b" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "4c8b95f7-1aa5-46a7-a37b-60636d8452cf" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "08588cbb-fe11-470f-bdde-1bbb7c21674b" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Tue, 08 Sep 2015 17:05:01 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 202 + }, + { + "RequestUri": "/pools/TestSpecPrefix_AFE1F60C-4CDF-4183-8584-6745BB85AE4C?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L3Bvb2xzL1Rlc3RTcGVjUHJlZml4X0FGRTFGNjBDLTRDREYtNDE4My04NTg0LTY3NDVCQjg1QUU0Qz9hcGktdmVyc2lvbj0yMDE1LTA2LTAxLjIuMCZ0aW1lb3V0PTMw", + "RequestMethod": "DELETE", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "08588cbb-fe11-470f-bdde-1bbb7c21674b" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "4c8b95f7-1aa5-46a7-a37b-60636d8452cf" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "08588cbb-fe11-470f-bdde-1bbb7c21674b" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Tue, 08 Sep 2015 17:05:01 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 202 + }, + { + "RequestUri": "/pools/TestSpecPrefix_AFE1F60C-4CDF-4183-8584-6745BB85AE4C?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L3Bvb2xzL1Rlc3RTcGVjUHJlZml4X0FGRTFGNjBDLTRDREYtNDE4My04NTg0LTY3NDVCQjg1QUU0Qz9hcGktdmVyc2lvbj0yMDE1LTA2LTAxLjIuMCZ0aW1lb3V0PTMw", + "RequestMethod": "DELETE", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "08588cbb-fe11-470f-bdde-1bbb7c21674b" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "4c8b95f7-1aa5-46a7-a37b-60636d8452cf" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "08588cbb-fe11-470f-bdde-1bbb7c21674b" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Tue, 08 Sep 2015 17:05:01 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 202 + }, + { + "RequestUri": "/pools/TestSpecPrefix_AFE1F60C-4CDF-4183-8584-6745BB85AE4C?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L3Bvb2xzL1Rlc3RTcGVjUHJlZml4X0FGRTFGNjBDLTRDREYtNDE4My04NTg0LTY3NDVCQjg1QUU0Qz9hcGktdmVyc2lvbj0yMDE1LTA2LTAxLjIuMCZ0aW1lb3V0PTMw", + "RequestMethod": "DELETE", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "08588cbb-fe11-470f-bdde-1bbb7c21674b" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "4c8b95f7-1aa5-46a7-a37b-60636d8452cf" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "08588cbb-fe11-470f-bdde-1bbb7c21674b" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Tue, 08 Sep 2015 17:05:01 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 202 + }, + { + "RequestUri": "/pools/TestSpecPrefix_AFE1F60C-4CDF-4183-8584-6745BB85AE4C?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L3Bvb2xzL1Rlc3RTcGVjUHJlZml4X0FGRTFGNjBDLTRDREYtNDE4My04NTg0LTY3NDVCQjg1QUU0Qz9hcGktdmVyc2lvbj0yMDE1LTA2LTAxLjIuMCZ0aW1lb3V0PTMw", + "RequestMethod": "DELETE", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "08588cbb-fe11-470f-bdde-1bbb7c21674b" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "4c8b95f7-1aa5-46a7-a37b-60636d8452cf" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "08588cbb-fe11-470f-bdde-1bbb7c21674b" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Tue, 08 Sep 2015 17:05:01 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 202 + }, + { + "RequestUri": "/pools/TestSpecPrefix_AFE1F60C-4CDF-4183-8584-6745BB85AE4C?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L3Bvb2xzL1Rlc3RTcGVjUHJlZml4X0FGRTFGNjBDLTRDREYtNDE4My04NTg0LTY3NDVCQjg1QUU0Qz9hcGktdmVyc2lvbj0yMDE1LTA2LTAxLjIuMCZ0aW1lb3V0PTMw", + "RequestMethod": "DELETE", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "08588cbb-fe11-470f-bdde-1bbb7c21674b" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "4c8b95f7-1aa5-46a7-a37b-60636d8452cf" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "08588cbb-fe11-470f-bdde-1bbb7c21674b" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Tue, 08 Sep 2015 17:05:01 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 202 + }, + { + "RequestUri": "/pools/TestSpecPrefix_AFE1F60C-4CDF-4183-8584-6745BB85AE4C?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L3Bvb2xzL1Rlc3RTcGVjUHJlZml4X0FGRTFGNjBDLTRDREYtNDE4My04NTg0LTY3NDVCQjg1QUU0Qz9hcGktdmVyc2lvbj0yMDE1LTA2LTAxLjIuMCZ0aW1lb3V0PTMw", + "RequestMethod": "DELETE", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "08588cbb-fe11-470f-bdde-1bbb7c21674b" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 17:05:00 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "4c8b95f7-1aa5-46a7-a37b-60636d8452cf" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "08588cbb-fe11-470f-bdde-1bbb7c21674b" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Tue, 08 Sep 2015 17:05:01 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 202 + } + ], + "Names": {}, + "Variables": { + "SubscriptionId": "6368ed38-3570-481f-b4fa-1d0a6e8d3f3b" + } +} \ No newline at end of file diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/SessionRecords/Microsoft.Azure.Commands.Batch.Test.ScenarioTests.PoolTests/TestUpdatePool.json b/src/ResourceManager/AzureBatch/Commands.Batch.Test/SessionRecords/Microsoft.Azure.Commands.Batch.Test.ScenarioTests.PoolTests/TestUpdatePool.json new file mode 100644 index 000000000000..0bccf8a0dc23 --- /dev/null +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/SessionRecords/Microsoft.Azure.Commands.Batch.Test.ScenarioTests.PoolTests/TestUpdatePool.json @@ -0,0 +1,842 @@ +{ + "Entries": [ + { + "RequestUri": "/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resources?$filter=resourceType%20eq%20'Microsoft.Batch%2FbatchAccounts'&api-version=2014-04-01-preview", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNjM2OGVkMzgtMzU3MC00ODFmLWI0ZmEtMWQwYTZlOGQzZjNiL3Jlc291cmNlcz8kZmlsdGVyPXJlc291cmNlVHlwZSUyMGVxJTIwJ01pY3Jvc29mdC5CYXRjaCUyRmJhdGNoQWNjb3VudHMnJmFwaS12ZXJzaW9uPTIwMTQtMDQtMDEtcHJldmlldw==", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "User-Agent": [ + "Microsoft.Azure.Management.Resources.ResourceManagementClient/2.0.0.0" + ] + }, + "ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"id\": \"/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resourceGroups/default-azurebatch-eastus/providers/Microsoft.Batch/batchAccounts/pstests\",\r\n \"name\": \"pstests\",\r\n \"type\": \"Microsoft.Batch/batchAccounts\",\r\n \"location\": \"eastus\"\r\n },\r\n {\r\n \"id\": \"/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resourceGroups/Default-AzureBatch-WestUS/providers/Microsoft.Batch/batchAccounts/jaschneibatchtest\",\r\n \"name\": \"jaschneibatchtest\",\r\n \"type\": \"Microsoft.Batch/batchAccounts\",\r\n \"location\": \"westus\"\r\n }\r\n ]\r\n}", + "ResponseHeaders": { + "Content-Length": [ + "483" + ], + "Content-Type": [ + "application/json; charset=utf-8" + ], + "Expires": [ + "-1" + ], + "Pragma": [ + "no-cache" + ], + "x-ms-ratelimit-remaining-subscription-reads": [ + "14981" + ], + "x-ms-request-id": [ + "5940b3fd-364f-49b4-858e-891f6ab931d3" + ], + "x-ms-correlation-request-id": [ + "5940b3fd-364f-49b4-858e-891f6ab931d3" + ], + "x-ms-routing-request-id": [ + "WESTUS:20150908T173605Z:5940b3fd-364f-49b4-858e-891f6ab931d3" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "Cache-Control": [ + "no-cache" + ], + "Date": [ + "Tue, 08 Sep 2015 17:36:05 GMT" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resources?$filter=resourceType%20eq%20'Microsoft.Batch%2FbatchAccounts'&api-version=2014-04-01-preview", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNjM2OGVkMzgtMzU3MC00ODFmLWI0ZmEtMWQwYTZlOGQzZjNiL3Jlc291cmNlcz8kZmlsdGVyPXJlc291cmNlVHlwZSUyMGVxJTIwJ01pY3Jvc29mdC5CYXRjaCUyRmJhdGNoQWNjb3VudHMnJmFwaS12ZXJzaW9uPTIwMTQtMDQtMDEtcHJldmlldw==", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "User-Agent": [ + "Microsoft.Azure.Management.Resources.ResourceManagementClient/2.0.0.0" + ] + }, + "ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"id\": \"/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resourceGroups/default-azurebatch-eastus/providers/Microsoft.Batch/batchAccounts/pstests\",\r\n \"name\": \"pstests\",\r\n \"type\": \"Microsoft.Batch/batchAccounts\",\r\n \"location\": \"eastus\"\r\n },\r\n {\r\n \"id\": \"/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resourceGroups/Default-AzureBatch-WestUS/providers/Microsoft.Batch/batchAccounts/jaschneibatchtest\",\r\n \"name\": \"jaschneibatchtest\",\r\n \"type\": \"Microsoft.Batch/batchAccounts\",\r\n \"location\": \"westus\"\r\n }\r\n ]\r\n}", + "ResponseHeaders": { + "Content-Length": [ + "483" + ], + "Content-Type": [ + "application/json; charset=utf-8" + ], + "Expires": [ + "-1" + ], + "Pragma": [ + "no-cache" + ], + "x-ms-ratelimit-remaining-subscription-reads": [ + "14980" + ], + "x-ms-request-id": [ + "5de7aba1-6ace-4794-983c-412c34f145ff" + ], + "x-ms-correlation-request-id": [ + "5de7aba1-6ace-4794-983c-412c34f145ff" + ], + "x-ms-routing-request-id": [ + "WESTUS:20150908T173608Z:5de7aba1-6ace-4794-983c-412c34f145ff" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "Cache-Control": [ + "no-cache" + ], + "Date": [ + "Tue, 08 Sep 2015 17:36:07 GMT" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resourceGroups/default-azurebatch-eastus/providers/Microsoft.Batch/batchAccounts/pstests?api-version=2015-07-01", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNjM2OGVkMzgtMzU3MC00ODFmLWI0ZmEtMWQwYTZlOGQzZjNiL3Jlc291cmNlR3JvdXBzL2RlZmF1bHQtYXp1cmViYXRjaC1lYXN0dXMvcHJvdmlkZXJzL01pY3Jvc29mdC5CYXRjaC9iYXRjaEFjY291bnRzL3BzdGVzdHM/YXBpLXZlcnNpb249MjAxNS0wNy0wMQ==", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "x-ms-version": [ + "2015-07-01" + ], + "User-Agent": [ + "Microsoft.Azure.Management.Batch.BatchManagementClient/1.0.0.0" + ] + }, + "ResponseBody": "{\r\n \"name\": \"pstests\",\r\n \"location\": \"eastus\",\r\n \"properties\": {\r\n \"accountEndpoint\": \"pstests.eastus.batch.azure.com\",\r\n \"provisioningState\": \"Succeeded\"\r\n },\r\n \"id\": \"/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resourceGroups/default-azurebatch-eastus/providers/Microsoft.Batch/batchAccounts/pstests\",\r\n \"type\": \"Microsoft.Batch/batchAccounts\"\r\n}", + "ResponseHeaders": { + "Content-Length": [ + "323" + ], + "Content-Type": [ + "application/json; charset=utf-8" + ], + "Expires": [ + "-1" + ], + "Last-Modified": [ + "Tue, 08 Sep 2015 17:36:07 GMT" + ], + "Pragma": [ + "no-cache" + ], + "request-id": [ + "c2faa69a-39e6-448d-bba1-f1e59e7fd390" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "x-ms-ratelimit-remaining-subscription-reads": [ + "14983" + ], + "x-ms-request-id": [ + "ed88c0ea-d566-447b-a76d-7fafe27af55e" + ], + "x-ms-correlation-request-id": [ + "ed88c0ea-d566-447b-a76d-7fafe27af55e" + ], + "x-ms-routing-request-id": [ + "WESTUS:20150908T173607Z:ed88c0ea-d566-447b-a76d-7fafe27af55e" + ], + "Cache-Control": [ + "no-cache" + ], + "Date": [ + "Tue, 08 Sep 2015 17:36:06 GMT" + ], + "ETag": [ + "0x8D2B873FA6BCD1C" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resourceGroups/default-azurebatch-eastus/providers/Microsoft.Batch/batchAccounts/pstests?api-version=2015-07-01", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNjM2OGVkMzgtMzU3MC00ODFmLWI0ZmEtMWQwYTZlOGQzZjNiL3Jlc291cmNlR3JvdXBzL2RlZmF1bHQtYXp1cmViYXRjaC1lYXN0dXMvcHJvdmlkZXJzL01pY3Jvc29mdC5CYXRjaC9iYXRjaEFjY291bnRzL3BzdGVzdHM/YXBpLXZlcnNpb249MjAxNS0wNy0wMQ==", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "x-ms-version": [ + "2015-07-01" + ], + "User-Agent": [ + "Microsoft.Azure.Management.Batch.BatchManagementClient/1.0.0.0" + ] + }, + "ResponseBody": "{\r\n \"name\": \"pstests\",\r\n \"location\": \"eastus\",\r\n \"properties\": {\r\n \"accountEndpoint\": \"pstests.eastus.batch.azure.com\",\r\n \"provisioningState\": \"Succeeded\"\r\n },\r\n \"id\": \"/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resourceGroups/default-azurebatch-eastus/providers/Microsoft.Batch/batchAccounts/pstests\",\r\n \"type\": \"Microsoft.Batch/batchAccounts\"\r\n}", + "ResponseHeaders": { + "Content-Length": [ + "323" + ], + "Content-Type": [ + "application/json; charset=utf-8" + ], + "Expires": [ + "-1" + ], + "Last-Modified": [ + "Tue, 08 Sep 2015 17:36:09 GMT" + ], + "Pragma": [ + "no-cache" + ], + "request-id": [ + "1fb1bd6f-c831-4a06-8a1b-9d2e39cd7c52" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "x-ms-ratelimit-remaining-subscription-reads": [ + "14982" + ], + "x-ms-request-id": [ + "afe7048f-ebb4-4751-9e23-b23e9011190e" + ], + "x-ms-correlation-request-id": [ + "afe7048f-ebb4-4751-9e23-b23e9011190e" + ], + "x-ms-routing-request-id": [ + "WESTUS:20150908T173608Z:afe7048f-ebb4-4751-9e23-b23e9011190e" + ], + "Cache-Control": [ + "no-cache" + ], + "Date": [ + "Tue, 08 Sep 2015 17:36:08 GMT" + ], + "ETag": [ + "0x8D2B873FB5978A4" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resourceGroups/default-azurebatch-eastus/providers/Microsoft.Batch/batchAccounts/pstests/listKeys?api-version=2015-07-01", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNjM2OGVkMzgtMzU3MC00ODFmLWI0ZmEtMWQwYTZlOGQzZjNiL3Jlc291cmNlR3JvdXBzL2RlZmF1bHQtYXp1cmViYXRjaC1lYXN0dXMvcHJvdmlkZXJzL01pY3Jvc29mdC5CYXRjaC9iYXRjaEFjY291bnRzL3BzdGVzdHMvbGlzdEtleXM/YXBpLXZlcnNpb249MjAxNS0wNy0wMQ==", + "RequestMethod": "POST", + "RequestBody": "", + "RequestHeaders": { + "x-ms-version": [ + "2015-07-01" + ], + "User-Agent": [ + "Microsoft.Azure.Management.Batch.BatchManagementClient/1.0.0.0" + ] + }, + "ResponseBody": "{\r\n \"accountName\": \"pstests\",\r\n \"primary\": \"XXFZ+jAijJoB8YsqvHU7t0es8xUSVpgCoQ2sK1MxOWPFiMkBl1NhQ2TdzkmA9dH3YfXTaE26kMRRvYG1gax9gw==\",\r\n \"secondary\": \"Wk38jkxm7UKVR3Yp7x5IhHvPdLuzOEwVEXlwrF9DvTp0YhkP8zvG0Kc0BM4kMJP0wu9IEOHMwklmykjgikTchg==\"\r\n}", + "ResponseHeaders": { + "Content-Length": [ + "229" + ], + "Content-Type": [ + "application/json; charset=utf-8" + ], + "Expires": [ + "-1" + ], + "Pragma": [ + "no-cache" + ], + "request-id": [ + "0f79a991-8f22-41c0-869a-dee79fb1f8bf" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "x-ms-ratelimit-remaining-subscription-writes": [ + "1199" + ], + "x-ms-request-id": [ + "092d9fd6-fd1e-481b-876e-617ca9a34b9b" + ], + "x-ms-correlation-request-id": [ + "092d9fd6-fd1e-481b-876e-617ca9a34b9b" + ], + "x-ms-routing-request-id": [ + "WESTUS:20150908T173607Z:092d9fd6-fd1e-481b-876e-617ca9a34b9b" + ], + "Cache-Control": [ + "no-cache" + ], + "Date": [ + "Tue, 08 Sep 2015 17:36:06 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resourceGroups/default-azurebatch-eastus/providers/Microsoft.Batch/batchAccounts/pstests/listKeys?api-version=2015-07-01", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNjM2OGVkMzgtMzU3MC00ODFmLWI0ZmEtMWQwYTZlOGQzZjNiL3Jlc291cmNlR3JvdXBzL2RlZmF1bHQtYXp1cmViYXRjaC1lYXN0dXMvcHJvdmlkZXJzL01pY3Jvc29mdC5CYXRjaC9iYXRjaEFjY291bnRzL3BzdGVzdHMvbGlzdEtleXM/YXBpLXZlcnNpb249MjAxNS0wNy0wMQ==", + "RequestMethod": "POST", + "RequestBody": "", + "RequestHeaders": { + "x-ms-version": [ + "2015-07-01" + ], + "User-Agent": [ + "Microsoft.Azure.Management.Batch.BatchManagementClient/1.0.0.0" + ] + }, + "ResponseBody": "{\r\n \"accountName\": \"pstests\",\r\n \"primary\": \"XXFZ+jAijJoB8YsqvHU7t0es8xUSVpgCoQ2sK1MxOWPFiMkBl1NhQ2TdzkmA9dH3YfXTaE26kMRRvYG1gax9gw==\",\r\n \"secondary\": \"Wk38jkxm7UKVR3Yp7x5IhHvPdLuzOEwVEXlwrF9DvTp0YhkP8zvG0Kc0BM4kMJP0wu9IEOHMwklmykjgikTchg==\"\r\n}", + "ResponseHeaders": { + "Content-Length": [ + "229" + ], + "Content-Type": [ + "application/json; charset=utf-8" + ], + "Expires": [ + "-1" + ], + "Pragma": [ + "no-cache" + ], + "request-id": [ + "9fb6e29f-ea2e-4e1a-81b3-07ec9978fbab" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "x-ms-ratelimit-remaining-subscription-writes": [ + "1198" + ], + "x-ms-request-id": [ + "45e6a890-e1e9-4a24-aa7c-4c523808d7fb" + ], + "x-ms-correlation-request-id": [ + "45e6a890-e1e9-4a24-aa7c-4c523808d7fb" + ], + "x-ms-routing-request-id": [ + "WESTUS:20150908T173609Z:45e6a890-e1e9-4a24-aa7c-4c523808d7fb" + ], + "Cache-Control": [ + "no-cache" + ], + "Date": [ + "Tue, 08 Sep 2015 17:36:08 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/pools?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L3Bvb2xzP2FwaS12ZXJzaW9uPTIwMTUtMDYtMDEuMi4wJnRpbWVvdXQ9MzA=", + "RequestMethod": "POST", + "RequestBody": "{\r\n \"id\": \"testUpdate\",\r\n \"vmSize\": \"small\",\r\n \"osFamily\": \"4\",\r\n \"targetDedicated\": 0,\r\n \"enableInterNodeCommunication\": false\r\n}", + "RequestHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Content-Length": [ + "135" + ], + "client-request-id": [ + "f58ccd4b-11b8-4c6a-a369-6d94adb94d54" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 17:36:07 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Last-Modified": [ + "Tue, 08 Sep 2015 17:36:08 GMT" + ], + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "7ab4cba9-d0d9-4cb7-a0ff-7b9b2a63cc2b" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "f58ccd4b-11b8-4c6a-a369-6d94adb94d54" + ], + "DataServiceVersion": [ + "3.0" + ], + "DataServiceId": [ + "https://pstests.eastus.batch.azure.com/pools/testUpdate" + ], + "Date": [ + "Tue, 08 Sep 2015 17:36:07 GMT" + ], + "ETag": [ + "0x8D2B873FAE5BB34" + ], + "Location": [ + "https://pstests.eastus.batch.azure.com/pools/testUpdate" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 201 + }, + { + "RequestUri": "/pools/testUpdate?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L3Bvb2xzL3Rlc3RVcGRhdGU/YXBpLXZlcnNpb249MjAxNS0wNi0wMS4yLjAmdGltZW91dD0zMA==", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "0dfd5514-04d5-4c3c-9555-3a72f4286e77" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 17:36:08 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "{\r\n \"odata.metadata\": \"https://pstests.eastus.batch.azure.com/$metadata#pools/@Element\",\r\n \"id\": \"testUpdate\",\r\n \"url\": \"https://pstests.eastus.batch.azure.com/pools/testUpdate\",\r\n \"eTag\": \"0x8D2B873FAE5BB34\",\r\n \"lastModified\": \"2015-09-08T17:36:08.277074Z\",\r\n \"creationTime\": \"2015-09-08T17:36:08.277074Z\",\r\n \"state\": \"active\",\r\n \"stateTransitionTime\": \"2015-09-08T17:36:08.277074Z\",\r\n \"allocationState\": \"steady\",\r\n \"allocationStateTransitionTime\": \"2015-09-08T17:36:08.3930748Z\",\r\n \"osFamily\": \"4\",\r\n \"targetOSVersion\": \"*\",\r\n \"currentOSVersion\": \"*\",\r\n \"vmSize\": \"small\",\r\n \"resizeTimeout\": \"PT5M\",\r\n \"currentDedicated\": 0,\r\n \"targetDedicated\": 0,\r\n \"enableAutoScale\": false,\r\n \"enableInterNodeCommunication\": false,\r\n \"maxTasksPerNode\": 1,\r\n \"taskSchedulingPolicy\": {\r\n \"nodeFillType\": \"Spread\"\r\n }\r\n}", + "ResponseHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Last-Modified": [ + "Tue, 08 Sep 2015 17:36:08 GMT" + ], + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "fad3e6a1-64a9-4f2a-94d5-a999bb620049" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "0dfd5514-04d5-4c3c-9555-3a72f4286e77" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Tue, 08 Sep 2015 17:36:09 GMT" + ], + "ETag": [ + "0x8D2B873FAE5BB34" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/pools/testUpdate?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L3Bvb2xzL3Rlc3RVcGRhdGU/YXBpLXZlcnNpb249MjAxNS0wNi0wMS4yLjAmdGltZW91dD0zMA==", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "a053c0a0-770d-4bd4-bb7a-4963366c5f95" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 17:36:09 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "{\r\n \"odata.metadata\": \"https://pstests.eastus.batch.azure.com/$metadata#pools/@Element\",\r\n \"id\": \"testUpdate\",\r\n \"url\": \"https://pstests.eastus.batch.azure.com/pools/testUpdate\",\r\n \"eTag\": \"0x8D2B873FBE78D6D\",\r\n \"lastModified\": \"2015-09-08T17:36:09.9667309Z\",\r\n \"creationTime\": \"2015-09-08T17:36:08.277074Z\",\r\n \"state\": \"active\",\r\n \"stateTransitionTime\": \"2015-09-08T17:36:08.277074Z\",\r\n \"allocationState\": \"steady\",\r\n \"allocationStateTransitionTime\": \"2015-09-08T17:36:08.3930748Z\",\r\n \"osFamily\": \"4\",\r\n \"targetOSVersion\": \"*\",\r\n \"currentOSVersion\": \"*\",\r\n \"vmSize\": \"small\",\r\n \"resizeTimeout\": \"PT5M\",\r\n \"currentDedicated\": 0,\r\n \"targetDedicated\": 0,\r\n \"enableAutoScale\": false,\r\n \"enableInterNodeCommunication\": false,\r\n \"startTask\": {\r\n \"commandLine\": \"cmd /c dir /s\",\r\n \"resourceFiles\": [\r\n {\r\n \"blobSource\": \"https://testacct1.blob.core.windows.net/\",\r\n \"filePath\": \"filePath1\"\r\n },\r\n {\r\n \"blobSource\": \"https://testacct2.blob.core.windows.net/\",\r\n \"filePath\": \"filePath2\"\r\n }\r\n ],\r\n \"environmentSettings\": [\r\n {\r\n \"name\": \"envName\",\r\n \"value\": \"envVal\"\r\n }\r\n ],\r\n \"runElevated\": false,\r\n \"maxTaskRetryCount\": 0,\r\n \"waitForSuccess\": false\r\n },\r\n \"metadata\": [\r\n {\r\n \"name\": \"poolMetaName\",\r\n \"value\": \"poolMetaValue\"\r\n }\r\n ],\r\n \"maxTasksPerNode\": 1,\r\n \"taskSchedulingPolicy\": {\r\n \"nodeFillType\": \"Spread\"\r\n }\r\n}", + "ResponseHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Last-Modified": [ + "Tue, 08 Sep 2015 17:36:09 GMT" + ], + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "5308dd42-87c7-4aa3-88e1-6175e3ce9fab" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "a053c0a0-770d-4bd4-bb7a-4963366c5f95" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Tue, 08 Sep 2015 17:36:09 GMT" + ], + "ETag": [ + "0x8D2B873FBE78D6D" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/pools/testUpdate?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L3Bvb2xzL3Rlc3RVcGRhdGU/YXBpLXZlcnNpb249MjAxNS0wNi0wMS4yLjAmdGltZW91dD0zMA==", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "a053c0a0-770d-4bd4-bb7a-4963366c5f95" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 17:36:09 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "{\r\n \"odata.metadata\": \"https://pstests.eastus.batch.azure.com/$metadata#pools/@Element\",\r\n \"id\": \"testUpdate\",\r\n \"url\": \"https://pstests.eastus.batch.azure.com/pools/testUpdate\",\r\n \"eTag\": \"0x8D2B873FBE78D6D\",\r\n \"lastModified\": \"2015-09-08T17:36:09.9667309Z\",\r\n \"creationTime\": \"2015-09-08T17:36:08.277074Z\",\r\n \"state\": \"active\",\r\n \"stateTransitionTime\": \"2015-09-08T17:36:08.277074Z\",\r\n \"allocationState\": \"steady\",\r\n \"allocationStateTransitionTime\": \"2015-09-08T17:36:08.3930748Z\",\r\n \"osFamily\": \"4\",\r\n \"targetOSVersion\": \"*\",\r\n \"currentOSVersion\": \"*\",\r\n \"vmSize\": \"small\",\r\n \"resizeTimeout\": \"PT5M\",\r\n \"currentDedicated\": 0,\r\n \"targetDedicated\": 0,\r\n \"enableAutoScale\": false,\r\n \"enableInterNodeCommunication\": false,\r\n \"startTask\": {\r\n \"commandLine\": \"cmd /c dir /s\",\r\n \"resourceFiles\": [\r\n {\r\n \"blobSource\": \"https://testacct1.blob.core.windows.net/\",\r\n \"filePath\": \"filePath1\"\r\n },\r\n {\r\n \"blobSource\": \"https://testacct2.blob.core.windows.net/\",\r\n \"filePath\": \"filePath2\"\r\n }\r\n ],\r\n \"environmentSettings\": [\r\n {\r\n \"name\": \"envName\",\r\n \"value\": \"envVal\"\r\n }\r\n ],\r\n \"runElevated\": false,\r\n \"maxTaskRetryCount\": 0,\r\n \"waitForSuccess\": false\r\n },\r\n \"metadata\": [\r\n {\r\n \"name\": \"poolMetaName\",\r\n \"value\": \"poolMetaValue\"\r\n }\r\n ],\r\n \"maxTasksPerNode\": 1,\r\n \"taskSchedulingPolicy\": {\r\n \"nodeFillType\": \"Spread\"\r\n }\r\n}", + "ResponseHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Last-Modified": [ + "Tue, 08 Sep 2015 17:36:09 GMT" + ], + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "5308dd42-87c7-4aa3-88e1-6175e3ce9fab" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "a053c0a0-770d-4bd4-bb7a-4963366c5f95" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Tue, 08 Sep 2015 17:36:09 GMT" + ], + "ETag": [ + "0x8D2B873FBE78D6D" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/pools/testUpdate?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L3Bvb2xzL3Rlc3RVcGRhdGU/YXBpLXZlcnNpb249MjAxNS0wNi0wMS4yLjAmdGltZW91dD0zMA==", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "a053c0a0-770d-4bd4-bb7a-4963366c5f95" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 17:36:09 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "{\r\n \"odata.metadata\": \"https://pstests.eastus.batch.azure.com/$metadata#pools/@Element\",\r\n \"id\": \"testUpdate\",\r\n \"url\": \"https://pstests.eastus.batch.azure.com/pools/testUpdate\",\r\n \"eTag\": \"0x8D2B873FBE78D6D\",\r\n \"lastModified\": \"2015-09-08T17:36:09.9667309Z\",\r\n \"creationTime\": \"2015-09-08T17:36:08.277074Z\",\r\n \"state\": \"active\",\r\n \"stateTransitionTime\": \"2015-09-08T17:36:08.277074Z\",\r\n \"allocationState\": \"steady\",\r\n \"allocationStateTransitionTime\": \"2015-09-08T17:36:08.3930748Z\",\r\n \"osFamily\": \"4\",\r\n \"targetOSVersion\": \"*\",\r\n \"currentOSVersion\": \"*\",\r\n \"vmSize\": \"small\",\r\n \"resizeTimeout\": \"PT5M\",\r\n \"currentDedicated\": 0,\r\n \"targetDedicated\": 0,\r\n \"enableAutoScale\": false,\r\n \"enableInterNodeCommunication\": false,\r\n \"startTask\": {\r\n \"commandLine\": \"cmd /c dir /s\",\r\n \"resourceFiles\": [\r\n {\r\n \"blobSource\": \"https://testacct1.blob.core.windows.net/\",\r\n \"filePath\": \"filePath1\"\r\n },\r\n {\r\n \"blobSource\": \"https://testacct2.blob.core.windows.net/\",\r\n \"filePath\": \"filePath2\"\r\n }\r\n ],\r\n \"environmentSettings\": [\r\n {\r\n \"name\": \"envName\",\r\n \"value\": \"envVal\"\r\n }\r\n ],\r\n \"runElevated\": false,\r\n \"maxTaskRetryCount\": 0,\r\n \"waitForSuccess\": false\r\n },\r\n \"metadata\": [\r\n {\r\n \"name\": \"poolMetaName\",\r\n \"value\": \"poolMetaValue\"\r\n }\r\n ],\r\n \"maxTasksPerNode\": 1,\r\n \"taskSchedulingPolicy\": {\r\n \"nodeFillType\": \"Spread\"\r\n }\r\n}", + "ResponseHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Last-Modified": [ + "Tue, 08 Sep 2015 17:36:09 GMT" + ], + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "5308dd42-87c7-4aa3-88e1-6175e3ce9fab" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "a053c0a0-770d-4bd4-bb7a-4963366c5f95" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Tue, 08 Sep 2015 17:36:09 GMT" + ], + "ETag": [ + "0x8D2B873FBE78D6D" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/pools/testUpdate?updateproperties&api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L3Bvb2xzL3Rlc3RVcGRhdGU/dXBkYXRlcHJvcGVydGllcyZhcGktdmVyc2lvbj0yMDE1LTA2LTAxLjIuMCZ0aW1lb3V0PTMw", + "RequestMethod": "POST", + "RequestBody": "{\r\n \"startTask\": {\r\n \"commandLine\": \"cmd /c dir /s\",\r\n \"resourceFiles\": [\r\n {\r\n \"blobSource\": \"https://testacct1.blob.core.windows.net/\",\r\n \"filePath\": \"filePath1\"\r\n },\r\n {\r\n \"blobSource\": \"https://testacct2.blob.core.windows.net/\",\r\n \"filePath\": \"filePath2\"\r\n }\r\n ],\r\n \"environmentSettings\": [\r\n {\r\n \"name\": \"envName\",\r\n \"value\": \"envVal\"\r\n }\r\n ]\r\n },\r\n \"certificateReferences\": [],\r\n \"metadata\": [\r\n {\r\n \"name\": \"poolMetaName\",\r\n \"value\": \"poolMetaValue\"\r\n }\r\n ]\r\n}", + "RequestHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Content-Length": [ + "575" + ], + "client-request-id": [ + "dd2c4e22-065b-40b4-9a45-09c69a75e170" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 17:36:09 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Content-Length": [ + "0" + ], + "Last-Modified": [ + "Tue, 08 Sep 2015 17:36:09 GMT" + ], + "request-id": [ + "60a1ee09-f23f-4561-a7f5-2af35ce0ac4c" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "dd2c4e22-065b-40b4-9a45-09c69a75e170" + ], + "DataServiceVersion": [ + "3.0" + ], + "DataServiceId": [ + "https://pstests.eastus.batch.azure.com/pools/testUpdate" + ], + "Date": [ + "Tue, 08 Sep 2015 17:36:09 GMT" + ], + "ETag": [ + "0x8D2B873FBE78D6D" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 204 + }, + { + "RequestUri": "/pools/testUpdate?updateproperties&api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L3Bvb2xzL3Rlc3RVcGRhdGU/dXBkYXRlcHJvcGVydGllcyZhcGktdmVyc2lvbj0yMDE1LTA2LTAxLjIuMCZ0aW1lb3V0PTMw", + "RequestMethod": "POST", + "RequestBody": "{\r\n \"startTask\": {\r\n \"commandLine\": \"cmd /c dir /s\",\r\n \"resourceFiles\": [\r\n {\r\n \"blobSource\": \"https://testacct1.blob.core.windows.net/\",\r\n \"filePath\": \"filePath1\"\r\n },\r\n {\r\n \"blobSource\": \"https://testacct2.blob.core.windows.net/\",\r\n \"filePath\": \"filePath2\"\r\n }\r\n ],\r\n \"environmentSettings\": [\r\n {\r\n \"name\": \"envName\",\r\n \"value\": \"envVal\"\r\n }\r\n ]\r\n },\r\n \"certificateReferences\": [],\r\n \"metadata\": [\r\n {\r\n \"name\": \"poolMetaName\",\r\n \"value\": \"poolMetaValue\"\r\n }\r\n ]\r\n}", + "RequestHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Content-Length": [ + "575" + ], + "client-request-id": [ + "dd2c4e22-065b-40b4-9a45-09c69a75e170" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 17:36:09 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Content-Length": [ + "0" + ], + "Last-Modified": [ + "Tue, 08 Sep 2015 17:36:09 GMT" + ], + "request-id": [ + "60a1ee09-f23f-4561-a7f5-2af35ce0ac4c" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "dd2c4e22-065b-40b4-9a45-09c69a75e170" + ], + "DataServiceVersion": [ + "3.0" + ], + "DataServiceId": [ + "https://pstests.eastus.batch.azure.com/pools/testUpdate" + ], + "Date": [ + "Tue, 08 Sep 2015 17:36:09 GMT" + ], + "ETag": [ + "0x8D2B873FBE78D6D" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 204 + }, + { + "RequestUri": "/pools/testUpdate?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L3Bvb2xzL3Rlc3RVcGRhdGU/YXBpLXZlcnNpb249MjAxNS0wNi0wMS4yLjAmdGltZW91dD0zMA==", + "RequestMethod": "DELETE", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "57654dda-bb01-40f2-9830-45a433d8e4e1" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 17:36:09 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "9bb8bd1f-23be-42d3-b6a2-ce45eb9ade93" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "57654dda-bb01-40f2-9830-45a433d8e4e1" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Tue, 08 Sep 2015 17:36:09 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 202 + }, + { + "RequestUri": "/pools/testUpdate?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L3Bvb2xzL3Rlc3RVcGRhdGU/YXBpLXZlcnNpb249MjAxNS0wNi0wMS4yLjAmdGltZW91dD0zMA==", + "RequestMethod": "DELETE", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "57654dda-bb01-40f2-9830-45a433d8e4e1" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 17:36:09 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "9bb8bd1f-23be-42d3-b6a2-ce45eb9ade93" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "57654dda-bb01-40f2-9830-45a433d8e4e1" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Tue, 08 Sep 2015 17:36:09 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 202 + } + ], + "Names": {}, + "Variables": { + "SubscriptionId": "6368ed38-3570-481f-b4fa-1d0a6e8d3f3b" + } +} \ No newline at end of file diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/SessionRecords/Microsoft.Azure.Commands.Batch.Test.ScenarioTests.TaskTests/TestUpdateTask.json b/src/ResourceManager/AzureBatch/Commands.Batch.Test/SessionRecords/Microsoft.Azure.Commands.Batch.Test.ScenarioTests.TaskTests/TestUpdateTask.json new file mode 100644 index 000000000000..64bf2e582a37 --- /dev/null +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/SessionRecords/Microsoft.Azure.Commands.Batch.Test.ScenarioTests.TaskTests/TestUpdateTask.json @@ -0,0 +1,1016 @@ +{ + "Entries": [ + { + "RequestUri": "/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resources?$filter=resourceType%20eq%20'Microsoft.Batch%2FbatchAccounts'&api-version=2014-04-01-preview", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNjM2OGVkMzgtMzU3MC00ODFmLWI0ZmEtMWQwYTZlOGQzZjNiL3Jlc291cmNlcz8kZmlsdGVyPXJlc291cmNlVHlwZSUyMGVxJTIwJ01pY3Jvc29mdC5CYXRjaCUyRmJhdGNoQWNjb3VudHMnJmFwaS12ZXJzaW9uPTIwMTQtMDQtMDEtcHJldmlldw==", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "User-Agent": [ + "Microsoft.Azure.Management.Resources.ResourceManagementClient/2.0.0.0" + ] + }, + "ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"id\": \"/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resourceGroups/default-azurebatch-eastus/providers/Microsoft.Batch/batchAccounts/pstests\",\r\n \"name\": \"pstests\",\r\n \"type\": \"Microsoft.Batch/batchAccounts\",\r\n \"location\": \"eastus\"\r\n },\r\n {\r\n \"id\": \"/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resourceGroups/Default-AzureBatch-WestUS/providers/Microsoft.Batch/batchAccounts/jaschneibatchtest\",\r\n \"name\": \"jaschneibatchtest\",\r\n \"type\": \"Microsoft.Batch/batchAccounts\",\r\n \"location\": \"westus\"\r\n }\r\n ]\r\n}", + "ResponseHeaders": { + "Content-Length": [ + "483" + ], + "Content-Type": [ + "application/json; charset=utf-8" + ], + "Expires": [ + "-1" + ], + "Pragma": [ + "no-cache" + ], + "x-ms-ratelimit-remaining-subscription-reads": [ + "14987" + ], + "x-ms-request-id": [ + "ea9432fa-9cc4-4a23-a5e4-a1d49cd533d9" + ], + "x-ms-correlation-request-id": [ + "ea9432fa-9cc4-4a23-a5e4-a1d49cd533d9" + ], + "x-ms-routing-request-id": [ + "WESTUS:20150908T180259Z:ea9432fa-9cc4-4a23-a5e4-a1d49cd533d9" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "Cache-Control": [ + "no-cache" + ], + "Date": [ + "Tue, 08 Sep 2015 18:02:58 GMT" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resources?$filter=resourceType%20eq%20'Microsoft.Batch%2FbatchAccounts'&api-version=2014-04-01-preview", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNjM2OGVkMzgtMzU3MC00ODFmLWI0ZmEtMWQwYTZlOGQzZjNiL3Jlc291cmNlcz8kZmlsdGVyPXJlc291cmNlVHlwZSUyMGVxJTIwJ01pY3Jvc29mdC5CYXRjaCUyRmJhdGNoQWNjb3VudHMnJmFwaS12ZXJzaW9uPTIwMTQtMDQtMDEtcHJldmlldw==", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "User-Agent": [ + "Microsoft.Azure.Management.Resources.ResourceManagementClient/2.0.0.0" + ] + }, + "ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"id\": \"/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resourceGroups/default-azurebatch-eastus/providers/Microsoft.Batch/batchAccounts/pstests\",\r\n \"name\": \"pstests\",\r\n \"type\": \"Microsoft.Batch/batchAccounts\",\r\n \"location\": \"eastus\"\r\n },\r\n {\r\n \"id\": \"/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resourceGroups/Default-AzureBatch-WestUS/providers/Microsoft.Batch/batchAccounts/jaschneibatchtest\",\r\n \"name\": \"jaschneibatchtest\",\r\n \"type\": \"Microsoft.Batch/batchAccounts\",\r\n \"location\": \"westus\"\r\n }\r\n ]\r\n}", + "ResponseHeaders": { + "Content-Length": [ + "483" + ], + "Content-Type": [ + "application/json; charset=utf-8" + ], + "Expires": [ + "-1" + ], + "Pragma": [ + "no-cache" + ], + "x-ms-ratelimit-remaining-subscription-reads": [ + "14986" + ], + "x-ms-request-id": [ + "152d9aba-cd51-4703-8c8b-223005e7077f" + ], + "x-ms-correlation-request-id": [ + "152d9aba-cd51-4703-8c8b-223005e7077f" + ], + "x-ms-routing-request-id": [ + "WESTUS:20150908T180302Z:152d9aba-cd51-4703-8c8b-223005e7077f" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "Cache-Control": [ + "no-cache" + ], + "Date": [ + "Tue, 08 Sep 2015 18:03:01 GMT" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resourceGroups/default-azurebatch-eastus/providers/Microsoft.Batch/batchAccounts/pstests?api-version=2015-07-01", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNjM2OGVkMzgtMzU3MC00ODFmLWI0ZmEtMWQwYTZlOGQzZjNiL3Jlc291cmNlR3JvdXBzL2RlZmF1bHQtYXp1cmViYXRjaC1lYXN0dXMvcHJvdmlkZXJzL01pY3Jvc29mdC5CYXRjaC9iYXRjaEFjY291bnRzL3BzdGVzdHM/YXBpLXZlcnNpb249MjAxNS0wNy0wMQ==", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "x-ms-version": [ + "2015-07-01" + ], + "User-Agent": [ + "Microsoft.Azure.Management.Batch.BatchManagementClient/1.0.0.0" + ] + }, + "ResponseBody": "{\r\n \"name\": \"pstests\",\r\n \"location\": \"eastus\",\r\n \"properties\": {\r\n \"accountEndpoint\": \"pstests.eastus.batch.azure.com\",\r\n \"provisioningState\": \"Succeeded\"\r\n },\r\n \"id\": \"/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resourceGroups/default-azurebatch-eastus/providers/Microsoft.Batch/batchAccounts/pstests\",\r\n \"type\": \"Microsoft.Batch/batchAccounts\"\r\n}", + "ResponseHeaders": { + "Content-Length": [ + "323" + ], + "Content-Type": [ + "application/json; charset=utf-8" + ], + "Expires": [ + "-1" + ], + "Last-Modified": [ + "Tue, 08 Sep 2015 18:03:00 GMT" + ], + "Pragma": [ + "no-cache" + ], + "request-id": [ + "d977cc31-78f6-4398-bee9-87262f364651" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "x-ms-ratelimit-remaining-subscription-reads": [ + "14966" + ], + "x-ms-request-id": [ + "55fe863e-4d42-4451-b2cc-8b81e53baadd" + ], + "x-ms-correlation-request-id": [ + "55fe863e-4d42-4451-b2cc-8b81e53baadd" + ], + "x-ms-routing-request-id": [ + "WESTUS:20150908T180300Z:55fe863e-4d42-4451-b2cc-8b81e53baadd" + ], + "Cache-Control": [ + "no-cache" + ], + "Date": [ + "Tue, 08 Sep 2015 18:02:59 GMT" + ], + "ETag": [ + "0x8D2B877BBE3A60B" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resourceGroups/default-azurebatch-eastus/providers/Microsoft.Batch/batchAccounts/pstests?api-version=2015-07-01", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNjM2OGVkMzgtMzU3MC00ODFmLWI0ZmEtMWQwYTZlOGQzZjNiL3Jlc291cmNlR3JvdXBzL2RlZmF1bHQtYXp1cmViYXRjaC1lYXN0dXMvcHJvdmlkZXJzL01pY3Jvc29mdC5CYXRjaC9iYXRjaEFjY291bnRzL3BzdGVzdHM/YXBpLXZlcnNpb249MjAxNS0wNy0wMQ==", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "x-ms-version": [ + "2015-07-01" + ], + "User-Agent": [ + "Microsoft.Azure.Management.Batch.BatchManagementClient/1.0.0.0" + ] + }, + "ResponseBody": "{\r\n \"name\": \"pstests\",\r\n \"location\": \"eastus\",\r\n \"properties\": {\r\n \"accountEndpoint\": \"pstests.eastus.batch.azure.com\",\r\n \"provisioningState\": \"Succeeded\"\r\n },\r\n \"id\": \"/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resourceGroups/default-azurebatch-eastus/providers/Microsoft.Batch/batchAccounts/pstests\",\r\n \"type\": \"Microsoft.Batch/batchAccounts\"\r\n}", + "ResponseHeaders": { + "Content-Length": [ + "323" + ], + "Content-Type": [ + "application/json; charset=utf-8" + ], + "Expires": [ + "-1" + ], + "Last-Modified": [ + "Tue, 08 Sep 2015 18:03:02 GMT" + ], + "Pragma": [ + "no-cache" + ], + "request-id": [ + "585c959c-99ba-467e-92d6-80d04522fcbb" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "x-ms-ratelimit-remaining-subscription-reads": [ + "14965" + ], + "x-ms-request-id": [ + "094bf1fa-70ef-4ec1-a600-0959ea9fbddd" + ], + "x-ms-correlation-request-id": [ + "094bf1fa-70ef-4ec1-a600-0959ea9fbddd" + ], + "x-ms-routing-request-id": [ + "WESTUS:20150908T180302Z:094bf1fa-70ef-4ec1-a600-0959ea9fbddd" + ], + "Cache-Control": [ + "no-cache" + ], + "Date": [ + "Tue, 08 Sep 2015 18:03:01 GMT" + ], + "ETag": [ + "0x8D2B877BD0E0B4E" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resourceGroups/default-azurebatch-eastus/providers/Microsoft.Batch/batchAccounts/pstests/listKeys?api-version=2015-07-01", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNjM2OGVkMzgtMzU3MC00ODFmLWI0ZmEtMWQwYTZlOGQzZjNiL3Jlc291cmNlR3JvdXBzL2RlZmF1bHQtYXp1cmViYXRjaC1lYXN0dXMvcHJvdmlkZXJzL01pY3Jvc29mdC5CYXRjaC9iYXRjaEFjY291bnRzL3BzdGVzdHMvbGlzdEtleXM/YXBpLXZlcnNpb249MjAxNS0wNy0wMQ==", + "RequestMethod": "POST", + "RequestBody": "", + "RequestHeaders": { + "x-ms-version": [ + "2015-07-01" + ], + "User-Agent": [ + "Microsoft.Azure.Management.Batch.BatchManagementClient/1.0.0.0" + ] + }, + "ResponseBody": "{\r\n \"accountName\": \"pstests\",\r\n \"primary\": \"XXFZ+jAijJoB8YsqvHU7t0es8xUSVpgCoQ2sK1MxOWPFiMkBl1NhQ2TdzkmA9dH3YfXTaE26kMRRvYG1gax9gw==\",\r\n \"secondary\": \"Wk38jkxm7UKVR3Yp7x5IhHvPdLuzOEwVEXlwrF9DvTp0YhkP8zvG0Kc0BM4kMJP0wu9IEOHMwklmykjgikTchg==\"\r\n}", + "ResponseHeaders": { + "Content-Length": [ + "229" + ], + "Content-Type": [ + "application/json; charset=utf-8" + ], + "Expires": [ + "-1" + ], + "Pragma": [ + "no-cache" + ], + "request-id": [ + "df71f5c2-d557-41cd-a265-f7e63d395b63" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "x-ms-ratelimit-remaining-subscription-writes": [ + "1197" + ], + "x-ms-request-id": [ + "81de6465-6c34-4cf6-9d37-cdf3f4559c20" + ], + "x-ms-correlation-request-id": [ + "81de6465-6c34-4cf6-9d37-cdf3f4559c20" + ], + "x-ms-routing-request-id": [ + "WESTUS:20150908T180300Z:81de6465-6c34-4cf6-9d37-cdf3f4559c20" + ], + "Cache-Control": [ + "no-cache" + ], + "Date": [ + "Tue, 08 Sep 2015 18:02:59 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/subscriptions/6368ed38-3570-481f-b4fa-1d0a6e8d3f3b/resourceGroups/default-azurebatch-eastus/providers/Microsoft.Batch/batchAccounts/pstests/listKeys?api-version=2015-07-01", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvNjM2OGVkMzgtMzU3MC00ODFmLWI0ZmEtMWQwYTZlOGQzZjNiL3Jlc291cmNlR3JvdXBzL2RlZmF1bHQtYXp1cmViYXRjaC1lYXN0dXMvcHJvdmlkZXJzL01pY3Jvc29mdC5CYXRjaC9iYXRjaEFjY291bnRzL3BzdGVzdHMvbGlzdEtleXM/YXBpLXZlcnNpb249MjAxNS0wNy0wMQ==", + "RequestMethod": "POST", + "RequestBody": "", + "RequestHeaders": { + "x-ms-version": [ + "2015-07-01" + ], + "User-Agent": [ + "Microsoft.Azure.Management.Batch.BatchManagementClient/1.0.0.0" + ] + }, + "ResponseBody": "{\r\n \"accountName\": \"pstests\",\r\n \"primary\": \"XXFZ+jAijJoB8YsqvHU7t0es8xUSVpgCoQ2sK1MxOWPFiMkBl1NhQ2TdzkmA9dH3YfXTaE26kMRRvYG1gax9gw==\",\r\n \"secondary\": \"Wk38jkxm7UKVR3Yp7x5IhHvPdLuzOEwVEXlwrF9DvTp0YhkP8zvG0Kc0BM4kMJP0wu9IEOHMwklmykjgikTchg==\"\r\n}", + "ResponseHeaders": { + "Content-Length": [ + "229" + ], + "Content-Type": [ + "application/json; charset=utf-8" + ], + "Expires": [ + "-1" + ], + "Pragma": [ + "no-cache" + ], + "request-id": [ + "5ba4c8e7-4ec3-4ee6-92e0-7956db8a67b0" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "x-ms-ratelimit-remaining-subscription-writes": [ + "1196" + ], + "x-ms-request-id": [ + "c50fcfda-399f-404d-8c0d-f00632102c21" + ], + "x-ms-correlation-request-id": [ + "c50fcfda-399f-404d-8c0d-f00632102c21" + ], + "x-ms-routing-request-id": [ + "WESTUS:20150908T180302Z:c50fcfda-399f-404d-8c0d-f00632102c21" + ], + "Cache-Control": [ + "no-cache" + ], + "Date": [ + "Tue, 08 Sep 2015 18:03:01 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/jobs?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L2pvYnM/YXBpLXZlcnNpb249MjAxNS0wNi0wMS4yLjAmdGltZW91dD0zMA==", + "RequestMethod": "POST", + "RequestBody": "{\r\n \"id\": \"updateTaskJob\",\r\n \"priority\": 0,\r\n \"poolInfo\": {\r\n \"poolId\": \"testPool\"\r\n }\r\n}", + "RequestHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Content-Length": [ + "96" + ], + "client-request-id": [ + "c4c8ad9f-ab65-4df9-a2ae-c6491d2d76ce" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 18:03:00 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Last-Modified": [ + "Tue, 08 Sep 2015 18:03:02 GMT" + ], + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "501e2f0b-dba0-4b71-ab2c-6f17c50d4194" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "c4c8ad9f-ab65-4df9-a2ae-c6491d2d76ce" + ], + "DataServiceVersion": [ + "3.0" + ], + "DataServiceId": [ + "https://pstests.eastus.batch.azure.com/jobs/job-1" + ], + "Date": [ + "Tue, 08 Sep 2015 18:03:01 GMT" + ], + "ETag": [ + "0x8D2B877BCDB3F6F" + ], + "Location": [ + "https://pstests.eastus.batch.azure.com/jobs/job-1" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 201 + }, + { + "RequestUri": "/jobs/updateTaskJob/tasks?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L2pvYnMvdXBkYXRlVGFza0pvYi90YXNrcz9hcGktdmVyc2lvbj0yMDE1LTA2LTAxLjIuMCZ0aW1lb3V0PTMw", + "RequestMethod": "POST", + "RequestBody": "{\r\n \"id\": \"testTask\",\r\n \"commandLine\": \"ping -t localhost -w 60\",\r\n \"runElevated\": true\r\n}", + "RequestHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Content-Length": [ + "93" + ], + "client-request-id": [ + "9932cfc1-5971-439d-a6c8-b52f74e67e8f" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 18:03:01 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Last-Modified": [ + "Tue, 08 Sep 2015 18:03:02 GMT" + ], + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "07ee97b0-21a2-42b7-8913-17408e3ccfc6" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "9932cfc1-5971-439d-a6c8-b52f74e67e8f" + ], + "DataServiceVersion": [ + "3.0" + ], + "DataServiceId": [ + "https://pstests.eastus.batch.azure.com/jobs/updateTaskJob/tasks/testTask" + ], + "Date": [ + "Tue, 08 Sep 2015 18:03:02 GMT" + ], + "ETag": [ + "0x8D2B877BCE3AE0D" + ], + "Location": [ + "https://pstests.eastus.batch.azure.com/jobs/updateTaskJob/tasks/testTask" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 201 + }, + { + "RequestUri": "/jobs/updateTaskJob/tasks?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L2pvYnMvdXBkYXRlVGFza0pvYi90YXNrcz9hcGktdmVyc2lvbj0yMDE1LTA2LTAxLjIuMCZ0aW1lb3V0PTMw", + "RequestMethod": "POST", + "RequestBody": "{\r\n \"id\": \"testTask\",\r\n \"commandLine\": \"ping -t localhost -w 60\",\r\n \"runElevated\": true\r\n}", + "RequestHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Content-Length": [ + "93" + ], + "client-request-id": [ + "9932cfc1-5971-439d-a6c8-b52f74e67e8f" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 18:03:01 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Last-Modified": [ + "Tue, 08 Sep 2015 18:03:02 GMT" + ], + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "07ee97b0-21a2-42b7-8913-17408e3ccfc6" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "9932cfc1-5971-439d-a6c8-b52f74e67e8f" + ], + "DataServiceVersion": [ + "3.0" + ], + "DataServiceId": [ + "https://pstests.eastus.batch.azure.com/jobs/updateTaskJob/tasks/testTask" + ], + "Date": [ + "Tue, 08 Sep 2015 18:03:02 GMT" + ], + "ETag": [ + "0x8D2B877BCE3AE0D" + ], + "Location": [ + "https://pstests.eastus.batch.azure.com/jobs/updateTaskJob/tasks/testTask" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 201 + }, + { + "RequestUri": "/jobs/updateTaskJob/tasks/testTask?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L2pvYnMvdXBkYXRlVGFza0pvYi90YXNrcy90ZXN0VGFzaz9hcGktdmVyc2lvbj0yMDE1LTA2LTAxLjIuMCZ0aW1lb3V0PTMw", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "31e9c8a8-17f1-4501-b9f1-eec6d9be8688" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 18:03:02 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "{\r\n \"odata.metadata\": \"https://pstests.eastus.batch.azure.com/$metadata#tasks/@Element\",\r\n \"id\": \"testTask\",\r\n \"url\": \"https://pstests.eastus.batch.azure.com/jobs/updateTaskJob/tasks/testTask\",\r\n \"eTag\": \"0x8D2B877BCE3AE0D\",\r\n \"creationTime\": \"2015-09-08T18:03:02.2318093Z\",\r\n \"lastModified\": \"2015-09-08T18:03:02.2318093Z\",\r\n \"state\": \"running\",\r\n \"stateTransitionTime\": \"2015-09-08T18:03:03.1105889Z\",\r\n \"previousState\": \"active\",\r\n \"previousStateTransitionTime\": \"2015-09-08T18:03:02.2318093Z\",\r\n \"commandLine\": \"ping -t localhost -w 60\",\r\n \"runElevated\": true,\r\n \"constraints\": {\r\n \"maxWallClockTime\": \"P10675199DT2H48M5.4775807S\",\r\n \"retentionTime\": \"P10675199DT2H48M5.4775807S\",\r\n \"maxTaskRetryCount\": 0\r\n },\r\n \"executionInfo\": {\r\n \"startTime\": \"2015-09-08T18:03:03.1105889Z\",\r\n \"retryCount\": 0,\r\n \"requeueCount\": 0\r\n },\r\n \"nodeInfo\": {\r\n \"affinityId\": \"TVM:tvm-3257026573_3-20150904t230807z\",\r\n \"nodeUrl\": \"https://pstests.eastus.batch.azure.com/pools/testpool/nodes/tvm-3257026573_3-20150904t230807z\",\r\n \"poolId\": \"testpool\",\r\n \"nodeId\": \"tvm-3257026573_3-20150904t230807z\"\r\n }\r\n}", + "ResponseHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Last-Modified": [ + "Tue, 08 Sep 2015 18:03:02 GMT" + ], + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "f87063ed-dd3a-4b10-aa78-c2655d5d8be3" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "31e9c8a8-17f1-4501-b9f1-eec6d9be8688" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Tue, 08 Sep 2015 18:03:03 GMT" + ], + "ETag": [ + "0x8D2B877BCE3AE0D" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/jobs/updateTaskJob/tasks/testTask?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L2pvYnMvdXBkYXRlVGFza0pvYi90YXNrcy90ZXN0VGFzaz9hcGktdmVyc2lvbj0yMDE1LTA2LTAxLjIuMCZ0aW1lb3V0PTMw", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "ec4c4d75-7ee6-45be-9e99-5ea4c46f32ab" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 18:03:03 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "{\r\n \"odata.metadata\": \"https://pstests.eastus.batch.azure.com/$metadata#tasks/@Element\",\r\n \"id\": \"testTask\",\r\n \"url\": \"https://pstests.eastus.batch.azure.com/jobs/updateTaskJob/tasks/testTask\",\r\n \"eTag\": \"0x8D2B877BDC10C3C\",\r\n \"creationTime\": \"2015-09-08T18:03:02.2318093Z\",\r\n \"lastModified\": \"2015-09-08T18:03:03.682566Z\",\r\n \"state\": \"running\",\r\n \"stateTransitionTime\": \"2015-09-08T18:03:03.1105889Z\",\r\n \"previousState\": \"active\",\r\n \"previousStateTransitionTime\": \"2015-09-08T18:03:02.2318093Z\",\r\n \"commandLine\": \"ping -t localhost -w 60\",\r\n \"runElevated\": true,\r\n \"constraints\": {\r\n \"maxWallClockTime\": \"P10D\",\r\n \"retentionTime\": \"P2D\",\r\n \"maxTaskRetryCount\": 5\r\n },\r\n \"executionInfo\": {\r\n \"startTime\": \"2015-09-08T18:03:03.1105889Z\",\r\n \"retryCount\": 0,\r\n \"requeueCount\": 0\r\n },\r\n \"nodeInfo\": {\r\n \"affinityId\": \"TVM:tvm-3257026573_3-20150904t230807z\",\r\n \"nodeUrl\": \"https://pstests.eastus.batch.azure.com/pools/testpool/nodes/tvm-3257026573_3-20150904t230807z\",\r\n \"poolId\": \"testpool\",\r\n \"nodeId\": \"tvm-3257026573_3-20150904t230807z\"\r\n }\r\n}", + "ResponseHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Last-Modified": [ + "Tue, 08 Sep 2015 18:03:03 GMT" + ], + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "e95ef3ed-ceb9-4007-b17d-d29e2e1e2aba" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "ec4c4d75-7ee6-45be-9e99-5ea4c46f32ab" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Tue, 08 Sep 2015 18:03:03 GMT" + ], + "ETag": [ + "0x8D2B877BDC10C3C" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/jobs/updateTaskJob/tasks/testTask?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L2pvYnMvdXBkYXRlVGFza0pvYi90YXNrcy90ZXN0VGFzaz9hcGktdmVyc2lvbj0yMDE1LTA2LTAxLjIuMCZ0aW1lb3V0PTMw", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "ec4c4d75-7ee6-45be-9e99-5ea4c46f32ab" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 18:03:03 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "{\r\n \"odata.metadata\": \"https://pstests.eastus.batch.azure.com/$metadata#tasks/@Element\",\r\n \"id\": \"testTask\",\r\n \"url\": \"https://pstests.eastus.batch.azure.com/jobs/updateTaskJob/tasks/testTask\",\r\n \"eTag\": \"0x8D2B877BDC10C3C\",\r\n \"creationTime\": \"2015-09-08T18:03:02.2318093Z\",\r\n \"lastModified\": \"2015-09-08T18:03:03.682566Z\",\r\n \"state\": \"running\",\r\n \"stateTransitionTime\": \"2015-09-08T18:03:03.1105889Z\",\r\n \"previousState\": \"active\",\r\n \"previousStateTransitionTime\": \"2015-09-08T18:03:02.2318093Z\",\r\n \"commandLine\": \"ping -t localhost -w 60\",\r\n \"runElevated\": true,\r\n \"constraints\": {\r\n \"maxWallClockTime\": \"P10D\",\r\n \"retentionTime\": \"P2D\",\r\n \"maxTaskRetryCount\": 5\r\n },\r\n \"executionInfo\": {\r\n \"startTime\": \"2015-09-08T18:03:03.1105889Z\",\r\n \"retryCount\": 0,\r\n \"requeueCount\": 0\r\n },\r\n \"nodeInfo\": {\r\n \"affinityId\": \"TVM:tvm-3257026573_3-20150904t230807z\",\r\n \"nodeUrl\": \"https://pstests.eastus.batch.azure.com/pools/testpool/nodes/tvm-3257026573_3-20150904t230807z\",\r\n \"poolId\": \"testpool\",\r\n \"nodeId\": \"tvm-3257026573_3-20150904t230807z\"\r\n }\r\n}", + "ResponseHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Last-Modified": [ + "Tue, 08 Sep 2015 18:03:03 GMT" + ], + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "e95ef3ed-ceb9-4007-b17d-d29e2e1e2aba" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "ec4c4d75-7ee6-45be-9e99-5ea4c46f32ab" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Tue, 08 Sep 2015 18:03:03 GMT" + ], + "ETag": [ + "0x8D2B877BDC10C3C" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/jobs/updateTaskJob/tasks/testTask?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L2pvYnMvdXBkYXRlVGFza0pvYi90YXNrcy90ZXN0VGFzaz9hcGktdmVyc2lvbj0yMDE1LTA2LTAxLjIuMCZ0aW1lb3V0PTMw", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "ec4c4d75-7ee6-45be-9e99-5ea4c46f32ab" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 18:03:03 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "{\r\n \"odata.metadata\": \"https://pstests.eastus.batch.azure.com/$metadata#tasks/@Element\",\r\n \"id\": \"testTask\",\r\n \"url\": \"https://pstests.eastus.batch.azure.com/jobs/updateTaskJob/tasks/testTask\",\r\n \"eTag\": \"0x8D2B877BDC10C3C\",\r\n \"creationTime\": \"2015-09-08T18:03:02.2318093Z\",\r\n \"lastModified\": \"2015-09-08T18:03:03.682566Z\",\r\n \"state\": \"running\",\r\n \"stateTransitionTime\": \"2015-09-08T18:03:03.1105889Z\",\r\n \"previousState\": \"active\",\r\n \"previousStateTransitionTime\": \"2015-09-08T18:03:02.2318093Z\",\r\n \"commandLine\": \"ping -t localhost -w 60\",\r\n \"runElevated\": true,\r\n \"constraints\": {\r\n \"maxWallClockTime\": \"P10D\",\r\n \"retentionTime\": \"P2D\",\r\n \"maxTaskRetryCount\": 5\r\n },\r\n \"executionInfo\": {\r\n \"startTime\": \"2015-09-08T18:03:03.1105889Z\",\r\n \"retryCount\": 0,\r\n \"requeueCount\": 0\r\n },\r\n \"nodeInfo\": {\r\n \"affinityId\": \"TVM:tvm-3257026573_3-20150904t230807z\",\r\n \"nodeUrl\": \"https://pstests.eastus.batch.azure.com/pools/testpool/nodes/tvm-3257026573_3-20150904t230807z\",\r\n \"poolId\": \"testpool\",\r\n \"nodeId\": \"tvm-3257026573_3-20150904t230807z\"\r\n }\r\n}", + "ResponseHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Last-Modified": [ + "Tue, 08 Sep 2015 18:03:03 GMT" + ], + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "e95ef3ed-ceb9-4007-b17d-d29e2e1e2aba" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "ec4c4d75-7ee6-45be-9e99-5ea4c46f32ab" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Tue, 08 Sep 2015 18:03:03 GMT" + ], + "ETag": [ + "0x8D2B877BDC10C3C" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/jobs/updateTaskJob/tasks/testTask?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L2pvYnMvdXBkYXRlVGFza0pvYi90YXNrcy90ZXN0VGFzaz9hcGktdmVyc2lvbj0yMDE1LTA2LTAxLjIuMCZ0aW1lb3V0PTMw", + "RequestMethod": "PUT", + "RequestBody": "{\r\n \"constraints\": {\r\n \"maxWallClockTime\": \"P10D\",\r\n \"retentionTime\": \"P2D\",\r\n \"maxTaskRetryCount\": 5\r\n }\r\n}", + "RequestHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Content-Length": [ + "119" + ], + "client-request-id": [ + "cd1829f9-a74d-4f4a-bd77-4659603348aa" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 18:03:02 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Last-Modified": [ + "Tue, 08 Sep 2015 18:03:03 GMT" + ], + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "d01a0c6b-6c3b-4cd0-8cb3-c6ebf546aeaa" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "cd1829f9-a74d-4f4a-bd77-4659603348aa" + ], + "DataServiceVersion": [ + "3.0" + ], + "DataServiceId": [ + "https://pstests.eastus.batch.azure.com/jobs/updateTaskJob/tasks/testTask" + ], + "Date": [ + "Tue, 08 Sep 2015 18:03:03 GMT" + ], + "ETag": [ + "0x8D2B877BDC10C3C" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/jobs/updateTaskJob/tasks/testTask?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L2pvYnMvdXBkYXRlVGFza0pvYi90YXNrcy90ZXN0VGFzaz9hcGktdmVyc2lvbj0yMDE1LTA2LTAxLjIuMCZ0aW1lb3V0PTMw", + "RequestMethod": "PUT", + "RequestBody": "{\r\n \"constraints\": {\r\n \"maxWallClockTime\": \"P10D\",\r\n \"retentionTime\": \"P2D\",\r\n \"maxTaskRetryCount\": 5\r\n }\r\n}", + "RequestHeaders": { + "Content-Type": [ + "application/json; odata=minimalmetadata" + ], + "Content-Length": [ + "119" + ], + "client-request-id": [ + "cd1829f9-a74d-4f4a-bd77-4659603348aa" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 18:03:02 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Last-Modified": [ + "Tue, 08 Sep 2015 18:03:03 GMT" + ], + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "d01a0c6b-6c3b-4cd0-8cb3-c6ebf546aeaa" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "cd1829f9-a74d-4f4a-bd77-4659603348aa" + ], + "DataServiceVersion": [ + "3.0" + ], + "DataServiceId": [ + "https://pstests.eastus.batch.azure.com/jobs/updateTaskJob/tasks/testTask" + ], + "Date": [ + "Tue, 08 Sep 2015 18:03:03 GMT" + ], + "ETag": [ + "0x8D2B877BDC10C3C" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/jobs/updateTaskJob?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L2pvYnMvdXBkYXRlVGFza0pvYj9hcGktdmVyc2lvbj0yMDE1LTA2LTAxLjIuMCZ0aW1lb3V0PTMw", + "RequestMethod": "DELETE", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "a31492a8-9932-419c-8295-5db9691c96b5" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 18:03:03 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "2680ea09-0088-42a5-98c4-77ca020370e8" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "a31492a8-9932-419c-8295-5db9691c96b5" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Tue, 08 Sep 2015 18:03:03 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 202 + }, + { + "RequestUri": "/jobs/updateTaskJob?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L2pvYnMvdXBkYXRlVGFza0pvYj9hcGktdmVyc2lvbj0yMDE1LTA2LTAxLjIuMCZ0aW1lb3V0PTMw", + "RequestMethod": "DELETE", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "a31492a8-9932-419c-8295-5db9691c96b5" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 18:03:03 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "2680ea09-0088-42a5-98c4-77ca020370e8" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "a31492a8-9932-419c-8295-5db9691c96b5" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Tue, 08 Sep 2015 18:03:03 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 202 + }, + { + "RequestUri": "/jobs/updateTaskJob?api-version=2015-06-01.2.0&timeout=30", + "EncodedRequestUri": "L2pvYnMvdXBkYXRlVGFza0pvYj9hcGktdmVyc2lvbj0yMDE1LTA2LTAxLjIuMCZ0aW1lb3V0PTMw", + "RequestMethod": "DELETE", + "RequestBody": "", + "RequestHeaders": { + "client-request-id": [ + "a31492a8-9932-419c-8295-5db9691c96b5" + ], + "ocp-date": [ + "Tue, 08 Sep 2015 18:03:03 GMT" + ], + "return-client-request-id": [ + "true" + ], + "User-Agent": [ + "Microsoft.Azure.Batch.Protocol.BatchRestClient/2.0.1.0", + "AzBatch/2.0.1.0" + ] + }, + "ResponseBody": "", + "ResponseHeaders": { + "Transfer-Encoding": [ + "chunked" + ], + "request-id": [ + "2680ea09-0088-42a5-98c4-77ca020370e8" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "client-request-id": [ + "a31492a8-9932-419c-8295-5db9691c96b5" + ], + "DataServiceVersion": [ + "3.0" + ], + "Date": [ + "Tue, 08 Sep 2015 18:03:03 GMT" + ], + "Server": [ + "Microsoft-HTTPAPI/2.0" + ] + }, + "StatusCode": 202 + } + ], + "Names": {}, + "Variables": { + "SubscriptionId": "6368ed38-3570-481f-b4fa-1d0a6e8d3f3b" + } +} \ No newline at end of file diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Tasks/GetBatchTaskCommandTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Tasks/GetBatchTaskCommandTests.cs index e53b3d02727d..93bc34be0a95 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Tasks/GetBatchTaskCommandTests.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Tasks/GetBatchTaskCommandTests.cs @@ -56,7 +56,7 @@ public void GetBatchTaskParametersTest() cmdlet.Filter = null; // Build a CloudTask instead of querying the service on a List CloudTask call - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(); cmdlet.AdditionalBehaviors = new List() { interceptor }; Assert.Throws(() => cmdlet.ExecuteCmdlet()); @@ -80,7 +80,7 @@ public void GetBatchTaskTest() // Build a CloudTask instead of querying the service on a Get CloudTask call CloudTaskGetResponse response = BatchTestHelpers.CreateCloudTaskGetResponse(cmdlet.Id); - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(response); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(response); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Setup the cmdlet to write pipeline output to a list that can be examined later @@ -109,7 +109,7 @@ public void ListBatchTasksByODataFilterTest() // Build some CloudTasks instead of querying the service on a List CloudTasks call CloudTaskListResponse response = BatchTestHelpers.CreateCloudTaskListResponse(idsOfConstructedTasks); - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(response); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(response); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Setup the cmdlet to write pipeline output to a list that can be examined later @@ -146,7 +146,7 @@ public void ListBatchTasksWithoutFiltersTest() // Build some CloudTasks instead of querying the service on a List CloudTasks call CloudTaskListResponse response = BatchTestHelpers.CreateCloudTaskListResponse(idsOfConstructedTasks); - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(response); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(response); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Setup the cmdlet to write pipeline output to a list that can be examined later @@ -188,7 +188,7 @@ public void ListTasksMaxCountTest() // Build some CloudTasks instead of querying the service on a List CloudTasks call CloudTaskListResponse response = BatchTestHelpers.CreateCloudTaskListResponse(idsOfConstructedTasks); - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(response); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(response); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Setup the cmdlet to write pipeline output to a list that can be examined later diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Tasks/NewBatchTaskCommandTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Tasks/NewBatchTaskCommandTests.cs index cbafce4f22ea..b34da1139b4c 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Tasks/NewBatchTaskCommandTests.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Tasks/NewBatchTaskCommandTests.cs @@ -59,7 +59,7 @@ public void NewBatchTaskParametersTest() cmdlet.Id = "testTask"; // Don't go to the service on an Add CloudTask call - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Verify no exceptions when required parameters are set diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Tasks/RemoveBatchTaskCommandTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Tasks/RemoveBatchTaskCommandTests.cs index a447f2c5de36..158eabdd0736 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Tasks/RemoveBatchTaskCommandTests.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Tasks/RemoveBatchTaskCommandTests.cs @@ -60,7 +60,7 @@ public void RemoveBatchTaskParametersTest() cmdlet.Id = "testTask"; // Don't go to the service on a Delete CloudTask call - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Verify no exceptions when required parameters are set diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Tasks/SetBatchTaskCommandTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Tasks/SetBatchTaskCommandTests.cs new file mode 100644 index 000000000000..552d6bc87147 --- /dev/null +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Tasks/SetBatchTaskCommandTests.cs @@ -0,0 +1,64 @@ +// ---------------------------------------------------------------------------------- +// +// 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; +using Microsoft.Azure.Batch; +using Microsoft.Azure.Batch.Protocol; +using Microsoft.Azure.Batch.Protocol.Models; +using Microsoft.Azure.Commands.Batch.Models; +using Microsoft.WindowsAzure.Commands.ScenarioTest; +using Moq; +using System.Management.Automation; +using Xunit; +using BatchClient = Microsoft.Azure.Commands.Batch.Models.BatchClient; + +namespace Microsoft.Azure.Commands.Batch.Test.Tasks +{ + public class SetBatchTaskCommandTests + { + private SetBatchTaskCommand cmdlet; + private Mock batchClientMock; + private Mock commandRuntimeMock; + + public SetBatchTaskCommandTests() + { + batchClientMock = new Mock(); + commandRuntimeMock = new Mock(); + cmdlet = new SetBatchTaskCommand() + { + CommandRuntime = commandRuntimeMock.Object, + BatchClient = batchClientMock.Object, + }; + } + + [Fact] + [Trait(Category.AcceptanceType, Category.CheckIn)] + public void SetBatchTaskParametersTest() + { + // Setup cmdlet without the required parameters + BatchAccountContext context = BatchTestHelpers.CreateBatchContextWithKeys(); + cmdlet.BatchContext = context; + + Assert.Throws(() => cmdlet.ExecuteCmdlet()); + + cmdlet.Task = new PSCloudTask(BatchTestHelpers.CreateFakeBoundTask(context)); + + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(); + cmdlet.AdditionalBehaviors = new BatchClientBehavior[] { interceptor }; + + // Verify that no exceptions occur + cmdlet.ExecuteCmdlet(); + } + } +} diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Tasks/StopBatchTaskCommandTests.cs b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Tasks/StopBatchTaskCommandTests.cs index 5626d04003fd..9fc58c375c0a 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/Tasks/StopBatchTaskCommandTests.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/Tasks/StopBatchTaskCommandTests.cs @@ -59,7 +59,7 @@ public void StopBatchTaskParametersTest() cmdlet.Id = "testTask"; // Don't go to the service on a Terminate CloudTask call - RequestInterceptor interceptor = BatchTestHelpers.CreateNoOpInterceptor(); + RequestInterceptor interceptor = BatchTestHelpers.CreateFakeServiceResponseInterceptor(); cmdlet.AdditionalBehaviors = new List() { interceptor }; // Verify no exceptions when required parameters are set diff --git a/src/ResourceManager/AzureBatch/Commands.Batch.Test/packages.config b/src/ResourceManager/AzureBatch/Commands.Batch.Test/packages.config index a1b2dd645320..f72609d2c847 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch.Test/packages.config +++ b/src/ResourceManager/AzureBatch/Commands.Batch.Test/packages.config @@ -3,7 +3,7 @@ - + diff --git a/src/ResourceManager/AzureBatch/Commands.Batch/Accounts/GetBatchAccountCommand.cs b/src/ResourceManager/AzureBatch/Commands.Batch/Accounts/GetBatchAccountCommand.cs index c44be7f1441d..c96b3d129008 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch/Accounts/GetBatchAccountCommand.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch/Accounts/GetBatchAccountCommand.cs @@ -18,7 +18,7 @@ namespace Microsoft.Azure.Commands.Batch { - [Cmdlet(VerbsCommon.Get, Constants.AzureRMBatchAccount), OutputType(typeof(BatchAccountContext))] + [Cmdlet(VerbsCommon.Get, Constants.AzureRmBatchAccount), OutputType(typeof(BatchAccountContext))] public class GetBatchAccountCommand : BatchCmdletBase { [Alias("Name")] diff --git a/src/ResourceManager/AzureBatch/Commands.Batch/Accounts/GetBatchAccountKeysCommand.cs b/src/ResourceManager/AzureBatch/Commands.Batch/Accounts/GetBatchAccountKeysCommand.cs index 4aebcda70028..59f857894aa3 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch/Accounts/GetBatchAccountKeysCommand.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch/Accounts/GetBatchAccountKeysCommand.cs @@ -17,7 +17,7 @@ namespace Microsoft.Azure.Commands.Batch { - [Cmdlet(VerbsCommon.Get, Constants.AzureRMBatchAccountKeys), OutputType(typeof(BatchAccountContext))] + [Cmdlet(VerbsCommon.Get, Constants.AzureRmBatchAccountKeys), OutputType(typeof(BatchAccountContext))] public class GetBatchAccountKeysCommand : BatchCmdletBase { [Parameter(Position = 0, Mandatory = true, ValueFromPipelineByPropertyName = true, diff --git a/src/ResourceManager/AzureBatch/Commands.Batch/Accounts/NewBatchAccountCommand.cs b/src/ResourceManager/AzureBatch/Commands.Batch/Accounts/NewBatchAccountCommand.cs index ecd36b03e35a..40af1c9f1fe2 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch/Accounts/NewBatchAccountCommand.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch/Accounts/NewBatchAccountCommand.cs @@ -18,7 +18,7 @@ namespace Microsoft.Azure.Commands.Batch { - [Cmdlet(VerbsCommon.New, Constants.AzureRMBatchAccount), OutputType(typeof(BatchAccountContext))] + [Cmdlet(VerbsCommon.New, Constants.AzureRmBatchAccount), OutputType(typeof(BatchAccountContext))] public class NewBatchAccountCommand : BatchCmdletBase { [Parameter(Position = 0, Mandatory = true, ValueFromPipelineByPropertyName = true, diff --git a/src/ResourceManager/AzureBatch/Commands.Batch/Accounts/NewBatchAccountKeyCommand.cs b/src/ResourceManager/AzureBatch/Commands.Batch/Accounts/NewBatchAccountKeyCommand.cs index 14bb82c62ffe..6bdcb76a690b 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch/Accounts/NewBatchAccountKeyCommand.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch/Accounts/NewBatchAccountKeyCommand.cs @@ -18,7 +18,7 @@ namespace Microsoft.Azure.Commands.Batch { - [Cmdlet(VerbsCommon.New, Constants.AzureRMBatchAccountKey), OutputType(typeof(BatchAccountContext))] + [Cmdlet(VerbsCommon.New, Constants.AzureRmBatchAccountKey), OutputType(typeof(BatchAccountContext))] public class RegenBatchAccountKeyCommand : BatchCmdletBase { [Parameter(Position = 0, Mandatory = true, ValueFromPipelineByPropertyName = true, diff --git a/src/ResourceManager/AzureBatch/Commands.Batch/Accounts/RemoveBatchAccountCommand.cs b/src/ResourceManager/AzureBatch/Commands.Batch/Accounts/RemoveBatchAccountCommand.cs index 8c5862fcbd09..ea7571a638b7 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch/Accounts/RemoveBatchAccountCommand.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch/Accounts/RemoveBatchAccountCommand.cs @@ -18,7 +18,7 @@ namespace Microsoft.Azure.Commands.Batch { - [Cmdlet(VerbsCommon.Remove, Constants.AzureRMBatchAccount)] + [Cmdlet(VerbsCommon.Remove, Constants.AzureRmBatchAccount)] public class RemoveBatchAccountCommand : BatchCmdletBase { private static string mamlCall = "RemoveAccount"; diff --git a/src/ResourceManager/AzureBatch/Commands.Batch/Accounts/SetBatchAccountCommand.cs b/src/ResourceManager/AzureBatch/Commands.Batch/Accounts/SetBatchAccountCommand.cs index fe5dc2aa071d..ffd5a5213d83 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch/Accounts/SetBatchAccountCommand.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch/Accounts/SetBatchAccountCommand.cs @@ -18,7 +18,7 @@ namespace Microsoft.Azure.Commands.Batch { - [Cmdlet(VerbsCommon.Set, Constants.AzureRMBatchAccount), OutputType(typeof(BatchAccountContext))] + [Cmdlet(VerbsCommon.Set, Constants.AzureRmBatchAccount), OutputType(typeof(BatchAccountContext))] public class SetBatchAccountCommand : BatchCmdletBase { [Parameter(Mandatory = true, Position = 0, ValueFromPipelineByPropertyName = true, diff --git a/src/ResourceManager/AzureBatch/Commands.Batch/Commands.Batch.csproj b/src/ResourceManager/AzureBatch/Commands.Batch/Commands.Batch.csproj index 2f77d199352c..7b4a599bcf68 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch/Commands.Batch.csproj +++ b/src/ResourceManager/AzureBatch/Commands.Batch/Commands.Batch.csproj @@ -52,7 +52,7 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -156,16 +156,19 @@ + + + @@ -257,11 +260,13 @@ + + @@ -277,6 +282,7 @@ + @@ -311,25 +317,15 @@ + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/src/ResourceManager/AzureBatch/Commands.Batch/ComputeNodeUsers/SetBatchComputeNodeUserCommand.cs b/src/ResourceManager/AzureBatch/Commands.Batch/ComputeNodeUsers/SetBatchComputeNodeUserCommand.cs new file mode 100644 index 000000000000..ae6fcdc2ed0e --- /dev/null +++ b/src/ResourceManager/AzureBatch/Commands.Batch/ComputeNodeUsers/SetBatchComputeNodeUserCommand.cs @@ -0,0 +1,59 @@ +// ---------------------------------------------------------------------------------- +// +// 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; +using Microsoft.Azure.Commands.Batch.Models; +using System.Management.Automation; +using Constants = Microsoft.Azure.Commands.Batch.Utils.Constants; + +namespace Microsoft.Azure.Commands.Batch +{ + [Cmdlet(VerbsCommon.Set, Constants.AzureBatchComputeNodeUser)] + public class SetBatchComputeNodeUserCommand : BatchObjectModelCmdletBase + { + [Parameter(Position = 0, Mandatory = true, + HelpMessage = "The id of the pool containing the compute node.")] + [ValidateNotNullOrEmpty] + public string PoolId { get; set; } + + [Parameter(Position = 1, Mandatory = true, + HelpMessage = "The id of the compute node containing the user account to update.")] + [ValidateNotNullOrEmpty] + public string ComputeNodeId { get; set; } + + [Parameter(Position = 2, Mandatory = true, + HelpMessage = "The name of the user account to update.")] + [ValidateNotNullOrEmpty] + public string Name { get; set; } + + [Parameter(Position = 3, Mandatory = true, HelpMessage = "The account password.")] + [ValidateNotNullOrEmpty] + public string Password { get; set; } + + [Parameter] + [ValidateNotNullOrEmpty] + public DateTime ExpiryTime { get; set; } + + protected override void ProcessRecord() + { + UpdateComputeNodeUserParameters parameters = new UpdateComputeNodeUserParameters(this.BatchContext, + this.PoolId, this.ComputeNodeId, this.Name, this.AdditionalBehaviors) + { + Password = this.Password, + ExpiryTime = this.ExpiryTime + }; + this.BatchClient.UpdateComputeNodeUser(parameters); + } + } +} diff --git a/src/ResourceManager/AzureBatch/Commands.Batch/JobSchedules/SetBatchJobScheduleCommand.cs b/src/ResourceManager/AzureBatch/Commands.Batch/JobSchedules/SetBatchJobScheduleCommand.cs new file mode 100644 index 000000000000..fb774663e6cd --- /dev/null +++ b/src/ResourceManager/AzureBatch/Commands.Batch/JobSchedules/SetBatchJobScheduleCommand.cs @@ -0,0 +1,34 @@ +// ---------------------------------------------------------------------------------- +// +// 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.Batch.Models; +using System.Management.Automation; +using Constants = Microsoft.Azure.Commands.Batch.Utils.Constants; + +namespace Microsoft.Azure.Commands.Batch +{ + [Cmdlet(VerbsCommon.Set, Constants.AzureBatchJobSchedule)] + public class SetBatchJobScheduleCommand : BatchObjectModelCmdletBase + { + [Parameter(Position = 0, Mandatory = true, ValueFromPipeline = true, + HelpMessage = "The PSCloudJobSchedule object with changes to commit to the Batch Service.")] + [ValidateNotNullOrEmpty] + public PSCloudJobSchedule JobSchedule { get; set; } + + protected override void ProcessRecord() + { + this.BatchClient.UpdateJobSchedule(this.BatchContext, this.JobSchedule, this.AdditionalBehaviors); + } + } +} diff --git a/src/ResourceManager/Resources/Commands.Resources/Models.Authorization/PSServiceRoleAssignment.cs b/src/ResourceManager/AzureBatch/Commands.Batch/Jobs/SetBatchJobCommand.cs similarity index 51% rename from src/ResourceManager/Resources/Commands.Resources/Models.Authorization/PSServiceRoleAssignment.cs rename to src/ResourceManager/AzureBatch/Commands.Batch/Jobs/SetBatchJobCommand.cs index 935977a74f97..dbce5dec7323 100644 --- a/src/ResourceManager/Resources/Commands.Resources/Models.Authorization/PSServiceRoleAssignment.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch/Jobs/SetBatchJobCommand.cs @@ -12,12 +12,23 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using System.Collections.Generic; +using Microsoft.Azure.Commands.Batch.Models; +using System.Management.Automation; +using Constants = Microsoft.Azure.Commands.Batch.Utils.Constants; -namespace Microsoft.Azure.Commands.Resources.Models.Authorization +namespace Microsoft.Azure.Commands.Batch { - public class PSServiceRoleAssignment : PSRoleAssignment + [Cmdlet(VerbsCommon.Set, Constants.AzureBatchJob)] + public class SetBatchJobCommand : BatchObjectModelCmdletBase { - public string ServicePrincipalName { get; set; } + [Parameter(Position = 0, Mandatory = true, ValueFromPipeline = true, + HelpMessage = "The PSCloudJob object with changes to commit to the Batch Service.")] + [ValidateNotNullOrEmpty] + public PSCloudJob Job { get; set; } + + protected override void ProcessRecord() + { + this.BatchClient.UpdateJob(this.BatchContext, this.Job, this.AdditionalBehaviors); + } } } diff --git a/src/ResourceManager/AzureBatch/Commands.Batch/Microsoft.Azure.Commands.Batch.dll-Help.xml b/src/ResourceManager/AzureBatch/Commands.Batch/Microsoft.Azure.Commands.Batch.dll-Help.xml index a370084dc237..b0812f74cb59 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch/Microsoft.Azure.Commands.Batch.dll-Help.xml +++ b/src/ResourceManager/AzureBatch/Commands.Batch/Microsoft.Azure.Commands.Batch.dll-Help.xml @@ -9415,6 +9415,849 @@ cmdletexample westus cmdletexamplerg {System.Collection https: + + + + Set-AzureBatchComputeNodeUser + + + Updates the properties of a user account on a compute node. + + + + + Set + AzureBatchComputeNodeUser + + + + Updates the properties of a user account on a compute node. + + + + + Set-AzureBatchComputeNodeUser + + PoolId + + The id of the pool containing the compute node. + + string + + + ComputeNodeId + + The id of the compute node containing the user account to update. + + string + + + Name + + The name of the user account to update. + + string + + + Password + + The account password. + + string + + + BatchContext + + The BatchAccountContext instance to use when interacting with the Batch service. Use the Get-AzureRMBatchAccountKeys cmdlet to get a BatchAccountContext object with its access keys populated. + + BatchAccountContext + + + ExpiryTime + + The time at which the account should expire. The default is 1 day from the time of the update. + + DateTime + + + + + + + BatchContext + + The BatchAccountContext instance to use when interacting with the Batch service. Use the Get-AzureRMBatchAccountKeys cmdlet to get a BatchAccountContext object with its access keys populated. + + + BatchAccountContext + + BatchAccountContext + + + + + + ComputeNodeId + + The id of the compute node containing the user account to update. + + + string + + string + + + + + + ExpiryTime + + The time at which the account should expire. The default is 1 day from the time of the update. + + + DateTime + + DateTime + + + + + + Name + + The name of the user account to update. + + + string + + string + + + + + + Password + + The account password. + + + string + + string + + + + + + PoolId + + The id of the pool containing the compute node. + + + string + + string + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -------------------------- EXAMPLE 1 -------------------------- + + + C:\PS> + + + Set-AzureBatchComputeNodeUser "myPool" "tvm-3257026573_1-20150904t230807z" "myUser" "Password1234!" -ExpiryTime ([DateTime]::Now.AddDays(14)) -BatchContext $context + + + Description + ----------- + Updates the "myUser" user account on compute node "tvm-3257026573_1-20150904t230807z" in pool "myPool". The account password is updated to "Password1234!", and the expiry time is updated to 14 days from now. + + + + + + + + + + + + + + + + + + + + + + + + Set-AzureBatchJob + + + Updates the properties of a job. + + + + + Set + AzureBatchJob + + + + Updates the properties of a job. + + + + + Set-AzureBatchJob + + Job + + The PSCloudJob object with changes to commit to the Batch Service. Use the Get-AzureBatchJob cmdlet to get a PSCloudJob object. Modify the properties of this object and pass it into the Set-AzureBatchJob cmdlet to commit these changes to the Batch Service. + + PSCloudJob + + + BatchContext + + The BatchAccountContext instance to use when interacting with the Batch service. Use the Get-AzureRMBatchAccountKeys cmdlet to get a BatchAccountContext object with its access keys populated. + + BatchAccountContext + + + + + + + BatchContext + + The BatchAccountContext instance to use when interacting with the Batch service. Use the Get-AzureRMBatchAccountKeys cmdlet to get a BatchAccountContext object with its access keys populated. + + + BatchAccountContext + + BatchAccountContext + + + + + + Job + + The PSCloudJob object with changes to commit to the Batch Service. Use the Get-AzureBatchJob cmdlet to get a PSCloudJob object. Modify the properties of this object and pass it into the Set-AzureBatchJob cmdlet to commit these changes to the Batch Service. + + + PSCloudJob + + PSCloudJob + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -------------------------- EXAMPLE 1 -------------------------- + + + C:\PS> + + + $job = Get-AzureBatchJob "myJob" -BatchContext $context + $job.Priority = 1 + $job | Set-AzureBatchJob -BatchContext $context + + + Description + ----------- + Updates the priority of job "myJob" to a new value of 1. + + + + + + + + + + + + + + + + + + + + + + + + Set-AzureBatchJobSchedule + + + Updates the properties of a job schedule. + + + + + Set + AzureBatchJobSchedule + + + + Updates the properties of a job schedule. + + + + + Set-AzureBatchJobSchedule + + JobSchedule + + The PSCloudJobSchedule object with changes to commit to the Batch Service. Use the Get-AzureBatchJobSchedule cmdlet to get a PSCloudJobSchedule object. Modify the properties of this object and pass it into the Set-AzureBatchJobSchedule cmdlet to commit these changes to the Batch Service. + + PSCloudJobSchedule + + + BatchContext + + The BatchAccountContext instance to use when interacting with the Batch service. Use the Get-AzureRMBatchAccountKeys cmdlet to get a BatchAccountContext object with its access keys populated. + + BatchAccountContext + + + + + + + BatchContext + + The BatchAccountContext instance to use when interacting with the Batch service. Use the Get-AzureRMBatchAccountKeys cmdlet to get a BatchAccountContext object with its access keys populated. + + + BatchAccountContext + + BatchAccountContext + + + + + + JobSchedule + + The PSCloudJobSchedule object with changes to commit to the Batch Service. Use the Get-AzureBatchJobSchedule cmdlet to get a PSCloudJobSchedule object. Modify the properties of this object and pass it into the Set-AzureBatchJobSchedule cmdlet to commit these changes to the Batch Service. + + + PSCloudJobSchedule + + PSCloudJobSchedule + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -------------------------- EXAMPLE 1 -------------------------- + + + C:\PS> + + + $jobSchedule = Get-AzureBatchJobSchedule "myJobSchedule" -BatchContext $context + $schedule = New-Object Microsoft.Azure.Commands.Batch.Models.PSSchedule + $schedule.DoNotRunAfter = [DateTime]::Now.AddDays(30) + $schedule.DoNotRunUntil = [DateTime]::Now.AddDays(1) + $jobSchedule.Schedule = $schedule + $jobSchedule | Set-AzureBatchJobSchedule -BatchContext $context + + + Description + ----------- + Updates the Schedule property on the job schedule with id "myJobSchedule". + + + + + + + + + + + + + + + + + + + + + + + + Set-AzureBatchPool + + + Updates the properties of a pool. + + + + + Set + AzureBatchPool + + + + Updates the properties of a pool. + + + + + Set-AzureBatchPool + + Pool + + The PSCloudPool object with changes to commit to the Batch Service. Use the Get-AzureBatchPool cmdlet to get a PSCloudPool object. Modify the properties of this object and pass it into the Set-AzureBatchPool cmdlet to commit these changes to the Batch Service. + + PSCloudPool + + + BatchContext + + The BatchAccountContext instance to use when interacting with the Batch service. Use the Get-AzureRMBatchAccountKeys cmdlet to get a BatchAccountContext object with its access keys populated. + + BatchAccountContext + + + + + + + BatchContext + + The BatchAccountContext instance to use when interacting with the Batch service. Use the Get-AzureRMBatchAccountKeys cmdlet to get a BatchAccountContext object with its access keys populated. + + + BatchAccountContext + + BatchAccountContext + + + + + + Pool + + The PSCloudPool object with changes to commit to the Batch Service. Use the Get-AzureBatchPool cmdlet to get a PSCloudPool object. Modify the properties of this object and pass it into the Set-AzureBatchPool cmdlet to commit these changes to the Batch Service. + + + PSCloudPool + + PSCloudPool + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -------------------------- EXAMPLE 1 -------------------------- + + + C:\PS> + + + $pool = Get-AzureBatchPool "myPool" -BatchContext $context + $startTask = New-Object Microsoft.Azure.Commands.Batch.Models.PSStartTask + $startTask.CommandLine = "cmd /c echo example" + $pool.StartTask = $startTask + $pool | Set-AzureBatchPool -BatchContext $context + + + Description + ----------- + Updates the start task specification on pool "myPool". + + + + + + + + + + + + + + + + + + + + + + + + Set-AzureBatchTask + + + Updates the properties of a task. + + + + + Set + AzureBatchTask + + + + Updates the properties of a task. + + + + + Set-AzureBatchTask + + Task + + The PSCloudTask object with changes to commit to the Batch Service. Use the Get-AzureBatchTask cmdlet to get a PSCloudTask object. Modify the properties of this object and pass it into the Set-AzureBatchTask cmdlet to commit these changes to the Batch Service. + + PSCloudTask + + + BatchContext + + The BatchAccountContext instance to use when interacting with the Batch service. Use the Get-AzureRMBatchAccountKeys cmdlet to get a BatchAccountContext object with its access keys populated. + + BatchAccountContext + + + + + + + BatchContext + + The BatchAccountContext instance to use when interacting with the Batch service. Use the Get-AzureRMBatchAccountKeys cmdlet to get a BatchAccountContext object with its access keys populated. + + + BatchAccountContext + + BatchAccountContext + + + + + + Task + + The PSCloudTask object with changes to commit to the Batch Service. Use the Get-AzureBatchTask cmdlet to get a PSCloudTask object. Modify the properties of this object and pass it into the Set-AzureBatchTask cmdlet to commit these changes to the Batch Service. + + + PSCloudTask + + PSCloudTask + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + -------------------------- EXAMPLE 1 -------------------------- + + + C:\PS> + + + $task = Get-AzureBatchTask "myJob" "myTask" -BatchContext $context + $constraints = New-Object Microsoft.Azure.Commands.Batch.Models.PSTaskConstraints -ArgumentList @([TimeSpan}::FromDays(5), [TimeSpan]::FromDays(2), 3) + $task.Constraints = $constraints + $task | Set-AzureBatchTask -BatchContext $context + + + Description + ----------- + Updates the constraints on task "myTask" under job "myJob". + + + + + + + + + + + + + + + + + + + + diff --git a/src/ResourceManager/AzureBatch/Commands.Batch/Models/BatchClient.ComputeNodeUsers.cs b/src/ResourceManager/AzureBatch/Commands.Batch/Models/BatchClient.ComputeNodeUsers.cs index 587ed9e7c4ba..ba7691e4a998 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch/Models/BatchClient.ComputeNodeUsers.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch/Models/BatchClient.ComputeNodeUsers.cs @@ -58,6 +58,26 @@ public void CreateComputeNodeUser(NewComputeNodeUserParameters options) user.Commit(ComputeNodeUserCommitSemantics.AddUser, options.AdditionalBehaviors); } + /// + /// Updates a compute node user account + /// + /// The parameters specifying the compute node user to update and the changes to make + public void UpdateComputeNodeUser(UpdateComputeNodeUserParameters parameters) + { + if (parameters == null) + { + throw new ArgumentNullException("parameters"); + } + + WriteVerbose(string.Format(Resources.UpdatingComputeNodeUser, parameters.ComputeNodeUserName)); + + ComputeNodeUser computeNodeUser = new ComputeNodeUser(parameters.Context.BatchOMClient.PoolOperations, parameters.PoolId, parameters.ComputeNodeId); + computeNodeUser.Name = parameters.ComputeNodeUserName; + computeNodeUser.Password = parameters.Password; + computeNodeUser.ExpiryTime = parameters.ExpiryTime; + computeNodeUser.Commit(ComputeNodeUserCommitSemantics.UpdateUser, parameters.AdditionalBehaviors); + } + /// /// Deletes the specified compute node user. /// diff --git a/src/ResourceManager/AzureBatch/Commands.Batch/Models/BatchClient.JobSchedules.cs b/src/ResourceManager/AzureBatch/Commands.Batch/Models/BatchClient.JobSchedules.cs index 94a1ce5de840..85205e9e3215 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch/Models/BatchClient.JobSchedules.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch/Models/BatchClient.JobSchedules.cs @@ -111,6 +111,25 @@ public void CreateJobSchedule(NewJobScheduleParameters parameters) jobSchedule.Commit(parameters.AdditionalBehaviors); } + /// + /// Commits changes to a PSCloudJobSchedule object to the Batch Service. + /// + /// The account to use. + /// The PSCloudJobSchedule object representing the job schedule to update. + /// Additional client behaviors to perform. + public void UpdateJobSchedule(BatchAccountContext context, PSCloudJobSchedule jobSchedule, IEnumerable additionBehaviors = null) + { + if (jobSchedule == null) + { + throw new ArgumentNullException("jobSchedule"); + } + + WriteVerbose(string.Format(Resources.UpdatingJobSchedule, jobSchedule.Id)); + + Utils.Utils.BoundJobScheduleSyncCollections(jobSchedule); + jobSchedule.omObject.Commit(additionBehaviors); + } + /// /// Deletes the specified job schedule. /// diff --git a/src/ResourceManager/AzureBatch/Commands.Batch/Models/BatchClient.Jobs.cs b/src/ResourceManager/AzureBatch/Commands.Batch/Models/BatchClient.Jobs.cs index ff89a7120bbd..7987721f4bbc 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch/Models/BatchClient.Jobs.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch/Models/BatchClient.Jobs.cs @@ -153,6 +153,25 @@ public void CreateJob(NewJobParameters parameters) job.Commit(parameters.AdditionalBehaviors); } + /// + /// Commits changes to a PSCloudJob object to the Batch Service. + /// + /// The account to use. + /// The PSCloudJob object representing the job to update. + /// Additional client behaviors to perform. + public void UpdateJob(BatchAccountContext context, PSCloudJob job, IEnumerable additionBehaviors = null) + { + if (job == null) + { + throw new ArgumentNullException("job"); + } + + WriteVerbose(string.Format(Resources.UpdatingJob, job.Id)); + + Utils.Utils.BoundJobSyncCollections(job); + job.omObject.Commit(additionBehaviors); + } + /// /// Deletes the specified job. /// diff --git a/src/ResourceManager/AzureBatch/Commands.Batch/Models/BatchClient.Pools.cs b/src/ResourceManager/AzureBatch/Commands.Batch/Models/BatchClient.Pools.cs index 1a4e76c60c17..db0dcd6daca8 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch/Models/BatchClient.Pools.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch/Models/BatchClient.Pools.cs @@ -130,6 +130,25 @@ public void CreatePool(NewPoolParameters parameters) pool.Commit(parameters.AdditionalBehaviors); } + /// + /// Commits changes to a PSCloudPool object to the Batch Service. + /// + /// The account to use. + /// The PSCloudPool object representing the pool to update. + /// Additional client behaviors to perform. + public void UpdatePool(BatchAccountContext context, PSCloudPool pool, IEnumerable additionBehaviors = null) + { + if (pool == null) + { + throw new ArgumentNullException("pool"); + } + + WriteVerbose(string.Format(Resources.UpdatingPool, pool.Id)); + + Utils.Utils.BoundPoolSyncCollections(pool); + pool.omObject.Commit(additionBehaviors); + } + /// /// Deletes the specified pool. /// diff --git a/src/ResourceManager/AzureBatch/Commands.Batch/Models/BatchClient.Tasks.cs b/src/ResourceManager/AzureBatch/Commands.Batch/Models/BatchClient.Tasks.cs index 3ac03bb3eb7b..10b04145d83a 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch/Models/BatchClient.Tasks.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch/Models/BatchClient.Tasks.cs @@ -135,6 +135,24 @@ public void CreateTask(NewTaskParameters parameters) } } + /// + /// Commits changes to a PSCloudTask object to the Batch Service. + /// + /// The account to use. + /// The PSCloudTask object representing the task to update. + /// Additional client behaviors to perform. + public void UpdateTask(BatchAccountContext context, PSCloudTask task, IEnumerable additionBehaviors = null) + { + if (task == null) + { + throw new ArgumentNullException("task"); + } + + WriteVerbose(string.Format(Resources.UpdatingTask, task.Id)); + + task.omObject.Commit(additionBehaviors); + } + /// /// Deletes the specified task. /// diff --git a/src/ResourceManager/Resources/Commands.Resources/Models.Authorization/PSUserRoleAssignment.cs b/src/ResourceManager/AzureBatch/Commands.Batch/Models/UpdateComputeNodeUserParameters.cs similarity index 52% rename from src/ResourceManager/Resources/Commands.Resources/Models.Authorization/PSUserRoleAssignment.cs rename to src/ResourceManager/AzureBatch/Commands.Batch/Models/UpdateComputeNodeUserParameters.cs index 61e6c72bfd81..52e1554de612 100644 --- a/src/ResourceManager/Resources/Commands.Resources/Models.Authorization/PSUserRoleAssignment.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch/Models/UpdateComputeNodeUserParameters.cs @@ -12,14 +12,27 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using System; +using Microsoft.Azure.Batch; using System.Collections.Generic; -namespace Microsoft.Azure.Commands.Resources.Models.Authorization +namespace Microsoft.Azure.Commands.Batch.Models { - public class PSUserRoleAssignment : PSRoleAssignment + public class UpdateComputeNodeUserParameters : ComputeNodeUserOperationParameters { - public string UserPrincipalName { get; set; } + public UpdateComputeNodeUserParameters(BatchAccountContext context, string poolId, string computeNodeId, string computeNodeUserName, + IEnumerable additionalBehaviors = null) + : base(context, poolId, computeNodeId, computeNodeUserName, additionalBehaviors) + { } - public string Mail { get; set; } + /// + /// The account password. + /// + public string Password { get; set; } + + /// + /// The expiry time. + /// + public DateTime ExpiryTime { get; set; } } } diff --git a/src/ResourceManager/AzureBatch/Commands.Batch/Pools/SetBatchPoolCommand.cs b/src/ResourceManager/AzureBatch/Commands.Batch/Pools/SetBatchPoolCommand.cs new file mode 100644 index 000000000000..d718c30e4b1d --- /dev/null +++ b/src/ResourceManager/AzureBatch/Commands.Batch/Pools/SetBatchPoolCommand.cs @@ -0,0 +1,34 @@ +// ---------------------------------------------------------------------------------- +// +// 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.Batch.Models; +using System.Management.Automation; +using Constants = Microsoft.Azure.Commands.Batch.Utils.Constants; + +namespace Microsoft.Azure.Commands.Batch +{ + [Cmdlet(VerbsCommon.Set, Constants.AzureBatchPool)] + public class SetBatchPoolCommand : BatchObjectModelCmdletBase + { + [Parameter(Position = 0, Mandatory = true, ValueFromPipeline = true, + HelpMessage = "The PSCloudPool object with changes to commit to the Batch Service.")] + [ValidateNotNullOrEmpty] + public PSCloudPool Pool { get; set; } + + protected override void ProcessRecord() + { + this.BatchClient.UpdatePool(this.BatchContext, this.Pool, this.AdditionalBehaviors); + } + } +} diff --git a/src/ResourceManager/AzureBatch/Commands.Batch/Properties/Resources.Designer.cs b/src/ResourceManager/AzureBatch/Commands.Batch/Properties/Resources.Designer.cs index e585e46bb03b..4de1b59c3c07 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch/Properties/Resources.Designer.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch/Properties/Resources.Designer.cs @@ -824,5 +824,50 @@ internal static string UpdatingAccount { return ResourceManager.GetString("UpdatingAccount", resourceCulture); } } + + /// + /// Looks up a localized string similar to Updating compute node user {0}.. + /// + internal static string UpdatingComputeNodeUser { + get { + return ResourceManager.GetString("UpdatingComputeNodeUser", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Updating job {0}.. + /// + internal static string UpdatingJob { + get { + return ResourceManager.GetString("UpdatingJob", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Updating job schedule {0}.. + /// + internal static string UpdatingJobSchedule { + get { + return ResourceManager.GetString("UpdatingJobSchedule", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Updating pool {0}.. + /// + internal static string UpdatingPool { + get { + return ResourceManager.GetString("UpdatingPool", resourceCulture); + } + } + + /// + /// Looks up a localized string similar to Updating task {0}.. + /// + internal static string UpdatingTask { + get { + return ResourceManager.GetString("UpdatingTask", resourceCulture); + } + } } } diff --git a/src/ResourceManager/AzureBatch/Commands.Batch/Properties/Resources.resx b/src/ResourceManager/AzureBatch/Commands.Batch/Properties/Resources.resx index fb5131a80985..a4be31c3d82d 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch/Properties/Resources.resx +++ b/src/ResourceManager/AzureBatch/Commands.Batch/Properties/Resources.resx @@ -373,4 +373,19 @@ Updating account {0} + + Updating compute node user {0}. + + + Updating job {0}. + + + Updating job schedule {0}. + + + Updating pool {0}. + + + Updating task {0}. + \ No newline at end of file diff --git a/src/ResourceManager/AzureBatch/Commands.Batch/Tasks/SetBatchTaskCommand.cs b/src/ResourceManager/AzureBatch/Commands.Batch/Tasks/SetBatchTaskCommand.cs new file mode 100644 index 000000000000..0754d8322d93 --- /dev/null +++ b/src/ResourceManager/AzureBatch/Commands.Batch/Tasks/SetBatchTaskCommand.cs @@ -0,0 +1,34 @@ +// ---------------------------------------------------------------------------------- +// +// 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.Batch.Models; +using System.Management.Automation; +using Constants = Microsoft.Azure.Commands.Batch.Utils.Constants; + +namespace Microsoft.Azure.Commands.Batch +{ + [Cmdlet(VerbsCommon.Set, Constants.AzureBatchTask)] + public class SetBatchTaskCommand : BatchObjectModelCmdletBase + { + [Parameter(Position = 0, Mandatory = true, ValueFromPipeline = true, + HelpMessage = "The PSCloudTask object with changes to commit to the Batch Service.")] + [ValidateNotNullOrEmpty] + public PSCloudTask Task { get; set; } + + protected override void ProcessRecord() + { + this.BatchClient.UpdateTask(this.BatchContext, this.Task, this.AdditionalBehaviors); + } + } +} diff --git a/src/ResourceManager/AzureBatch/Commands.Batch/Utils/Constants.cs b/src/ResourceManager/AzureBatch/Commands.Batch/Utils/Constants.cs index f2047a0a96d1..c038c2208b5e 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch/Utils/Constants.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch/Utils/Constants.cs @@ -19,9 +19,9 @@ public class Constants public const int DefaultMaxCount = 1000; // ARM cmdlet nouns - public const string AzureRMBatchAccount = "AzureRmBatchAccount"; - public const string AzureRMBatchAccountKey = "AzureRmBatchAccountKey"; - public const string AzureRMBatchAccountKeys = "AzureRmBatchAccountKeys"; + public const string AzureRmBatchAccount = "AzureRmBatchAccount"; + public const string AzureRmBatchAccountKey = "AzureRmBatchAccountKey"; + public const string AzureRmBatchAccountKeys = "AzureRmBatchAccountKeys"; // Batch Service cmdlet nouns public const string AzureBatchPool = "AzureBatchPool"; diff --git a/src/ResourceManager/AzureBatch/Commands.Batch/Utils/Utils.cs b/src/ResourceManager/AzureBatch/Commands.Batch/Utils/Utils.cs index e07ac3bcdf11..45e7f393e194 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch/Utils/Utils.cs +++ b/src/ResourceManager/AzureBatch/Commands.Batch/Utils/Utils.cs @@ -25,6 +25,75 @@ namespace Microsoft.Azure.Commands.Batch.Utils /// internal static class Utils { + /// + /// Syncs the collections on a bound PSCloudPool with its wrapped OM object + /// + internal static void BoundPoolSyncCollections(PSCloudPool pool) + { + if (pool != null) + { + pool.omObject.CertificateReferences = CreateSyncedList(pool.CertificateReferences, + (c) => + { + return ConvertCertificateReference(c); + }); + + pool.omObject.Metadata = CreateSyncedList(pool.Metadata, + (m) => + { + MetadataItem metadata = new MetadataItem(m.Name, m.Value); + return metadata; + }); + + if (pool.StartTask != null) + { + StartTaskSyncCollections(pool.StartTask); + } + } + } + + /// + /// Syncs the collections on a bound PSCloudJobSchedule with its wrapped OM object + /// + internal static void BoundJobScheduleSyncCollections(PSCloudJobSchedule jobSchedule) + { + if (jobSchedule != null) + { + jobSchedule.omObject.Metadata = CreateSyncedList(jobSchedule.Metadata, + (m) => + { + MetadataItem metadata = new MetadataItem(m.Name, m.Value); + return metadata; + }); + + if (jobSchedule.JobSpecification != null) + { + JobSpecificationSyncCollections(jobSchedule.JobSpecification); + } + } + } + + /// + /// Syncs the collections on a bound PSCloudJob with its wrapped OM object + /// + internal static void BoundJobSyncCollections(PSCloudJob job) + { + if (job != null) + { + job.omObject.Metadata = CreateSyncedList(job.Metadata, + (m) => + { + MetadataItem metadata = new MetadataItem(m.Name, m.Value); + return metadata; + }); + + if (job.PoolInformation != null) + { + PoolInformationSyncCollections(job.PoolInformation); + } + } + } + /// /// Syncs the collections on a PSJobSpecification with its wrapped OM object /// @@ -175,13 +244,7 @@ internal static void PoolSpecificationSyncCollections(PSPoolSpecification spec) spec.omObject.CertificateReferences = CreateSyncedList(spec.CertificateReferences, (c) => { - CertificateReference certReference = new CertificateReference(); - certReference.StoreLocation = c.StoreLocation; - certReference.StoreName = c.StoreName; - certReference.Thumbprint = c.Thumbprint; - certReference.ThumbprintAlgorithm = c.ThumbprintAlgorithm; - certReference.Visibility = c.Visibility; - return certReference; + return ConvertCertificateReference(c); }); spec.omObject.Metadata = CreateSyncedList(spec.Metadata, @@ -244,5 +307,19 @@ private static IList CreateSyncedList(IEnumerable psList, Fu } return omList; } + + /// + /// Converts a PSCertificateReference to a CertificateReference + /// + private static CertificateReference ConvertCertificateReference(PSCertificateReference psCert) + { + CertificateReference certReference = new CertificateReference(); + certReference.StoreLocation = psCert.StoreLocation; + certReference.StoreName = psCert.StoreName; + certReference.Thumbprint = psCert.Thumbprint; + certReference.ThumbprintAlgorithm = psCert.ThumbprintAlgorithm; + certReference.Visibility = psCert.Visibility; + return certReference; + } } } diff --git a/src/ResourceManager/AzureBatch/Commands.Batch/packages.config b/src/ResourceManager/AzureBatch/Commands.Batch/packages.config index 15b7a9cc80ad..e88277ae7987 100644 --- a/src/ResourceManager/AzureBatch/Commands.Batch/packages.config +++ b/src/ResourceManager/AzureBatch/Commands.Batch/packages.config @@ -3,7 +3,7 @@ - + diff --git a/src/ResourceManager/AzureBatch/NuGet.Config b/src/ResourceManager/AzureBatch/NuGet.Config new file mode 100644 index 000000000000..2de911013532 --- /dev/null +++ b/src/ResourceManager/AzureBatch/NuGet.Config @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/ResourceManager/Common/Commands.ResourceManager.Common/Commands.ResourceManager.Common.csproj b/src/ResourceManager/Common/Commands.ResourceManager.Common/Commands.ResourceManager.Common.csproj index 08f4285fa0ef..aaf987173ae0 100644 --- a/src/ResourceManager/Common/Commands.ResourceManager.Common/Commands.ResourceManager.Common.csproj +++ b/src/ResourceManager/Common/Commands.ResourceManager.Common/Commands.ResourceManager.Common.csproj @@ -61,7 +61,7 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -140,48 +140,6 @@ - - Common\AzurePSCmdlet.cs - - - Common\AzurePowerShell.cs - - - Common\AzurePSDataCollectionProfile.cs - - - Common\CmdletExtensions.cs - - - Common\ConversionUtilities.cs - - - Common\DebugStreamTraceListener.cs - - - Common\GeneralUtilities.cs - - - Common\MetricHelper.cs - - - Common\PowerShellUtilities.cs - - - Common\ProfileClientExtensions.cs - - - Common\PSAzureAccount.cs - - - Common\RecordingTracingInterceptor.cs - - - Common\SecureStringExtensions.cs - - - Common\TestMockSupport.cs - @@ -203,7 +161,12 @@ Designer + + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + + - \ No newline at end of file diff --git a/src/ResourceManager/Common/Commands.ResourceManager.Common/RMProfileClient.cs b/src/ResourceManager/Common/Commands.ResourceManager.Common/RMProfileClient.cs index 5b0ba40b17e1..159ede44f4ae 100644 --- a/src/ResourceManager/Common/Commands.ResourceManager.Common/RMProfileClient.cs +++ b/src/ResourceManager/Common/Commands.ResourceManager.Common/RMProfileClient.cs @@ -151,6 +151,19 @@ public bool TryGetSubscription(string tenantId, string subscriptionId, out Azure tenantId, subscriptionId, out subscription, out tenant); } + public bool TryGetSubscriptionByName(string tenantId, string subscriptionName, out AzureSubscription subscription) + { + if (string.IsNullOrWhiteSpace(tenantId)) + { + throw new ArgumentNullException("Please provide a valid tenant Id."); + } + + IEnumerable subscriptionList = ListSubscriptions(tenantId); + subscription = subscriptionList.FirstOrDefault(s => s.Name.Equals(subscriptionName, StringComparison.OrdinalIgnoreCase)); + + return subscription != null; + } + public AzureEnvironment AddOrSetEnvironment(AzureEnvironment environment) { if (environment == null) diff --git a/src/ResourceManager/Common/Commands.ResourceManager.Common/packages.config b/src/ResourceManager/Common/Commands.ResourceManager.Common/packages.config index 8b3394fd6012..357c4f26f18d 100644 --- a/src/ResourceManager/Common/Commands.ResourceManager.Common/packages.config +++ b/src/ResourceManager/Common/Commands.ResourceManager.Common/packages.config @@ -4,7 +4,7 @@ - + diff --git a/src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/Commands.ScenarioTests.ResourceManager.Common.csproj b/src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/Commands.ScenarioTests.ResourceManager.Common.csproj index 246ae60432a0..74aab6a0f870 100644 --- a/src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/Commands.ScenarioTests.ResourceManager.Common.csproj +++ b/src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/Commands.ScenarioTests.ResourceManager.Common.csproj @@ -46,7 +46,7 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -130,15 +130,6 @@ - - Profile\ProfileClient.cs - - - Profile\PSAzureAccount.cs - - - Profile\PublishSettingsImporter.cs - @@ -164,30 +155,15 @@ + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - \ No newline at end of file diff --git a/src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/EnvironmentSetupHelper.cs b/src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/EnvironmentSetupHelper.cs index 075d4dd0277c..0a5585090fd6 100644 --- a/src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/EnvironmentSetupHelper.cs +++ b/src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/EnvironmentSetupHelper.cs @@ -43,7 +43,7 @@ public class EnvironmentSetupHelper private AzureAccount testAccount; private const string PackageDirectoryFromCommon = @"..\..\..\..\Package\Debug"; - private const string PackageDirectory = @"..\..\..\..\..\Package\Debug"; + public string PackageDirectory = @"..\..\..\..\..\Package\Debug"; protected List modules; @@ -66,16 +66,52 @@ public EnvironmentSetupHelper() System.Net.ServicePointManager.ServerCertificateValidationCallback += (se, cert, chain, sslerror) => true; // Set RunningMocked - if (HttpMockServer.GetCurrentMode() == HttpRecorderMode.Playback) + TestMockSupport.RunningMocked = HttpMockServer.GetCurrentMode() == HttpRecorderMode.Playback; + } + + public string RMProfileModule + { + get { - TestMockSupport.RunningMocked = true; + return Path.Combine(this.PackageDirectory, + @"ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1"); } - else + } + + public string RMResourceModule + { + get + { + return Path.Combine(this.PackageDirectory, + @"ResourceManager\AzureResourceManager\AzureRM.Resources\AzureRM.Resources.psd1"); + } + } + + public string RMStorageModule + { + get { - TestMockSupport.RunningMocked = false; + return Path.Combine(this.PackageDirectory, + @"ResourceManager\AzureResourceManager\AzureRM.Storage\AzureRM.Storage.psd1"); } } + //TODO: clarify (data plane should not be under ARM folder) + public string RMStorageDataPlaneModule + { + get + { + return Path.Combine(this.PackageDirectory, + @"ResourceManager\AzureResourceManager\Azure.Storage\Azure.Storage.psd1"); + } + } + + public string GetRMModulePath(string psd1FileName) + { + string basename = Path.GetFileNameWithoutExtension(psd1FileName); + return Path.Combine(this.PackageDirectory, + @"ResourceManager\AzureResourceManager\" + basename + @"\" + psd1FileName); + } /// /// Loads DummyManagementClientHelper with clients and throws exception if any client is missing. /// @@ -103,32 +139,29 @@ public void SetupEnvironment(AzureModule mode) private void SetupAzureEnvironmentFromEnvironmentVariables(AzureModule mode) { - TestEnvironment rdfeEnvironment = new RDFETestEnvironmentFactory().GetTestEnvironment(); - TestEnvironment csmEnvironment = new CSMTestEnvironmentFactory().GetTestEnvironment(); - TestEnvironment currentEnvironment = (mode == AzureModule.AzureResourceManager ? csmEnvironment : rdfeEnvironment); + TestEnvironment currentEnvironment = null; + if (mode == AzureModule.AzureResourceManager) + { + currentEnvironment = new CSMTestEnvironmentFactory().GetTestEnvironment(); + } + else + { + currentEnvironment = new RDFETestEnvironmentFactory().GetTestEnvironment(); + } if (currentEnvironment.UserName == null) { currentEnvironment.UserName = "fakeuser@microsoft.com"; } - SetAuthenticationFactory(mode, rdfeEnvironment, csmEnvironment); + SetAuthenticationFactory(mode, currentEnvironment); AzureEnvironment environment = new AzureEnvironment { Name = testEnvironmentName }; Debug.Assert(currentEnvironment != null); environment.Endpoints[AzureEnvironment.Endpoint.ActiveDirectory] = currentEnvironment.Endpoints.AADAuthUri.AbsoluteUri; environment.Endpoints[AzureEnvironment.Endpoint.Gallery] = currentEnvironment.Endpoints.GalleryUri.AbsoluteUri; - - if (csmEnvironment != null) - { - environment.Endpoints[AzureEnvironment.Endpoint.ResourceManager] = csmEnvironment.BaseUri.AbsoluteUri; - } - - if (rdfeEnvironment != null) - { - environment.Endpoints[AzureEnvironment.Endpoint.ServiceManagement] = rdfeEnvironment.BaseUri.AbsoluteUri; - } + environment.Endpoints[AzureEnvironment.Endpoint.ServiceManagement] = currentEnvironment.BaseUri.AbsoluteUri; if (!ProfileClient.Profile.Environments.ContainsKey(testEnvironmentName)) { @@ -169,44 +202,29 @@ private void SetupAzureEnvironmentFromEnvironmentVariables(AzureModule mode) } } - private void SetAuthenticationFactory(AzureModule mode, TestEnvironment rdfeEnvironment, TestEnvironment csmEnvironment) + private void SetAuthenticationFactory(AzureModule mode, TestEnvironment environment) { string jwtToken = null; X509Certificate2 certificate = null; - TestEnvironment currentEnvironment = (mode == AzureModule.AzureResourceManager ? csmEnvironment : rdfeEnvironment); - if (mode == AzureModule.AzureServiceManagement) + if (environment.Credentials is TokenCloudCredentials) { - if (rdfeEnvironment.Credentials is TokenCloudCredentials) - { - jwtToken = ((TokenCloudCredentials)rdfeEnvironment.Credentials).Token; - } - if (rdfeEnvironment.Credentials is CertificateCloudCredentials) - { - certificate = ((CertificateCloudCredentials)rdfeEnvironment.Credentials).ManagementCertificate; - } + jwtToken = ((TokenCloudCredentials)environment.Credentials).Token; } - else + if (environment.Credentials is CertificateCloudCredentials) { - if (csmEnvironment.Credentials is TokenCloudCredentials) - { - jwtToken = ((TokenCloudCredentials)csmEnvironment.Credentials).Token; - } - if (csmEnvironment.Credentials is CertificateCloudCredentials) - { - certificate = ((CertificateCloudCredentials)csmEnvironment.Credentials).ManagementCertificate; - } + certificate = ((CertificateCloudCredentials)environment.Credentials).ManagementCertificate; } if (jwtToken != null) { - AzureSession.AuthenticationFactory = new MockTokenAuthenticationFactory(currentEnvironment.UserName, + AzureSession.AuthenticationFactory = new MockTokenAuthenticationFactory(environment.UserName, jwtToken); } else if (certificate != null) { - AzureSession.AuthenticationFactory = new MockCertificateAuthenticationFactory(currentEnvironment.UserName, + AzureSession.AuthenticationFactory = new MockCertificateAuthenticationFactory(environment.UserName, certificate); } } @@ -223,14 +241,7 @@ public void SetupModules(AzureModule mode, params string[] modules) { this.modules.Add(Path.Combine(PackageDirectory, @"ServiceManagement\Azure\Azure.psd1")); } - else if (mode == AzureModule.AzureResourceManager) - { - this.modules.Add(Path.Combine(PackageDirectory, @"ResourceManager\AzureResourceManager\AzureResourceManager.psd1")); - } - else - { - throw new ArgumentException("Unknown command type for testing"); - } + this.modules.Add("Assert.ps1"); this.modules.Add("Common.ps1"); this.modules.AddRange(modules); diff --git a/src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/Mocks/MockCertificateAuthenticationFactory.cs b/src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/Mocks/MockCertificateAuthenticationFactory.cs index e8016b59a4f6..5c888d2e887e 100644 --- a/src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/Mocks/MockCertificateAuthenticationFactory.cs +++ b/src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/Mocks/MockCertificateAuthenticationFactory.cs @@ -79,5 +79,11 @@ public Microsoft.Rest.ServiceClientCredentials GetServiceClientCredentials(Azure { throw new System.NotImplementedException(); } + + + public SubscriptionCloudCredentials GetSubscriptionCloudCredentials(AzureContext context, AzureEnvironment.Endpoint targetEndpoint) + { + return new CertificateCloudCredentials(context.Subscription.Id.ToString(), Certificate); + } } } diff --git a/src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/Mocks/MockTokenAuthenticationFactory.cs b/src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/Mocks/MockTokenAuthenticationFactory.cs index db1e257ff57f..88cdcfce346e 100644 --- a/src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/Mocks/MockTokenAuthenticationFactory.cs +++ b/src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/Mocks/MockTokenAuthenticationFactory.cs @@ -119,5 +119,11 @@ public Microsoft.Rest.ServiceClientCredentials GetServiceClientCredentials(Azure { return new Microsoft.Rest.TokenCredentials(Token.AccessToken); } + + + public SubscriptionCloudCredentials GetSubscriptionCloudCredentials(AzureContext context, AzureEnvironment.Endpoint targetEndpoint) + { + return new AccessTokenCredential(context.Subscription.Id, Token); + } } } diff --git a/src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/packages.config b/src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/packages.config index 942d14ec3068..6c96e0abf665 100644 --- a/src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/packages.config +++ b/src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj b/src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj index 549d833e0046..3e3faec354fc 100644 --- a/src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj +++ b/src/ResourceManager/Compute/Commands.Compute.Test/Commands.Compute.Test.csproj @@ -50,7 +50,7 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -350,22 +350,5 @@ - - - xcopy "$(SolutionDir)Package\$(ConfigurationName)\*.*" $(TargetDir) /Y /E - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/Common/ComputeTestController.cs b/src/ResourceManager/Compute/Commands.Compute.Test/Common/ComputeTestController.cs index 3e80837fd0dc..572482b43ce2 100644 --- a/src/ResourceManager/Compute/Commands.Compute.Test/Common/ComputeTestController.cs +++ b/src/ResourceManager/Compute/Commands.Compute.Test/Common/ComputeTestController.cs @@ -21,7 +21,6 @@ using Microsoft.Azure.Subscriptions; using Microsoft.Azure.Test.HttpRecorder; using Microsoft.WindowsAzure.Commands.ScenarioTest; -using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.Azure.Management.Storage; using Microsoft.Azure.Test; using System; @@ -119,11 +118,16 @@ public void RunPsTestWorkflow( var callingClassName = callingClassType .Split(new[] { "." }, StringSplitOptions.RemoveEmptyEntries) .Last(); - helper.SetupModules( - AzureModule.AzureResourceManager, - "ScenarioTests\\Common.ps1", - "ScenarioTests\\ComputeTestCommon.ps1", - "ScenarioTests\\" + callingClassName + ".ps1"); + helper.SetupModules(AzureModule.AzureResourceManager, + "ScenarioTests\\Common.ps1", + "ScenarioTests\\ComputeTestCommon.ps1", + "ScenarioTests\\" + callingClassName + ".ps1", + helper.RMProfileModule, + helper.RMResourceModule, + helper.RMStorageDataPlaneModule, + helper.RMStorageModule, + helper.GetRMModulePath("AzureRM.Compute.psd1"), + helper.GetRMModulePath("AzureRM.Network.psd1")); try { diff --git a/src/ResourceManager/Compute/Commands.Compute.Test/packages.config b/src/ResourceManager/Compute/Commands.Compute.Test/packages.config index 72802bc87f93..904b46762c16 100644 --- a/src/ResourceManager/Compute/Commands.Compute.Test/packages.config +++ b/src/ResourceManager/Compute/Commands.Compute.Test/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/ResourceManager/Compute/Commands.Compute/Commands.Compute.csproj b/src/ResourceManager/Compute/Commands.Compute/Commands.Compute.csproj index fe0699e58523..c3db514d58f6 100644 --- a/src/ResourceManager/Compute/Commands.Compute/Commands.Compute.csproj +++ b/src/ResourceManager/Compute/Commands.Compute/Commands.Compute.csproj @@ -59,7 +59,7 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -174,12 +174,6 @@ - - Common\ComputeCloudException.cs - - - Common\DiagnosticsHelper.cs - Extension\DSC\DscExtensionCmdletConstants.cs @@ -205,6 +199,8 @@ + + @@ -313,6 +309,10 @@ {65c3a86a-716d-4e7d-ab67-1db00b3bf72d} Commands.Common.Storage + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common @@ -379,23 +379,5 @@ - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - \ No newline at end of file diff --git a/src/Common/Commands.Common/ComputeCloudException.cs b/src/ResourceManager/Compute/Commands.Compute/Common/ComputeCloudException.cs similarity index 100% rename from src/Common/Commands.Common/ComputeCloudException.cs rename to src/ResourceManager/Compute/Commands.Compute/Common/ComputeCloudException.cs diff --git a/src/Common/Commands.Common/DiagnosticsHelper.cs b/src/ResourceManager/Compute/Commands.Compute/Common/DiagnosticsHelper.cs similarity index 100% rename from src/Common/Commands.Common/DiagnosticsHelper.cs rename to src/ResourceManager/Compute/Commands.Compute/Common/DiagnosticsHelper.cs diff --git a/src/ResourceManager/Compute/Commands.Compute/packages.config b/src/ResourceManager/Compute/Commands.Compute/packages.config index 29b2981e6af7..9f861a7dc86d 100644 --- a/src/ResourceManager/Compute/Commands.Compute/packages.config +++ b/src/ResourceManager/Compute/Commands.Compute/packages.config @@ -3,7 +3,7 @@ - + diff --git a/src/ResourceManager/Compute/Compute.sln b/src/ResourceManager/Compute/Compute.sln new file mode 100644 index 000000000000..4675b38ccd59 --- /dev/null +++ b/src/ResourceManager/Compute/Compute.sln @@ -0,0 +1,117 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.31101.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{95C16AED-FD57-42A0-86C3-2CF4300A4817}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ResourceManager.Common", "..\Common\Commands.ResourceManager.Common\Commands.ResourceManager.Common.csproj", "{3819D8A7-C62C-4C47-8DDD-0332D9CE1252}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Resources", "..\Resources\Commands.Resources\Commands.Resources.csproj", "{E1F5201D-6067-430E-B303-4E367652991B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Tags", "..\Tags\Commands.Tags\Commands.Tags.csproj", "{2493A8F7-1949-4F29-8D53-9D459046C3B8}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Compute", "Commands.Compute\Commands.Compute.csproj", "{52643BD5-6378-49BD-9F6E-DAC9DD8A867B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Network", "..\Network\Commands.Network\Commands.Network.csproj", "{98CFD96B-A6BC-4F15-AE2C-603FC2B58981}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Management.Storage", "..\Storage\Commands.Management.Storage\Commands.Management.Storage.csproj", "{A50AB133-5C04-4A17-9054-F8343683EC23}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common.Storage", "..\..\Common\Commands.Common.Storage\Commands.Common.Storage.csproj", "{65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sync", "..\..\ServiceManagement\Compute\Sync\Sync.csproj", "{73820CBC-F4EB-4C5E-B4F0-CC4A93FBF157}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VhdManagement", "..\..\ServiceManagement\Compute\VhdManagement\VhdManagement.csproj", "{80496B7B-068A-4A1E-B0BB-4B1FFF3FA616}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Compute.Test", "Commands.Compute.Test\Commands.Compute.Test.csproj", "{37C44181-3F1B-4ABD-8089-26DFAB4B6BA8}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Profile", "..\Profile\Commands.Profile\Commands.Profile.csproj", "{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ScenarioTests.ResourceManager.Common", "..\Common\Commands.ScenarioTests.ResourceManager.Common\Commands.ScenarioTests.ResourceManager.Common.csproj", "{3436A126-EDC9-4060-8952-9A1BE34CDD95}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common", "..\..\Common\Commands.Common\Commands.Common.csproj", "{5EE72C53-1720-4309-B54B-5FB79703195F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Resources.Rest", "..\Resources\Commands.ResourceManager\Cmdlets\Commands.Resources.Rest.csproj", "{8058D403-06E3-4BED-8924-D166CE303961}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage", "..\..\Common\Storage\Commands.Storage\Commands.Storage.csproj", "{08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ServiceManagement.Common", "..\..\ServiceManagement\Common\Commands.ServiceManagement.Common\Commands.ServiceManagement.Common.csproj", "{CFF09E81-1E31-444E-B4D4-A21E946C29E2}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.Build.0 = Release|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Release|Any CPU.Build.0 = Release|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Release|Any CPU.Build.0 = Release|Any CPU + {52643BD5-6378-49BD-9F6E-DAC9DD8A867B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {52643BD5-6378-49BD-9F6E-DAC9DD8A867B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {52643BD5-6378-49BD-9F6E-DAC9DD8A867B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {52643BD5-6378-49BD-9F6E-DAC9DD8A867B}.Release|Any CPU.Build.0 = Release|Any CPU + {98CFD96B-A6BC-4F15-AE2C-603FC2B58981}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {98CFD96B-A6BC-4F15-AE2C-603FC2B58981}.Debug|Any CPU.Build.0 = Debug|Any CPU + {98CFD96B-A6BC-4F15-AE2C-603FC2B58981}.Release|Any CPU.ActiveCfg = Release|Any CPU + {98CFD96B-A6BC-4F15-AE2C-603FC2B58981}.Release|Any CPU.Build.0 = Release|Any CPU + {A50AB133-5C04-4A17-9054-F8343683EC23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A50AB133-5C04-4A17-9054-F8343683EC23}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A50AB133-5C04-4A17-9054-F8343683EC23}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A50AB133-5C04-4A17-9054-F8343683EC23}.Release|Any CPU.Build.0 = Release|Any CPU + {65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Release|Any CPU.Build.0 = Release|Any CPU + {73820CBC-F4EB-4C5E-B4F0-CC4A93FBF157}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {73820CBC-F4EB-4C5E-B4F0-CC4A93FBF157}.Debug|Any CPU.Build.0 = Debug|Any CPU + {73820CBC-F4EB-4C5E-B4F0-CC4A93FBF157}.Release|Any CPU.ActiveCfg = Release|Any CPU + {73820CBC-F4EB-4C5E-B4F0-CC4A93FBF157}.Release|Any CPU.Build.0 = Release|Any CPU + {80496B7B-068A-4A1E-B0BB-4B1FFF3FA616}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {80496B7B-068A-4A1E-B0BB-4B1FFF3FA616}.Debug|Any CPU.Build.0 = Debug|Any CPU + {80496B7B-068A-4A1E-B0BB-4B1FFF3FA616}.Release|Any CPU.ActiveCfg = Release|Any CPU + {80496B7B-068A-4A1E-B0BB-4B1FFF3FA616}.Release|Any CPU.Build.0 = Release|Any CPU + {37C44181-3F1B-4ABD-8089-26DFAB4B6BA8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {37C44181-3F1B-4ABD-8089-26DFAB4B6BA8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {37C44181-3F1B-4ABD-8089-26DFAB4B6BA8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {37C44181-3F1B-4ABD-8089-26DFAB4B6BA8}.Release|Any CPU.Build.0 = Release|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.Build.0 = Release|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Release|Any CPU.Build.0 = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.Build.0 = Release|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Release|Any CPU.Build.0 = Release|Any CPU + {08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}.Release|Any CPU.Build.0 = Release|Any CPU + {CFF09E81-1E31-444E-B4D4-A21E946C29E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CFF09E81-1E31-444E-B4D4-A21E946C29E2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CFF09E81-1E31-444E-B4D4-A21E946C29E2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CFF09E81-1E31-444E-B4D4-A21E946C29E2}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {37C44181-3F1B-4ABD-8089-26DFAB4B6BA8} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} + {3436A126-EDC9-4060-8952-9A1BE34CDD95} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} + EndGlobalSection +EndGlobal diff --git a/src/ResourceManager/Compute/NuGet.Config b/src/ResourceManager/Compute/NuGet.Config new file mode 100644 index 000000000000..2de911013532 --- /dev/null +++ b/src/ResourceManager/Compute/NuGet.Config @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories.Test/Commands.DataFactories.Test.csproj b/src/ResourceManager/DataFactories/Commands.DataFactories.Test/Commands.DataFactories.Test.csproj index 376f19a1e47a..39e27f7d7309 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories.Test/Commands.DataFactories.Test.csproj +++ b/src/ResourceManager/DataFactories/Commands.DataFactories.Test/Commands.DataFactories.Test.csproj @@ -49,7 +49,7 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -284,6 +284,10 @@ + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common @@ -306,19 +310,5 @@ - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/DataFactoriesScenarioTestsBase.cs b/src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/DataFactoriesScenarioTestsBase.cs index 45163ce54a35..783c5e6b0e7c 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/DataFactoriesScenarioTestsBase.cs +++ b/src/ResourceManager/DataFactories/Commands.DataFactories.Test/ScenarioTests/DataFactoriesScenarioTestsBase.cs @@ -21,7 +21,6 @@ using Microsoft.Azure.Subscriptions; using Microsoft.Azure.Test.HttpRecorder; using Microsoft.WindowsAzure.Commands.ScenarioTest; -using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Management.Storage; using Microsoft.Azure.Test; using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; @@ -64,8 +63,12 @@ protected void RunPowerShellTest(params string[] scripts) SetupManagementClients(); helper.SetupEnvironment(AzureModule.AzureResourceManager); - helper.SetupModules(AzureModule.AzureResourceManager, "ScenarioTests\\Common.ps1", - "ScenarioTests\\" + this.GetType().Name + ".ps1"); + helper.SetupModules(AzureModule.AzureResourceManager, + "ScenarioTests\\Common.ps1", + "ScenarioTests\\" + this.GetType().Name + ".ps1", + helper.RMProfileModule, + helper.RMResourceModule, + helper.GetRMModulePath("AzureRM.DataFactories.psd1")); helper.RunPowerShellTest(scripts); } diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories.Test/packages.config b/src/ResourceManager/DataFactories/Commands.DataFactories.Test/packages.config index 41db87b08c75..a97945b206bf 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories.Test/packages.config +++ b/src/ResourceManager/DataFactories/Commands.DataFactories.Test/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.csproj b/src/ResourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.csproj index 9122dc9c6f05..3d1f3b6131a8 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.csproj +++ b/src/ResourceManager/DataFactories/Commands.DataFactories/Commands.DataFactories.csproj @@ -55,7 +55,7 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -263,12 +263,15 @@ + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common - \ No newline at end of file diff --git a/src/ResourceManager/DataFactories/Commands.DataFactories/packages.config b/src/ResourceManager/DataFactories/Commands.DataFactories/packages.config index 4f83a6b163b0..89106d53c69d 100644 --- a/src/ResourceManager/DataFactories/Commands.DataFactories/packages.config +++ b/src/ResourceManager/DataFactories/Commands.DataFactories/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/ResourceManager/DataFactories/DataFactories.sln b/src/ResourceManager/DataFactories/DataFactories.sln new file mode 100644 index 000000000000..776515232269 --- /dev/null +++ b/src/ResourceManager/DataFactories/DataFactories.sln @@ -0,0 +1,81 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.31101.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{95C16AED-FD57-42A0-86C3-2CF4300A4817}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ResourceManager.Common", "..\Common\Commands.ResourceManager.Common\Commands.ResourceManager.Common.csproj", "{3819D8A7-C62C-4C47-8DDD-0332D9CE1252}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.DataFactories", "Commands.DataFactories\Commands.DataFactories.csproj", "{9577252E-0A6B-4D61-86E8-95F7F309A987}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.DataFactories.Test", "Commands.DataFactories.Test\Commands.DataFactories.Test.csproj", "{D4EDAD6F-6A1D-4295-9A88-CD3F69EAD42B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Profile", "..\Profile\Commands.Profile\Commands.Profile.csproj", "{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ScenarioTests.ResourceManager.Common", "..\Common\Commands.ScenarioTests.ResourceManager.Common\Commands.ScenarioTests.ResourceManager.Common.csproj", "{3436A126-EDC9-4060-8952-9A1BE34CDD95}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common.Storage", "..\..\Common\Commands.Common.Storage\Commands.Common.Storage.csproj", "{65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common", "..\..\Common\Commands.Common\Commands.Common.csproj", "{5EE72C53-1720-4309-B54B-5FB79703195F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Resources", "..\Resources\Commands.Resources\Commands.Resources.csproj", "{E1F5201D-6067-430E-B303-4E367652991B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Resources.Rest", "..\Resources\Commands.ResourceManager\Cmdlets\Commands.Resources.Rest.csproj", "{8058D403-06E3-4BED-8924-D166CE303961}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Tags", "..\Tags\Commands.Tags\Commands.Tags.csproj", "{2493A8F7-1949-4F29-8D53-9D459046C3B8}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.Build.0 = Release|Any CPU + {9577252E-0A6B-4D61-86E8-95F7F309A987}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9577252E-0A6B-4D61-86E8-95F7F309A987}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9577252E-0A6B-4D61-86E8-95F7F309A987}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9577252E-0A6B-4D61-86E8-95F7F309A987}.Release|Any CPU.Build.0 = Release|Any CPU + {D4EDAD6F-6A1D-4295-9A88-CD3F69EAD42B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D4EDAD6F-6A1D-4295-9A88-CD3F69EAD42B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D4EDAD6F-6A1D-4295-9A88-CD3F69EAD42B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D4EDAD6F-6A1D-4295-9A88-CD3F69EAD42B}.Release|Any CPU.Build.0 = Release|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.Build.0 = Release|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Release|Any CPU.Build.0 = Release|Any CPU + {65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Release|Any CPU.Build.0 = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.Build.0 = Release|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Release|Any CPU.Build.0 = Release|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Release|Any CPU.Build.0 = Release|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {D4EDAD6F-6A1D-4295-9A88-CD3F69EAD42B} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} + {3436A126-EDC9-4060-8952-9A1BE34CDD95} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} + EndGlobalSection +EndGlobal diff --git a/src/ResourceManager/DataFactories/NuGet.Config b/src/ResourceManager/DataFactories/NuGet.Config new file mode 100644 index 000000000000..2de911013532 --- /dev/null +++ b/src/ResourceManager/DataFactories/NuGet.Config @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/ResourceManager/Dns/Commands.Dns.Test/Commands.Dns.Test.csproj b/src/ResourceManager/Dns/Commands.Dns.Test/Commands.Dns.Test.csproj index f55003e68b46..31e54fb73252 100644 --- a/src/ResourceManager/Dns/Commands.Dns.Test/Commands.Dns.Test.csproj +++ b/src/ResourceManager/Dns/Commands.Dns.Test/Commands.Dns.Test.csproj @@ -52,7 +52,7 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -154,6 +154,10 @@ + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common @@ -281,12 +285,5 @@ - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - \ No newline at end of file diff --git a/src/ResourceManager/Dns/Commands.Dns.Test/ScenarioTests/DnsTestsBase.cs b/src/ResourceManager/Dns/Commands.Dns.Test/ScenarioTests/DnsTestsBase.cs index dba0ca5bf768..24c0b325a7e6 100644 --- a/src/ResourceManager/Dns/Commands.Dns.Test/ScenarioTests/DnsTestsBase.cs +++ b/src/ResourceManager/Dns/Commands.Dns.Test/ScenarioTests/DnsTestsBase.cs @@ -28,8 +28,7 @@ namespace Microsoft.Azure.Commands.ScenarioTest.DnsTests using Microsoft.Azure.Management.Dns; using Microsoft.Azure.Subscriptions; using WindowsAzure.Commands.Test.Utilities.Common; - using Dns.Models; - + public class DnsTestsBase : RMTestBase { private CSMTestEnvironmentFactory csmTestFactory; @@ -136,14 +135,13 @@ public void RunPsTestWorkflow( string callingClassName = callingClassType .Split(new[] { "." }, StringSplitOptions.RemoveEmptyEntries) - .Last(); - + .Last(); - this.helper.SetupModules( - AzureModule.AzureResourceManager, - "ScenarioTests\\Common.ps1", - "ScenarioTests\\" + callingClassName + ".ps1"); + this.helper.SetupModules(AzureModule.AzureResourceManager, "ScenarioTests\\Common.ps1", "ScenarioTests\\" + callingClassName + ".ps1", + helper.RMProfileModule, + helper.RMResourceModule, + helper.GetRMModulePath("AzureRM.Dns.psd1")); try { diff --git a/src/ResourceManager/Dns/Commands.Dns.Test/packages.config b/src/ResourceManager/Dns/Commands.Dns.Test/packages.config index bf84c70bcf8b..6f3b27a34d2a 100644 --- a/src/ResourceManager/Dns/Commands.Dns.Test/packages.config +++ b/src/ResourceManager/Dns/Commands.Dns.Test/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/ResourceManager/Dns/Commands.Dns/Commands.Dns.csproj b/src/ResourceManager/Dns/Commands.Dns/Commands.Dns.csproj index b4ae88e77d1b..9c22cf409b71 100644 --- a/src/ResourceManager/Dns/Commands.Dns/Commands.Dns.csproj +++ b/src/ResourceManager/Dns/Commands.Dns/Commands.Dns.csproj @@ -96,7 +96,7 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -168,6 +168,10 @@ + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common @@ -186,6 +190,5 @@ - \ No newline at end of file diff --git a/src/ResourceManager/Dns/Commands.Dns/packages.config b/src/ResourceManager/Dns/Commands.Dns/packages.config index 39bd23233a55..4ca6e4245015 100644 --- a/src/ResourceManager/Dns/Commands.Dns/packages.config +++ b/src/ResourceManager/Dns/Commands.Dns/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/ResourceManager/Dns/Dns.sln b/src/ResourceManager/Dns/Dns.sln new file mode 100644 index 000000000000..51bb234e88d0 --- /dev/null +++ b/src/ResourceManager/Dns/Dns.sln @@ -0,0 +1,75 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.31101.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{95C16AED-FD57-42A0-86C3-2CF4300A4817}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ResourceManager.Common", "..\Common\Commands.ResourceManager.Common\Commands.ResourceManager.Common.csproj", "{3819D8A7-C62C-4C47-8DDD-0332D9CE1252}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Resources", "..\Resources\Commands.Resources\Commands.Resources.csproj", "{E1F5201D-6067-430E-B303-4E367652991B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Resources.Rest", "..\Resources\Commands.ResourceManager\Cmdlets\Commands.Resources.Rest.csproj", "{8058D403-06E3-4BED-8924-D166CE303961}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Dns", "Commands.Dns\Commands.Dns.csproj", "{3CAE1B57-FFEC-4945-A6C5-6E5E8DEA4BA9}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Profile", "..\Profile\Commands.Profile\Commands.Profile.csproj", "{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ScenarioTests.ResourceManager.Common", "..\Common\Commands.ScenarioTests.ResourceManager.Common\Commands.ScenarioTests.ResourceManager.Common.csproj", "{3436A126-EDC9-4060-8952-9A1BE34CDD95}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Tags", "..\Tags\Commands.Tags\Commands.Tags.csproj", "{2493A8F7-1949-4F29-8D53-9D459046C3B8}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Dns.Test", "Commands.Dns.Test\Commands.Dns.Test.csproj", "{133561EC-99AF-4ADC-AF41-39C4D3AD323B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common", "..\..\Common\Commands.Common\Commands.Common.csproj", "{5EE72C53-1720-4309-B54B-5FB79703195F}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.Build.0 = Release|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Release|Any CPU.Build.0 = Release|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Release|Any CPU.Build.0 = Release|Any CPU + {3CAE1B57-FFEC-4945-A6C5-6E5E8DEA4BA9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3CAE1B57-FFEC-4945-A6C5-6E5E8DEA4BA9}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3CAE1B57-FFEC-4945-A6C5-6E5E8DEA4BA9}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3CAE1B57-FFEC-4945-A6C5-6E5E8DEA4BA9}.Release|Any CPU.Build.0 = Release|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.Build.0 = Release|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Release|Any CPU.Build.0 = Release|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Release|Any CPU.Build.0 = Release|Any CPU + {133561EC-99AF-4ADC-AF41-39C4D3AD323B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {133561EC-99AF-4ADC-AF41-39C4D3AD323B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {133561EC-99AF-4ADC-AF41-39C4D3AD323B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {133561EC-99AF-4ADC-AF41-39C4D3AD323B}.Release|Any CPU.Build.0 = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {3436A126-EDC9-4060-8952-9A1BE34CDD95} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} + {133561EC-99AF-4ADC-AF41-39C4D3AD323B} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} + EndGlobalSection +EndGlobal diff --git a/src/ResourceManager/Dns/NuGet.Config b/src/ResourceManager/Dns/NuGet.Config new file mode 100644 index 000000000000..2de911013532 --- /dev/null +++ b/src/ResourceManager/Dns/NuGet.Config @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/ResourceManager/HDInsight/Commands.HDInsight.Test/Commands.HDInsight.Test.csproj b/src/ResourceManager/HDInsight/Commands.HDInsight.Test/Commands.HDInsight.Test.csproj index 3253ec73759a..5f1543871e42 100644 --- a/src/ResourceManager/HDInsight/Commands.HDInsight.Test/Commands.HDInsight.Test.csproj +++ b/src/ResourceManager/HDInsight/Commands.HDInsight.Test/Commands.HDInsight.Test.csproj @@ -39,7 +39,7 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -140,6 +140,10 @@ + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common @@ -168,18 +172,4 @@ - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/src/ResourceManager/HDInsight/Commands.HDInsight.Test/ScenarioTests/HDInsightScenarioTestsBase.cs b/src/ResourceManager/HDInsight/Commands.HDInsight.Test/ScenarioTests/HDInsightScenarioTestsBase.cs index ed6d1661d085..70fa46cafcb8 100644 --- a/src/ResourceManager/HDInsight/Commands.HDInsight.Test/ScenarioTests/HDInsightScenarioTestsBase.cs +++ b/src/ResourceManager/HDInsight/Commands.HDInsight.Test/ScenarioTests/HDInsightScenarioTestsBase.cs @@ -15,7 +15,6 @@ using Microsoft.Azure.Common.Authentication; using Microsoft.Azure.Management.HDInsight; using Microsoft.Azure.Test; -using Microsoft.Azure.Test.HttpRecorder; using Microsoft.WindowsAzure.Commands.ScenarioTest; using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; @@ -47,8 +46,11 @@ protected void RunPowerShellTest(params string[] scripts) SetupManagementClients(); helper.SetupEnvironment(AzureModule.AzureResourceManager); - helper.SetupModules(AzureModule.AzureResourceManager, //"ScenarioTests\\Common.ps1", - "ScenarioTests\\" + this.GetType().Name + ".ps1"); + helper.SetupModules(AzureModule.AzureResourceManager, + "ScenarioTests\\" + this.GetType().Name + ".ps1", + helper.RMProfileModule, + helper.RMResourceModule, + helper.GetRMModulePath("AzureRM.HDInsight.psd1")); helper.RunPowerShellTest(scripts); } diff --git a/src/ResourceManager/HDInsight/Commands.HDInsight.Test/packages.config b/src/ResourceManager/HDInsight/Commands.HDInsight.Test/packages.config index b920883190da..c6f13d66bbe5 100644 --- a/src/ResourceManager/HDInsight/Commands.HDInsight.Test/packages.config +++ b/src/ResourceManager/HDInsight/Commands.HDInsight.Test/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/ResourceManager/HDInsight/Commands.HDInsight/ClusterConfigurationUtils.cs b/src/ResourceManager/HDInsight/Commands.HDInsight/ClusterConfigurationUtils.cs new file mode 100644 index 000000000000..4c9216626e28 --- /dev/null +++ b/src/ResourceManager/HDInsight/Commands.HDInsight/ClusterConfigurationUtils.cs @@ -0,0 +1,78 @@ +// +// 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; +using System.Collections.Generic; +using System.Linq; + +namespace Microsoft.Azure.Commands.HDInsight.Models +{ + internal class ClusterConfigurationUtils + { + public static string GetResourceGroupFromClusterId(string clusterId) + { + // Parse resource group from cluster Id + // The code expects Id to be of the format \ + // /subscriptions//resourceGroups//providers/Microsoft.HDInsight/clusters/ + + string resourceGroup = null; + int index = clusterId.IndexOf("resourceGroups", StringComparison.OrdinalIgnoreCase); + + if (index >= 0) + { + index += "resourceGroups".Length; + string[] parts = clusterId.Substring(index).Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries); + + if (parts.Length > 0) + { + resourceGroup = parts[0]; + } + } + + return resourceGroup; + } + + public static AzureHDInsightDefaultStorageAccount GetDefaultStorageAccountDetails( + IDictionary configuration, + string version) + { + string key = version.Equals("2.1") ? Constants.ClusterConfiguration.DefaultStorageAccountNameKeyOld + : Constants.ClusterConfiguration.DefaultStorageAccountNameKey; + + string accountAndContainerStr; + + if (configuration.TryGetValue(key, out accountAndContainerStr)) + { + string[] accountAndContainer = accountAndContainerStr.Substring("wasb://".Length).Split('@'); + + return new AzureHDInsightDefaultStorageAccount + { + StorageContainerName = accountAndContainer[0], + StorageAccountName = accountAndContainer[1], + StorageAccountKey = configuration[Constants.ClusterConfiguration.StorageAccountKeyPrefix + accountAndContainer[1]] + }; + } + + return null; + } + + public static List GetAdditionStorageAccounts(IDictionary configuration, string defaultAccount) + { + // Parse the storage account names from the key and exclude the default one + return (from key in configuration.Keys + where key.StartsWith(Constants.ClusterConfiguration.StorageAccountKeyPrefix, StringComparison.OrdinalIgnoreCase) && + !key.EndsWith(defaultAccount, StringComparison.OrdinalIgnoreCase) + select key.Remove(0, Constants.ClusterConfiguration.StorageAccountKeyPrefix.Length)).ToList(); + } + } +} diff --git a/src/ResourceManager/HDInsight/Commands.HDInsight/Commands.HDInsight.csproj b/src/ResourceManager/HDInsight/Commands.HDInsight/Commands.HDInsight.csproj index 5208d20928ca..562cccbacdaa 100644 --- a/src/ResourceManager/HDInsight/Commands.HDInsight/Commands.HDInsight.csproj +++ b/src/ResourceManager/HDInsight/Commands.HDInsight/Commands.HDInsight.csproj @@ -22,7 +22,6 @@ DEBUG;TRACE prompt 4 - ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.HDInsight\Microsoft.Azure.Commands.HDInsight.xml pdbonly @@ -75,10 +74,12 @@ + + @@ -90,7 +91,9 @@ Always - + + Designer + @@ -100,7 +103,7 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -182,18 +185,15 @@ + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - \ No newline at end of file diff --git a/src/ResourceManager/HDInsight/Commands.HDInsight/Constants.cs b/src/ResourceManager/HDInsight/Commands.HDInsight/Constants.cs index 44fc1809e243..27578ef1d496 100644 --- a/src/ResourceManager/HDInsight/Commands.HDInsight/Constants.cs +++ b/src/ResourceManager/HDInsight/Commands.HDInsight/Constants.cs @@ -40,5 +40,12 @@ public static class JobDefinitions public const string AzureHDInsightMapReduceJobDefinition = "AzureRmHDInsightMapReduceJobDefinition"; public const string AzureHDInsightStreamingMapReduceJobDefinition = "AzureRmHDInsightStreamingMapReduceJobDefinition"; } + + public static class ClusterConfiguration + { + public const string DefaultStorageAccountNameKey = "fs.defaultFS"; + public const string DefaultStorageAccountNameKeyOld = "fs.default.name"; + public const string StorageAccountKeyPrefix = "fs.azure.account.key."; + } } } diff --git a/src/ResourceManager/HDInsight/Commands.HDInsight/ManagementCommands/GetAzureHDInsightClusterCommand.cs b/src/ResourceManager/HDInsight/Commands.HDInsight/ManagementCommands/GetAzureHDInsightClusterCommand.cs index 853f577fea62..dfab29435d2f 100644 --- a/src/ResourceManager/HDInsight/Commands.HDInsight/ManagementCommands/GetAzureHDInsightClusterCommand.cs +++ b/src/ResourceManager/HDInsight/Commands.HDInsight/ManagementCommands/GetAzureHDInsightClusterCommand.cs @@ -12,6 +12,7 @@ // limitations under the License. // ---------------------------------------------------------------------------------- +using System; using System.Collections.Generic; using System.Linq; using System.Management.Automation; @@ -44,7 +45,14 @@ public class GetAzureHDInsightCommand : HDInsightCmdletBase protected override void ProcessRecord() { var result = HDInsightManagementClient.GetCluster(ResourceGroupName, ClusterName); - var output = result.Select(cluster => new AzureHDInsightCluster(cluster)).ToList(); + + var output = result.Select(entry => + { + string resourceGroupName = ClusterConfigurationUtils.GetResourceGroupFromClusterId(entry.Id); + var configuration = HDInsightManagementClient.GetClusterConfigurations(resourceGroupName, entry.Name, "core-site"); + return new AzureHDInsightCluster(entry, configuration); + }).ToList(); + WriteObject(output, true); } } diff --git a/src/ResourceManager/HDInsight/Commands.HDInsight/Models/Management/AzureHDInsightCluster.cs b/src/ResourceManager/HDInsight/Commands.HDInsight/Models/Management/AzureHDInsightCluster.cs index 8a03fd720ee0..5b1584ea6a72 100644 --- a/src/ResourceManager/HDInsight/Commands.HDInsight/Models/Management/AzureHDInsightCluster.cs +++ b/src/ResourceManager/HDInsight/Commands.HDInsight/Models/Management/AzureHDInsightCluster.cs @@ -13,6 +13,7 @@ // ---------------------------------------------------------------------------------- using System; +using System.Collections.Generic; using System.Linq; using Microsoft.Azure.Management.HDInsight.Models; @@ -34,18 +35,35 @@ public AzureHDInsightCluster(Cluster cluster) cluster.Properties.ConnectivityEndpoints.FirstOrDefault(c => c.Name.Equals("HTTPS", StringComparison.OrdinalIgnoreCase)); HttpEndpoint = httpEndpoint != null ? httpEndpoint.Location : null; + ResourceGroup = ClusterConfigurationUtils.GetResourceGroupFromClusterId(cluster.Id); + } + + public AzureHDInsightCluster(Cluster cluster, IDictionary clusterConfiguration) + : this(cluster) + { + if (clusterConfiguration != null) + { + var defaultAccount = ClusterConfigurationUtils.GetDefaultStorageAccountDetails( + clusterConfiguration, + cluster.Properties.ClusterVersion); + + DefaultStorageAccount = defaultAccount.StorageAccountName; + DefaultStorageContainer = defaultAccount.StorageContainerName; + + AdditionalStorageAccounts = ClusterConfigurationUtils.GetAdditionStorageAccounts(clusterConfiguration, DefaultStorageAccount); + } } /// /// The name of the resource. /// public string Name { get; set; } - + /// /// The ID of the resource. /// public string Id { get; set; } - + /// /// The location of the resource. /// @@ -80,5 +98,25 @@ public AzureHDInsightCluster(Cluster cluster) /// The endpoint with which to connect to the cluster. /// public string HttpEndpoint { get; set; } + + /// + /// Default storage account for this cluster. + /// + public string DefaultStorageAccount { get; set; } + + /// + /// Default storage container for this cluster. + /// + public string DefaultStorageContainer { get; set; } + + /// + /// Default storage container for this cluster. + /// + public string ResourceGroup { get; set; } + + /// + /// Additional storage accounts for this cluster + /// + public List AdditionalStorageAccounts { get; set; } } } diff --git a/src/ResourceManager/Resources/Commands.Resources/Models.Authorization/PSGroupRoleAssignment.cs b/src/ResourceManager/HDInsight/Commands.HDInsight/Models/Management/AzureHDInsightDefaultStorageAccount.cs similarity index 70% rename from src/ResourceManager/Resources/Commands.Resources/Models.Authorization/PSGroupRoleAssignment.cs rename to src/ResourceManager/HDInsight/Commands.HDInsight/Models/Management/AzureHDInsightDefaultStorageAccount.cs index 1cb6bf0d4ee7..9a6dca3733b2 100644 --- a/src/ResourceManager/Resources/Commands.Resources/Models.Authorization/PSGroupRoleAssignment.cs +++ b/src/ResourceManager/HDInsight/Commands.HDInsight/Models/Management/AzureHDInsightDefaultStorageAccount.cs @@ -1,5 +1,4 @@ -// ---------------------------------------------------------------------------------- -// +// // 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. @@ -12,12 +11,14 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using System.Collections.Generic; - -namespace Microsoft.Azure.Commands.Resources.Models.Authorization +namespace Microsoft.Azure.Commands.HDInsight.Models { - public class PSGroupRoleAssignment : PSRoleAssignment + public class AzureHDInsightDefaultStorageAccount { - public string Mail { get; set; } + public string StorageAccountName { get; set; } + + public string StorageAccountKey { get; set; } + + public string StorageContainerName { get; set; } } } diff --git a/src/ResourceManager/HDInsight/Commands.HDInsight/Models/Management/AzureHdInsightManagementClient.cs b/src/ResourceManager/HDInsight/Commands.HDInsight/Models/Management/AzureHdInsightManagementClient.cs index abacaac0d61c..b1a8582480e2 100644 --- a/src/ResourceManager/HDInsight/Commands.HDInsight/Models/Management/AzureHdInsightManagementClient.cs +++ b/src/ResourceManager/HDInsight/Commands.HDInsight/Models/Management/AzureHdInsightManagementClient.cs @@ -59,7 +59,7 @@ public virtual List GetCluster(string resourceGroupName, string cluster var getresponse = Get(resourceGroupName, clusterName); if (getresponse != null) { - result.Add(getresponse.Cluster); + result.Add(getresponse.Cluster); } } return result; @@ -72,7 +72,7 @@ public virtual ClusterListResponse ListClusters() public virtual ClusterListResponse ListClusters(string resourceGroupName) { - return HdInsightManagementClient.Clusters.ListByResourceGroup(resourceGroupName); + return HdInsightManagementClient.Clusters.ListByResourceGroup(resourceGroupName); } public virtual ClusterGetResponse Get(string resourceGroupName, string clusterName) @@ -109,5 +109,22 @@ public virtual CapabilitiesResponse GetCapabilities(string location) { return HdInsightManagementClient.Clusters.GetCapabilities(location); } + + public virtual IDictionary GetClusterConfigurations(string resourceGroupName, string clusterName, string configurationName) + { + Dictionary properties = new Dictionary(); + + if (string.IsNullOrWhiteSpace(resourceGroupName) || + string.IsNullOrWhiteSpace(clusterName) || + string.IsNullOrWhiteSpace(configurationName)) + { + return properties; + } + + return HdInsightManagementClient.Clusters.GetClusterConfigurations( + resourceGroupName, + clusterName, + configurationName).Configuration; + } } } diff --git a/src/ResourceManager/HDInsight/Commands.HDInsight/packages.config b/src/ResourceManager/HDInsight/Commands.HDInsight/packages.config index 71414dc901ac..e220d7e75e37 100644 --- a/src/ResourceManager/HDInsight/Commands.HDInsight/packages.config +++ b/src/ResourceManager/HDInsight/Commands.HDInsight/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/ResourceManager/HDInsight/HDInsight.sln b/src/ResourceManager/HDInsight/HDInsight.sln new file mode 100644 index 000000000000..b014fe0664c9 --- /dev/null +++ b/src/ResourceManager/HDInsight/HDInsight.sln @@ -0,0 +1,75 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.31101.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{95C16AED-FD57-42A0-86C3-2CF4300A4817}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ResourceManager.Common", "..\Common\Commands.ResourceManager.Common\Commands.ResourceManager.Common.csproj", "{3819D8A7-C62C-4C47-8DDD-0332D9CE1252}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Resources", "..\Resources\Commands.Resources\Commands.Resources.csproj", "{E1F5201D-6067-430E-B303-4E367652991B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Resources.Rest", "..\Resources\Commands.ResourceManager\Cmdlets\Commands.Resources.Rest.csproj", "{8058D403-06E3-4BED-8924-D166CE303961}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.HDInsight", "Commands.HDInsight\Commands.HDInsight.csproj", "{6B7540C5-8AB3-4011-864B-0BE76F282F9E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.HDInsight.Test", "Commands.HDInsight.Test\Commands.HDInsight.Test.csproj", "{5FBB9D19-B365-4C97-BEFF-BBD5506A6D25}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Profile", "..\Profile\Commands.Profile\Commands.Profile.csproj", "{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ScenarioTests.ResourceManager.Common", "..\Common\Commands.ScenarioTests.ResourceManager.Common\Commands.ScenarioTests.ResourceManager.Common.csproj", "{3436A126-EDC9-4060-8952-9A1BE34CDD95}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Tags", "..\Tags\Commands.Tags\Commands.Tags.csproj", "{2493A8F7-1949-4F29-8D53-9D459046C3B8}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common", "..\..\Common\Commands.Common\Commands.Common.csproj", "{5EE72C53-1720-4309-B54B-5FB79703195F}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.Build.0 = Release|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Release|Any CPU.Build.0 = Release|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Release|Any CPU.Build.0 = Release|Any CPU + {6B7540C5-8AB3-4011-864B-0BE76F282F9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6B7540C5-8AB3-4011-864B-0BE76F282F9E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6B7540C5-8AB3-4011-864B-0BE76F282F9E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6B7540C5-8AB3-4011-864B-0BE76F282F9E}.Release|Any CPU.Build.0 = Release|Any CPU + {5FBB9D19-B365-4C97-BEFF-BBD5506A6D25}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5FBB9D19-B365-4C97-BEFF-BBD5506A6D25}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5FBB9D19-B365-4C97-BEFF-BBD5506A6D25}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5FBB9D19-B365-4C97-BEFF-BBD5506A6D25}.Release|Any CPU.Build.0 = Release|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.Build.0 = Release|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Release|Any CPU.Build.0 = Release|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Release|Any CPU.Build.0 = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {5FBB9D19-B365-4C97-BEFF-BBD5506A6D25} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} + {3436A126-EDC9-4060-8952-9A1BE34CDD95} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} + EndGlobalSection +EndGlobal diff --git a/src/ResourceManager/HDInsight/NuGet.Config b/src/ResourceManager/HDInsight/NuGet.Config new file mode 100644 index 000000000000..2de911013532 --- /dev/null +++ b/src/ResourceManager/HDInsight/NuGet.Config @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/ResourceManager/Insights/Commands.Insights.Test/Commands.Insights.Test.csproj b/src/ResourceManager/Insights/Commands.Insights.Test/Commands.Insights.Test.csproj index 29332bc36ea8..55394b43cbe4 100644 --- a/src/ResourceManager/Insights/Commands.Insights.Test/Commands.Insights.Test.csproj +++ b/src/ResourceManager/Insights/Commands.Insights.Test/Commands.Insights.Test.csproj @@ -51,7 +51,7 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -169,6 +169,10 @@ + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common @@ -257,19 +261,5 @@ - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/src/ResourceManager/Insights/Commands.Insights.Test/ScenarioTests/TestsController.cs b/src/ResourceManager/Insights/Commands.Insights.Test/ScenarioTests/TestsController.cs index 7949f278d8b8..5f5084c78205 100644 --- a/src/ResourceManager/Insights/Commands.Insights.Test/ScenarioTests/TestsController.cs +++ b/src/ResourceManager/Insights/Commands.Insights.Test/ScenarioTests/TestsController.cs @@ -86,10 +86,11 @@ public void RunPsTestWorkflow( var callingClassName = callingClassType .Split(new[] { "." }, StringSplitOptions.RemoveEmptyEntries) .Last(); - helper.SetupModules( - AzureModule.AzureResourceManager, - "ScenarioTests\\Common.ps1", - "ScenarioTests\\" + callingClassName + ".ps1"); + helper.SetupModules(AzureModule.AzureResourceManager, + "ScenarioTests\\Common.ps1", + "ScenarioTests\\" + callingClassName + ".ps1", + helper.RMProfileModule, + helper.GetRMModulePath("AzureRM.Insights.psd1")); try { diff --git a/src/ResourceManager/Insights/Commands.Insights.Test/packages.config b/src/ResourceManager/Insights/Commands.Insights.Test/packages.config index 6bb50d279ba9..9b43e148472e 100644 --- a/src/ResourceManager/Insights/Commands.Insights.Test/packages.config +++ b/src/ResourceManager/Insights/Commands.Insights.Test/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/ResourceManager/Insights/Commands.Insights/Commands.Insights.csproj b/src/ResourceManager/Insights/Commands.Insights/Commands.Insights.csproj index aa9e701d35d0..e0dfa4174d18 100644 --- a/src/ResourceManager/Insights/Commands.Insights/Commands.Insights.csproj +++ b/src/ResourceManager/Insights/Commands.Insights/Commands.Insights.csproj @@ -50,7 +50,7 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -219,25 +219,15 @@ + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/src/ResourceManager/Insights/Commands.Insights/packages.config b/src/ResourceManager/Insights/Commands.Insights/packages.config index 042cf78bd74b..239da90ca04a 100644 --- a/src/ResourceManager/Insights/Commands.Insights/packages.config +++ b/src/ResourceManager/Insights/Commands.Insights/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/ResourceManager/Insights/Insights.sln b/src/ResourceManager/Insights/Insights.sln new file mode 100644 index 000000000000..36d29f50e21d --- /dev/null +++ b/src/ResourceManager/Insights/Insights.sln @@ -0,0 +1,57 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.31101.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{95C16AED-FD57-42A0-86C3-2CF4300A4817}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ResourceManager.Common", "..\Common\Commands.ResourceManager.Common\Commands.ResourceManager.Common.csproj", "{3819D8A7-C62C-4C47-8DDD-0332D9CE1252}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Insights", "Commands.Insights\Commands.Insights.csproj", "{DEA446A1-84E2-46CC-B780-EB4AFDE2460E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Insights.Test", "Commands.Insights.Test\Commands.Insights.Test.csproj", "{469F20E0-9D40-41AD-94C3-B47AD15A4C00}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ScenarioTests.ResourceManager.Common", "..\Common\Commands.ScenarioTests.ResourceManager.Common\Commands.ScenarioTests.ResourceManager.Common.csproj", "{3436A126-EDC9-4060-8952-9A1BE34CDD95}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Profile", "..\Profile\Commands.Profile\Commands.Profile.csproj", "{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common", "..\..\Common\Commands.Common\Commands.Common.csproj", "{5EE72C53-1720-4309-B54B-5FB79703195F}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.Build.0 = Release|Any CPU + {DEA446A1-84E2-46CC-B780-EB4AFDE2460E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DEA446A1-84E2-46CC-B780-EB4AFDE2460E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DEA446A1-84E2-46CC-B780-EB4AFDE2460E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DEA446A1-84E2-46CC-B780-EB4AFDE2460E}.Release|Any CPU.Build.0 = Release|Any CPU + {469F20E0-9D40-41AD-94C3-B47AD15A4C00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {469F20E0-9D40-41AD-94C3-B47AD15A4C00}.Debug|Any CPU.Build.0 = Debug|Any CPU + {469F20E0-9D40-41AD-94C3-B47AD15A4C00}.Release|Any CPU.ActiveCfg = Release|Any CPU + {469F20E0-9D40-41AD-94C3-B47AD15A4C00}.Release|Any CPU.Build.0 = Release|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Release|Any CPU.Build.0 = Release|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.Build.0 = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {469F20E0-9D40-41AD-94C3-B47AD15A4C00} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} + {3436A126-EDC9-4060-8952-9A1BE34CDD95} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} + EndGlobalSection +EndGlobal diff --git a/src/ResourceManager/Insights/NuGet.Config b/src/ResourceManager/Insights/NuGet.Config new file mode 100644 index 000000000000..2de911013532 --- /dev/null +++ b/src/ResourceManager/Insights/NuGet.Config @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault.Test/Commands.KeyVault.Test.csproj b/src/ResourceManager/KeyVault/Commands.KeyVault.Test/Commands.KeyVault.Test.csproj index 22430309b25c..432b76f8a453 100644 --- a/src/ResourceManager/KeyVault/Commands.KeyVault.Test/Commands.KeyVault.Test.csproj +++ b/src/ResourceManager/KeyVault/Commands.KeyVault.Test/Commands.KeyVault.Test.csproj @@ -57,7 +57,7 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -286,6 +286,10 @@ + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common @@ -314,13 +318,5 @@ - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault.Test/ScenarioTests/KeyVaultManagementController.cs b/src/ResourceManager/KeyVault/Commands.KeyVault.Test/ScenarioTests/KeyVaultManagementController.cs index 3cf18d314d63..b659174a86b4 100644 --- a/src/ResourceManager/KeyVault/Commands.KeyVault.Test/ScenarioTests/KeyVaultManagementController.cs +++ b/src/ResourceManager/KeyVault/Commands.KeyVault.Test/ScenarioTests/KeyVaultManagementController.cs @@ -18,7 +18,6 @@ using Microsoft.Azure.Subscriptions; using Microsoft.Azure.Test.HttpRecorder; using Microsoft.WindowsAzure.Commands.ScenarioTest; -using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.Azure.Test; using System; using System.Linq; @@ -26,7 +25,6 @@ using Microsoft.Azure.Graph.RBAC; using Microsoft.Azure.Management.KeyVault; using Microsoft.Azure.Commands.ResourceManager.Common; -using Microsoft.Azure.Common.Authentication.Models; namespace Microsoft.Azure.Commands.KeyVault.Test { @@ -107,10 +105,12 @@ public void RunPsTestWorkflow( var callingClassName = callingClassType .Split(new[] { "." }, StringSplitOptions.RemoveEmptyEntries) .Last(); - helper.SetupModules( - AzureModule.AzureResourceManager, - "ScenarioTests\\Common.ps1", - "ScenarioTests\\" + callingClassName + ".ps1"); + helper.SetupModules(AzureModule.AzureResourceManager, + "ScenarioTests\\Common.ps1", + "ScenarioTests\\" + callingClassName + ".ps1", + helper.RMProfileModule, + helper.RMResourceModule, + helper.GetRMModulePath("AzureRM.KeyVault.psd1")); try { diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault.Test/packages.config b/src/ResourceManager/KeyVault/Commands.KeyVault.Test/packages.config index 47d4a218a822..8c8566ef15ea 100644 --- a/src/ResourceManager/KeyVault/Commands.KeyVault.Test/packages.config +++ b/src/ResourceManager/KeyVault/Commands.KeyVault.Test/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault/Commands.KeyVault.csproj b/src/ResourceManager/KeyVault/Commands.KeyVault/Commands.KeyVault.csproj index 8795b067b938..4026353e18e5 100644 --- a/src/ResourceManager/KeyVault/Commands.KeyVault/Commands.KeyVault.csproj +++ b/src/ResourceManager/KeyVault/Commands.KeyVault/Commands.KeyVault.csproj @@ -117,7 +117,7 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -200,6 +200,10 @@ + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common @@ -225,6 +229,5 @@ - \ No newline at end of file diff --git a/src/ResourceManager/KeyVault/Commands.KeyVault/packages.config b/src/ResourceManager/KeyVault/Commands.KeyVault/packages.config index 1092909f33a5..4c7e7f1fd981 100644 --- a/src/ResourceManager/KeyVault/Commands.KeyVault/packages.config +++ b/src/ResourceManager/KeyVault/Commands.KeyVault/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/ResourceManager/KeyVault/KeyVault.sln b/src/ResourceManager/KeyVault/KeyVault.sln new file mode 100644 index 000000000000..d0026ceedd50 --- /dev/null +++ b/src/ResourceManager/KeyVault/KeyVault.sln @@ -0,0 +1,75 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.31101.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{95C16AED-FD57-42A0-86C3-2CF4300A4817}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ResourceManager.Common", "..\Common\Commands.ResourceManager.Common\Commands.ResourceManager.Common.csproj", "{3819D8A7-C62C-4C47-8DDD-0332D9CE1252}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Resources", "..\Resources\Commands.Resources\Commands.Resources.csproj", "{E1F5201D-6067-430E-B303-4E367652991B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Tags", "..\Tags\Commands.Tags\Commands.Tags.csproj", "{2493A8F7-1949-4F29-8D53-9D459046C3B8}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Resources.Rest", "..\Resources\Commands.ResourceManager\Cmdlets\Commands.Resources.Rest.csproj", "{8058D403-06E3-4BED-8924-D166CE303961}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.KeyVault", "Commands.KeyVault\Commands.KeyVault.csproj", "{9FFC40CC-A341-4D0C-A25D-DC6B78EF6C94}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.KeyVault.Test", "Commands.KeyVault.Test\Commands.KeyVault.Test.csproj", "{080B0477-7E52-4455-90AB-23BD13D1B1CE}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ScenarioTests.ResourceManager.Common", "..\Common\Commands.ScenarioTests.ResourceManager.Common\Commands.ScenarioTests.ResourceManager.Common.csproj", "{3436A126-EDC9-4060-8952-9A1BE34CDD95}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Profile", "..\Profile\Commands.Profile\Commands.Profile.csproj", "{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common", "..\..\Common\Commands.Common\Commands.Common.csproj", "{5EE72C53-1720-4309-B54B-5FB79703195F}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.Build.0 = Release|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Release|Any CPU.Build.0 = Release|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Release|Any CPU.Build.0 = Release|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Release|Any CPU.Build.0 = Release|Any CPU + {9FFC40CC-A341-4D0C-A25D-DC6B78EF6C94}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9FFC40CC-A341-4D0C-A25D-DC6B78EF6C94}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9FFC40CC-A341-4D0C-A25D-DC6B78EF6C94}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9FFC40CC-A341-4D0C-A25D-DC6B78EF6C94}.Release|Any CPU.Build.0 = Release|Any CPU + {080B0477-7E52-4455-90AB-23BD13D1B1CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {080B0477-7E52-4455-90AB-23BD13D1B1CE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {080B0477-7E52-4455-90AB-23BD13D1B1CE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {080B0477-7E52-4455-90AB-23BD13D1B1CE}.Release|Any CPU.Build.0 = Release|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Release|Any CPU.Build.0 = Release|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.Build.0 = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {080B0477-7E52-4455-90AB-23BD13D1B1CE} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} + {3436A126-EDC9-4060-8952-9A1BE34CDD95} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} + EndGlobalSection +EndGlobal diff --git a/src/ResourceManager/KeyVault/NuGet.Config b/src/ResourceManager/KeyVault/NuGet.Config new file mode 100644 index 000000000000..2de911013532 --- /dev/null +++ b/src/ResourceManager/KeyVault/NuGet.Config @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/ResourceManager/Network/Commands.Network.Test/Commands.Network.Test.csproj b/src/ResourceManager/Network/Commands.Network.Test/Commands.Network.Test.csproj index b0338fdcfc9f..9dd8062f23a1 100644 --- a/src/ResourceManager/Network/Commands.Network.Test/Commands.Network.Test.csproj +++ b/src/ResourceManager/Network/Commands.Network.Test/Commands.Network.Test.csproj @@ -50,7 +50,7 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -323,6 +323,10 @@ {65c3a86a-716d-4e7d-ab67-1db00b3bf72d} Commands.Common.Storage + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common @@ -341,22 +345,5 @@ - - - xcopy "$(SolutionDir)Package\$(ConfigurationName)\*.*" $(TargetDir) /Y /E - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/src/ResourceManager/Network/Commands.Network.Test/NetworkResourcesController.cs b/src/ResourceManager/Network/Commands.Network.Test/NetworkResourcesController.cs index ca82fe660ac2..f797e0817d22 100644 --- a/src/ResourceManager/Network/Commands.Network.Test/NetworkResourcesController.cs +++ b/src/ResourceManager/Network/Commands.Network.Test/NetworkResourcesController.cs @@ -20,7 +20,6 @@ using Microsoft.Azure.Management.Resources; using Microsoft.Azure.Subscriptions; using Microsoft.WindowsAzure.Commands.ScenarioTest; -using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.Azure.Test; using Microsoft.Azure.Common.Authentication; @@ -96,10 +95,12 @@ public void RunPsTestWorkflow( var callingClassName = callingClassType .Split(new[] { "." }, StringSplitOptions.RemoveEmptyEntries) .Last(); - helper.SetupModules( - AzureModule.AzureResourceManager, - "ScenarioTests\\Common.ps1", - "ScenarioTests\\" + callingClassName + ".ps1"); + helper.SetupModules(AzureModule.AzureResourceManager, + "ScenarioTests\\Common.ps1", + "ScenarioTests\\" + callingClassName + ".ps1", + helper.RMProfileModule, + helper.RMResourceModule, + helper.GetRMModulePath("AzureRM.Network.psd1")); try { diff --git a/src/ResourceManager/Network/Commands.Network.Test/packages.config b/src/ResourceManager/Network/Commands.Network.Test/packages.config index c29d7ef31161..1ac8445dd4b3 100644 --- a/src/ResourceManager/Network/Commands.Network.Test/packages.config +++ b/src/ResourceManager/Network/Commands.Network.Test/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/ResourceManager/Network/Commands.Network/Commands.Network.csproj b/src/ResourceManager/Network/Commands.Network/Commands.Network.csproj index 5ac7c2f0e920..9b6b23ad81de 100644 --- a/src/ResourceManager/Network/Commands.Network/Commands.Network.csproj +++ b/src/ResourceManager/Network/Commands.Network/Commands.Network.csproj @@ -55,7 +55,7 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -378,6 +378,10 @@ + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common @@ -421,23 +425,5 @@ - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - \ No newline at end of file diff --git a/src/ResourceManager/Network/Commands.Network/packages.config b/src/ResourceManager/Network/Commands.Network/packages.config index e2d291758307..5a0561c5a56d 100644 --- a/src/ResourceManager/Network/Commands.Network/packages.config +++ b/src/ResourceManager/Network/Commands.Network/packages.config @@ -3,7 +3,7 @@ - + diff --git a/src/ResourceManager/Network/Network.sln b/src/ResourceManager/Network/Network.sln new file mode 100644 index 000000000000..828d39e9f320 --- /dev/null +++ b/src/ResourceManager/Network/Network.sln @@ -0,0 +1,81 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.31101.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{95C16AED-FD57-42A0-86C3-2CF4300A4817}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ResourceManager.Common", "..\Common\Commands.ResourceManager.Common\Commands.ResourceManager.Common.csproj", "{3819D8A7-C62C-4C47-8DDD-0332D9CE1252}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Resources", "..\Resources\Commands.Resources\Commands.Resources.csproj", "{E1F5201D-6067-430E-B303-4E367652991B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Tags", "..\Tags\Commands.Tags\Commands.Tags.csproj", "{2493A8F7-1949-4F29-8D53-9D459046C3B8}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Network", "Commands.Network\Commands.Network.csproj", "{98CFD96B-A6BC-4F15-AE2C-603FC2B58981}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common.Storage", "..\..\Common\Commands.Common.Storage\Commands.Common.Storage.csproj", "{65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Network.Test", "Commands.Network.Test\Commands.Network.Test.csproj", "{A2DF4FE5-46EE-43E2-B246-E5CDDD47B752}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ScenarioTests.ResourceManager.Common", "..\Common\Commands.ScenarioTests.ResourceManager.Common\Commands.ScenarioTests.ResourceManager.Common.csproj", "{3436A126-EDC9-4060-8952-9A1BE34CDD95}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Resources.Rest", "..\Resources\Commands.ResourceManager\Cmdlets\Commands.Resources.Rest.csproj", "{8058D403-06E3-4BED-8924-D166CE303961}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Profile", "..\Profile\Commands.Profile\Commands.Profile.csproj", "{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common", "..\..\Common\Commands.Common\Commands.Common.csproj", "{5EE72C53-1720-4309-B54B-5FB79703195F}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.Build.0 = Release|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Release|Any CPU.Build.0 = Release|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Release|Any CPU.Build.0 = Release|Any CPU + {98CFD96B-A6BC-4F15-AE2C-603FC2B58981}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {98CFD96B-A6BC-4F15-AE2C-603FC2B58981}.Debug|Any CPU.Build.0 = Debug|Any CPU + {98CFD96B-A6BC-4F15-AE2C-603FC2B58981}.Release|Any CPU.ActiveCfg = Release|Any CPU + {98CFD96B-A6BC-4F15-AE2C-603FC2B58981}.Release|Any CPU.Build.0 = Release|Any CPU + {65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Release|Any CPU.Build.0 = Release|Any CPU + {A2DF4FE5-46EE-43E2-B246-E5CDDD47B752}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A2DF4FE5-46EE-43E2-B246-E5CDDD47B752}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A2DF4FE5-46EE-43E2-B246-E5CDDD47B752}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A2DF4FE5-46EE-43E2-B246-E5CDDD47B752}.Release|Any CPU.Build.0 = Release|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Release|Any CPU.Build.0 = Release|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Release|Any CPU.Build.0 = Release|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.Build.0 = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {A2DF4FE5-46EE-43E2-B246-E5CDDD47B752} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} + {3436A126-EDC9-4060-8952-9A1BE34CDD95} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} + EndGlobalSection +EndGlobal diff --git a/src/ResourceManager/Network/NuGet.Config b/src/ResourceManager/Network/NuGet.Config new file mode 100644 index 000000000000..2de911013532 --- /dev/null +++ b/src/ResourceManager/Network/NuGet.Config @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/Commands.OperationalInsights.Test.csproj b/src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/Commands.OperationalInsights.Test.csproj index ffa69b696d5a..245d4025ef4b 100644 --- a/src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/Commands.OperationalInsights.Test.csproj +++ b/src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/Commands.OperationalInsights.Test.csproj @@ -48,7 +48,7 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -140,6 +140,10 @@ + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common @@ -187,20 +191,5 @@ - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - \ No newline at end of file diff --git a/src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/ScenarioTests/OperationalInsightsScenarioTestBase.cs b/src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/ScenarioTests/OperationalInsightsScenarioTestBase.cs index a1554ee8afc8..7eb73b3e4349 100644 --- a/src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/ScenarioTests/OperationalInsightsScenarioTestBase.cs +++ b/src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/ScenarioTests/OperationalInsightsScenarioTestBase.cs @@ -12,7 +12,6 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using System.Collections.Generic; using Microsoft.Azure.Common.Authentication; using Microsoft.Azure.Gallery; using Microsoft.Azure.Management.Authorization; @@ -59,10 +58,12 @@ protected void RunPowerShellTest(params string[] scripts) SetupManagementClients(); helper.SetupEnvironment(AzureModule.AzureResourceManager); - helper.SetupModules( - AzureModule.AzureResourceManager, - "ScenarioTests\\Common.ps1", - "ScenarioTests\\" + this.GetType().Name + ".ps1"); + helper.SetupModules(AzureModule.AzureResourceManager, + "ScenarioTests\\Common.ps1", + "ScenarioTests\\" + this.GetType().Name + ".ps1", + helper.RMProfileModule, + helper.RMResourceModule, + helper.GetRMModulePath(@"AzureRM.OperationalInsights.psd1")); helper.RunPowerShellTest(scripts); } diff --git a/src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/packages.config b/src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/packages.config index 292c376798b6..a127ed24b996 100644 --- a/src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/packages.config +++ b/src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Commands.OperationalInsights.csproj b/src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Commands.OperationalInsights.csproj index 69dabcffb636..aba77c71886f 100644 --- a/src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Commands.OperationalInsights.csproj +++ b/src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Commands.OperationalInsights.csproj @@ -55,7 +55,7 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -186,12 +186,15 @@ + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common - \ No newline at end of file diff --git a/src/ResourceManager/OperationalInsights/Commands.OperationalInsights/packages.config b/src/ResourceManager/OperationalInsights/Commands.OperationalInsights/packages.config index 2724561ee814..4552dc7803a2 100644 --- a/src/ResourceManager/OperationalInsights/Commands.OperationalInsights/packages.config +++ b/src/ResourceManager/OperationalInsights/Commands.OperationalInsights/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/ResourceManager/OperationalInsights/NuGet.Config b/src/ResourceManager/OperationalInsights/NuGet.Config new file mode 100644 index 000000000000..2de911013532 --- /dev/null +++ b/src/ResourceManager/OperationalInsights/NuGet.Config @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/ResourceManager/OperationalInsights/OperationalInsights.sln b/src/ResourceManager/OperationalInsights/OperationalInsights.sln new file mode 100644 index 000000000000..627df9cc0c04 --- /dev/null +++ b/src/ResourceManager/OperationalInsights/OperationalInsights.sln @@ -0,0 +1,75 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.31101.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{95C16AED-FD57-42A0-86C3-2CF4300A4817}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ResourceManager.Common", "..\Common\Commands.ResourceManager.Common\Commands.ResourceManager.Common.csproj", "{3819D8A7-C62C-4C47-8DDD-0332D9CE1252}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.OperationalInsights", "Commands.OperationalInsights\Commands.OperationalInsights.csproj", "{5BE35A94-C20F-4659-AA29-9B9AEBCFAF36}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.OperationalInsights.Test", "Commands.OperationalInsights.Test\Commands.OperationalInsights.Test.csproj", "{11387E0A-4DB6-49B8-BDBC-EE020D85D10F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Profile", "..\Profile\Commands.Profile\Commands.Profile.csproj", "{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ScenarioTests.ResourceManager.Common", "..\Common\Commands.ScenarioTests.ResourceManager.Common\Commands.ScenarioTests.ResourceManager.Common.csproj", "{3436A126-EDC9-4060-8952-9A1BE34CDD95}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Resources", "..\Resources\Commands.Resources\Commands.Resources.csproj", "{E1F5201D-6067-430E-B303-4E367652991B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Resources.Rest", "..\Resources\Commands.ResourceManager\Cmdlets\Commands.Resources.Rest.csproj", "{8058D403-06E3-4BED-8924-D166CE303961}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Tags", "..\Tags\Commands.Tags\Commands.Tags.csproj", "{2493A8F7-1949-4F29-8D53-9D459046C3B8}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common", "..\..\Common\Commands.Common\Commands.Common.csproj", "{5EE72C53-1720-4309-B54B-5FB79703195F}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.Build.0 = Release|Any CPU + {5BE35A94-C20F-4659-AA29-9B9AEBCFAF36}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5BE35A94-C20F-4659-AA29-9B9AEBCFAF36}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5BE35A94-C20F-4659-AA29-9B9AEBCFAF36}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5BE35A94-C20F-4659-AA29-9B9AEBCFAF36}.Release|Any CPU.Build.0 = Release|Any CPU + {11387E0A-4DB6-49B8-BDBC-EE020D85D10F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {11387E0A-4DB6-49B8-BDBC-EE020D85D10F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {11387E0A-4DB6-49B8-BDBC-EE020D85D10F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {11387E0A-4DB6-49B8-BDBC-EE020D85D10F}.Release|Any CPU.Build.0 = Release|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.Build.0 = Release|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Release|Any CPU.Build.0 = Release|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Release|Any CPU.Build.0 = Release|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Release|Any CPU.Build.0 = Release|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Release|Any CPU.Build.0 = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {11387E0A-4DB6-49B8-BDBC-EE020D85D10F} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} + {3436A126-EDC9-4060-8952-9A1BE34CDD95} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} + EndGlobalSection +EndGlobal diff --git a/src/ResourceManager/Profile/AzureRM.Profile.psd1 b/src/ResourceManager/Profile/AzureRM.Profile.psd1 index c7ea821c2ed1..6ba540780cdc 100644 --- a/src/ResourceManager/Profile/AzureRM.Profile.psd1 +++ b/src/ResourceManager/Profile/AzureRM.Profile.psd1 @@ -76,7 +76,10 @@ CmdletsToExport = '*' VariablesToExport = '*' # Aliases to export from this module -AliasesToExport = @() +AliasesToExport = @( + 'Login-AzureRmAccount', + 'Select-AzureRmSubscription' + ) # List of all modules packaged with this module ModuleList = @() diff --git a/src/ResourceManager/Profile/Commands.Profile.Test/Commands.Profile.Test.csproj b/src/ResourceManager/Profile/Commands.Profile.Test/Commands.Profile.Test.csproj index 0f80c686ac38..b4720ea3a1ab 100644 --- a/src/ResourceManager/Profile/Commands.Profile.Test/Commands.Profile.Test.csproj +++ b/src/ResourceManager/Profile/Commands.Profile.Test/Commands.Profile.Test.csproj @@ -1,7 +1,6 @@  - Debug @@ -58,7 +57,7 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -199,6 +198,10 @@ + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common @@ -214,12 +217,5 @@ - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - \ No newline at end of file diff --git a/src/ResourceManager/Profile/Commands.Profile.Test/ContextCmdletTests.cs b/src/ResourceManager/Profile/Commands.Profile.Test/ContextCmdletTests.cs index 4af66377caf0..9f9146552369 100644 --- a/src/ResourceManager/Profile/Commands.Profile.Test/ContextCmdletTests.cs +++ b/src/ResourceManager/Profile/Commands.Profile.Test/ContextCmdletTests.cs @@ -22,6 +22,7 @@ using System.Linq; using Xunit; using System; +using Microsoft.Azure.Commands.Profile.Models; using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; namespace Microsoft.Azure.Commands.ResourceManager.Profile.Test @@ -54,8 +55,8 @@ public void GetAzureContext() // Verify Assert.True(commandRuntimeMock.OutputPipeline.Count == 1); - var context = (AzureContext) commandRuntimeMock.OutputPipeline[0]; - Assert.Equal("test", context.Subscription.Name); + var context = (PSAzureContext) commandRuntimeMock.OutputPipeline[0]; + Assert.Equal("test", context.Subscription.SubscriptionName); } [Fact] @@ -66,7 +67,7 @@ public void SelectAzureContextWithSubscriptionAndTenant() // Setup cmdlt.CommandRuntime = commandRuntimeMock; cmdlt.SubscriptionId = "db1ab6f0-4769-4b27-930e-01e2ef9c123c"; - cmdlt.Tenant = "72f988bf-86f1-41af-91ab-2d7cd011db47"; + cmdlt.TenantId = "72f988bf-86f1-41af-91ab-2d7cd011db47"; // Act cmdlt.InvokeBeginProcessing(); @@ -75,9 +76,9 @@ public void SelectAzureContextWithSubscriptionAndTenant() // Verify Assert.True(commandRuntimeMock.OutputPipeline.Count == 1); - var context = (AzureContext)commandRuntimeMock.OutputPipeline[0]; - Assert.Equal("db1ab6f0-4769-4b27-930e-01e2ef9c123c", context.Subscription.Id.ToString()); - Assert.Equal("72f988bf-86f1-41af-91ab-2d7cd011db47", context.Tenant.Id.ToString()); + var context = (PSAzureContext)commandRuntimeMock.OutputPipeline[0]; + Assert.Equal("db1ab6f0-4769-4b27-930e-01e2ef9c123c", context.Subscription.SubscriptionId); + Assert.Equal("72f988bf-86f1-41af-91ab-2d7cd011db47", context.Tenant.TenantId); } [Fact] @@ -96,8 +97,8 @@ public void SelectAzureContextWithSubscriptionAndNoTenant() // Verify Assert.True(commandRuntimeMock.OutputPipeline.Count == 1); - var context = (AzureContext)commandRuntimeMock.OutputPipeline[0]; - Assert.Equal("db1ab6f0-4769-4b27-930e-01e2ef9c123c", context.Subscription.Id.ToString()); + var context = (PSAzureContext)commandRuntimeMock.OutputPipeline[0]; + Assert.Equal("db1ab6f0-4769-4b27-930e-01e2ef9c123c", context.Subscription.SubscriptionId); } [Fact] @@ -107,7 +108,7 @@ public void SelectAzureContextWithNoSubscriptionAndTenant() var cmdlt = new SetAzureRMContextCommand(); // Setup cmdlt.CommandRuntime = commandRuntimeMock; - cmdlt.Tenant = "72f988bf-86f1-41af-91ab-2d7cd011db47"; + cmdlt.TenantId = "72f988bf-86f1-41af-91ab-2d7cd011db47"; // Act cmdlt.InvokeBeginProcessing(); @@ -116,8 +117,8 @@ public void SelectAzureContextWithNoSubscriptionAndTenant() // Verify Assert.True(commandRuntimeMock.OutputPipeline.Count == 1); - var context = (AzureContext)commandRuntimeMock.OutputPipeline[0]; - Assert.Equal("72f988bf-86f1-41af-91ab-2d7cd011db47", context.Tenant.Id.ToString()); + var context = (PSAzureContext)commandRuntimeMock.OutputPipeline[0]; + Assert.Equal("72f988bf-86f1-41af-91ab-2d7cd011db47", context.Tenant.TenantId); } [Fact] @@ -135,7 +136,7 @@ public void SelectAzureContextWithNoSubscriptionAndNoTenant() // Verify Assert.True(commandRuntimeMock.OutputPipeline.Count == 1); - var context = (AzureContext)commandRuntimeMock.OutputPipeline[0]; + var context = (PSAzureContext)commandRuntimeMock.OutputPipeline[0]; Assert.NotNull(context); } } diff --git a/src/ResourceManager/Profile/Commands.Profile.Test/EnvironmentCmdletTests.cs b/src/ResourceManager/Profile/Commands.Profile.Test/EnvironmentCmdletTests.cs index e477f071f432..a4c36a5e0dff 100644 --- a/src/ResourceManager/Profile/Commands.Profile.Test/EnvironmentCmdletTests.cs +++ b/src/ResourceManager/Profile/Commands.Profile.Test/EnvironmentCmdletTests.cs @@ -12,20 +12,19 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.WindowsAzure.Commands.Utilities.Common; -using Microsoft.Azure.Commands.Profile; -using Microsoft.Azure.Commands.ResourceManager.Common; +using System; +using System.Management.Automation; +using System.Collections.Generic; using Microsoft.Azure.Common.Authentication; using Microsoft.Azure.Common.Authentication.Models; -using Microsoft.WindowsAzure.Commands.Common.Test.Mocks; +using Microsoft.Azure.Commands.Profile; +using Microsoft.Azure.Commands.Profile.Models; +using Microsoft.Azure.Commands.ResourceManager.Common; using Microsoft.WindowsAzure.Commands.ScenarioTest; -using System.Linq; -using Xunit; -using System; using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; +using Microsoft.WindowsAzure.Commands.Utilities.Common; using Moq; -using System.Management.Automation; -using System.Collections.Generic; +using Xunit; namespace Microsoft.Azure.Commands.ResourceManager.Profile.Test { diff --git a/src/ResourceManager/Profile/Commands.Profile.Test/LoginCmdletTests.cs b/src/ResourceManager/Profile/Commands.Profile.Test/LoginCmdletTests.cs index 119ec1ed5dcb..bdd4a92ce59e 100644 --- a/src/ResourceManager/Profile/Commands.Profile.Test/LoginCmdletTests.cs +++ b/src/ResourceManager/Profile/Commands.Profile.Test/LoginCmdletTests.cs @@ -45,7 +45,7 @@ public LoginCmdletTests() [Trait(Category.AcceptanceType, Category.LiveOnly)] public void LoginWithSubscriptionAndTenant() { - var cmdlt = new LoginAzureRMAccountCommand(); + var cmdlt = new AddAzureRMAccountCommand(); // Setup cmdlt.CommandRuntime = commandRuntimeMock; cmdlt.SubscriptionId = "2c224e7e-3ef5-431d-a57b-e71f4662e3a6"; @@ -64,7 +64,7 @@ public void LoginWithSubscriptionAndTenant() [Trait(Category.AcceptanceType, Category.LiveOnly)] public void LoginWithInvalidSubscriptionAndTenantThrowsCloudException() { - var cmdlt = new LoginAzureRMAccountCommand(); + var cmdlt = new AddAzureRMAccountCommand(); // Setup cmdlt.CommandRuntime = commandRuntimeMock; cmdlt.SubscriptionId = "2c224e7e-3ef5-431d-a57b-e71f4662e3a5"; @@ -80,7 +80,7 @@ public void LoginWithInvalidSubscriptionAndTenantThrowsCloudException() [Trait(Category.AcceptanceType, Category.LiveOnly)] public void LoginWithSubscriptionAndNoTenant() { - var cmdlt = new LoginAzureRMAccountCommand(); + var cmdlt = new AddAzureRMAccountCommand(); // Setup cmdlt.CommandRuntime = commandRuntimeMock; cmdlt.SubscriptionId = "2c224e7e-3ef5-431d-a57b-e71f4662e3a6"; @@ -98,7 +98,7 @@ public void LoginWithSubscriptionAndNoTenant() [Trait(Category.AcceptanceType, Category.LiveOnly)] public void LoginWithNoSubscriptionAndNoTenant() { - var cmdlt = new LoginAzureRMAccountCommand(); + var cmdlt = new AddAzureRMAccountCommand(); // Setup cmdlt.CommandRuntime = commandRuntimeMock; @@ -115,7 +115,7 @@ public void LoginWithNoSubscriptionAndNoTenant() [Trait(Category.AcceptanceType, Category.LiveOnly)] public void LoginWithNoSubscriptionAndTenant() { - var cmdlt = new LoginAzureRMAccountCommand(); + var cmdlt = new AddAzureRMAccountCommand(); // Setup cmdlt.CommandRuntime = commandRuntimeMock; cmdlt.Tenant = "72f988bf-86f1-41af-91ab-2d7cd011db47"; diff --git a/src/ResourceManager/Profile/Commands.Profile.Test/ProfileController.cs b/src/ResourceManager/Profile/Commands.Profile.Test/ProfileController.cs index a9eee14788cd..1e2459d0ba69 100644 --- a/src/ResourceManager/Profile/Commands.Profile.Test/ProfileController.cs +++ b/src/ResourceManager/Profile/Commands.Profile.Test/ProfileController.cs @@ -13,16 +13,10 @@ // ---------------------------------------------------------------------------------- using System; -using System.Collections.Generic; using System.Linq; -using System.Net.Http; -using System.Net.Http.Headers; -using Microsoft.Azure.Commands.ResourceManager.Common; using Microsoft.Azure.Common.Authentication; -using Microsoft.Azure.Management.Resources; using Microsoft.Azure.Subscriptions; using Microsoft.Azure.Test; -using Microsoft.Azure.Test.HttpRecorder; using Microsoft.WindowsAzure.Commands.Common.Test.Mocks; using Microsoft.WindowsAzure.Commands.ScenarioTest; @@ -93,9 +87,9 @@ public void RunPsTestWorkflow( var callingClassName = callingClassType .Split(new[] {"."}, StringSplitOptions.RemoveEmptyEntries) .Last(); - helper.SetupModules( - AzureModule.AzureResourceManager, - callingClassName + ".ps1"); + helper.SetupModules(AzureModule.AzureResourceManager, + callingClassName + ".ps1", + helper.RMProfileModule); try { diff --git a/src/ResourceManager/Profile/Commands.Profile.Test/SessionRecords/Microsoft.Azure.Commands.Profile.Test.SubscriptionCmdletTests/AllParameterSetsSucceed.json b/src/ResourceManager/Profile/Commands.Profile.Test/SessionRecords/Microsoft.Azure.Commands.Profile.Test.SubscriptionCmdletTests/AllParameterSetsSucceed.json index 6e40e34f6a17..3c38ad3c0d5f 100644 --- a/src/ResourceManager/Profile/Commands.Profile.Test/SessionRecords/Microsoft.Azure.Commands.Profile.Test.SubscriptionCmdletTests/AllParameterSetsSucceed.json +++ b/src/ResourceManager/Profile/Commands.Profile.Test/SessionRecords/Microsoft.Azure.Commands.Profile.Test.SubscriptionCmdletTests/AllParameterSetsSucceed.json @@ -10,10 +10,10 @@ "Microsoft.Azure.Subscriptions.SubscriptionClient/2.0.0.0" ] }, - "ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"id\": \"/tenants/72f988bf-86f1-41af-91ab-2d7cd011db47\",\r\n \"tenantId\": \"72f988bf-86f1-41af-91ab-2d7cd011db47\"\r\n },\r\n {\r\n \"id\": \"/tenants/54826b22-38d6-4fb2-bad9-b7b93a3e9c5a\",\r\n \"tenantId\": \"54826b22-38d6-4fb2-bad9-b7b93a3e9c5a\"\r\n },\r\n {\r\n \"id\": \"/tenants/d5f34e25-06f2-42eb-bbe1-0efebece6ed5\",\r\n \"tenantId\": \"d5f34e25-06f2-42eb-bbe1-0efebece6ed5\"\r\n }\r\n ]\r\n}", + "ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"id\": \"/tenants/72f988bf-86f1-41af-91ab-2d7cd011db47\",\r\n \"tenantId\": \"72f988bf-86f1-41af-91ab-2d7cd011db47\"\r\n }\r\n ]\r\n}", "ResponseHeaders": { "Content-Length": [ - "326" + "116" ], "Content-Type": [ "application/json; charset=utf-8" @@ -25,16 +25,16 @@ "no-cache" ], "x-ms-ratelimit-remaining-tenant-reads": [ - "14994" + "14997" ], "x-ms-request-id": [ - "dfbcb8b4-79bd-4b49-98cd-2f48f03ab959" + "a42eba50-f499-4291-96ed-4d11c704ad59" ], "x-ms-correlation-request-id": [ - "dfbcb8b4-79bd-4b49-98cd-2f48f03ab959" + "a42eba50-f499-4291-96ed-4d11c704ad59" ], "x-ms-routing-request-id": [ - "WESTUS:20150917T092920Z:dfbcb8b4-79bd-4b49-98cd-2f48f03ab959" + "WESTUS:20150923T220350Z:a42eba50-f499-4291-96ed-4d11c704ad59" ], "Strict-Transport-Security": [ "max-age=31536000; includeSubDomains" @@ -43,7 +43,7 @@ "no-cache" ], "Date": [ - "Thu, 17 Sep 2015 09:29:19 GMT" + "Wed, 23 Sep 2015 22:03:49 GMT" ] }, "StatusCode": 200 @@ -58,10 +58,10 @@ "Microsoft.Azure.Subscriptions.SubscriptionClient/2.0.0.0" ] }, - "ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"id\": \"/subscriptions/00977cdb-163f-435f-9c32-39ec8ae61f4d\",\r\n \"subscriptionId\": \"00977cdb-163f-435f-9c32-39ec8ae61f4d\",\r\n \"displayName\": \"node\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/279b0675-cf67-467f-98f0-67ae31eb540f\",\r\n \"subscriptionId\": \"279b0675-cf67-467f-98f0-67ae31eb540f\",\r\n \"displayName\": \"Azure SDK CI\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/2c224e7e-3ef5-431d-a57b-e71f4662e3a6\",\r\n \"subscriptionId\": \"2c224e7e-3ef5-431d-a57b-e71f4662e3a6\",\r\n \"displayName\": \"Node CLI Test\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/69801886-4b2b-493b-ba5b-3b26dabadadc\",\r\n \"subscriptionId\": \"69801886-4b2b-493b-ba5b-3b26dabadadc\",\r\n \"displayName\": \"WebStackAndEF_TestInfra\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/6b085460-5f21-477e-ba44-1035046e9101\",\r\n \"subscriptionId\": \"6b085460-5f21-477e-ba44-1035046e9101\",\r\n \"displayName\": \"Azure SDK Infrastructure\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/9ed7cca5-c306-4f66-9d1c-2766e67013d8\",\r\n \"subscriptionId\": \"9ed7cca5-c306-4f66-9d1c-2766e67013d8\",\r\n \"displayName\": \"FISMA Pen Testing Subscription\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/c9cbd920-c00c-427c-852b-8aaf38badaeb\",\r\n \"subscriptionId\": \"c9cbd920-c00c-427c-852b-8aaf38badaeb\",\r\n \"displayName\": \"Azure SDK Powershell Test\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/d1e52cbc-b073-42e2-a0a0-c2f547118a6e\",\r\n \"subscriptionId\": \"d1e52cbc-b073-42e2-a0a0-c2f547118a6e\",\r\n \"displayName\": \"Test Subscription 1 for Migration\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/db1ab6f0-4769-4b27-930e-01e2ef9c123c\",\r\n \"subscriptionId\": \"db1ab6f0-4769-4b27-930e-01e2ef9c123c\",\r\n \"displayName\": \"Azure SDK sandbox\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/3028579c-d25b-4ab8-87fc-455abc9bb7fb\",\r\n \"subscriptionId\": \"3028579c-d25b-4ab8-87fc-455abc9bb7fb\",\r\n \"displayName\": \"WindowsOnDevices\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/b6b78feb-3074-4129-8748-42cee6c73020\",\r\n \"subscriptionId\": \"b6b78feb-3074-4129-8748-42cee6c73020\",\r\n \"displayName\": \"XFD Data Systems - Public\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n }\r\n ]\r\n}", + "ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"id\": \"/subscriptions/2c224e7e-3ef5-431d-a57b-e71f4662e3a6\",\r\n \"subscriptionId\": \"2c224e7e-3ef5-431d-a57b-e71f4662e3a6\",\r\n \"displayName\": \"Node CLI Test\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/6b085460-5f21-477e-ba44-1035046e9101\",\r\n \"subscriptionId\": \"6b085460-5f21-477e-ba44-1035046e9101\",\r\n \"displayName\": \"Azure SDK Infrastructure\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/db1ab6f0-4769-4b27-930e-01e2ef9c123c\",\r\n \"subscriptionId\": \"db1ab6f0-4769-4b27-930e-01e2ef9c123c\",\r\n \"displayName\": \"Azure SDK sandbox\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/d03b04c7-d1d4-467b-aaaa-87b6fcb38b38\",\r\n \"subscriptionId\": \"d03b04c7-d1d4-467b-aaaa-87b6fcb38b38\",\r\n \"displayName\": \"AppInsight Test\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/b6b78feb-3074-4129-8748-42cee6c73020\",\r\n \"subscriptionId\": \"b6b78feb-3074-4129-8748-42cee6c73020\",\r\n \"displayName\": \"XFD Data Systems - Public\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n }\r\n ]\r\n}", "ResponseHeaders": { "Content-Length": [ - "3016" + "1370" ], "Content-Type": [ "application/json; charset=utf-8" @@ -73,16 +73,16 @@ "no-cache" ], "x-ms-ratelimit-remaining-tenant-reads": [ - "14993" + "14996" ], "x-ms-request-id": [ - "3bf4c9ed-5a95-47ad-b574-3d3bab512da2" + "ab82b219-a56e-47b5-9841-4decccd44c31" ], "x-ms-correlation-request-id": [ - "3bf4c9ed-5a95-47ad-b574-3d3bab512da2" + "ab82b219-a56e-47b5-9841-4decccd44c31" ], "x-ms-routing-request-id": [ - "WESTUS:20150917T092921Z:3bf4c9ed-5a95-47ad-b574-3d3bab512da2" + "WESTUS:20150923T220350Z:ab82b219-a56e-47b5-9841-4decccd44c31" ], "Strict-Transport-Security": [ "max-age=31536000; includeSubDomains" @@ -91,7 +91,7 @@ "no-cache" ], "Date": [ - "Thu, 17 Sep 2015 09:29:20 GMT" + "Wed, 23 Sep 2015 22:03:50 GMT" ] }, "StatusCode": 200 @@ -106,10 +106,10 @@ "Microsoft.Azure.Subscriptions.SubscriptionClient/2.0.0.0" ] }, - "ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"id\": \"/subscriptions/00977cdb-163f-435f-9c32-39ec8ae61f4d\",\r\n \"subscriptionId\": \"00977cdb-163f-435f-9c32-39ec8ae61f4d\",\r\n \"displayName\": \"node\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/279b0675-cf67-467f-98f0-67ae31eb540f\",\r\n \"subscriptionId\": \"279b0675-cf67-467f-98f0-67ae31eb540f\",\r\n \"displayName\": \"Azure SDK CI\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/2c224e7e-3ef5-431d-a57b-e71f4662e3a6\",\r\n \"subscriptionId\": \"2c224e7e-3ef5-431d-a57b-e71f4662e3a6\",\r\n \"displayName\": \"Node CLI Test\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/69801886-4b2b-493b-ba5b-3b26dabadadc\",\r\n \"subscriptionId\": \"69801886-4b2b-493b-ba5b-3b26dabadadc\",\r\n \"displayName\": \"WebStackAndEF_TestInfra\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/6b085460-5f21-477e-ba44-1035046e9101\",\r\n \"subscriptionId\": \"6b085460-5f21-477e-ba44-1035046e9101\",\r\n \"displayName\": \"Azure SDK Infrastructure\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/9ed7cca5-c306-4f66-9d1c-2766e67013d8\",\r\n \"subscriptionId\": \"9ed7cca5-c306-4f66-9d1c-2766e67013d8\",\r\n \"displayName\": \"FISMA Pen Testing Subscription\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/c9cbd920-c00c-427c-852b-8aaf38badaeb\",\r\n \"subscriptionId\": \"c9cbd920-c00c-427c-852b-8aaf38badaeb\",\r\n \"displayName\": \"Azure SDK Powershell Test\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/d1e52cbc-b073-42e2-a0a0-c2f547118a6e\",\r\n \"subscriptionId\": \"d1e52cbc-b073-42e2-a0a0-c2f547118a6e\",\r\n \"displayName\": \"Test Subscription 1 for Migration\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/db1ab6f0-4769-4b27-930e-01e2ef9c123c\",\r\n \"subscriptionId\": \"db1ab6f0-4769-4b27-930e-01e2ef9c123c\",\r\n \"displayName\": \"Azure SDK sandbox\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/3028579c-d25b-4ab8-87fc-455abc9bb7fb\",\r\n \"subscriptionId\": \"3028579c-d25b-4ab8-87fc-455abc9bb7fb\",\r\n \"displayName\": \"WindowsOnDevices\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/b6b78feb-3074-4129-8748-42cee6c73020\",\r\n \"subscriptionId\": \"b6b78feb-3074-4129-8748-42cee6c73020\",\r\n \"displayName\": \"XFD Data Systems - Public\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n }\r\n ]\r\n}", + "ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"id\": \"/subscriptions/2c224e7e-3ef5-431d-a57b-e71f4662e3a6\",\r\n \"subscriptionId\": \"2c224e7e-3ef5-431d-a57b-e71f4662e3a6\",\r\n \"displayName\": \"Node CLI Test\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/6b085460-5f21-477e-ba44-1035046e9101\",\r\n \"subscriptionId\": \"6b085460-5f21-477e-ba44-1035046e9101\",\r\n \"displayName\": \"Azure SDK Infrastructure\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/db1ab6f0-4769-4b27-930e-01e2ef9c123c\",\r\n \"subscriptionId\": \"db1ab6f0-4769-4b27-930e-01e2ef9c123c\",\r\n \"displayName\": \"Azure SDK sandbox\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/d03b04c7-d1d4-467b-aaaa-87b6fcb38b38\",\r\n \"subscriptionId\": \"d03b04c7-d1d4-467b-aaaa-87b6fcb38b38\",\r\n \"displayName\": \"AppInsight Test\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/b6b78feb-3074-4129-8748-42cee6c73020\",\r\n \"subscriptionId\": \"b6b78feb-3074-4129-8748-42cee6c73020\",\r\n \"displayName\": \"XFD Data Systems - Public\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n }\r\n ]\r\n}", "ResponseHeaders": { "Content-Length": [ - "3016" + "1370" ], "Content-Type": [ "application/json; charset=utf-8" @@ -121,16 +121,16 @@ "no-cache" ], "x-ms-ratelimit-remaining-tenant-reads": [ - "14992" + "14995" ], "x-ms-request-id": [ - "f59628b0-b505-47bd-8662-b362f1585fcc" + "434fa678-e760-47de-bee6-be4db7f9e93f" ], "x-ms-correlation-request-id": [ - "f59628b0-b505-47bd-8662-b362f1585fcc" + "434fa678-e760-47de-bee6-be4db7f9e93f" ], "x-ms-routing-request-id": [ - "WESTUS:20150917T092922Z:f59628b0-b505-47bd-8662-b362f1585fcc" + "WESTUS:20150923T220351Z:434fa678-e760-47de-bee6-be4db7f9e93f" ], "Strict-Transport-Security": [ "max-age=31536000; includeSubDomains" @@ -139,7 +139,7 @@ "no-cache" ], "Date": [ - "Thu, 17 Sep 2015 09:29:21 GMT" + "Wed, 23 Sep 2015 22:03:50 GMT" ] }, "StatusCode": 200 @@ -154,10 +154,10 @@ "Microsoft.Azure.Subscriptions.SubscriptionClient/2.0.0.0" ] }, - "ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"id\": \"/subscriptions/00977cdb-163f-435f-9c32-39ec8ae61f4d\",\r\n \"subscriptionId\": \"00977cdb-163f-435f-9c32-39ec8ae61f4d\",\r\n \"displayName\": \"node\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/279b0675-cf67-467f-98f0-67ae31eb540f\",\r\n \"subscriptionId\": \"279b0675-cf67-467f-98f0-67ae31eb540f\",\r\n \"displayName\": \"Azure SDK CI\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/2c224e7e-3ef5-431d-a57b-e71f4662e3a6\",\r\n \"subscriptionId\": \"2c224e7e-3ef5-431d-a57b-e71f4662e3a6\",\r\n \"displayName\": \"Node CLI Test\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/69801886-4b2b-493b-ba5b-3b26dabadadc\",\r\n \"subscriptionId\": \"69801886-4b2b-493b-ba5b-3b26dabadadc\",\r\n \"displayName\": \"WebStackAndEF_TestInfra\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/6b085460-5f21-477e-ba44-1035046e9101\",\r\n \"subscriptionId\": \"6b085460-5f21-477e-ba44-1035046e9101\",\r\n \"displayName\": \"Azure SDK Infrastructure\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/9ed7cca5-c306-4f66-9d1c-2766e67013d8\",\r\n \"subscriptionId\": \"9ed7cca5-c306-4f66-9d1c-2766e67013d8\",\r\n \"displayName\": \"FISMA Pen Testing Subscription\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/c9cbd920-c00c-427c-852b-8aaf38badaeb\",\r\n \"subscriptionId\": \"c9cbd920-c00c-427c-852b-8aaf38badaeb\",\r\n \"displayName\": \"Azure SDK Powershell Test\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/d1e52cbc-b073-42e2-a0a0-c2f547118a6e\",\r\n \"subscriptionId\": \"d1e52cbc-b073-42e2-a0a0-c2f547118a6e\",\r\n \"displayName\": \"Test Subscription 1 for Migration\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/db1ab6f0-4769-4b27-930e-01e2ef9c123c\",\r\n \"subscriptionId\": \"db1ab6f0-4769-4b27-930e-01e2ef9c123c\",\r\n \"displayName\": \"Azure SDK sandbox\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/3028579c-d25b-4ab8-87fc-455abc9bb7fb\",\r\n \"subscriptionId\": \"3028579c-d25b-4ab8-87fc-455abc9bb7fb\",\r\n \"displayName\": \"WindowsOnDevices\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/b6b78feb-3074-4129-8748-42cee6c73020\",\r\n \"subscriptionId\": \"b6b78feb-3074-4129-8748-42cee6c73020\",\r\n \"displayName\": \"XFD Data Systems - Public\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n }\r\n ]\r\n}", + "ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"id\": \"/subscriptions/2c224e7e-3ef5-431d-a57b-e71f4662e3a6\",\r\n \"subscriptionId\": \"2c224e7e-3ef5-431d-a57b-e71f4662e3a6\",\r\n \"displayName\": \"Node CLI Test\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/6b085460-5f21-477e-ba44-1035046e9101\",\r\n \"subscriptionId\": \"6b085460-5f21-477e-ba44-1035046e9101\",\r\n \"displayName\": \"Azure SDK Infrastructure\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/db1ab6f0-4769-4b27-930e-01e2ef9c123c\",\r\n \"subscriptionId\": \"db1ab6f0-4769-4b27-930e-01e2ef9c123c\",\r\n \"displayName\": \"Azure SDK sandbox\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/d03b04c7-d1d4-467b-aaaa-87b6fcb38b38\",\r\n \"subscriptionId\": \"d03b04c7-d1d4-467b-aaaa-87b6fcb38b38\",\r\n \"displayName\": \"AppInsight Test\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/b6b78feb-3074-4129-8748-42cee6c73020\",\r\n \"subscriptionId\": \"b6b78feb-3074-4129-8748-42cee6c73020\",\r\n \"displayName\": \"XFD Data Systems - Public\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n }\r\n ]\r\n}", "ResponseHeaders": { "Content-Length": [ - "3016" + "1370" ], "Content-Type": [ "application/json; charset=utf-8" @@ -169,16 +169,16 @@ "no-cache" ], "x-ms-ratelimit-remaining-tenant-reads": [ - "14991" + "14994" ], "x-ms-request-id": [ - "c6440f00-0988-475d-94da-24d45117ed6f" + "1d2c19cc-dd12-4833-bbd1-4f545dc718a9" ], "x-ms-correlation-request-id": [ - "c6440f00-0988-475d-94da-24d45117ed6f" + "1d2c19cc-dd12-4833-bbd1-4f545dc718a9" ], "x-ms-routing-request-id": [ - "WESTUS:20150917T092923Z:c6440f00-0988-475d-94da-24d45117ed6f" + "WESTUS:20150923T220351Z:1d2c19cc-dd12-4833-bbd1-4f545dc718a9" ], "Strict-Transport-Security": [ "max-age=31536000; includeSubDomains" @@ -187,7 +187,7 @@ "no-cache" ], "Date": [ - "Thu, 17 Sep 2015 09:29:23 GMT" + "Wed, 23 Sep 2015 22:03:51 GMT" ] }, "StatusCode": 200 @@ -202,10 +202,10 @@ "Microsoft.Azure.Subscriptions.SubscriptionClient/2.0.0.0" ] }, - "ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"id\": \"/subscriptions/00977cdb-163f-435f-9c32-39ec8ae61f4d\",\r\n \"subscriptionId\": \"00977cdb-163f-435f-9c32-39ec8ae61f4d\",\r\n \"displayName\": \"node\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/279b0675-cf67-467f-98f0-67ae31eb540f\",\r\n \"subscriptionId\": \"279b0675-cf67-467f-98f0-67ae31eb540f\",\r\n \"displayName\": \"Azure SDK CI\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/2c224e7e-3ef5-431d-a57b-e71f4662e3a6\",\r\n \"subscriptionId\": \"2c224e7e-3ef5-431d-a57b-e71f4662e3a6\",\r\n \"displayName\": \"Node CLI Test\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/69801886-4b2b-493b-ba5b-3b26dabadadc\",\r\n \"subscriptionId\": \"69801886-4b2b-493b-ba5b-3b26dabadadc\",\r\n \"displayName\": \"WebStackAndEF_TestInfra\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/6b085460-5f21-477e-ba44-1035046e9101\",\r\n \"subscriptionId\": \"6b085460-5f21-477e-ba44-1035046e9101\",\r\n \"displayName\": \"Azure SDK Infrastructure\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/9ed7cca5-c306-4f66-9d1c-2766e67013d8\",\r\n \"subscriptionId\": \"9ed7cca5-c306-4f66-9d1c-2766e67013d8\",\r\n \"displayName\": \"FISMA Pen Testing Subscription\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/c9cbd920-c00c-427c-852b-8aaf38badaeb\",\r\n \"subscriptionId\": \"c9cbd920-c00c-427c-852b-8aaf38badaeb\",\r\n \"displayName\": \"Azure SDK Powershell Test\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/d1e52cbc-b073-42e2-a0a0-c2f547118a6e\",\r\n \"subscriptionId\": \"d1e52cbc-b073-42e2-a0a0-c2f547118a6e\",\r\n \"displayName\": \"Test Subscription 1 for Migration\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/db1ab6f0-4769-4b27-930e-01e2ef9c123c\",\r\n \"subscriptionId\": \"db1ab6f0-4769-4b27-930e-01e2ef9c123c\",\r\n \"displayName\": \"Azure SDK sandbox\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/3028579c-d25b-4ab8-87fc-455abc9bb7fb\",\r\n \"subscriptionId\": \"3028579c-d25b-4ab8-87fc-455abc9bb7fb\",\r\n \"displayName\": \"WindowsOnDevices\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/b6b78feb-3074-4129-8748-42cee6c73020\",\r\n \"subscriptionId\": \"b6b78feb-3074-4129-8748-42cee6c73020\",\r\n \"displayName\": \"XFD Data Systems - Public\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n }\r\n ]\r\n}", + "ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"id\": \"/subscriptions/2c224e7e-3ef5-431d-a57b-e71f4662e3a6\",\r\n \"subscriptionId\": \"2c224e7e-3ef5-431d-a57b-e71f4662e3a6\",\r\n \"displayName\": \"Node CLI Test\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/6b085460-5f21-477e-ba44-1035046e9101\",\r\n \"subscriptionId\": \"6b085460-5f21-477e-ba44-1035046e9101\",\r\n \"displayName\": \"Azure SDK Infrastructure\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/db1ab6f0-4769-4b27-930e-01e2ef9c123c\",\r\n \"subscriptionId\": \"db1ab6f0-4769-4b27-930e-01e2ef9c123c\",\r\n \"displayName\": \"Azure SDK sandbox\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/d03b04c7-d1d4-467b-aaaa-87b6fcb38b38\",\r\n \"subscriptionId\": \"d03b04c7-d1d4-467b-aaaa-87b6fcb38b38\",\r\n \"displayName\": \"AppInsight Test\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/b6b78feb-3074-4129-8748-42cee6c73020\",\r\n \"subscriptionId\": \"b6b78feb-3074-4129-8748-42cee6c73020\",\r\n \"displayName\": \"XFD Data Systems - Public\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n }\r\n ]\r\n}", "ResponseHeaders": { "Content-Length": [ - "3016" + "1370" ], "Content-Type": [ "application/json; charset=utf-8" @@ -217,16 +217,16 @@ "no-cache" ], "x-ms-ratelimit-remaining-tenant-reads": [ - "14990" + "14993" ], "x-ms-request-id": [ - "821067d5-0dda-4c06-896c-d05adda670be" + "5f375daa-bb7a-4186-9289-62e70bf6ef39" ], "x-ms-correlation-request-id": [ - "821067d5-0dda-4c06-896c-d05adda670be" + "5f375daa-bb7a-4186-9289-62e70bf6ef39" ], "x-ms-routing-request-id": [ - "WESTUS:20150917T092941Z:821067d5-0dda-4c06-896c-d05adda670be" + "WESTUS:20150923T220352Z:5f375daa-bb7a-4186-9289-62e70bf6ef39" ], "Strict-Transport-Security": [ "max-age=31536000; includeSubDomains" @@ -235,7 +235,7 @@ "no-cache" ], "Date": [ - "Thu, 17 Sep 2015 09:29:40 GMT" + "Wed, 23 Sep 2015 22:03:51 GMT" ] }, "StatusCode": 200 @@ -250,10 +250,10 @@ "Microsoft.Azure.Subscriptions.SubscriptionClient/2.0.0.0" ] }, - "ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"id\": \"/subscriptions/00977cdb-163f-435f-9c32-39ec8ae61f4d\",\r\n \"subscriptionId\": \"00977cdb-163f-435f-9c32-39ec8ae61f4d\",\r\n \"displayName\": \"node\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/279b0675-cf67-467f-98f0-67ae31eb540f\",\r\n \"subscriptionId\": \"279b0675-cf67-467f-98f0-67ae31eb540f\",\r\n \"displayName\": \"Azure SDK CI\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/2c224e7e-3ef5-431d-a57b-e71f4662e3a6\",\r\n \"subscriptionId\": \"2c224e7e-3ef5-431d-a57b-e71f4662e3a6\",\r\n \"displayName\": \"Node CLI Test\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/69801886-4b2b-493b-ba5b-3b26dabadadc\",\r\n \"subscriptionId\": \"69801886-4b2b-493b-ba5b-3b26dabadadc\",\r\n \"displayName\": \"WebStackAndEF_TestInfra\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/6b085460-5f21-477e-ba44-1035046e9101\",\r\n \"subscriptionId\": \"6b085460-5f21-477e-ba44-1035046e9101\",\r\n \"displayName\": \"Azure SDK Infrastructure\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/9ed7cca5-c306-4f66-9d1c-2766e67013d8\",\r\n \"subscriptionId\": \"9ed7cca5-c306-4f66-9d1c-2766e67013d8\",\r\n \"displayName\": \"FISMA Pen Testing Subscription\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/c9cbd920-c00c-427c-852b-8aaf38badaeb\",\r\n \"subscriptionId\": \"c9cbd920-c00c-427c-852b-8aaf38badaeb\",\r\n \"displayName\": \"Azure SDK Powershell Test\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/d1e52cbc-b073-42e2-a0a0-c2f547118a6e\",\r\n \"subscriptionId\": \"d1e52cbc-b073-42e2-a0a0-c2f547118a6e\",\r\n \"displayName\": \"Test Subscription 1 for Migration\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/db1ab6f0-4769-4b27-930e-01e2ef9c123c\",\r\n \"subscriptionId\": \"db1ab6f0-4769-4b27-930e-01e2ef9c123c\",\r\n \"displayName\": \"Azure SDK sandbox\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/3028579c-d25b-4ab8-87fc-455abc9bb7fb\",\r\n \"subscriptionId\": \"3028579c-d25b-4ab8-87fc-455abc9bb7fb\",\r\n \"displayName\": \"WindowsOnDevices\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/b6b78feb-3074-4129-8748-42cee6c73020\",\r\n \"subscriptionId\": \"b6b78feb-3074-4129-8748-42cee6c73020\",\r\n \"displayName\": \"XFD Data Systems - Public\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n }\r\n ]\r\n}", + "ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"id\": \"/subscriptions/2c224e7e-3ef5-431d-a57b-e71f4662e3a6\",\r\n \"subscriptionId\": \"2c224e7e-3ef5-431d-a57b-e71f4662e3a6\",\r\n \"displayName\": \"Node CLI Test\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/6b085460-5f21-477e-ba44-1035046e9101\",\r\n \"subscriptionId\": \"6b085460-5f21-477e-ba44-1035046e9101\",\r\n \"displayName\": \"Azure SDK Infrastructure\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/db1ab6f0-4769-4b27-930e-01e2ef9c123c\",\r\n \"subscriptionId\": \"db1ab6f0-4769-4b27-930e-01e2ef9c123c\",\r\n \"displayName\": \"Azure SDK sandbox\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/d03b04c7-d1d4-467b-aaaa-87b6fcb38b38\",\r\n \"subscriptionId\": \"d03b04c7-d1d4-467b-aaaa-87b6fcb38b38\",\r\n \"displayName\": \"AppInsight Test\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/b6b78feb-3074-4129-8748-42cee6c73020\",\r\n \"subscriptionId\": \"b6b78feb-3074-4129-8748-42cee6c73020\",\r\n \"displayName\": \"XFD Data Systems - Public\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n }\r\n ]\r\n}", "ResponseHeaders": { "Content-Length": [ - "3016" + "1370" ], "Content-Type": [ "application/json; charset=utf-8" @@ -265,16 +265,16 @@ "no-cache" ], "x-ms-ratelimit-remaining-tenant-reads": [ - "14989" + "14992" ], "x-ms-request-id": [ - "41377497-013c-4147-a578-899a8c738e7c" + "868cd3dc-7db3-4762-a9db-51270e66e80f" ], "x-ms-correlation-request-id": [ - "41377497-013c-4147-a578-899a8c738e7c" + "868cd3dc-7db3-4762-a9db-51270e66e80f" ], "x-ms-routing-request-id": [ - "WESTUS:20150917T092941Z:41377497-013c-4147-a578-899a8c738e7c" + "WESTUS:20150923T220352Z:868cd3dc-7db3-4762-a9db-51270e66e80f" ], "Strict-Transport-Security": [ "max-age=31536000; includeSubDomains" @@ -283,14 +283,14 @@ "no-cache" ], "Date": [ - "Thu, 17 Sep 2015 09:29:41 GMT" + "Wed, 23 Sep 2015 22:03:52 GMT" ] }, "StatusCode": 200 }, { - "RequestUri": "/subscriptions/00977cdb-163f-435f-9c32-39ec8ae61f4d?api-version=2014-04-01-preview", - "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvMDA5NzdjZGItMTYzZi00MzVmLTljMzItMzllYzhhZTYxZjRkP2FwaS12ZXJzaW9uPTIwMTQtMDQtMDEtcHJldmlldw==", + "RequestUri": "/subscriptions?api-version=2014-04-01-preview", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnM/YXBpLXZlcnNpb249MjAxNC0wNC0wMS1wcmV2aWV3", "RequestMethod": "GET", "RequestBody": "", "RequestHeaders": { @@ -298,10 +298,58 @@ "Microsoft.Azure.Subscriptions.SubscriptionClient/2.0.0.0" ] }, - "ResponseBody": "{\r\n \"id\": \"/subscriptions/00977cdb-163f-435f-9c32-39ec8ae61f4d\",\r\n \"subscriptionId\": \"00977cdb-163f-435f-9c32-39ec8ae61f4d\",\r\n \"displayName\": \"node\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n}", + "ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"id\": \"/subscriptions/2c224e7e-3ef5-431d-a57b-e71f4662e3a6\",\r\n \"subscriptionId\": \"2c224e7e-3ef5-431d-a57b-e71f4662e3a6\",\r\n \"displayName\": \"Node CLI Test\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/6b085460-5f21-477e-ba44-1035046e9101\",\r\n \"subscriptionId\": \"6b085460-5f21-477e-ba44-1035046e9101\",\r\n \"displayName\": \"Azure SDK Infrastructure\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/db1ab6f0-4769-4b27-930e-01e2ef9c123c\",\r\n \"subscriptionId\": \"db1ab6f0-4769-4b27-930e-01e2ef9c123c\",\r\n \"displayName\": \"Azure SDK sandbox\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/d03b04c7-d1d4-467b-aaaa-87b6fcb38b38\",\r\n \"subscriptionId\": \"d03b04c7-d1d4-467b-aaaa-87b6fcb38b38\",\r\n \"displayName\": \"AppInsight Test\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n },\r\n {\r\n \"id\": \"/subscriptions/b6b78feb-3074-4129-8748-42cee6c73020\",\r\n \"subscriptionId\": \"b6b78feb-3074-4129-8748-42cee6c73020\",\r\n \"displayName\": \"XFD Data Systems - Public\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n }\r\n ]\r\n}", "ResponseHeaders": { "Content-Length": [ - "256" + "1370" + ], + "Content-Type": [ + "application/json; charset=utf-8" + ], + "Expires": [ + "-1" + ], + "Pragma": [ + "no-cache" + ], + "x-ms-ratelimit-remaining-tenant-reads": [ + "14991" + ], + "x-ms-request-id": [ + "fd52e14b-1d8e-413f-909b-9566de157fa3" + ], + "x-ms-correlation-request-id": [ + "fd52e14b-1d8e-413f-909b-9566de157fa3" + ], + "x-ms-routing-request-id": [ + "WESTUS:20150923T220352Z:fd52e14b-1d8e-413f-909b-9566de157fa3" + ], + "Strict-Transport-Security": [ + "max-age=31536000; includeSubDomains" + ], + "Cache-Control": [ + "no-cache" + ], + "Date": [ + "Wed, 23 Sep 2015 22:03:52 GMT" + ] + }, + "StatusCode": 200 + }, + { + "RequestUri": "/subscriptions/2c224e7e-3ef5-431d-a57b-e71f4662e3a6?api-version=2014-04-01-preview", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvMmMyMjRlN2UtM2VmNS00MzFkLWE1N2ItZTcxZjQ2NjJlM2E2P2FwaS12ZXJzaW9uPTIwMTQtMDQtMDEtcHJldmlldw==", + "RequestMethod": "GET", + "RequestBody": "", + "RequestHeaders": { + "User-Agent": [ + "Microsoft.Azure.Subscriptions.SubscriptionClient/2.0.0.0" + ] + }, + "ResponseBody": "{\r\n \"id\": \"/subscriptions/2c224e7e-3ef5-431d-a57b-e71f4662e3a6\",\r\n \"subscriptionId\": \"2c224e7e-3ef5-431d-a57b-e71f4662e3a6\",\r\n \"displayName\": \"Node CLI Test\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n}", + "ResponseHeaders": { + "Content-Length": [ + "265" ], "Content-Type": [ "application/json; charset=utf-8" @@ -313,16 +361,16 @@ "no-cache" ], "x-ms-ratelimit-remaining-subscription-reads": [ - "14998" + "14936" ], "x-ms-request-id": [ - "0b257a33-7f01-4a98-8d98-1bc654be1159" + "42a18419-bd3f-4e9f-9c78-ce3be611213c" ], "x-ms-correlation-request-id": [ - "0b257a33-7f01-4a98-8d98-1bc654be1159" + "42a18419-bd3f-4e9f-9c78-ce3be611213c" ], "x-ms-routing-request-id": [ - "WESTUS:20150917T092923Z:0b257a33-7f01-4a98-8d98-1bc654be1159" + "WESTUS:20150923T220350Z:42a18419-bd3f-4e9f-9c78-ce3be611213c" ], "Strict-Transport-Security": [ "max-age=31536000; includeSubDomains" @@ -331,14 +379,14 @@ "no-cache" ], "Date": [ - "Thu, 17 Sep 2015 09:29:23 GMT" + "Wed, 23 Sep 2015 22:03:50 GMT" ] }, "StatusCode": 200 }, { - "RequestUri": "/subscriptions/00977cdb-163f-435f-9c32-39ec8ae61f4d?api-version=2014-04-01-preview", - "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvMDA5NzdjZGItMTYzZi00MzVmLTljMzItMzllYzhhZTYxZjRkP2FwaS12ZXJzaW9uPTIwMTQtMDQtMDEtcHJldmlldw==", + "RequestUri": "/subscriptions/2c224e7e-3ef5-431d-a57b-e71f4662e3a6?api-version=2014-04-01-preview", + "EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvMmMyMjRlN2UtM2VmNS00MzFkLWE1N2ItZTcxZjQ2NjJlM2E2P2FwaS12ZXJzaW9uPTIwMTQtMDQtMDEtcHJldmlldw==", "RequestMethod": "GET", "RequestBody": "", "RequestHeaders": { @@ -346,10 +394,10 @@ "Microsoft.Azure.Subscriptions.SubscriptionClient/2.0.0.0" ] }, - "ResponseBody": "{\r\n \"id\": \"/subscriptions/00977cdb-163f-435f-9c32-39ec8ae61f4d\",\r\n \"subscriptionId\": \"00977cdb-163f-435f-9c32-39ec8ae61f4d\",\r\n \"displayName\": \"node\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n}", + "ResponseBody": "{\r\n \"id\": \"/subscriptions/2c224e7e-3ef5-431d-a57b-e71f4662e3a6\",\r\n \"subscriptionId\": \"2c224e7e-3ef5-431d-a57b-e71f4662e3a6\",\r\n \"displayName\": \"Node CLI Test\",\r\n \"state\": \"Enabled\",\r\n \"subscriptionPolicies\": {\r\n \"locationPlacementId\": \"Internal_2014-09-01\",\r\n \"quotaId\": \"Internal_2014-09-01\"\r\n }\r\n}", "ResponseHeaders": { "Content-Length": [ - "256" + "265" ], "Content-Type": [ "application/json; charset=utf-8" @@ -361,16 +409,16 @@ "no-cache" ], "x-ms-ratelimit-remaining-subscription-reads": [ - "14997" + "14935" ], "x-ms-request-id": [ - "ad76a94a-cb03-494f-853e-7c0a68a7766a" + "eb25825e-45d8-4e13-8dcc-6fb4479760e1" ], "x-ms-correlation-request-id": [ - "ad76a94a-cb03-494f-853e-7c0a68a7766a" + "eb25825e-45d8-4e13-8dcc-6fb4479760e1" ], "x-ms-routing-request-id": [ - "WESTUS:20150917T092936Z:ad76a94a-cb03-494f-853e-7c0a68a7766a" + "WESTUS:20150923T220350Z:eb25825e-45d8-4e13-8dcc-6fb4479760e1" ], "Strict-Transport-Security": [ "max-age=31536000; includeSubDomains" @@ -379,7 +427,7 @@ "no-cache" ], "Date": [ - "Thu, 17 Sep 2015 09:29:36 GMT" + "Wed, 23 Sep 2015 22:03:50 GMT" ] }, "StatusCode": 200 diff --git a/src/ResourceManager/Profile/Commands.Profile.Test/SubscriptionCmdletTests.cs b/src/ResourceManager/Profile/Commands.Profile.Test/SubscriptionCmdletTests.cs index 19c5917699ad..5a3508e3e80c 100644 --- a/src/ResourceManager/Profile/Commands.Profile.Test/SubscriptionCmdletTests.cs +++ b/src/ResourceManager/Profile/Commands.Profile.Test/SubscriptionCmdletTests.cs @@ -12,20 +12,9 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.WindowsAzure.Commands.Utilities.Common; -using Microsoft.Azure.Commands.Profile; -using Microsoft.Azure.Commands.ResourceManager.Common; -using Microsoft.Azure.Common.Authentication; -using Microsoft.Azure.Common.Authentication.Models; -using Microsoft.WindowsAzure.Commands.Common.Test.Mocks; +using Microsoft.Azure.Commands.Resources.Test.ScenarioTests; using Microsoft.WindowsAzure.Commands.ScenarioTest; -using System.Linq; using Xunit; -using System; -using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; -using Hyak.Common; -using System.Management.Automation; -using Microsoft.Azure.Commands.Resources.Test.ScenarioTests; namespace Microsoft.Azure.Commands.Profile.Test { @@ -35,7 +24,7 @@ public class SubscriptionCmdletTests [Trait(Category.AcceptanceType, Category.CheckIn)] public void AllParameterSetsSucceed() { - ProfileController.NewInstance.RunPsTest("72f988bf-86f1-41af-91ab-2d7cd011db47", "Test-GetSubscriptionsEndToEnd"); + ProfileController.NewInstance.RunPsTest("db1ab6f0-4769-4b27-930e-01e2ef9c123c", "Test-GetSubscriptionsEndToEnd"); } } } diff --git a/src/ResourceManager/Profile/Commands.Profile.Test/SubscriptionCmdletTests.ps1 b/src/ResourceManager/Profile/Commands.Profile.Test/SubscriptionCmdletTests.ps1 index 8f2face12e47..52edbb776d64 100644 --- a/src/ResourceManager/Profile/Commands.Profile.Test/SubscriptionCmdletTests.ps1 +++ b/src/ResourceManager/Profile/Commands.Profile.Test/SubscriptionCmdletTests.ps1 @@ -20,14 +20,24 @@ function Test-GetSubscriptionsEndToEnd { $allSubscriptions = Get-AzureRmSubscription -All $firstSubscription = $allSubscriptions[0] - $id = $firstSubscription.Id - $tenant = $firstSubscription.GetProperty([Microsoft.Azure.Common.Authentication.Models.AzureSubscription+Property]::Tenants) - $subscription = Get-AzureRmSubscription -SubscriptionId $id -Tenant $tenant + $id = $firstSubscription.SubscriptionId + $tenant = $firstSubscription.TenantId + $name = $firstSubscription.SubscriptionName + $subscription = $firstSubscription | Get-AzureRmSubscription Assert-True { $subscription -ne $null } - Assert-AreEqual $id $subscription.Id + Assert-AreEqual $id $subscription.SubscriptionId $subscription = Get-AzureRmSubscription -SubscriptionId $id Assert-True { $subscription -ne $null } - Assert-AreEqual $id $subscription.Id + Assert-AreEqual $id $subscription.SubscriptionId + $subscription = Get-AzureRmSubscription -SubscriptionName $name -Tenant $tenant + Assert-True { $subscription -ne $null } + Assert-AreEqual $name $subscription.Name + $subscription = Get-AzureRmSubscription -SubscriptionName $name + Assert-True { $subscription -ne $null } + Assert-AreEqual $name $subscription.Name + $subscription = Get-AzureRmSubscription -SubscriptionName $name.ToUpper() + Assert-True { $subscription -ne $null } + Assert-AreEqual $name $subscription.Name $mostSubscriptions = Get-AzureRmSubscription Assert-True {$mostSubscriptions.Count -gt 0} $tenantSubscriptions = Get-AzureRmSubscription -Tenant $tenant diff --git a/src/ResourceManager/Profile/Commands.Profile.Test/TenantCmdletTests.cs b/src/ResourceManager/Profile/Commands.Profile.Test/TenantCmdletTests.cs index db1595c9d6e2..34ec718baeaa 100644 --- a/src/ResourceManager/Profile/Commands.Profile.Test/TenantCmdletTests.cs +++ b/src/ResourceManager/Profile/Commands.Profile.Test/TenantCmdletTests.cs @@ -102,7 +102,7 @@ public void GetTenantWithoutParameters() private void Login(string subscriptionId, string tenantId) { - var cmdlt = new LoginAzureRMAccountCommand(); + var cmdlt = new AddAzureRMAccountCommand(); // Setup cmdlt.CommandRuntime = commandRuntimeMock; cmdlt.SubscriptionId = subscriptionId; diff --git a/src/ResourceManager/Profile/Commands.Profile.Test/packages.config b/src/ResourceManager/Profile/Commands.Profile.Test/packages.config index 86e2df0e8f89..a2e916a5e448 100644 --- a/src/ResourceManager/Profile/Commands.Profile.Test/packages.config +++ b/src/ResourceManager/Profile/Commands.Profile.Test/packages.config @@ -2,12 +2,12 @@ - + - + diff --git a/src/ResourceManager/Profile/Commands.Profile/Account/LoginAzureRMAccount.cs b/src/ResourceManager/Profile/Commands.Profile/Account/AddAzureRmAccount.cs similarity index 74% rename from src/ResourceManager/Profile/Commands.Profile/Account/LoginAzureRMAccount.cs rename to src/ResourceManager/Profile/Commands.Profile/Account/AddAzureRmAccount.cs index 16c853790ed9..735a695eaff8 100644 --- a/src/ResourceManager/Profile/Commands.Profile/Account/LoginAzureRMAccount.cs +++ b/src/ResourceManager/Profile/Commands.Profile/Account/AddAzureRmAccount.cs @@ -12,21 +12,24 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.Azure.Commands.ResourceManager.Common; +using System.IO; using System.Management.Automation; -using Microsoft.Azure.Common.Authentication.Models; +using System.Reflection; using System.Security; -using Microsoft.WindowsAzure.Commands.Utilities.Common; -using Microsoft.IdentityModel.Clients.ActiveDirectory; +using Microsoft.Azure.Common.Authentication.Models; +using Microsoft.Azure.Commands.Profile.Models; +using Microsoft.Azure.Commands.ResourceManager.Common; +using Microsoft.Azure.Common.Authentication; namespace Microsoft.Azure.Commands.Profile { /// /// Cmdlet to log into an environment and download the subscriptions /// - [Cmdlet("Login", "AzureRmAccount", DefaultParameterSetName = "User")] - [OutputType(typeof(AzureRMProfile))] - public class LoginAzureRMAccountCommand : AzureRMCmdlet + [Cmdlet("Add", "AzureRmAccount", DefaultParameterSetName = "User")] + [Alias("Login-AzureRmAccount")] + [OutputType(typeof(PSAzureProfile))] + public class AddAzureRMAccountCommand : AzureRMCmdlet , IModuleAssemblyInitializer { [Parameter(Mandatory = false, HelpMessage = "Environment containing the account to log into")] [ValidateNotNullOrEmpty] @@ -40,8 +43,8 @@ public class LoginAzureRMAccountCommand : AzureRMCmdlet public SwitchParameter ServicePrincipal { get; set; } [Parameter(ParameterSetName = "User", Mandatory = false, HelpMessage = "Optional tenant name or ID")] - [Parameter(ParameterSetName = "ServicePrincipal", Mandatory = true, HelpMessage = "Tenant name or ID")] - [Parameter(ParameterSetName = "AccessToken", Mandatory = false, HelpMessage = "Tenant name or ID")] + [Parameter(ParameterSetName = "ServicePrincipal", Mandatory = true, HelpMessage = "TenantId name or ID")] + [Parameter(ParameterSetName = "AccessToken", Mandatory = false, HelpMessage = "TenantId name or ID")] [ValidateNotNullOrEmpty] public string Tenant { get; set; } @@ -106,7 +109,28 @@ protected override void ProcessRecord() var profileClient = new RMProfileClient(AzureRMCmdlet.DefaultProfile); - WriteObject(profileClient.Login(azureAccount, Environment, Tenant, SubscriptionId, password)); + WriteObject((PSAzureProfile)profileClient.Login(azureAccount, Environment, Tenant, SubscriptionId, password)); + } + + /// + /// Load global aliases for ARM + /// + public void OnImport() + { + try + { + System.Management.Automation.PowerShell invoker = null; + invoker = System.Management.Automation.PowerShell.Create(RunspaceMode.CurrentRunspace); + invoker.AddScript(File.ReadAllText(FileUtilities.GetContentFilePath( + Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), + "AzureRmProfileStartup.ps1"))); + invoker.Invoke(); + } + catch + { + // This will throw exception for tests, ignore. + } } + } } diff --git a/src/ResourceManager/Profile/Commands.Profile/AzureRmProfileStartup.ps1 b/src/ResourceManager/Profile/Commands.Profile/AzureRmProfileStartup.ps1 new file mode 100644 index 000000000000..8230c9e861d3 --- /dev/null +++ b/src/ResourceManager/Profile/Commands.Profile/AzureRmProfileStartup.ps1 @@ -0,0 +1,18 @@ +# ---------------------------------------------------------------------------------- +# +# 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. +# ---------------------------------------------------------------------------------- + +@{ + "Login-AzureRmAccount" = "Add-AzureRmAccount"; + "Select-AzureRmSubscription" = "Set-AzureRmContext"; +}.GetEnumerator() | Select @{Name='Name'; Expression={$_.Key}}, @{Name='Value'; Expression={$_.Value}} | New-Alias -Description "AzureAlias" diff --git a/src/ResourceManager/Profile/Commands.Profile/Commands.Profile.csproj b/src/ResourceManager/Profile/Commands.Profile/Commands.Profile.csproj index c51f9614f841..d2f98ae45e7a 100644 --- a/src/ResourceManager/Profile/Commands.Profile/Commands.Profile.csproj +++ b/src/ResourceManager/Profile/Commands.Profile/Commands.Profile.csproj @@ -28,7 +28,7 @@ false - ..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Profile\ + ..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.Profile\ TRACE;SIGN true pdbonly @@ -54,7 +54,7 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -132,13 +132,18 @@ - + + + + + + - + @@ -160,6 +165,9 @@ AzureRM.Profile.psd1 PreserveNewest + + PreserveNewest + @@ -170,6 +178,10 @@ + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common @@ -183,6 +195,5 @@ - \ No newline at end of file diff --git a/src/ResourceManager/Profile/Commands.Profile/Context/GetAzureRMContext.cs b/src/ResourceManager/Profile/Commands.Profile/Context/GetAzureRMContext.cs index 29d8b3ee9dbd..172fe2436a3d 100644 --- a/src/ResourceManager/Profile/Commands.Profile/Context/GetAzureRMContext.cs +++ b/src/ResourceManager/Profile/Commands.Profile/Context/GetAzureRMContext.cs @@ -12,9 +12,9 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.Azure.Commands.ResourceManager.Common; -using Microsoft.Azure.Common.Authentication.Models; using System.Management.Automation; +using Microsoft.Azure.Commands.Profile.Models; +using Microsoft.Azure.Commands.ResourceManager.Common; namespace Microsoft.Azure.Commands.Profile { @@ -22,12 +22,12 @@ namespace Microsoft.Azure.Commands.Profile /// Cmdlet to get current context. /// [Cmdlet(VerbsCommon.Get, "AzureRmContext")] - [OutputType(typeof(AzureContext))] + [OutputType(typeof(PSAzureContext))] public class GetAzureRMContextCommand : AzureRMCmdlet { protected override void ProcessRecord() { - WriteObject(AzureRMCmdlet.DefaultProfile.Context); + WriteObject((PSAzureContext)AzureRMCmdlet.DefaultProfile.Context); } } } diff --git a/src/ResourceManager/Profile/Commands.Profile/Context/SetAzureRMContext.cs b/src/ResourceManager/Profile/Commands.Profile/Context/SetAzureRMContext.cs index 0a58e1d3198f..3879a7ed3faf 100644 --- a/src/ResourceManager/Profile/Commands.Profile/Context/SetAzureRMContext.cs +++ b/src/ResourceManager/Profile/Commands.Profile/Context/SetAzureRMContext.cs @@ -12,40 +12,55 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.Azure.Commands.ResourceManager.Common; -using Microsoft.Azure.Common.Authentication.Models; using System.Management.Automation; +using Microsoft.Azure.Common.Authentication.Models; +using Microsoft.Azure.Commands.Profile.Models; +using Microsoft.Azure.Commands.ResourceManager.Common; namespace Microsoft.Azure.Commands.Profile { /// /// Cmdlet to change current Azure context. /// - [Cmdlet(VerbsCommon.Set, "AzureRmContext")] - [OutputType(typeof(AzureContext))] + [Cmdlet(VerbsCommon.Set, "AzureRMContext", DefaultParameterSetName =TenantIdAndSubscriptionIdParameterSet)] + [Alias("Select-AzureRmSubscription")] + [OutputType(typeof(PSAzureContext))] public class SetAzureRMContextCommand : AzureRMCmdlet { - private const string TenantParameterSet = "Tenant"; - private const string SubscriptionParameterSet = "Subscription"; + private const string TenantIdParameterSet = "TenantId"; + private const string SubscriptionIdParameterSet = "Subscription"; + private const string TenantIdAndSubscriptionIdParameterSet = "TenantIdAndSubscriptionId"; private const string TenantAndSubscriptionParameterSet = "TenantAndSubscription"; - [Parameter(ParameterSetName = TenantParameterSet, Mandatory = true, HelpMessage = "Tenant name or ID")] - [Parameter(ParameterSetName = TenantAndSubscriptionParameterSet, Mandatory = true, HelpMessage = "Tenant name or ID")] + [Parameter(ParameterSetName = TenantIdParameterSet, Mandatory = true, HelpMessage = "TenantId name or ID", ValueFromPipelineByPropertyName=true)] + [Parameter(ParameterSetName = TenantIdAndSubscriptionIdParameterSet, Mandatory = true, HelpMessage = "TenantId name or ID", ValueFromPipelineByPropertyName=true)] [ValidateNotNullOrEmpty] - public string Tenant { get; set; } + public string TenantId { get; set; } - [Parameter(ParameterSetName = SubscriptionParameterSet, Mandatory = true, HelpMessage = "Subscription")] - [Parameter(ParameterSetName = TenantAndSubscriptionParameterSet, Mandatory = true, HelpMessage = "Subscription")] + [Parameter(ParameterSetName = SubscriptionIdParameterSet, Mandatory = true, HelpMessage = "Subscription", ValueFromPipelineByPropertyName=true)] + [Parameter(ParameterSetName = TenantIdAndSubscriptionIdParameterSet, Mandatory = true, HelpMessage = "Subscription", ValueFromPipelineByPropertyName=true)] [ValidateNotNullOrEmpty] public string SubscriptionId { get; set; } + [Parameter(ParameterSetName = TenantAndSubscriptionParameterSet, Mandatory = true, HelpMessage = "TenantId name or ID", ValueFromPipelineByPropertyName=true)] + public AzureTenant Tenant { get; set; } + + [Parameter(ParameterSetName = TenantAndSubscriptionParameterSet, Mandatory = true, HelpMessage = "Subscription", ValueFromPipelineByPropertyName=true)] + [ValidateNotNullOrEmpty] + public AzureSubscription Subscription { get; set; } + protected override void ProcessRecord() { var profileClient = new RMProfileClient(AzureRMCmdlet.DefaultProfile); + if (ParameterSetName == TenantAndSubscriptionParameterSet) + { + SubscriptionId = Subscription.Id.ToString(); + TenantId = (Tenant == null )? null : Tenant.Id.ToString(); + } - AzureRMCmdlet.DefaultProfile.Context = profileClient.SetCurrentContext(SubscriptionId, Tenant); + AzureRMCmdlet.DefaultProfile.Context = profileClient.SetCurrentContext(SubscriptionId, TenantId); - WriteObject(AzureRMCmdlet.DefaultProfile.Context); + WriteObject((PSAzureContext)AzureRMCmdlet.DefaultProfile.Context); } } } diff --git a/src/ResourceManager/Profile/Commands.Profile/Environment/AddAzureRMEnvironment.cs b/src/ResourceManager/Profile/Commands.Profile/Environment/AddAzureRMEnvironment.cs index ec46a2135a4a..4a3011c181dd 100644 --- a/src/ResourceManager/Profile/Commands.Profile/Environment/AddAzureRMEnvironment.cs +++ b/src/ResourceManager/Profile/Commands.Profile/Environment/AddAzureRMEnvironment.cs @@ -12,9 +12,10 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.Azure.Commands.ResourceManager.Common; -using Microsoft.Azure.Common.Authentication.Models; using System.Management.Automation; +using Microsoft.Azure.Common.Authentication.Models; +using Microsoft.Azure.Commands.Profile.Models; +using Microsoft.Azure.Commands.ResourceManager.Common; namespace Microsoft.Azure.Commands.Profile { diff --git a/src/ResourceManager/Profile/Commands.Profile/Environment/GetAzureRMEnvironment.cs b/src/ResourceManager/Profile/Commands.Profile/Environment/GetAzureRMEnvironment.cs index 3b372088989b..df6f8780bd96 100644 --- a/src/ResourceManager/Profile/Commands.Profile/Environment/GetAzureRMEnvironment.cs +++ b/src/ResourceManager/Profile/Commands.Profile/Environment/GetAzureRMEnvironment.cs @@ -12,13 +12,10 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.Azure.Commands.ResourceManager.Common; -using Microsoft.Azure.Common.Authentication.Models; -using System; using System.Linq; -using System.Collections.Generic; -using System.Globalization; using System.Management.Automation; +using Microsoft.Azure.Commands.Profile.Models; +using Microsoft.Azure.Commands.ResourceManager.Common; namespace Microsoft.Azure.Commands.Profile { @@ -26,7 +23,7 @@ namespace Microsoft.Azure.Commands.Profile /// Cmdlet to get current Azure Environment from Profile. /// [Cmdlet(VerbsCommon.Get, "AzureRmEnvironment")] - [OutputType(typeof(List))] + [OutputType(typeof(PSAzureEnvironment))] public class GetAzureRMEnvironmentCommand : AzureRMCmdlet { [Parameter(Position = 0, Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "The environment name")] diff --git a/src/ResourceManager/Profile/Commands.Profile/Environment/RemoveAzureRMEnvironment.cs b/src/ResourceManager/Profile/Commands.Profile/Environment/RemoveAzureRMEnvironment.cs index be3c4dd2d768..a7d95e1e983d 100644 --- a/src/ResourceManager/Profile/Commands.Profile/Environment/RemoveAzureRMEnvironment.cs +++ b/src/ResourceManager/Profile/Commands.Profile/Environment/RemoveAzureRMEnvironment.cs @@ -12,12 +12,9 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.Azure.Commands.ResourceManager.Common; -using Microsoft.Azure.Common.Authentication.Models; -using System; -using System.Collections.Generic; -using System.Globalization; using System.Management.Automation; +using Microsoft.Azure.Commands.Profile.Models; +using Microsoft.Azure.Commands.ResourceManager.Common; namespace Microsoft.Azure.Commands.Profile { diff --git a/src/ResourceManager/Profile/Commands.Profile/Environment/SetAzureRMEnvironment.cs b/src/ResourceManager/Profile/Commands.Profile/Environment/SetAzureRMEnvironment.cs index 03ab683b8318..077636f767ab 100644 --- a/src/ResourceManager/Profile/Commands.Profile/Environment/SetAzureRMEnvironment.cs +++ b/src/ResourceManager/Profile/Commands.Profile/Environment/SetAzureRMEnvironment.cs @@ -12,11 +12,12 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.Azure.Commands.ResourceManager.Common; -using Microsoft.Azure.Common.Authentication.Models; using System; using System.Globalization; using System.Management.Automation; +using Microsoft.Azure.Common.Authentication.Models; +using Microsoft.Azure.Commands.Profile.Models; +using Microsoft.Azure.Commands.ResourceManager.Common; namespace Microsoft.Azure.Commands.Profile { diff --git a/src/ResourceManager/Profile/Commands.Profile/Microsoft.Azure.Commands.Profile.dll-Help.xml b/src/ResourceManager/Profile/Commands.Profile/Microsoft.Azure.Commands.Profile.dll-Help.xml index e4d520115e03..0abaf2341498 100644 --- a/src/ResourceManager/Profile/Commands.Profile/Microsoft.Azure.Commands.Profile.dll-Help.xml +++ b/src/ResourceManager/Profile/Commands.Profile/Microsoft.Azure.Commands.Profile.dll-Help.xml @@ -2,86 +2,162 @@ - Add-AzureAccount + Add-AzureRmAccount - Adds the Azure account to Windows PowerShell + Log in to authenticate cmdlets with Azure Resource Manager. Add - AzureAccount + AzureRmAccount - The Add-AzureAccount cmdlet makes your Azure account and its subscriptions available in Windows PowerShell. It's like logging into your Azure account in Windows PowerShell. To log out of the account, use the Remove-AzureAccount cmdlet. - Add-AzureAccount downloads information about your Azure account and saves it in a subscription data file in your roaming user profile. It also gets an access token that allows Windows PowerShell to access your Azure account on your behalf. When the command completes, you can manage your Azure account in Windows PowerShell. - There are two different ways to make your Azure account available to Windows PowerShell. You can use the Add-AzureAccount cmdlet, which uses Azure Active Directory (Azure AD) authentication access tokens, or Import-AzurePublishSettingsFile, which uses a management certificate. For guidance on which method to use, see "How to: Connect to your subscription" (http://azure.microsoft.com/en-us/documentation/articles/install-configure-powershell/#Connect). - When you run Add-AzureAccount, it displays an interactive window that prompts you to sign into your Azure account. This sign-in is valid until the access token expires. When it expires, cmdlets that require access to your account prompt you to run Add-AzureAccount again. - If you have a Microsoft Organizational account, you can use the -Credential parameter to add the subscriptions associated with your account to Windows PowerShell without an interactive dialog. - When specifying -ServicePrincipal switch a -Credential parameter is used to authenticate a Service Principal. + NOTE THAT THIS CMDLET AUTHENTICATES ONLY AZURE RESOURCE MANAGER CMDLETS. SERVICE MANAGEMENT CMDLETS MUST BE SEPARATELY AUTHENTICATED USING THE ADD-AZUREACCOUNT OR IMPORT-AZUREPUBLISHSETTINGSFILE CMDLETS. + Log in to Azure Resource manager to provide authentication for management cmdlets. Microsoft Account (Live Id) and Oragnization Id credentials may be provided through the dialog prompt. Organizational ID and Service Principal credentials may be provided through a -Credential parameter. Access Token credentials may be provided through the AccessToken credential. By default, user is authenticated agains all available teants. The TenantId parameter may be provided to streamline authentication when access to only a single teant is needed. The SubscriptionId parameter may be provided to select a particular subscription by default, otherwise the first listed subscription will be selected. - Add-AzureAccount + Add-AzureRmAccount Environment - Specifies an Azure environment for the user account. This parameter is optional. The default is the AzureCloud environment.An Azure environment an independent deployment of Microsoft Azure, such as AzureCloud for global Azure and AzureChinaCloud for Azure operated by 21Vianet in China. You can also create on-premises Azure environments by using Azure Pack and the WAPack cmdlets. For more information, see Azure Pack.To get the available Azure environments, use the Get-AzureEnvironment cmdlet. To add an environment, use the Add-AzureEnvironment cmdlet. + The name of the Azure environment to authenticate with. Built-in environments include AzureCloud (the default setting) and AzureChinaCloud for access to Azure China. - String + AzureEnvironment Credential - The username and password account credentials used to authenticate with Azure Active Directory. The credentials must be for a Microsoft Organizational account or Service Principal, not a Microsoft account. + Securely provide the user id and password for Organization Id credentials or the Application Id and Secret for Service Principal credentials. The provided credentials will be sued to acquire tokens for authenticataing ARM cmdlets with Azure. PSCredential - Profile + Tenant + + If provided, limit authentication to only the provided tenant. This parameter is required for authentication as a service principal. + + String + + + SubscriptionId + + If provided, determines the subscription that will be targeted by default after log in. If this parameter is not provided, the first listed subscription will be targeted. + + String + + + InformationAction + + + + ActionPreference + + + InformationVariable - The Profile to add accounts and subscriptions to. If not specified, adds accounts and subscriptions to the default (on disk) profile. + - AzureProfile + String - Add-AzureAccount + Add-AzureRmAccount Environment - Specifies an Azure environment for the user account. This parameter is optional. The default is the AzureCloud environment.An Azure environment an independent deployment of Microsoft Azure, such as AzureCloud for global Azure and AzureChinaCloud for Azure operated by 21Vianet in China. You can also create on-premises Azure environments by using Azure Pack and the WAPack cmdlets. For more information, see Azure Pack.To get the available Azure environments, use the Get-AzureEnvironment cmdlet. To add an environment, use the Add-AzureEnvironment cmdlet. + The name of the Azure environment to authenticate with. Built-in environments include AzureCloud (the default setting) and AzureChinaCloud for access to Azure China. - String + AzureEnvironment Credential - The username and password account credentials used to authenticate with Azure Active Directory. The credentials must be for a Microsoft Organizational account or Service Principal, not a Microsoft account. + Securely provide the user id and password for Organization Id credentials or the Application Id and Secret for Service Principal credentials. The provided credentials will be sued to acquire tokens for authenticataing ARM cmdlets with Azure. PSCredential ServicePrincipal - Specifies that your are logging in as a service principal. You must give a Credentials parameter for this case, with the service principal ID as the user name and the service principal key as the password. + When provided, indicates that service princiapl credentials will be provided via the Credential parameter and the Tenant containing the given Servicew Principal will be provided in the TenantId parameter. SwitchParameter - + Tenant - Used when logging in as a service principal. Specifies the AAD tenant the service principal is defined in. This can be either the tenant's domain name or id. + If provided, limit authentication to only the provided tenant. This parameter is required for authentication as a service principal. String - Profile + SubscriptionId + + If provided, determines the subscription that will be targeted by default after log in. If this parameter is not provided, the first listed subscription will be targeted. + + String + + + InformationAction + + + + ActionPreference + + + InformationVariable + + + + String + + + + Add-AzureRmAccount + + Environment + + The name of the Azure environment to authenticate with. Built-in environments include AzureCloud (the default setting) and AzureChinaCloud for access to Azure China. + + AzureEnvironment + + + Tenant + + If provided, limit authentication to only the provided tenant. This parameter is required for authentication as a service principal. + + String + + + AccessToken + + When provided, indicates that authentication with Azure Resource Manager should use the given access token. + + String + + + SubscriptionId + + If provided, determines the subscription that will be targeted by default after log in. If this parameter is not provided, the first listed subscription will be targeted. + + String + + + InformationAction + + + + ActionPreference + + + InformationVariable - The Profile to add accounts and subscriptions to. If not specified, adds accounts and subscriptions to the default (on disk) profile. + - AzureProfile + String @@ -89,55 +165,67 @@ Environment - Specifies an Azure environment for the user account. This parameter is optional. The default is the AzureCloud environment.An Azure environment an independent deployment of Microsoft Azure, such as AzureCloud for global Azure and AzureChinaCloud for Azure operated by 21Vianet in China. You can also create on-premises Azure environments by using Azure Pack and the WAPack cmdlets. For more information, see Azure Pack.To get the available Azure environments, use the Get-AzureEnvironment cmdlet. To add an environment, use the Add-AzureEnvironment cmdlet. + The name of the Azure environment to authenticate with. Built-in environments include AzureCloud (the default setting) and AzureChinaCloud for access to Azure China. - String + AzureEnvironment - String + AzureEnvironment - + AzureCloud Credential - The username and password account credentials used to authenticate with Azure Active Directory. The credentials must be for a Microsoft Organizational account or Service Principal, not a Microsoft account. + Securely provide the user id and password for Organization Id credentials or the Application Id and Secret for Service Principal credentials. The provided credentials will be sued to acquire tokens for authenticataing ARM cmdlets with Azure. PSCredential PSCredential - + None - Profile + Tenant - The Profile to add accounts and subscriptions to. If not specified, adds accounts and subscriptions to the default (on disk) profile. + If provided, limit authentication to only the provided tenant. This parameter is required for authentication as a service principal. - AzureProfile + String - AzureProfile + String - Default on-disk Profile + Common - - ServicePrincipal + + SubscriptionId - Specifies that your are logging in as a service principal. You must give a Credentials parameter for this case, with the service principal ID as the user name and the service principal key as the password. + If provided, determines the subscription that will be targeted by default after log in. If this parameter is not provided, the first listed subscription will be targeted. - SwitchParameter + String - SwitchParameter + String + + + None + + + InformationAction + + + + ActionPreference + + ActionPreference - - Tenant + + InformationVariable - Used when logging in as a service principal. Specifies the AAD tenant the service principal is defined in. This can be either the tenant's domain name or id. + String @@ -146,42 +234,52 @@ - - SubscriptionDataFile + + ServicePrincipal + + When provided, indicates that service princiapl credentials will be provided via the Credential parameter and the Tenant containing the given Servicew Principal will be provided in the TenantId parameter. + + SwitchParameter + + SwitchParameter + + + Common + + + AccessToken - [Deprecated]: The SubscriptionDataFile parameter is deprecated. This parameter will be removed in a future release. See https://github.com/Azure/azure-powershell/wiki/Proposed-Design-Stateless-Azure-Profile for a description of the upcoming mechanism for providing alternate sources of subscription information. Specifies the path to a profile file. This parameter is optional. If it is not provided, default file in the user's profile is used. + When provided, indicates that authentication with Azure Resource Manager should use the given access token. - string + String - string + String - + None - None + - - + - None + - - + @@ -190,41 +288,24 @@ - Add-AzureAccount (and the Azure AD authentication method) takes precedence over Import-AzurePublishSettings (and the management certificate method). If you use Add-AzureAccount even once on your account, the Azure AD authentication method is used and the management certificate is ignored. To remove the Azure AD token and restore the management certificate method, use the Remove-AzureAccount cmdlet. For more information, type: Get-Help Remove-AzureAccount. + - -------------------------- Example 1: Add an account -------------------------- - - PS C:\> - - PS C:\>Add-AzureAccount - - This command adds an Azure account to Windows PowerShell. When you run the command, a windows pops up to request the user name and password of the account. - - - - - - - - - - - - - - -------------------------- Example 2: Use an alternate subscription data file -------------------------- + -------------------------- Interactive Login -------------------------- PS C:\> - PS C:\>Add-AzureAccount -SubscriptionDataFile C:\Testing\SDF.xml + Add-AzureRmAccount - This command uses the SubscriptionDataFile parameter to direct Add-AzureAccount to store the account data in the C:\Testing\SDF.xml file, instead of the default file. + Displays a dialog where Microsoft Account or Oragnizational Id credentials may be provided. The given credentials will be used to acquire a token for authentication with Azure Resource Manager. Note that if multi-factor authentication (MFA) is enabled for your credentials, you must log in using the interactive option, or use Service Principal authentication. - + Account: azureuser@contoso.com +Environment: AzureCloud +Subscription: xxxx-xxxx-xxxx-xxxx +Tenant: xxxx-xxxx-xxxx-xxxx @@ -235,17 +316,21 @@ - -------------------------- Example 3: Add a Microsoft Organizational account using Credential -------------------------- + -------------------------- Organization Id Login -------------------------- PS C:\> - PS C:\>$credential = Get-Credential - PS C:\>Add-AzureAccount -Credential $credential + $credential = Get-Credential +Add-AzureRmAccount -Credential $credential - This command uses the Credential parameter to provide AAD authentication information on the command line, rather than using the pop-up dialog for AAD authentication. + Log in for authentication with Azure Resource Manager using Organization Id parameters. + Note that multi-factor authentication (MFA) and Microsoft Account credentials (Live ID) will not work with this option. - + Account: azureuser@contoso.onmicrosoft.cn +Environment: AzureChinacloud +Subscription: xxxx-xxxx-xxxx-xxxx +Tenant: xxxx-xxxx-xxxx-xxxx @@ -256,17 +341,20 @@ - -------------------------- Example 4: Add a Service Principal account using Credential and ServicePrincipal -------------------------- + -------------------------- Service Principal Login -------------------------- PS C:\> - PS C:\>$credential = Get-Credential - PS C:\>Add-AzureAccount -Credential $credential -ServicePrincipal -Tenant "3EB32C56-E1E5-46A6-9410-F4A0572B3998" + $credential = Get-Credential +Add-AzureRmAccount -Credential $credential -TenantId xxxx-xxxx-xxxx-xxxx -ServicePrincipal - This command uses the Credential parameter to provide AAD authentication information of the Service Principal in the tenant 3EB32C56-E1E5-46A6-9410-F4A0572B3998. + Log in to Azure Resource Manager using the provided AD Application ID and Application secret - + Account: xxxx-xxxx-xxxx-xxxx +Environment: AzureCloud +Subscription: yyyy-yyyy-yyyy-yyyy +Tenant: zzzz-zzzz-zzzz-zzzz @@ -277,16 +365,19 @@ - -------------------------- Example 5: Add an account in Azure China -------------------------- + -------------------------- Select tenant and subscription -------------------------- PS C:\> - PS C:\>Add-AzureAccount -Environment AzureChinaCloud + Add-AzureRmAccount -TenantId xxxx-xxxx-xxxx-xxxx -SubscriptionId yyyy-yyyy-yyyy-yyyy - This command uses the Environment parameter to add an Azure China account to Windows PowerShell. When you run the command, a windows pops up to request the user name and password of the account. + Log in to the given tenant in Azure Resource Manager and target management cmdlets at the given subscription by default - + Account: user@example.com +Environment: AzureCloud +Subscription: yyyy-yyyy-yyyy-yyyy +Tenant: xxxx-xxxx-xxxx-xxxx @@ -299,27 +390,43 @@ - Online Version: - http://go.microsoft.com/fwlink/?LinkID=397618 + Get-AzureRmContext + + + + Get-AzureRmSubscription + + + + Save-AzureRmProfile + + + + Set-AzureRmContext + + + + Select-AzureRmProfile + - Add-AzureEnvironment + Get-AzureRmTenant - Get-AzureEnvironment + Add-AzureRmEnvironment - Import-AzurePublishSettingsFile + Set-AzureRmEnvironment - Get-AzureAccount + Get-AzureRmEnvironment - Remove-AzureAccount + Remove-AzureRmEnvironment @@ -327,116 +434,148 @@ - Add-AzureEnvironment + Add-AzureRmEnvironment - Creates an Azure environment + Add endpoints and metadata for an instance of Azure Resource Manager Add - AzureEnvironment + AzureRmEnvironment - The Add-AzureEnvironment cmdlet creates a new custom Azure account environment and saves it in your roaming user profile. The cmdlet returns an object that represents the new environment. When the command completes, you can use the environment in Windows PowerShell. - An Azure environment an independent deployment of Microsoft Azure, such as AzureCloud for global Azure and AzureChinaCloud for Azure operated by 21Vianet in China. You can also create on-premises Azure environments by using Azure Pack and the WAPack cmdlets. For more information, see Azure Pack (http://www.microsoft.com/en-us/server-cloud/products/windows-azure-pack/default.aspx). - Only the Name parameter of this cmdlet is mandatory. If you omit a parameter, its value is null ($null), and the service that uses that endpoint might not function properly. To add or change the value of an environment property, use the Set-AzureEnvironment cmdlet. - NOTE: Changing your environment can cause your account to fail. Typically, environments are added only for testing or troubleshooting. + Add endpoints and metdaata that allow Azure Resource Manager cmdlets to connect with a new instance of Azure Resource Manager. Built-in environments AzureCloud and AzureChinaCloud target existing public instances of Azure Resource Manager. - Add-AzureEnvironment + Add-AzureRmEnvironment Name - Specifies a name for the environment. This parameter is required. Do not use the names of the default environments, AzureCloud and AzureChinaCloud. + String PublishSettingsFileUrl - Specifies the URL of the publish settings files for your account. An Azure publish settings file is an XML file that contains information about your account and a management certificate that allows Windows PowerShell to sign into your Azure account on your behalf. + The url where PublishSettings files may be downloaded. String ServiceEndpoint - Specifies the URL of the Azure service endpoint. The Azure service endpoint determines whether your application is managed by the global Azure platform, Azure operated by 21Vianet in China, or a private Azure installation. + The endpoint for Service Management (RDFE) requests. String ManagementPortalUrl - Specifies the URL of the Azure Management Portal in the new environment. + The url for the management portal. String StorageEndpoint - Specifies the default endpoint of storage services in the new environment. + The endpoint for storage (blob, table, queue, file) access. String ActiveDirectoryEndpoint - Specifies the endpoint for Azure Active Directory authentication in the new environment. + The base authority for Azure Active Directory authentication. String ResourceManagerEndpoint - Specifies the endpoint for Azure Resource Manager data, including data about resource groups associated with the account. For more information about Azure Resource Manager, see Azure Resource Manager Cmdlets (http://go.microsoft.com/fwlink/?LinkID=394765) and Using Windows PowerShell with Resource Manager (http://go.microsoft.com/fwlink/?LinkID=394767). + The Url for Azure Resource Manager requests. String GalleryEndpoint - Specifies the endpoint for the Azure Resource Manager gallery, which stores resource group gallery templates. For more information about Azure resource groups and gallery templates, see the help topic for Get-AzureResourceGroupGalleryTemplate. + The endpoint for Azure Resource Manager gallery of deployment templates. String ActiveDirectoryServiceEndpointResourceId - Specifies the resource ID of a management API whose access is managed by Azure Active Directory. + The audience for tokens that authenticate requests to Azure Resource Manager or Service Management (RDFE) endpoints. String GraphEndpoint - Changes the endpoint for Azure Active Directory Graph API to the specified value. + The url for graph (Active Directory metadata) requests. String AzureKeyVaultDnsSuffix - The DNS suffix for Azure KeyVaut; servers in this environment + The domain name suffix for Key Vault services. String AzureKeyVaultServiceEndpointResourceId - The identity of the KeyVault endpoint, used to acquire a token for authenticating with the KeyValue service. + The audience for access tokens that authorize requests for Key Vault services. + + String + + + TrafficManagerDnsSuffix + + The domain name suffix for Azure Traffic Manager Services. + + String + + + SqlDatabaseDnsSuffix + + The domain name suffix for Azure Sql database servers. + + String + + + EnableAdfsAuthentication + + Indicates whether ADFS (on premise) authentication is allowed. + + SwitchParameter + + + AdTenant + + The default Active Direcotyr Tenant. String - Profile + InformationAction + + + + ActionPreference + + + InformationVariable - The Profile to add the environment to to. If not specified, adds the environment to the default (on disk) profile. + - AzureProfile + String @@ -444,7 +583,7 @@ Name - Specifies a name for the environment. This parameter is required. Do not use the names of the default environments, AzureCloud and AzureChinaCloud. + String @@ -456,7 +595,7 @@ PublishSettingsFileUrl - Specifies the URL of the publish settings files for your account. An Azure publish settings file is an XML file that contains information about your account and a management certificate that allows Windows PowerShell to sign into your Azure account on your behalf. + The url where PublishSettings files may be downloaded. String @@ -468,7 +607,7 @@ ServiceEndpoint - Specifies the URL of the Azure service endpoint. The Azure service endpoint determines whether your application is managed by the global Azure platform, Azure operated by 21Vianet in China, or a private Azure installation. + The endpoint for Service Management (RDFE) requests. String @@ -480,7 +619,7 @@ ManagementPortalUrl - Specifies the URL of the Azure Management Portal in the new environment. + The url for the management portal. String @@ -492,7 +631,7 @@ StorageEndpoint - Specifies the default endpoint of storage services in the new environment. + The endpoint for storage (blob, table, queue, file) access. String @@ -504,7 +643,7 @@ ActiveDirectoryEndpoint - Specifies the endpoint for Azure Active Directory authentication in the new environment. + The base authority for Azure Active Directory authentication. String @@ -516,7 +655,7 @@ ResourceManagerEndpoint - Specifies the endpoint for Azure Resource Manager data, including data about resource groups associated with the account. For more information about Azure Resource Manager, see Azure Resource Manager Cmdlets (http://go.microsoft.com/fwlink/?LinkID=394765) and Using Windows PowerShell with Resource Manager (http://go.microsoft.com/fwlink/?LinkID=394767). + The Url for Azure Resource Manager requests. String @@ -528,7 +667,7 @@ GalleryEndpoint - Specifies the endpoint for the Azure Resource Manager gallery, which stores resource group gallery templates. For more information about Azure resource groups and gallery templates, see the help topic for Get-AzureResourceGroupGalleryTemplate. + The endpoint for Azure Resource Manager gallery of deployment templates. String @@ -540,7 +679,7 @@ ActiveDirectoryServiceEndpointResourceId - Specifies the resource ID of a management API whose access is managed by Azure Active Directory. + The audience for tokens that authenticate requests to Azure Resource Manager or Service Management (RDFE) endpoints. String @@ -552,7 +691,7 @@ GraphEndpoint - Changes the endpoint for Azure Active Directory Graph API to the specified value. + The url for graph (Active Directory metadata) requests. String @@ -564,7 +703,7 @@ AzureKeyVaultDnsSuffix - The DNS suffix for Azure KeyVaut; servers in this environment + The domain name suffix for Key Vault services. String @@ -576,7 +715,31 @@ AzureKeyVaultServiceEndpointResourceId - The identity of the KeyVault endpoint, used to acquire a token for authenticating with the KeyValue service. + The audience for access tokens that authorize requests for Key Vault services. + + String + + String + + + + + + TrafficManagerDnsSuffix + + The domain name suffix for Azure Traffic Manager Services. + + String + + String + + + + + + SqlDatabaseDnsSuffix + + The domain name suffix for Azure Sql database servers. String @@ -585,26 +748,50 @@ + + EnableAdfsAuthentication + + Indicates whether ADFS (on premise) authentication is allowed. + + SwitchParameter + + SwitchParameter + + + + + + AdTenant + + The default Active Direcotyr Tenant. + + String + + String + + + Common + - Profile + InformationAction - The Profile to add the environment to to. If not specified, adds the environment to the default (on disk) profile. + - AzureProfile + ActionPreference - AzureProfile + ActionPreference - SubscriptionDataFile + InformationVariable - [Deprecated]: The SubscriptionDataFile parameter is deprecated. This parameter will be removed in a future release. See https://github.com/Azure/azure-powershell/wiki/Proposed-Design-Stateless-Azure-Profile for a description of the upcoming mechanism for providing alternate sources of subscription information. Specifies the path to a profile file. This parameter is optional. If it is not provided, default file in the user's profile is used. + - string + String - string + String @@ -613,26 +800,24 @@ - None + - - + - Microsoft.WindowsAzure.Commands.Utilities.Common.WindowsAzureEnvironment + - - + Returns the set of endpoints and metadata needed to communicate with an instace of Azure. @@ -645,85 +830,18 @@ - - -------------------------- Example 1: Add an Azure environment -------------------------- - - PS C:\> - - PS C:\>Add-AzureEnvironment -Name ContosoEnv -PublishSettingsFileUrl https://contoso.com/fwlink/?LinkID=101 -ServiceEndpoint https://contoso.com/fwlink/?LinkID=102 - Name : ContosoEnv - - PublishSettingsFileUrl : https://contoso.com/fwlink/?LinkID=101 - - ServiceEndpoint : https://contoso.com/fwlink/?LinkID=102 - - ResourceManagerEndpoint : - - ManagementPortalUrl : - - ActiveDirectoryEndpoint : - - ActiveDirectoryCommonTenantId : - - StorageEndpointSuffix : - - StorageBlobEndpointFormat : - - StorageQueueEndpointFormat : - - StorageTableEndpointFormat : - - GalleryEndpoint : - - This command creates the ContosoEnv Azure environment. - - - - - - - - - - - - - - -------------------------- Example 2: Add an Azure environment with Parameters -------------------------- - - PS C:\> - - PS C:\>Add-AzureEnvironment -Name ContosoEnv -PublishSettingsFileUrl "https://contoso.com/fwlink/?LinkID=101" -ServiceEndpoint "https://contoso.com/fwlink/?LinkID=102" -ResourceManagerEndpoint "https://contoso.com/fwlink/?LinkID=103" -GraphEndpoint "https://contoso.com/fwlink/?LinkID=104" - - This command creates the ContosoEnv Azure environment with PublishSettingsFileUrl, ServiceEndpoint, ResourceManagerEndpoint, and GraphEndpoint specified. All other endpoints are ignored. - - - - - - - - - - - - - Online Version: - http://go.microsoft.com/fwlink/?LinkID=397619 - - - Get-AzureEnvironment + Get-AzureRmEnvironment - Remove-AzureEnvironment + Set-AzureRmEnvironment - Set-AzureEnvironment + Remove-AzureRmEnvironment @@ -731,72 +849,60 @@ - Clear-AzureProfile + Get-AzureRmContext - Clears an Azure profile + Get the current metadata used to authenticate Azure Resource Manager requests. Includes the active directory account, Active Directory tenant, Azure subscription, and the targeted azure environemtn. Azure Resource Manager cmdlets use these settings by default when making Azure Resource Manager Requests. - Clear - AzureProfile + Get + AzureRmContext - The Clear-AzureProfile cmdlet resets Azure profile to default values. All imported subscriptions and accounts are removed. + Get the current metadata used to authenticate Azure Resource Manager requests. Includes the active directory account, Active Directory tenant, Azure subscription, and the targeted azure environemtn. Azure Resource Manager cmdlets use these settings by default when making Azure Resource Manager Requests. - Clear-AzureProfile - - Force + Get-AzureRmContext + + InformationAction - Suppresses the confirmation prompt. By default, Clear-AzureProfile prompts you before clearing the profile. + - SwitchParameter + ActionPreference - Profile + InformationVariable - The Profile to remove all accounts, certificates, and subscriptions from. If not specified, removes all accounts and subscriptions from the default (on disk) profile. + - AzureProfile + String - - Force - - Suppresses the confirmation prompt. By default, Clear-AzureProfile prompts you before clearing the profile. - - SwitchParameter - - SwitchParameter - - - - - Profile + InformationAction - The Profile to remove all accounts, certificates, and subscriptions from. If not specified, removes all accounts and subscriptions from the default (on disk) profile. + - AzureProfile + ActionPreference - AzureProfile + ActionPreference - SubscriptionDataFile + InformationVariable - [Deprecated]: The SubscriptionDataFile parameter is deprecated. This parameter will be removed in a future release. See https://github.com/Azure/azure-powershell/wiki/Proposed-Design-Stateless-Azure-Profile for a description of the upcoming mechanism for providing alternate sources of subscription information. Specifies the path to a profile file. This parameter is optional. If it is not provided, default file in the user's profile is used. + - string + String - string + String @@ -810,21 +916,19 @@ - - + - None + - - + Returns the account, tenant, and subscription used by Azure Resource Manager cmdlets. @@ -837,62 +941,14 @@ - - -------------------------- Example 1: Clear profile -------------------------- - - PS C:\> - - PS C:\>Clear-AzureProfile - - This command clears default user Azure profile. - - - - - - - - - - - - - - -------------------------- Example 2: Clear nondefault profile -------------------------- - - PS C:\> - - PS C:\>Clear-AzureProfile -SubscriptionDataFile c:\myprofile.json - - This command clears Azure profile stored in c:\myprofile.json file. - - - - - - - - - - - - - Get-AzureSubscription - - - - Set-AzureSubscription - - - - Add-AzureAccount + Set-AzureRmContext - Remove-AzureAccount + Add-AzureRmAccount @@ -900,45 +956,51 @@ - Get-AzureAccount + Get-AzureRmEnvironment - Gets Azure accounts that are available to Azure PowerShell. + Get endpoints and metadata for the given instance of Azure services. Get - AzureAccount + AzureRmEnvironment - This is the Description section - The Get-AzureAccount cmdlet gets the Azure accounts that are available to Windows PowerShell. To make your accounts available to Windows PowerShell, use the Add-AzureAccount or Import-PublishSettingsFile cmdlets. + Get endpoints and metadata for the given instance of Azure services. - Get-AzureAccount - + Get-AzureRmEnvironment + Name - Gets only the specified account. The default is all accounts that are available to Windows PowerShell. Enter the account name. The Name value is case-sensitive. Wildcards are not permitted. + The name of the azure instance. String - Profile + InformationAction + + + + ActionPreference + + + InformationVariable - The Profile to get accounts from. If not specified, gets the accounts from the default (on disk) profile. + - AzureProfile + String - + Name - Gets only the specified account. The default is all accounts that are available to Windows PowerShell. Enter the account name. The Name value is case-sensitive. Wildcards are not permitted. + The name of the azure instance. String @@ -948,25 +1010,25 @@ - Profile + InformationAction - The Profile to get accounts from. If not specified, gets the accounts from the default (on disk) profile. + - AzureProfile + ActionPreference - AzureProfile + ActionPreference - SubscriptionDataFile + InformationVariable - [Deprecated]: The SubscriptionDataFile parameter is deprecated. This parameter will be removed in a future release. See https://github.com/Azure/azure-powershell/wiki/Proposed-Design-Stateless-Azure-Profile for a description of the upcoming mechanism for providing alternate sources of subscription information. Specifies the path to a profile file. This parameter is optional. If it is not provided, default file in the user's profile is used. + - string + String - string + String @@ -975,26 +1037,24 @@ - None + - - + - None + - - + @@ -1007,73 +1067,14 @@ - - -------------------------- Example 1: Get all accounts -------------------------- - - PS C:\> - - PS C:\>Get-AzureAccount - Name ActiveDirectories - ---- ----------------- - contosoadmin@outlook.com {{ ActiveDirectoryTenantId = abcde5cd-bcc3-441a-bd86-e6a... - contosotest1@outlook.com {{ ActiveDirectoryTenantId = aaeabcde-386c-4466-bf70-794... - - This command gets all accounts associated with the specified user. - - - - - - - - - - - - - - -------------------------- Example 2: Get an account by name -------------------------- - - PS C:\> - - PS C:\>Get-AzureAccount -Name contosoadmin@outlook.com - Name ActiveDirectories - ---- ----------------- - contosoadmin@outlook.com {{ ActiveDirectoryTenantId = abcde5cd-bcc3-441a-bd86-e6a... - - This command gets the ContosoAdmin account. - - - - - - - - - - - - - Online Version: - http://go.microsoft.com/fwlink/?LinkID=397620 - - - Add-AzureAccount + Add-AzureRmEnvironment - Get-AzurePublishSettingsFile - - - - Import-AzurePublishSettingsFile - - - - Remove-AzureAccount + Set-AzureRmEnvironment @@ -1081,45 +1082,125 @@ - Get-AzureEnvironment + Get-AzureRmSubscription - Gets Azure environments + Get detailed information about subscriptions the current account can access. Get - AzureEnvironment + AzureRmSubscription - This is the Description section - The Get-AzureEnvironment cmdlet gets the Azure environments that are available to Windows PowerShell.An Azure environment an independent deployment of Microsoft Azure, such as AzureCloud for global Azure and AzureChinaCloud for Azure operated by 21Vianet in China. You can also create on-premises Azure environments by using Azure Pack and the WAPack cmdlets. For more information, see Azure Pack (http://www.microsoft.com/en-us/server-cloud/products/windows-azure-pack/default.aspx).The Get-AzureEnvironment cmdlet gets environments from your subscription data file, not from Azure. If the subscription data file is outdated, run the Add-AzureAccount or Import-PublishSettingsFile cmdlet to refresh it. + Get detailed information, inbclusing subscription id, subscription name, and home tenant about subscriptions the current account can access. - Get-AzureEnvironment - - Name + Get-AzureRmSubscription + + SubscriptionId + + The subscription to target. + + String + + + TenantId - Gets only the specified environment. Type the environment name. The parameter value is case-sensitive. Wildcard characters are not permitted. + The tenant containing subscriptions to get or list details about. String - Profile + InformationAction + + + + ActionPreference + + + InformationVariable + + + + String + + + + Get-AzureRmSubscription + + SubscriptionName + + + + String + + + TenantId + + The tenant containing subscriptions to get or list details about. + + String + + + InformationAction + + + + ActionPreference + + + InformationVariable + + + + String + + + + Get-AzureRmSubscription + + All + + If Provided, lists subscription details for all subscriptions in all tenants authorized for the current account. + + SwitchParameter + + + InformationAction + + + + ActionPreference + + + InformationVariable - The Profile to get environments from. If not specified, gets environments from the default (on disk) profile. + - AzureProfile + String - - Name + + SubscriptionId + + The subscription to target. + + String + + String + + + + + + TenantId - Gets only the specified environment. Type the environment name. The parameter value is case-sensitive. Wildcard characters are not permitted. + The tenant containing subscriptions to get or list details about. String @@ -1129,25 +1210,49 @@ - Profile + InformationAction - The Profile to get environments from. If not specified, gets environments from the default (on disk) profile. + - AzureProfile + ActionPreference - AzureProfile + ActionPreference - SubscriptionDataFile + InformationVariable + + + + String + + String + + + + + + SubscriptionName + + + + String + + String + + + + + + All - [Deprecated]: The SubscriptionDataFile parameter is deprecated. This parameter will be removed in a future release. See https://github.com/Azure/azure-powershell/wiki/Proposed-Design-Stateless-Azure-Profile for a description of the upcoming mechanism for providing alternate sources of subscription information. Specifies the path to a profile file. This parameter is optional. If it is not provided, default file in the user's profile is used. + If Provided, lists subscription details for all subscriptions in all tenants authorized for the current account. - string + SwitchParameter - string + SwitchParameter @@ -1156,26 +1261,24 @@ - None + - - + - System.Management.Automation.PSCustomObject + - - + @@ -1189,21 +1292,18 @@ - -------------------------- Example 1: Get all environments -------------------------- + -------------------------- List all subscriptions in all tenants -------------------------- PS C:\> - PS C:\>Get-AzureEnvironment - EnvironmentName ServiceEndpoint ResourceManagerEndpoint PublishSettingsFileUrl - --------------- --------------- ----------------------- ---------------------- - - AzureCloud https://management.core.wi... https://management.azure.com/ http://go.microsoft.com/fw... - AzureChinaCloud https://management.core.ch... https://not-supported-serv... http://go.microsoft.com/fw... + Get-AzureRmSubscription -All - This command gets all environments that are available to Windows PowerShell. + List all subscriptions in all tenants that are authorized for the current account. - + SubscriptionId: xxxx-xxxx-xxxx-xxxx +TenantId: yyyy-yyyy-yyyy-yyyy +Subscription Name: Contoso Subscription 1 @@ -1214,39 +1314,22 @@ - -------------------------- Example 2: Get an environment by name -------------------------- + -------------------------- List all subscription in one tenant -------------------------- PS C:\> - PS C:\>Get-AzureEnvironment -Name AzureCloud - Name : AzureCloud - - PublishSettingsFileUrl : http://go.microsoft.com/fwlink/?LinkID=301775 - - ServiceEndpoint : https://management.core.windows.net/ - - ResourceManagerEndpoint : https://management.azure.com/ - - ManagementPortalUrl : http://go.microsoft.com/fwlink/?LinkId=254433 - - ActiveDirectoryEndpoint : https://login.windows.net/ - - ActiveDirectoryCommonTenantId : common - - StorageEndpointSuffix : core.windows.net - - StorageBlobEndpointFormat : {0}://{1}.blob.core.windows.net/ - - StorageQueueEndpointFormat : {0}://{1}.queue.core.windows.net/ - - StorageTableEndpointFormat : {0}://{1}.table.core.windows.net/ - - GalleryEndpoint : https://gallery.azure.com/ + Get-AzureRmSubscription -TenantId xxxx-xxxx-xxxx-xxxx - This example gets the AzureCloud environment. + List all subscriptions in the given tenant that are authorized for the current account. - + SubscriptionId: yyyy-yyyy-yyyy-yyyy +TenantId: xxxx-xxxx-xxxx-xxxx +Subscription Name: Contoso Subscription 1 + +SubscriptionId: yyyy-yyyy-yyyy-yyyy +TenantId: xxxx-xxxx-xxxx-xxxx +Subscription Name: Contoso Subscription 2 @@ -1257,16 +1340,22 @@ - -------------------------- Example 3: Get all properties of all environments -------------------------- + -------------------------- List all subscriptions in the current tenant -------------------------- PS C:\> - PS C:\>Get-AzureEnvironment | ForEach-Object {Get-AzureEnvironment -Name $_.EnvironmentName} + Get-AzureRmSubscription - This command gets all properties of all environments. + List all subscriptions in the current tenant that are authorized for the given user. - The command uses the Get-AzureEnvironment cmdlet to get all Azure environments for this account. Then, it uses the Foreach-Object cmdlet to run a Get-AzureEnvironment command with the Name parameter on each environment. The value of the Name parameter is the EnvironmentName property of each environment.Without parameters, Get-AzureEnvironment gets only selected properties of an environment. + SubscriptionId: yyyy-yyyy-yyyy-yyyy +TenantId: xxxx-xxxx-xxxx-xxxx +Subscription Name: Contoso Subscription 1 + +SubscriptionId: yyyy-yyyy-yyyy-yyyy +TenantId: xxxx-xxxx-xxxx-xxxx +Subscription Name: Contoso Subscription 2 @@ -1276,106 +1365,80 @@ - - - - Online Version: - http://go.microsoft.com/fwlink/?LinkID=397621 - - - Add-AzureAccount - - - - Add-AzureEnvironment - - - - Get-AzurePublishSettingsFile - - - - Import-AzurePublishSettingsFile - - - - Remove-AzureEnvironment - - - - Set-AzureEnvironment - - + + -------------------------- Change the current context to target a particular subscription -------------------------- + + PS C:\> + + Get-AzureRmSubscription -SubscriptionId xxxx-xxxx-xxxx-xxxx -TenantId yyyy-yyyy-yyyy-yyyy | Set-AzureRmContext + + Set the context to use the given subscription. All subsequent cmdlets in this session will use the new subscription by default. + + + SubscriptionId: xxxx-xxxx-xxxx-xxxx +TenantId: yyyy-yyyy-yyyy-yyyy +Subscription Name: Contoso Subscription 1 + + + + + + + + + + + - Get-AzurePublishSettingsFile + Get-AzureRmTenant - Downloads the publish settings file for an Azure subscription. + Get detailed information about tenants authorized for the current user Get - AzurePublishSettingsFile + AzureRmTenant - This is the Description section - The Get-AzurePublishSettingsFile cmdlet downloads a publish settings file for a subscription in your account. When the command completes, you can use the Import-PublishSettingsFile cmdlet to make the settings in the file available to Windows PowerShell.To make your Azure account available to Windows PowerShell, you can use a publish settings file or the Add-AzureAccount cmdlet. Publish settings files let you prepare the session in advance so you can run scripts and background jobs unattended. However, not all services support publish settings files. For example, the AzureResourceManager module does not support publish settings files.When you run Get-AzurePublishSettingsFile, it opens your default browser and prompts you to sign into your Azure account, select a subscription, and select a file system location for the publish settings file. Then, it downloads the publish settings file for your subscription into the file that you selected.A "publish settings file" is an XML file with a .publishsettings file name extension. The file contains an encoded certificate that provides management credentials for your Azure subscriptions.Security Note: Publish settings files contains credentials that are used to administer your Azure subscriptions and services. If malicious users access your publish settings file, they can edit, create, and delete your Azure services. As a security best practice, save the file to a location in your Downloads or Documents folder and then delete it after using Import-AzurePublishSettingsFile cmdlet to import the settings. + Get detailed information about tenants authorized for the current user - Get-AzurePublishSettingsFile + Get-AzureRmTenant - Environment - - Specifies an Azure environment.An Azure environment an independent deployment of Microsoft Azure, such as AzureCloud for global Azure and AzureChinaCloud for Azure operated by 21Vianet in China. You can also create on-premises Azure environments by using Azure Pack and the WAPack cmdlets. For more information, see Azure Pack (http://www.microsoft.com/en-us/server-cloud/products/windows-azure-pack/default.aspx). - - String - - - Realm + Tenant - Specifies the organization in an organizational ID. For example, if you sign into Azure as admin@contoso.com, the value of the Realm parameter is contoso.com. Use this parameter when you use an organizational ID to sign into the Azure portal. This parameter is not required when you use a Microsoft account, such as an outlook.com or live.com account. + Tenant to get information about. If not provided, all authorized tenants are returned. String - - PassThru + + InformationAction - Returns True ($true) if the command succeeds and False ($false) if it fails. By default, this cmdlet does not return any output. The PassThru parameter is typically used in conditional statements in functions and scripts. + - SwitchParameter + ActionPreference - Profile + InformationVariable - The Profile to retrieve the PublishSettings download endpoint from. If not specified, gets the PublishSettings download endpoint from the default (on disk) profile. + - AzureProfile + String - Environment - - Specifies an Azure environment.An Azure environment an independent deployment of Microsoft Azure, such as AzureCloud for global Azure and AzureChinaCloud for Azure operated by 21Vianet in China. You can also create on-premises Azure environments by using Azure Pack and the WAPack cmdlets. For more information, see Azure Pack (http://www.microsoft.com/en-us/server-cloud/products/windows-azure-pack/default.aspx). - - String - - String - - - - - - Realm + Tenant - Specifies the organization in an organizational ID. For example, if you sign into Azure as admin@contoso.com, the value of the Realm parameter is contoso.com. Use this parameter when you use an organizational ID to sign into the Azure portal. This parameter is not required when you use a Microsoft account, such as an outlook.com or live.com account. + Tenant to get information about. If not provided, all authorized tenants are returned. String @@ -1384,38 +1447,26 @@ - - PassThru - - Returns True ($true) if the command succeeds and False ($false) if it fails. By default, this cmdlet does not return any output. The PassThru parameter is typically used in conditional statements in functions and scripts. - - SwitchParameter - - SwitchParameter - - - - - Profile + InformationAction - The Profile to retrieve the PublishSettings download endpoint from. If not specified, gets the PublishSettings download endpoint from the default (on disk) profile. + - AzureProfile + ActionPreference - AzureProfile + ActionPreference - SubscriptionDataFile + InformationVariable - [Deprecated]: The SubscriptionDataFile parameter is deprecated. This parameter will be removed in a future release. See https://github.com/Azure/azure-powershell/wiki/Proposed-Design-Stateless-Azure-Profile for a description of the upcoming mechanism for providing alternate sources of subscription information. Specifies the path to a profile file. This parameter is optional. If it is not provided, default file in the user's profile is used. + - string + String - string + String @@ -1424,26 +1475,24 @@ - None + - - + - None or System.Boolean + - - + Tenant Id and associated domain information for tenants authorized for the current account. @@ -1456,183 +1505,65 @@ - - -------------------------- Example 1: Download a publish settings file -------------------------- - - PS C:\> - - PS C:\>Get-AzurePublishSettingsFile - - This command opens your default browser, connects to your Microsoft Azure account, and then downloads the .publishsettings file for your account. - - - - - - - - - - - - - - -------------------------- Example 2: Specify a realm -------------------------- - - PS C:\> - - PS C:\>Get-AzurePublishSettingsFile -Realm contoso.com -Passthru - - This command downloads the publish settings file for an account in the contoso.com domain. Use a command with the Realm parameter when you sign into Azure with an organizational account, instead of a Microsoft account. - - - - - - - - - - - - - - Online Version: - http://go.microsoft.com/fwlink/?LinkID=397622 - - - Add-AzureAccount - - - - Import-AzurePublishSettingsFile - - - Get-AzureSubscription + Remove-AzureRmEnvironment - Gets Azure subscriptions in Azure account. + Remove endpoints and metadata information for connecting to a given Azure instance. - Get - AzureSubscription + Remove + AzureRmEnvironment - This is the Description section - The Get-AzureSubscription cmdlet gets the subscriptions in your Azure account. You can use this cmdlet to get information about the subscription and to pipe the subscription to other cmdlets.Get-AzureSubscription requires access to your Azure accounts. Before you run Get-AzureSubscription, you must run the Add-AzureAccount cmdlet or the cmdlets that download and install a publish settings file (Get-AzurePublishSettingsFile, Import-AzurePublishSettingsFile. + Remove endpoints and metadata information for connecting to a given Azure instance. - Get-AzureSubscription - - SubscriptionName - - Gets only the specified subscription. Enter the subscription name. The value is case-sensitive. Wildcard characters are not supported. By default, Get-AzureSubscription gets all subscriptions in your Azure accounts. - - String - - - ExtendedDetails - - Returns quota information for the subscription, in addition to the standard settings. - - SwitchParameter - - - Profile - - The Profile to get subscriptions from. If not specified, gets subscriptions from the default (on disk) profile. - - AzureProfile - - - - Get-AzureSubscription - - SubscriptionId + Remove-AzureRmEnvironment + + Name - Gets only the specified subscription. Enter the subscription Id. By default, Get-AzureSubscription gets all subscriptions in your Azure accounts. + The name of the environment to remove. String - - ExtendedDetails - - Returns quota information for the subscription, in addition to the standard settings. - - SwitchParameter - - - Profile - - The Profile to get subscriptions from. If not specified, gets subscriptions from the default (on disk) profile. - - AzureProfile - - - - Get-AzureSubscription - - Default - - Gets only the default subscription, that is, the subscription designated as "default." By default, Get-AzureSubscription gets all subscriptions in your Azure accounts. To designate a subscription as "default," use the Default parameter of the Select-AzureSubscription cmdlet. - - SwitchParameter - - - ExtendedDetails - - Returns quota information for the subscription, in addition to the standard settings. - - SwitchParameter - - - Profile - - The Profile to get subscriptions from. If not specified, gets subscriptions from the default (on disk) profile. - - AzureProfile - - - - Get-AzureSubscription - - Current + + Force - Gets only the current subscription, that is, the subscription designated as "current." By default, Get-AzureSubscription gets all subscriptions in your Azure accounts. To designate a subscription as "current," use the Current parameter of the Select-AzureSubscription cmdlet. + Force removal without prompts. SwitchParameter - ExtendedDetails + InformationAction - Returns quota information for the subscription, in addition to the standard settings. + - SwitchParameter + ActionPreference - Profile + InformationVariable - The Profile to get subscriptions from. If not specified, gets subscriptions from the default (on disk) profile. + - AzureProfile + String - - SubscriptionName + + Name - Gets only the specified subscription. Enter the subscription name. The value is case-sensitive. Wildcard characters are not supported. By default, Get-AzureSubscription gets all subscriptions in your Azure accounts. + The name of the environment to remove. String @@ -1641,10 +1572,10 @@ - - ExtendedDetails + + Force - Returns quota information for the subscription, in addition to the standard settings. + Force removal without prompts. SwitchParameter @@ -1654,21 +1585,21 @@ - Profile + InformationAction - The Profile to get subscriptions from. If not specified, gets subscriptions from the default (on disk) profile. + - AzureProfile + ActionPreference - AzureProfile + ActionPreference - - SubscriptionId + + InformationVariable - Gets only the specified subscription. Enter the subscription Id. By default, Get-AzureSubscription gets all subscriptions in your Azure accounts. + String @@ -1677,66 +1608,28 @@ - - Default - - Gets only the default subscription, that is, the subscription designated as "default." By default, Get-AzureSubscription gets all subscriptions in your Azure accounts. To designate a subscription as "default," use the Default parameter of the Select-AzureSubscription cmdlet. - - SwitchParameter - - SwitchParameter - - - - - - Current - - Gets only the current subscription, that is, the subscription designated as "current." By default, Get-AzureSubscription gets all subscriptions in your Azure accounts. To designate a subscription as "current," use the Current parameter of the Select-AzureSubscription cmdlet. - - SwitchParameter - - SwitchParameter - - - - - - SubscriptionDataFile - - [Deprecated]: The SubscriptionDataFile parameter is deprecated. This parameter will be removed in a future release. See https://github.com/Azure/azure-powershell/wiki/Proposed-Design-Stateless-Azure-Profile for a description of the upcoming mechanism for providing alternate sources of subscription information. Specifies the path to a profile file. This parameter is optional. If it is not provided, default file in the user's profile is used. - - string - - string - - - - - None + - - + - Microsoft.WindowsAzure.Commands.Utilities.Common.AzureSubscription + - - + @@ -1745,1655 +1638,7 @@ - Get-AzureSubscription gets data from the subscription data file that the Add-AzureAccount and Import-PublishSettingsFile cmdlets create. - - - - - -------------------------- Example 1: Get all subscriptions -------------------------- - - PS C:\> - - PS C:\> C:\PS>Get-AzureSubscription - - This command gets all subscriptions in the account. - - - - - - - - - - - - - - -------------------------- Example 2: Get a subscription by name -------------------------- - - PS C:\> - - PS C:\> C:\PS>Get-AzureSubscription –SubscriptionName "MyProdSubscription" - - This command gets only the "MyProdSubsciption" subscription. - - - - - - - - - - - - - - -------------------------- Example 3: Get the default subscription -------------------------- - - PS C:\> - - PS C:\> C:\PS>(Get-AzureSubscription -Default).SubscriptionName - - This command gets only the name of the default subscription. The command first gets the subscription and then uses the dot method to get the SubscriptionName property of the subscription. - - - - - - - - - - - - - - -------------------------- Example 4: Get selected subscription properties -------------------------- - - PS C:\> - - PS C:\> C:\PS>Get-AzureSubscription -Current | Format-List -Property SubscriptionName, Certificate - - This command returns a list with the name and certificate of the current subscription. It uses a Get-AzureSubscription command to get the current subscription. Then it pipes the subscription to a Format-List command that displays the selected properties in a list. - - - - - - - - - - - - - - -------------------------- Example 5: Use an alternate subscription data file -------------------------- - - PS C:\> - - PS C:\> C:\PS>Get-AzureSubscription -SubscriptionDataFile "C:\Temp\MySubscriptions.xml" - - This command gets subscriptions from the C:\Temp\MySubscriptions.xml subscription data file. Use the SubscriptionDataFile parameter if you specified an alternate subscription data file when you ran the Add-AzureAccount or Import-PublishSettingsFile cmdlets. - - - - - - - - - - - - - - - - Online Version: - http://go.microsoft.com/fwlink/?LinkID=397623 - - - Add-AzureAccount - - - - Get-AzurePublishSettingsFile - - - - Import-AzurePublishSettingsFile - - - - Remove-AzureSubscription - - - - Set-AzureSubscription - - - - - - - - Import-AzurePublishSettingsFile - - Imports a publish settings file that lets you manage your Azure accounts in Windows PowerShell. - - - - - Import - AzurePublishSettingsFile - - - - This is the Description section - The Import-AzurePublishSettingsFile cmdlet imports a publish settings file (*.publishsettings) that contains information about your Azure accounts and saves a subscription data file on your computer. When the cmdlet completes, you can manage your Azure accounts in Windows PowerShell.Before running Import-AzurePublishSettingsFile, run Get-AzurePublishSettingsFile, which downloads and saves the publish settings file so you can import it.To make your Azure account available to Windows PowerShell, you can use a publish settings file or the Add-AzureAccount cmdlet. Publish settings files let you prepare the session in advance so you can run scripts and background jobs unattended. However, not all services support publish settings files. For example, the AzureResourceManager module does not support publish settings files.Security Note: Publish settings files contain a management certificate that is encoded, but not encrypted. If malicious users access your publish settings file, they might be able to edit, create, and delete your Azure services. As a security best practice, save the file to a location in your Downloads or Documents folder and then delete it after using Import-AzurePublishSettingsFile cmdlet to import the settings. - - - - Import-AzurePublishSettingsFile - - PublishSettingsFile - - Specifies the full path and filename of the publish settings file. This should match the file location that you entered when prompted by Get-AzurePublishSettingsFile. - - String - - - Environment - - Specifies the environment to use. This parameter is optional. If it is not provided, an environment will be chosen according to the endpoint in the publish settings file. - - String - - - Profile - - The Profile to add certificates and subscriptions to. If not specified, adds certificates and subscriptions to the default (on disk) profile. - - AzureProfile - - - - - - PublishSettingsFile - - Specifies the full path and filename of the publish settings file. This should match the file location that you entered when prompted by Get-AzurePublishSettingsFile. - - String - - String - - - - - - Environment - - Specifies the environment to use. This parameter is optional. If it is not provided, an environment will be chosen according to the endpoint in the publish settings file. - - String - - String - - - - - - Profile - - The Profile to add certificates and subscriptions to. If not specified, adds certificates and subscriptions to the default (on disk) profile. - - AzureProfile - - AzureProfile - - - - - - SubscriptionDataFile - - [Deprecated]: The SubscriptionDataFile parameter is deprecated. This parameter will be removed in a future release. See https://github.com/Azure/azure-powershell/wiki/Proposed-Design-Stateless-Azure-Profile for a description of the upcoming mechanism for providing alternate sources of subscription information. Specifies the path to a profile file. This parameter is optional. If it is not provided, default file in the user's profile is used. - - string - - string - - - - - - - - - None - - - - - - - - - - - - - None - - - - - - - - - - - - - - - A "publish settings file" is an XML file with a .publishsettings file name extension. The file contains an encoded certificate that provides management credentials for your Azure subscriptions. After you import this file, delete it to avoid security risks. - - - - - -------------------------- Example 1 -------------------------- - - PS C:\> - - PS C:\>Import-AzurePublishSettingsFile –PublishSettingsFile C:\Temp\MyAccount.publishsettings - - This command imports the "C:\Temp\MyAccount.publishsettings" file. - - - - - - - - - - - - - - -------------------------- Example 2 -------------------------- - - PS C:\> - - PS C:\>Import-AzurePublishSettingsFile –PublishSettingsFile C:\Temp\MyAccount.publishsettings –SubscriptionDataFile C:\Subs\Subscriptions.xml - - This command imports the "C:\Temp\MyAccountName-date-credentials.publishsettings" file and then saves the subscription data file in C:\Subs\Subscriptions.xml. - - - When you use the SubscriptionDataFile parameter to save your subscription data file in an alternate location, be sure to use the SubscriptionDataFile parameter of cmdlets that use subscription data file, such as Select-AzureSubscription and Remove-AzureAccount. - - - - - - - - - - - -------------------------- Example 3 -------------------------- - - PS C:\> - - PS C:\>Import-AzurePublishSettingsFile –PublishSettingsFile C:\Temp\MyAccount.publishsettings -Environment AzureChinaCloud - - This command imports the "C:\Temp\MyAccount.publishsettings" file and sets the Azure environment of all imported subscriptions to be AzureChinaCloud. This will overwrite the endpoints defined in the publish settings file. - - - - - - - - - - - - - - - - Online Version: - http://go.microsoft.com/fwlink/?LinkID=397624 - - - How to Install and Configure Azure PowerShell - - - - Add-AzureAccount - - - - Get-AzurePublishSettingsFile - - - - - - - - New-AzureProfile - - Create a new credential profile for Microsoft Azure PowerShell cmdlets in the current PowerShell session. - - - - - New - AzureProfile - - - - Create a new credential profile for Microsoft Azure PowerShell cmdlets in the current PowerShell session. A credential Profile is a container for the environments, accounts, and subscriptions used to authenticate Microsoft Azure PowerShell cmdlets with Microsoft Azure endpoints. A profile created with tis command can be passed as a parameter to any Microsoft Azure PowerShell cmdlet and the cmdlet will use the passed in profile for authentication. You can also use Select-AzureProfile to select a profile for use by all cmdlets in the current PowerrShell session. This enables using different credential sets in different PowerShell sessions independently. - The cmdlet can initialize the created profile with a default subscription and the associated credentials. You can create a default subscription in the profile using a certificate, Azure ActiveDirectory Organization ID credewntials, Azure active directory Service Principal credentials, or an Azure Access Directory access token you acquire outside of PowerShell. - - - - New-AzureProfile - - Environment - - Sets the AzureEnvironment for the default subscription in the created AzureProfile. - - AzureEnvironment - - - SubscriptionId - - The Id of the default subscription for this profile. - - String - - - StorageAccount - - The default storage account for the default subscription in the created Profile. - - String - - - AccessToken - - The authorization token used to authenticate the default subscription in this Profile. - - String - - - AccountId - - The Account name associated with the AccessToken for the default subscription in this Profile. - - String - - - - New-AzureProfile - - Environment - - Sets the AzureEnvironment for the default subscription in the created AzureProfile. - - AzureEnvironment - - - SubscriptionId - - The Id of the default subscription for this profile. - - String - - - StorageAccount - - The default storage account for the default subscription in the created Profile. - - String - - - Credential - - Azure Organization ID credentials for authenticating the default subscription in this Profile. - - PSCredential - - - Tenant - - The Tenant Id for the default subscription in this Profile. - - String - - - ServicePrincipal - - The ServicePrincipal Credential used to authenticate the default subscription in this Profile. - - SwitchParameter - - - - New-AzureProfile - - Environment - - Sets the AzureEnvironment for the default subscription in the created AzureProfile. - - AzureEnvironment - - - SubscriptionId - - The Id of the default subscription for this profile. - - String - - - StorageAccount - - The default storage account for the default subscription in the created Profile. - - String - - - Credential - - Azure Organization ID credentials for authenticating the default subscription in this Profile. - - PSCredential - - - Tenant - - The Tenant Id for the default subscription in this Profile. - - String - - - - New-AzureProfile - - Environment - - Sets the AzureEnvironment for the default subscription in the created AzureProfile. - - AzureEnvironment - - - SubscriptionId - - The Id of the default subscription for this profile. - - String - - - StorageAccount - - The default storage account for the default subscription in the created Profile. - - String - - - Certificate - - The certificate used to authenticate the default subscription in this Profile. - - X509Certificate2 - - - - New-AzureProfile - - Path - - The fully-qualified path to an AzureProfile saved on disk. - - String - - - - New-AzureProfile - - Properties - - A hash table containing details about the default subscription for this profile. The Hash keys and values may include: - SubscriptionId - [string]: The subscription ID for the default subscription in this Profile. - Certificate - [X509Certificate2]: The certificate credentials for the default subscription in this Profile. - Username - [string]: The user name associated with the default subscription for this Profile. Used to acquire an Azure Active Directory User credential. - Password - [string]: The password associated with the default subscription for the Profile. Used to acquire an Azure Active Directory User or Service credential. - ServicePrincipal - [string]: The SPN associated with the default subscription for this Profile. Used to acquire an Azure Active Directory Service credential. - Tenant - [string]: The tenant associated with the default subscription for this Profile. Used to acquire an Azure Active Directory Service credential. - AccountId - [string]: The user name associated with the default subscription for this Profile. Used to create a credential when access token is also specified. - Token - [string]: The access token associated with the default subscription for this Profile. Used to create a credential when AccountId is also specified. - Environment - [string]: The name of the environment associated with the default subscription for this Profile. Defaults to 'AzureCloud' if not specified. - StorageAccount - [string]: The name of the default storage account associated with the default subscription for this Profile. - - Hashtable - - - - - - Environment - - Sets the AzureEnvironment for the default subscription in the created AzureProfile. - - AzureEnvironment - - AzureEnvironment - - - AzureCloud - - - SubscriptionId - - The Id of the default subscription for this profile. - - String - - String - - - - - - StorageAccount - - The default storage account for the default subscription in the created Profile. - - String - - String - - - - - - AccessToken - - The authorization token used to authenticate the default subscription in this Profile. - - String - - String - - - - - - AccountId - - The Account name associated with the AccessToken for the default subscription in this Profile. - - String - - String - - - - - - Credential - - Azure Organization ID credentials for authenticating the default subscription in this Profile. - - PSCredential - - PSCredential - - - - - - Tenant - - The Tenant Id for the default subscription in this Profile. - - String - - String - - - - - - ServicePrincipal - - The ServicePrincipal Credential used to authenticate the default subscription in this Profile. - - SwitchParameter - - SwitchParameter - - - - - - Certificate - - The certificate used to authenticate the default subscription in this Profile. - - X509Certificate2 - - X509Certificate2 - - - - - - Path - - The fully-qualified path to an AzureProfile saved on disk. - - String - - String - - - - - - Properties - - A hash table containing details about the default subscription for this profile. The Hash keys and values may include: - SubscriptionId - [string]: The subscription ID for the default subscription in this Profile. - Certificate - [X509Certificate2]: The certificate credentials for the default subscription in this Profile. - Username - [string]: The user name associated with the default subscription for this Profile. Used to acquire an Azure Active Directory User credential. - Password - [string]: The password associated with the default subscription for the Profile. Used to acquire an Azure Active Directory User or Service credential. - ServicePrincipal - [string]: The SPN associated with the default subscription for this Profile. Used to acquire an Azure Active Directory Service credential. - Tenant - [string]: The tenant associated with the default subscription for this Profile. Used to acquire an Azure Active Directory Service credential. - AccountId - [string]: The user name associated with the default subscription for this Profile. Used to create a credential when access token is also specified. - Token - [string]: The access token associated with the default subscription for this Profile. Used to create a credential when AccountId is also specified. - Environment - [string]: The name of the environment associated with the default subscription for this Profile. Defaults to 'AzureCloud' if not specified. - StorageAccount - [string]: The name of the default storage account associated with the default subscription for this Profile. - - Hashtable - - Hashtable - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -------------------------- Create a new empty profile for the current session -------------------------- - - PS C:\> - - > Select-AzureProfile -Profile $(New-AzureProfile) -> Add-AzureAccount -> Get-AzureVM - - This creates a new empty profile and makes this profile active for the current Azure PowerShell session. Any commands executed in the current PowerShell window will use this in-memory Profile rather than the default profile on disk. - In the example above, the Add-AzureAccount cmdlet adds a subscription to the in-memory profile, and the Get-AzureVM command lists the VMs for this subscription. The added subscription is only visible in the current session, another PowerShell window could use a separate in-memory profile at the same time. When the PowerShell window is closed, the subscription and associated credentials are discarded. - - - - - - - - - - - - - - -------------------------- Create and use multiple profiles in a session -------------------------- - - PS C:\> - - > $profile1 = New-AzureProfile -SubscriptionId <subscription1> -Credential $(Get-Credential) -> $profile2 = New-AzureProfile -SubscriptionId <subscription2> -Credential $(Get-Credential) -> Get-AzureVM -Profile $profile1 -> Get-AzureVM -Profile $profile2 - - This example creates 2 profiles containing different default subscriptions. The VMs for each subscription are listed by passing in the profile on the command line. - Using this pattern, management actions can be easily executed using multiple subscriptions and mutliple sets of credentials within the same PowerShell session. - - - - - - - - - - - - - - - - Select-AzureProfile - - - - Clear-AzureProfile - - - - - - - - Remove-AzureAccount - - Deletes an Azure account from Windows PowerShell. - - - - - Remove - AzureAccount - - - - The Remove-AzureAccount cmdlet deletes an Azure account and its subscriptions from the subscription data file in your roaming user profile. It does not delete the account from Microsoft Azure, or change the actual account in any way. - Using this cmdlet is a lot like logging out of your Azure account. And, if you want to log into the account again, use the Add-AzureAccount or Import-AzurePublishSettingsFile to add the account to Windows PowerShell again. - You can also use Remove-AzureAccount cmdlet to change the way the Azure PowerShell cmdlets sign into your Azure account. If your account has both a management certificate from Import-AzurePublishSettingsFile and an access token from Add-AzureAccount, the Azure PowerShell cmdlets use only the access token; they ignore the management certificate. To use the management certificate, run Remove-AzureAccount. When Remove-AzureAccount finds both a management certificate and an access token, it deletes only the access token, instead of deleting the account. The management certificate is still there, so account is still available to Windows PowerShell. - - - - Remove-AzureAccount - - Name - - Specifies the name of the account to remove. The parameter value is case-sensitive. Wildcard characters are not supported. - - String - - - Force - - Suppresses the confirmation prompt. By default, Remove-AzureAccount prompts you before removing the account from Windows PowerShell. - - SwitchParameter - - - PassThru - - Returns True ($true) if the operation succeeded and False ($false) if it failed. By default, the cmdlet does not return any output. - - SwitchParameter - - - Profile - - The Profile to remove accounts from. If not specified, removes accounts from the default (on disk) profile. - - AzureProfile - - - WhatIf - - Shows what would happen if the cmdlet runs. The cmdlet is not run. - - SwitchParameter - - - Confirm - - Prompts you for confirmation before running the cmdlet. - - SwitchParameter - - - - - - Name - - Specifies the name of the account to remove. The parameter value is case-sensitive. Wildcard characters are not supported. - - String - - String - - - - - - Force - - Suppresses the confirmation prompt. By default, Remove-AzureAccount prompts you before removing the account from Windows PowerShell. - - SwitchParameter - - SwitchParameter - - - - - - PassThru - - Returns True ($true) if the operation succeeded and False ($false) if it failed. By default, the cmdlet does not return any output. - - SwitchParameter - - SwitchParameter - - - - - - Profile - - The Profile to remove accounts from. If not specified, removes accounts from the default (on disk) profile. - - AzureProfile - - AzureProfile - - - - - - WhatIf - - Shows what would happen if the cmdlet runs. The cmdlet is not run. - - SwitchParameter - - SwitchParameter - - - false - - - Confirm - - Prompts you for confirmation before running the cmdlet. - - SwitchParameter - - SwitchParameter - - - false - - - SubscriptionDataFile - - [Deprecated]: The SubscriptionDataFile parameter is deprecated. This parameter will be removed in a future release. See https://github.com/Azure/azure-powershell/wiki/Proposed-Design-Stateless-Azure-Profile for a description of the upcoming mechanism for providing alternate sources of subscription information. Specifies the path to a profile file. This parameter is optional. If it is not provided, default file in the user's profile is used. - - string - - string - - - - - - - - - None - - - - - - - - - - - - - None or System.Boolean - - - - - - - - - - - - - - - - - - - - -------------------------- Example 1: Remove an account -------------------------- - - PS C:\> - - PS C:\>Remove-AzureAccount -Name admin@contoso.com - - This command removes the admin@contoso.com from your subscription data file. When the command completes, the account is no longer available to Windows PowerShell. - - - - - - - - - - - - - - - - Online Version: - http://go.microsoft.com/fwlink/?LinkID=397625 - - - Add-AzureAccount - - - - Get-AzureAccount - - - - - - - - Remove-AzureEnvironment - - Deletes an Azure environment from Windows PowerShell - - - - - Remove - AzureEnvironment - - - - This is the Description section - The Remove-AzureEnvironment cmdlet deletes an Azure environment from your roaming profile so Windows PowerShell can't find it. This cmdlet does not delete the environment from Microsoft Azure, or change the actual environment in any way.An Azure environment an independent deployment of Microsoft Azure, such as AzureCloud for global Azure and AzureChinaCloud for Azure operated by 21Vianet in China. You can also create on-premises Azure environments by using Azure Pack and the WAPack cmdlets. For more information, see Azure Pack (http://www.microsoft.com/en-us/server-cloud/products/windows-azure-pack/default.aspx). - - - - Remove-AzureEnvironment - - Name - - Specifies the name of the environment to remove. This parameter is required. This parameter value is case-sensitive. Wildcard characters are not permitted. - - String - - - Force - - Suppresses the confirmation prompt. By default, Remove-AzureAccount prompts you before removing the account from Windows PowerShell. - - SwitchParameter - - - Profile - - The Profile to remove environments from. If not specified, removes environments from the default (on disk) profile. - - AzureProfile - - - - - - Name - - Specifies the name of the environment to remove. This parameter is required. This parameter value is case-sensitive. Wildcard characters are not permitted. - - String - - String - - - - - - Force - - Suppresses the confirmation prompt. By default, Remove-AzureAccount prompts you before removing the account from Windows PowerShell. - - SwitchParameter - - SwitchParameter - - - - - - Profile - - The Profile to remove environments from. If not specified, removes environments from the default (on disk) profile. - - AzureProfile - - AzureProfile - - - - - - SubscriptionDataFile - - [Deprecated]: The SubscriptionDataFile parameter is deprecated. This parameter will be removed in a future release. See https://github.com/Azure/azure-powershell/wiki/Proposed-Design-Stateless-Azure-Profile for a description of the upcoming mechanism for providing alternate sources of subscription information. Specifies the path to a profile file. This parameter is optional. If it is not provided, default file in the user's profile is used. - - string - - string - - - - - - PassThru - - Returns True ($true) if the command succeeds and False ($false) if it fails. By default, this cmdlet does not return any output. - - string - - string - - - - - - - - - None - - - - - - - - - - - - - None or System.Boolean - - - - - - - - - - - - - - - - - - - - -------------------------- Example 1: Delete an environment -------------------------- - - PS C:\> - - PS C:\>Remove-AzureEnvironment -Name ContosoEnv - - This command deletes the ContosoEnv environment from Windows PowerShell. - - - - - - - - - - - - - - -------------------------- Example 2: Delete multiple environments -------------------------- - - PS C:\> - - PS C:\>Get-AzureEnvironment | Where-Object EnvironmentName -like "Contoso*" | ForEach-Object {Remove-AzureEnvironment -Name $_.EnvironmentName } - - This command deletes environments whose names begin with "Contoso" from Windows PowerShell. - - - - - - - - - - - - - - - - Online Version: - http://go.microsoft.com/fwlink/?LinkID=397626 - - - Add-AzureEnvironment - - - - Get-AzureEnvironment - - - - Set-AzureEnvironment - - - - - - - - Remove-AzureSubscription - - Deletes an Azure subscription from Windows PowerShell. - - - - - Remove - AzureSubscription - - - - The Remove-AzureSubscription cmdlet deletes an Azure subscription from your subscription data file so Windows PowerShell can't find it. This cmdlet does not delete the subscription from Microsoft Azure, or change the actual subscription in any way. - - - - Remove-AzureSubscription - - SubscriptionName - - Specifies the subscription name. This parameter is required. The parameter value is case-sensitive. Wildcard characters are not permitted. - - String - - - Force - - Suppresses the confirmation prompt. By default, Remove-AzureSubscription prompts you before deleting the subscription. - - SwitchParameter - - - PassThru - - Returns True ($true) if the command succeeds and False ($false) if it fails. By default, this cmdlet does not return any output. - - SwitchParameter - - - Profile - - The Profile to remove subscriptions from. If not specified, removes subscriptions from the default (on disk) profile. - - AzureProfile - - - WhatIf - - Shows what would happen if the cmdlet runs. The cmdlet is not run. - - SwitchParameter - - - Confirm - - Prompts you for confirmation before running the cmdlet. - - SwitchParameter - - - - Remove-AzureSubscription - - SubscriptionId - - Specifies the subscription Id. This parameter is required. - - String - - - Force - - Suppresses the confirmation prompt. By default, Remove-AzureSubscription prompts you before deleting the subscription. - - SwitchParameter - - - PassThru - - Returns True ($true) if the command succeeds and False ($false) if it fails. By default, this cmdlet does not return any output. - - SwitchParameter - - - Profile - - The Profile to remove subscriptions from. If not specified, removes subscriptions from the default (on disk) profile. - - AzureProfile - - - WhatIf - - Shows what would happen if the cmdlet runs. The cmdlet is not run. - - SwitchParameter - - - Confirm - - Prompts you for confirmation before running the cmdlet. - - SwitchParameter - - - - - - SubscriptionName - - Specifies the subscription name. This parameter is required. The parameter value is case-sensitive. Wildcard characters are not permitted. - - String - - String - - - - - - Force - - Suppresses the confirmation prompt. By default, Remove-AzureSubscription prompts you before deleting the subscription. - - SwitchParameter - - SwitchParameter - - - - - - PassThru - - Returns True ($true) if the command succeeds and False ($false) if it fails. By default, this cmdlet does not return any output. - - SwitchParameter - - SwitchParameter - - - - - - Profile - - The Profile to remove subscriptions from. If not specified, removes subscriptions from the default (on disk) profile. - - AzureProfile - - AzureProfile - - - - - - WhatIf - - Shows what would happen if the cmdlet runs. The cmdlet is not run. - - SwitchParameter - - SwitchParameter - - - false - - - Confirm - - Prompts you for confirmation before running the cmdlet. - - SwitchParameter - - SwitchParameter - - - false - - - SubscriptionId - - Specifies the subscription Id. This parameter is required. - - String - - String - - - - - - SubscriptionDataFile - - [Deprecated]: The SubscriptionDataFile parameter is deprecated. This parameter will be removed in a future release. See https://github.com/Azure/azure-powershell/wiki/Proposed-Design-Stateless-Azure-Profile for a description of the upcoming mechanism for providing alternate sources of subscription information. Specifies the path to a profile file. This parameter is optional. If it is not provided, default file in the user's profile is used. - - string - - string - - - - - - - - - None - - - - - - - - - - - - - None or System.Boolean - - - - - - - - - - - - - - - - - - - - -------------------------- Example 1: Delete a subscription -------------------------- - - PS C:\> - - PS C:\> C:\PS> Remove-AzureSubscription -SubscriptionName Test - - Confirm - Are you sure you want to perform this action? - [Y] Yes [A] Yes to All [N] No [L] No to All [S] Suspend [?] Help (default is "Y"): - - This command deletes the "Test" subscription from the default subscription data file. - - - - - - - - - - - - - - -------------------------- Example 2: Delete from an alternate subscription data file -------------------------- - - PS C:\> - - PS C:\> C:\PS> Remove-AzureSubscription -SubscriptionName Test -SubscriptionDataFile C:\Subs\MySubscriptions.xml -Force - - This command deletes the Test subscription from the MySubscriptions.xml subscription data file. The command uses the Force parameter to suppress the confirmation prompt. - - - - - - - - - - - - - - -------------------------- Example 3: Delete a subscription in a script -------------------------- - - PS C:\> - - PS C:\> C:\PS> ...if (Remove-AzureSubscription -SubscriptionName Test -PassThru) {...} - - This command uses the Remove-AzureSubscription command in an If statement. It uses the PassThru parameter, which returns a Boolean value, to determine whether the script block in the If statement is executed. - - - - - - - - - - - - - - - - Online Version: - http://go.microsoft.com/fwlink/?LinkID=397627 - - - Get-AzureSubscription - - - - Select-AzureSubscription - - - - Set-AzureSubscription - - - - - - - - Select-AzureProfile - - Select the active profile for the current PowerShell session. - - - - - Select - AzureProfile - - - - Select the active profile for the current PowerShell session. A Profile is a container for subscriptions and associated credentials used to authenticate Microsoft Azure PowerShell cmdlets with Microsoft Azure services. - Any cmdlets executed in the current session will use the selected Profile until the window is closed or another Select-AzureProfile cmdlet is executed. - - - - Select-AzureProfile - - Profile - - The profile to select as the active Profile for the session. All cmdlets subsequently executed in the session will use the subscriptions contained in this Profile for authenticating with Microsoft Azure - - AzureProfile - - - - Select-AzureProfile - - Default - - Select the default on-disk profile as the active profile for the session. All subsequent cmdlets executed in the session will use the default on-disk Profile - - SwitchParameter - - - - - - Profile - - The profile to select as the active Profile for the session. All cmdlets subsequently executed in the session will use the subscriptions contained in this Profile for authenticating with Microsoft Azure - - AzureProfile - - AzureProfile - - - - - - Default - - Select the default on-disk profile as the active profile for the session. All subsequent cmdlets executed in the session will use the default on-disk Profile - - SwitchParameter - - SwitchParameter - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + @@ -3404,255 +1649,70 @@ - Select-AzureSubscription + Save-AzureRMProfile - Changes the current and default Azure subscriptions + Save the current authentication information for use in other PowerShell sessions. - Select - AzureSubscription + Save + AzureRMProfile - The Select-AzureSubscription cmdlet sets and clears the current and default Azure subscriptions. - The "current subscription" is the subscription that is used by default in the current Windows PowerShell session. The "default subscription" is used by default in all Windows PowerShell sessions. The "current subscription" label lets you specify a different subscription to be used by default for the current session without changing the "default subscription" for all other sessions. - The "default" subscription designation is saved in your subscription data file. The session-specific "current" designation is not saved. + Save the current authentication information for use in other PowerShell sessions. - Select-AzureSubscription - - SubscriptionName - - Specifies the subscription to change. Enter the subscription name. This parameter value is case-sensitive. Wildcard characters are not permitted. - - String - - - Account - - Specifies optionally the account to use with the subscription. This parameter value is case-sensitive. Wildcard characters are not permitted. - - String - - - Current - - Sets the "current" subscription. Use the SubscriptionName parameter to identify the subscription.The "current subscription" is the subscription that is used by default in the current Windows PowerShell session. - - SwitchParameter - - - PassThru - - Returns True ($true) when the operation succeeds and False ($false) when it fails. By default, this cmdlet does not return any output. - - SwitchParameter - - - Profile - - The Profile to select the default subscription in. The default subscription in a profile is the subscription that is used when that profile is active in the current session. If not specified, selects the default subscription in the default (on disk) profile. - - AzureProfile - - - - Select-AzureSubscription - - SubscriptionName - - Specifies the subscription to change. Enter the subscription name. This parameter value is case-sensitive. Wildcard characters are not permitted. - - String - - - Account - - Specifies optionally the account to use with the subscription. This parameter value is case-sensitive. Wildcard characters are not permitted. - - String - - - Default - - Sets the "default" subscription. Use the SubscriptionName parameter to identify the subscription.The "default subscription" is the subscription that is used by default in the all Windows PowerShell sessions, unless a different subscription is set to "current". - - SwitchParameter - - - PassThru - - Returns True ($true) when the operation succeeds and False ($false) when it fails. By default, this cmdlet does not return any output. - - SwitchParameter - - - Profile - - The Profile to select the default subscription in. The default subscription in a profile is the subscription that is used when that profile is active in the current session. If not specified, selects the default subscription in the default (on disk) profile. - - AzureProfile - - - - Select-AzureSubscription - - SubscriptionId - - Specifies the subscription Id to change. Enter the subscription Id. - - String - - - Account - - Specifies optionally the account to use with the subscription. This parameter value is case-sensitive. Wildcard characters are not permitted. - - String - - - Current - - Sets the "current" subscription. Use the SubscriptionName parameter to identify the subscription.The "current subscription" is the subscription that is used by default in the current Windows PowerShell session. - - SwitchParameter - - - PassThru - - Returns True ($true) when the operation succeeds and False ($false) when it fails. By default, this cmdlet does not return any output. - - SwitchParameter - - - Profile - - The Profile to select the default subscription in. The default subscription in a profile is the subscription that is used when that profile is active in the current session. If not specified, selects the default subscription in the default (on disk) profile. - - AzureProfile - - - - Select-AzureSubscription - - SubscriptionId - - Specifies the subscription Id to change. Enter the subscription Id. - - String - - - Account - - Specifies optionally the account to use with the subscription. This parameter value is case-sensitive. Wildcard characters are not permitted. - - String - - - Default - - Sets the "default" subscription. Use the SubscriptionName parameter to identify the subscription.The "default subscription" is the subscription that is used by default in the all Windows PowerShell sessions, unless a different subscription is set to "current". - - SwitchParameter - - - PassThru - - Returns True ($true) when the operation succeeds and False ($false) when it fails. By default, this cmdlet does not return any output. - - SwitchParameter - - - Profile - - The Profile to select the default subscription in. The default subscription in a profile is the subscription that is used when that profile is active in the current session. If not specified, selects the default subscription in the default (on disk) profile. - - AzureProfile - - - - Select-AzureSubscription - - Account - - Specifies optionally the account to use with the subscription. This parameter value is case-sensitive. Wildcard characters are not permitted. - - String - - - NoCurrent - - Clears the "current" subscription setting. When no subscription is set to "current," the Azure PowerShell cmdlets use the default subscription. - - SwitchParameter - - - PassThru - - Returns True ($true) when the operation succeeds and False ($false) when it fails. By default, this cmdlet does not return any output. - - SwitchParameter - - + Save-AzureRMProfile + Profile - The Profile to select the default subscription in. The default subscription in a profile is the subscription that is used when that profile is active in the current session. If not specified, selects the default subscription in the default (on disk) profile. + If provided, saves the given profile to the provided path. If no profile is provided, the currently active profile will be saved. - AzureProfile + AzureRMProfile - - - Select-AzureSubscription - - Account + + Path - Specifies optionally the account to use with the subscription. This parameter value is case-sensitive. Wildcard characters are not permitted. + The full path of the file to save authentication information to. String - - NoDefault - - Clears the "default" subscription setting. If there is no default subscription, the current subscription is used by default. When there is no current or default subscription, and you do not identify a subscription, commands that require a subscription fail. - - SwitchParameter - - PassThru + InformationAction - Returns True ($true) when the operation succeeds and False ($false) when it fails. By default, this cmdlet does not return any output. + - SwitchParameter + ActionPreference - Profile + InformationVariable - The Profile to select the default subscription in. The default subscription in a profile is the subscription that is used when that profile is active in the current session. If not specified, selects the default subscription in the default (on disk) profile. + - AzureProfile + String - - SubscriptionName + + Profile - Specifies the subscription to change. Enter the subscription name. This parameter value is case-sensitive. Wildcard characters are not permitted. + If provided, saves the given profile to the provided path. If no profile is provided, the currently active profile will be saved. - String + AzureRMProfile - String + AzureRMProfile - - Account + + Path - Specifies optionally the account to use with the subscription. This parameter value is case-sensitive. Wildcard characters are not permitted. + The full path of the file to save authentication information to. String @@ -3662,97 +1722,187 @@ - Current + InformationAction - Sets the "current" subscription. Use the SubscriptionName parameter to identify the subscription.The "current subscription" is the subscription that is used by default in the current Windows PowerShell session. + - SwitchParameter + ActionPreference - SwitchParameter + ActionPreference - PassThru + InformationVariable - Returns True ($true) when the operation succeeds and False ($false) when it fails. By default, this cmdlet does not return any output. + - SwitchParameter + String - SwitchParameter + String - - Profile - - The Profile to select the default subscription in. The default subscription in a profile is the subscription that is used when that profile is active in the current session. If not specified, selects the default subscription in the default (on disk) profile. - - AzureProfile + + + - AzureProfile - + + + - - - - Default - Sets the "default" subscription. Use the SubscriptionName parameter to identify the subscription.The "default subscription" is the subscription that is used by default in the all Windows PowerShell sessions, unless a different subscription is set to "current". + - SwitchParameter + + + + - SwitchParameter - + + + - - + + + + + + + + + + + + + + + + + + Add-AzureRmAccount + + + + Set-AzureRmContext + + + + + + + + Select-AzureRMProfile + + Load authentication information from the given file. This sets the current context and azure environment metadata used by all cmdlets in the current session. + + + + + Select + AzureRMProfile + + + + Load authentication information from the given file. This sets the current context and azure environment metadata used by all cmdlets in the current session. + + + + Select-AzureRMProfile + + Profile + + The profile to select as the current profile in the given session. + + AzureRMProfile + + + InformationAction + + + + ActionPreference + + + InformationVariable + + + + String + + + + Select-AzureRMProfile + + Path + + The path to profile information previously saved using Save-AzureRmProfile. Cmdlets executed in the current session will use this information to authenticate requests to Azure Resource Manager. + + String + + + InformationAction + + + + ActionPreference + + + InformationVariable + + + + String + + + + - SubscriptionId + Profile - Specifies the subscription Id to change. Enter the subscription Id. + The profile to select as the current profile in the given session. - String + AzureRMProfile - String + AzureRMProfile - - NoCurrent + + InformationAction - Clears the "current" subscription setting. When no subscription is set to "current," the Azure PowerShell cmdlets use the default subscription. + - SwitchParameter + ActionPreference - SwitchParameter + ActionPreference - - NoDefault + + InformationVariable - Clears the "default" subscription setting. If there is no default subscription, the current subscription is used by default. When there is no current or default subscription, and you do not identify a subscription, commands that require a subscription fail. + - SwitchParameter + String - SwitchParameter + String - - SubscriptionDataFile + + Path - [Deprecated]: The SubscriptionDataFile parameter is deprecated. This parameter will be removed in a future release. See https://github.com/Azure/azure-powershell/wiki/Proposed-Design-Stateless-Azure-Profile for a description of the upcoming mechanism for providing alternate sources of subscription information. Specifies the path to a profile file. This parameter is optional. If it is not provided, default file in the user's profile is used. + The path to profile information previously saved using Save-AzureRmProfile. Cmdlets executed in the current session will use this information to authenticate requests to Azure Resource Manager. - string + String - string + String @@ -3761,26 +1911,24 @@ - None + - - + - None or AzureSubscription if PassThru + - - + @@ -3793,301 +1941,144 @@ - - -------------------------- Example 1: Set the current subscription -------------------------- - - PS C:\> - - PS C:\> C:\PS> Select-AzureSubscription -Current -SubscriptionName ContosoEngineering - - This command makes "ContosoEngineering" the current subscription. - - - - - - - - - - - - - - -------------------------- Example 2: Set the current subscription with account -------------------------- - - PS C:\> - - PS C:\> C:\PS> Select-AzureSubscription -Current -SubscriptionName ContosoEngineering -Account user@mail.contoso.com - - This command makes "ContosoEngineering" the current subscription and user@mail.contoso.com the current user. - - - - - - - - - - - - - - -------------------------- Example 3: Set the default description -------------------------- - - PS C:\> - - PS C:\> C:\PS> Select-AzureSubscription -Default -SubscriptionName ContosoFinance -SubscriptionDataFile "C:\subs\MySubscriptions.xml" - - This command changes the default subscription to "ContosoFinance." It saves the setting in the Subscriptions.xml subscription data file, instead of the default subscription data file. - - - - - - - - - - - - - - Online Version: - http://go.microsoft.com/fwlink/?LinkID=397628 - - - Get-AzureSubscription - - - - Remove-AzureSubscription - - - - Set-AzureSubscription - - - Set-AzureEnvironment + Set-AzureRMContext - Changes the properties of an Azure environment + Set the tenant, subscription, and environment to be used by cmdlets in this session. Set - AzureEnvironment + AzureRMContext - This is the Description section - The Set-AzureEnvironment cmdlet changes the properties of an Azure environment. It returns an object that represents the environment with its new property values. Use the Name parameter to identify the environment and the other parameters to change property values. You cannot use Set-AzureEnvironment to change the name of an Azure environment.An Azure environment an independent deployment of Microsoft Azure, such as AzureCloud for global Azure and AzureChinaCloud for Azure operated by 21Vianet in China. You can also create on-premises Azure environments by using Azure Pack and the WAPack cmdlets. For more information, see Azure Pack (http://www.microsoft.com/en-us/server-cloud/products/windows-azure-pack/default.aspx).NOTE: Do not change the properties of the AzureCloud or AzureChinaCloud environments. Use this cmdlet to change the values of private environments that you create. + Set authentication information for cmdlets executed in the current session. Includes subscription, tenant, and environment information. - Set-AzureEnvironment - - Name + Set-AzureRMContext + + TenantId - Identifies the environment that is being changed. This parameter is required. The parameter value is case-sensitive. Wildcard characters are not permitted. + The tenant for Azure Resource Manager cmdlets to target. String - - PublishSettingsFileUrl + + SubscriptionId - Changes the URL for publish settings files in the specified environment. An Azure publish settings file is an XML file that contains information about your account and a management certificate that allows Windows PowerShell to sign into your Azure account on your behalf. + The Subscription Id for executed cmdlets to use. String - - ServiceEndpoint + + InformationAction - Changes the URL of the Azure service endpoint in the specified environment. The Azure service endpoint determines whether your application is managed by the global Azure platform, Azure operated by 21Vianet in China, or a private Azure installation. + - String + ActionPreference - - ManagementPortalUrl + + InformationVariable - Changes the URL of the Azure Management Portal to the specified value. + String - - StorageEndpoint + + + Set-AzureRMContext + + TenantId - Changes the default endpoint of storage services in the specified environment. + The tenant for Azure Resource Manager cmdlets to target. String - - ActiveDirectoryEndpoint + + InformationAction - Changes the endpoint for Azure Active Directory authentication to the specified value. + - String + ActionPreference - - ResourceManagerEndpoint + + InformationVariable - Changes the endpoint for Azure Resource Manager data, including data about resource groups associated with the account. For more information about Azure Resource Manager, see Azure Resource Manager Cmdlets (http://go.microsoft.com/fwlink/?LinkID=394765) and Using Windows PowerShell with Resource Manager (http://go.microsoft.com/fwlink/?LinkID=394767). + String - - GalleryEndpoint + + + Set-AzureRMContext + + SubscriptionId - Changes the endpoint for the Azure Resource Manager gallery to the specified value. The gallery endpoint is the location for resource group gallery templates. For more information about Azure resource groups and gallery templates, see the help topic for Get-AzureResourceGroupGalleryTemplate. + The Subscription Id for executed cmdlets to use. String - - ActiveDirectoryServiceEndpointResourceId + + InformationAction - Specifies the resource ID of a management API whose access is managed by Azure Active Directory. + - String + ActionPreference - - GraphEndpoint + + InformationVariable - Changes the endpoint for Azure Active Directory Graph API to the specified value. + String - - AzureKeyVaultDnsSuffix + + + Set-AzureRMContext + + Tenant + + The tenant to taret in this session. + + AzureTenant + + + Subscription - The dns suffix used by KeyValut endpoints in the environment. + The subscription to target in this session. - String + AzureSubscription - - AzureKeyVaultServiceEndpointResourceId + + InformationAction - The audience used when acquiring tokens for use with the KeyValut service in this environment. + - String + ActionPreference - Profile + InformationVariable - The Profile to set environment details in. If not specified, sets environment details in the default (on disk) profile. + - AzureProfile + String - - Name - - Identifies the environment that is being changed. This parameter is required. The parameter value is case-sensitive. Wildcard characters are not permitted. - - String - - String - - - - - - PublishSettingsFileUrl - - Changes the URL for publish settings files in the specified environment. An Azure publish settings file is an XML file that contains information about your account and a management certificate that allows Windows PowerShell to sign into your Azure account on your behalf. - - String - - String - - - - - - ServiceEndpoint - - Changes the URL of the Azure service endpoint in the specified environment. The Azure service endpoint determines whether your application is managed by the global Azure platform, Azure operated by 21Vianet in China, or a private Azure installation. - - String - - String - - - - - - ManagementPortalUrl - - Changes the URL of the Azure Management Portal to the specified value. - - String - - String - - - - - - StorageEndpoint - - Changes the default endpoint of storage services in the specified environment. - - String - - String - - - - - - ActiveDirectoryEndpoint - - Changes the endpoint for Azure Active Directory authentication to the specified value. - - String - - String - - - - - - ResourceManagerEndpoint - - Changes the endpoint for Azure Resource Manager data, including data about resource groups associated with the account. For more information about Azure Resource Manager, see Azure Resource Manager Cmdlets (http://go.microsoft.com/fwlink/?LinkID=394765) and Using Windows PowerShell with Resource Manager (http://go.microsoft.com/fwlink/?LinkID=394767). - - String - - String - - - - - - GalleryEndpoint - - Changes the endpoint for the Azure Resource Manager gallery to the specified value. The gallery endpoint is the location for resource group gallery templates. For more information about Azure resource groups and gallery templates, see the help topic for Get-AzureResourceGroupGalleryTemplate. - - String - - String - - - - - - ActiveDirectoryServiceEndpointResourceId + + TenantId - Specifies the resource ID of a management API whose access is managed by Azure Active Directory. + The tenant for Azure Resource Manager cmdlets to target. String @@ -4096,10 +2087,10 @@ - - GraphEndpoint + + SubscriptionId - Changes the endpoint for Azure Active Directory Graph API to the specified value. + The Subscription Id for executed cmdlets to use. String @@ -4108,22 +2099,22 @@ - - AzureKeyVaultDnsSuffix + + InformationAction - The dns suffix used by KeyValut endpoints in the environment. + - String + ActionPreference - String + ActionPreference - - AzureKeyVaultServiceEndpointResourceId + + InformationVariable - The audience used when acquiring tokens for use with the KeyValut service in this environment. + String @@ -4132,26 +2123,26 @@ - - Profile + + Tenant - The Profile to set environment details in. If not specified, sets environment details in the default (on disk) profile. + The tenant to taret in this session. - AzureProfile + AzureTenant - AzureProfile + AzureTenant - - SubscriptionDataFile + + Subscription - [Deprecated]: The SubscriptionDataFile parameter is deprecated. This parameter will be removed in a future release. See https://github.com/Azure/azure-powershell/wiki/Proposed-Design-Stateless-Azure-Profile for a description of the upcoming mechanism for providing alternate sources of subscription information. Specifies the path to a profile file. This parameter is optional. If it is not provided, default file in the user's profile is used. + The subscription to target in this session. - string + AzureSubscription - string + AzureSubscription @@ -4160,26 +2151,24 @@ - None + - - + - Microsoft.WindowsAzure.Commands.Utilities.Common.WindowsAzureEnvironment + - - + @@ -4193,16 +2182,19 @@ - -------------------------- Example 1: Change environment properties -------------------------- + -------------------------- Select a subscription -------------------------- PS C:\> - PS C:\>Set-AzureEnvironment -Name ContosoEnv -PublishSettingsFileUrl "https://contoso.com" -StorageEndpoint "contoso.com" -GraphEndpoint "https://contoso.com/fwlink/?LinkID=104" + Set-AzureRmContext -SubscriptionId xxxx-xxxx-xxxx-xxxx - This command changes the values of the PublishSettingsFileUrl, StorageEndpoint, and GraphEndpoint properties of the ContosoEnv environment. + Select the given subscription. - + Account: user@contoso.com +Environment: AzureCloud +Subscription: xxxx-xxxx-xxxx-xxxx +Tenant: yyyy-yyyy-yyyy-yyyy @@ -4215,19 +2207,11 @@ - Online Version: - http://go.microsoft.com/fwlink/?LinkID=397629 - - - Add-AzureEnvironment - - - - Get-AzureEnvironment + Get-AzureRmContext - Remove-AzureEnvironment + Login-AzureRmAccount @@ -4235,213 +2219,192 @@ - Set-AzureSubscription + Set-AzureRmEnvironment - Creates or changes an Azure subscription + Set properties for the given Azure instance. Set - AzureSubscription + AzureRmEnvironment - The Set-AzureSubscription cmdlet establishes and changes the properties of an Azure subscription. You can use this cmdlet to create a new subscription or change the properties of an existing subscription. - To create a new subscription, select a unique name for the value of the SubscriptionName parameter. To change an existing subscription, use the SubscriptionName parameter to identify the subscription. - This cmdlet changes the data in the subscription data file that you create when you use the Add-AzureAccount or Import-AzurePublishSettingsFile cmdlet to add an Azure account to Windows PowerShell. + Set endpoints and metadata for connecting to the given Azure instance. - Set-AzureSubscription + Set-AzureRmEnvironment - SubscriptionName + Name - Specifies the subscription name. If an Azure subscription with this name does not exist, this parameter creates a new subscription with the specified name. If the subscription exists, this parameter identifies the subscription and uses the other property values to change it.To get the names of existing Azure subscriptions, use the Get-AzureSubscription cmdlet. + String - - SubscriptionId + + PublishSettingsFileUrl - Specifies the ID of the subscription. To get the subscription ID of an existing Azure subscription, use the Get-AzureSubscription cmdlet. + The url where PublishSettings files may be downloaded. String - - Certificate - - Specifies a management certificate for the subscription. Management certificates are X.509 certificates that are saved as .cer files and uploaded to the Azure Management Portal. The certificate, including its private key, must be installed on the local computer, either in the current user's personal certificate store, or the local machine’s personal certificate store. - - X509Certificate2 - - + ServiceEndpoint - Sets or changes the custom service endpoint for the management service to the specified value.The service endpoint is the Azure management API endpoint in the Azure environment. You can create custom service endpoints and set a different service endpoint for each subscription. + The endpoint for Service Management (RDFE) requests. String - - ResourceManagerEndpoint + + ManagementPortalUrl - Sets or changes the endpoint for Azure Resource Manager data to the specified value.For more information about Azure Resource Manager, see Azure Resource Manager Cmdlets (http://go.microsoft.com/fwlink/?LinkID=394765) and Using Windows PowerShell with Resource Manager (http://go.microsoft.com/fwlink/?LinkID=394767). + The url for the management portal. String - - CurrentStorageAccountName + + StorageEndpoint - Designates the specified storage account as the "current" storage account for the subscription. Enter the storage account name. The parameter value is case-sensitive. Wildcard characters are not permitted.This parameter does not create a storage account; it just associates the storage account with the subscription. To create a storage account, use the New-AzureStorageAccount cmdlet. + The endpoint for storage (blob, table, queue, file) access. String - - Environment + + ActiveDirectoryEndpoint - Specifies the environment name. + The base authority for Azure Active Directory authentication. String - - PassThru - - Returns True ($true) if the operation succeeds and False ($false) if it fails. By default, this cmdlet does not return any output. - - SwitchParameter - - - Profile - - The Profile to set subscription details in. If not specified, sets subscription details in the default (on disk) profile. - - AzureProfile - - - - Set-AzureSubscription - - SubscriptionName + + ResourceManagerEndpoint - Specifies the subscription name. If an Azure subscription with this name does not exist, this parameter creates a new subscription with the specified name. If the subscription exists, this parameter identifies the subscription and uses the other property values to change it.To get the names of existing Azure subscriptions, use the Get-AzureSubscription cmdlet. + The Url for Azure Resource Manager requests. String - - Certificate - - Specifies a management certificate for the subscription. Management certificates are X.509 certificates that are saved as .cer files and uploaded to the Azure Management Portal. The certificate, including its private key, must be installed on the local computer, either in the current user's personal certificate store, or the local machine’s personal certificate store. - - X509Certificate2 - - - ServiceEndpoint + + GalleryEndpoint - Sets or changes the custom service endpoint for the management service to the specified value.The service endpoint is the Azure management API endpoint in the Azure environment. You can create custom service endpoints and set a different service endpoint for each subscription. + The endpoint for Azure Resource Manager gallery of deployment templates. String - - ResourceManagerEndpoint + + ActiveDirectoryServiceEndpointResourceId - Sets or changes the endpoint for Azure Resource Manager data to the specified value.For more information about Azure Resource Manager, see Azure Resource Manager Cmdlets (http://go.microsoft.com/fwlink/?LinkID=394765) and Using Windows PowerShell with Resource Manager (http://go.microsoft.com/fwlink/?LinkID=394767). + The audience for tokens that authenticate requests to Azure Resource Manager or Service Management (RDFE) endpoints. String - - CurrentStorageAccountName + + GraphEndpoint - Designates the specified storage account as the "current" storage account for the subscription. Enter the storage account name. The parameter value is case-sensitive. Wildcard characters are not permitted.This parameter does not create a storage account; it just associates the storage account with the subscription. To create a storage account, use the New-AzureStorageAccount cmdlet. + The url for graph (Active Directory metadata) requests. String - - Environment + + AzureKeyVaultDnsSuffix - Specifies the environment name. + The domain name suffix for Key Vault services. String - - PassThru - - Returns True ($true) if the operation succeeds and False ($false) if it fails. By default, this cmdlet does not return any output. - - SwitchParameter - - - Profile - - The Profile to set subscription details in. If not specified, sets subscription details in the default (on disk) profile. - - AzureProfile - - - - Set-AzureSubscription - - SubscriptionId + + AzureKeyVaultServiceEndpointResourceId - Specifies the ID of the subscription. To get the subscription ID of an existing Azure subscription, use the Get-AzureSubscription cmdlet. + The audience for access tokens that authorize requests for Key Vault services. String - - Certificate - - Specifies a management certificate for the subscription. Management certificates are X.509 certificates that are saved as .cer files and uploaded to the Azure Management Portal. The certificate, including its private key, must be installed on the local computer, either in the current user's personal certificate store, or the local machine’s personal certificate store. - - X509Certificate2 - - - ServiceEndpoint + + TrafficManagerDnsSuffix - Sets or changes the custom service endpoint for the management service to the specified value.The service endpoint is the Azure management API endpoint in the Azure environment. You can create custom service endpoints and set a different service endpoint for each subscription. + The domain name suffix for Azure Traffic Manager Services. String - - ResourceManagerEndpoint + + SqlDatabaseDnsSuffix - Sets or changes the endpoint for Azure Resource Manager data to the specified value.For more information about Azure Resource Manager, see Azure Resource Manager Cmdlets (http://go.microsoft.com/fwlink/?LinkID=394765) and Using Windows PowerShell with Resource Manager (http://go.microsoft.com/fwlink/?LinkID=394767). + The domain name suffix for Azure Sql database servers. String - - CurrentStorageAccountName + + EnableAdfsAuthentication - Designates the specified storage account as the "current" storage account for the subscription. Enter the storage account name. The parameter value is case-sensitive. Wildcard characters are not permitted.This parameter does not create a storage account; it just associates the storage account with the subscription. To create a storage account, use the New-AzureStorageAccount cmdlet. + Indicates whether ADFS (on premise) authentication is allowed. - String + SwitchParameter - - Environment + + AdTenant - Specifies the environment name. + The default Active Direcotyr Tenant. String - PassThru + InformationAction - Returns True ($true) if the operation succeeds and False ($false) if it fails. By default, this cmdlet does not return any output. + - SwitchParameter + ActionPreference - Profile + InformationVariable - The Profile to set subscription details in. If not specified, sets subscription details in the default (on disk) profile. + - AzureProfile + String - SubscriptionName + Name + + + + String + + String + + + + + + PublishSettingsFileUrl + + The url where PublishSettings files may be downloaded. + + String + + String + + + + + + ServiceEndpoint + + The endpoint for Service Management (RDFE) requests. + + String + + String + + + + + + ManagementPortalUrl - Specifies the subscription name. If an Azure subscription with this name does not exist, this parameter creates a new subscription with the specified name. If the subscription exists, this parameter identifies the subscription and uses the other property values to change it.To get the names of existing Azure subscriptions, use the Get-AzureSubscription cmdlet. + The url for the management portal. String @@ -4450,10 +2413,10 @@ - - SubscriptionId + + StorageEndpoint - Specifies the ID of the subscription. To get the subscription ID of an existing Azure subscription, use the Get-AzureSubscription cmdlet. + The endpoint for storage (blob, table, queue, file) access. String @@ -4462,22 +2425,22 @@ - - Certificate + + ActiveDirectoryEndpoint - Specifies a management certificate for the subscription. Management certificates are X.509 certificates that are saved as .cer files and uploaded to the Azure Management Portal. The certificate, including its private key, must be installed on the local computer, either in the current user's personal certificate store, or the local machine’s personal certificate store. + The base authority for Azure Active Directory authentication. - X509Certificate2 + String - X509Certificate2 + String - - ServiceEndpoint + + ResourceManagerEndpoint - Sets or changes the custom service endpoint for the management service to the specified value.The service endpoint is the Azure management API endpoint in the Azure environment. You can create custom service endpoints and set a different service endpoint for each subscription. + The Url for Azure Resource Manager requests. String @@ -4486,10 +2449,10 @@ - - ResourceManagerEndpoint + + GalleryEndpoint - Sets or changes the endpoint for Azure Resource Manager data to the specified value.For more information about Azure Resource Manager, see Azure Resource Manager Cmdlets (http://go.microsoft.com/fwlink/?LinkID=394765) and Using Windows PowerShell with Resource Manager (http://go.microsoft.com/fwlink/?LinkID=394767). + The endpoint for Azure Resource Manager gallery of deployment templates. String @@ -4498,10 +2461,10 @@ - - CurrentStorageAccountName + + ActiveDirectoryServiceEndpointResourceId - Designates the specified storage account as the "current" storage account for the subscription. Enter the storage account name. The parameter value is case-sensitive. Wildcard characters are not permitted.This parameter does not create a storage account; it just associates the storage account with the subscription. To create a storage account, use the New-AzureStorageAccount cmdlet. + The audience for tokens that authenticate requests to Azure Resource Manager or Service Management (RDFE) endpoints. String @@ -4510,10 +2473,10 @@ - - Environment + + GraphEndpoint - Specifies the environment name. + The url for graph (Active Directory metadata) requests. String @@ -4522,259 +2485,70 @@ - - PassThru + + AzureKeyVaultDnsSuffix - Returns True ($true) if the operation succeeds and False ($false) if it fails. By default, this cmdlet does not return any output. + The domain name suffix for Key Vault services. - SwitchParameter + String - SwitchParameter + String - - Profile + + AzureKeyVaultServiceEndpointResourceId - The Profile to set subscription details in. If not specified, sets subscription details in the default (on disk) profile. + The audience for access tokens that authorize requests for Key Vault services. - AzureProfile + String - AzureProfile + String - - SubscriptionDataFile + + TrafficManagerDnsSuffix - [Deprecated]: The SubscriptionDataFile parameter is deprecated. This parameter will be removed in a future release. See https://github.com/Azure/azure-powershell/wiki/Proposed-Design-Stateless-Azure-Profile for a description of the upcoming mechanism for providing alternate sources of subscription information. Specifies the path to a profile file. This parameter is optional. If it is not provided, default file in the user's profile is used. + The domain name suffix for Azure Traffic Manager Services. - string + String - string + String - - - - - None - - - + + SqlDatabaseDnsSuffix - - + The domain name suffix for Azure Sql database servers. - - - - + String - None or System.Boolean - - + String + + + + + EnableAdfsAuthentication - - + Indicates whether ADFS (on premise) authentication is allowed. - - - - - - - - - - - - - -------------------------- Example 1: Create a new subscription -------------------------- - - PS C:\> - - PS C:\>$thumbprint = <Certificate Thumbprint> - PS C:\>$myCert = Get-Item cert:\\CurrentUser\My\$thumbprint - PS C:\>Set-AzureSubscription -SubscriptionName ContosotTest -Certificate $myCert -SubscriptionID 12345 - - These commands create the ContosoTest subscription in the default subscription data file. The commands add a management certificate and subscription ID for the new subscription. - - - When you run the Set-AzureSubscription command, the cmdlet looks for a subscription with the name "ContosoTest". If it doesn't find one, it creates a new subscription with the specified values. - - - - - - - - - - - -------------------------- Example 2: Change an existing subscription -------------------------- - - PS C:\> - - PS C:\> C:\PS> $thumbprint = <Thumbprint-2> - C:\PS> $differentCert = Get-Item cert:\\CurrentUser\My\$thumbprint - C:\PS> Set-AzureSubscription –SubscriptionName ContosoEngineering -Certificate $differentCert - - These commands are very similar to the commands in Example 1. However, because the SubscriptionName parameter now identifies an existing subscription, Set-AzureSubscription uses the remaining parameters to change the values of the existing subscription rather than creating a new subscription - - - - - - - - - - - - - - -------------------------- Example 2: Change the service endpoint -------------------------- - - PS C:\> - - PS C:\> C:\PS> Set-AzureSubscription –SubscriptionName ContosoEngineering -ServiceEndpoint "https://management.core.contoso.com" - - This command adds or changes a custom service endpoint for the ContosoEngineering subscription. - - - - - - - - - - - - - - -------------------------- Example 3: Clear property values -------------------------- - - PS C:\> - - PS C:\> C:\PS> Set-AzureSubscription –SubscriptionName ContosoEngineering –Certificate $null -ResourceManagerEndpoint $null - - This command sets the values of the Certificate and ResourceManagerEndpoint properties to null ($null). This clears the values of those properties without changing other settings. - - - - - - - - - - - - - - -------------------------- Example 4: Use an alternate subscription data file -------------------------- - - PS C:\> - - PS C:\> C:\PS> Set-AzureSubscription -SubscriptionName ContosoFinance -SubscriptionDataFile = C:\Azure\SubscriptionData.xml - CurrentStorageAccount ContosoStorage01 - - This command changes the current storage account of the ContosoFinance subscription to ContosoStorage01. The command uses the SubscriptionDataFile parameter to change the data in the C:\Azure\SubscriptionData.xml subscription data file. By default, Set-AzureSubscription uses the default subscription data file in your roaming user profile. - - - - - - - - - - - - - - - - Online Version: - http://go.microsoft.com/fwlink/?LinkID=397630 - - - Add-AzureAccount - - - - Get-AzureSubscription - - - - Import-AzurePublishSettingsFile - - - - Remove-AzureSubscription - - - - Select-AzureSubscription - - - - - - - - Switch-AzureMode - - Switches between the Azure and Azure Resource Manager modules - - - - - Switch - AzureMode - - - - This is the Description section - The Switch-AzureMode cmdlet switches between the Azure and Azure Resource Manager (AzureResourceManager) modules. These modules are not designed to be used in the same session. To determine which module is in your current session, use the Get-Module cmdlet.NOTE: The AzureResourceManager module is currently in preview. It might not provide the same management capabilities as the Azure module. Beginning in version 0.8,0, the Azure PowerShell installation includes both Azure modules and Azure Profile, a module of commands common to both modules. When you use the Azure PowerShell cmdlets, the Azure and Azure Profile modules are imported into the session by default. To remove the Azure module from the session and import the Azure Resource Manager module, use Switch-AzureMode. And, to switch back to the Azure module, just use Switch-AzureMode again. The Azure module includes cmdlets that help you to manage your Azure account in the traditional way. The cmdlets get, create, change, and remove individual resources such as storage accounts, virtual machines, SQL databases, web sites, media services, and cloud services.The new Azure Resource Manager module lets you manage your resources in an entirely new way. Instead of creating individual resources and trying to use them together, begin by imagining the service you want to create, such as a web portal, a blog, a photo gallery, a commerce site, or a wiki. Select a resource group template, including one of dozens in the Azure template gallery, or create your own. Each template provides a model of a complex service, complete with the resources that you need to support the service. Then use the template to create a resource group and its resources, and deploy and manage the related resources as a unit.You can use Switch-AzureMode to switch between Azure modules as often as you like. To set an Azure module as the default for all sessions, use the Global parameter when switching between modes. - - - - Switch-AzureMode - - Name - - Switches to the specified module. To switch to the Azure Resource Manager module, type AzureResourceManager. To switch to the Azure module, type AzureServiceManagement. This parameter is required. - - String - - - Global - - Switches all Windows PowerShell session to the specified Azure module. Use this parameter to save your module selection for other sessions. This parameter is optional. By default, the switch affects only the current session.This parameter requires administrator permissions. To use this parameter, start Windows PowerShell with the "Run as administrator" option. - - SwitchParameter - - - Profile - - - - AzureProfile - - - - - - Name + SwitchParameter + + SwitchParameter + + + + + + AdTenant - Switches to the specified module. To switch to the Azure Resource Manager module, type AzureResourceManager. To switch to the Azure module, type AzureServiceManagement. This parameter is required. + The default Active Direcotyr Tenant. String @@ -4783,26 +2557,26 @@ - - Global + + InformationAction - Switches all Windows PowerShell session to the specified Azure module. Use this parameter to save your module selection for other sessions. This parameter is optional. By default, the switch affects only the current session.This parameter requires administrator permissions. To use this parameter, start Windows PowerShell with the "Run as administrator" option. + - SwitchParameter + ActionPreference - SwitchParameter + ActionPreference - Profile + InformationVariable - AzureProfile + String - AzureProfile + String @@ -4811,26 +2585,24 @@ - None + - - + - None + - - + @@ -4843,63 +2615,22 @@ - - -------------------------- Example 1: Switch to the Azure Resource Manager module -------------------------- - - PS C:\> - - PS C:\>Switch-AzureMode -Name AzureResourceManager - PS C:\>Switch-AzureMode -Name AzureServiceManagement - - This command shows you how to switch between modules. The first command uses the Switch-AzureMode cmdlet to switch to the Azure Resource Manager module. The second command uses the Switch-AzureMode cmdlet to switch back to the Azure module. - - - When you import either module, the AzureProfile module, which includes commands common to both modules, including Add-AzureAccount, Get-AzureSubscription, and Switch-AzureMode, is imported, too. - - - - - - - - - - - -------------------------- Example 2: Switch all sessions to the Azure Resource Manager module -------------------------- - - PS C:\> - - PS C:\>Switch-AzureMode -Name AzureResourceManager -Global - - This command uses the Global parameter of Switch-AzureMode to switch all Microsoft Azure PowerShell sessions to the Azure Resource Manager module. If you close this session and open an new one, the Azure Resource Manager module is imported by default. - - - The Global parameter requires administrator permissions. To run this command, start Windows PowerShell with the "Run as administrator" option. - - - - - - - - - - Online Version: - http://go.microsoft.com/fwlink/?LinkID=394398 + Add-AzureRmEnvironment + - Azure Resource Manager Cmdlets + Get-AzureRmEnvironment - Azure Service Management Cmdlets + Remove-AzureRmEnvironment - Azure Profile Cmdlets + diff --git a/src/ResourceManager/Profile/Commands.Profile/Microsoft.Azure.Commands.Profile.format.ps1xml b/src/ResourceManager/Profile/Commands.Profile/Microsoft.Azure.Commands.Profile.format.ps1xml index b34dcf874e8b..1de33501915d 100644 --- a/src/ResourceManager/Profile/Commands.Profile/Microsoft.Azure.Commands.Profile.format.ps1xml +++ b/src/ResourceManager/Profile/Commands.Profile/Microsoft.Azure.Commands.Profile.format.ps1xml @@ -2,47 +2,103 @@ - Microsoft.Azure.Common.Authentication.Models.PSAzureAccount + Microsoft.Azure.Commands.Profile.Models.PSAzureProfile - Microsoft.Azure.Common.Authentication.Models.PSAzureAccount + Microsoft.Azure.Commands.Profile.Models.PSAzureProfile - - - - - 30 - - - - 10 - - - - - - - - - - - - - - Id - - - Type - - - Subscriptions - - - Tenants - - - - - + + + + + + + $_.Context.Environment.ToString() + + + + $_.Context.Account.ToString() + + + + $_.Context.Tenant.ToString() + + + + $_.Context.Subscription.ToString() + + + + + + + + Microsoft.Azure.Commands.Profile.Models.PSAzureContext + + Microsoft.Azure.Commands.Profile.Models.PSAzureContext + + + + + + + Environment + + + Account + + + Tenant + + + Subscription + + + + + + + + Microsoft.Azure.Commands.Profile.Models.PSAzureSubscription + + Microsoft.Azure.Commands.Profile.Models.PSAzureSubscription + + + + + + + SubscriptionName + + + SubscriptionId + + + TenantId + + + + + + + + Microsoft.Azure.Commands.Profile.Models.PSAzureTenant + + Microsoft.Azure.Commands.Profile.Models.PSAzureTenant + + + + + + + TenantId + + + Domain + + + + + diff --git a/src/ResourceManager/Profile/Commands.Profile/Models/PSAzureAccount.cs b/src/ResourceManager/Profile/Commands.Profile/Models/PSAzureAccount.cs new file mode 100644 index 000000000000..db37bc6769c3 --- /dev/null +++ b/src/ResourceManager/Profile/Commands.Profile/Models/PSAzureAccount.cs @@ -0,0 +1,70 @@ +// ---------------------------------------------------------------------------------- +// +// 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; +using System.Configuration; +using Microsoft.Azure.Common.Authentication.Models; +using Microsoft.Azure.Common.Authentication.Utilities; + +namespace Microsoft.Azure.Commands.Profile.Models +{ + /// + /// Azure account details. + /// + public class PSAzureAccount + { + /// + /// Convert between implementation of Azure Account metadata + /// + /// The account to convert. + /// The converted account. + public static implicit operator PSAzureAccount(AzureAccount account) + { + return new PSAzureAccount + { + Id = account != null ? account.Id : null, + AccountType = account != null? account.Type.ToString() : null + }; + } + + /// + /// Convert between implementation of Azure Account metadata + /// + /// The account to convert. + /// The converted account. + public static implicit operator AzureAccount(PSAzureAccount account) + { + return new AzureAccount + { + Id = account != null? account.Id : null, + Type = account != null? ((AzureAccount.AccountType)Enum.Parse(typeof(AzureAccount.AccountType), + account.AccountType, true)) : AzureAccount.AccountType.User + }; + } + + /// + /// The UPN or SPN for this account. + /// + public string Id { get; set; } + /// + /// The type of the account + /// + public string AccountType { get; set; } + + public override string ToString() + { + return this.Id; + } + } +} diff --git a/src/ResourceManager/Profile/Commands.Profile/Models/PSAzureContext.cs b/src/ResourceManager/Profile/Commands.Profile/Models/PSAzureContext.cs new file mode 100644 index 000000000000..6b7b0e5f72f6 --- /dev/null +++ b/src/ResourceManager/Profile/Commands.Profile/Models/PSAzureContext.cs @@ -0,0 +1,67 @@ +using System; +using System.CodeDom; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Microsoft.Azure.Common.Authentication.Models; + +namespace Microsoft.Azure.Commands.Profile.Models +{ + /// + /// The context for connecting cmdlets in the current session to Azure. + /// + public class PSAzureContext + { + /// + /// Convert between implementations of the current connection context for Azure. + /// + /// The connection context to covnert. + /// The converted context. + public static implicit operator PSAzureContext(AzureContext context) + { + return new PSAzureContext + { + Account = context != null ? context.Account : null, + Environment = context != null ? context.Environment : null, + Subscription = context != null ? context.Subscription : null, + Tenant = context != null ? context.Tenant : null, + TokenCache = context != null ? context.TokenCache : null + }; + } + + /// + /// Convert between implementations of the current connection context for Azure. + /// + /// The connection context to covnert. + /// The converted context. + public static implicit operator AzureContext(PSAzureContext context) + { + var result= new AzureContext(context != null ? context.Subscription : null, context != null ? context.Account : null, + context != null ? context.Environment : null, context != null ? context.Tenant : null); + result.TokenCache = context!= null? context.TokenCache : null; + return result; + } + + /// + /// The account used to connect to Azure. + /// + public PSAzureAccount Account { get; set; } + + /// + /// The endpoint and connection metadata for the targeted instance of the Azure cloud. + /// + public PSAzureEnvironment Environment { get; set; } + + /// + /// The subscription targeted in Azure. + /// + public PSAzureSubscription Subscription { get; set; } + + /// + /// The targeted tenant in Azure. + /// + public PSAzureTenant Tenant { get; set; } + private byte[] TokenCache { get; set; } + } +} diff --git a/src/ResourceManager/Profile/Commands.Profile/Environment/PSAzureEnvironment.cs b/src/ResourceManager/Profile/Commands.Profile/Models/PSAzureEnvironment.cs similarity index 96% rename from src/ResourceManager/Profile/Commands.Profile/Environment/PSAzureEnvironment.cs rename to src/ResourceManager/Profile/Commands.Profile/Models/PSAzureEnvironment.cs index 1c1250616102..09f31f154fd9 100644 --- a/src/ResourceManager/Profile/Commands.Profile/Environment/PSAzureEnvironment.cs +++ b/src/ResourceManager/Profile/Commands.Profile/Models/PSAzureEnvironment.cs @@ -14,7 +14,7 @@ using Microsoft.Azure.Common.Authentication.Models; -namespace Microsoft.Azure.Commands.Profile +namespace Microsoft.Azure.Commands.Profile.Models { /// /// Settings and endpoints for management of Azure or Azure Stack services. @@ -28,6 +28,11 @@ public class PSAzureEnvironment /// The internal representation of the Azure environment, as used by .Net authentication libraries. public static implicit operator AzureEnvironment(PSAzureEnvironment environment) { + if (environment == null) + { + return null; + } + var newEnvironment = new AzureEnvironment { Name = environment.Name, @@ -62,6 +67,11 @@ public static implicit operator AzureEnvironment(PSAzureEnvironment environment) /// The PowerShell;-friendly representation of the environment. public static implicit operator PSAzureEnvironment(AzureEnvironment environment) { + if (environment == null) + { + return null; + } + return new PSAzureEnvironment(environment); } @@ -157,7 +167,7 @@ public PSAzureEnvironment(AzureEnvironment environment) public string Name { get; set; } /// - /// Gets or sets a value indicating whether ADFS authentication should be allowed . + /// Gets or sets a value indicating whther ADFS authentication should be allowed . /// Generally, this is only used in Azure Stack environments. /// public bool EnableAdfsAuthentication { get; set; } @@ -218,7 +228,7 @@ public PSAzureEnvironment(AzureEnvironment environment) public string GraphUrl { get; set; } /// - /// Gets or sets the domain name suffix for traffic manager services. + /// Gets or sets the domain name suffix for traffig manager services. /// public string TrafficManagerDnsSuffix { get; set; } @@ -266,5 +276,10 @@ public override int GetHashCode() { return base.GetHashCode(); } + + public override string ToString() + { + return this.Name; + } } } diff --git a/src/ResourceManager/Profile/Commands.Profile/Models/PSAzureProfile.cs b/src/ResourceManager/Profile/Commands.Profile/Models/PSAzureProfile.cs new file mode 100644 index 000000000000..d9f2c8d5ac51 --- /dev/null +++ b/src/ResourceManager/Profile/Commands.Profile/Models/PSAzureProfile.cs @@ -0,0 +1,80 @@ +using System; +using System.CodeDom; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Microsoft.Azure.Common.Authentication.Models; +using Microsoft.WindowsAzure.Commands.Utilities.Common; + +namespace Microsoft.Azure.Commands.Profile.Models +{ + /// + /// Credential and environment data for connecting with an Azure instance in the current session. + /// + public class PSAzureProfile + { + private Dictionary _env = new Dictionary(); + + /// + /// Convert between implementations of AzureProfile. + /// + /// The profile to convert. + /// The converted profile. + public static implicit operator PSAzureProfile(AzureRMProfile profile) + { + if (profile == null) + { + return null; + } + + var result = new PSAzureProfile + { + Context = profile.Context + }; + + profile.Environments + .ForEach((e) => result.Environments.Add(e.Key, (PSAzureEnvironment)e.Value)); + return result; + } + + /// + /// Convert between implementations of AzureProfile. + /// + /// The profile to convert. + /// The converted profile. + public static implicit operator AzureRMProfile(PSAzureProfile profile) + { + if (profile == null) + { + return null; + } + + var result = new AzureRMProfile + { + Context = profile.Context + }; + profile.Environments + .ForEach((e) => result.Environments.Add(e.Key, (AzureEnvironment)e.Value)); + return result; + } + + /// + /// The set of AzureCloud environments. + /// + public IDictionary Environments + { + get { return _env; } + } + + /// + /// The current credentials and mestadata for connectiong with the current Azure cloud instance. + /// + public PSAzureContext Context { get; set; } + + public override string ToString() + { + return Context.ToString(); + } + } +} diff --git a/src/ResourceManager/Profile/Commands.Profile/Models/PSAzureSubscription.cs b/src/ResourceManager/Profile/Commands.Profile/Models/PSAzureSubscription.cs new file mode 100644 index 000000000000..09024b3c380e --- /dev/null +++ b/src/ResourceManager/Profile/Commands.Profile/Models/PSAzureSubscription.cs @@ -0,0 +1,97 @@ +// ---------------------------------------------------------------------------------- +// +// 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; +using System.Configuration; +using Microsoft.Azure.Common.Authentication.Models; +using Microsoft.Azure.Common.Authentication.Utilities; + +namespace Microsoft.Azure.Commands.Profile.Models +{ + /// + /// Azure subscription details. + /// + public class PSAzureSubscription + { + /// + /// Convert between formats of AzureSubscription information. + /// + /// The subscription to convert. + /// The converted subscription. + public static implicit operator PSAzureSubscription(AzureSubscription other) + { + return new PSAzureSubscription + { + SubscriptionId = other != null? other.Id.ToString() : null, + SubscriptionName = other != null? other.Name : null, + TenantId = other != null && other.IsPropertySet(AzureSubscription.Property.Tenants)? + other.GetProperty(AzureSubscription.Property.Tenants) : null + }; + } + + /// + /// Convert between formats of AzureSubscription information. + /// + /// The subscription to convert. + /// The converted subscription. + public static implicit operator AzureSubscription(PSAzureSubscription other) + { + if (other == null) + { + return null; + } + + var result = new AzureSubscription + { + Name = other.SubscriptionName + }; + + if (other.SubscriptionId != null) + { + Guid subscriptionId; + if (Guid.TryParse(other.SubscriptionId, out subscriptionId)) + { + result.Id = subscriptionId; + } + } + + if (other.TenantId != null) + { + result.Properties.SetProperty(AzureSubscription.Property.Tenants, other.TenantId); + } + + return result; + } + + /// + /// The subscription id. + /// + public string SubscriptionId { get; set; } + + /// + /// The name of the subscription. + /// + public string SubscriptionName { get; set; } + + /// + /// The tenant home for the subscription. + /// + public string TenantId { get; set; } + + public override string ToString() + { + return this.SubscriptionId; + } + } +} diff --git a/src/ResourceManager/Profile/Commands.Profile/Models/PSAzureTenant.cs b/src/ResourceManager/Profile/Commands.Profile/Models/PSAzureTenant.cs new file mode 100644 index 000000000000..8dfbff694014 --- /dev/null +++ b/src/ResourceManager/Profile/Commands.Profile/Models/PSAzureTenant.cs @@ -0,0 +1,86 @@ +// ---------------------------------------------------------------------------------- +// +// 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; +using System.Configuration; +using Microsoft.Azure.Common.Authentication.Models; +using Microsoft.Azure.Common.Authentication.Utilities; + +namespace Microsoft.Azure.Commands.Profile.Models +{ + /// + /// Azure subscription details. + /// + public class PSAzureTenant + { + /// + /// Convert between formats of AzureSubscription information. + /// + /// The subscription to convert. + /// The converted subscription. + public static implicit operator PSAzureTenant(AzureTenant other) + { + return new PSAzureTenant + { + TenantId = other != null? other.Id.ToString() : null, + Domain = other != null? other.Domain : null + }; + } + + /// + /// Convert between formats of AzureSubscription information. + /// + /// The subscription to convert. + /// The converted subscription. + public static implicit operator AzureTenant(PSAzureTenant other) + { + if (other == null) + { + return null; + } + + var result = new AzureTenant + { + Domain = other.Domain + }; + + if (other.TenantId != null) + { + Guid tenantId; + if (Guid.TryParse(other.TenantId, out tenantId)) + { + result.Id = tenantId; + } + } + + return result; + } + + /// + /// The subscription id. + /// + public string TenantId { get; set; } + + /// + /// The name of the subscription. + /// + public string Domain { get; set; } + + + public override string ToString() + { + return this.TenantId; + } + } +} diff --git a/src/ResourceManager/Profile/Commands.Profile/Profile/SaveAzureRMProfile.cs b/src/ResourceManager/Profile/Commands.Profile/Profile/SaveAzureRMProfile.cs index b29af2fc4569..7b141f61d963 100644 --- a/src/ResourceManager/Profile/Commands.Profile/Profile/SaveAzureRMProfile.cs +++ b/src/ResourceManager/Profile/Commands.Profile/Profile/SaveAzureRMProfile.cs @@ -12,18 +12,19 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.Azure.Commands.Profile.Properties; -using Microsoft.Azure.Commands.ResourceManager.Common; -using Microsoft.Azure.Common.Authentication.Models; using System; using System.Management.Automation; +using Microsoft.Azure.Common.Authentication.Models; +using Microsoft.Azure.Commands.Profile.Models; +using Microsoft.Azure.Commands.Profile.Properties; +using Microsoft.Azure.Commands.ResourceManager.Common; namespace Microsoft.Azure.Commands.Profile { /// /// Saves Microsoft Azure profile. /// - [Cmdlet(VerbsData.Save, "AzureRmProfile"), OutputType(typeof(AzureRMProfile))] + [Cmdlet(VerbsData.Save, "AzureRMProfile"), OutputType(typeof(PSAzureProfile))] public class SaveAzureRMProfileCommand : AzureRMCmdlet { [Parameter(Mandatory = false, Position = 0, ValueFromPipelineByPropertyName = true)] diff --git a/src/ResourceManager/Profile/Commands.Profile/Profile/SelectAzureRMProfile.cs b/src/ResourceManager/Profile/Commands.Profile/Profile/SelectAzureRMProfile.cs index 04d27ff7ef91..6675f0fb1c54 100644 --- a/src/ResourceManager/Profile/Commands.Profile/Profile/SelectAzureRMProfile.cs +++ b/src/ResourceManager/Profile/Commands.Profile/Profile/SelectAzureRMProfile.cs @@ -12,18 +12,19 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.Azure.Commands.Profile.Properties; -using Microsoft.Azure.Commands.ResourceManager.Common; -using Microsoft.Azure.Common.Authentication.Models; using System; using System.Management.Automation; +using Microsoft.Azure.Common.Authentication.Models; +using Microsoft.Azure.Commands.Profile.Models; +using Microsoft.Azure.Commands.Profile.Properties; +using Microsoft.Azure.Commands.ResourceManager.Common; namespace Microsoft.Azure.Commands.Profile { /// /// Selects Microsoft Azure profile. /// - [Cmdlet(VerbsCommon.Select, "AzureRmProfile"), OutputType(typeof(AzureRMProfile))] + [Cmdlet(VerbsCommon.Select, "AzureRMProfile"), OutputType(typeof(PSAzureProfile))] public class SelectAzureRMProfileCommand : AzureRMCmdlet { internal const string InMemoryProfileParameterSet = "InMemoryProfile"; @@ -56,7 +57,7 @@ protected override void ProcessRecord() throw new ArgumentException(Resources.AzureProfileMustNotBeNull); } - WriteObject(AzureRMCmdlet.DefaultProfile); + WriteObject((PSAzureProfile)AzureRMCmdlet.DefaultProfile); } } } diff --git a/src/ResourceManager/Profile/Commands.Profile/Subscription/GetAzureRMSubscription.cs b/src/ResourceManager/Profile/Commands.Profile/Subscription/GetAzureRMSubscription.cs index e95e905f75d8..166024184af9 100644 --- a/src/ResourceManager/Profile/Commands.Profile/Subscription/GetAzureRMSubscription.cs +++ b/src/ResourceManager/Profile/Commands.Profile/Subscription/GetAzureRMSubscription.cs @@ -11,28 +11,35 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.Azure.Commands.ResourceManager.Common; +using System.Linq; using System.Management.Automation; -using Microsoft.Azure.Commands.Profile.Properties; using Microsoft.Azure.Common.Authentication; using Microsoft.Azure.Common.Authentication.Models; +using Microsoft.Azure.Commands.Profile.Models; +using Microsoft.Azure.Commands.Profile.Properties; +using Microsoft.Azure.Commands.ResourceManager.Common; namespace Microsoft.Azure.Commands.Profile { - [Cmdlet(VerbsCommon.Get, "AzureRmSubscription", DefaultParameterSetName = ListInTenantParameterSet), - OutputType(typeof(AzureSubscription))] + [Cmdlet(VerbsCommon.Get, "AzureRmSubscription", DefaultParameterSetName = ListByIdInTenantParameterSet), + OutputType(typeof(PSAzureSubscription))] public class GetAzureRMSubscriptionCommand : AzureRMCmdlet { - public const string ListInTenantParameterSet = "ListInTenant"; + public const string ListByIdInTenantParameterSet = "ListByIdInTenant"; + public const string ListByNameInTenantParameterSet = "ListByNameInTenant"; public const string ListAllParameterSet = "ListAll"; private RMProfileClient _client; - [Parameter(ParameterSetName= ListInTenantParameterSet, ValueFromPipelineByPropertyName = true, Mandatory=false)] + [Parameter(ParameterSetName= ListByIdInTenantParameterSet, ValueFromPipelineByPropertyName = true, Mandatory=false)] public string SubscriptionId { get; set; } - [Parameter(ParameterSetName = ListInTenantParameterSet, ValueFromPipelineByPropertyName = true, Mandatory = false)] - public string Tenant { get; set; } + [Parameter(ParameterSetName = ListByNameInTenantParameterSet, ValueFromPipelineByPropertyName = true, Mandatory = false)] + public string SubscriptionName { get; set; } + + [Parameter(ParameterSetName = ListByIdInTenantParameterSet, ValueFromPipelineByPropertyName = true, Mandatory = false)] + [Parameter(ParameterSetName = ListByNameInTenantParameterSet, ValueFromPipelineByPropertyName = true, Mandatory = false)] + public string TenantId { get; set; } [Parameter(ParameterSetName = ListAllParameterSet, Mandatory = true)] public SwitchParameter All { get; set; } @@ -50,7 +57,7 @@ protected override void ProcessRecord() { try { - WriteObject(_client.ListSubscriptions(), enumerateCollection: true); + WriteObject(_client.ListSubscriptions().Select((s) => (PSAzureSubscription)(s)), enumerateCollection: true); } catch (AadAuthenticationException exception) { @@ -60,6 +67,26 @@ protected override void ProcessRecord() throw new PSInvalidOperationException(string.Format(Resources.CommonTenantAuthFailed, account), exception); } } + else if (!string.IsNullOrWhiteSpace(this.SubscriptionName)) + { + var tenant = EnsureValidTenant(); + AzureSubscription result; + try + { + if (!this._client.TryGetSubscriptionByName(tenant, this.SubscriptionName, out result)) + { + ThrowSubscriptionNotFoundError(this.TenantId, this.SubscriptionName); + } + + WriteObject(result); + } + catch (AadAuthenticationException exception) + { + ThrowTenantAuthenticationError(tenant, exception); + throw; + } + + } else if (!string.IsNullOrWhiteSpace(this.SubscriptionId)) { var tenant = EnsureValidTenant(); @@ -68,10 +95,10 @@ protected override void ProcessRecord() { if (!this._client.TryGetSubscription(tenant, this.SubscriptionId, out result)) { - ThrowSubscriptionNotFoundError(this.Tenant, this.SubscriptionId); + ThrowSubscriptionNotFoundError(this.TenantId, this.SubscriptionId); } - WriteObject(result); + WriteObject((PSAzureSubscription)result); } catch (AadAuthenticationException exception) { @@ -85,7 +112,7 @@ protected override void ProcessRecord() var tenant = EnsureValidTenant(); try { - WriteObject(_client.ListSubscriptions(tenant), enumerateCollection: true); + WriteObject(_client.ListSubscriptions(tenant).Select((s) => (PSAzureSubscription)s), enumerateCollection: true); } catch (AadAuthenticationException exception) { @@ -107,7 +134,7 @@ private void ThrowTenantAuthenticationError(string tenant, AadAuthenticationExce private string EnsureValidTenant() { - var tenant = this.Tenant; + var tenant = this.TenantId; if (string.IsNullOrWhiteSpace(tenant) && (DefaultContext.Tenant == null || DefaultContext.Tenant.Id == null)) { diff --git a/src/ResourceManager/Profile/Commands.Profile/Tenant/GetAzureRMTenant.cs b/src/ResourceManager/Profile/Commands.Profile/Tenant/GetAzureRMTenant.cs index 4735ef83d7f6..9857eaf7f9de 100644 --- a/src/ResourceManager/Profile/Commands.Profile/Tenant/GetAzureRMTenant.cs +++ b/src/ResourceManager/Profile/Commands.Profile/Tenant/GetAzureRMTenant.cs @@ -12,10 +12,10 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using Microsoft.Azure.Commands.ResourceManager.Common; -using Microsoft.Azure.Common.Authentication.Models; -using System.Collections.Generic; +using System.Linq; using System.Management.Automation; +using Microsoft.Azure.Commands.Profile.Models; +using Microsoft.Azure.Commands.ResourceManager.Common; namespace Microsoft.Azure.Commands.Profile { @@ -24,7 +24,7 @@ namespace Microsoft.Azure.Commands.Profile /// [Cmdlet(VerbsCommon.Get, "AzureRmTenant")] [Alias("Get-AzureRmDomain")] - [OutputType(typeof(List))] + [OutputType(typeof(PSAzureTenant))] public class GetAzureRMTenantCommand : AzureRMCmdlet { [Parameter(Mandatory = false, Position = 0, ValueFromPipelineByPropertyName = true)] @@ -36,7 +36,7 @@ protected override void ProcessRecord() { var profileClient = new RMProfileClient(AzureRMCmdlet.DefaultProfile); - WriteObject(profileClient.ListTenants(Tenant), enumerateCollection: true); + WriteObject(profileClient.ListTenants(Tenant).Select((t) => (PSAzureTenant)t), enumerateCollection: true); } } } diff --git a/src/ResourceManager/Profile/Commands.Profile/packages.config b/src/ResourceManager/Profile/Commands.Profile/packages.config index 7b3702039384..39075986661f 100644 --- a/src/ResourceManager/Profile/Commands.Profile/packages.config +++ b/src/ResourceManager/Profile/Commands.Profile/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/ResourceManager/Profile/NuGet.Config b/src/ResourceManager/Profile/NuGet.Config new file mode 100644 index 000000000000..2de911013532 --- /dev/null +++ b/src/ResourceManager/Profile/NuGet.Config @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/ResourceManager/Profile/Profile.sln b/src/ResourceManager/Profile/Profile.sln new file mode 100644 index 000000000000..eeb568975b82 --- /dev/null +++ b/src/ResourceManager/Profile/Profile.sln @@ -0,0 +1,51 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.31101.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{95C16AED-FD57-42A0-86C3-2CF4300A4817}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ResourceManager.Common", "..\Common\Commands.ResourceManager.Common\Commands.ResourceManager.Common.csproj", "{3819D8A7-C62C-4C47-8DDD-0332D9CE1252}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Profile", "Commands.Profile\Commands.Profile.csproj", "{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Profile.Test", "Commands.Profile.Test\Commands.Profile.Test.csproj", "{152D78F0-A642-4D0E-B3A8-2FC64FFA9714}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ScenarioTests.ResourceManager.Common", "..\Common\Commands.ScenarioTests.ResourceManager.Common\Commands.ScenarioTests.ResourceManager.Common.csproj", "{3436A126-EDC9-4060-8952-9A1BE34CDD95}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common", "..\..\Common\Commands.Common\Commands.Common.csproj", "{5EE72C53-1720-4309-B54B-5FB79703195F}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.Build.0 = Release|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.Build.0 = Release|Any CPU + {152D78F0-A642-4D0E-B3A8-2FC64FFA9714}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {152D78F0-A642-4D0E-B3A8-2FC64FFA9714}.Debug|Any CPU.Build.0 = Debug|Any CPU + {152D78F0-A642-4D0E-B3A8-2FC64FFA9714}.Release|Any CPU.ActiveCfg = Release|Any CPU + {152D78F0-A642-4D0E-B3A8-2FC64FFA9714}.Release|Any CPU.Build.0 = Release|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Release|Any CPU.Build.0 = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {152D78F0-A642-4D0E-B3A8-2FC64FFA9714} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} + {3436A126-EDC9-4060-8952-9A1BE34CDD95} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} + EndGlobalSection +EndGlobal diff --git a/src/ResourceManager/RedisCache/Commands.RedisCache.Test/Commands.RedisCache.Test.csproj b/src/ResourceManager/RedisCache/Commands.RedisCache.Test/Commands.RedisCache.Test.csproj index 16004dad69ee..abe94708191b 100644 --- a/src/ResourceManager/RedisCache/Commands.RedisCache.Test/Commands.RedisCache.Test.csproj +++ b/src/ResourceManager/RedisCache/Commands.RedisCache.Test/Commands.RedisCache.Test.csproj @@ -50,7 +50,7 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -148,6 +148,10 @@ + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common @@ -185,19 +189,5 @@ - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/src/ResourceManager/RedisCache/Commands.RedisCache.Test/ScenarioTests/RedisCacheTestsBase.cs b/src/ResourceManager/RedisCache/Commands.RedisCache.Test/ScenarioTests/RedisCacheTestsBase.cs index ef93eb5f31e4..579a2b878e0c 100644 --- a/src/ResourceManager/RedisCache/Commands.RedisCache.Test/ScenarioTests/RedisCacheTestsBase.cs +++ b/src/ResourceManager/RedisCache/Commands.RedisCache.Test/ScenarioTests/RedisCacheTestsBase.cs @@ -16,7 +16,6 @@ namespace Microsoft.Azure.Commands.RedisCache.Test.ScenarioTests { using System; using Microsoft.WindowsAzure.Commands.ScenarioTest; - using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.Azure.Test; using Microsoft.Azure.Management.Redis; using Microsoft.Azure.Common.Authentication; @@ -46,7 +45,10 @@ protected void RunPowerShellTest(params string[] scripts) SetupManagementClients(); helper.SetupEnvironment(AzureModule.AzureResourceManager); - helper.SetupModules(AzureModule.AzureResourceManager, "ScenarioTests\\" + this.GetType().Name + ".ps1"); + helper.SetupModules(AzureModule.AzureResourceManager, + "ScenarioTests\\" + this.GetType().Name + ".ps1", + helper.RMProfileModule, + helper.GetRMModulePath(@"AzureRM.RedisCache.psd1")); helper.RunPowerShellTest(scripts); } diff --git a/src/ResourceManager/RedisCache/Commands.RedisCache.Test/packages.config b/src/ResourceManager/RedisCache/Commands.RedisCache.Test/packages.config index dbe7a52a9549..a06ba0f0529f 100644 --- a/src/ResourceManager/RedisCache/Commands.RedisCache.Test/packages.config +++ b/src/ResourceManager/RedisCache/Commands.RedisCache.Test/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/ResourceManager/RedisCache/Commands.RedisCache/Commands.RedisCache.csproj b/src/ResourceManager/RedisCache/Commands.RedisCache/Commands.RedisCache.csproj index 2550577d02ff..bd2516f3d7d8 100644 --- a/src/ResourceManager/RedisCache/Commands.RedisCache/Commands.RedisCache.csproj +++ b/src/ResourceManager/RedisCache/Commands.RedisCache/Commands.RedisCache.csproj @@ -53,7 +53,7 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -165,16 +165,15 @@ + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common - - - - - \ No newline at end of file diff --git a/src/ResourceManager/RedisCache/Commands.RedisCache/packages.config b/src/ResourceManager/RedisCache/Commands.RedisCache/packages.config index 77b0acee0ee8..ff0d3d4ffcc8 100644 --- a/src/ResourceManager/RedisCache/Commands.RedisCache/packages.config +++ b/src/ResourceManager/RedisCache/Commands.RedisCache/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/ResourceManager/RedisCache/NuGet.Config b/src/ResourceManager/RedisCache/NuGet.Config new file mode 100644 index 000000000000..2de911013532 --- /dev/null +++ b/src/ResourceManager/RedisCache/NuGet.Config @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/ResourceManager/RedisCache/RedisCache.sln b/src/ResourceManager/RedisCache/RedisCache.sln new file mode 100644 index 000000000000..0f8569262a39 --- /dev/null +++ b/src/ResourceManager/RedisCache/RedisCache.sln @@ -0,0 +1,57 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.31101.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{95C16AED-FD57-42A0-86C3-2CF4300A4817}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ResourceManager.Common", "..\Common\Commands.ResourceManager.Common\Commands.ResourceManager.Common.csproj", "{3819D8A7-C62C-4C47-8DDD-0332D9CE1252}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.RedisCache", "Commands.RedisCache\Commands.RedisCache.csproj", "{C972E3EF-4461-4758-BA31-93E0947B1253}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.RedisCache.Test", "Commands.RedisCache.Test\Commands.RedisCache.Test.csproj", "{4AE5705F-62CF-461D-B72E-DD9DCD9B3609}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Profile", "..\Profile\Commands.Profile\Commands.Profile.csproj", "{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ScenarioTests.ResourceManager.Common", "..\Common\Commands.ScenarioTests.ResourceManager.Common\Commands.ScenarioTests.ResourceManager.Common.csproj", "{3436A126-EDC9-4060-8952-9A1BE34CDD95}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common", "..\..\Common\Commands.Common\Commands.Common.csproj", "{5EE72C53-1720-4309-B54B-5FB79703195F}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.Build.0 = Release|Any CPU + {C972E3EF-4461-4758-BA31-93E0947B1253}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {C972E3EF-4461-4758-BA31-93E0947B1253}.Debug|Any CPU.Build.0 = Debug|Any CPU + {C972E3EF-4461-4758-BA31-93E0947B1253}.Release|Any CPU.ActiveCfg = Release|Any CPU + {C972E3EF-4461-4758-BA31-93E0947B1253}.Release|Any CPU.Build.0 = Release|Any CPU + {4AE5705F-62CF-461D-B72E-DD9DCD9B3609}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4AE5705F-62CF-461D-B72E-DD9DCD9B3609}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4AE5705F-62CF-461D-B72E-DD9DCD9B3609}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4AE5705F-62CF-461D-B72E-DD9DCD9B3609}.Release|Any CPU.Build.0 = Release|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.Build.0 = Release|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Release|Any CPU.Build.0 = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {4AE5705F-62CF-461D-B72E-DD9DCD9B3609} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} + {3436A126-EDC9-4060-8952-9A1BE34CDD95} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} + EndGlobalSection +EndGlobal diff --git a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Commands.Resources.Rest.csproj b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Commands.Resources.Rest.csproj index a4952d5b40e6..f16b165c9807 100644 --- a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Commands.Resources.Rest.csproj +++ b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/Commands.Resources.Rest.csproj @@ -54,8 +54,8 @@ False ..\..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - - ..\..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + + ..\..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -182,19 +182,15 @@ + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/packages.config b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/packages.config index 14f798eb59d9..b4ba1141f201 100644 --- a/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/packages.config +++ b/src/ResourceManager/Resources/Commands.ResourceManager/Cmdlets/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/ResourceManager/Resources/Commands.Resources.Test/Commands.Resources.Test.csproj b/src/ResourceManager/Resources/Commands.Resources.Test/Commands.Resources.Test.csproj index a1e94b953e72..978282aded95 100644 --- a/src/ResourceManager/Resources/Commands.Resources.Test/Commands.Resources.Test.csproj +++ b/src/ResourceManager/Resources/Commands.Resources.Test/Commands.Resources.Test.csproj @@ -51,7 +51,7 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -62,7 +62,7 @@ False - ..\..\..\packages\Microsoft.Azure.Graph.RBAC.1.7.0-preview\lib\net40\Microsoft.Azure.Graph.RBAC.dll + ..\..\..\packages\Microsoft.Azure.Graph.RBAC.1.7.1-preview\lib\net40\Microsoft.Azure.Graph.RBAC.dll ..\..\..\packages\Microsoft.Azure.Insights.0.7.7-preview\lib\net45\Microsoft.Azure.Insights.dll @@ -222,6 +222,10 @@ + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common @@ -512,19 +516,5 @@ - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourcesController.cs b/src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourcesController.cs index 4503222142ca..81dc67c39305 100644 --- a/src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourcesController.cs +++ b/src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/ResourcesController.cs @@ -110,10 +110,11 @@ public void RunPsTestWorkflow( var callingClassName = callingClassType .Split(new[] { "." }, StringSplitOptions.RemoveEmptyEntries) .Last(); - helper.SetupModules( - AzureModule.AzureResourceManager, - "ScenarioTests\\Common.ps1", - "ScenarioTests\\" + callingClassName + ".ps1"); + helper.SetupModules(AzureModule.AzureResourceManager, + "ScenarioTests\\Common.ps1", + "ScenarioTests\\" + callingClassName + ".ps1", + helper.RMProfileModule, + helper.RMResourceModule); try { diff --git a/src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/RoleAssignmentTests.cs b/src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/RoleAssignmentTests.cs index 96d22e99864a..f00e0377d006 100644 --- a/src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/RoleAssignmentTests.cs +++ b/src/ResourceManager/Resources/Commands.Resources.Test/ScenarioTests/RoleAssignmentTests.cs @@ -58,14 +58,14 @@ public void RaByScope() ResourcesController.NewInstance.RunPsTest("Test-RaByScope"); } - [Fact] + [Fact(Skip = "Need to re-record test")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void RaByResourceGroup() { ResourcesController.NewInstance.RunPsTest("Test-RaByResourceGroup"); } - [Fact] + [Fact(Skip = "Need to re-record test")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void RaByResource() { @@ -79,7 +79,7 @@ public void RaByServicePrincipal() ResourcesController.NewInstance.RunPsTest("Test-RaByServicePrincipal"); } - [Fact] + [Fact(Skip = "Need to re-record test")] [Trait(Category.AcceptanceType, Category.CheckIn)] public void RaByUpn() { diff --git a/src/ResourceManager/Resources/Commands.Resources.Test/packages.config b/src/ResourceManager/Resources/Commands.Resources.Test/packages.config index 5d8005f0b0fa..f7c9f0c51e90 100644 --- a/src/ResourceManager/Resources/Commands.Resources.Test/packages.config +++ b/src/ResourceManager/Resources/Commands.Resources.Test/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/ResourceManager/Resources/Commands.Resources/Commands.Resources.csproj b/src/ResourceManager/Resources/Commands.Resources/Commands.Resources.csproj index 9c3e30b5cfe0..cd424ada4626 100644 --- a/src/ResourceManager/Resources/Commands.Resources/Commands.Resources.csproj +++ b/src/ResourceManager/Resources/Commands.Resources/Commands.Resources.csproj @@ -55,7 +55,7 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -66,7 +66,7 @@ False - ..\..\..\packages\Microsoft.Azure.Graph.RBAC.1.7.0-preview\lib\net40\Microsoft.Azure.Graph.RBAC.dll + ..\..\..\packages\Microsoft.Azure.Graph.RBAC.1.7.1-preview\lib\net40\Microsoft.Azure.Graph.RBAC.dll ..\..\..\packages\Microsoft.Azure.Management.Authorization.1.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll @@ -165,9 +165,6 @@ - - - @@ -238,6 +235,10 @@ + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common @@ -279,7 +280,6 @@ - powershell.exe -ExecutionPolicy Unrestricted -File "$(ProjectDir)\PostBuild.ps1" "$(TargetDir)\" diff --git a/src/ResourceManager/Resources/Commands.Resources/Models.ActiveDirectory/ADObjectFilterOptions.cs b/src/ResourceManager/Resources/Commands.Resources/Models.ActiveDirectory/ADObjectFilterOptions.cs index f6ed5686b790..5eb8164569fc 100644 --- a/src/ResourceManager/Resources/Commands.Resources/Models.ActiveDirectory/ADObjectFilterOptions.cs +++ b/src/ResourceManager/Resources/Commands.Resources/Models.ActiveDirectory/ADObjectFilterOptions.cs @@ -19,6 +19,8 @@ public class ADObjectFilterOptions { public string SearchString { get; set; } + public string SignInName { get; set; } + public string Mail { get; set; } public string UPN { get; set; } @@ -48,6 +50,8 @@ public string ActiveFilter return SPN; else if (!string.IsNullOrEmpty(Mail)) return Mail; + else if (!string.IsNullOrEmpty(SignInName)) + return SignInName; else if (!string.IsNullOrEmpty(SearchString)) return SearchString; else diff --git a/src/ResourceManager/Resources/Commands.Resources/Models.ActiveDirectory/ActiveDirectoryClient.cs b/src/ResourceManager/Resources/Commands.Resources/Models.ActiveDirectory/ActiveDirectoryClient.cs index 979c90f584c9..d401b9e1d7aa 100644 --- a/src/ResourceManager/Resources/Commands.Resources/Models.ActiveDirectory/ActiveDirectoryClient.cs +++ b/src/ResourceManager/Resources/Commands.Resources/Models.ActiveDirectory/ActiveDirectoryClient.cs @@ -47,7 +47,7 @@ public PSADObject GetADObject(ADObjectFilterOptions options) Debug.Assert(options != null); - if (IsSet(options.Mail, options.UPN, options.Id)) + if (IsSet(options.SignInName, options.Mail, options.UPN, options.Id)) { result = FilterUsers(options).FirstOrDefault(); } @@ -163,11 +163,11 @@ public List FilterUsers(ADObjectFilterOptions options) users.Add(user.ToPSADUser()); } } - else if (!string.IsNullOrEmpty(options.Mail)) + else if (!string.IsNullOrEmpty(options.Mail) || !string.IsNullOrEmpty(options.SignInName)) { try { - user = GraphClient.User.GetBySignInName(options.Mail).Users.FirstOrDefault(); + user = GraphClient.User.GetBySignInName(Normalize(options.Mail) ?? Normalize(options.SignInName)).Users.FirstOrDefault(); } catch { /* The user does not exist, ignore the exception. */ } @@ -225,6 +225,14 @@ public List ListUserGroups(string principal) return result; } + public List GetObjectsByObjectId(List objectIds) + { + List result = new List(); + var adObjects = GraphClient.Objects.GetObjectsByObjectIds(new GetObjectsParameters { Ids = objectIds }).AADObject; + result.AddRange(adObjects.Select(o => o.ToPSADObject())); + return result; + } + public List FilterGroups(ADObjectFilterOptions options) { List groups = new List(); diff --git a/src/ResourceManager/Resources/Commands.Resources/Models.ActiveDirectory/ActiveDirectoryClientExtensions.cs b/src/ResourceManager/Resources/Commands.Resources/Models.ActiveDirectory/ActiveDirectoryClientExtensions.cs index 59f2b4f10cc4..cafbb1e26476 100644 --- a/src/ResourceManager/Resources/Commands.Resources/Models.ActiveDirectory/ActiveDirectoryClientExtensions.cs +++ b/src/ResourceManager/Resources/Commands.Resources/Models.ActiveDirectory/ActiveDirectoryClientExtensions.cs @@ -51,6 +51,7 @@ public static PSADObject ToPSADObject(this AADObject obj) Id = new Guid(obj.ObjectId), Type = obj.ObjectType, UserPrincipalName = obj.UserPrincipalName, + SignInName = obj.SignInName, Mail = obj.Mail }; } @@ -66,6 +67,16 @@ public static PSADObject ToPSADObject(this AADObject obj) }; } + else if (obj.ObjectType == typeof(ServicePrincipal).Name) + { + return new PSADServicePrincipal() + { + DisplayName = obj.DisplayName, + Id = new Guid(obj.ObjectId), + Type = obj.ObjectType, + ServicePrincipalName = obj.ServicePrincipalNames.FirstOrDefault() + }; + } else { return new PSADObject() @@ -93,7 +104,8 @@ public static PSADUser ToPSADUser(this User user) DisplayName = user.DisplayName, Id = new Guid(user.ObjectId), UserPrincipalName = user.UserPrincipalName, - Mail = user.SignInName + Mail = user.SignInName, + SignInName = user.SignInName }; } diff --git a/src/ResourceManager/Resources/Commands.Resources/Models.ActiveDirectory/PSADUser.cs b/src/ResourceManager/Resources/Commands.Resources/Models.ActiveDirectory/PSADUser.cs index 9a932096a175..af4c6b903b1b 100644 --- a/src/ResourceManager/Resources/Commands.Resources/Models.ActiveDirectory/PSADUser.cs +++ b/src/ResourceManager/Resources/Commands.Resources/Models.ActiveDirectory/PSADUser.cs @@ -19,5 +19,7 @@ public class PSADUser : PSADObject public string UserPrincipalName { get; set; } public string Mail { get; set; } + + public string SignInName { get; set; } } } diff --git a/src/ResourceManager/Resources/Commands.Resources/Models.ActiveDirectory/ParameterSet.cs b/src/ResourceManager/Resources/Commands.Resources/Models.ActiveDirectory/ParameterSet.cs index ab606a7b9324..2b49683e42e2 100644 --- a/src/ResourceManager/Resources/Commands.Resources/Models.ActiveDirectory/ParameterSet.cs +++ b/src/ResourceManager/Resources/Commands.Resources/Models.ActiveDirectory/ParameterSet.cs @@ -22,38 +22,34 @@ internal static class ParameterSet public const string SPN = "SPNParameterSet"; + public const string SignInName = "SignInNameParameterSet"; + public const string SearchString = "SearchStringParameterSet"; public const string ObjectId = "ObjectIdParameterSet"; public const string Scope = "ScopeParameterSet"; - public const string ScopeWithMail = "ScopeWithMailParameterSet"; - - public const string ScopeWithUPN = "ScopeWithUPNParameterSet"; - public const string ScopeWithSPN = "ScopeWithSPNParameterSet"; + public const string ScopeWithSignInName = "ScopeWithSignInNameParameterSet"; + public const string ScopeWithObjectId = "ScopeWithObjectIdParameterSet"; public const string ResourceGroup = "ResourceGroupParameterSet"; - public const string ResourceGroupWithMail = "ResourceGroupWithMailParameterSet"; - - public const string ResourceGroupWithUPN = "ResourceGroupWithUPNParameterSet"; - public const string ResourceGroupWithSPN = "ResourceGroupWithSPNParameterSet"; public const string ResourceGroupWithObjectId = "ResourceGroupWithObjectIdParameterSet"; - public const string Resource = "ResourceParameterSet"; - - public const string ResourceWithMail = "ResourceWithMailParameterSet"; + public const string ResourceGroupWithSignInName = "ResourceGroupWithSignInNameParameterSet"; - public const string ResourceWithUPN = "ResourceWithUPNParameterSet"; + public const string Resource = "ResourceParameterSet"; public const string ResourceWithSPN = "ResourceWithSPNParameterSet"; + public const string ResourceWithSignInName = "ResourceWithSignInNameParameterSet"; + public const string ResourceWithObjectId = "ResourceWithObjectIdParameterSet"; public const string ApplicationWithoutCredential = "ApplicationWithoutCredentialParameterSet"; diff --git a/src/ResourceManager/Resources/Commands.Resources/Models.Authorization/AuthorizationClient.cs b/src/ResourceManager/Resources/Commands.Resources/Models.Authorization/AuthorizationClient.cs index 8392053e0070..4258bbd9c7f8 100644 --- a/src/ResourceManager/Resources/Commands.Resources/Models.Authorization/AuthorizationClient.cs +++ b/src/ResourceManager/Resources/Commands.Resources/Models.Authorization/AuthorizationClient.cs @@ -68,6 +68,7 @@ public PSRoleDefinition GetRoleDefinition(string roleId) /// /// Filters the existing role Definitions. + /// If name is not provided, all role definitions are fetched. /// /// The role name /// The matched role Definitions @@ -122,7 +123,11 @@ public PSRoleAssignment CreateRoleAssignment(FilterRoleAssignmentsOptions parame }; AuthorizationManagementClient.RoleAssignments.Create(parameters.Scope, roleAssignmentId, createParameters); - return AuthorizationManagementClient.RoleAssignments.Get(parameters.Scope, roleAssignmentId).RoleAssignment.ToPSRoleAssignment(this, ActiveDirectoryClient); + + RoleAssignment assignment = AuthorizationManagementClient.RoleAssignments.Get(parameters.Scope, roleAssignmentId).RoleAssignment; + IEnumerable assignments = new List() { assignment }; + + return assignments.ToPSRoleAssignments(this, ActiveDirectoryClient).FirstOrDefault(); } /// @@ -136,17 +141,18 @@ public List FilterRoleAssignments(FilterRoleAssignmentsOptions List result = new List(); ListAssignmentsFilterParameters parameters = new ListAssignmentsFilterParameters(); + PSADObject adObject = null; if (options.ADObjectFilter.HasFilter) { + adObject = ActiveDirectoryClient.GetADObject(options.ADObjectFilter); + if (adObject == null) + { + throw new KeyNotFoundException(ProjectResources.PrincipalNotFound); + } + // Filter first by principal if (options.ExpandPrincipalGroups) { - PSADObject adObject = ActiveDirectoryClient.GetADObject(options.ADObjectFilter); - if (adObject == null) - { - throw new KeyNotFoundException(ProjectResources.PrincipalNotFound); - } - if (!(adObject is PSADUser)) { throw new InvalidOperationException(ProjectResources.ExpandGroupsNotSupported); @@ -156,11 +162,12 @@ public List FilterRoleAssignments(FilterRoleAssignmentsOptions } else { - parameters.PrincipalId = string.IsNullOrEmpty(options.ADObjectFilter.Id) ? ActiveDirectoryClient.GetObjectId(options.ADObjectFilter) : Guid.Parse(options.ADObjectFilter.Id); + parameters.PrincipalId = string.IsNullOrEmpty(options.ADObjectFilter.Id) ? adObject.Id : Guid.Parse(options.ADObjectFilter.Id); } - + result.AddRange(AuthorizationManagementClient.RoleAssignments.List(parameters) - .RoleAssignments.Select(r => r.ToPSRoleAssignment(this, ActiveDirectoryClient, options.ExcludeAssignmentsForDeletedPrincipals)).Where(r => r != null)); + .RoleAssignments.ToPSRoleAssignments(this, ActiveDirectoryClient, options.ExcludeAssignmentsForDeletedPrincipals)); + // Filter out by scope if (!string.IsNullOrEmpty(options.Scope)) @@ -172,13 +179,14 @@ public List FilterRoleAssignments(FilterRoleAssignmentsOptions { // Filter by scope and above directly parameters.AtScope = true; + result.AddRange(AuthorizationManagementClient.RoleAssignments.ListForScope(options.Scope, parameters) - .RoleAssignments.Select(r => r.ToPSRoleAssignment(this, ActiveDirectoryClient, options.ExcludeAssignmentsForDeletedPrincipals)).Where(r => r != null)); + .RoleAssignments.ToPSRoleAssignments(this, ActiveDirectoryClient, options.ExcludeAssignmentsForDeletedPrincipals)); } else { result.AddRange(AuthorizationManagementClient.RoleAssignments.List(parameters) - .RoleAssignments.Select(r => r.ToPSRoleAssignment(this, ActiveDirectoryClient, options.ExcludeAssignmentsForDeletedPrincipals)).Where(r => r != null)); + .RoleAssignments.ToPSRoleAssignments(this, ActiveDirectoryClient, options.ExcludeAssignmentsForDeletedPrincipals)); } if (!string.IsNullOrEmpty(options.RoleDefinition)) @@ -190,7 +198,23 @@ public List FilterRoleAssignments(FilterRoleAssignmentsOptions { // Get classic administrator access assignments List classicAdministrators = AuthorizationManagementClient.ClassicAdministrators.List().ClassicAdministrators.ToList(); - List classicAdministratorsAssignments = classicAdministrators.Select(a => a.ToPSRoleAssignment(currentSubscription)).ToList(); + List classicAdministratorsAssignments = classicAdministrators.Select(a => a.ToPSRoleAssignment(currentSubscription)).ToList(); + + // Filter by principal if provided + if (options.ADObjectFilter.HasFilter) + { + if (!(adObject is PSADUser)) + { + throw new InvalidOperationException(ProjectResources.IncludeClassicAdminsNotSupported); + } + + var userObject = adObject as PSADUser; + classicAdministratorsAssignments = classicAdministratorsAssignments.Where(c => + c.DisplayName.Equals(userObject.UserPrincipalName, StringComparison.OrdinalIgnoreCase) || + c.DisplayName.Equals(userObject.Mail, StringComparison.OrdinalIgnoreCase) || + c.DisplayName.Equals(userObject.SignInName, StringComparison.OrdinalIgnoreCase)).ToList(); + } + result.AddRange(classicAdministratorsAssignments); } diff --git a/src/ResourceManager/Resources/Commands.Resources/Models.Authorization/AuthorizationClientExtensions.cs b/src/ResourceManager/Resources/Commands.Resources/Models.Authorization/AuthorizationClientExtensions.cs index 829d4b253bcb..b1e7821a542b 100644 --- a/src/ResourceManager/Resources/Commands.Resources/Models.Authorization/AuthorizationClientExtensions.cs +++ b/src/ResourceManager/Resources/Commands.Resources/Models.Authorization/AuthorizationClientExtensions.cs @@ -44,69 +44,82 @@ public static PSRoleDefinition ToPSRoleDefinition(this RoleDefinition role) return roleDefinition; } - public static PSRoleAssignment ToPSRoleAssignment(this RoleAssignment role, AuthorizationClient policyClient, ActiveDirectoryClient activeDirectoryClient, bool excludeAssignmentsForDeletedPrincipals = true) + public static IEnumerable ToPSRoleAssignments(this IEnumerable assignments, AuthorizationClient policyClient, ActiveDirectoryClient activeDirectoryClient, bool excludeAssignmentsForDeletedPrincipals = true) { - PSRoleDefinition roleDefinition = policyClient.GetRoleDefinition(role.Properties.RoleDefinitionId); - PSADObject adObject = activeDirectoryClient.GetADObject(new ADObjectFilterOptions { Id = role.Properties.PrincipalId.ToString() }) ?? new PSADObject() { Id = role.Properties.PrincipalId }; - - if (adObject is PSADUser) + List psAssignments = new List(); + if(assignments ==null || !assignments.Any()) { - return new PSUserRoleAssignment() - { - RoleAssignmentId = role.Id, - DisplayName = adObject.DisplayName, - Actions = roleDefinition.Actions, - NotActions = roleDefinition.NotActions, - RoleDefinitionName = roleDefinition.Name, - Scope = role.Properties.Scope, - UserPrincipalName = ((PSADUser)adObject).UserPrincipalName, - Mail = ((PSADUser)adObject).Mail, - ObjectId = adObject.Id - }; + return psAssignments; } - else if (adObject is PSADGroup) + + List objectIds = new List(); + objectIds.AddRange(assignments.Select(r => r.Properties.PrincipalId.ToString())); + List adObjects = activeDirectoryClient.GetObjectsByObjectId(objectIds); + + List roleDefinitions = policyClient.FilterRoleDefinitions(name: null); + + foreach (RoleAssignment assignment in assignments) { - return new PSGroupRoleAssignment() + PSADObject adObject = adObjects.SingleOrDefault(o => o.Id == assignment.Properties.PrincipalId) ?? new PSADObject() { Id = assignment.Properties.PrincipalId }; + PSRoleDefinition roleDefinition = roleDefinitions.SingleOrDefault(r => r.Id == assignment.Properties.RoleDefinitionId) ?? new PSRoleDefinition() { Id = assignment.Properties.RoleDefinitionId }; + + if (adObject is PSADUser) { - RoleAssignmentId = role.Id, - DisplayName = adObject.DisplayName, - Actions = roleDefinition.Actions, - NotActions = roleDefinition.NotActions, - RoleDefinitionName = roleDefinition.Name, - Scope = role.Properties.Scope, - Mail = ((PSADGroup)adObject).Mail, - ObjectId = adObject.Id - }; - } - else if (adObject is PSADServicePrincipal) - { - return new PSServiceRoleAssignment() + psAssignments.Add(new PSRoleAssignment() + { + RoleAssignmentId = assignment.Id, + DisplayName = adObject.DisplayName, + RoleDefinitionId = roleDefinition.Id.GuidFromFullyQualifiedId(), + RoleDefinitionName = roleDefinition.Name, + Scope = assignment.Properties.Scope, + SignInName = ((PSADUser)adObject).SignInName, + ObjectId = adObject.Id, + ObjectType = adObject.Type + }); + } + else if (adObject is PSADGroup) { - RoleAssignmentId = role.Id, - DisplayName = adObject.DisplayName, - Actions = roleDefinition.Actions, - NotActions = roleDefinition.NotActions, - RoleDefinitionName = roleDefinition.Name, - Scope = role.Properties.Scope, - ServicePrincipalName = ((PSADServicePrincipal)adObject).ServicePrincipalName, - ObjectId = adObject.Id - }; - } - else if (!excludeAssignmentsForDeletedPrincipals) - { - return new PSRoleAssignment() + psAssignments.Add(new PSRoleAssignment() + { + RoleAssignmentId = assignment.Id, + DisplayName = adObject.DisplayName, + RoleDefinitionId = roleDefinition.Id.GuidFromFullyQualifiedId(), + RoleDefinitionName = roleDefinition.Name, + Scope = assignment.Properties.Scope, + ObjectId = adObject.Id, + ObjectType = adObject.Type + }); + } + else if (adObject is PSADServicePrincipal) { - RoleAssignmentId = role.Id, - DisplayName = adObject.DisplayName, - Actions = roleDefinition.Actions, - NotActions = roleDefinition.NotActions, - RoleDefinitionName = roleDefinition.Name, - Scope = role.Properties.Scope, - ObjectId = adObject.Id - }; + psAssignments.Add(new PSRoleAssignment() + { + RoleAssignmentId = assignment.Id, + DisplayName = adObject.DisplayName, + RoleDefinitionId = roleDefinition.Id.GuidFromFullyQualifiedId(), + RoleDefinitionName = roleDefinition.Name, + Scope = assignment.Properties.Scope, + ObjectId = adObject.Id, + ObjectType = adObject.Type + }); + } + else if (!excludeAssignmentsForDeletedPrincipals) + { + psAssignments.Add(new PSRoleAssignment() + { + RoleAssignmentId = assignment.Id, + DisplayName = adObject.DisplayName, + RoleDefinitionId = roleDefinition.Id.GuidFromFullyQualifiedId(), + RoleDefinitionName = roleDefinition.Name, + Scope = assignment.Properties.Scope, + ObjectId = adObject.Id, + }); + } + + // Ignore the assignment if principal does not exists and excludeAssignmentsForDeletedPrincipals is set to true } - return null; + return psAssignments; } public static PSRoleAssignment ToPSRoleAssignment(this ClassicAdministrator classicAdministrator, string currentSubscriptionId) @@ -115,9 +128,15 @@ public static PSRoleAssignment ToPSRoleAssignment(this ClassicAdministrator clas { RoleDefinitionName = classicAdministrator.Properties.Role, DisplayName = classicAdministrator.Properties.EmailAddress, + SignInName = classicAdministrator.Properties.EmailAddress, Scope = "/subscriptions/" + currentSubscriptionId, - Actions = new List() {"*"} + ObjectType = "User" }; } + + private static string GuidFromFullyQualifiedId(this string Id) + { + return Id.TrimEnd('/').Substring(Id.LastIndexOf('/') + 1); + } } } diff --git a/src/ResourceManager/Resources/Commands.Resources/Models.Authorization/PSRoleAssignment.cs b/src/ResourceManager/Resources/Commands.Resources/Models.Authorization/PSRoleAssignment.cs index f6964f43d899..826cc2d4acfc 100644 --- a/src/ResourceManager/Resources/Commands.Resources/Models.Authorization/PSRoleAssignment.cs +++ b/src/ResourceManager/Resources/Commands.Resources/Models.Authorization/PSRoleAssignment.cs @@ -21,16 +21,18 @@ public class PSRoleAssignment { public string RoleAssignmentId { get; set; } - public string DisplayName { get; set; } + public string Scope { get; set; } - public string RoleDefinitionName { get; set; } + public string DisplayName { get; set; } - public List Actions { get; set; } + public string SignInName { get; set; } - public List NotActions { get; set; } + public string RoleDefinitionName { get; set; } - public string Scope { get; set; } + public string RoleDefinitionId { get; set; } public Guid ObjectId { get; set; } + + public string ObjectType { get; set; } } } diff --git a/src/ResourceManager/Resources/Commands.Resources/Properties/Resources.Designer.cs b/src/ResourceManager/Resources/Commands.Resources/Properties/Resources.Designer.cs index 721162c74cd3..6d83f79970e5 100644 --- a/src/ResourceManager/Resources/Commands.Resources/Properties/Resources.Designer.cs +++ b/src/ResourceManager/Resources/Commands.Resources/Properties/Resources.Designer.cs @@ -177,6 +177,15 @@ internal static string FileAlreadyExists { } } + /// + /// Looks up a localized string similar to IncludeClassicAdministrators is only supported for a User principal. + /// + internal static string IncludeClassicAdminsNotSupported { + get { + return ResourceManager.GetString("IncludeClassicAdminsNotSupported", resourceCulture); + } + } + /// /// Looks up a localized string similar to Invalid value for Actions. /// diff --git a/src/ResourceManager/Resources/Commands.Resources/Properties/Resources.resx b/src/ResourceManager/Resources/Commands.Resources/Properties/Resources.resx index 0d7cab205514..39d63d336787 100644 --- a/src/ResourceManager/Resources/Commands.Resources/Properties/Resources.resx +++ b/src/ResourceManager/Resources/Commands.Resources/Properties/Resources.resx @@ -312,4 +312,7 @@ Cannot find principal using the specified options + + IncludeClassicAdministrators is only supported for a User principal + \ No newline at end of file diff --git a/src/ResourceManager/Resources/Commands.Resources/RoleAssignments/GetAzureRoleAssignmentCommand.cs b/src/ResourceManager/Resources/Commands.Resources/RoleAssignments/GetAzureRoleAssignmentCommand.cs index dea9daf50188..dd8164ca3032 100644 --- a/src/ResourceManager/Resources/Commands.Resources/RoleAssignments/GetAzureRoleAssignmentCommand.cs +++ b/src/ResourceManager/Resources/Commands.Resources/RoleAssignments/GetAzureRoleAssignmentCommand.cs @@ -39,28 +39,17 @@ public class GetAzureRoleAssignmentCommand : ResourcesBaseCmdlet [Alias("Id", "PrincipalId")] public Guid ObjectId { get; set; } - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.Mail, - HelpMessage = "The user email address.")] - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceGroupWithMail, - HelpMessage = "The user email address.")] - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithMail, - HelpMessage = "The user email address.")] - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ScopeWithMail, - HelpMessage = "The user email address.")] + [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceGroupWithSignInName, + HelpMessage = "The user SignInName.")] + [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithSignInName, + HelpMessage = "The user SignInName.")] + [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ScopeWithSignInName, + HelpMessage = "The user SignInName.")] + [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.SignInName, + HelpMessage = "The user SignInName.")] [ValidateNotNullOrEmpty] - public string Mail { get; set; } - - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceGroupWithUPN, - HelpMessage = "The user UPN.")] - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithUPN, - HelpMessage = "The user UPN.")] - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ScopeWithUPN, - HelpMessage = "The user UPN.")] - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.UPN, - HelpMessage = "The user UPN.")] - [ValidateNotNullOrEmpty] - [Alias("UPN")] - public string UserPrincipalName { get; set; } + [Alias("Email", "UserPrincipalName")] + public string SignInName { get; set; } [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceGroupWithSPN, HelpMessage = "The app SPN.")] @@ -82,13 +71,9 @@ public class GetAzureRoleAssignmentCommand : ResourcesBaseCmdlet HelpMessage = "Resource group to assign the role to.")] [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithObjectId, HelpMessage = "Resource group to assign the role to.")] - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceGroupWithMail, - HelpMessage = "Resource group to assign the role to.")] - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithMail, + [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceGroupWithSignInName, HelpMessage = "Resource group to assign the role to.")] - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceGroupWithUPN, - HelpMessage = "Resource group to assign the role to.")] - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithUPN, + [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithSignInName, HelpMessage = "Resource group to assign the role to.")] [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceGroupWithSPN, HelpMessage = "Resource group to assign the role to.")] @@ -101,9 +86,7 @@ public class GetAzureRoleAssignmentCommand : ResourcesBaseCmdlet HelpMessage = "Resource to assign the role to.")] [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithObjectId, HelpMessage = "Resource to assign the role to.")] - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithMail, - HelpMessage = "Resource to assign the role to.")] - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithUPN, + [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithSignInName, HelpMessage = "Resource to assign the role to.")] [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithSPN, HelpMessage = "Resource to assign the role to.")] @@ -114,9 +97,7 @@ public class GetAzureRoleAssignmentCommand : ResourcesBaseCmdlet HelpMessage = "Type of the resource to assign the role to.")] [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithObjectId, HelpMessage = "Type of the resource to assign the role to.")] - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithMail, - HelpMessage = "Type of the resource to assign the role to.")] - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithUPN, + [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithSignInName, HelpMessage = "Type of the resource to assign the role to.")] [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithSPN, HelpMessage = "Type of the resource to assign the role to.")] @@ -127,9 +108,7 @@ public class GetAzureRoleAssignmentCommand : ResourcesBaseCmdlet HelpMessage = "Parent resource of the resource to assign the role to, if there is any.")] [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithObjectId, HelpMessage = "Parent resource of the resource to assign the role to, if there is any.")] - [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithMail, - HelpMessage = "Parent resource of the resource to assign the role to, if there is any.")] - [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithUPN, + [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithSignInName, HelpMessage = "Parent resource of the resource to assign the role to, if there is any.")] [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithSPN, HelpMessage = "Parent resource of the resource to assign the role to, if there is any.")] @@ -138,41 +117,33 @@ public class GetAzureRoleAssignmentCommand : ResourcesBaseCmdlet [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.Empty, HelpMessage = "Role to assign the principals with.")] - [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.Mail, - HelpMessage = "Role to assign the principals with.")] [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ObjectId, HelpMessage = "Role to assign the principals with.")] - [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.UPN, + [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.SignInName, HelpMessage = "Role to assign the principals with.")] [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.SPN, HelpMessage = "Role to assign the principals with.")] [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.Scope, HelpMessage = "Role to assign the principals with.")] - [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ScopeWithMail, - HelpMessage = "Role to assign the principals with.")] [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ScopeWithObjectId, HelpMessage = "Role to assign the principals with.")] - [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ScopeWithUPN, + [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ScopeWithSignInName, HelpMessage = "Role to assign the principals with.")] [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ScopeWithSPN, HelpMessage = "Role to assign the principals with.")] [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceGroup, HelpMessage = "Role to assign the principals with.")] - [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceGroupWithMail, - HelpMessage = "Role to assign the principals with.")] [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceGroupWithObjectId, HelpMessage = "Role to assign the principals with.")] - [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceGroupWithUPN, + [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceGroupWithSignInName, HelpMessage = "Role to assign the principals with.")] [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceGroupWithSPN, HelpMessage = "Role to assign the principals with.")] [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.Resource, HelpMessage = "Role to assign the principals with.")] - [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithMail, - HelpMessage = "Role to assign the principals with.")] [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithObjectId, HelpMessage = "Role to assign the principals with.")] - [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithUPN, + [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithSignInName, HelpMessage = "Role to assign the principals with.")] [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithSPN, HelpMessage = "Role to assign the principals with.")] @@ -183,60 +154,48 @@ public class GetAzureRoleAssignmentCommand : ResourcesBaseCmdlet HelpMessage = "Scope of the role assignment. In the format of relative URI.")] [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ScopeWithObjectId, HelpMessage = "Scope of the role assignment. In the format of relative URI.")] - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ScopeWithMail, - HelpMessage = "Scope of the role assignment. In the format of relative URI.")] - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ScopeWithUPN, + [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ScopeWithSignInName, HelpMessage = "Scope of the role assignment. In the format of relative URI.")] [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ScopeWithSPN, HelpMessage = "Scope of the role assignment. In the format of relative URI.")] [ValidateNotNullOrEmpty] public string Scope { get; set; } - [Parameter(Mandatory = false, ParameterSetName = ParameterSet.Mail, - HelpMessage = "If specified, returns role assignments directly assigned to the principal as well as assignments to the principal's groups (transitive). Supported only for User Principals.")] [Parameter(Mandatory = false, ParameterSetName = ParameterSet.ObjectId, HelpMessage = "If specified, returns role assignments directly assigned to the principal as well as assignments to the principal's groups (transitive). Supported only for User Principals.")] - [Parameter(Mandatory = false, ParameterSetName = ParameterSet.UPN, + [Parameter(Mandatory = false, ParameterSetName = ParameterSet.SignInName, HelpMessage = "If specified, returns role assignments directly assigned to the principal as well as assignments to the principal's groups (transitive). Supported only for User Principals.")] public SwitchParameter ExpandPrincipalGroups { get; set; } [Parameter(Mandatory = false, ParameterSetName = ParameterSet.Empty, HelpMessage = "If specified, also returns the subscription classic administrators as role assignments.")] - [Parameter(Mandatory = false, ParameterSetName = ParameterSet.Mail, - HelpMessage = "If specified, also returns the subscription classic administrators as role assignments.")] [Parameter(Mandatory = false, ParameterSetName = ParameterSet.ObjectId, HelpMessage = "If specified, also returns the subscription classic administrators as role assignments.")] - [Parameter(Mandatory = false, ParameterSetName = ParameterSet.UPN, + [Parameter(Mandatory = false, ParameterSetName = ParameterSet.SignInName, HelpMessage = "If specified, also returns the subscription classic administrators as role assignments.")] [Parameter(Mandatory = false, ParameterSetName = ParameterSet.SPN, HelpMessage = "If specified, also returns the subscription classic administrators as role assignments.")] [Parameter(Mandatory = false, ParameterSetName = ParameterSet.Scope, HelpMessage = "If specified, also returns the subscription classic administrators as role assignments.")] - [Parameter(Mandatory = false, ParameterSetName = ParameterSet.ScopeWithMail, - HelpMessage = "If specified, also returns the subscription classic administrators as role assignments.")] [Parameter(Mandatory = false, ParameterSetName = ParameterSet.ScopeWithObjectId, HelpMessage = "If specified, also returns the subscription classic administrators as role assignments.")] - [Parameter(Mandatory = false, ParameterSetName = ParameterSet.ScopeWithUPN, + [Parameter(Mandatory = false, ParameterSetName = ParameterSet.ScopeWithSignInName, HelpMessage = "If specified, also returns the subscription classic administrators as role assignments.")] [Parameter(Mandatory = false, ParameterSetName = ParameterSet.ScopeWithSPN, HelpMessage = "If specified, also returns the subscription classic administrators as role assignments.")] [Parameter(Mandatory = false, ParameterSetName = ParameterSet.ResourceGroup, HelpMessage = "If specified, also returns the subscription classic administrators as role assignments.")] - [Parameter(Mandatory = false, ParameterSetName = ParameterSet.ResourceGroupWithMail, - HelpMessage = "If specified, also returns the subscription classic administrators as role assignments.")] [Parameter(Mandatory = false, ParameterSetName = ParameterSet.ResourceGroupWithObjectId, HelpMessage = "If specified, also returns the subscription classic administrators as role assignments.")] - [Parameter(Mandatory = false, ParameterSetName = ParameterSet.ResourceGroupWithUPN, + [Parameter(Mandatory = false, ParameterSetName = ParameterSet.ResourceGroupWithSignInName, HelpMessage = "If specified, also returns the subscription classic administrators as role assignments.")] [Parameter(Mandatory = false, ParameterSetName = ParameterSet.ResourceGroupWithSPN, HelpMessage = "If specified, also returns the subscription classic administrators as role assignments.")] [Parameter(Mandatory = false, ParameterSetName = ParameterSet.Resource, HelpMessage = "If specified, also returns the subscription classic administrators as role assignments.")] - [Parameter(Mandatory = false, ParameterSetName = ParameterSet.ResourceWithMail, - HelpMessage = "If specified, also returns the subscription classic administrators as role assignments.")] [Parameter(Mandatory = false, ParameterSetName = ParameterSet.ResourceWithObjectId, HelpMessage = "If specified, also returns the subscription classic administrators as role assignments.")] - [Parameter(Mandatory = false, ParameterSetName = ParameterSet.ResourceWithUPN, + [Parameter(Mandatory = false, ParameterSetName = ParameterSet.ResourceWithSignInName, HelpMessage = "If specified, also returns the subscription classic administrators as role assignments.")] [Parameter(Mandatory = false, ParameterSetName = ParameterSet.ResourceWithSPN, HelpMessage = "If specified, also returns the subscription classic administrators as role assignments.")] @@ -250,8 +209,7 @@ protected override void ProcessRecord() RoleDefinition = RoleDefinitionName, ADObjectFilter = new ADObjectFilterOptions { - Mail = Mail, - UPN = UserPrincipalName, + SignInName = SignInName, SPN = ServicePrincipalName, Id = ObjectId == Guid.Empty ? null : ObjectId.ToString(), }, diff --git a/src/ResourceManager/Resources/Commands.Resources/RoleAssignments/NewAzureRoleAssignmentCommand.cs b/src/ResourceManager/Resources/Commands.Resources/RoleAssignments/NewAzureRoleAssignmentCommand.cs index 4b15520c9616..76459623096a 100644 --- a/src/ResourceManager/Resources/Commands.Resources/RoleAssignments/NewAzureRoleAssignmentCommand.cs +++ b/src/ResourceManager/Resources/Commands.Resources/RoleAssignments/NewAzureRoleAssignmentCommand.cs @@ -23,7 +23,7 @@ namespace Microsoft.Azure.Commands.Resources /// /// Creates new role assignment. /// - [Cmdlet(VerbsCommon.New, "AzureRmRoleAssignment"), OutputType(typeof(PSRoleAssignment))] + [Cmdlet(VerbsCommon.New, "AzureRmRoleAssignment", DefaultParameterSetName = ParameterSet.Empty), OutputType(typeof(PSRoleAssignment))] public class NewAzureRoleAssignmentCommand : ResourcesBaseCmdlet { [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceGroupWithObjectId, @@ -32,34 +32,21 @@ public class NewAzureRoleAssignmentCommand : ResourcesBaseCmdlet HelpMessage = "The user or group object id.")] [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ScopeWithObjectId, HelpMessage = "The user or group object id.")] - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ObjectId, + [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.Empty, HelpMessage = "The user or group object id.")] [ValidateNotNullOrEmpty] [Alias("Id", "PrincipalId")] public Guid ObjectId { get; set; } - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceGroupWithMail, - HelpMessage = "The user or group email address.")] - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithMail, - HelpMessage = "The user or group email address.")] - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ScopeWithMail, - HelpMessage = "The user or group email address.")] - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.Mail, - HelpMessage = "The user or group email address.")] + [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceGroupWithSignInName, + HelpMessage = "The user SignInName.")] + [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithSignInName, + HelpMessage = "The user SignInName.")] + [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ScopeWithSignInName, + HelpMessage = "The user SignInName.")] [ValidateNotNullOrEmpty] - public string Mail { get; set; } - - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceGroupWithUPN, - HelpMessage = "The user UPN.")] - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithUPN, - HelpMessage = "The user UPN.")] - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ScopeWithUPN, - HelpMessage = "The user UPN.")] - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.UPN, - HelpMessage = "The user UPN.")] - [ValidateNotNullOrEmpty] - [Alias("UPN")] - public string UserPrincipalName { get; set; } + [Alias("Email", "UserPrincipalName")] + public string SignInName { get; set; } [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceGroupWithSPN, HelpMessage = "The app SPN.")] @@ -67,8 +54,6 @@ public class NewAzureRoleAssignmentCommand : ResourcesBaseCmdlet HelpMessage = "The app SPN.")] [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ScopeWithSPN, HelpMessage = "The app SPN.")] - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.SPN, - HelpMessage = "The app SPN.")] [ValidateNotNullOrEmpty] [Alias("SPN")] public string ServicePrincipalName { get; set; } @@ -77,13 +62,9 @@ public class NewAzureRoleAssignmentCommand : ResourcesBaseCmdlet HelpMessage = "Resource group to assign the role to.")] [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithObjectId, HelpMessage = "Resource group to assign the role to.")] - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceGroupWithMail, - HelpMessage = "Resource group to assign the role to.")] - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithMail, - HelpMessage = "Resource group to assign the role to.")] - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceGroupWithUPN, + [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceGroupWithSignInName, HelpMessage = "Resource group to assign the role to.")] - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithUPN, + [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithSignInName, HelpMessage = "Resource group to assign the role to.")] [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceGroupWithSPN, HelpMessage = "Resource group to assign the role to.")] @@ -94,9 +75,7 @@ public class NewAzureRoleAssignmentCommand : ResourcesBaseCmdlet [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithObjectId, HelpMessage = "Resource to assign the role to.")] - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithMail, - HelpMessage = "Resource to assign the role to.")] - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithUPN, + [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithSignInName, HelpMessage = "Resource to assign the role to.")] [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithSPN, HelpMessage = "Resource to assign the role to.")] @@ -105,9 +84,7 @@ public class NewAzureRoleAssignmentCommand : ResourcesBaseCmdlet [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithObjectId, HelpMessage = "Type of the resource to assign the role to.")] - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithMail, - HelpMessage = "Type of the resource to assign the role to.")] - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithUPN, + [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithSignInName, HelpMessage = "Type of the resource to assign the role to.")] [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithSPN, HelpMessage = "Type of the resource to assign the role to.")] @@ -116,22 +93,20 @@ public class NewAzureRoleAssignmentCommand : ResourcesBaseCmdlet [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithObjectId, HelpMessage = "Parent resource of the resource to assign the role to, if there is any.")] - [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithMail, - HelpMessage = "Parent resource of the resource to assign the role to, if there is any.")] - [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithUPN, + [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithSignInName, HelpMessage = "Parent resource of the resource to assign the role to, if there is any.")] [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithSPN, HelpMessage = "Parent resource of the resource to assign the role to, if there is any.")] [ValidateNotNullOrEmpty] public string ParentResource { get; set; } - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ScopeWithObjectId, + [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.Empty, HelpMessage = "Scope of the role assignment. In the format of relative URI. If not specified, will assign the role at subscription level. If specified, it can either start with \"/subscriptions/\" or the part after that. If it's latter, the current subscription id will be used.")] - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ScopeWithMail, + [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ScopeWithObjectId, HelpMessage = "Scope of the role assignment. In the format of relative URI. If not specified, will assign the role at subscription level. If specified, it can either start with \"/subscriptions/\" or the part after that. If it's latter, the current subscription id will be used.")] - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ScopeWithUPN, + [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ScopeWithSignInName, HelpMessage = "Scope of the role assignment. In the format of relative URI. If not specified, will assign the role at subscription level. If specified, it can either start with \"/subscriptions/\" or the part after that. If it's latter, the current subscription id will be used.")] - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ScopeWithSPN, + [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ScopeWithSPN, HelpMessage = "Scope of the role assignment. In the format of relative URI. If not specified, will assign the role at subscription level. If specified, it can either start with \"/subscriptions/\" or the part after that. If it's latter, the current subscription id will be used.")] [ValidateNotNullOrEmpty] public string Scope { get; set; } @@ -148,8 +123,7 @@ protected override void ProcessRecord() RoleDefinition = RoleDefinitionName, ADObjectFilter = new ADObjectFilterOptions { - Mail = Mail, - UPN = UserPrincipalName, + SignInName = SignInName, SPN = ServicePrincipalName, Id = ObjectId == Guid.Empty ? null : ObjectId.ToString(), }, diff --git a/src/ResourceManager/Resources/Commands.Resources/RoleAssignments/RemoveAzureRoleAssignmentCommand.cs b/src/ResourceManager/Resources/Commands.Resources/RoleAssignments/RemoveAzureRoleAssignmentCommand.cs index 964bf0710cf2..193751b34c7b 100644 --- a/src/ResourceManager/Resources/Commands.Resources/RoleAssignments/RemoveAzureRoleAssignmentCommand.cs +++ b/src/ResourceManager/Resources/Commands.Resources/RoleAssignments/RemoveAzureRoleAssignmentCommand.cs @@ -32,73 +32,70 @@ public class RemoveAzureRoleAssignmentCommand : ResourcesBaseCmdlet HelpMessage = "The user or group object id")] [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithObjectId, HelpMessage = "The user or group object id.")] + [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceGroupWithObjectId, + HelpMessage = "The user or group object id.")] [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ScopeWithObjectId, HelpMessage = "The user or group object id.")] [ValidateNotNullOrEmpty] [Alias("Id", "PrincipalId")] public Guid ObjectId { get; set; } - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithMail, - HelpMessage = "The user or group email address.")] - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ScopeWithMail, - HelpMessage = "The user or group email address.")] - [ValidateNotNullOrEmpty] - public string Mail { get; set; } - - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithUPN, - HelpMessage = "The user UPN.")] - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ScopeWithUPN, - HelpMessage = "The user UPN.")] + [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithSignInName, + HelpMessage = "The user SignInName.")] + [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceGroupWithSignInName, + HelpMessage = "The user SignInName.")] + [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ScopeWithSignInName, + HelpMessage = "The user SignInName.")] [ValidateNotNullOrEmpty] - [Alias("UPN")] - public string UserPrincipalName { get; set; } + [Alias("Email", "UserPrincipalName")] + public string SignInName { get; set; } [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithSPN, HelpMessage = "The app SPN.")] + [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceGroupWithSPN, + HelpMessage = "The app SPN.")] [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ScopeWithSPN, HelpMessage = "The app SPN.")] [ValidateNotNullOrEmpty] [Alias("SPN")] public string ServicePrincipalName { get; set; } - [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithObjectId, + [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceGroupWithObjectId, + HelpMessage = "Resource group to assign the role to.")] + [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithObjectId, HelpMessage = "Resource group to assign the role to.")] - [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithMail, + [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceGroupWithSignInName, HelpMessage = "Resource group to assign the role to.")] - [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithUPN, + [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithSignInName, HelpMessage = "Resource group to assign the role to.")] - [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithSPN, + [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceGroupWithSPN, + HelpMessage = "Resource group to assign the role to.")] + [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithSPN, HelpMessage = "Resource group to assign the role to.")] [ValidateNotNullOrEmpty] public string ResourceGroupName { get; set; } - [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithObjectId, - HelpMessage = "Resource to assign the role to.")] - [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithMail, + [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithObjectId, HelpMessage = "Resource to assign the role to.")] - [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithUPN, + [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithSignInName, HelpMessage = "Resource to assign the role to.")] - [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithSPN, + [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithSPN, HelpMessage = "Resource to assign the role to.")] [ValidateNotNullOrEmpty] public string ResourceName { get; set; } - [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithObjectId, - HelpMessage = "Type of the resource to assign the role to.")] - [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithMail, + [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithObjectId, HelpMessage = "Type of the resource to assign the role to.")] - [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithUPN, + [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithSignInName, HelpMessage = "Type of the resource to assign the role to.")] - [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithSPN, + [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithSPN, HelpMessage = "Type of the resource to assign the role to.")] [ValidateNotNullOrEmpty] public string ResourceType { get; set; } [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithObjectId, HelpMessage = "Parent resource of the resource to assign the role to, if there is any.")] - [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithMail, - HelpMessage = "Parent resource of the resource to assign the role to, if there is any.")] - [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithUPN, + [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithSignInName, HelpMessage = "Parent resource of the resource to assign the role to, if there is any.")] [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ResourceWithSPN, HelpMessage = "Parent resource of the resource to assign the role to, if there is any.")] @@ -107,13 +104,11 @@ public class RemoveAzureRoleAssignmentCommand : ResourcesBaseCmdlet [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.Empty, HelpMessage = "Role to assign the principals with.")] - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ScopeWithObjectId, - HelpMessage = "Scope of the role assignment. In the format of relative URI. If not specified, will assign the role at subscription level. If specified, it can either start with \"/subscriptions/\" or the part after that. If it's latter, the current subscription id will be used.")] - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ScopeWithMail, + [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ScopeWithObjectId, HelpMessage = "Scope of the role assignment. In the format of relative URI. If not specified, will assign the role at subscription level. If specified, it can either start with \"/subscriptions/\" or the part after that. If it's latter, the current subscription id will be used.")] - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ScopeWithUPN, + [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ScopeWithSignInName, HelpMessage = "Scope of the role assignment. In the format of relative URI. If not specified, will assign the role at subscription level. If specified, it can either start with \"/subscriptions/\" or the part after that. If it's latter, the current subscription id will be used.")] - [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ScopeWithSPN, + [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, ParameterSetName = ParameterSet.ScopeWithSPN, HelpMessage = "Scope of the role assignment. In the format of relative URI. If not specified, will assign the role at subscription level. If specified, it can either start with \"/subscriptions/\" or the part after that. If it's latter, the current subscription id will be used.")] [ValidateNotNullOrEmpty] public string Scope { get; set; } @@ -137,9 +132,8 @@ protected override void ProcessRecord() RoleDefinition = RoleDefinitionName, ADObjectFilter = new ADObjectFilterOptions { - Mail = Mail, + SignInName = SignInName, Id = ObjectId == Guid.Empty ? null : ObjectId.ToString(), - UPN = UserPrincipalName, SPN = ServicePrincipalName }, ResourceIdentifier = new ResourceIdentifier() diff --git a/src/ResourceManager/Resources/Commands.Resources/packages.config b/src/ResourceManager/Resources/Commands.Resources/packages.config index 2c57e0a9465d..e0420e43bf50 100644 --- a/src/ResourceManager/Resources/Commands.Resources/packages.config +++ b/src/ResourceManager/Resources/Commands.Resources/packages.config @@ -2,10 +2,10 @@ - + - + diff --git a/src/ResourceManager/Resources/NuGet.Config b/src/ResourceManager/Resources/NuGet.Config new file mode 100644 index 000000000000..2de911013532 --- /dev/null +++ b/src/ResourceManager/Resources/NuGet.Config @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/ResourceManager/Resources/Resources.sln b/src/ResourceManager/Resources/Resources.sln new file mode 100644 index 000000000000..8fb07dab530d --- /dev/null +++ b/src/ResourceManager/Resources/Resources.sln @@ -0,0 +1,69 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.31101.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{95C16AED-FD57-42A0-86C3-2CF4300A4817}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ResourceManager.Common", "..\Common\Commands.ResourceManager.Common\Commands.ResourceManager.Common.csproj", "{3819D8A7-C62C-4C47-8DDD-0332D9CE1252}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Resources", "Commands.Resources\Commands.Resources.csproj", "{E1F5201D-6067-430E-B303-4E367652991B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Tags", "..\Tags\Commands.Tags\Commands.Tags.csproj", "{2493A8F7-1949-4F29-8D53-9D459046C3B8}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Resources.Test", "Commands.Resources.Test\Commands.Resources.Test.csproj", "{4C2FE49A-09E1-4979-AD46-CD64FD04C8F7}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Resources.Rest", "Commands.ResourceManager\Cmdlets\Commands.Resources.Rest.csproj", "{8058D403-06E3-4BED-8924-D166CE303961}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ScenarioTests.ResourceManager.Common", "..\Common\Commands.ScenarioTests.ResourceManager.Common\Commands.ScenarioTests.ResourceManager.Common.csproj", "{3436A126-EDC9-4060-8952-9A1BE34CDD95}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Profile", "..\Profile\Commands.Profile\Commands.Profile.csproj", "{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common", "..\..\Common\Commands.Common\Commands.Common.csproj", "{5EE72C53-1720-4309-B54B-5FB79703195F}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.Build.0 = Release|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Release|Any CPU.Build.0 = Release|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Release|Any CPU.Build.0 = Release|Any CPU + {4C2FE49A-09E1-4979-AD46-CD64FD04C8F7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4C2FE49A-09E1-4979-AD46-CD64FD04C8F7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4C2FE49A-09E1-4979-AD46-CD64FD04C8F7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4C2FE49A-09E1-4979-AD46-CD64FD04C8F7}.Release|Any CPU.Build.0 = Release|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Release|Any CPU.Build.0 = Release|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Release|Any CPU.Build.0 = Release|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.Build.0 = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {4C2FE49A-09E1-4979-AD46-CD64FD04C8F7} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} + {3436A126-EDC9-4060-8952-9A1BE34CDD95} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} + EndGlobalSection +EndGlobal diff --git a/src/ResourceManager/SiteRecovery/Commands.SiteRecovery.Test/Commands.SiteRecovery.Test.csproj b/src/ResourceManager/SiteRecovery/Commands.SiteRecovery.Test/Commands.SiteRecovery.Test.csproj index ab06dba64c3a..1be3f12c9a7a 100644 --- a/src/ResourceManager/SiteRecovery/Commands.SiteRecovery.Test/Commands.SiteRecovery.Test.csproj +++ b/src/ResourceManager/SiteRecovery/Commands.SiteRecovery.Test/Commands.SiteRecovery.Test.csproj @@ -35,7 +35,7 @@ - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -158,6 +158,10 @@ + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common @@ -175,21 +179,5 @@ - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - \ No newline at end of file diff --git a/src/ResourceManager/SiteRecovery/Commands.SiteRecovery.Test/ScenarioTests/SiteRecoveryTestsBase.cs b/src/ResourceManager/SiteRecovery/Commands.SiteRecovery.Test/ScenarioTests/SiteRecoveryTestsBase.cs index 60382e454d4e..6f6763dc9b5e 100644 --- a/src/ResourceManager/SiteRecovery/Commands.SiteRecovery.Test/ScenarioTests/SiteRecoveryTestsBase.cs +++ b/src/ResourceManager/SiteRecovery/Commands.SiteRecovery.Test/ScenarioTests/SiteRecoveryTestsBase.cs @@ -12,7 +12,6 @@ // limitations under the License. // ---------------------------------------------------------------------------------- -using System; using System.IO; using System.Net; using System.Net.Security; @@ -20,15 +19,11 @@ using System.Xml; using Microsoft.Azure.Test.HttpRecorder; using Microsoft.Azure.Portal.RecoveryServices.Models.Common; -using Microsoft.WindowsAzure; using Microsoft.WindowsAzure.Commands.ScenarioTest; -using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Management.Scheduler; using Microsoft.Azure.Management.RecoveryServices; using Microsoft.Azure.Management.SiteRecovery; using Microsoft.Azure.Test; -using Microsoft.WindowsAzure.Commands.Common; -using Microsoft.Azure.Common.Authentication.Models; using Microsoft.Azure.Common.Authentication; using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; @@ -103,9 +98,10 @@ protected void RunPowerShellTest(params string[] scripts) SetupManagementClients(); helper.SetupEnvironment(AzureModule.AzureResourceManager); - helper.SetupModules(AzureModule.AzureResourceManager, - "ScenarioTests\\" + this.GetType().Name + ".ps1"); - + helper.SetupModules(AzureModule.AzureResourceManager, + "ScenarioTests\\" + this.GetType().Name + ".ps1", + helper.RMProfileModule, + helper.GetRMModulePath(@"AzureRM.SiteRecovery.psd1")); helper.RunPowerShellTest(scripts); } } diff --git a/src/ResourceManager/SiteRecovery/Commands.SiteRecovery.Test/packages.config b/src/ResourceManager/SiteRecovery/Commands.SiteRecovery.Test/packages.config index 6e688014a2f7..2685448c48cc 100644 --- a/src/ResourceManager/SiteRecovery/Commands.SiteRecovery.Test/packages.config +++ b/src/ResourceManager/SiteRecovery/Commands.SiteRecovery.Test/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Commands.SiteRecovery.csproj b/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Commands.SiteRecovery.csproj index 536870b24bd1..382f2475bec6 100644 --- a/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Commands.SiteRecovery.csproj +++ b/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/Commands.SiteRecovery.csproj @@ -44,7 +44,7 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -188,25 +188,15 @@ + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/packages.config b/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/packages.config index a8552a4e8425..12d913cb0f28 100644 --- a/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/packages.config +++ b/src/ResourceManager/SiteRecovery/Commands.SiteRecovery/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/ResourceManager/SiteRecovery/NuGet.Config b/src/ResourceManager/SiteRecovery/NuGet.Config new file mode 100644 index 000000000000..2de911013532 --- /dev/null +++ b/src/ResourceManager/SiteRecovery/NuGet.Config @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/ResourceManager/SiteRecovery/SiteRecovery.sln b/src/ResourceManager/SiteRecovery/SiteRecovery.sln new file mode 100644 index 000000000000..2136cd6804f0 --- /dev/null +++ b/src/ResourceManager/SiteRecovery/SiteRecovery.sln @@ -0,0 +1,57 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.31101.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{95C16AED-FD57-42A0-86C3-2CF4300A4817}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ResourceManager.Common", "..\Common\Commands.ResourceManager.Common\Commands.ResourceManager.Common.csproj", "{3819D8A7-C62C-4C47-8DDD-0332D9CE1252}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.SiteRecovery", "Commands.SiteRecovery\Commands.SiteRecovery.csproj", "{7C879645-31EE-4A78-AD81-5512300FA104}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.SiteRecovery.Test", "Commands.SiteRecovery.Test\Commands.SiteRecovery.Test.csproj", "{6C7D3D81-37AB-445E-8081-78A1FEC0A773}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ScenarioTests.ResourceManager.Common", "..\Common\Commands.ScenarioTests.ResourceManager.Common\Commands.ScenarioTests.ResourceManager.Common.csproj", "{3436A126-EDC9-4060-8952-9A1BE34CDD95}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Profile", "..\Profile\Commands.Profile\Commands.Profile.csproj", "{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common", "..\..\Common\Commands.Common\Commands.Common.csproj", "{5EE72C53-1720-4309-B54B-5FB79703195F}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.Build.0 = Release|Any CPU + {7C879645-31EE-4A78-AD81-5512300FA104}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7C879645-31EE-4A78-AD81-5512300FA104}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7C879645-31EE-4A78-AD81-5512300FA104}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7C879645-31EE-4A78-AD81-5512300FA104}.Release|Any CPU.Build.0 = Release|Any CPU + {6C7D3D81-37AB-445E-8081-78A1FEC0A773}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6C7D3D81-37AB-445E-8081-78A1FEC0A773}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6C7D3D81-37AB-445E-8081-78A1FEC0A773}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6C7D3D81-37AB-445E-8081-78A1FEC0A773}.Release|Any CPU.Build.0 = Release|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Release|Any CPU.Build.0 = Release|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.Build.0 = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {6C7D3D81-37AB-445E-8081-78A1FEC0A773} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} + {3436A126-EDC9-4060-8952-9A1BE34CDD95} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} + EndGlobalSection +EndGlobal diff --git a/src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj b/src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj index 9c00abcef899..483486a43428 100644 --- a/src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj +++ b/src/ResourceManager/Sql/Commands.Sql.Test/Commands.Sql.Test.csproj @@ -48,7 +48,7 @@ ..\..\..\packages\Hyak.Common.1.0.2\lib\net45\Hyak.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -244,6 +244,10 @@ + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common @@ -540,19 +544,5 @@ - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/SqlTestsBase.cs b/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/SqlTestsBase.cs index 4ef2d3d245a3..092b9453f827 100644 --- a/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/SqlTestsBase.cs +++ b/src/ResourceManager/Sql/Commands.Sql.Test/ScenarioTests/SqlTestsBase.cs @@ -16,18 +16,15 @@ using Microsoft.Azure.Management.Resources; using Microsoft.Azure.Test.HttpRecorder; using Microsoft.WindowsAzure.Commands.ScenarioTest; -using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Management.Storage; using Microsoft.Azure.Test; using Microsoft.Azure.Graph.RBAC; using Microsoft.Azure.Common.Authentication; using Microsoft.Azure.Management.Authorization; -using Microsoft.Azure.Commands.Resources.Models.ActiveDirectory; using System; using System.Collections.Generic; using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; using Microsoft.Azure.Commands.ResourceManager.Common; -using Microsoft.Azure.Common.Authentication.Models; namespace Microsoft.Azure.Commands.ScenarioTest.SqlTests @@ -72,8 +69,15 @@ protected void RunPowerShellTest(params string[] scripts) helper.SetupEnvironment(); - helper.SetupModules(AzureModule.AzureResourceManager, "ScenarioTests\\Common.ps1", - "ScenarioTests\\" + this.GetType().Name + ".ps1"); + helper.SetupModules(AzureModule.AzureResourceManager, + "ScenarioTests\\Common.ps1", + "ScenarioTests\\" + this.GetType().Name + ".ps1", + helper.RMProfileModule, + helper.RMResourceModule, + helper.RMStorageDataPlaneModule, + helper.RMStorageModule, + helper.GetRMModulePath(@"AzureRM.Insights.psd1"), + helper.GetRMModulePath(@"AzureRM.Sql.psd1")); helper.RunPowerShellTest(scripts); } diff --git a/src/ResourceManager/Sql/Commands.Sql.Test/packages.config b/src/ResourceManager/Sql/Commands.Sql.Test/packages.config index 8dedab95675b..c61fbc7a64de 100644 --- a/src/ResourceManager/Sql/Commands.Sql.Test/packages.config +++ b/src/ResourceManager/Sql/Commands.Sql.Test/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/ResourceManager/Sql/Commands.Sql/Commands.Sql.csproj b/src/ResourceManager/Sql/Commands.Sql/Commands.Sql.csproj index 5083d79a2b56..378e4f5bfad5 100644 --- a/src/ResourceManager/Sql/Commands.Sql/Commands.Sql.csproj +++ b/src/ResourceManager/Sql/Commands.Sql/Commands.Sql.csproj @@ -252,7 +252,7 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -351,6 +351,10 @@ + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common @@ -369,6 +373,5 @@ - - + \ No newline at end of file diff --git a/src/ResourceManager/Sql/Commands.Sql/packages.config b/src/ResourceManager/Sql/Commands.Sql/packages.config index 4d5c9f30042d..f181c1710fa6 100644 --- a/src/ResourceManager/Sql/Commands.Sql/packages.config +++ b/src/ResourceManager/Sql/Commands.Sql/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/ResourceManager/Sql/NuGet.Config b/src/ResourceManager/Sql/NuGet.Config new file mode 100644 index 000000000000..2de911013532 --- /dev/null +++ b/src/ResourceManager/Sql/NuGet.Config @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/ResourceManager/Sql/Sql.sln b/src/ResourceManager/Sql/Sql.sln new file mode 100644 index 000000000000..8dcf5b48785b --- /dev/null +++ b/src/ResourceManager/Sql/Sql.sln @@ -0,0 +1,105 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.31101.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{95C16AED-FD57-42A0-86C3-2CF4300A4817}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ResourceManager.Common", "..\Common\Commands.ResourceManager.Common\Commands.ResourceManager.Common.csproj", "{3819D8A7-C62C-4C47-8DDD-0332D9CE1252}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Sql", "Commands.Sql\Commands.Sql.csproj", "{69ED499E-6F3C-488F-86B8-B74CFDA4D47E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common.Storage", "..\..\Common\Commands.Common.Storage\Commands.Common.Storage.csproj", "{65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Sql.Test", "Commands.Sql.Test\Commands.Sql.Test.csproj", "{56ED8C97-53B9-4DF6-ACB5-7E6800105BF8}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Profile", "..\Profile\Commands.Profile\Commands.Profile.csproj", "{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ScenarioTests.ResourceManager.Common", "..\Common\Commands.ScenarioTests.ResourceManager.Common\Commands.ScenarioTests.ResourceManager.Common.csproj", "{3436A126-EDC9-4060-8952-9A1BE34CDD95}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Resources", "..\Resources\Commands.Resources\Commands.Resources.csproj", "{E1F5201D-6067-430E-B303-4E367652991B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Resources.Rest", "..\Resources\Commands.ResourceManager\Cmdlets\Commands.Resources.Rest.csproj", "{8058D403-06E3-4BED-8924-D166CE303961}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Tags", "..\Tags\Commands.Tags\Commands.Tags.csproj", "{2493A8F7-1949-4F29-8D53-9D459046C3B8}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Management.Storage", "..\Storage\Commands.Management.Storage\Commands.Management.Storage.csproj", "{A50AB133-5C04-4A17-9054-F8343683EC23}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage", "..\..\Common\Storage\Commands.Storage\Commands.Storage.csproj", "{08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common", "..\..\Common\Commands.Common\Commands.Common.csproj", "{5EE72C53-1720-4309-B54B-5FB79703195F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Insights", "..\Insights\Commands.Insights\Commands.Insights.csproj", "{DEA446A1-84E2-46CC-B780-EB4AFDE2460E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ServiceManagement.Common", "..\..\ServiceManagement\Common\Commands.ServiceManagement.Common\Commands.ServiceManagement.Common.csproj", "{CFF09E81-1E31-444E-B4D4-A21E946C29E2}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.Build.0 = Release|Any CPU + {69ED499E-6F3C-488F-86B8-B74CFDA4D47E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {69ED499E-6F3C-488F-86B8-B74CFDA4D47E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {69ED499E-6F3C-488F-86B8-B74CFDA4D47E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {69ED499E-6F3C-488F-86B8-B74CFDA4D47E}.Release|Any CPU.Build.0 = Release|Any CPU + {65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Release|Any CPU.Build.0 = Release|Any CPU + {56ED8C97-53B9-4DF6-ACB5-7E6800105BF8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {56ED8C97-53B9-4DF6-ACB5-7E6800105BF8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {56ED8C97-53B9-4DF6-ACB5-7E6800105BF8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {56ED8C97-53B9-4DF6-ACB5-7E6800105BF8}.Release|Any CPU.Build.0 = Release|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.Build.0 = Release|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Release|Any CPU.Build.0 = Release|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Release|Any CPU.Build.0 = Release|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Release|Any CPU.Build.0 = Release|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Release|Any CPU.Build.0 = Release|Any CPU + {A50AB133-5C04-4A17-9054-F8343683EC23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A50AB133-5C04-4A17-9054-F8343683EC23}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A50AB133-5C04-4A17-9054-F8343683EC23}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A50AB133-5C04-4A17-9054-F8343683EC23}.Release|Any CPU.Build.0 = Release|Any CPU + {08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}.Release|Any CPU.Build.0 = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.Build.0 = Release|Any CPU + {DEA446A1-84E2-46CC-B780-EB4AFDE2460E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {DEA446A1-84E2-46CC-B780-EB4AFDE2460E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {DEA446A1-84E2-46CC-B780-EB4AFDE2460E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {DEA446A1-84E2-46CC-B780-EB4AFDE2460E}.Release|Any CPU.Build.0 = Release|Any CPU + {CFF09E81-1E31-444E-B4D4-A21E946C29E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CFF09E81-1E31-444E-B4D4-A21E946C29E2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CFF09E81-1E31-444E-B4D4-A21E946C29E2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CFF09E81-1E31-444E-B4D4-A21E946C29E2}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {56ED8C97-53B9-4DF6-ACB5-7E6800105BF8} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} + {3436A126-EDC9-4060-8952-9A1BE34CDD95} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} + EndGlobalSection +EndGlobal diff --git a/src/ResourceManager/Storage/Commands.Management.Storage.Test/Commands.Management.Storage.Test.csproj b/src/ResourceManager/Storage/Commands.Management.Storage.Test/Commands.Management.Storage.Test.csproj index e9e9552370ad..5a73577fae3d 100644 --- a/src/ResourceManager/Storage/Commands.Management.Storage.Test/Commands.Management.Storage.Test.csproj +++ b/src/ResourceManager/Storage/Commands.Management.Storage.Test/Commands.Management.Storage.Test.csproj @@ -40,7 +40,7 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -165,19 +165,5 @@ - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/src/ResourceManager/Storage/Commands.Management.Storage.Test/TestController.cs b/src/ResourceManager/Storage/Commands.Management.Storage.Test/TestController.cs index 4fe460da4a3e..062db8b4d306 100644 --- a/src/ResourceManager/Storage/Commands.Management.Storage.Test/TestController.cs +++ b/src/ResourceManager/Storage/Commands.Management.Storage.Test/TestController.cs @@ -102,9 +102,8 @@ public void RunPsTestWorkflow( var callingClassName = callingClassType .Split(new[] { "." }, StringSplitOptions.RemoveEmptyEntries) .Last(); - helper.SetupModules( - AzureModule.AzureResourceManager, - "ScenarioTests\\Common.ps1", + helper.SetupModules(AzureModule.AzureResourceManager, + "ScenarioTests\\Common.ps1", "ScenarioTests\\" + callingClassName + ".ps1"); try diff --git a/src/ResourceManager/Storage/Commands.Management.Storage.Test/packages.config b/src/ResourceManager/Storage/Commands.Management.Storage.Test/packages.config index 5b24dce45356..2c1c4b18c888 100644 --- a/src/ResourceManager/Storage/Commands.Management.Storage.Test/packages.config +++ b/src/ResourceManager/Storage/Commands.Management.Storage.Test/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/ResourceManager/Storage/Commands.Management.Storage/Commands.Management.Storage.csproj b/src/ResourceManager/Storage/Commands.Management.Storage/Commands.Management.Storage.csproj index bb17d972b332..4c9d64927485 100644 --- a/src/ResourceManager/Storage/Commands.Management.Storage/Commands.Management.Storage.csproj +++ b/src/ResourceManager/Storage/Commands.Management.Storage/Commands.Management.Storage.csproj @@ -54,7 +54,7 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -140,6 +140,10 @@ + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common @@ -154,19 +158,5 @@ - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/src/ResourceManager/Storage/Commands.Management.Storage/packages.config b/src/ResourceManager/Storage/Commands.Management.Storage/packages.config index c9df8289e4c5..40167b0ba176 100644 --- a/src/ResourceManager/Storage/Commands.Management.Storage/packages.config +++ b/src/ResourceManager/Storage/Commands.Management.Storage/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/ResourceManager/Storage/NuGet.Config b/src/ResourceManager/Storage/NuGet.Config new file mode 100644 index 000000000000..2de911013532 --- /dev/null +++ b/src/ResourceManager/Storage/NuGet.Config @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/ResourceManager/Storage/Storage.sln b/src/ResourceManager/Storage/Storage.sln new file mode 100644 index 000000000000..7af18caf0872 --- /dev/null +++ b/src/ResourceManager/Storage/Storage.sln @@ -0,0 +1,39 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.31101.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common.Storage", "..\..\Common\Commands.Common.Storage\Commands.Common.Storage.csproj", "{65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common", "..\..\Common\Commands.Common\Commands.Common.csproj", "{5EE72C53-1720-4309-B54B-5FB79703195F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage", "..\..\Common\Storage\Commands.Storage\Commands.Storage.csproj", "{08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ServiceManagement.Common", "..\..\ServiceManagement\Common\Commands.ServiceManagement.Common\Commands.ServiceManagement.Common.csproj", "{CFF09E81-1E31-444E-B4D4-A21E946C29E2}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Release|Any CPU.Build.0 = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.Build.0 = Release|Any CPU + {08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}.Release|Any CPU.Build.0 = Release|Any CPU + {CFF09E81-1E31-444E-B4D4-A21E946C29E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CFF09E81-1E31-444E-B4D4-A21E946C29E2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CFF09E81-1E31-444E-B4D4-A21E946C29E2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CFF09E81-1E31-444E-B4D4-A21E946C29E2}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/Commands.StreamAnalytics.Test.csproj b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/Commands.StreamAnalytics.Test.csproj index 94b78981337e..ae228b44f30c 100644 --- a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/Commands.StreamAnalytics.Test.csproj +++ b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/Commands.StreamAnalytics.Test.csproj @@ -48,7 +48,7 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -170,6 +170,10 @@ {65c3a86a-716d-4e7d-ab67-1db00b3bf72d} Commands.Common.Storage + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common @@ -216,20 +220,5 @@ - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - \ No newline at end of file diff --git a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/ScenarioTests/StreamAnalyticsScenarioTestsBase.cs b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/ScenarioTests/StreamAnalyticsScenarioTestsBase.cs index 526ba05e29c5..7fa1fc97e9ec 100644 --- a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/ScenarioTests/StreamAnalyticsScenarioTestsBase.cs +++ b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/ScenarioTests/StreamAnalyticsScenarioTestsBase.cs @@ -19,7 +19,6 @@ using Microsoft.Azure.Management.StreamAnalytics; using Microsoft.Azure.Subscriptions; using Microsoft.WindowsAzure.Commands.ScenarioTest; -using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.WindowsAzure.Management.Storage; using Microsoft.Azure.Test; using Microsoft.WindowsAzure.Commands.Test.Utilities.Common; @@ -59,7 +58,10 @@ protected void RunPowerShellTest(params string[] scripts) SetupManagementClients(); helper.SetupEnvironment(AzureModule.AzureResourceManager); - helper.SetupModules(AzureModule.AzureResourceManager, "ScenarioTests\\" + this.GetType().Name + ".ps1"); + helper.SetupModules(AzureModule.AzureResourceManager, + "ScenarioTests\\" + this.GetType().Name + ".ps1", + helper.RMProfileModule, + helper.GetRMModulePath(@"AzureRM.StreamAnalytics.psd1")); helper.RunPowerShellTest(scripts); } diff --git a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/packages.config b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/packages.config index 3de3f7ab6aad..a443e2b6c62d 100644 --- a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/packages.config +++ b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics.Test/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Commands.StreamAnalytics.csproj b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Commands.StreamAnalytics.csproj index 7486052d0a41..39fb94439d54 100644 --- a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Commands.StreamAnalytics.csproj +++ b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/Commands.StreamAnalytics.csproj @@ -54,8 +54,8 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -212,12 +212,15 @@ + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common - - + \ No newline at end of file diff --git a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/packages.config b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/packages.config index 198350208389..2c2a52d8ab8a 100644 --- a/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/packages.config +++ b/src/ResourceManager/StreamAnalytics/Commands.StreamAnalytics/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/ResourceManager/StreamAnalytics/NuGet.Config b/src/ResourceManager/StreamAnalytics/NuGet.Config new file mode 100644 index 000000000000..2de911013532 --- /dev/null +++ b/src/ResourceManager/StreamAnalytics/NuGet.Config @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/ResourceManager/StreamAnalytics/StreamAnalytics.sln b/src/ResourceManager/StreamAnalytics/StreamAnalytics.sln new file mode 100644 index 000000000000..9d241c5dc78e --- /dev/null +++ b/src/ResourceManager/StreamAnalytics/StreamAnalytics.sln @@ -0,0 +1,93 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.31101.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{95C16AED-FD57-42A0-86C3-2CF4300A4817}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ResourceManager.Common", "..\Common\Commands.ResourceManager.Common\Commands.ResourceManager.Common.csproj", "{3819D8A7-C62C-4C47-8DDD-0332D9CE1252}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.DataFactories", "..\DataFactories\Commands.DataFactories\Commands.DataFactories.csproj", "{9577252E-0A6B-4D61-86E8-95F7F309A987}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Management.Storage", "..\Storage\Commands.Management.Storage\Commands.Management.Storage.csproj", "{A50AB133-5C04-4A17-9054-F8343683EC23}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.StreamAnalytics", "Commands.StreamAnalytics\Commands.StreamAnalytics.csproj", "{F49A314A-A235-47D3-A654-1EC19ACA366C}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common.Storage", "..\..\Common\Commands.Common.Storage\Commands.Common.Storage.csproj", "{65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.StreamAnalytics.Test", "Commands.StreamAnalytics.Test\Commands.StreamAnalytics.Test.csproj", "{7E6683BE-ECFF-4709-89EB-1325E9E70512}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Profile", "..\Profile\Commands.Profile\Commands.Profile.csproj", "{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ScenarioTests.ResourceManager.Common", "..\Common\Commands.ScenarioTests.ResourceManager.Common\Commands.ScenarioTests.ResourceManager.Common.csproj", "{3436A126-EDC9-4060-8952-9A1BE34CDD95}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common", "..\..\Common\Commands.Common\Commands.Common.csproj", "{5EE72C53-1720-4309-B54B-5FB79703195F}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Resources", "..\Resources\Commands.Resources\Commands.Resources.csproj", "{E1F5201D-6067-430E-B303-4E367652991B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Resources.Rest", "..\Resources\Commands.ResourceManager\Cmdlets\Commands.Resources.Rest.csproj", "{8058D403-06E3-4BED-8924-D166CE303961}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Tags", "..\Tags\Commands.Tags\Commands.Tags.csproj", "{2493A8F7-1949-4F29-8D53-9D459046C3B8}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.Build.0 = Release|Any CPU + {9577252E-0A6B-4D61-86E8-95F7F309A987}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9577252E-0A6B-4D61-86E8-95F7F309A987}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9577252E-0A6B-4D61-86E8-95F7F309A987}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9577252E-0A6B-4D61-86E8-95F7F309A987}.Release|Any CPU.Build.0 = Release|Any CPU + {A50AB133-5C04-4A17-9054-F8343683EC23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A50AB133-5C04-4A17-9054-F8343683EC23}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A50AB133-5C04-4A17-9054-F8343683EC23}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A50AB133-5C04-4A17-9054-F8343683EC23}.Release|Any CPU.Build.0 = Release|Any CPU + {F49A314A-A235-47D3-A654-1EC19ACA366C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F49A314A-A235-47D3-A654-1EC19ACA366C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F49A314A-A235-47D3-A654-1EC19ACA366C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F49A314A-A235-47D3-A654-1EC19ACA366C}.Release|Any CPU.Build.0 = Release|Any CPU + {65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}.Release|Any CPU.Build.0 = Release|Any CPU + {7E6683BE-ECFF-4709-89EB-1325E9E70512}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {7E6683BE-ECFF-4709-89EB-1325E9E70512}.Debug|Any CPU.Build.0 = Debug|Any CPU + {7E6683BE-ECFF-4709-89EB-1325E9E70512}.Release|Any CPU.ActiveCfg = Release|Any CPU + {7E6683BE-ECFF-4709-89EB-1325E9E70512}.Release|Any CPU.Build.0 = Release|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.Build.0 = Release|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Release|Any CPU.Build.0 = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.Build.0 = Release|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Release|Any CPU.Build.0 = Release|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Release|Any CPU.Build.0 = Release|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {7E6683BE-ECFF-4709-89EB-1325E9E70512} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} + {3436A126-EDC9-4060-8952-9A1BE34CDD95} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} + EndGlobalSection +EndGlobal diff --git a/src/ResourceManager/Tags/Commands.Tags/Commands.Tags.csproj b/src/ResourceManager/Tags/Commands.Tags/Commands.Tags.csproj index 3bdba790afb9..f20c63e0f405 100644 --- a/src/ResourceManager/Tags/Commands.Tags/Commands.Tags.csproj +++ b/src/ResourceManager/Tags/Commands.Tags/Commands.Tags.csproj @@ -55,7 +55,7 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -161,16 +161,15 @@ + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common - - - - - - + \ No newline at end of file diff --git a/src/ResourceManager/Tags/Commands.Tags/packages.config b/src/ResourceManager/Tags/Commands.Tags/packages.config index 7b3702039384..39075986661f 100644 --- a/src/ResourceManager/Tags/Commands.Tags/packages.config +++ b/src/ResourceManager/Tags/Commands.Tags/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/ResourceManager/Tags/NuGet.Config b/src/ResourceManager/Tags/NuGet.Config new file mode 100644 index 000000000000..2de911013532 --- /dev/null +++ b/src/ResourceManager/Tags/NuGet.Config @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/ResourceManager/Tags/Tags.sln b/src/ResourceManager/Tags/Tags.sln new file mode 100644 index 000000000000..d4527bd8a3d9 --- /dev/null +++ b/src/ResourceManager/Tags/Tags.sln @@ -0,0 +1,33 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.31101.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ResourceManager.Common", "..\Common\Commands.ResourceManager.Common\Commands.ResourceManager.Common.csproj", "{3819D8A7-C62C-4C47-8DDD-0332D9CE1252}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Tags", "Commands.Tags\Commands.Tags.csproj", "{2493A8F7-1949-4F29-8D53-9D459046C3B8}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common", "..\..\Common\Commands.Common\Commands.Common.csproj", "{5EE72C53-1720-4309-B54B-5FB79703195F}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.Build.0 = Release|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Release|Any CPU.Build.0 = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/Commands.TrafficManager.Test.csproj b/src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/Commands.TrafficManager.Test.csproj index 54ff306a39d9..f32429ea018f 100644 --- a/src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/Commands.TrafficManager.Test.csproj +++ b/src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/Commands.TrafficManager.Test.csproj @@ -45,7 +45,7 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -140,6 +140,10 @@ + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common @@ -158,20 +162,5 @@ - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - \ No newline at end of file diff --git a/src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/ScenarioTests/TestController.cs b/src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/ScenarioTests/TestController.cs index f7df3cd31617..f8f894c3a1bb 100644 --- a/src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/ScenarioTests/TestController.cs +++ b/src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/ScenarioTests/TestController.cs @@ -120,10 +120,12 @@ public void RunPsTestWorkflow( .Split(new[] { "." }, StringSplitOptions.RemoveEmptyEntries) .Last(); - this.helper.SetupModules( - AzureModule.AzureResourceManager, - "ScenarioTests\\Common.ps1", - "ScenarioTests\\" + callingClassName + ".ps1"); + this.helper.SetupModules(AzureModule.AzureResourceManager, + "ScenarioTests\\Common.ps1", + "ScenarioTests\\" + callingClassName + ".ps1", + helper.RMProfileModule, + helper.RMResourceModule, + helper.GetRMModulePath(@"AzureRM.TrafficManager.psd1")); try { diff --git a/src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/packages.config b/src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/packages.config index 4327e0a09ab8..81e536e77184 100644 --- a/src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/packages.config +++ b/src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/ResourceManager/TrafficManager/Commands.TrafficManager2/Commands.TrafficManager.csproj b/src/ResourceManager/TrafficManager/Commands.TrafficManager2/Commands.TrafficManager.csproj index 756003326d41..8aa7fa1aa0a9 100644 --- a/src/ResourceManager/TrafficManager/Commands.TrafficManager2/Commands.TrafficManager.csproj +++ b/src/ResourceManager/TrafficManager/Commands.TrafficManager2/Commands.TrafficManager.csproj @@ -52,7 +52,7 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -121,6 +121,10 @@ + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common @@ -149,10 +153,5 @@ - - - - - \ No newline at end of file diff --git a/src/ResourceManager/TrafficManager/Commands.TrafficManager2/Models/TrafficManagerEndpoint.cs b/src/ResourceManager/TrafficManager/Commands.TrafficManager2/Models/TrafficManagerEndpoint.cs index 1c49713a068f..db14aa458cbc 100644 --- a/src/ResourceManager/TrafficManager/Commands.TrafficManager2/Models/TrafficManagerEndpoint.cs +++ b/src/ResourceManager/TrafficManager/Commands.TrafficManager2/Models/TrafficManagerEndpoint.cs @@ -20,6 +20,8 @@ namespace Microsoft.Azure.Commands.TrafficManager.Models public class TrafficManagerEndpoint { + public string Id { get; set; } + public string Name { get; set; } public string ProfileName { get; set; } @@ -46,16 +48,17 @@ public Endpoint ToSDKEndpoint() { return new Endpoint { + Id = this.Id, Name = this.Name, Type = TrafficManagerEndpoint.ToSDKEndpointType(this.Type), - Id = this.TargetResourceId, Properties = new EndpointProperties { Target = this.Target, EndpointStatus = this.EndpointStatus, Weight = this.Weight, Priority = this.Priority, - EndpointLocation = this.Location + EndpointLocation = this.Location, + TargetResourceId = this.TargetResourceId } }; } diff --git a/src/ResourceManager/TrafficManager/Commands.TrafficManager2/Utilities/TrafficManagerClient.cs b/src/ResourceManager/TrafficManager/Commands.TrafficManager2/Utilities/TrafficManagerClient.cs index 87a220c5bd3a..2b2a1d0123d3 100644 --- a/src/ResourceManager/TrafficManager/Commands.TrafficManager2/Utilities/TrafficManagerClient.cs +++ b/src/ResourceManager/TrafficManager/Commands.TrafficManager2/Utilities/TrafficManagerClient.cs @@ -105,7 +105,7 @@ public TrafficManagerEndpoint CreateTrafficManagerEndpoint(string resourceGroupN } }); - return TrafficManagerClient.GetPowershellTrafficManagerEndpoint(resourceGroupName, profileName, endpointType, endpointName, response.Endpoint.Properties); + return TrafficManagerClient.GetPowershellTrafficManagerEndpoint(response.Endpoint.Id, resourceGroupName, profileName, endpointType, endpointName, response.Endpoint.Properties); } public TrafficManagerProfile GetTrafficManagerProfile(string resourceGroupName, string profileName) @@ -120,6 +120,7 @@ public TrafficManagerEndpoint GetTrafficManagerEndpoint(string resourceGroupName EndpointGetResponse response = this.TrafficManagerManagementClient.Endpoints.Get(resourceGroupName, profileName, endpointType, endpointName); return TrafficManagerClient.GetPowershellTrafficManagerEndpoint( + response.Endpoint.Id, resourceGroupName, profileName, endpointType, @@ -171,6 +172,7 @@ public TrafficManagerEndpoint SetTrafficManagerEndpoint(TrafficManagerEndpoint e parameters); return TrafficManagerClient.GetPowershellTrafficManagerEndpoint( + endpoint.Id, endpoint.ResourceGroupName, endpoint.ProfileName, endpoint.Type, @@ -285,10 +287,11 @@ private static string ExtractResourceGroupFromId(string id) return id.Split('/')[4]; } - private static TrafficManagerEndpoint GetPowershellTrafficManagerEndpoint(string resourceGroupName, string profileName, string endpointType, string endpointName, EndpointProperties mamlEndpointProperties) + private static TrafficManagerEndpoint GetPowershellTrafficManagerEndpoint(string id, string resourceGroupName, string profileName, string endpointType, string endpointName, EndpointProperties mamlEndpointProperties) { return new TrafficManagerEndpoint { + Id = id, ResourceGroupName = resourceGroupName, ProfileName = profileName, Name = endpointName, diff --git a/src/ResourceManager/TrafficManager/Commands.TrafficManager2/packages.config b/src/ResourceManager/TrafficManager/Commands.TrafficManager2/packages.config index 09091389c170..f7b2cbac1674 100644 --- a/src/ResourceManager/TrafficManager/Commands.TrafficManager2/packages.config +++ b/src/ResourceManager/TrafficManager/Commands.TrafficManager2/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/ResourceManager/TrafficManager/NuGet.Config b/src/ResourceManager/TrafficManager/NuGet.Config new file mode 100644 index 000000000000..2de911013532 --- /dev/null +++ b/src/ResourceManager/TrafficManager/NuGet.Config @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/ResourceManager/TrafficManager/TrafficManager.sln b/src/ResourceManager/TrafficManager/TrafficManager.sln new file mode 100644 index 000000000000..86bd2ca81848 --- /dev/null +++ b/src/ResourceManager/TrafficManager/TrafficManager.sln @@ -0,0 +1,75 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.31101.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{95C16AED-FD57-42A0-86C3-2CF4300A4817}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ResourceManager.Common", "..\Common\Commands.ResourceManager.Common\Commands.ResourceManager.Common.csproj", "{3819D8A7-C62C-4C47-8DDD-0332D9CE1252}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Tags", "..\Tags\Commands.Tags\Commands.Tags.csproj", "{2493A8F7-1949-4F29-8D53-9D459046C3B8}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.TrafficManager", "Commands.TrafficManager2\Commands.TrafficManager.csproj", "{270CBB5F-BB8A-4E33-B35B-95698E607D97}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.TrafficManager.Test", "Commands.TrafficManager2.Test\Commands.TrafficManager.Test.csproj", "{5764A3A4-586C-4536-8481-13007CAC111B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Profile", "..\Profile\Commands.Profile\Commands.Profile.csproj", "{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ScenarioTests.ResourceManager.Common", "..\Common\Commands.ScenarioTests.ResourceManager.Common\Commands.ScenarioTests.ResourceManager.Common.csproj", "{3436A126-EDC9-4060-8952-9A1BE34CDD95}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Resources", "..\Resources\Commands.Resources\Commands.Resources.csproj", "{E1F5201D-6067-430E-B303-4E367652991B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Resources.Rest", "..\Resources\Commands.ResourceManager\Cmdlets\Commands.Resources.Rest.csproj", "{8058D403-06E3-4BED-8924-D166CE303961}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common", "..\..\Common\Commands.Common\Commands.Common.csproj", "{5EE72C53-1720-4309-B54B-5FB79703195F}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.Build.0 = Release|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Release|Any CPU.Build.0 = Release|Any CPU + {270CBB5F-BB8A-4E33-B35B-95698E607D97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {270CBB5F-BB8A-4E33-B35B-95698E607D97}.Debug|Any CPU.Build.0 = Debug|Any CPU + {270CBB5F-BB8A-4E33-B35B-95698E607D97}.Release|Any CPU.ActiveCfg = Release|Any CPU + {270CBB5F-BB8A-4E33-B35B-95698E607D97}.Release|Any CPU.Build.0 = Release|Any CPU + {5764A3A4-586C-4536-8481-13007CAC111B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5764A3A4-586C-4536-8481-13007CAC111B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5764A3A4-586C-4536-8481-13007CAC111B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5764A3A4-586C-4536-8481-13007CAC111B}.Release|Any CPU.Build.0 = Release|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.Build.0 = Release|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Release|Any CPU.Build.0 = Release|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Release|Any CPU.Build.0 = Release|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Release|Any CPU.Build.0 = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {5764A3A4-586C-4536-8481-13007CAC111B} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} + {3436A126-EDC9-4060-8952-9A1BE34CDD95} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} + EndGlobalSection +EndGlobal diff --git a/src/ResourceManager/UsageAggregates/Commands.UsageAggregates.Test/Commands.UsageAggregates.Test.csproj b/src/ResourceManager/UsageAggregates/Commands.UsageAggregates.Test/Commands.UsageAggregates.Test.csproj index 8ad30ca01f64..205e96ae08b1 100644 --- a/src/ResourceManager/UsageAggregates/Commands.UsageAggregates.Test/Commands.UsageAggregates.Test.csproj +++ b/src/ResourceManager/UsageAggregates/Commands.UsageAggregates.Test/Commands.UsageAggregates.Test.csproj @@ -39,7 +39,7 @@ True - ..\..\..\packages\Microsoft.Azure.Commerce.UsageAggregates.1.1.1\lib\net40\Microsoft.Azure.Commerce.UsageAggregates.dll + ..\..\..\packages\Microsoft.Azure.Commerce.UsageAggregates.1.2.0\lib\net40\Microsoft.Azure.Commerce.UsageAggregates.dll True @@ -47,7 +47,7 @@ True - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -138,18 +138,5 @@ - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - - - - - \ No newline at end of file diff --git a/src/ResourceManager/UsageAggregates/Commands.UsageAggregates.Test/Common/UsageAggregatesTestController.cs b/src/ResourceManager/UsageAggregates/Commands.UsageAggregates.Test/Common/UsageAggregatesTestController.cs index 5db3b5e4d830..728f1fac528a 100644 --- a/src/ResourceManager/UsageAggregates/Commands.UsageAggregates.Test/Common/UsageAggregatesTestController.cs +++ b/src/ResourceManager/UsageAggregates/Commands.UsageAggregates.Test/Common/UsageAggregatesTestController.cs @@ -79,9 +79,10 @@ public void RunPsTestWorkflow( var callingClassName = callingClassType .Split(new[] { "." }, StringSplitOptions.RemoveEmptyEntries) .Last(); - helper.SetupModules( - AzureModule.AzureResourceManager, - "ScenarioTests\\" + callingClassName + ".ps1"); + helper.SetupModules(AzureModule.AzureResourceManager, + "ScenarioTests\\" + callingClassName + ".ps1", + helper.RMProfileModule, + helper.GetRMModulePath(@"AzureRM.UsageAggregates.psd1")); try { diff --git a/src/ResourceManager/UsageAggregates/Commands.UsageAggregates.Test/packages.config b/src/ResourceManager/UsageAggregates/Commands.UsageAggregates.Test/packages.config index 810a3f3b33e6..fef95a7cead4 100644 --- a/src/ResourceManager/UsageAggregates/Commands.UsageAggregates.Test/packages.config +++ b/src/ResourceManager/UsageAggregates/Commands.UsageAggregates.Test/packages.config @@ -1,9 +1,9 @@  - + - + diff --git a/src/ResourceManager/UsageAggregates/Commands.UsageAggregates/Commands.UsageAggregates.csproj b/src/ResourceManager/UsageAggregates/Commands.UsageAggregates/Commands.UsageAggregates.csproj index 4faf76673e15..72b0190667c5 100644 --- a/src/ResourceManager/UsageAggregates/Commands.UsageAggregates/Commands.UsageAggregates.csproj +++ b/src/ResourceManager/UsageAggregates/Commands.UsageAggregates/Commands.UsageAggregates.csproj @@ -41,7 +41,7 @@ True - ..\..\..\packages\Microsoft.Azure.Commerce.UsageAggregates.1.1.1\lib\net40\Microsoft.Azure.Commerce.UsageAggregates.dll + ..\..\..\packages\Microsoft.Azure.Commerce.UsageAggregates.1.2.0\lib\net40\Microsoft.Azure.Commerce.UsageAggregates.dll True @@ -49,7 +49,7 @@ True - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -117,18 +117,15 @@ + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - + \ No newline at end of file diff --git a/src/ResourceManager/UsageAggregates/Commands.UsageAggregates/packages.config b/src/ResourceManager/UsageAggregates/Commands.UsageAggregates/packages.config index a95b798c8f16..e57133fcc051 100644 --- a/src/ResourceManager/UsageAggregates/Commands.UsageAggregates/packages.config +++ b/src/ResourceManager/UsageAggregates/Commands.UsageAggregates/packages.config @@ -1,9 +1,9 @@  - + - + diff --git a/src/ResourceManager/UsageAggregates/NuGet.Config b/src/ResourceManager/UsageAggregates/NuGet.Config new file mode 100644 index 000000000000..2de911013532 --- /dev/null +++ b/src/ResourceManager/UsageAggregates/NuGet.Config @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/ResourceManager/UsageAggregates/UsageAggregates.sln b/src/ResourceManager/UsageAggregates/UsageAggregates.sln new file mode 100644 index 000000000000..1f0626abd5e7 --- /dev/null +++ b/src/ResourceManager/UsageAggregates/UsageAggregates.sln @@ -0,0 +1,57 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.31101.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{95C16AED-FD57-42A0-86C3-2CF4300A4817}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ResourceManager.Common", "..\Common\Commands.ResourceManager.Common\Commands.ResourceManager.Common.csproj", "{3819D8A7-C62C-4C47-8DDD-0332D9CE1252}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.UsageAggregates", "Commands.UsageAggregates\Commands.UsageAggregates.csproj", "{1A131D3A-EAC4-420C-A1C0-5490ED68EF67}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.UsageAggregates.Test", "Commands.UsageAggregates.Test\Commands.UsageAggregates.Test.csproj", "{F220C306-29A3-4511-8518-A58A55C60D07}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ScenarioTests.ResourceManager.Common", "..\Common\Commands.ScenarioTests.ResourceManager.Common\Commands.ScenarioTests.ResourceManager.Common.csproj", "{3436A126-EDC9-4060-8952-9A1BE34CDD95}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Profile", "..\Profile\Commands.Profile\Commands.Profile.csproj", "{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common", "..\..\Common\Commands.Common\Commands.Common.csproj", "{5EE72C53-1720-4309-B54B-5FB79703195F}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.Build.0 = Release|Any CPU + {1A131D3A-EAC4-420C-A1C0-5490ED68EF67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1A131D3A-EAC4-420C-A1C0-5490ED68EF67}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1A131D3A-EAC4-420C-A1C0-5490ED68EF67}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1A131D3A-EAC4-420C-A1C0-5490ED68EF67}.Release|Any CPU.Build.0 = Release|Any CPU + {F220C306-29A3-4511-8518-A58A55C60D07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F220C306-29A3-4511-8518-A58A55C60D07}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F220C306-29A3-4511-8518-A58A55C60D07}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F220C306-29A3-4511-8518-A58A55C60D07}.Release|Any CPU.Build.0 = Release|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Release|Any CPU.Build.0 = Release|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.Build.0 = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {F220C306-29A3-4511-8518-A58A55C60D07} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} + {3436A126-EDC9-4060-8952-9A1BE34CDD95} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} + EndGlobalSection +EndGlobal diff --git a/src/ResourceManager/Websites/Commands.Websites.Test/Commands.Websites.Test.csproj b/src/ResourceManager/Websites/Commands.Websites.Test/Commands.Websites.Test.csproj index 5fa223edf939..40ce89d570bd 100644 --- a/src/ResourceManager/Websites/Commands.Websites.Test/Commands.Websites.Test.csproj +++ b/src/ResourceManager/Websites/Commands.Websites.Test/Commands.Websites.Test.csproj @@ -47,7 +47,7 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -150,6 +150,10 @@ + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common @@ -158,10 +162,6 @@ {3436a126-edc9-4060-8952-9a1be34cdd95} Commands.ScenarioTests.ResourceManager.Common - - {d470e50a-9607-48d6-a924-4f9f86502704} - Commands.Batch - {e1f5201d-6067-430e-b303-4e367652991b} Commands.Resources @@ -175,20 +175,5 @@ - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - \ No newline at end of file diff --git a/src/ResourceManager/Websites/Commands.Websites.Test/ScenarioTests/WebsitesController.cs b/src/ResourceManager/Websites/Commands.Websites.Test/ScenarioTests/WebsitesController.cs index fcda51519432..a3447005ed2b 100644 --- a/src/ResourceManager/Websites/Commands.Websites.Test/ScenarioTests/WebsitesController.cs +++ b/src/ResourceManager/Websites/Commands.Websites.Test/ScenarioTests/WebsitesController.cs @@ -17,11 +17,9 @@ using Microsoft.Azure.Gallery; using Microsoft.Azure.Management.Resources; using Microsoft.Azure.Management.WebSites; -using Microsoft.Azure.Commands.WebApp.Utilities; using Microsoft.Azure.Subscriptions; using Microsoft.Azure.Test.HttpRecorder; using Microsoft.WindowsAzure.Commands.ScenarioTest; -using Microsoft.WindowsAzure.Commands.Utilities.Common; using Microsoft.Azure.Test; using System; using System.Collections.Generic; @@ -108,10 +106,12 @@ public void RunPsTestWorkflow( var callingClassName = callingClassType .Split(new[] { "." }, StringSplitOptions.RemoveEmptyEntries) .Last(); - helper.SetupModules( - AzureModule.AzureResourceManager, - "ScenarioTests\\Common.ps1", - "ScenarioTests\\" + callingClassName + ".ps1"); + helper.SetupModules(AzureModule.AzureResourceManager, + "ScenarioTests\\Common.ps1", + "ScenarioTests\\" + callingClassName + ".ps1", + helper.RMProfileModule, + helper.RMResourceModule, + helper.GetRMModulePath(@"AzureRM.WebSites.psd1")); try { diff --git a/src/ResourceManager/Websites/Commands.Websites.Test/packages.config b/src/ResourceManager/Websites/Commands.Websites.Test/packages.config index 90e2ee2e3399..2bb7442705ca 100644 --- a/src/ResourceManager/Websites/Commands.Websites.Test/packages.config +++ b/src/ResourceManager/Websites/Commands.Websites.Test/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/ResourceManager/Websites/Commands.Websites/Commands.Websites.csproj b/src/ResourceManager/Websites/Commands.Websites/Commands.Websites.csproj index a82f5f032cbd..c355ba51a17b 100644 --- a/src/ResourceManager/Websites/Commands.Websites/Commands.Websites.csproj +++ b/src/ResourceManager/Websites/Commands.Websites/Commands.Websites.csproj @@ -55,7 +55,7 @@ ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll - ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.0-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll True @@ -190,12 +190,15 @@ + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + {3819d8a7-c62c-4c47-8ddd-0332d9ce1252} Commands.ResourceManager.Common - - + \ No newline at end of file diff --git a/src/ResourceManager/Websites/Commands.Websites/packages.config b/src/ResourceManager/Websites/Commands.Websites/packages.config index 48f24c431bed..4af0be149a38 100644 --- a/src/ResourceManager/Websites/Commands.Websites/packages.config +++ b/src/ResourceManager/Websites/Commands.Websites/packages.config @@ -2,7 +2,7 @@ - + diff --git a/src/ResourceManager/Websites/NuGet.Config b/src/ResourceManager/Websites/NuGet.Config new file mode 100644 index 000000000000..2de911013532 --- /dev/null +++ b/src/ResourceManager/Websites/NuGet.Config @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/ResourceManager/Websites/WebSites.sln b/src/ResourceManager/Websites/WebSites.sln new file mode 100644 index 000000000000..e9c3057d83e7 --- /dev/null +++ b/src/ResourceManager/Websites/WebSites.sln @@ -0,0 +1,75 @@ +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.31101.0 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{95C16AED-FD57-42A0-86C3-2CF4300A4817}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ResourceManager.Common", "..\Common\Commands.ResourceManager.Common\Commands.ResourceManager.Common.csproj", "{3819D8A7-C62C-4C47-8DDD-0332D9CE1252}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Resources", "..\Resources\Commands.Resources\Commands.Resources.csproj", "{E1F5201D-6067-430E-B303-4E367652991B}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Resources.Rest", "..\Resources\Commands.ResourceManager\Cmdlets\Commands.Resources.Rest.csproj", "{8058D403-06E3-4BED-8924-D166CE303961}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Websites", "Commands.Websites\Commands.Websites.csproj", "{80A92297-7C92-456B-8EE7-9FB6CE30149D}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Profile", "..\Profile\Commands.Profile\Commands.Profile.csproj", "{142D7B0B-388A-4CEB-A228-7F6D423C5C2E}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Websites.Test", "Commands.Websites.Test\Commands.Websites.Test.csproj", "{13E031E4-8A43-4B87-9D72-D70180C31C11}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ScenarioTests.ResourceManager.Common", "..\Common\Commands.ScenarioTests.ResourceManager.Common\Commands.ScenarioTests.ResourceManager.Common.csproj", "{3436A126-EDC9-4060-8952-9A1BE34CDD95}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Tags", "..\Tags\Commands.Tags\Commands.Tags.csproj", "{2493A8F7-1949-4F29-8D53-9D459046C3B8}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common", "..\..\Common\Commands.Common\Commands.Common.csproj", "{5EE72C53-1720-4309-B54B-5FB79703195F}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3819D8A7-C62C-4C47-8DDD-0332D9CE1252}.Release|Any CPU.Build.0 = Release|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E1F5201D-6067-430E-B303-4E367652991B}.Release|Any CPU.Build.0 = Release|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Debug|Any CPU.Build.0 = Debug|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Release|Any CPU.ActiveCfg = Release|Any CPU + {8058D403-06E3-4BED-8924-D166CE303961}.Release|Any CPU.Build.0 = Release|Any CPU + {80A92297-7C92-456B-8EE7-9FB6CE30149D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {80A92297-7C92-456B-8EE7-9FB6CE30149D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {80A92297-7C92-456B-8EE7-9FB6CE30149D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {80A92297-7C92-456B-8EE7-9FB6CE30149D}.Release|Any CPU.Build.0 = Release|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Debug|Any CPU.Build.0 = Debug|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.ActiveCfg = Release|Any CPU + {142D7B0B-388A-4CEB-A228-7F6D423C5C2E}.Release|Any CPU.Build.0 = Release|Any CPU + {13E031E4-8A43-4B87-9D72-D70180C31C11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {13E031E4-8A43-4B87-9D72-D70180C31C11}.Debug|Any CPU.Build.0 = Debug|Any CPU + {13E031E4-8A43-4B87-9D72-D70180C31C11}.Release|Any CPU.ActiveCfg = Release|Any CPU + {13E031E4-8A43-4B87-9D72-D70180C31C11}.Release|Any CPU.Build.0 = Release|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3436A126-EDC9-4060-8952-9A1BE34CDD95}.Release|Any CPU.Build.0 = Release|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2493A8F7-1949-4F29-8D53-9D459046C3B8}.Release|Any CPU.Build.0 = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Debug|Any CPU.Build.0 = Debug|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.ActiveCfg = Release|Any CPU + {5EE72C53-1720-4309-B54B-5FB79703195F}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {13E031E4-8A43-4B87-9D72-D70180C31C11} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} + {3436A126-EDC9-4060-8952-9A1BE34CDD95} = {95C16AED-FD57-42A0-86C3-2CF4300A4817} + EndGlobalSection +EndGlobal diff --git a/src/ServiceManagement/Automation/Commands.Automation.Test/Commands.Automation.Test.csproj b/src/ServiceManagement/Automation/Commands.Automation.Test/Commands.Automation.Test.csproj index 4ced193caff2..4495d3bc5df4 100644 --- a/src/ServiceManagement/Automation/Commands.Automation.Test/Commands.Automation.Test.csproj +++ b/src/ServiceManagement/Automation/Commands.Automation.Test/Commands.Automation.Test.csproj @@ -178,6 +178,10 @@ {c1bda476-a5cc-4394-914d-48b0ec31a710} Commands.ScenarioTests.Common + + {cff09e81-1e31-444e-b4d4-a21e946c29e2} + Commands.ServiceManagement.Common + {47cd7e95-5330-4384-abce-2c267c57085c} Commands.Automation @@ -189,19 +193,5 @@ - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/src/ServiceManagement/Automation/Commands.Automation/Commands.Automation.csproj b/src/ServiceManagement/Automation/Commands.Automation/Commands.Automation.csproj index 338794751b11..46799fa9c6e7 100644 --- a/src/ServiceManagement/Automation/Commands.Automation/Commands.Automation.csproj +++ b/src/ServiceManagement/Automation/Commands.Automation/Commands.Automation.csproj @@ -224,6 +224,10 @@ {5ee72c53-1720-4309-b54b-5fb79703195f} Commands.Common + + {cff09e81-1e31-444e-b4d4-a21e946c29e2} + Commands.ServiceManagement.Common + @@ -233,13 +237,5 @@ - - \ No newline at end of file diff --git a/src/ServiceManagement/Common/Commands.Common.Test/Commands.Common.Test.csproj b/src/ServiceManagement/Common/Commands.Common.Test/Commands.Common.Test.csproj index 0dbb2105132b..ddf328295a59 100644 --- a/src/ServiceManagement/Common/Commands.Common.Test/Commands.Common.Test.csproj +++ b/src/ServiceManagement/Common/Commands.Common.Test/Commands.Common.Test.csproj @@ -212,6 +212,10 @@ {c1bda476-a5cc-4394-914d-48b0ec31a710} Commands.ScenarioTests.Common + + {cff09e81-1e31-444e-b4d4-a21e946c29e2} + Commands.ServiceManagement.Common + @@ -303,12 +307,5 @@ - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - \ No newline at end of file diff --git a/src/ServiceManagement/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj b/src/ServiceManagement/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj index 9a7860e5b608..452b381e46b5 100644 --- a/src/ServiceManagement/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj +++ b/src/ServiceManagement/Common/Commands.ScenarioTest/Commands.ScenarioTest.csproj @@ -566,6 +566,10 @@ {c1bda476-a5cc-4394-914d-48b0ec31a710} Commands.ScenarioTests.Common + + {cff09e81-1e31-444e-b4d4-a21e946c29e2} + Commands.ServiceManagement.Common + @@ -583,19 +587,5 @@ - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/src/ServiceManagement/Common/Commands.ScenarioTest/Common/TestEnvironmentFactory.cs b/src/ServiceManagement/Common/Commands.ScenarioTest/Common/TestEnvironmentFactory.cs index 24fbcfeb6aac..ec3cde25204f 100644 --- a/src/ServiceManagement/Common/Commands.ScenarioTest/Common/TestEnvironmentFactory.cs +++ b/src/ServiceManagement/Common/Commands.ScenarioTest/Common/TestEnvironmentFactory.cs @@ -36,12 +36,12 @@ public abstract class TestEnvironmentFactory public const string SubscriptionIdKey = ConnectionStringFields.SubscriptionId; /// - /// The key inside the connection string for the subscription identifier + /// The key inside the connection string for the AAD user ID /// public const string AADUserIdKey = ConnectionStringFields.UserId; /// - /// The key inside the connection string for the subscription identifier + /// The key inside the connection string for the AAD password /// public const string AADPasswordKey = ConnectionStringFields.Password; @@ -51,7 +51,7 @@ public abstract class TestEnvironmentFactory public const string BaseUriKey = ConnectionStringFields.BaseUri; /// - /// The key inside the connection string for the AAD client ID" + /// The key inside the connection string for the AAD client ID /// public const string ClientID = ConnectionStringFields.AADClientId; public const string ClientIdDefault = "1950a258-227b-4e31-a9cf-717495945fc2"; @@ -70,7 +70,7 @@ public abstract class TestEnvironmentFactory public const string StorageAccountKey = "AZURE_STORAGE_ACCOUNT"; /// - /// A raw token to be used for authentication with the give subscription ID + /// A raw token to be used for authentication with the given subscription ID /// public const string RawToken = ConnectionStringFields.RawToken; @@ -84,9 +84,9 @@ public virtual TestEnvironment GetTestEnvironment() protected abstract TestEnvironment GetTestEnvironmentFromContext(); /// - /// Return test credentials and URI using AAD auth for an OrgID account. Use this emthod with causion, it may take a dependency on ADAL + /// Return test credentials and URI using AAD auth for an OrgID account. Use this method with caution - it may take a dependency on ADAL. /// - /// The test credentials, or null if nthe appropriate environment variablke is not set. + /// The test credentials, or null if the appropriate environment variable is not set. protected virtual TestEnvironment GetOrgIdTestEnvironment(string orgIdVariable) { TestEnvironment orgIdEnvironment = null; @@ -181,7 +181,7 @@ private static string GetOrgId(string orgIdVariable) /// A dictionary of keys and values from the connection string public static IDictionary ParseConnectionString(string connectionString) { - // hacky connection string parser. We should replace with more robust connection strign parsing + // hacky connection string parser. We should replace with more robust connection string parsing IDictionary settings = new Dictionary(); string[] pairs = connectionString.Split(new char[] { ';' }); foreach (string pair in pairs) diff --git a/src/Common/Commands.Common/AzureSMCmdlet.cs b/src/ServiceManagement/Common/Commands.ServiceManagement.Common/AzureSMCmdlet.cs similarity index 100% rename from src/Common/Commands.Common/AzureSMCmdlet.cs rename to src/ServiceManagement/Common/Commands.ServiceManagement.Common/AzureSMCmdlet.cs diff --git a/src/Common/Commands.Common/ChannelHelper.cs b/src/ServiceManagement/Common/Commands.ServiceManagement.Common/ChannelHelper.cs similarity index 100% rename from src/Common/Commands.Common/ChannelHelper.cs rename to src/ServiceManagement/Common/Commands.ServiceManagement.Common/ChannelHelper.cs diff --git a/src/Common/Commands.Common/CloudBaseCmdlet.cs b/src/ServiceManagement/Common/Commands.ServiceManagement.Common/CloudBaseCmdlet.cs similarity index 100% rename from src/Common/Commands.Common/CloudBaseCmdlet.cs rename to src/ServiceManagement/Common/Commands.ServiceManagement.Common/CloudBaseCmdlet.cs diff --git a/src/ServiceManagement/Common/Commands.ServiceManagement.Common/Commands.ServiceManagement.Common.csproj b/src/ServiceManagement/Common/Commands.ServiceManagement.Common/Commands.ServiceManagement.Common.csproj new file mode 100644 index 000000000000..c41854a78f3a --- /dev/null +++ b/src/ServiceManagement/Common/Commands.ServiceManagement.Common/Commands.ServiceManagement.Common.csproj @@ -0,0 +1,180 @@ + + + + + Debug + AnyCPU + {CFF09E81-1E31-444E-B4D4-A21E946C29E2} + Library + Properties + Microsoft.WindowsAzure.Commands.Common + Microsoft.WindowsAzure.Commands.ServiceManagement.Common + v4.5 + 512 + + ..\..\ + true + /assemblyCompareMode:StrongNameIgnoringVersion + 06e19c11 + + + true + full + false + bin\Debug + DEBUG;TRACE + prompt + 4 + true + true + false + true + + + bin\Release + TRACE;SIGN + true + pdbonly + AnyCPU + bin\Release\Management.Utilities.dll.CodeAnalysisLog.xml + true + GlobalSuppressions.cs + prompt + MinimumRecommendedRules.ruleset + ;$(ProgramFiles)\Microsoft Visual Studio 12.0\Team Tools\Static Analysis Tools\Rule Sets + ;$(ProgramFiles)\Microsoft Visual Studio 12.0\Team Tools\Static Analysis Tools\FxCop\Rules + true + MSSharedLibKey.snk + true + true + false + true + + + + False + ..\..\..\packages\Hyak.Common.1.0.2\lib\portable-net403+win+wpa81\Hyak.Common.dll + + + ..\..\..\packages\Microsoft.ApplicationInsights.1.1.1-beta\lib\net45\Microsoft.ApplicationInsights.dll + True + + + False + ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll + + + ..\..\..\packages\Microsoft.Azure.Common.Authentication.1.3.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll + True + + + False + ..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll + + + False + ..\..\..\packages\Microsoft.Azure.Management.Resources.2.18.7-preview\lib\net40\Microsoft.Azure.ResourceManager.dll + + + False + ..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.dll + + + False + ..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.18.206251556\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll + + + False + ..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.dll + + + False + ..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.dll + + + False + ..\..\..\packages\Microsoft.Bcl.Async.1.0.168\lib\net40\Microsoft.Threading.Tasks.Extensions.Desktop.dll + + + False + ..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll + + + ..\..\..\packages\Newtonsoft.Json.6.0.4\lib\net45\Newtonsoft.Json.dll + True + + + ..\..\..\packages\Microsoft.Rest.ClientRuntime.1.2.0\lib\net45\Microsoft.Rest.ClientRuntime.dll + True + + + ..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.0.9.3\lib\net45\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll + True + + + + + + + + False + ..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Extensions.dll + + + False + ..\..\..\packages\Microsoft.AspNet.WebApi.Client.5.2.2\lib\net45\System.Net.Http.Formatting.dll + + + False + ..\..\..\packages\Microsoft.Net.Http.2.2.28\lib\net45\System.Net.Http.Primitives.dll + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Designer + + + + + {5ee72c53-1720-4309-b54b-5fb79703195f} + Commands.Common + + + + + \ No newline at end of file diff --git a/src/ServiceManagement/Common/Commands.ServiceManagement.Common/ComputeCloudException.cs b/src/ServiceManagement/Common/Commands.ServiceManagement.Common/ComputeCloudException.cs new file mode 100644 index 000000000000..9d4e593b08e4 --- /dev/null +++ b/src/ServiceManagement/Common/Commands.ServiceManagement.Common/ComputeCloudException.cs @@ -0,0 +1,60 @@ +// ---------------------------------------------------------------------------------- +// +// 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; +using System.Linq; +using System.Text; +using Hyak.Common; + +namespace Microsoft.WindowsAzure.Commands.Common +{ + public class ComputeCloudException : CloudException + { + protected const string RequestIdHeaderInResponse = "x-ms-request-id"; + + public ComputeCloudException(CloudException ex) + : base(GetErrorMessageWithRequestIdInfo(ex), ex) + { + } + + protected static string GetErrorMessageWithRequestIdInfo(CloudException cloudException) + { + if (cloudException == null) + { + throw new ArgumentNullException("cloudException"); + } + + var sb = new StringBuilder(); + + if (!string.IsNullOrEmpty(cloudException.Message)) + { + sb.Append(cloudException.Message); + } + + if (cloudException.Response != null && + cloudException.Response.Headers != null) + { + var headers = cloudException.Response.Headers; + if (headers.ContainsKey(RequestIdHeaderInResponse)) + { + sb.AppendLine().AppendFormat( + "OperationID : '{0}'", + headers[RequestIdHeaderInResponse].FirstOrDefault()); + } + } + + return sb.ToString(); + } + } +} \ No newline at end of file diff --git a/src/Common/Commands.Common/ConfigurationConstants.cs b/src/ServiceManagement/Common/Commands.ServiceManagement.Common/ConfigurationConstants.cs similarity index 100% rename from src/Common/Commands.Common/ConfigurationConstants.cs rename to src/ServiceManagement/Common/Commands.ServiceManagement.Common/ConfigurationConstants.cs diff --git a/src/ServiceManagement/Common/Commands.ServiceManagement.Common/DiagnosticsHelper.cs b/src/ServiceManagement/Common/Commands.ServiceManagement.Common/DiagnosticsHelper.cs new file mode 100644 index 000000000000..50719b3c27f4 --- /dev/null +++ b/src/ServiceManagement/Common/Commands.ServiceManagement.Common/DiagnosticsHelper.cs @@ -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. +// ---------------------------------------------------------------------------------- + +using System; +using System.Collections; +using System.IO; +using System.Text; +using System.Xml; +using Newtonsoft.Json; + +namespace Microsoft.WindowsAzure.Commands.Utilities.Common +{ + public static class DiagnosticsHelper + { + private static string XmlNamespace = "http://schemas.microsoft.com/ServiceHosting/2010/10/DiagnosticsConfiguration"; + private static string EncodedXmlCfg = "xmlCfg"; + private static string StorageAccount = "storageAccount"; + private static string Path = "path"; + private static string ExpandResourceDirectory = "expandResourceDirectory"; + private static string LocalResourceDirectory = "localResourceDirectory"; + private static string StorageAccountNameTag = "storageAccountName"; + private static string StorageAccountKeyTag = "storageAccountKey"; + private static string StorageAccountEndPointTag = "storageAccountEndPoint"; + + public static string GetJsonSerializedPublicDiagnosticsConfigurationFromFile(string configurationPath, + string storageAccountName) + { + return + JsonConvert.SerializeObject( + DiagnosticsHelper.GetPublicDiagnosticsConfigurationFromFile(configurationPath, storageAccountName)); + } + + public static Hashtable GetPublicDiagnosticsConfigurationFromFile(string configurationPath, string storageAccountName) + { + using (StreamReader reader = new StreamReader(configurationPath)) + { + return GetPublicDiagnosticsConfiguration(reader.ReadToEnd(), storageAccountName); + } + } + + public static Hashtable GetPublicDiagnosticsConfiguration(string config, string storageAccountName) + { + // find the element and extract it + int wadCfgBeginIndex = config.IndexOf(""); + if (wadCfgBeginIndex == -1) + { + throw new ArgumentException("Cannot find the WadCfg element in the config."); + } + + int wadCfgEndIndex = config.IndexOf(""); + if (wadCfgEndIndex == -1) + { + throw new ArgumentException("Cannot find the WadCfg end element in the config."); + } + + if (wadCfgEndIndex <= wadCfgBeginIndex) + { + throw new ArgumentException("WadCfg start element in the config is not matching the end element."); + } + + string encodedConfiguration = Convert.ToBase64String( + Encoding.UTF8.GetBytes( + config.Substring( + wadCfgBeginIndex, wadCfgEndIndex + "".Length - wadCfgBeginIndex).ToCharArray())); + + // Now extract the local resource directory element + XmlDocument doc = new XmlDocument(); + XmlNamespaceManager ns = new XmlNamespaceManager(doc.NameTable); + ns.AddNamespace("ns", XmlNamespace); + doc.LoadXml(config); + var node = doc.SelectSingleNode("//ns:LocalResourceDirectory", ns); + string localDirectory = (node != null && node.Attributes != null) ? node.Attributes[Path].Value : null; + string localDirectoryExpand = (node != null && node.Attributes != null) + ? node.Attributes["expandEnvironment"].Value + : null; + if (localDirectoryExpand == "0") + { + localDirectoryExpand = "false"; + } + if (localDirectoryExpand == "1") + { + localDirectoryExpand = "true"; + } + + var hashTable = new Hashtable(); + hashTable.Add(EncodedXmlCfg, encodedConfiguration); + hashTable.Add(StorageAccount, storageAccountName); + if (!string.IsNullOrEmpty(localDirectory)) + { + var localDirectoryHashTable = new Hashtable(); + localDirectoryHashTable.Add(Path, localDirectory); + localDirectoryHashTable.Add(ExpandResourceDirectory, localDirectoryExpand); + hashTable.Add(LocalResourceDirectory, localDirectoryHashTable); + } + + return hashTable; + } + + public static string GetJsonSerializedPrivateDiagnosticsConfiguration(string storageAccountName, + string storageKey, string endpoint) + { + return JsonConvert.SerializeObject(GetPrivateDiagnosticsConfiguration( storageAccountName, storageKey, endpoint)); + } + + public static Hashtable GetPrivateDiagnosticsConfiguration(string storageAccountName, string storageKey, string endpoint) + { + var hashTable = new Hashtable(); + hashTable.Add(StorageAccountNameTag, storageAccountName); + hashTable.Add(StorageAccountKeyTag, storageKey); + hashTable.Add(StorageAccountEndPointTag, endpoint); + return hashTable; + } + } +} diff --git a/src/Common/Commands.Common/ErrorHelper.cs b/src/ServiceManagement/Common/Commands.ServiceManagement.Common/ErrorHelper.cs similarity index 100% rename from src/Common/Commands.Common/ErrorHelper.cs rename to src/ServiceManagement/Common/Commands.ServiceManagement.Common/ErrorHelper.cs diff --git a/src/Common/Commands.Common/HttpClientExtensions.cs b/src/ServiceManagement/Common/Commands.ServiceManagement.Common/HttpClientExtensions.cs similarity index 100% rename from src/Common/Commands.Common/HttpClientExtensions.cs rename to src/ServiceManagement/Common/Commands.ServiceManagement.Common/HttpClientExtensions.cs diff --git a/src/Common/Commands.Common/HttpRestCallLogger.cs b/src/ServiceManagement/Common/Commands.ServiceManagement.Common/HttpRestCallLogger.cs similarity index 100% rename from src/Common/Commands.Common/HttpRestCallLogger.cs rename to src/ServiceManagement/Common/Commands.ServiceManagement.Common/HttpRestCallLogger.cs diff --git a/src/Common/Commands.Common/HttpRestMessageInspector.cs b/src/ServiceManagement/Common/Commands.ServiceManagement.Common/HttpRestMessageInspector.cs similarity index 100% rename from src/Common/Commands.Common/HttpRestMessageInspector.cs rename to src/ServiceManagement/Common/Commands.ServiceManagement.Common/HttpRestMessageInspector.cs diff --git a/src/Common/Commands.Common/IdnHelper.cs b/src/ServiceManagement/Common/Commands.ServiceManagement.Common/IdnHelper.cs similarity index 100% rename from src/Common/Commands.Common/IdnHelper.cs rename to src/ServiceManagement/Common/Commands.ServiceManagement.Common/IdnHelper.cs diff --git a/src/ServiceManagement/Common/Commands.ServiceManagement.Common/MSSharedLibKey.snk b/src/ServiceManagement/Common/Commands.ServiceManagement.Common/MSSharedLibKey.snk new file mode 100644 index 000000000000..695f1b38774e Binary files /dev/null and b/src/ServiceManagement/Common/Commands.ServiceManagement.Common/MSSharedLibKey.snk differ diff --git a/src/Common/Commands.Common/ManagementOperationContext.cs b/src/ServiceManagement/Common/Commands.ServiceManagement.Common/ManagementOperationContext.cs similarity index 100% rename from src/Common/Commands.Common/ManagementOperationContext.cs rename to src/ServiceManagement/Common/Commands.ServiceManagement.Common/ManagementOperationContext.cs diff --git a/src/Common/Commands.Common/Parameters.cs b/src/ServiceManagement/Common/Commands.ServiceManagement.Common/Parameters.cs similarity index 100% rename from src/Common/Commands.Common/Parameters.cs rename to src/ServiceManagement/Common/Commands.ServiceManagement.Common/Parameters.cs diff --git a/src/Common/Commands.Common/ProcessHelper.cs b/src/ServiceManagement/Common/Commands.ServiceManagement.Common/ProcessHelper.cs similarity index 100% rename from src/Common/Commands.Common/ProcessHelper.cs rename to src/ServiceManagement/Common/Commands.ServiceManagement.Common/ProcessHelper.cs diff --git a/src/ServiceManagement/Common/Commands.ServiceManagement.Common/Properties/AssemblyInfo.cs b/src/ServiceManagement/Common/Commands.ServiceManagement.Common/Properties/AssemblyInfo.cs new file mode 100644 index 000000000000..3f06c165c06f --- /dev/null +++ b/src/ServiceManagement/Common/Commands.ServiceManagement.Common/Properties/AssemblyInfo.cs @@ -0,0 +1,58 @@ +// ---------------------------------------------------------------------------------- +// +// 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; +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +[assembly: AssemblyTitle("Microsoft Azure Powershell - Common Library")] +[assembly: AssemblyCompany("Microsoft")] +[assembly: AssemblyProduct(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyProduct)] +[assembly: AssemblyCopyright(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyCopyright)] + +[assembly: ComVisible(false)] +[assembly: CLSCompliant(false)] +[assembly: Guid("4f3ab2e4-cc7a-43ac-bb15-f481fcf94d58")] +[assembly: AssemblyVersion(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyVersion)] +[assembly: AssemblyFileVersion(Microsoft.WindowsAzure.Commands.Common.AzurePowerShell.AssemblyFileVersion)] +#if SIGN +[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")] +[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands.CloudService, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")] +[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands.Websites, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")] +[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands.Test.Utilities, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")] +[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")] +[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands.CloudService.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")] +[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands.Websites.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")] +[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands.ScenarioTest, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")] +[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands.WAPackIaaS.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")] +[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands.WAPackIaaS.FunctionalTest, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")] +[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands.Common.Storage, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")] +[assembly: InternalsVisibleTo("Microsoft.Azure.Commands.Compute, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")] +[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands.ServiceManagement, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")] +#else +[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands")] +[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands.CloudService")] +[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands.Websites")] +[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands.Test.Utilities")] +[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands.Test")] +[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands.CloudService.Test")] +[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands.Websites.Test")] +[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands.ScenarioTest")] +[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands.WAPackIaaS.Test")] +[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands.WAPackIaaS.FunctionalTest")] +[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands.Common.Storage")] +[assembly: InternalsVisibleTo("Microsoft.Azure.Commands.Compute")] +[assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands.ServiceManagement")] +#endif diff --git a/src/Common/Commands.Common/RPRegistrationAction.cs b/src/ServiceManagement/Common/Commands.ServiceManagement.Common/RPRegistrationAction.cs similarity index 100% rename from src/Common/Commands.Common/RPRegistrationAction.cs rename to src/ServiceManagement/Common/Commands.ServiceManagement.Common/RPRegistrationAction.cs diff --git a/src/Common/Commands.Common/RequiredResourceLookup.cs b/src/ServiceManagement/Common/Commands.ServiceManagement.Common/RequiredResourceLookup.cs similarity index 100% rename from src/Common/Commands.Common/RequiredResourceLookup.cs rename to src/ServiceManagement/Common/Commands.ServiceManagement.Common/RequiredResourceLookup.cs diff --git a/src/Common/Commands.Common/ServiceManagementTypes.cs b/src/ServiceManagement/Common/Commands.ServiceManagement.Common/ServiceManagementTypes.cs similarity index 100% rename from src/Common/Commands.Common/ServiceManagementTypes.cs rename to src/ServiceManagement/Common/Commands.ServiceManagement.Common/ServiceManagementTypes.cs diff --git a/src/Common/Commands.Common/SubscriptionCmdletBase.cs b/src/ServiceManagement/Common/Commands.ServiceManagement.Common/SubscriptionCmdletBase.cs similarity index 100% rename from src/Common/Commands.Common/SubscriptionCmdletBase.cs rename to src/ServiceManagement/Common/Commands.ServiceManagement.Common/SubscriptionCmdletBase.cs diff --git a/src/Common/Commands.Common/Tasks.cs b/src/ServiceManagement/Common/Commands.ServiceManagement.Common/Tasks.cs similarity index 100% rename from src/Common/Commands.Common/Tasks.cs rename to src/ServiceManagement/Common/Commands.ServiceManagement.Common/Tasks.cs diff --git a/src/ServiceManagement/Common/Commands.ServiceManagement.Common/packages.config b/src/ServiceManagement/Common/Commands.ServiceManagement.Common/packages.config new file mode 100644 index 000000000000..357c4f26f18d --- /dev/null +++ b/src/ServiceManagement/Common/Commands.ServiceManagement.Common/packages.config @@ -0,0 +1,19 @@ + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/Commands.ServiceManagement.PlatformImageRepository.csproj b/src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/Commands.ServiceManagement.PlatformImageRepository.csproj index 744b67269a71..d149b65473ac 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/Commands.ServiceManagement.PlatformImageRepository.csproj +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/Commands.ServiceManagement.PlatformImageRepository.csproj @@ -217,6 +217,10 @@ + + {cff09e81-1e31-444e-b4d4-a21e946c29e2} + Commands.ServiceManagement.Common + {e1ca72ba-8374-45f6-904d-fd34ecdf5b6f} Commands.ServiceManagement @@ -236,13 +240,5 @@ - - \ No newline at end of file diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Commands.ServiceManagement.Preview.csproj b/src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Commands.ServiceManagement.Preview.csproj index b19e23d4ce90..b721fb2853f6 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Commands.ServiceManagement.Preview.csproj +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/Commands.ServiceManagement.Preview.csproj @@ -308,6 +308,10 @@ + + {cff09e81-1e31-444e-b4d4-a21e946c29e2} + Commands.ServiceManagement.Common + {e1ca72ba-8374-45f6-904d-fd34ecdf5b6f} Commands.ServiceManagement @@ -331,15 +335,7 @@ - - %WINDIR%\System32\WindowsPowerShell\v1.0\powershell.exe diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Commands.ServiceManagement.Test.csproj b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Commands.ServiceManagement.Test.csproj index 86b69d2d6711..9f6512492e25 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Commands.ServiceManagement.Test.csproj +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement.Test/Commands.ServiceManagement.Test.csproj @@ -608,6 +608,10 @@ {65c3a86a-716d-4e7d-ab67-1db00b3bf72d} Commands.Common.Storage + + {cff09e81-1e31-444e-b4d4-a21e946c29e2} + Commands.ServiceManagement.Common + {c60342b1-47d3-4a0e-8081-9b97ce60b7af} Commands.Profile @@ -681,19 +685,5 @@ - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/Commands.ServiceManagement.csproj b/src/ServiceManagement/Compute/Commands.ServiceManagement/Commands.ServiceManagement.csproj index b4a05c0f770d..531778190ac1 100644 --- a/src/ServiceManagement/Compute/Commands.ServiceManagement/Commands.ServiceManagement.csproj +++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/Commands.ServiceManagement.csproj @@ -547,6 +547,10 @@ {5ee72c53-1720-4309-b54b-5fb79703195f} Commands.Common + + {cff09e81-1e31-444e-b4d4-a21e946c29e2} + Commands.ServiceManagement.Common + {4900ec4e-8deb-4412-9108-0bc52f81d457} Commands.Utilities @@ -561,13 +565,5 @@ - - \ No newline at end of file diff --git a/src/ServiceManagement/Compute/Sync/Sync.csproj b/src/ServiceManagement/Compute/Sync/Sync.csproj index adb9ffd0ee55..c5ba9c047121 100644 --- a/src/ServiceManagement/Compute/Sync/Sync.csproj +++ b/src/ServiceManagement/Compute/Sync/Sync.csproj @@ -126,12 +126,4 @@ - - diff --git a/src/ServiceManagement/Compute/VhdManagement/VhdManagement.csproj b/src/ServiceManagement/Compute/VhdManagement/VhdManagement.csproj index 0ac3a2dfa16f..f762ce3f01a7 100644 --- a/src/ServiceManagement/Compute/VhdManagement/VhdManagement.csproj +++ b/src/ServiceManagement/Compute/VhdManagement/VhdManagement.csproj @@ -115,18 +115,4 @@ - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/Commands.ExpressRoute.csproj b/src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/Commands.ExpressRoute.csproj index bc38453b88f1..0abf8391b01e 100644 --- a/src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/Commands.ExpressRoute.csproj +++ b/src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/Commands.ExpressRoute.csproj @@ -184,8 +184,11 @@ {5ee72c53-1720-4309-b54b-5fb79703195f} Commands.Common + + {cff09e81-1e31-444e-b4d4-a21e946c29e2} + Commands.ServiceManagement.Common + - \ No newline at end of file diff --git a/src/ServiceManagement/HDInsight/Commands.HDInsight.Test/Commands.HDInsight.Test.csproj b/src/ServiceManagement/HDInsight/Commands.HDInsight.Test/Commands.HDInsight.Test.csproj index e41029f1b6d2..2351003d1677 100644 --- a/src/ServiceManagement/HDInsight/Commands.HDInsight.Test/Commands.HDInsight.Test.csproj +++ b/src/ServiceManagement/HDInsight/Commands.HDInsight.Test/Commands.HDInsight.Test.csproj @@ -285,6 +285,10 @@ {c1bda476-a5cc-4394-914d-48b0ec31a710} Commands.ScenarioTests.Common + + {cff09e81-1e31-444e-b4d4-a21e946c29e2} + Commands.ServiceManagement.Common + {bc420543-c04e-4bf3-96e1-cd81b823bdd7} Commands.Test.Utilities @@ -302,12 +306,5 @@ - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file + \ No newline at end of file diff --git a/src/ServiceManagement/HDInsight/Commands.HDInsight/HDInsight.csproj b/src/ServiceManagement/HDInsight/Commands.HDInsight/HDInsight.csproj index db2265cd9a20..ee1442b5152d 100644 --- a/src/ServiceManagement/HDInsight/Commands.HDInsight/HDInsight.csproj +++ b/src/ServiceManagement/HDInsight/Commands.HDInsight/HDInsight.csproj @@ -378,6 +378,10 @@ {5ee72c53-1720-4309-b54b-5fb79703195f} Commands.Common + + {cff09e81-1e31-444e-b4d4-a21e946c29e2} + Commands.ServiceManagement.Common + @@ -386,19 +390,5 @@ - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/src/ServiceManagement/ManagedCache/Commands.ManagedCache.Test/Commands.ManagedCache.Test.csproj b/src/ServiceManagement/ManagedCache/Commands.ManagedCache.Test/Commands.ManagedCache.Test.csproj index cbbe0e1c7661..4e20a4ccc2ba 100644 --- a/src/ServiceManagement/ManagedCache/Commands.ManagedCache.Test/Commands.ManagedCache.Test.csproj +++ b/src/ServiceManagement/ManagedCache/Commands.ManagedCache.Test/Commands.ManagedCache.Test.csproj @@ -196,6 +196,10 @@ {c1bda476-a5cc-4394-914d-48b0ec31a710} Commands.ScenarioTests.Common + + {cff09e81-1e31-444e-b4d4-a21e946c29e2} + Commands.ServiceManagement.Common + {bc420543-c04e-4bf3-96e1-cd81b823bdd7} Commands.Test.Utilities @@ -215,12 +219,5 @@ - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - \ No newline at end of file diff --git a/src/ServiceManagement/ManagedCache/Commands.ManagedCache/Commands.ManagedCache.csproj b/src/ServiceManagement/ManagedCache/Commands.ManagedCache/Commands.ManagedCache.csproj index 78586b392991..675c204578ca 100644 --- a/src/ServiceManagement/ManagedCache/Commands.ManagedCache/Commands.ManagedCache.csproj +++ b/src/ServiceManagement/ManagedCache/Commands.ManagedCache/Commands.ManagedCache.csproj @@ -165,6 +165,10 @@ + + {cff09e81-1e31-444e-b4d4-a21e946c29e2} + Commands.ServiceManagement.Common + {CD5AA507-F5EF-473D-855B-84B91A1ABE54} Commands @@ -187,6 +191,5 @@ - \ No newline at end of file diff --git a/src/ServiceManagement/Network/Commands.Network.Test/Commands.ServiceManagement.Network.Test.csproj b/src/ServiceManagement/Network/Commands.Network.Test/Commands.ServiceManagement.Network.Test.csproj index f5d1855386e2..d0517fe6b4b1 100644 --- a/src/ServiceManagement/Network/Commands.Network.Test/Commands.ServiceManagement.Network.Test.csproj +++ b/src/ServiceManagement/Network/Commands.Network.Test/Commands.ServiceManagement.Network.Test.csproj @@ -216,6 +216,10 @@ {c1bda476-a5cc-4394-914d-48b0ec31a710} Commands.ScenarioTests.Common + + {cff09e81-1e31-444e-b4d4-a21e946c29e2} + Commands.ServiceManagement.Common + {46c06ed8-43d9-41fd-b73b-41547d9c04e1} Commands.ManagedCache @@ -306,12 +310,5 @@ - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - \ No newline at end of file diff --git a/src/ServiceManagement/Network/Commands.Network/Commands.ServiceManagement.Network.csproj b/src/ServiceManagement/Network/Commands.Network/Commands.ServiceManagement.Network.csproj index 1c941e3cd190..9c4c503517bb 100644 --- a/src/ServiceManagement/Network/Commands.Network/Commands.ServiceManagement.Network.csproj +++ b/src/ServiceManagement/Network/Commands.Network/Commands.ServiceManagement.Network.csproj @@ -269,6 +269,10 @@ + + {cff09e81-1e31-444e-b4d4-a21e946c29e2} + Commands.ServiceManagement.Common + {e1ca72ba-8374-45f6-904d-fd34ecdf5b6f} Commands.ServiceManagement @@ -301,11 +305,6 @@ - - - - - \ No newline at end of file diff --git a/src/ServiceManagement/NuGet.Config b/src/ServiceManagement/NuGet.Config new file mode 100644 index 000000000000..d151eea23028 --- /dev/null +++ b/src/ServiceManagement/NuGet.Config @@ -0,0 +1,6 @@ + + + + + + diff --git a/src/ServiceManagement/Profile/Commands.Profile/Commands.Profile.csproj b/src/ServiceManagement/Profile/Commands.Profile/Commands.Profile.csproj index 2324621c02cf..57aacf2faa5b 100644 --- a/src/ServiceManagement/Profile/Commands.Profile/Commands.Profile.csproj +++ b/src/ServiceManagement/Profile/Commands.Profile/Commands.Profile.csproj @@ -173,8 +173,11 @@ {5ee72c53-1720-4309-b54b-5fb79703195f} Commands.Common + + {cff09e81-1e31-444e-b4d4-a21e946c29e2} + Commands.ServiceManagement.Common + - \ No newline at end of file diff --git a/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices.Test/Commands.RecoveryServices.Test.csproj b/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices.Test/Commands.RecoveryServices.Test.csproj index 83e45b6d707d..3a0dd2a797f4 100644 --- a/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices.Test/Commands.RecoveryServices.Test.csproj +++ b/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices.Test/Commands.RecoveryServices.Test.csproj @@ -199,6 +199,10 @@ {c1bda476-a5cc-4394-914d-48b0ec31a710} Commands.ScenarioTests.Common + + {cff09e81-1e31-444e-b4d4-a21e946c29e2} + Commands.ServiceManagement.Common + {98b10548-df97-4fb1-8d82-2a12945d4f21} Commands.RecoveryServices @@ -208,20 +212,5 @@ - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - \ No newline at end of file diff --git a/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Commands.RecoveryServices.csproj b/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Commands.RecoveryServices.csproj index 3d890c5a0f23..51a82264a65a 100644 --- a/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Commands.RecoveryServices.csproj +++ b/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Commands.RecoveryServices.csproj @@ -216,6 +216,10 @@ {5ee72c53-1720-4309-b54b-5fb79703195f} Commands.Common + + {cff09e81-1e31-444e-b4d4-a21e946c29e2} + Commands.ServiceManagement.Common + @@ -240,20 +244,6 @@ - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/src/ServiceManagement/RemoteApp/Commands.RemoteApp.Test/Commands.RemoteApp.Test.csproj b/src/ServiceManagement/RemoteApp/Commands.RemoteApp.Test/Commands.RemoteApp.Test.csproj index 2d13a319bb23..d64f56853642 100644 --- a/src/ServiceManagement/RemoteApp/Commands.RemoteApp.Test/Commands.RemoteApp.Test.csproj +++ b/src/ServiceManagement/RemoteApp/Commands.RemoteApp.Test/Commands.RemoteApp.Test.csproj @@ -71,6 +71,10 @@ {c1bda476-a5cc-4394-914d-48b0ec31a710} Commands.ScenarioTests.Common + + {cff09e81-1e31-444e-b4d4-a21e946c29e2} + Commands.ServiceManagement.Common + {b7fd03f6-98bc-4f54-9a14-0455e579fcd4} Commands.Test @@ -179,20 +183,5 @@ - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - \ No newline at end of file diff --git a/src/ServiceManagement/RemoteApp/Commands.RemoteApp/Commands.RemoteApp.csproj b/src/ServiceManagement/RemoteApp/Commands.RemoteApp/Commands.RemoteApp.csproj index 68e4412e698e..e716700292c2 100644 --- a/src/ServiceManagement/RemoteApp/Commands.RemoteApp/Commands.RemoteApp.csproj +++ b/src/ServiceManagement/RemoteApp/Commands.RemoteApp/Commands.RemoteApp.csproj @@ -165,6 +165,10 @@ {5ee72c53-1720-4309-b54b-5fb79703195f} Commands.Common + + {cff09e81-1e31-444e-b4d4-a21e946c29e2} + Commands.ServiceManagement.Common + @@ -232,19 +236,5 @@ - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/src/ServiceManagement.sln b/src/ServiceManagement/ServiceManagement.sln similarity index 76% rename from src/ServiceManagement.sln rename to src/ServiceManagement/ServiceManagement.sln index 448ee21e8bea..4d97c396f3ad 100644 --- a/src/ServiceManagement.sln +++ b/src/ServiceManagement/ServiceManagement.sln @@ -1,108 +1,110 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.30723.0 +VisualStudioVersion = 12.0.31101.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{8531411A-0137-4E27-9C5E-49E07C245048}" ProjectSection(SolutionItems) = preProject - local.runsettings = local.runsettings - Local.testsettings = Local.testsettings - UnitTest.testsettings = UnitTest.testsettings + ..\local.runsettings = ..\local.runsettings + ..\Local.testsettings = ..\Local.testsettings + ..\UnitTest.testsettings = ..\UnitTest.testsettings EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands", "ServiceManagement\Services\Commands\Commands.csproj", "{CD5AA507-F5EF-473D-855B-84B91A1ABE54}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands", "Services\Commands\Commands.csproj", "{CD5AA507-F5EF-473D-855B-84B91A1ABE54}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Test", "ServiceManagement\Services\Commands.Test\Commands.Test.csproj", "{B7FD03F6-98BC-4F54-9A14-0455E579FCD4}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Test", "Services\Commands.Test\Commands.Test.csproj", "{B7FD03F6-98BC-4F54-9A14-0455E579FCD4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.SqlDatabase", "ServiceManagement\Sql\Commands.SqlDatabase\Commands.SqlDatabase.csproj", "{DDF5D225-C9C5-42B7-BDB5-2C3646E479AA}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.SqlDatabase", "Sql\Commands.SqlDatabase\Commands.SqlDatabase.csproj", "{DDF5D225-C9C5-42B7-BDB5-2C3646E479AA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.SqlDatabase.Test", "ServiceManagement\Sql\Commands.SqlDatabase.Test\Commands.SqlDatabase.Test.csproj", "{37455286-D8A7-4E0C-8B4D-C517D20C641A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.SqlDatabase.Test", "Sql\Commands.SqlDatabase.Test\Commands.SqlDatabase.Test.csproj", "{37455286-D8A7-4E0C-8B4D-C517D20C641A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage", "Common\Storage\Commands.Storage\Commands.Storage.csproj", "{08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage", "..\Common\Storage\Commands.Storage\Commands.Storage.csproj", "{08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage.Test", "Common\Storage\Commands.Storage.Test\Commands.Storage.Test.csproj", "{D6F470A6-7395-4B8B-9D29-44DF0EC8F624}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage.Test", "..\Common\Storage\Commands.Storage.Test\Commands.Storage.Test.csproj", "{D6F470A6-7395-4B8B-9D29-44DF0EC8F624}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ScenarioTest", "ServiceManagement\Common\Commands.ScenarioTest\Commands.ScenarioTest.csproj", "{A3965B66-5A3E-4B8C-9574-28E5958D4828}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ScenarioTest", "Common\Commands.ScenarioTest\Commands.ScenarioTest.csproj", "{A3965B66-5A3E-4B8C-9574-28E5958D4828}" ProjectSection(ProjectDependencies) = postProject {CD5AA507-F5EF-473D-855B-84B91A1ABE54} = {CD5AA507-F5EF-473D-855B-84B91A1ABE54} {DDF5D225-C9C5-42B7-BDB5-2C3646E479AA} = {DDF5D225-C9C5-42B7-BDB5-2C3646E479AA} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ServiceManagement", "ServiceManagement\Compute\Commands.ServiceManagement\Commands.ServiceManagement.csproj", "{E1CA72BA-8374-45F6-904D-FD34ECDF5B6F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ServiceManagement", "Compute\Commands.ServiceManagement\Commands.ServiceManagement.csproj", "{E1CA72BA-8374-45F6-904D-FD34ECDF5B6F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ServiceManagement.Test", "ServiceManagement\Compute\Commands.ServiceManagement.Test\Commands.ServiceManagement.Test.csproj", "{58A78F29-8C0C-4A5E-893E-3953C0F29C8A}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ServiceManagement.Test", "Compute\Commands.ServiceManagement.Test\Commands.ServiceManagement.Test.csproj", "{58A78F29-8C0C-4A5E-893E-3953C0F29C8A}" ProjectSection(ProjectDependencies) = postProject {08CF7DA7-0392-4A19-B79B-E1FF67CDB81A} = {08CF7DA7-0392-4A19-B79B-E1FF67CDB81A} {E895BBDA-0B06-46AB-B909-9B97B3ECE47E} = {E895BBDA-0B06-46AB-B909-9B97B3ECE47E} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sync", "ServiceManagement\Compute\Sync\Sync.csproj", "{73820CBC-F4EB-4C5E-B4F0-CC4A93FBF157}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sync", "Compute\Sync\Sync.csproj", "{73820CBC-F4EB-4C5E-B4F0-CC4A93FBF157}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VhdManagement", "ServiceManagement\Compute\VhdManagement\VhdManagement.csproj", "{80496B7B-068A-4A1E-B0BB-4B1FFF3FA616}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VhdManagement", "Compute\VhdManagement\VhdManagement.csproj", "{80496B7B-068A-4A1E-B0BB-4B1FFF3FA616}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Utilities", "ServiceManagement\Services\Commands.Utilities\Commands.Utilities.csproj", "{4900EC4E-8DEB-4412-9108-0BC52F81D457}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Utilities", "Services\Commands.Utilities\Commands.Utilities.csproj", "{4900EC4E-8DEB-4412-9108-0BC52F81D457}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Test.Utilities", "ServiceManagement\Services\Commands.Test.Utilities\Commands.Test.Utilities.csproj", "{BC420543-C04E-4BF3-96E1-CD81B823BDD7}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Test.Utilities", "Services\Commands.Test.Utilities\Commands.Test.Utilities.csproj", "{BC420543-C04E-4BF3-96E1-CD81B823BDD7}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage.MsTestLib", "Common\Storage\Commands.Storage.MsTestLib\Commands.Storage.MsTestLib.csproj", "{CE97967B-7479-43B9-9561-776232AC5D47}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage.MsTestLib", "..\Common\Storage\Commands.Storage.MsTestLib\Commands.Storage.MsTestLib.csproj", "{CE97967B-7479-43B9-9561-776232AC5D47}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage.StorageTestLib", "Common\Storage\Commands.Storage.StorageTestLib\Commands.Storage.StorageTestLib.csproj", "{0A513849-2690-4D07-8DE7-0ACE39645D12}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage.StorageTestLib", "..\Common\Storage\Commands.Storage.StorageTestLib\Commands.Storage.StorageTestLib.csproj", "{0A513849-2690-4D07-8DE7-0ACE39645D12}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage.ScenarioTest", "Common\Storage\Commands.Storage.ScenarioTest\Commands.Storage.ScenarioTest.csproj", "{4BC0E3D3-6EDD-43AA-8F15-DCFED8ACC93D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage.ScenarioTest", "..\Common\Storage\Commands.Storage.ScenarioTest\Commands.Storage.ScenarioTest.csproj", "{4BC0E3D3-6EDD-43AA-8F15-DCFED8ACC93D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage.MsTest2", "Common\Storage\Commands.Storage.MsTest2\Commands.Storage.MsTest2.csproj", "{9D5A40CA-5594-4F5C-8230-7ADF7CC0558E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage.MsTest2", "..\Common\Storage\Commands.Storage.MsTest2\Commands.Storage.MsTest2.csproj", "{9D5A40CA-5594-4F5C-8230-7ADF7CC0558E}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ServiceManagement.PlatformImageRepository", "ServiceManagement\Compute\Commands.ServiceManagement.PlatformImageRepository\Commands.ServiceManagement.PlatformImageRepository.csproj", "{6478FA8B-3801-4863-8591-87F0855D5C82}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ServiceManagement.PlatformImageRepository", "Compute\Commands.ServiceManagement.PlatformImageRepository\Commands.ServiceManagement.PlatformImageRepository.csproj", "{6478FA8B-3801-4863-8591-87F0855D5C82}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ServiceManagement.Preview", "ServiceManagement\Compute\Commands.ServiceManagement.Preview\Commands.ServiceManagement.Preview.csproj", "{E895BBDA-0B06-46AB-B909-9B97B3ECE47E}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ServiceManagement.Preview", "Compute\Commands.ServiceManagement.Preview\Commands.ServiceManagement.Preview.csproj", "{E895BBDA-0B06-46AB-B909-9B97B3ECE47E}" ProjectSection(ProjectDependencies) = postProject {6478FA8B-3801-4863-8591-87F0855D5C82} = {6478FA8B-3801-4863-8591-87F0855D5C82} EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ExpressRoute", "ServiceManagement\ExpressRoute\Commands.ExpressRoute\Commands.ExpressRoute.csproj", "{45C2D687-E0CE-4C97-B731-335834DC2BF2}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ExpressRoute", "ExpressRoute\Commands.ExpressRoute\Commands.ExpressRoute.csproj", "{45C2D687-E0CE-4C97-B731-335834DC2BF2}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common", "Common\Commands.Common\Commands.Common.csproj", "{5EE72C53-1720-4309-B54B-5FB79703195F}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common", "..\Common\Commands.Common\Commands.Common.csproj", "{5EE72C53-1720-4309-B54B-5FB79703195F}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common.Storage", "Common\Commands.Common.Storage\Commands.Common.Storage.csproj", "{65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common.Storage", "..\Common\Commands.Common.Storage\Commands.Common.Storage.csproj", "{65C3A86A-716D-4E7D-AB67-1DB00B3BF72D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common.Test", "ServiceManagement\Common\Commands.Common.Test\Commands.Common.Test.csproj", "{3B48A77B-5956-4A62-9081-92BA04B02B27}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common.Test", "Common\Commands.Common.Test\Commands.Common.Test.csproj", "{3B48A77B-5956-4A62-9081-92BA04B02B27}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{95C16AED-FD57-42A0-86C3-2CF4300A4817}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.TrafficManager", "ServiceManagement\TrafficManager\Commands.TrafficManager\Commands.TrafficManager.csproj", "{94E96A5C-B5AD-4E10-B13A-3BC16D102AED}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.TrafficManager", "TrafficManager\Commands.TrafficManager\Commands.TrafficManager.csproj", "{94E96A5C-B5AD-4E10-B13A-3BC16D102AED}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ManagedCache", "ServiceManagement\ManagedCache\Commands.ManagedCache\Commands.ManagedCache.csproj", "{46C06ED8-43D9-41FD-B73B-41547D9C04E1}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ManagedCache", "ManagedCache\Commands.ManagedCache\Commands.ManagedCache.csproj", "{46C06ED8-43D9-41FD-B73B-41547D9C04E1}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ManagedCache.Test", "ServiceManagement\ManagedCache\Commands.ManagedCache.Test\Commands.ManagedCache.Test.csproj", "{374D4000-DEDE-4995-9B63-E3B9FE0C4D29}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ManagedCache.Test", "ManagedCache\Commands.ManagedCache.Test\Commands.ManagedCache.Test.csproj", "{374D4000-DEDE-4995-9B63-E3B9FE0C4D29}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.TrafficManager.Test", "ServiceManagement\TrafficManager\Commands.TrafficManager.Test\Commands.TrafficManager.Test.csproj", "{84F99CBD-5B86-4428-B263-135B2F67F512}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.TrafficManager.Test", "TrafficManager\Commands.TrafficManager.Test\Commands.TrafficManager.Test.csproj", "{84F99CBD-5B86-4428-B263-135B2F67F512}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.HDInsight.Test", "ServiceManagement\HDInsight\Commands.HDInsight.Test\Commands.HDInsight.Test.csproj", "{7E8D2555-2DDD-4757-974F-D5FFD0647671}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.HDInsight.Test", "HDInsight\Commands.HDInsight.Test\Commands.HDInsight.Test.csproj", "{7E8D2555-2DDD-4757-974F-D5FFD0647671}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Automation", "ServiceManagement\Automation\Commands.Automation\Commands.Automation.csproj", "{47CD7E95-5330-4384-ABCE-2C267C57085C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Automation", "Automation\Commands.Automation\Commands.Automation.csproj", "{47CD7E95-5330-4384-ABCE-2C267C57085C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Automation.Test", "ServiceManagement\Automation\Commands.Automation.Test\Commands.Automation.Test.csproj", "{127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Automation.Test", "Automation\Commands.Automation.Test\Commands.Automation.Test.csproj", "{127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HDInsight", "ServiceManagement\HDInsight\Commands.HDInsight\HDInsight.csproj", "{137D404A-865A-43DB-930C-6DA67DA048DF}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "HDInsight", "HDInsight\Commands.HDInsight\HDInsight.csproj", "{137D404A-865A-43DB-930C-6DA67DA048DF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ServiceManagement.Network", "ServiceManagement\Network\Commands.Network\Commands.ServiceManagement.Network.csproj", "{40FEE0BB-FD45-4EFC-85BC-0D602A6892C4}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ServiceManagement.Network", "Network\Commands.Network\Commands.ServiceManagement.Network.csproj", "{40FEE0BB-FD45-4EFC-85BC-0D602A6892C4}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ServiceManagement.Network.Test", "ServiceManagement\Network\Commands.Network.Test\Commands.ServiceManagement.Network.Test.csproj", "{FDB897BD-FCB4-44A1-8D66-AC99F22EC737}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ServiceManagement.Network.Test", "Network\Commands.Network.Test\Commands.ServiceManagement.Network.Test.csproj", "{FDB897BD-FCB4-44A1-8D66-AC99F22EC737}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.RecoveryServices", "ServiceManagement\RecoveryServices\Commands.RecoveryServices\Commands.RecoveryServices.csproj", "{98B10548-DF97-4FB1-8D82-2A12945D4F21}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.RecoveryServices", "RecoveryServices\Commands.RecoveryServices\Commands.RecoveryServices.csproj", "{98B10548-DF97-4FB1-8D82-2A12945D4F21}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.RecoveryServices.Test", "ServiceManagement\RecoveryServices\Commands.RecoveryServices.Test\Commands.RecoveryServices.Test.csproj", "{A415F75B-EB6A-49A6-934E-5BA71B83D6EB}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.RecoveryServices.Test", "RecoveryServices\Commands.RecoveryServices.Test\Commands.RecoveryServices.Test.csproj", "{A415F75B-EB6A-49A6-934E-5BA71B83D6EB}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.RemoteApp", "ServiceManagement\RemoteApp\Commands.RemoteApp\Commands.RemoteApp.csproj", "{492D2AF2-950B-4F2E-8079-8794305313FD}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.RemoteApp", "RemoteApp\Commands.RemoteApp\Commands.RemoteApp.csproj", "{492D2AF2-950B-4F2E-8079-8794305313FD}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.RemoteApp.Test", "ServiceManagement\RemoteApp\Commands.RemoteApp.Test\Commands.RemoteApp.Test.csproj", "{CA82D500-1940-4068-A076-D7A8AD459FB0}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.RemoteApp.Test", "RemoteApp\Commands.RemoteApp.Test\Commands.RemoteApp.Test.csproj", "{CA82D500-1940-4068-A076-D7A8AD459FB0}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.StorSimple", "ServiceManagement\StorSimple\Commands.StorSimple\Commands.StorSimple.csproj", "{11524D98-6C40-4091-A8E1-86463FEE607C}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.StorSimple", "StorSimple\Commands.StorSimple\Commands.StorSimple.csproj", "{11524D98-6C40-4091-A8E1-86463FEE607C}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ScenarioTests.Common", "Common\Commands.ScenarioTests.Common\Commands.ScenarioTests.Common.csproj", "{C1BDA476-A5CC-4394-914D-48B0EC31A710}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ScenarioTests.Common", "..\Common\Commands.ScenarioTests.Common\Commands.ScenarioTests.Common.csproj", "{C1BDA476-A5CC-4394-914D-48B0EC31A710}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Profile", "ServiceManagement\Profile\Commands.Profile\Commands.Profile.csproj", "{C60342B1-47D3-4A0E-8081-9B97CE60B7AF}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Profile", "Profile\Commands.Profile\Commands.Profile.csproj", "{C60342B1-47D3-4A0E-8081-9B97CE60B7AF}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.StorSimple.Test", "ServiceManagement\StorSimple\Commands.StorSimple.Test\Commands.StorSimple.Test.csproj", "{0FA676D5-1349-4086-B33F-65EC2CB7DA41}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.StorSimple.Test", "StorSimple\Commands.StorSimple.Test\Commands.StorSimple.Test.csproj", "{0FA676D5-1349-4086-B33F-65EC2CB7DA41}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ServiceManagement.Common", "Common\Commands.ServiceManagement.Common\Commands.ServiceManagement.Common.csproj", "{CFF09E81-1E31-444E-B4D4-A21E946C29E2}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -274,6 +276,10 @@ Global {0FA676D5-1349-4086-B33F-65EC2CB7DA41}.Debug|Any CPU.Build.0 = Debug|Any CPU {0FA676D5-1349-4086-B33F-65EC2CB7DA41}.Release|Any CPU.ActiveCfg = Release|Any CPU {0FA676D5-1349-4086-B33F-65EC2CB7DA41}.Release|Any CPU.Build.0 = Release|Any CPU + {CFF09E81-1E31-444E-B4D4-A21E946C29E2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CFF09E81-1E31-444E-B4D4-A21E946C29E2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CFF09E81-1E31-444E-B4D4-A21E946C29E2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CFF09E81-1E31-444E-B4D4-A21E946C29E2}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/src/ServiceManagement/Services/Commands.Test.Utilities/Commands.Test.Utilities.csproj b/src/ServiceManagement/Services/Commands.Test.Utilities/Commands.Test.Utilities.csproj index 44ec05593535..fc1df98ed503 100644 --- a/src/ServiceManagement/Services/Commands.Test.Utilities/Commands.Test.Utilities.csproj +++ b/src/ServiceManagement/Services/Commands.Test.Utilities/Commands.Test.Utilities.csproj @@ -163,6 +163,10 @@ {c1bda476-a5cc-4394-914d-48b0ec31a710} Commands.ScenarioTests.Common + + {cff09e81-1e31-444e-b4d4-a21e946c29e2} + Commands.ServiceManagement.Common + {e1ca72ba-8374-45f6-904d-fd34ecdf5b6f} Commands.ServiceManagement @@ -178,12 +182,5 @@ - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - \ No newline at end of file diff --git a/src/ServiceManagement/Services/Commands.Test/Commands.Test.csproj b/src/ServiceManagement/Services/Commands.Test/Commands.Test.csproj index 2a9ee4098d0b..0535bf2cdf04 100644 --- a/src/ServiceManagement/Services/Commands.Test/Commands.Test.csproj +++ b/src/ServiceManagement/Services/Commands.Test/Commands.Test.csproj @@ -404,6 +404,10 @@ + + {cff09e81-1e31-444e-b4d4-a21e946c29e2} + Commands.ServiceManagement.Common + {c60342b1-47d3-4a0e-8081-9b97ce60b7af} Commands.Profile @@ -455,19 +459,5 @@ - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/src/ServiceManagement/Services/Commands.Utilities/Commands.Utilities.csproj b/src/ServiceManagement/Services/Commands.Utilities/Commands.Utilities.csproj index 00e7cd4bf701..2e9e5c50ccd0 100644 --- a/src/ServiceManagement/Services/Commands.Utilities/Commands.Utilities.csproj +++ b/src/ServiceManagement/Services/Commands.Utilities/Commands.Utilities.csproj @@ -696,11 +696,14 @@ {5ee72c53-1720-4309-b54b-5fb79703195f} Commands.Common + + {cff09e81-1e31-444e-b4d4-a21e946c29e2} + Commands.ServiceManagement.Common + - powershell.exe -ExecutionPolicy Unrestricted -File "$(ProjectDir)\PostBuild.ps1" "$(TargetDir)\" - \ No newline at end of file + \ No newline at end of file diff --git a/src/ServiceManagement/Services/Commands/Commands.csproj b/src/ServiceManagement/Services/Commands/Commands.csproj index ea54fbccac2d..5985c0b5929a 100644 --- a/src/ServiceManagement/Services/Commands/Commands.csproj +++ b/src/ServiceManagement/Services/Commands/Commands.csproj @@ -349,6 +349,10 @@ + + {cff09e81-1e31-444e-b4d4-a21e946c29e2} + Commands.ServiceManagement.Common + {4900ec4e-8deb-4412-9108-0bc52f81d457} Commands.Utilities @@ -360,10 +364,5 @@ - - - - - \ No newline at end of file diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/Commands.SqlDatabase.Test.csproj b/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/Commands.SqlDatabase.Test.csproj index f0221ebbafcc..cdabe9a8c084 100644 --- a/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/Commands.SqlDatabase.Test.csproj +++ b/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/Commands.SqlDatabase.Test.csproj @@ -240,6 +240,10 @@ {c1bda476-a5cc-4394-914d-48b0ec31a710} Commands.ScenarioTests.Common + + {cff09e81-1e31-444e-b4d4-a21e946c29e2} + Commands.ServiceManagement.Common + {DDF5D225-C9C5-42B7-BDB5-2C3646E479AA} Commands.SqlDatabase @@ -282,19 +286,5 @@ - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase/Commands.SqlDatabase.csproj b/src/ServiceManagement/Sql/Commands.SqlDatabase/Commands.SqlDatabase.csproj index 18166f8baefb..5e8600483ac3 100644 --- a/src/ServiceManagement/Sql/Commands.SqlDatabase/Commands.SqlDatabase.csproj +++ b/src/ServiceManagement/Sql/Commands.SqlDatabase/Commands.SqlDatabase.csproj @@ -241,6 +241,10 @@ {65c3a86a-716d-4e7d-ab67-1db00b3bf72d} Commands.Common.Storage + + {cff09e81-1e31-444e-b4d4-a21e946c29e2} + Commands.ServiceManagement.Common + {CD5AA507-F5EF-473D-855B-84B91A1ABE54} Commands @@ -268,6 +272,5 @@ - - + \ No newline at end of file diff --git a/src/ServiceManagement/StorSimple/Commands.StorSimple.Test/Commands.StorSimple.Test.csproj b/src/ServiceManagement/StorSimple/Commands.StorSimple.Test/Commands.StorSimple.Test.csproj index 6f6bc70fd31b..657d75231e2d 100644 --- a/src/ServiceManagement/StorSimple/Commands.StorSimple.Test/Commands.StorSimple.Test.csproj +++ b/src/ServiceManagement/StorSimple/Commands.StorSimple.Test/Commands.StorSimple.Test.csproj @@ -141,6 +141,10 @@ {c1bda476-a5cc-4394-914d-48b0ec31a710} Commands.ScenarioTests.Common + + {cff09e81-1e31-444e-b4d4-a21e946c29e2} + Commands.ServiceManagement.Common + {11524d98-6c40-4091-a8e1-86463fee607c} Commands.StorSimple @@ -167,25 +171,6 @@ - - - xcopy "$(SolutionDir)Package\$(ConfigurationName)\*.*" $(TargetDir) /Y /E - - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - \ No newline at end of file diff --git a/src/ServiceManagement/StorSimple/Commands.StorSimple/Commands.StorSimple.csproj b/src/ServiceManagement/StorSimple/Commands.StorSimple/Commands.StorSimple.csproj index ba0bcce3df4c..a05248056e39 100644 --- a/src/ServiceManagement/StorSimple/Commands.StorSimple/Commands.StorSimple.csproj +++ b/src/ServiceManagement/StorSimple/Commands.StorSimple/Commands.StorSimple.csproj @@ -209,6 +209,10 @@ {5ee72c53-1720-4309-b54b-5fb79703195f} Commands.Common + + {cff09e81-1e31-444e-b4d4-a21e946c29e2} + Commands.ServiceManagement.Common + @@ -236,20 +240,5 @@ - - - - This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - - \ No newline at end of file diff --git a/src/ServiceManagement/TrafficManager/Commands.TrafficManager.Test/Commands.TrafficManager.Test.csproj b/src/ServiceManagement/TrafficManager/Commands.TrafficManager.Test/Commands.TrafficManager.Test.csproj index b050ad64b5b3..db5a7672b0bc 100644 --- a/src/ServiceManagement/TrafficManager/Commands.TrafficManager.Test/Commands.TrafficManager.Test.csproj +++ b/src/ServiceManagement/TrafficManager/Commands.TrafficManager.Test/Commands.TrafficManager.Test.csproj @@ -175,6 +175,10 @@ {c1bda476-a5cc-4394-914d-48b0ec31a710} Commands.ScenarioTests.Common + + {cff09e81-1e31-444e-b4d4-a21e946c29e2} + Commands.ServiceManagement.Common + {94e96a5c-b5ad-4e10-b13a-3bc16d102aed} Commands.TrafficManager @@ -184,19 +188,5 @@ - - - - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - - - - \ No newline at end of file diff --git a/src/ServiceManagement/TrafficManager/Commands.TrafficManager/Commands.TrafficManager.csproj b/src/ServiceManagement/TrafficManager/Commands.TrafficManager/Commands.TrafficManager.csproj index 5a519f02e10e..9603969382a6 100644 --- a/src/ServiceManagement/TrafficManager/Commands.TrafficManager/Commands.TrafficManager.csproj +++ b/src/ServiceManagement/TrafficManager/Commands.TrafficManager/Commands.TrafficManager.csproj @@ -173,6 +173,10 @@ {5ee72c53-1720-4309-b54b-5fb79703195f} Commands.Common + + {cff09e81-1e31-444e-b4d4-a21e946c29e2} + Commands.ServiceManagement.Common + @@ -180,6 +184,5 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/tools/AzureRM/AzureRM.psd1 b/tools/AzureRM/AzureRM.psd1 index b59669b2fb87..51fd7597bf01 100644 Binary files a/tools/AzureRM/AzureRM.psd1 and b/tools/AzureRM/AzureRM.psd1 differ diff --git a/tools/AzureRM/AzureRM.psm1 b/tools/AzureRM/AzureRM.psm1 index dbcfdd49a92b..f28ba6e28a7a 100644 --- a/tools/AzureRM/AzureRM.psm1 +++ b/tools/AzureRM/AzureRM.psm1 @@ -1,9 +1,68 @@ +$AzureRMProfileVersion = "0.9.8"; + +$AzureRMModules = @{ + "AzureRM.ApiManagement" = "0.9.8"; + "AzureRM.Automation" = "0.9.8"; + "AzureRM.Backup" = "0.9.8"; + "AzureRM.Batch" = "0.9.8"; + "AzureRM.Compute" = "0.9.8"; + "AzureRM.DataFactories" = "0.9.8"; + "AzureRM.Dns" = "0.9.8"; + "AzureRM.HDInsight" = "0.9.8"; + "AzureRM.Insights" = "0.9.8"; + "AzureRM.KeyVault" = "0.9.8"; + "AzureRM.Network" = "0.9.8"; + "AzureRM.OperationalInsights" = "0.9.8"; + "AzureRM.RedisCache" = "0.9.8"; + "AzureRM.Resources" = "0.9.8"; + "AzureRM.SiteRecovery" = "0.9.8"; + "AzureRM.Sql" = "0.9.8"; + "AzureRM.Storage" = "0.9.8"; + "AzureRM.StreamAnalytics" = "0.9.8"; + "AzureRM.Tags" = "0.9.8"; + "AzureRM.TrafficManager" = "0.9.8"; + "AzureRM.UsageAggregates" = "0.9.8"; + "AzureRM.Websites" = "0.9.8" +} + +function Validate-AdminRights([string]$Scope) +{ + if ($Scope -ne "CurrentUser") + { + $user = [Security.Principal.WindowsIdentity]::GetCurrent(); + $isAdmin = (New-Object Security.Principal.WindowsPrincipal $user).IsInRole([Security.Principal.WindowsBuiltinRole]::Administrator) + if($isAdmin -eq $false) + { + throw "Administrator rights are required to install Microsoft Azure modules" + } + } +} + +function Import-ModuleWithVersionCheck([string]$Name,[string]$MinimumVersion,[string]$Repository,[string]$Scope) +{ + $minVer = $MinimumVersion + $maxVer = "$($minVer.Split(".")[0]).9999.0" + try { + if ([string]::IsNullOrWhiteSpace($Repository)) + { + Install-Module -Name $Name -Scope $Scope -MinimumVersion $minVer -MaximumVersion $maxVer -ErrorAction Stop + } else { + Install-Module -Name $Name -Repository $Repository -Scope $Scope -MinimumVersion $minVer -MaximumVersion $maxVer -ErrorAction Stop + } + $v = (Get-InstalledModule -Name $Name)[0].Version.ToString() + Write-Output "$Name $v installed..." + } catch { + Write-Warning "Skipping $Name package..." + Write-Warning $_ + } +} + <# .Synopsis Install Azure Resource Manager cmdlet modules .Description - Installs all the available Azure Resource Manager cmdlet modules that start with "AzureRM". + Installs all the available Azure Resource Manager cmdlet modules. .Parameter Repository Limit the search for "AzureRM" cmdlets in a specific repository. @@ -13,36 +72,69 @@ #> function Update-AzureRM { - param( - [Parameter(Position=0, Mandatory = $false)] - [string] - $Repository, + param( + [Parameter(Position=0, Mandatory = $false)] + [string] + $Repository, + [Parameter(Position=1, Mandatory = $false)] + [ValidateSet("CurrentUser","AllUsers")] + [string] + $Scope) - [Parameter(Position=1, Mandatory = $false)] - [ValidateSet("CurrentUser","AllUsers")] - [string] - $Scope) + if ([string]::IsNullOrWhiteSpace($Scope)) + { + $Scope = "AllUsers" + } - if ([string]::IsNullOrWhiteSpace($Scope)) - { - $Scope = "AllUsers" - } + Validate-AdminRights $Scope - Install-Module AzureRM.Profile -Repository $Repository - if ([string]::IsNullOrWhiteSpace($Repository)) - { - $modules = Find-Module -Name AzureRM.* | Where-Object {$_.Name -ne "AzureRM" -and $_.Name -ne "AzureRM.Profile"} - } else { - $modules = Find-Module -Repository $Repository | Where-Object {$_.Name -like "AzureRM.*" -and $_.Name -ne "AzureRM" -and $_.Name -ne "AzureRM.Profile"} + Write-Output "Installing AzureRM modules." + + Import-ModuleWithVersionCheck "AzureRM.Profile" $AzureRMProfileVersion $Repository $Scope + + $result = $AzureRMModules.Keys | ForEach { + Start-Job -Name $_ -ScriptBlock { + Import-ModuleWithVersionCheck $args[0] $args[1] $args[2] $args[3] + } -ArgumentList $_, $AzureRMModules[$_], $Repository, $Scope } + + $AzureRMModules.Keys | ForEach {Get-Job -Name $_ | Wait-Job | Receive-Job } +} + +<# + .Synopsis + Remove Azure Resource Manager cmdlet modules + + .Description + Removes all installed Azure Resource Manager cmdlet modules. +#> +function Uninstall-AzureRM +{ + param( + [Parameter(Position=0, Mandatory = $false)] + [string] + $Repository) + + Validate-AdminRights "AllUsers" + + Write-Output "Uninstalling AzureRM modules." + + $AzureRMModules.Keys | ForEach { + $moduleName = $_ + if ((Get-InstalledModule | where {$_.Name -eq $moduleName}) -ne $null) { + $minVer = $AzureRMModules[$_] + $maxVer = "$($minVer.Split(".")[0]).9999.0" + Uninstall-Module -Name $_ -MinimumVersion $minVer -MaximumVersion $maxVer -ErrorAction Stop + Write-Output "$moduleName uninstalled..." } + } - Write-Output "Installing $($modules.Length) AzureRM modules. This may take a few minutes." + if ((Get-InstalledModule | where {$_.Name -eq "AzureRM.Profile"}) -ne $null) { + $minVer = $AzureRMProfileVersion + $maxVer = "$($minVer.Split(".")[0]).9999.0" + Uninstall-Module -Name "AzureRM.Profile" -MinimumVersion $minVer -MaximumVersion $maxVer -ErrorAction Stop + Write-Output "AzureRM.Profile uninstalled..." + } +} - $result = $modules | ForEach { - Start-Job -Name $_.Name -ScriptBlock { - Install-Module -Name $args[0] -Repository $args[1] -Scope $args[2] - Write-Output "$($args[0]) installed..." - } -ArgumentList $_.Name, $Repository, $Scope } - - $modules | ForEach {Get-Job -Name $_.Name | Wait-Job | Receive-Job } -} \ No newline at end of file +New-Alias -Name Install-AzureRM -Value Update-AzureRM +Export-ModuleMember -function * -Alias * \ No newline at end of file diff --git a/src/.nuget/NuGet.exe b/tools/NuGet.exe similarity index 100% rename from src/.nuget/NuGet.exe rename to tools/NuGet.exe diff --git a/tools/PublishModules.ps1 b/tools/PublishModules.ps1 index e8535c77ebc7..9f8ba4ac00c8 100644 --- a/tools/PublishModules.ps1 +++ b/tools/PublishModules.ps1 @@ -15,46 +15,83 @@ param( [Parameter(Mandatory = $false, Position = 0)] [string] $buildConfig, - [Parameter(Mandatory = $false, Position = 1)] + [Parameter(Mandatory = $false, Position = 1)] + [string] $scope, + [Parameter(Mandatory = $false, Position = 2)] [string] $apiKey, - [Parameter(Mandatory = $false, Position = 2)] + [Parameter(Mandatory = $false, Position = 3)] [string] $repositoryLocation ) if ([string]::IsNullOrEmpty($buildConfig)) { - Write-Verbose "Setting build configuration to 'Release'" - $buildConfig = 'Release' + Write-Verbose "Setting build configuration to 'Release'" + $buildConfig = "Release" } if ([string]::IsNullOrEmpty($repositoryLocation)) { - Write-Verbose "Setting repository location to 'http://psget/PSGallery/api/v2/'" - $repositoryLocation = 'http://psget/PSGallery/api/v2/' + Write-Verbose "Setting repository location to 'https://dtlgalleryint.cloudapp.net/api/v2'" + $repositoryLocation = "https://dtlgalleryint.cloudapp.net/api/v2" } +if ([string]::IsNullOrEmpty($scope)) +{ + Write-Verbose "Default scope to all" + $scope = 'All' +} + +Write-Host "Publishing $scope package(s)" + $packageFolder = "$PSScriptRoot\..\src\Package" -$repoName = $(New-Guid).ToString() -Register-PSRepository -Name $repoName -SourceLocation $repositoryLocation -PublishLocation $repositoryLocation -InstallationPolicy Trusted -$modulePath = "$packageFolder\$buildConfig\ServiceManagement\Azure" -# Publish Azure module -Write-Host "Publishing Azure module from $modulePath" -Publish-Module -Path $modulePath -NuGetApiKey $apiKey -Repository $repoName -Write-Host "Published Azure module" -# Publish AzureRM.Profile module -Write-Host "Publishing AzureRM.Profile module from $modulePath" -Publish-Module -Path "$packageFolder\$buildConfig\ResourceManager\AzureResourceManager\AzureRM.Profile" -NuGetApiKey $apiKey -Repository $repoName -Write-Host "Published AzureRM.Profile module" - -# Publish AzureRM modules -$resourceManagerModules = Get-ChildItem -Path "$packageFolder\$buildConfig\ResourceManager\AzureResourceManager" -Directory -foreach ($module in $resourceManagerModules) { - if ($module -ne "AzureRM.Profile") { - $modulePath = $module.FullName - Write-Host "Publishing $module module from $modulePath" - Publish-Module -Path $modulePath -NuGetApiKey $apiKey -Repository $repoName - Write-Host "Published $module module" - } +$repo = Get-PSRepository | where { $_.SourceLocation -eq $repositoryLocation } +if ($repo -ne $null) { + $repoName = $repo.Name +} else { + $repoName = $(New-Guid).ToString() + Register-PSRepository -Name $repoName -SourceLocation $repositoryLocation -PublishLocation $repositoryLocation/package -InstallationPolicy Trusted +} + +if (($scope -eq 'All') -or ($scope -eq 'ServiceManagement')) { + $modulePath = "$packageFolder\$buildConfig\ServiceManagement\Azure" + # Publish Azure module + Write-Host "Publishing Azure module from $modulePath" + Publish-Module -Path $modulePath -NuGetApiKey $apiKey -Repository $repoName +} + +if (($scope -eq 'All') -or ($scope -eq 'AzureStorage')) { + $modulePath = "$packageFolder\$buildConfig\ServiceManagement\Azure\Azure.Storage" + # Publish AzureStorage module + Write-Host "Publishing AzureStorage module from $modulePath" + Publish-Module -Path $modulePath -NuGetApiKey $apiKey -Repository $repoName +} + +if ($scope -eq 'AzureRM') { + # Publish AzureRM module + $modulePath = "$PSScriptRoot\AzureRM" + Write-Host "Publishing AzureRM module from $modulePath" + Publish-Module -Path $modulePath -NuGetApiKey $apiKey -Repository $repoName + Write-Host "Published Azure module" +} + +$resourceManagerRootFolder = "$packageFolder\$buildConfig\ResourceManager\AzureResourceManager" +$resourceManagerModules = Get-ChildItem -Path $resourceManagerRootFolder -Directory +if ($scope -eq 'All') { + # Publish AzureRM modules + foreach ($module in $resourceManagerModules) { + $modulePath = $module.FullName + Write-Host "Publishing $module module from $modulePath" + Publish-Module -Path $modulePath -NuGetApiKey $apiKey -Repository $repoName + Write-Host "Published $module module" + } +} else { + $modulePath = Join-Path $resourceManagerRootFolder "AzureRM.$scope" + if (Test-Path $modulePath) { + Write-Host "Publishing $scope module from $modulePath" + Publish-Module -Path $modulePath -NuGetApiKey $apiKey -Repository $repoName + Write-Host "Published $scope module" + } else { + Write-Error "Can not find module with name $scope to publish" + } } -Unregister-PSRepository -Name $repoName \ No newline at end of file