Skip to content

Commit 997769e

Browse files
00Kai000Kai0
committed
merging
2 parents a8a5c76 + 3e43995 commit 997769e

File tree

4 files changed

+75
-86
lines changed

4 files changed

+75
-86
lines changed

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

Lines changed: 33 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -47,21 +47,23 @@
4747
},
4848
{
4949
"$ref": "#/parameters/NetworkManagerNameParameter"
50-
},
51-
{
52-
"name": "parameters",
53-
"in": "body",
54-
"required": true,
55-
"schema": {
56-
"$ref": "#/definitions/ActiveConfigurationParameter"
57-
},
58-
"description": "Active Configuration Parameter."
5950
}
6051
],
6152
"post": {
6253
"tags": [
6354
"NetworkManagerActiveConnectivityConfigurations"
6455
],
56+
"parameters": [
57+
{
58+
"name": "parameters",
59+
"in": "body",
60+
"required": true,
61+
"schema": {
62+
"$ref": "#/definitions/ActiveConfigurationParameter"
63+
},
64+
"description": "Active Configuration Parameter."
65+
}
66+
],
6567
"operationId": "ActiveConnectivityConfigurations_List",
6668
"description": "Lists active connectivity configurations in a network manager.",
6769
"responses": {
@@ -98,21 +100,23 @@
98100
},
99101
{
100102
"$ref": "#/parameters/NetworkManagerNameParameter"
101-
},
102-
{
103-
"name": "parameters",
104-
"in": "body",
105-
"required": true,
106-
"schema": {
107-
"$ref": "#/definitions/ActiveConfigurationParameter"
108-
},
109-
"description": "Active Configuration Parameter."
110103
}
111104
],
112105
"post": {
113106
"tags": [
114107
"NetworkManagerActiveConfigurations"
115108
],
109+
"parameters": [
110+
{
111+
"name": "parameters",
112+
"in": "body",
113+
"required": true,
114+
"schema": {
115+
"$ref": "#/definitions/ActiveConfigurationParameter"
116+
},
117+
"description": "Active Configuration Parameter."
118+
}
119+
],
116120
"operationId": "ActiveSecurityAdminRules_List",
117121
"description": "Lists active security admin rules in a network manager.",
118122
"responses": {
@@ -149,21 +153,23 @@
149153
},
150154
{
151155
"$ref": "#/parameters/NetworkManagerNameParameter"
152-
},
153-
{
154-
"name": "parameters",
155-
"in": "body",
156-
"required": true,
157-
"schema": {
158-
"$ref": "#/definitions/ActiveConfigurationParameter"
159-
},
160-
"description": "Active Configuration Parameter."
161156
}
162157
],
163158
"post": {
164159
"tags": [
165160
"NetworkManagerActiveSecurityUserRules"
166161
],
162+
"parameters": [
163+
{
164+
"name": "parameters",
165+
"in": "body",
166+
"required": true,
167+
"schema": {
168+
"$ref": "#/definitions/ActiveConfigurationParameter"
169+
},
170+
"description": "Active Configuration Parameter."
171+
}
172+
],
167173
"operationId": "ActiveSecurityUserRules_List",
168174
"description": "Lists Active Security User Rules in a network manager.",
169175
"responses": {

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

Lines changed: 22 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -47,21 +47,23 @@
4747
},
4848
{
4949
"$ref": "./network.json#/parameters/ApiVersionParameter"
50-
},
51-
{
52-
"name": "parameters",
53-
"in": "body",
54-
"required": true,
55-
"schema": {
56-
"$ref": "./networkManagerGroup.json#/definitions/QueryRequestOptions"
57-
},
58-
"description": "Parameters supplied to list correct page."
5950
}
6051
],
6152
"post": {
6253
"tags": [
6354
"NetworkManagerEffectiveConnectivityConfiguration"
6455
],
56+
"parameters": [
57+
{
58+
"name": "parameters",
59+
"in": "body",
60+
"required": true,
61+
"schema": {
62+
"$ref": "./networkManagerGroup.json#/definitions/QueryRequestOptions"
63+
},
64+
"description": "Parameters supplied to list correct page."
65+
}
66+
],
6567
"operationId": "EffectiveConnectivityConfigurations_List",
6668
"description": "List all effective connectivity configurations applied on a virtual network.",
6769
"responses": {
@@ -98,21 +100,23 @@
98100
},
99101
{
100102
"$ref": "./network.json#/parameters/ApiVersionParameter"
101-
},
102-
{
103-
"name": "parameters",
104-
"in": "body",
105-
"required": true,
106-
"schema": {
107-
"$ref": "./networkManagerGroup.json#/definitions/QueryRequestOptions"
108-
},
109-
"description": "Parameters supplied to list correct page."
110103
}
111104
],
112105
"post": {
113106
"tags": [
114107
"NetworkManagerEffectiveSecurityAdminRules"
115108
],
109+
"parameters": [
110+
{
111+
"name": "parameters",
112+
"in": "body",
113+
"required": true,
114+
"schema": {
115+
"$ref": "./networkManagerGroup.json#/definitions/QueryRequestOptions"
116+
},
117+
"description": "Parameters supplied to list correct page."
118+
}
119+
],
116120
"operationId": "NetworkManagerEffectiveSecurityAdminRules_List",
117121
"description": "List all effective security admin rules applied on a virtual network.",
118122
"responses": {

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

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -205,6 +205,22 @@ input-file:
205205
206206
```
207207

208+
### Tag: package-2021-02-preview-only
209+
210+
These settings apply only when `--tag=2021-02-preview-only` is specified on the command line.
211+
212+
``` yaml $(tag) == 'package-2021-02-preview-only'
213+
input-file:
214+
- Microsoft.Network/preview/2021-02-01-preview/networkManager.json
215+
- Microsoft.Network/preview/2021-02-01-preview/networkManagerActiveConfiguration.json
216+
- Microsoft.Network/preview/2021-02-01-preview/networkManagerConnectivityConfiguration.json
217+
- Microsoft.Network/preview/2021-02-01-preview/networkManagerEffectiveConfiguration.json
218+
- Microsoft.Network/preview/2021-02-01-preview/networkManagerGroup.json
219+
- Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityUserConfiguration.json
220+
- Microsoft.Network/preview/2021-02-01-preview/networkManagerSecurityAdminConfiguration.json
221+
- Microsoft.Network/preview/2021-02-01-preview/networkSecurityPerimeter.json
222+
```
223+
208224
### Tag: package-2021-02-preview
209225

210226
These settings apply only when `--tag=2021-02-preview` is specified on the command line.

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

Lines changed: 4 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -17,46 +17,9 @@ Generate all API versions currently shipped for this package
1717
```yaml $(multiapi)
1818
clear-output-folder: true
1919
batch:
20-
- tag: package-2021-02-preview
21-
- tag: package-2021-03
22-
- tag: package-2021-02
23-
- tag: package-2020-11
24-
- tag: package-2020-08
25-
- tag: package-2020-07
26-
- tag: package-2020-06
27-
- tag: package-2020-05
28-
- tag: package-2020-04
29-
- tag: package-2020-03
30-
- tag: package-2019-12
31-
- tag: package-2019-11
32-
- tag: package-2019-09
33-
- tag: package-2019-08
34-
- tag: package-2019-07
35-
- tag: package-2019-06
36-
- tag: package-2019-04
37-
- tag: package-2019-02
38-
- tag: package-2018-12
39-
- tag: package-2018-11
40-
- tag: package-2018-10
41-
- tag: package-2018-08
42-
- tag: package-2018-07
43-
- tag: package-2018-06
44-
- tag: package-2018-04
45-
- tag: package-2018-02
46-
- tag: package-2018-01
47-
- tag: package-2017-11
48-
- tag: package-2017-10
49-
- tag: package-2017-09
50-
- tag: package-2017-08
51-
- tag: package-2017-06
52-
- tag: package-2017-03
53-
- tag: package-2016-12
54-
- tag: package-2016-09
55-
- tag: package-2015-06split
20+
- tag: package-2021-02-preview-only
5621
- multiapiscript: true
5722

58-
modelerfour:
59-
lenient-model-deduplication: true
6023
```
6124

6225
``` yaml $(multiapiscript)
@@ -65,12 +28,12 @@ clear-output-folder: false
6528
perform-load: false
6629
```
6730
68-
### Tag: package-2021-02-preview and python
31+
### Tag: package-2021-02-preview-only and python
6932
70-
These settings apply only when `--tag=package-2021-02-preview --python` is specified on the command line.
33+
These settings apply only when `--tag=package-2021-02-preview-only --python` is specified on the command line.
7134
Please also specify `--python-sdks-folder=<path to the root directory of your azure-sdk-for-python clone>`.
7235

73-
``` yaml $(tag) == 'package-2021-02-preview'
36+
``` yaml $(tag) == 'package-2021-02-preview-only'
7437
namespace: azure.mgmt.network.v2021_02_01_preview
7538
output-folder: $(python-sdks-folder)/network/azure-mgmt-network/azure/mgmt/network/v2021_02_01_preview
7639
```

0 commit comments

Comments
 (0)