Skip to content

Commit 6ff39a9

Browse files
yanfa317yanfa317
authored
Make activeconfigraution body required, and update default package version (#15668)
* Add ResourceGuid to NetworkManager * add list by config * Revert "Add ResourceGuid to NetworkManager" This reverts commit 4e07577. * resourceGuid * [NetworkManager] Remove discriminator from ActiveConfiguration * revert change * fix format * Fix as commnets * fix test * Update Example * Split current APIs * Fix lintdiff * fix as commnets * small change and update default package id * remove subnet level api
1 parent 406c7b7 commit 6ff39a9

File tree

4 files changed

+4
-246
lines changed

4 files changed

+4
-246
lines changed

‎specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/examples/NetworkManagerEffectiveSecurityUserRulesListBySubnet.json

Lines changed: 0 additions & 77 deletions
This file was deleted.

‎specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerActiveConfiguration.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151
{
5252
"name": "parameters",
5353
"in": "body",
54-
"required": false,
54+
"required": true,
5555
"schema": {
5656
"$ref": "#/definitions/ActiveConfigurationParameter"
5757
},
@@ -102,7 +102,7 @@
102102
{
103103
"name": "parameters",
104104
"in": "body",
105-
"required": false,
105+
"required": true,
106106
"schema": {
107107
"$ref": "#/definitions/ActiveConfigurationParameter"
108108
},
@@ -153,7 +153,7 @@
153153
{
154154
"name": "parameters",
155155
"in": "body",
156-
"required": false,
156+
"required": true,
157157
"schema": {
158158
"$ref": "#/definitions/ActiveConfigurationParameter"
159159
},

‎specification/network/resource-manager/Microsoft.Network/preview/2021-02-01-preview/networkManagerEffectiveConfiguration.json

Lines changed: 0 additions & 165 deletions
Original file line numberDiff line numberDiff line change
@@ -135,64 +135,6 @@
135135
}
136136
}
137137
}
138-
},
139-
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworks/{virtualNetworkName}/subnets/{subnetName}/listNetworkManagerEffectiveSecurityUserRules": {
140-
"parameters": [
141-
{
142-
"$ref": "./network.json#/parameters/SubscriptionIdParameter"
143-
},
144-
{
145-
"$ref": "#/parameters/ResourceGroupNameParameter"
146-
},
147-
{
148-
"$ref": "#/parameters/VirtualNetworkNameParameter"
149-
},
150-
{
151-
"name": "subnetName",
152-
"in": "path",
153-
"required": true,
154-
"type": "string",
155-
"description": "The name of the subnet."
156-
},
157-
{
158-
"$ref": "./network.json#/parameters/ApiVersionParameter"
159-
},
160-
{
161-
"name": "parameters",
162-
"in": "body",
163-
"required": true,
164-
"schema": {
165-
"$ref": "./networkManagerGroup.json#/definitions/QueryRequestOptions"
166-
},
167-
"description": "Parameters supplied to list correct page."
168-
}
169-
],
170-
"post": {
171-
"tags": [
172-
"NetworkManagerEffectiveSecurityUserRules"
173-
],
174-
"operationId": "EffectiveSecurityUserRules_ListBySubnet",
175-
"description": "List all effective security user rules in a subnet.",
176-
"responses": {
177-
"200": {
178-
"description": "OK - Returns information about all effective configurations in a subnet.",
179-
"schema": {
180-
"$ref": "#/definitions/NetworkManagerEffectiveSecurityUserRulesListResult"
181-
}
182-
},
183-
"default": {
184-
"description": "Resource Provider error response describing why the operation failed.",
185-
"schema": {
186-
"$ref": "./network.json#/definitions/CloudError"
187-
}
188-
}
189-
},
190-
"x-ms-examples": {
191-
"List effective security user rules applied on a subnet": {
192-
"$ref": "./examples/NetworkManagerEffectiveSecurityUserRulesListBySubnet.json"
193-
}
194-
}
195-
}
196138
}
197139
},
198140
"definitions": {
@@ -230,23 +172,6 @@
230172
},
231173
"description": "Result of the request to list networkManagerEffectiveSecurityAdminRules. It contains a list of groups and a skiptoken to get the next set of results."
232174
},
233-
"NetworkManagerEffectiveSecurityUserRulesListResult": {
234-
"type": "object",
235-
"properties": {
236-
"value": {
237-
"type": "array",
238-
"items": {
239-
"$ref": "#/definitions/EffectiveBaseSecurityUserRule"
240-
},
241-
"description": "Gets a page of NetworkManagerEffectiveSecurityUserRules"
242-
},
243-
"$skipToken": {
244-
"description": "When present, the value can be passed to a subsequent query call (together with the same query and scopes used in the current request) to retrieve the next page of data.",
245-
"type": "string"
246-
}
247-
},
248-
"description": "Result of the request to list NetworkManagerEffectiveSecurityUserRules. It contains a list of groups and a skiptoken to get the next set of results."
249-
},
250175
"EffectiveConnectivityConfiguration": {
251176
"type": "object",
252177
"properties": {
@@ -359,96 +284,6 @@
359284
"description": "Network default admin rule.",
360285
"x-ms-discriminator-value": "Default"
361286
},
362-
"EffectiveBaseSecurityUserRule": {
363-
"type": "object",
364-
"properties": {
365-
"id": {
366-
"type": "string",
367-
"description": "Resource ID."
368-
},
369-
"configurationDisplayName": {
370-
"type": "string",
371-
"description": "A display name of the security user configuration."
372-
},
373-
"configurationDescription": {
374-
"type": "string",
375-
"description": "A description of the security user configuration."
376-
},
377-
"ruleCollectionDisplayName": {
378-
"type": "string",
379-
"description": "A display name of the rule collection."
380-
},
381-
"ruleCollectionDescription": {
382-
"type": "string",
383-
"description": "A description of the rule collection."
384-
},
385-
"ruleCollectionAppliesToGroups": {
386-
"type": "array",
387-
"items": {
388-
"$ref": "./networkManagerSecurityAdminConfiguration.json#/definitions/NetworkManagerSecurityGroupItem"
389-
},
390-
"description": "Groups for rule collection"
391-
},
392-
"ruleGroups": {
393-
"type": "array",
394-
"items": {
395-
"$ref": "#/definitions/ConfigurationGroup"
396-
},
397-
"description": "Effective configuration groups."
398-
},
399-
"kind": {
400-
"type": "string",
401-
"description": "Whether the rule is custom or default.",
402-
"enum": [
403-
"Custom",
404-
"Default"
405-
],
406-
"x-ms-enum": {
407-
"name": "EffectiveUserRuleKind",
408-
"modelAsString": true
409-
}
410-
}
411-
},
412-
"required": [
413-
"kind"
414-
],
415-
"discriminator": "kind",
416-
"description": "Network base rule."
417-
},
418-
"EffectiveSecurityUserRule": {
419-
"type": "object",
420-
"properties": {
421-
"properties": {
422-
"$ref": "./networkManagerSecurityUserConfiguration.json#/definitions/UserRulePropertiesFormat",
423-
"x-ms-client-flatten": true,
424-
"description": "Indicates the properties of the security user rule"
425-
}
426-
},
427-
"allOf": [
428-
{
429-
"$ref": "#/definitions/EffectiveBaseSecurityUserRule"
430-
}
431-
],
432-
"description": "Network security user rule.",
433-
"x-ms-discriminator-value": "Custom"
434-
},
435-
"EffectiveDefaultSecurityUserRule": {
436-
"type": "object",
437-
"properties": {
438-
"properties": {
439-
"$ref": "./networkManagerSecurityUserConfiguration.json#/definitions/DefaultUserRulePropertiesFormat",
440-
"x-ms-client-flatten": true,
441-
"description": "Indicates the properties of the security default user rule"
442-
}
443-
},
444-
"allOf": [
445-
{
446-
"$ref": "#/definitions/EffectiveBaseSecurityUserRule"
447-
}
448-
],
449-
"description": "Network security default user rule.",
450-
"x-ms-discriminator-value": "Default"
451-
},
452287
"ConfigurationGroup": {
453288
"type": "object",
454289
"properties": {

‎specification/network/resource-manager/readme.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ These are the global settings for the Network API.
2828
title: NetworkManagementClient
2929
description: Network Client
3030
openapi-type: arm
31-
tag: package-2021-02
31+
tag: package-2021-02-preview
3232
```
3333
3434

0 commit comments

Comments
 (0)