Skip to content

Commit 4300acc

Browse files
tian-rentian-ren
committed
Map ConnectivityCapabilities to ConnectivityCapability for PowerShell convention
1 parent 76c6298 commit 4300acc

File tree

9 files changed

+384
-370
lines changed

9 files changed

+384
-370
lines changed

‎src/Network/Network.Test/ScenarioTests/NetworkManagerTests.ps1‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -249,7 +249,7 @@ function Test-NetworkManagerConnectivityConfigurationCRUD
249249
PeeringEnforcement = "Unenforced"
250250
}
251251

252-
New-AzNetworkManagerConnectivityConfiguration -ResourceGroupName $rgname -Name $connectivityConfigurationName -NetworkManagerName $networkManagerName -ConnectivityTopology "HubAndSpoke" -Hub $hublist -AppliesToGroup $connectivityGroup -DeleteExistingPeering -ConnectivityCapabilities $caps
252+
New-AzNetworkManagerConnectivityConfiguration -ResourceGroupName $rgname -Name $connectivityConfigurationName -NetworkManagerName $networkManagerName -ConnectivityTopology "HubAndSpoke" -Hub $hublist -AppliesToGroup $connectivityGroup -DeleteExistingPeering -ConnectivityCapability $caps
253253

254254
$connConfig = Get-AzNetworkManagerConnectivityConfiguration -ResourceGroupName $rgname -NetworkManagerName $networkManagerName -Name $connectivityConfigurationName
255255
Assert-NotNull $connConfig;
@@ -263,12 +263,12 @@ function Test-NetworkManagerConnectivityConfigurationCRUD
263263
Assert-AreEqual "Microsoft.Network/virtualNetworks" $connConfig.Hubs[0].ResourceType;
264264
Assert-AreEqual "False" $connConfig.IsGlobal;
265265
Assert-AreEqual "True" $connConfig.DeleteExistingPeering;
266-
Assert-AreEqual "Standard" $connConfig.ConnectivityCapabilities.ConnectedGroupPrivateEndpointsScale;
267-
Assert-AreEqual "Disallowed" $connConfig.ConnectivityCapabilities.ConnectedGroupAddressOverlap;
268-
Assert-AreEqual "Unenforced" $connConfig.ConnectivityCapabilities.PeeringEnforcement;
266+
Assert-AreEqual "Standard" $connConfig.ConnectivityCapability.ConnectedGroupPrivateEndpointsScale;
267+
Assert-AreEqual "Disallowed" $connConfig.ConnectivityCapability.ConnectedGroupAddressOverlap;
268+
Assert-AreEqual "Unenforced" $connConfig.ConnectivityCapability.PeeringEnforcement;
269269

270270
$connConfig.Description = "A different description.";
271-
$connConfig.ConnectivityCapabilities = [PSCustomObject]@{
271+
$connConfig.ConnectivityCapability = [PSCustomObject]@{
272272
ConnectedGroupPrivateEndpointsScale = "Standard"
273273
ConnectedGroupAddressOverlap = "Allowed"
274274
PeeringEnforcement = "Unenforced"
@@ -278,9 +278,9 @@ function Test-NetworkManagerConnectivityConfigurationCRUD
278278
Assert-NotNull $newConnConfig;
279279
Assert-AreEqual "A different description." $newConnConfig.Description;
280280
Assert-AreEqual $connectivityConfigurationName $newConnConfig.Name;
281-
Assert-AreEqual "Standard" $connConfig.ConnectivityCapabilities.ConnectedGroupPrivateEndpointsScale;
282-
Assert-AreEqual "Allowed" $connConfig.ConnectivityCapabilities.ConnectedGroupAddressOverlap;
283-
Assert-AreEqual "Unenforced" $connConfig.ConnectivityCapabilities.PeeringEnforcement;
281+
Assert-AreEqual "Standard" $connConfig.ConnectivityCapability.ConnectedGroupPrivateEndpointsScale;
282+
Assert-AreEqual "Allowed" $connConfig.ConnectivityCapability.ConnectedGroupAddressOverlap;
283+
Assert-AreEqual "Unenforced" $connConfig.ConnectivityCapability.PeeringEnforcement;
284284

285285

286286
$configids = @($newConnConfig.Id)

‎src/Network/Network.Test/SessionRecords/Commands.Network.Test.ScenarioTests.NetworkManagerTests/TestNetworkManagerConnectivityConfigurationCRUD.json‎

Lines changed: 344 additions & 344 deletions
Large diffs are not rendered by default.

‎src/Network/Network/Common/NetworkResourceManagerProfile.cs‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2329,7 +2329,16 @@ private static void Initialize()
23292329
cfg.CreateMap<ANM.PSNetworkManagerAddressPrefixItem, MNM.AddressPrefixItem>();
23302330
cfg.CreateMap<ANM.PSNetworkManagerCommit, MNM.NetworkManagerCommit>();
23312331
cfg.CreateMap<ANM.PSNetworkManagerConfigurationGroup, MNM.ConfigurationGroup>();
2332-
cfg.CreateMap<ANM.PSNetworkManagerConnectivityConfiguration, MNM.ConnectivityConfiguration>();
2332+
2333+
cfg.CreateMap<ANM.PSNetworkManagerConnectivityConfiguration, MNM.ConnectivityConfiguration>()
2334+
.ForMember(dest => dest.ConnectivityCapabilities, opt => opt.MapFrom(src => src.ConnectivityCapability));
2335+
cfg.CreateMap<MNM.ConnectivityConfiguration, ANM.PSNetworkManagerConnectivityConfiguration>()
2336+
.ForMember(dest => dest.ConnectivityCapability, opt => opt.MapFrom(src => src.ConnectivityCapabilities));
2337+
2338+
cfg.CreateMap<MNM.ConnectivityConfigurationPropertiesConnectivityCapabilities, ANM.PSNetworkManagerConnectivityCapabilities>();
2339+
cfg.CreateMap<ANM.PSNetworkManagerConnectivityCapabilities, MNM.ConnectivityConfigurationPropertiesConnectivityCapabilities>();
2340+
2341+
23332342
cfg.CreateMap<ANM.PSNetworkManagerConnectivityGroupItem, MNM.ConnectivityGroupItem>();
23342343
cfg.CreateMap<ANM.PSNetworkManagerDeploymentStatus, MNM.NetworkManagerDeploymentStatus>();
23352344
cfg.CreateMap<ANM.PSNetworkManagerDeploymentStatusResult, MNM.NetworkManagerDeploymentStatusListResult>();

‎src/Network/Network/Models/NetworkManager/PSNetworkManagerConnectivityConfiguration.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public class PSNetworkManagerConnectivityConfiguration : PSNetworkManagerBaseRes
3434

3535
public string IsGlobal { get; set; }
3636

37-
public PSNetworkManagerConnectivityCapabilities ConnectivityCapabilities { get; set; }
37+
public PSNetworkManagerConnectivityCapabilities ConnectivityCapability { get; set; }
3838

3939
[JsonProperty(Order = 1)]
4040
public IList<PSNetworkManagerConnectivityGroupItem> AppliesToGroups { get; set; }

‎src/Network/Network/NetworkManager/NetworkManagerConnectivityConfiguration/NetworkManagerConnectivityConfigurationBaseCmdlet.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,10 @@ public PSNetworkManagerConnectivityConfiguration GetNetworkManagerConnectivityCo
5555
{
5656
var networkManagerConnectivityConfig = this.NetworkManagerConnectivityConfigurationClient.Get(resourceGroupName, networkManagerName, name);
5757
var psNetworkManagerConnectivityConfiguration = NetworkResourceManagerProfile.Mapper.Map<PSNetworkManagerConnectivityConfiguration>(networkManagerConnectivityConfig);
58+
if (networkManagerConnectivityConfig.ConnectivityCapabilities != null)
59+
{
60+
psNetworkManagerConnectivityConfiguration.ConnectivityCapability = NetworkResourceManagerProfile.Mapper.Map<PSNetworkManagerConnectivityCapabilities>(networkManagerConnectivityConfig.ConnectivityCapabilities);
61+
}
5862
psNetworkManagerConnectivityConfiguration.ResourceGroupName = resourceGroupName;
5963
psNetworkManagerConnectivityConfiguration.NetworkManagerName = networkManagerName;
6064
return psNetworkManagerConnectivityConfiguration;

‎src/Network/Network/NetworkManager/NetworkManagerConnectivityConfiguration/NewAzNetworkManagerConnectivityConfigurationCommand.cs‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,8 @@ public class NewAzNetworkManagerConnectivityConfigurationCommand : NetworkManage
9696
Mandatory = false,
9797
ValueFromPipelineByPropertyName = true,
9898
HelpMessage = "Topology-specific settings to refine connectivity. Accepts an object with: ConnectedGroupPrivateEndpointScale ('Standard', 'HighScale'), ConnectedGroupAddressOverlap ('Allowed', 'Disallowed'), PeeringEnforcement ('Unenforced', 'Enforced').")]
99-
public PSNetworkManagerConnectivityCapabilities ConnectivityCapabilities { get; set; }
99+
[Alias("ConnectivityCapabilities")]
100+
public PSNetworkManagerConnectivityCapabilities ConnectivityCapability { get; set; }
100101

101102
[Parameter(
102103
Mandatory = false,
@@ -164,9 +165,9 @@ private PSNetworkManagerConnectivityConfiguration CreateNetworkManagerConnectivi
164165
mncc.Description = this.Description;
165166
}
166167

167-
if (this.ConnectivityCapabilities != null)
168+
if (this.ConnectivityCapability != null)
168169
{
169-
mncc.ConnectivityCapabilities = this.ConnectivityCapabilities;
170+
mncc.ConnectivityCapability = this.ConnectivityCapability;
170171
}
171172

172173
mncc.AppliesToGroups = this.AppliesToGroup.ToList();

‎src/Network/Network/help/Get-AzNetworkManagerConnectivityConfiguration.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ ConnectivityTopology : HubAndSpoke
4141
Hubs : {/subscriptions/0fd190fa-dd1c-4724-b7f6-c5cc3ba5c884/resourceGroups/jaredgorthy-PowerShellTestResources/providers/Microsoft.Network/virtualNetworks/powerShellTestVnetHub}
4242
DeleteExistingPeering : True
4343
IsGlobal : False
44-
ConnectivityCapabilities : {
44+
ConnectivityCapability : {
4545
"ConnectedGroupPrivateEndpointsScale": "Standard",
4646
"ConnectedGroupAddressOverlap": "Disallowed",
4747
"PeeringEnforcement": "Unenforced"
@@ -100,7 +100,7 @@ ConnectivityTopology : HubAndSpoke
100100
Hubs : {/subscriptions/0fd190fa-dd1c-4724-b7f6-c5cc3ba5c884/resourceGroups/jaredgorthy-PowerShellTestResources/providers/Microsoft.Network/virtualNetworks/powerShellTestVnetHub}
101101
DeleteExistingPeering : True
102102
IsGlobal : False
103-
ConnectivityCapabilities : {
103+
ConnectivityCapability : {
104104
"ConnectedGroupPrivateEndpointsScale": "Standard",
105105
"ConnectedGroupAddressOverlap": "Disallowed",
106106
"PeeringEnforcement": "Unenforced"
@@ -150,7 +150,7 @@ ConnectivityTopology : Mesh
150150
Hubs : {}
151151
DeleteExistingPeering : True
152152
IsGlobal : False
153-
ConnectivityCapabilities : {
153+
ConnectivityCapability : {
154154
"ConnectedGroupPrivateEndpointsScale": "Standard",
155155
"ConnectedGroupAddressOverlap": "Disallowed",
156156
"PeeringEnforcement": "Unenforced"

‎src/Network/Network/help/New-AzNetworkManagerConnectivityConfiguration.md‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ Creates a network manager connectivity configuration.
1616
New-AzNetworkManagerConnectivityConfiguration -Name <String> -NetworkManagerName <String>
1717
-ResourceGroupName <String> -AppliesToGroup <PSNetworkManagerConnectivityGroupItem[]>
1818
-ConnectivityTopology <String> [-Description <String>] [-Hub <PSNetworkManagerHub[]>] [-DeleteExistingPeering]
19-
[-IsGlobal] [-ConnectivityCapabilities <PSNetworkManagerConnectivityCapabilities>] [-Force] [-AsJob] [-DefaultProfile <IAzureContextContainer>]
19+
[-IsGlobal] [-ConnectivityCapability <PSNetworkManagerConnectivityCapabilities>] [-Force] [-AsJob] [-DefaultProfile <IAzureContextContainer>]
2020
[-WhatIf] [-Confirm] [<CommonParameters>]
2121
```
2222

@@ -40,7 +40,7 @@ ConnectivityTopology : HubAndSpoke
4040
Hubs : {/subscriptions/0fd190fa-dd1c-4724-b7f6-c5cc3ba5c884/resourceGroups/jaredgorthy-PowerShellTestResources/providers/Microsoft.Network/virtualNetworks/powerShellTestVnetHub}
4141
DeleteExistingPeering : True
4242
IsGlobal : False
43-
ConnectivityCapabilities : {
43+
ConnectivityCapability : {
4444
"ConnectedGroupPrivateEndpointScale": "Standard",
4545
"ConnectedGroupAddressOverlap": "Allowed",
4646
"PeeringEnforcement": "Unenforced"
@@ -93,7 +93,7 @@ ConnectivityTopology : Mesh
9393
Hubs : {}
9494
DeleteExistingPeering : True
9595
IsGlobal : False
96-
ConnectivityCapabilities : {
96+
ConnectivityCapability : {
9797
"ConnectedGroupPrivateEndpointScale": "Standard",
9898
"ConnectedGroupAddressOverlap": "Allowed",
9999
"PeeringEnforcement": "Unenforced"
@@ -128,7 +128,7 @@ Id : /subscriptions/f0dc2b34-dfad-40e4-83e0-2309fed8d00b/reso
128128

129129
Creates a mesh network manager connectivity configuration.
130130

131-
### Example 3: Create with ConnectivityCapabilities
131+
### Example 3: Create with ConnectivityCapability
132132
```powershell
133133
$connectivityGroupItem = New-AzNetworkManagerConnectivityGroupItem -NetworkGroupId "/subscriptions/f0dc2b34-dfad-40e4-83e0-2309fed8d00b/resourceGroups/psResourceGroup/providers/Microsoft.Network/networkManagers/psNetworkManager/networkGroups/psNetworkGroup"
134134
[System.Collections.Generic.List[Microsoft.Azure.Commands.Network.Models.NetworkManager.PSNetworkManagerConnectivityGroupItem]]$connectivityGroup = @()
@@ -138,15 +138,15 @@ $capabilities = [PSCustomObject]@{
138138
ConnectedGroupAddressOverlap = "Disallowed"
139139
PeeringEnforcement = "Enforced"
140140
}
141-
New-AzNetworkManagerConnectivityConfiguration -ResourceGroupName psResourceGroup -Name "psConnectivityConfigMesh" -NetworkManagerName psNetworkManager -ConnectivityTopology "Mesh" -AppliesToGroup $connectivityGroup -DeleteExistingPeering -ConnectivityCapabilities $capabilities
141+
New-AzNetworkManagerConnectivityConfiguration -ResourceGroupName psResourceGroup -Name "psConnectivityConfigMesh" -NetworkManagerName psNetworkManager -ConnectivityTopology "Mesh" -AppliesToGroup $connectivityGroup -DeleteExistingPeering -ConnectivityCapability $capabilities
142142
```
143143

144144
```output
145145
ConnectivityTopology : Mesh
146146
Hubs : {}
147147
DeleteExistingPeering : True
148148
IsGlobal : False
149-
ConnectivityCapabilities : {
149+
ConnectivityCapability : {
150150
"ConnectedGroupPrivateEndpointScale": "HighScale",
151151
"ConnectedGroupAddressOverlap": "Disallowed",
152152
"PeeringEnforcement": "Enforced"
@@ -317,7 +317,7 @@ Accept pipeline input: True (ByPropertyName)
317317
Accept wildcard characters: False
318318
```
319319
320-
### -ConnectivityCapabilities
320+
### -ConnectivityCapability
321321
Specifies topology-specific settings to refine connectivity for the network manager configuration.
322322
323323
```yaml

‎src/Network/Network/help/Set-AzNetworkManagerConnectivityConfiguration.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ ConnectivityTopology : HubAndSpoke
4040
Hubs : {/subscriptions/0fd190fa-dd1c-4724-b7f6-c5cc3ba5c884/resourceGroups/jaredgorthy-PowerShellTestResources/providers/Microsoft.Network/virtualNetworks/powerShellTestVnetHub}
4141
DeleteExistingPeering : True
4242
IsGlobal : False
43-
ConnectivityCapabilities : {
43+
ConnectivityCapability : {
4444
"ConnectedGroupPrivateEndpointScale": "Standard",
4545
"ConnectedGroupAddressOverlap": "Disallowed",
4646
"PeeringEnforcement": "Unenforced"
@@ -92,7 +92,7 @@ Updates a connectivity configuration's group members.
9292
### Example 2
9393
```powershell
9494
$ConnectivityConfiguration = Get-AzNetworkManagerConnectivityConfiguration -Name "psConnectivityConfig" -NetworkManagerName "psNetworkManager" -ResourceGroupName "psResourceGroup"
95-
$ConnectivityConfiguration.ConnectivityCapabilities = [PSCustomObject]@{
95+
$ConnectivityConfiguration.ConnectivityCapability = [PSCustomObject]@{
9696
ConnectedGroupPrivateEndpointScale = "HighScale"
9797
ConnectedGroupAddressOverlap = "Allowed"
9898
PeeringEnforcement = "Enforced"
@@ -105,7 +105,7 @@ ConnectivityTopology : HubAndSpoke
105105
Hubs : {/subscriptions/0fd190fa-dd1c-4724-b7f6-c5cc3ba5c884/resourceGroups/jaredgorthy-PowerShellTestResources/providers/Microsoft.Network/virtualNetworks/powerShellTestVnetHub}
106106
DeleteExistingPeering : True
107107
IsGlobal : False
108-
ConnectivityCapabilities : {
108+
ConnectivityCapability : {
109109
"ConnectedGroupPrivateEndpointScale": "HighScale",
110110
"ConnectedGroupAddressOverlap": "Allowed",
111111
"PeeringEnforcement": "Enforced"

0 commit comments

Comments
 (0)