Skip to content

Commit 42d9639

Browse files
author
Zim Kalinowski
authored
fix network (#9369)
* fix network * duplicated publicipprefix * fixed example in 2018-01-01 * final updates * missing examples
1 parent b4f3b10 commit 42d9639

File tree

34 files changed

+3411
-90
lines changed

34 files changed

+3411
-90
lines changed

‎specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/examples/ApplicationGatewayAvailableSslOptionsPredefinedPoliciesGet.json‎

Lines changed: 38 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -7,38 +7,45 @@
77
"200": {
88
"body": {
99
"value": [
10-
[
11-
{
12-
"name": "AppGwSslPolicy20150501",
13-
"id": "/subscriptions/subid/resourceGroups//providers/Microsoft.Network/ApplicationGatewayAvailableSslOptions/default/ApplicationGatewaySslPredefinedPolicy/AppGwSslPolicy20150501",
14-
"properties": {
15-
"cipherSuites": [
16-
"TLS_RSA_WITH_AES_128_CBC_SHA"
17-
],
18-
"minProtocolVersion": "TLSv1_0"
19-
}
20-
},
21-
{
22-
"name": "AppGwSslPolicy20170401",
23-
"id": "/subscriptions/subid/resourceGroups//providers/Microsoft.Network/ApplicationGatewayAvailableSslOptions/default/ApplicationGatewaySslPredefinedPolicy/AppGwSslPolicy20170401",
24-
"properties": {
25-
"cipherSuites": [
26-
"TLS_RSA_WITH_AES_128_CBC_SHA"
27-
],
28-
"minProtocolVersion": "TLSv1_1"
29-
}
30-
},
31-
{
32-
"name": "AppGwSslPolicy20170401S",
33-
"id": "/subscriptions/subid/resourceGroups//providers/Microsoft.Network/ApplicationGatewayAvailableSslOptions/default/ApplicationGatewaySslPredefinedPolicy/AppGwSslPolicy20170401S",
34-
"properties": {
35-
"cipherSuites": [
36-
"TLS_RSA_WITH_AES_128_CBC_SHA"
37-
],
38-
"minProtocolVersion": "TLSv1_2"
39-
}
10+
{
11+
"name": "AppGwSslPolicy20150501",
12+
"id": "/subscriptions/subid/resourceGroups//providers/Microsoft.Network/ApplicationGatewayAvailableSslOptions/default/ApplicationGatewaySslPredefinedPolicy/AppGwSslPolicy20150501",
13+
"properties": {
14+
"cipherSuites": [
15+
"TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",
16+
"TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
17+
"TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384",
18+
"TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256"
19+
],
20+
"minProtocolVersion": "TLSv1_0"
4021
}
41-
]
22+
},
23+
{
24+
"name": "AppGwSslPolicy20170401",
25+
"id": "/subscriptions/subid/resourceGroups//providers/Microsoft.Network/ApplicationGatewayAvailableSslOptions/default/ApplicationGatewaySslPredefinedPolicy/AppGwSslPolicy20170401",
26+
"properties": {
27+
"cipherSuites": [
28+
"TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256",
29+
"TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384",
30+
"TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA",
31+
"TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA"
32+
],
33+
"minProtocolVersion": "TLSv1_1"
34+
}
35+
},
36+
{
37+
"name": "AppGwSslPolicy20170401S",
38+
"id": "/subscriptions/subid/resourceGroups//providers/Microsoft.Network/ApplicationGatewayAvailableSslOptions/default/ApplicationGatewaySslPredefinedPolicy/AppGwSslPolicy20170401S",
39+
"properties": {
40+
"cipherSuites": [
41+
"TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256",
42+
"TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384",
43+
"TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA",
44+
"TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA"
45+
],
46+
"minProtocolVersion": "TLSv1_2"
47+
}
48+
}
4249
]
4350
}
4451
}

‎specification/network/resource-manager/Microsoft.Network/stable/2018-07-01/publicIpPrefix.json‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@
352352
"ipTags": {
353353
"type": "array",
354354
"items": {
355-
"$ref": "#/definitions/IpTag"
355+
"$ref": "./publicIpAddress.json#/definitions/IpTag"
356356
},
357357
"description": "The list of tags associated with the public IP prefix."
358358
},
@@ -434,19 +434,6 @@
434434
},
435435
"description": "Response for ListPublicIpPrefixes API service call."
436436
},
437-
"IpTag": {
438-
"properties": {
439-
"ipTagType": {
440-
"type": "string",
441-
"description": "Gets or sets the ipTag type: Example FirstPartyUsage."
442-
},
443-
"tag": {
444-
"type": "string",
445-
"description": "Gets or sets value of the IpTag associated with the public IP. Example SQL, Storage etc"
446-
}
447-
},
448-
"description": "Contains the IpTag associated with the object"
449-
},
450437
"ReferencedPublicIpAddress": {
451438
"properties": {
452439
"id": {

‎specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/publicIpPrefix.json‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@
352352
"ipTags": {
353353
"type": "array",
354354
"items": {
355-
"$ref": "#/definitions/IpTag"
355+
"$ref": "./publicIpAddress.json#/definitions/IpTag"
356356
},
357357
"description": "The list of tags associated with the public IP prefix."
358358
},
@@ -434,19 +434,6 @@
434434
},
435435
"description": "Response for ListPublicIpPrefixes API service call."
436436
},
437-
"IpTag": {
438-
"properties": {
439-
"ipTagType": {
440-
"type": "string",
441-
"description": "Gets or sets the ipTag type: Example FirstPartyUsage."
442-
},
443-
"tag": {
444-
"type": "string",
445-
"description": "Gets or sets value of the IpTag associated with the public IP. Example SQL, Storage etc"
446-
}
447-
},
448-
"description": "Contains the IpTag associated with the object"
449-
},
450437
"ReferencedPublicIpAddress": {
451438
"properties": {
452439
"id": {

‎specification/network/resource-manager/Microsoft.Network/stable/2018-10-01/publicIpPrefix.json‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@
352352
"ipTags": {
353353
"type": "array",
354354
"items": {
355-
"$ref": "#/definitions/IpTag"
355+
"$ref": "./publicIpAddress.json#/definitions/IpTag"
356356
},
357357
"description": "The list of tags associated with the public IP prefix."
358358
},
@@ -434,19 +434,6 @@
434434
},
435435
"description": "Response for ListPublicIpPrefixes API service call."
436436
},
437-
"IpTag": {
438-
"properties": {
439-
"ipTagType": {
440-
"type": "string",
441-
"description": "Gets or sets the ipTag type: Example FirstPartyUsage."
442-
},
443-
"tag": {
444-
"type": "string",
445-
"description": "Gets or sets value of the IpTag associated with the public IP. Example SQL, Storage etc"
446-
}
447-
},
448-
"description": "Contains the IpTag associated with the object"
449-
},
450437
"ReferencedPublicIpAddress": {
451438
"properties": {
452439
"id": {

‎specification/network/resource-manager/Microsoft.Network/stable/2018-11-01/publicIpPrefix.json‎

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -352,7 +352,7 @@
352352
"ipTags": {
353353
"type": "array",
354354
"items": {
355-
"$ref": "#/definitions/IpTag"
355+
"$ref": "./publicIpAddress.json#/definitions/IpTag"
356356
},
357357
"description": "The list of tags associated with the public IP prefix."
358358
},
@@ -434,19 +434,6 @@
434434
},
435435
"description": "Response for ListPublicIpPrefixes API service call."
436436
},
437-
"IpTag": {
438-
"properties": {
439-
"ipTagType": {
440-
"type": "string",
441-
"description": "Gets or sets the ipTag type: Example FirstPartyUsage."
442-
},
443-
"tag": {
444-
"type": "string",
445-
"description": "Gets or sets value of the IpTag associated with the public IP. Example SQL, Storage etc"
446-
}
447-
},
448-
"description": "Contains the IpTag associated with the object"
449-
},
450437
"ReferencedPublicIpAddress": {
451438
"properties": {
452439
"id": {

‎specification/network/resource-manager/Microsoft.Network/stable/2019-07-01/examples/NetworkWatcherConnectionMonitorCreate.json‎

Lines changed: 70 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,70 @@
1+
{
2+
"parameters": {
3+
"api-version": "2019-07-01",
4+
"subscriptionId": "subid",
5+
"resourceGroupName": "rg1",
6+
"networkWatcherName": "nw1",
7+
"connectionMonitorName": "cm1",
8+
"parameters": {
9+
"location": "eastus",
10+
"properties": {
11+
"source": {
12+
"resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Compute/virtualMachines/vm1"
13+
},
14+
"destination": {
15+
"address": "bing.com",
16+
"port": 80
17+
},
18+
"monitoringIntervalInSeconds": 60
19+
}
20+
}
21+
},
22+
"responses": {
23+
"200": {
24+
"body": {
25+
"name": "cm1",
26+
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkWatchers/nw1/connectionMonitors/cm1",
27+
"etag": "W/\"e7497f26-5f09-4559-900b-fe98f3dedb6f\"",
28+
"properties": {
29+
"provisioningState": "Updating",
30+
"source": {
31+
"resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Compute/virtualMachines/vm1",
32+
"port": 0
33+
},
34+
"destination": {
35+
"address": "bing.com",
36+
"port": 80
37+
},
38+
"monitoringIntervalInSeconds": 60,
39+
"autoStart": true,
40+
"monitoringStatus": "NotStarted"
41+
},
42+
"location": "eastus",
43+
"type": "Microsoft.Network/networkWatchers/connectionMonitors"
44+
}
45+
},
46+
"201": {
47+
"body": {
48+
"name": "cm1",
49+
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkWatchers/nw1/connectionMonitors/cm1",
50+
"etag": "W/\"e7497f26-5f09-4559-900b-fe98f3dedb6f\"",
51+
"properties": {
52+
"provisioningState": "Updating",
53+
"source": {
54+
"resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Compute/virtualMachines/vm1",
55+
"port": 0
56+
},
57+
"destination": {
58+
"address": "bing.com",
59+
"port": 80
60+
},
61+
"monitoringIntervalInSeconds": 60,
62+
"autoStart": true,
63+
"monitoringStatus": "NotStarted"
64+
},
65+
"location": "eastus",
66+
"type": "Microsoft.Network/networkWatchers/connectionMonitors"
67+
}
68+
}
69+
}
70+
}

‎specification/network/resource-manager/Microsoft.Network/stable/2019-07-01/examples/NetworkWatcherConnectionMonitorDelete.json‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"parameters": {
3+
"api-version": "2019-07-01",
4+
"subscriptionId": "subid",
5+
"resourceGroupName": "rg1",
6+
"networkWatcherName": "nw1",
7+
"connectionMonitorName": "cm1"
8+
},
9+
"responses": {
10+
"204": {},
11+
"202": {}
12+
}
13+
}

‎specification/network/resource-manager/Microsoft.Network/stable/2019-07-01/examples/NetworkWatcherConnectionMonitorGet.json‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
{
2+
"parameters": {
3+
"api-version": "2019-07-01",
4+
"subscriptionId": "subid",
5+
"resourceGroupName": "rg1",
6+
"networkWatcherName": "nw1",
7+
"connectionMonitorName": "cm1"
8+
},
9+
"responses": {
10+
"200": {
11+
"body": {
12+
"name": "cm1",
13+
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkWatchers/nw1/connectionMonitors/cm1",
14+
"etag": "W/\"00000000-0000-0000-0000-000000000000\"",
15+
"properties": {
16+
"provisioningState": "Succeeded",
17+
"source": {
18+
"resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Compute/virtualMachines/vm1",
19+
"port": 0
20+
},
21+
"destination": {
22+
"address": "bing.com",
23+
"port": 80
24+
},
25+
"monitoringIntervalInSeconds": 60,
26+
"autoStart": true,
27+
"startTime": "2018-01-08T03:42:33.3387305Z",
28+
"monitoringStatus": "Running"
29+
},
30+
"location": "centraluseuap",
31+
"type": "Microsoft.Network/networkWatchers/connectionMonitors"
32+
}
33+
}
34+
}
35+
}

‎specification/network/resource-manager/Microsoft.Network/stable/2019-07-01/examples/NetworkWatcherConnectionMonitorList.json‎

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
{
2+
"parameters": {
3+
"api-version": "2019-07-01",
4+
"subscriptionId": "subid",
5+
"resourceGroupName": "rg1",
6+
"networkWatcherName": "nw1"
7+
},
8+
"responses": {
9+
"200": {
10+
"body": {
11+
"value": [
12+
{
13+
"name": "cm1",
14+
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkWatchers/nw1/connectionMonitors/cm1",
15+
"etag": "W/\"00000000-0000-0000-0000-000000000000\"",
16+
"properties": {
17+
"provisioningState": "Succeeded",
18+
"source": {
19+
"resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Compute/virtualMachines/vm1",
20+
"port": 0
21+
},
22+
"destination": {
23+
"address": "bing.com",
24+
"port": 80
25+
},
26+
"monitoringIntervalInSeconds": 60,
27+
"autoStart": true,
28+
"startTime": "2018-01-08T03:42:33.3387305Z",
29+
"monitoringStatus": "Running"
30+
},
31+
"location": "centraluseuap",
32+
"type": "Microsoft.Network/networkWatchers/connectionMonitors"
33+
},
34+
{
35+
"name": "cm2",
36+
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkWatchers/nw1/connectionMonitors/cm2",
37+
"etag": "W/\"00000000-0000-0000-0000-000000000000\"",
38+
"properties": {
39+
"provisioningState": "Succeeded",
40+
"source": {
41+
"resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Compute/virtualMachines/vm2",
42+
"port": 0
43+
},
44+
"destination": {
45+
"address": "google.com",
46+
"port": 80
47+
},
48+
"monitoringIntervalInSeconds": 30,
49+
"autoStart": true,
50+
"startTime": "2018-01-08T05:42:33.3387305Z",
51+
"monitoringStatus": "Running"
52+
},
53+
"location": "centraluseuap",
54+
"type": "Microsoft.Network/networkWatchers/connectionMonitors"
55+
}
56+
]
57+
}
58+
}
59+
}
60+
}

0 commit comments

Comments
 (0)