From c7d57421329eff63b4ba7257741b7180a95d25cf Mon Sep 17 00:00:00 2001 From: bquantump <53361486+bquantump@users.noreply.github.com> Date: Mon, 1 Mar 2021 16:32:12 -0800 Subject: [PATCH] Subnet Container list still returns SubnetOperations and not Subnet #5584 (#19109) * 5584 * Update async test * Test * WIP: test * Update Proto.Authorization.csproj * Update Proto.Authorization.csproj * Update Proto.Authorization.csproj * Update Proto.Authorization.csproj --- .../Azure.ResourceManager.Authorization.csproj | 1 + .../Azure.ResourceManager.Authorization/autorest.md | 11 ----------- .../Proto.Client/network/SubnetContainer.cs | 8 ++++---- sdk/resourcemanager/Proto.Client/src/Program.cs | 2 +- .../Proto.Client/src/Scenarios/GetByContainerAsync.cs | 5 ++--- .../Proto.Client/src/Scenarios/GetByContainers.cs | 5 ++--- 6 files changed, 10 insertions(+), 22 deletions(-) delete mode 100644 sdk/resourcemanager/Proto.Client/authorization/Azure.ResourceManager.Authorization/autorest.md diff --git a/sdk/resourcemanager/Proto.Client/authorization/Azure.ResourceManager.Authorization/Azure.ResourceManager.Authorization.csproj b/sdk/resourcemanager/Proto.Client/authorization/Azure.ResourceManager.Authorization/Azure.ResourceManager.Authorization.csproj index 00a1e88b84232..a13135cdfd3ef 100644 --- a/sdk/resourcemanager/Proto.Client/authorization/Azure.ResourceManager.Authorization/Azure.ResourceManager.Authorization.csproj +++ b/sdk/resourcemanager/Proto.Client/authorization/Azure.ResourceManager.Authorization/Azure.ResourceManager.Authorization.csproj @@ -4,6 +4,7 @@ Azure.ResourceManager.Authorization Azure Resource Manager client SDK for Azure resource provider Microsoft.Authorization azure;management;arm;resource manager;authorization + true diff --git a/sdk/resourcemanager/Proto.Client/authorization/Azure.ResourceManager.Authorization/autorest.md b/sdk/resourcemanager/Proto.Client/authorization/Azure.ResourceManager.Authorization/autorest.md deleted file mode 100644 index face655375676..0000000000000 --- a/sdk/resourcemanager/Proto.Client/authorization/Azure.ResourceManager.Authorization/autorest.md +++ /dev/null @@ -1,11 +0,0 @@ -# Generated code configuration - -Run `dotnet build /t:GenerateCode` to generate code. - -``` yaml - -azure-arm: true -require: https://raw.githubusercontent.com/Azure/azure-rest-api-specs/f0a0a9f0ab2278885f9349ef03bf02d4790f28ec/specification/authorization/resource-manager/readme.md - - -``` \ No newline at end of file diff --git a/sdk/resourcemanager/Proto.Client/network/SubnetContainer.cs b/sdk/resourcemanager/Proto.Client/network/SubnetContainer.cs index 51da32cf51e44..6566d5a1ed2c1 100644 --- a/sdk/resourcemanager/Proto.Client/network/SubnetContainer.cs +++ b/sdk/resourcemanager/Proto.Client/network/SubnetContainer.cs @@ -90,9 +90,9 @@ public SubnetBuilder Construct(string subnetCidr, NetworkSecurityGroupData group /// /// A token to allow the caller to cancel the call to the service. The default value is . /// A collection of resource operations that may take multiple service requests to iterate over. - public Pageable List(CancellationToken cancellationToken = default) + public Pageable List(CancellationToken cancellationToken = default) { - return new PhWrappingPageable( + return new PhWrappingPageable( Operations.List(Id.ResourceGroup, Id.Name, cancellationToken), convertor()); } @@ -102,9 +102,9 @@ public Pageable List(CancellationToken cancellationToken = def /// /// A token to allow the caller to cancel the call to the service. The default value is . /// An async collection of resource operations that may take multiple service requests to iterate over. - public AsyncPageable ListAsync(CancellationToken cancellationToken = default) + public AsyncPageable ListAsync(CancellationToken cancellationToken = default) { - return new PhWrappingAsyncPageable( + return new PhWrappingAsyncPageable( Operations.ListAsync(Id.ResourceGroup, Id.Name, cancellationToken), convertor()); } diff --git a/sdk/resourcemanager/Proto.Client/src/Program.cs b/sdk/resourcemanager/Proto.Client/src/Program.cs index 1e4f6ee5de7a0..380b481f7f9cc 100644 --- a/sdk/resourcemanager/Proto.Client/src/Program.cs +++ b/sdk/resourcemanager/Proto.Client/src/Program.cs @@ -10,7 +10,7 @@ static void Main(string[] args) Scenario scenario = null; try { - scenario = ScenarioFactory.GetScenario(Scenarios.CreateSingleVmExample); + scenario = ScenarioFactory.GetScenario(Scenarios.GetByContainersAsync); scenario.Execute(); } finally diff --git a/sdk/resourcemanager/Proto.Client/src/Scenarios/GetByContainerAsync.cs b/sdk/resourcemanager/Proto.Client/src/Scenarios/GetByContainerAsync.cs index 13c50526d4e50..638b89da02b69 100644 --- a/sdk/resourcemanager/Proto.Client/src/Scenarios/GetByContainerAsync.cs +++ b/sdk/resourcemanager/Proto.Client/src/Scenarios/GetByContainerAsync.cs @@ -33,9 +33,8 @@ private async Task ExecuteAsync() Debug.Assert(virtualNetwork.Value.Data.Name.Equals(response.Data.Id.Name)); await foreach (var subnetResponse in response.GetSubnetContainer().ListAsync()) { - var actualSubnet = await subnetResponse.GetAsync(); - var subnets = await response.GetSubnetContainer().GetAsync(actualSubnet.Value.Data.Name); - Debug.Assert(subnets.Value.Data.Name.Equals(actualSubnet.Value.Data.Name)); + var subnets = await response.GetSubnetContainer().GetAsync(subnetResponse.Data.Name); + Debug.Assert(subnets.Value.Data.Name.Equals(subnetResponse.Data.Name)); } } Console.WriteLine("\nDone all asserts passed ..."); diff --git a/sdk/resourcemanager/Proto.Client/src/Scenarios/GetByContainers.cs b/sdk/resourcemanager/Proto.Client/src/Scenarios/GetByContainers.cs index 6358e890ab3da..602c535c52d16 100644 --- a/sdk/resourcemanager/Proto.Client/src/Scenarios/GetByContainers.cs +++ b/sdk/resourcemanager/Proto.Client/src/Scenarios/GetByContainers.cs @@ -28,9 +28,8 @@ public override void Execute() Debug.Assert(virtualNetwork.Value.Data.Name.Equals(response.Data.Id.Name)); foreach (var subnetResponse in response.GetSubnetContainer().List()) { - var actualSubnet = subnetResponse.Get(); - var subnets = response.GetSubnetContainer().Get(actualSubnet.Value.Data.Name); - Debug.Assert(subnets.Value.Data.Name.Equals(actualSubnet.Value.Data.Name)); + var subnets = response.GetSubnetContainer().Get(subnetResponse.Data.Name); + Debug.Assert(subnets.Value.Data.Name.Equals(subnetResponse.Data.Name)); } } Console.WriteLine("\nDone all asserts passed ...");