Skip to content

huangpf PR: dev <- Azure:dev #570

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 7 commits into from
Jul 1, 2016
Merged

huangpf PR: dev <- Azure:dev #570

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
0d9f150
Remove Location restrictions from all CmdLets for AzureChinaCloud
solankisamir Jun 30, 2016
f5f10d6
Merge remote-tracking branch 'refs/remotes/Azure/dev' into dev
solankisamir Jun 30, 2016
5bbcf62
Fix test flakiness
markcowl Jul 1, 2016
a26d9af
Fixing flaky ServiceManagement tests
markcowl Jul 1, 2016
a0488b1
Merge remote-tracking branch 'refs/remotes/Azure/dev' into dev
solankisamir Jul 1, 2016
ef27dc5
Merge pull request #2546 from markcowl/flaky160
markcowl Jul 1, 2016
4628bef
Merge pull request #2536 from solankisamir/dev
markcowl Jul 1, 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
1 change: 0 additions & 1 deletion src/ResourceManager/ApiManagement/Commands.ApiManagement/Commands.ApiManagement.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,6 @@
<Compile Include="Commands\NewAzureApiManagement.cs" />
<Compile Include="Commands\RemoveAzureApiManagement.cs" />
<Compile Include="Commands\RestoreAzureApiManagement.cs" />
<Compile Include="CommonConstants.cs" />
<Compile Include="Models\PsApiManagement.cs" />
<Compile Include="Models\PsApiManagementHostnameCertificate.cs" />
<Compile Include="Models\PsApiManagementHostnameConfiguration.cs" />
Expand Down
4 changes: 0 additions & 4 deletions ...ourceManager/ApiManagement/Commands.ApiManagement/Commands/AddAzureApiManagementRegion.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@ public class AddAzureApiManagementRegion : AzureApiManagementCmdletBase
HelpMessage = "Location of the new deployment region.")]

[ValidateNotNullOrEmpty]
[ValidateSet(
"North Central US", "South Central US", "Central US", "West Europe", "North Europe", "West US", "East US",
"East US 2", "Japan East", "Japan West", "Brazil South", "Southeast Asia", "East Asia", "Australia East",
"Australia Southeast", IgnoreCase = false)]
public string Location { get; set; }

[Parameter(
Expand Down
4 changes: 0 additions & 4 deletions ...ager/ApiManagement/Commands.ApiManagement/Commands/NewAzureApiManagementVirtualNetwork.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,6 @@ public class NewAzureApiManagementVirtualNetwork : AzureRMCmdlet
HelpMessage = "Location of the virtual network.")]

[ValidateNotNullOrEmpty]
[ValidateSet(
"North Central US", "South Central US", "Central US", "West Europe", "North Europe", "West US", "East US",
"East US 2", "Japan East", "Japan West", "Brazil South", "Southeast Asia", "East Asia", "Australia East",
"Australia Southeast", IgnoreCase = false)]
public string Location { get; set; }

[Parameter(
Expand Down
4 changes: 0 additions & 4 deletions ...ceManager/ApiManagement/Commands.ApiManagement/Commands/RemoveAzureApiManagementRegion.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,6 @@ public class RemoveAzureApiManagementRegion : AzureApiManagementCmdletBase
Mandatory = true,
HelpMessage = "Location of the deployment region to remove.")]
[ValidateNotNullOrEmpty]
[ValidateSet(
"North Central US", "South Central US", "Central US", "West Europe", "North Europe", "West US", "East US",
"East US 2", "Japan East", "Japan West", "Brazil South", "Southeast Asia", "East Asia", "Australia East",
"Australia Southeast", IgnoreCase = false)]
public string Location { get; set; }

public override void ExecuteCmdlet()
Expand Down
4 changes: 0 additions & 4 deletions ...nager/ApiManagement/Commands.ApiManagement/Commands/UpdateAzureApiManagementDeployment.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,10 +53,6 @@ public class UpdateAzureApiManagementDeployment : AzureApiManagementCmdletBase
ValueFromPipelineByPropertyName = true,
Mandatory = true,
HelpMessage = "Location of master API Management deployment region.")]
[ValidateSet(
"North Central US", "South Central US", "Central US", "West Europe", "North Europe", "West US", "East US",
"East US 2", "Japan East", "Japan West", "Brazil South", "Southeast Asia", "East Asia", "Australia East",
"Australia Southeast", IgnoreCase = false)]
public string Location { get; set; }

[Parameter(
Expand Down
4 changes: 0 additions & 4 deletions ...ceManager/ApiManagement/Commands.ApiManagement/Commands/UpdateAzureApiManagementRegion.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,6 @@ public class UpdateAzureApiManagementRegion : AzureApiManagementCmdletBase
HelpMessage = "Location of the deployment region to update.")]

[ValidateNotNullOrEmpty]
[ValidateSet(
"North Central US", "South Central US", "Central US", "West Europe", "North Europe", "West US", "East US",
"East US 2", "Japan East", "Japan West", "Brazil South", "Southeast Asia", "East Asia", "Australia East",
"Australia Southeast", IgnoreCase = false)]
public string Location { get; set; }

[Parameter(
Expand Down
25 changes: 0 additions & 25 deletions src/ResourceManager/ApiManagement/Commands.ApiManagement/CommonConstants.cs
View file
Open in desktop

This file was deleted.

33 changes: 0 additions & 33 deletions src/ResourceManager/ApiManagement/Commands.ApiManagement/Models/PsApiManagement.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,17 +147,6 @@ public PsApiManagementRegion AddRegion(
throw new ArgumentNullException("location");
}

if (!CommonConstants.ValidLocationsSet.Contains(location))
{
throw new ArgumentException(
string.Format(
Resources.InvalidLocation,
location,
string.Join(",", CommonConstants.ValidLocationsSet)
),
"location");
}

if (location.Equals(Location) || AdditionalRegions.Any(r => location.Equals(r.Location)))
{
throw new ArgumentException(string.Format(Resources.AddRegionExistsMessage, location), "location");
Expand All @@ -183,17 +172,6 @@ public bool RemoveRegion(string location)
throw new ArgumentNullException("location");
}

if (!CommonConstants.ValidLocationsSet.Contains(location))
{
throw new ArgumentException(
string.Format(
Resources.InvalidLocation,
location,
string.Join(",", CommonConstants.ValidLocationsSet)
),
"location");
}

if (location.Equals(Location))
{
throw new ArgumentException(
Expand All @@ -213,17 +191,6 @@ public void UpdateRegion(string location, PsApiManagementSku sku, int capacity,
throw new ArgumentNullException("location");
}

if (!CommonConstants.ValidLocationsSet.Contains(location))
{
throw new ArgumentException(
string.Format(
Resources.InvalidLocation,
location,
string.Join(",", CommonConstants.ValidLocationsSet)
),
"location");
}

var regionToUpdate = AdditionalRegions.FirstOrDefault(r => location.Equals(r.Location));
if (regionToUpdate != null)
{
Expand Down
2 changes: 1 addition & 1 deletion src/ResourceManager/Resources/Commands.Resources.Test/Commands.Resources.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</Content>
<Content Include="Resources\WebSite.param.dev.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
<None Include="packages.config">
<SubType>Designer</SubType>
Expand Down
Loading