Skip to content

Vmss #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 15 commits into from
Feb 24, 2016
Merged

Vmss #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
7686f15
Merge remote-tracking branch 'refs/remotes/Azure/dev' into dev
sanjkum Feb 18, 2016
3353c29
Disable Set-AzureSqlServerCommunicationLink
adumitr Feb 18, 2016
8b4fa67
Fix for Bug #4639382
sanjkum Feb 19, 2016
ccd1079
Merge branch 'dev' of github.com:Azure/azure-powershell into dev
Feb 23, 2016
fd80e99
Update help for *RmResourceProvider cmdlets
vivsriaus Feb 24, 2016
82448e9
Remove Set-AzureSqlServerCommunicationLink from build
adumitr Feb 24, 2016
f6cd282
Merge branch 'dev' of github.com:Azure/azure-powershell into dev
Feb 24, 2016
e4ad28d
Fixed WarningOnIncompatibleVersions test to provide correct error.
Feb 24, 2016
79e0d9d
Removed flaky test from build.
Feb 24, 2016
41a9a6d
Merge pull request #1852 from hovsepm/dev
Feb 24, 2016
cf4dbdc
Merge pull request #1830 from adumitr/cross_server_gt
Feb 24, 2016
d6a620c
Merge pull request #1834 from sanjkum/dev
Feb 24, 2016
c50aaf6
Merge pull request #1851 from vivsriaus/DocUpdate
Feb 24, 2016
05995b7
Merge pull request #434 from Azure/dev
huangpf Feb 24, 2016
d5a5ba9
Merge pull request #436 from huangpf/dev
huangpf Feb 24, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/ResourceManager/Profile/Commands.Profile.Test/ProfileModuleTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ namespace Microsoft.Azure.Commands.Profile.Test
{
public class ProfileModuleTests
{
[Fact]
[Fact(Skip="Removed flaky test from CI.")]
[Trait(Category.AcceptanceType, Category.CheckIn)]
public void WarningOnIncompatibleVersions()
{
Expand Down
21 changes: 18 additions & 3 deletions src/ResourceManager/Profile/Commands.Profile.Test/ProfileModuleTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,25 @@
# limitations under the License.
# ----------------------------------------------------------------------------------

function Verify-TestRepoDeleted
{
$createdRepo = Get-PSRepository -Name "ProfileModuleTest" -ErrorAction Ignore
if($createdRepo)
{
Unregister-PSRepository -Name "ProfileModuleTest"
}
}

<#
.SYNOPSIS
Tests warning gets printed on incompatible modules with profile
#>
function Test-LoadProfileModule
{
$testPassed = $false
# Clean environment
Verify-TestRepoDeleted

# Push current profile module
Get-PackageProvider -Name NuGet -ForceBootstrap
$global:pushedProfileModule = $(Get-Module AzureRM.Profile).Path
Expand All @@ -29,15 +42,17 @@ function Test-LoadProfileModule
$global:buffer = Import-Module $global:pushedProfileModule 2>&1 3>&1 | Out-String
Write-Warning $global:buffer
Assert-True { $global:buffer -Like "*AzureRM.ApiManagement 998.9.8 is not compatible with AzureRM.Profile*" }
$testPassed = $true
} catch [system.exception] {
Write-Error $_ -ErrorAction Continue
Write-Error $_
} finally {
Uninstall-Module AzureRM.ApiManagement -ErrorAction Ignore
Uninstall-Module AzureRM.Profile -ErrorAction Ignore
}
} catch [system.exception] {
Write-Error $_ -ErrorAction Continue
Write-Error $_
} finally {
Unregister-PSRepository -Name "ProfileModuleTest"
Verify-TestRepoDeleted
}
Assert-True { $testPassed -eq $true } "testPassed = $testPassed"
}
138 changes: 138 additions & 0 deletions ...ourceManager/Resources/Commands.Resources/Microsoft.Azure.Commands.Resources.dll-Help.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1006,6 +1006,98 @@
</maml:alert>
</maml:alertSet>
<command:examples>
<command:example>
<maml:title>-------------------------- Example 1: Get all registered resource providers --------------------------</maml:title>
<maml:introduction>
<maml:paragraph>PS C:\&gt;</maml:paragraph>
</maml:introduction>
<dev:code>
PS C:\&gt;Get-AzureRmResourceProvider
</dev:code>
<dev:remarks>
<maml:para>This command gets all the registered resource providers.</maml:para>
<maml:para />
<maml:para />
<maml:para>
</maml:para>
</dev:remarks>
<command:commandLines>
<command:commandLine>
<command:commandText>
<maml:para />
</command:commandText>
</command:commandLine>
</command:commandLines>
</command:example>
<command:example>
<maml:title>-------------------------- Example 2: Get all resource providers, including those not registered --------------------------</maml:title>
<maml:introduction>
<maml:paragraph>PS C:\&gt;</maml:paragraph>
</maml:introduction>
<dev:code>
PS C:\&gt;Get-AzureRmResourceProvider -ListAvailable
</dev:code>
<dev:remarks>
<maml:para>This command gets all the resource providers, including those registered and unregistered.</maml:para>
<maml:para />
<maml:para />
<maml:para>
</maml:para>
</dev:remarks>
<command:commandLines>
<command:commandLine>
<command:commandText>
<maml:para />
</command:commandText>
</command:commandLine>
</command:commandLines>
</command:example>
<command:example>
<maml:title>-------------------------- Example 3: Get details about a particular resource provider --------------------------</maml:title>
<maml:introduction>
<maml:paragraph>PS C:\&gt;</maml:paragraph>
</maml:introduction>
<dev:code>
PS C:\&gt;Get-AzureRmResourceProvider -ProviderNamespace Microsoft.Web
</dev:code>
<dev:remarks>
<maml:para>This command gets details about a particular resource provider, including the resource types and locations available for the resource provider.</maml:para>
<maml:para />
<maml:para />
<maml:para>
</maml:para>
</dev:remarks>
<command:commandLines>
<command:commandLine>
<command:commandText>
<maml:para />
</command:commandText>
</command:commandLine>
</command:commandLines>
</command:example>
<command:example>
<maml:title>-------------------------- Example 4: Get all registered resource providers filtered by a location --------------------------</maml:title>
<maml:introduction>
<maml:paragraph>PS C:\&gt;</maml:paragraph>
</maml:introduction>
<dev:code>
PS C:\&gt;Get-AzureRmResourceProvider -Location westus
</dev:code>
<dev:remarks>
<maml:para>This command gets all the registered resource providers under a location.</maml:para>
<maml:para />
<maml:para />
<maml:para>
</maml:para>
</dev:remarks>
<command:commandLines>
<command:commandLine>
<command:commandText>
<maml:para />
</command:commandText>
</command:commandLine>
</command:commandLines>
</command:example>
</command:examples>
<maml:relatedLinks>
</maml:relatedLinks>
Expand Down Expand Up @@ -6311,6 +6403,29 @@ Resources</dev:code>
</maml:alert>
</maml:alertSet>
<command:examples>
<command:example>
<maml:title>-------------------------- Example 1: Register a resource provider --------------------------</maml:title>
<maml:introduction>
<maml:paragraph>PS C:\&gt;</maml:paragraph>
</maml:introduction>
<dev:code>
PS C:\&gt;Register-AzureRmResourceProvider -ProviderNamespace Microsoft.Web
</dev:code>
<dev:remarks>
<maml:para>This command registers the provider "Microsoft.Web" for the selected subscription.</maml:para>
<maml:para />
<maml:para />
<maml:para>
</maml:para>
</dev:remarks>
<command:commandLines>
<command:commandLine>
<command:commandText>
<maml:para />
</command:commandText>
</command:commandLine>
</command:commandLines>
</command:example>
</command:examples>
<maml:relatedLinks>
</maml:relatedLinks>
Expand Down Expand Up @@ -9657,6 +9772,29 @@ Tags:
</maml:alert>
</maml:alertSet>
<command:examples>
<command:example>
<maml:title>-------------------------- Example 1: Unregister a resource provider --------------------------</maml:title>
<maml:introduction>
<maml:paragraph>PS C:\&gt;</maml:paragraph>
</maml:introduction>
<dev:code>
PS C:\&gt;Unregister-AzureRmResourceProvider -ProviderNamespace Microsoft.Web
</dev:code>
<dev:remarks>
<maml:para>This command unregisters the provider "Microsoft.Web" for the selected subscription.</maml:para>
<maml:para />
<maml:para />
<maml:para>
</maml:para>
</dev:remarks>
<command:commandLines>
<command:commandLine>
<command:commandText>
<maml:para />
</command:commandText>
</command:commandLine>
</command:commandLines>
</command:example>
</command:examples>
<maml:relatedLinks>
</maml:relatedLinks>
Expand Down
1 change: 0 additions & 1 deletion src/ResourceManager/Sql/Commands.Sql/Commands.Sql.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,7 +200,6 @@
<Compile Include="ServerCommunicationLink\Cmdlet\GetAzureSqlServerCommunicationLink.cs" />
<Compile Include="ServerCommunicationLink\Cmdlet\NewAzureSqlServerCommunicationLink.cs" />
<Compile Include="ServerCommunicationLink\Cmdlet\RemoveAzureSqlServerCommunicationLink.cs" />
<Compile Include="ServerCommunicationLink\Cmdlet\SetAzureSqlServerCommunicationLink.cs" />
<Compile Include="ServerCommunicationLink\Model\AzureSqlServerCommunicationLinkModel.cs" />
<Compile Include="ServerCommunicationLink\Services\AzureSqlServerCommunicationLinkAdapter.cs" />
<Compile Include="ServerCommunicationLink\Services\AzureSqlServerCommunicationLinkCommunicator.cs" />
Expand Down
90 changes: 0 additions & 90 deletions ...ger/Sql/Commands.Sql/ServerCommunicationLink/Cmdlet/SetAzureSqlServerCommunicationLink.cs
View file
Open in desktop

This file was deleted.

Loading