Skip to content

PR : Update to accomdate SDK changes with VNET reference #12117

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
aegal merged 4 commits into from
Jun 12, 2020
Merged

PR : Update to accomdate SDK changes with VNET reference #12117

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0ffe125
update to vnet reference id only
aegal Jun 10, 2020
e211b12
Merge branch 'network-may' into updateVnetReference
aegal Jun 11, 2020
56297c4
updating due to validation error on CICD pipeline
aegal Jun 11, 2020
b44bafe
refreshing test files, updating to remove id from variable to fix cas…
aegal Jun 12, 2020
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/Network/Network.Test/Network.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Graph.RBAC" Version="3.4.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.1-preview" />
<PackageReference Include="Microsoft.Azure.Insights" Version="0.16.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.Compute" Version="36.0.0" />
<PackageReference Include="Microsoft.Azure.Management.ContainerInstance" Version="2.0.0" />
Expand Down
2 changes: 1 addition & 1 deletion src/Network/Network.Test/ScenarioTests/LoadBalancerBackendPoolTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -402,7 +402,7 @@ function Test-LoadBalancerBackendAddressConfig

Assert-AreEqual $ipconfig1.Name $backendAddressConfigName1
Assert-AreEqual $ipconfig1.IpAddress $validIpAddress
Assert-AreEqual $ipconfig1.VirtualNetwork.Id $virtualNetwork.Id
Assert-AreEqual $ipconfig1.VirtualNetworkId.Id $virtualNetwork.Id

Assert-ThrowsLike { New-AzLoadBalancerBackendAddressConfig -IpAddress $invalidIpAddress2 -Name $backendAddressConfigName1 -VirtualNetworkId $virtualNetwork.Id} "*Invalid IPAddress*"

Expand Down
403 changes: 230 additions & 173 deletions ...Test.ScenarioTests.LoadBalancerBackendPoolTests/TestLoadBalancerBackendAddressConfig.json
View file
Open in desktop

Large diffs are not rendered by default.

946 changes: 409 additions & 537 deletions ...work.Test.ScenarioTests.LoadBalancerBackendPoolTests/TestLoadBalancerBackendPoolCRUD.json
View file
Open in desktop

Large diffs are not rendered by default.

1,172 changes: 700 additions & 472 deletions ...rk.Test.ScenarioTests.LoadBalancerBackendPoolTests/TestLoadBalancerBackendPoolCreate.json
View file
Open in desktop

Large diffs are not rendered by default.

1,094 changes: 547 additions & 547 deletions ...rk.Test.ScenarioTests.LoadBalancerBackendPoolTests/TestLoadBalancerBackendPoolDelete.json
View file
Open in desktop

Large diffs are not rendered by default.

803 changes: 430 additions & 373 deletions ...work.Test.ScenarioTests.LoadBalancerBackendPoolTests/TestLoadBalancerBackendPoolRead.json
View file
Open in desktop

Large diffs are not rendered by default.

1,000 changes: 500 additions & 500 deletions ...rk.Test.ScenarioTests.LoadBalancerBackendPoolTests/TestLoadBalancerBackendPoolUpdate.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/Network/Network/LoadBalancer/NewAzLoadBalancerBackendAddressConfig.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public override void Execute()

var loadBalancerBackendAddress = new PSLoadBalancerBackendAddress();

loadBalancerBackendAddress.VirtualNetwork = new PSVirtualNetwork {
loadBalancerBackendAddress.VirtualNetworkId = new PSResourceId {
Id = VirtualNetworkId
};

Expand Down
16 changes: 4 additions & 12 deletions src/Network/Network/Models/PSLoadBalancerBackendAddress.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,34 +23,26 @@ public partial class PSLoadBalancerBackendAddress : PSChildResource
{
[JsonProperty(Order = 1)]
[Ps1Xml(Target = ViewControl.Table)]
public PSNetworkInterfaceIPConfiguration NetworkInterfaceIpConfiguration { get; set; }
public PSResourceId NetworkInterfaceIpConfigurationId { get; set; }

[JsonProperty(Order = 2)]
public PSVirtualNetwork VirtualNetwork { get; set; }
public PSResourceId VirtualNetworkId { get; set; }

[JsonProperty(Order = 3)]
public string IpAddress { get; set; }

[JsonIgnore]
public string NetworkInterfaceIpConfigurationText
{
get { return JsonConvert.SerializeObject(NetworkInterfaceIpConfiguration, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); }
get { return JsonConvert.SerializeObject(NetworkInterfaceIpConfigurationId, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); }
}

[JsonIgnore]
public string VirtualNetworkChildResourceText
{
get
{
// convert to child resource object to limit size of the output seen on the powershell console
var virtualNetworkChildResource = new PSChildResource
{
Name = VirtualNetwork?.Name,
Id = VirtualNetwork?.Id,
Etag = VirtualNetwork?.Etag
};

return JsonConvert.SerializeObject(virtualNetworkChildResource, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore });
return JsonConvert.SerializeObject(VirtualNetworkId, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore });
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion src/Network/Network/Network.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

<ItemGroup>
<PackageReference Include="AutoMapper" Version="6.2.2" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.Network" Version="20.0.1-preview" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/Network/Network/Network.format.ps1xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2526,11 +2526,11 @@
<PropertyName>IpAddress</PropertyName>
</ListItem>
<ListItem>
<Label>NetworkInterfaceIpConfiguration</Label>
<Label>NetworkInterfaceIpConfigurationId</Label>
<PropertyName>NetworkInterfaceIpConfigurationText</PropertyName>
Copy link
Contributor

@gmainar gmainar Jun 11, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't we change this to NetworkInterfaceIpConfigurationIdText?

Copy link
Contributor Author

@aegal aegal Jun 11, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, that label is what is printed on the powershell console. I think it would read kind of weird to add 'text' to the output console

Copy link
Contributor Author

@aegal aegal Jun 11, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same as the other comment.

</ListItem>
<ListItem>
<Label>VirtualNetwork</Label>
<Label>VirtualNetworkId</Label>
<PropertyName>VirtualNetworkChildResourceText</PropertyName>
Copy link
Contributor

@gmainar gmainar Jun 11, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't this be VirtualNetworkIdText

Copy link
Contributor Author

@aegal aegal Jun 11, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, that label is what is printed on the powershell console. I think it would read kind of weird to add 'text' to the output console

Copy link
Contributor Author

@aegal aegal Jun 11, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ohh sorry, you referring to VirtualNetworkChildResourceText property. Yeah that property name it isn't visible but I can update that for code readability.

</ListItem>
</ListItems>
Expand Down