Skip to content

Commit 1b023bc

Browse files
paruljainmsftparuljainmsft
authored
Removed the individual commit id from VirtualNetworkGateway.json file (#27490)
1 parent b52923c commit 1b023bc

15 files changed

+305
-36
lines changed

‎src/Network/Network.Management.Sdk/Generated/ConnectivityConfigurationsOperations.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,10 @@ internal ConnectivityConfigurationsOperations (NetworkManagementClient client)
306306
{
307307
throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.CannotBeNull, "connectivityConfiguration");
308308
}
309-
309+
if (connectivityConfiguration != null)
310+
{
311+
connectivityConfiguration.Validate();
312+
}
310313
if (this.Client.SubscriptionId == null)
311314
{
312315
throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.CannotBeNull, "this.Client.SubscriptionId");

‎src/Network/Network.Management.Sdk/Generated/Models/ActiveConnectivityConfiguration.cs

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ public ActiveConnectivityConfiguration()
6464

6565
/// <param name="region">Deployment region.
6666
/// </param>
67-
public ActiveConnectivityConfiguration(string connectivityTopology = default(string), string isGlobal = default(string), string provisioningState = default(string), string description = default(string), System.Collections.Generic.IList<Hub> hubs = default(System.Collections.Generic.IList<Hub>), object connectivityCapabilities = default(object), System.Collections.Generic.IList<ConnectivityGroupItem> appliesToGroups = default(System.Collections.Generic.IList<ConnectivityGroupItem>), string deleteExistingPeering = default(string), string resourceGuid = default(string), string id = default(string), System.Collections.Generic.IList<ConfigurationGroup> configurationGroups = default(System.Collections.Generic.IList<ConfigurationGroup>), System.DateTime? commitTime = default(System.DateTime?), string region = default(string))
67+
public ActiveConnectivityConfiguration(string connectivityTopology = default(string), string isGlobal = default(string), string provisioningState = default(string), string description = default(string), System.Collections.Generic.IList<Hub> hubs = default(System.Collections.Generic.IList<Hub>), ConnectivityConfigurationPropertiesConnectivityCapabilities connectivityCapabilities = default(ConnectivityConfigurationPropertiesConnectivityCapabilities), System.Collections.Generic.IList<ConnectivityGroupItem> appliesToGroups = default(System.Collections.Generic.IList<ConnectivityGroupItem>), string deleteExistingPeering = default(string), string resourceGuid = default(string), string id = default(string), System.Collections.Generic.IList<ConfigurationGroup> configurationGroups = default(System.Collections.Generic.IList<ConfigurationGroup>), System.DateTime? commitTime = default(System.DateTime?), string region = default(string))
6868

6969
: base(id, configurationGroups, connectivityTopology, isGlobal, provisioningState, description, hubs, connectivityCapabilities, appliesToGroups, deleteExistingPeering, resourceGuid)
7070
{
@@ -90,5 +90,16 @@ public ActiveConnectivityConfiguration()
9090
/// </summary>
9191
[Newtonsoft.Json.JsonProperty(PropertyName = "region")]
9292
public string Region {get; set; }
93+
/// <summary>
94+
/// Validate the object.
95+
/// </summary>
96+
/// <exception cref="Microsoft.Rest.ValidationException">
97+
/// Thrown if validation fails
98+
/// </exception>
99+
public override void Validate()
100+
{
101+
base.Validate();
102+
103+
}
93104
}
94105
}

‎src/Network/Network.Management.Sdk/Generated/Models/ApplicationGatewayFirewallUserSessionVariable.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,7 @@ public static class ApplicationGatewayFirewallUserSessionVariable
1616
public const string ClientAddr = "ClientAddr";
1717
public const string GeoLocation = "GeoLocation";
1818
public const string None = "None";
19+
public const string ClientAddrXFFHeader = "ClientAddrXFFHeader";
20+
public const string GeoLocationXFFHeader = "GeoLocationXFFHeader";
1921
}
2022
}

‎src/Network/Network.Management.Sdk/Generated/Models/ConnectivityConfiguration.cs

Lines changed: 33 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public ConnectivityConfiguration()
6868

6969
/// <param name="resourceGuid">Unique identifier for this resource.
7070
/// </param>
71-
public ConnectivityConfiguration(string id = default(string), string name = default(string), string type = default(string), string etag = default(string), SystemData systemData = default(SystemData), string connectivityTopology = default(string), string isGlobal = default(string), string provisioningState = default(string), string description = default(string), System.Collections.Generic.IList<Hub> hubs = default(System.Collections.Generic.IList<Hub>), object connectivityCapabilities = default(object), System.Collections.Generic.IList<ConnectivityGroupItem> appliesToGroups = default(System.Collections.Generic.IList<ConnectivityGroupItem>), string deleteExistingPeering = default(string), string resourceGuid = default(string))
71+
public ConnectivityConfiguration(string id = default(string), string name = default(string), string type = default(string), string etag = default(string), SystemData systemData = default(SystemData), string connectivityTopology = default(string), string isGlobal = default(string), string provisioningState = default(string), string description = default(string), System.Collections.Generic.IList<Hub> hubs = default(System.Collections.Generic.IList<Hub>), ConnectivityConfigurationPropertiesConnectivityCapabilities connectivityCapabilities = default(ConnectivityConfigurationPropertiesConnectivityCapabilities), System.Collections.Generic.IList<ConnectivityGroupItem> appliesToGroups = default(System.Collections.Generic.IList<ConnectivityGroupItem>), string deleteExistingPeering = default(string), string resourceGuid = default(string))
7272

7373
: base(id, name, type, etag)
7474
{
@@ -132,7 +132,7 @@ public ConnectivityConfiguration()
132132
/// behaviors of the connectivity configuration resource.
133133
/// </summary>
134134
[Newtonsoft.Json.JsonProperty(PropertyName = "properties.connectivityCapabilities")]
135-
public object ConnectivityCapabilities {get; set; }
135+
public ConnectivityConfigurationPropertiesConnectivityCapabilities ConnectivityCapabilities {get; set; }
136136

137137
/// <summary>
138138
/// Gets or sets groups for configuration
@@ -151,5 +151,36 @@ public ConnectivityConfiguration()
151151
/// </summary>
152152
[Newtonsoft.Json.JsonProperty(PropertyName = "properties.resourceGuid")]
153153
public string ResourceGuid {get; private set; }
154+
/// <summary>
155+
/// Validate the object.
156+
/// </summary>
157+
/// <exception cref="Microsoft.Rest.ValidationException">
158+
/// Thrown if validation fails
159+
/// </exception>
160+
public virtual void Validate()
161+
{
162+
163+
164+
165+
166+
167+
168+
if (this.ConnectivityCapabilities != null)
169+
{
170+
this.ConnectivityCapabilities.Validate();
171+
}
172+
if (this.AppliesToGroups != null)
173+
{
174+
foreach (var element in this.AppliesToGroups)
175+
{
176+
if (element != null)
177+
{
178+
element.Validate();
179+
}
180+
}
181+
}
182+
183+
184+
}
154185
}
155186
}

‎src/Network/Network.Management.Sdk/Generated/Models/ConnectivityConfigurationProperties.cs

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ public ConnectivityConfigurationProperties()
5252

5353
/// <param name="resourceGuid">Unique identifier for this resource.
5454
/// </param>
55-
public ConnectivityConfigurationProperties(string connectivityTopology, System.Collections.Generic.IList<ConnectivityGroupItem> appliesToGroups, string description = default(string), System.Collections.Generic.IList<Hub> hubs = default(System.Collections.Generic.IList<Hub>), string isGlobal = default(string), object connectivityCapabilities = default(object), string provisioningState = default(string), string deleteExistingPeering = default(string), string resourceGuid = default(string))
55+
public ConnectivityConfigurationProperties(string connectivityTopology, System.Collections.Generic.IList<ConnectivityGroupItem> appliesToGroups, string description = default(string), System.Collections.Generic.IList<Hub> hubs = default(System.Collections.Generic.IList<Hub>), string isGlobal = default(string), ConnectivityConfigurationPropertiesConnectivityCapabilities connectivityCapabilities = default(ConnectivityConfigurationPropertiesConnectivityCapabilities), string provisioningState = default(string), string deleteExistingPeering = default(string), string resourceGuid = default(string))
5656

5757
{
5858
this.Description = description;
@@ -102,7 +102,7 @@ public ConnectivityConfigurationProperties()
102102
/// behaviors of the connectivity configuration resource.
103103
/// </summary>
104104
[Newtonsoft.Json.JsonProperty(PropertyName = "connectivityCapabilities")]
105-
public object ConnectivityCapabilities {get; set; }
105+
public ConnectivityConfigurationPropertiesConnectivityCapabilities ConnectivityCapabilities {get; set; }
106106

107107
/// <summary>
108108
/// Gets or sets groups for configuration
@@ -147,7 +147,10 @@ public virtual void Validate()
147147

148148

149149

150-
150+
if (this.ConnectivityCapabilities != null)
151+
{
152+
this.ConnectivityCapabilities.Validate();
153+
}
151154
if (this.AppliesToGroups != null)
152155
{
153156
foreach (var element in this.AppliesToGroups)

‎src/Network/Network.Management.Sdk/Generated/Models/ConnectivityCapabilitiesItem.cs renamed to ‎src/Network/Network.Management.Sdk/Generated/Models/ConnectivityConfigurationPropertiesConnectivityCapabilities.cs

Lines changed: 31 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,21 @@ namespace Microsoft.Azure.Management.Network.Models
88
using System.Linq;
99

1010
/// <summary>
11-
/// Connectivity capabilities item.
11+
/// Collection of additional settings to enhance specific topology behaviors of
12+
/// the connectivity configuration resource.
1213
/// </summary>
13-
public partial class ConnectivityCapabilitiesItem
14+
public partial class ConnectivityConfigurationPropertiesConnectivityCapabilities
1415
{
1516
/// <summary>
16-
/// Initializes a new instance of the ConnectivityCapabilitiesItem class.
17+
/// Initializes a new instance of the ConnectivityConfigurationPropertiesConnectivityCapabilities class.
1718
/// </summary>
18-
public ConnectivityCapabilitiesItem()
19+
public ConnectivityConfigurationPropertiesConnectivityCapabilities()
1920
{
2021
CustomInit();
2122
}
2223

2324
/// <summary>
24-
/// Initializes a new instance of the ConnectivityCapabilitiesItem class.
25+
/// Initializes a new instance of the ConnectivityConfigurationPropertiesConnectivityCapabilities class.
2526
/// </summary>
2627

2728
/// <param name="connectedGroupPrivateEndpointScale">Option indicating the scale of private endpoints allowed in the connected
@@ -35,7 +36,7 @@ public ConnectivityCapabilitiesItem()
3536
/// <param name="peeringEnforcement">Option indicating enforcement of peerings created by the connectivity
3637
/// configuration.
3738
/// Possible values include: &#39;Unenforced&#39;, &#39;Enforced&#39;</param>
38-
public ConnectivityCapabilitiesItem(string connectedGroupPrivateEndpointScale = default(string), string connectedGroupAddressOverlap = default(string), string peeringEnforcement = default(string))
39+
public ConnectivityConfigurationPropertiesConnectivityCapabilities(string connectedGroupPrivateEndpointScale, string connectedGroupAddressOverlap, string peeringEnforcement)
3940

4041
{
4142
this.ConnectedGroupPrivateEndpointScale = connectedGroupPrivateEndpointScale;
@@ -70,5 +71,29 @@ public ConnectivityCapabilitiesItem()
7071
/// </summary>
7172
[Newtonsoft.Json.JsonProperty(PropertyName = "peeringEnforcement")]
7273
public string PeeringEnforcement {get; set; }
74+
/// <summary>
75+
/// Validate the object.
76+
/// </summary>
77+
/// <exception cref="Microsoft.Rest.ValidationException">
78+
/// Thrown if validation fails
79+
/// </exception>
80+
public virtual void Validate()
81+
{
82+
if (this.ConnectedGroupPrivateEndpointScale == null)
83+
{
84+
throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.CannotBeNull, "ConnectedGroupPrivateEndpointScale");
85+
}
86+
if (this.ConnectedGroupAddressOverlap == null)
87+
{
88+
throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.CannotBeNull, "ConnectedGroupAddressOverlap");
89+
}
90+
if (this.PeeringEnforcement == null)
91+
{
92+
throw new Microsoft.Rest.ValidationException(Microsoft.Rest.ValidationRules.CannotBeNull, "PeeringEnforcement");
93+
}
94+
95+
96+
97+
}
7398
}
7499
}

‎src/Network/Network.Management.Sdk/Generated/Models/EffectiveConnectivityConfiguration.cs

Lines changed: 34 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public EffectiveConnectivityConfiguration()
5959

6060
/// <param name="resourceGuid">Unique identifier for this resource.
6161
/// </param>
62-
public EffectiveConnectivityConfiguration(string id = default(string), System.Collections.Generic.IList<ConfigurationGroup> configurationGroups = default(System.Collections.Generic.IList<ConfigurationGroup>), string connectivityTopology = default(string), string isGlobal = default(string), string provisioningState = default(string), string description = default(string), System.Collections.Generic.IList<Hub> hubs = default(System.Collections.Generic.IList<Hub>), object connectivityCapabilities = default(object), System.Collections.Generic.IList<ConnectivityGroupItem> appliesToGroups = default(System.Collections.Generic.IList<ConnectivityGroupItem>), string deleteExistingPeering = default(string), string resourceGuid = default(string))
62+
public EffectiveConnectivityConfiguration(string id = default(string), System.Collections.Generic.IList<ConfigurationGroup> configurationGroups = default(System.Collections.Generic.IList<ConfigurationGroup>), string connectivityTopology = default(string), string isGlobal = default(string), string provisioningState = default(string), string description = default(string), System.Collections.Generic.IList<Hub> hubs = default(System.Collections.Generic.IList<Hub>), ConnectivityConfigurationPropertiesConnectivityCapabilities connectivityCapabilities = default(ConnectivityConfigurationPropertiesConnectivityCapabilities), System.Collections.Generic.IList<ConnectivityGroupItem> appliesToGroups = default(System.Collections.Generic.IList<ConnectivityGroupItem>), string deleteExistingPeering = default(string), string resourceGuid = default(string))
6363

6464
{
6565
this.Id = id;
@@ -129,7 +129,7 @@ public EffectiveConnectivityConfiguration()
129129
/// behaviors of the connectivity configuration resource.
130130
/// </summary>
131131
[Newtonsoft.Json.JsonProperty(PropertyName = "properties.connectivityCapabilities")]
132-
public object ConnectivityCapabilities {get; set; }
132+
public ConnectivityConfigurationPropertiesConnectivityCapabilities ConnectivityCapabilities {get; set; }
133133

134134
/// <summary>
135135
/// Gets or sets groups for configuration
@@ -148,5 +148,37 @@ public EffectiveConnectivityConfiguration()
148148
/// </summary>
149149
[Newtonsoft.Json.JsonProperty(PropertyName = "properties.resourceGuid")]
150150
public string ResourceGuid {get; private set; }
151+
/// <summary>
152+
/// Validate the object.
153+
/// </summary>
154+
/// <exception cref="Microsoft.Rest.ValidationException">
155+
/// Thrown if validation fails
156+
/// </exception>
157+
public virtual void Validate()
158+
{
159+
160+
161+
162+
163+
164+
165+
166+
if (this.ConnectivityCapabilities != null)
167+
{
168+
this.ConnectivityCapabilities.Validate();
169+
}
170+
if (this.AppliesToGroups != null)
171+
{
172+
foreach (var element in this.AppliesToGroups)
173+
{
174+
if (element != null)
175+
{
176+
element.Validate();
177+
}
178+
}
179+
}
180+
181+
182+
}
151183
}
152184
}

‎src/Network/Network.Management.Sdk/Generated/Models/GroupByVariable.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ public GroupByVariable()
2525
/// </summary>
2626

2727
/// <param name="variableName">User Session clause variable.
28-
/// Possible values include: &#39;ClientAddr&#39;, &#39;GeoLocation&#39;, &#39;None&#39;</param>
28+
/// Possible values include: &#39;ClientAddr&#39;, &#39;GeoLocation&#39;, &#39;None&#39;,
29+
/// &#39;ClientAddrXFFHeader&#39;, &#39;GeoLocationXFFHeader&#39;</param>
2930
public GroupByVariable(string variableName)
3031

3132
{
@@ -40,7 +41,7 @@ public GroupByVariable(string variableName)
4041

4142

4243
/// <summary>
43-
/// Gets or sets user Session clause variable. Possible values include: &#39;ClientAddr&#39;, &#39;GeoLocation&#39;, &#39;None&#39;
44+
/// Gets or sets user Session clause variable. Possible values include: &#39;ClientAddr&#39;, &#39;GeoLocation&#39;, &#39;None&#39;, &#39;ClientAddrXFFHeader&#39;, &#39;GeoLocationXFFHeader&#39;
4445
/// </summary>
4546
[Newtonsoft.Json.JsonProperty(PropertyName = "variableName")]
4647
public string VariableName {get; set; }

‎src/Network/Network.Management.Sdk/Generated/Models/ManagedRuleSet.cs

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,16 @@ public ManagedRuleSet()
3232

3333
/// <param name="ruleGroupOverrides">Defines the rule group overrides to apply to the rule set.
3434
/// </param>
35-
public ManagedRuleSet(string ruleSetType, string ruleSetVersion, System.Collections.Generic.IList<ManagedRuleGroupOverride> ruleGroupOverrides = default(System.Collections.Generic.IList<ManagedRuleGroupOverride>))
35+
36+
/// <param name="computedDisabledRules">Stores the final list of disabled rule groups
37+
/// </param>
38+
public ManagedRuleSet(string ruleSetType, string ruleSetVersion, System.Collections.Generic.IList<ManagedRuleGroupOverride> ruleGroupOverrides = default(System.Collections.Generic.IList<ManagedRuleGroupOverride>), System.Collections.Generic.IList<ManagedRuleSetRuleGroup> computedDisabledRules = default(System.Collections.Generic.IList<ManagedRuleSetRuleGroup>))
3639

3740
{
3841
this.RuleSetType = ruleSetType;
3942
this.RuleSetVersion = ruleSetVersion;
4043
this.RuleGroupOverrides = ruleGroupOverrides;
44+
this.ComputedDisabledRules = computedDisabledRules;
4145
CustomInit();
4246
}
4347

@@ -64,6 +68,12 @@ public ManagedRuleSet()
6468
/// </summary>
6569
[Newtonsoft.Json.JsonProperty(PropertyName = "ruleGroupOverrides")]
6670
public System.Collections.Generic.IList<ManagedRuleGroupOverride> RuleGroupOverrides {get; set; }
71+
72+
/// <summary>
73+
/// Gets stores the final list of disabled rule groups
74+
/// </summary>
75+
[Newtonsoft.Json.JsonProperty(PropertyName = "computedDisabledRules")]
76+
public System.Collections.Generic.IList<ManagedRuleSetRuleGroup> ComputedDisabledRules {get; private set; }
6777
/// <summary>
6878
/// Validate the object.
6979
/// </summary>
@@ -92,6 +102,16 @@ public virtual void Validate()
92102
}
93103
}
94104
}
105+
if (this.ComputedDisabledRules != null)
106+
{
107+
foreach (var element in this.ComputedDisabledRules)
108+
{
109+
if (element != null)
110+
{
111+
element.Validate();
112+
}
113+
}
114+
}
95115
}
96116
}
97117
}

0 commit comments

Comments
 (0)