Skip to content

Commit

Permalink
fix network (#9369)
Browse files Browse the repository at this point in the history
* fix network

* duplicated publicipprefix

* fixed example in 2018-01-01

* final updates

* missing examples

(cherry picked from commit 42d9639)
  • Loading branch information
Zim Kalinowski committed May 21, 2020
1 parent 212f942 commit 8c247fc
Show file tree
Hide file tree
Showing 34 changed files with 3,411 additions and 90 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -7,38 +7,45 @@
"200": {
"body": {
"value": [
[
{
"name": "AppGwSslPolicy20150501",
"id": "/subscriptions/subid/resourceGroups//providers/Microsoft.Network/ApplicationGatewayAvailableSslOptions/default/ApplicationGatewaySslPredefinedPolicy/AppGwSslPolicy20150501",
"properties": {
"cipherSuites": [
"TLS_RSA_WITH_AES_128_CBC_SHA"
],
"minProtocolVersion": "TLSv1_0"
}
},
{
"name": "AppGwSslPolicy20170401",
"id": "/subscriptions/subid/resourceGroups//providers/Microsoft.Network/ApplicationGatewayAvailableSslOptions/default/ApplicationGatewaySslPredefinedPolicy/AppGwSslPolicy20170401",
"properties": {
"cipherSuites": [
"TLS_RSA_WITH_AES_128_CBC_SHA"
],
"minProtocolVersion": "TLSv1_1"
}
},
{
"name": "AppGwSslPolicy20170401S",
"id": "/subscriptions/subid/resourceGroups//providers/Microsoft.Network/ApplicationGatewayAvailableSslOptions/default/ApplicationGatewaySslPredefinedPolicy/AppGwSslPolicy20170401S",
"properties": {
"cipherSuites": [
"TLS_RSA_WITH_AES_128_CBC_SHA"
],
"minProtocolVersion": "TLSv1_2"
}
{
"name": "AppGwSslPolicy20150501",
"id": "/subscriptions/subid/resourceGroups//providers/Microsoft.Network/ApplicationGatewayAvailableSslOptions/default/ApplicationGatewaySslPredefinedPolicy/AppGwSslPolicy20150501",
"properties": {
"cipherSuites": [
"TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384",
"TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256",
"TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384",
"TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256"
],
"minProtocolVersion": "TLSv1_0"
}
]
},
{
"name": "AppGwSslPolicy20170401",
"id": "/subscriptions/subid/resourceGroups//providers/Microsoft.Network/ApplicationGatewayAvailableSslOptions/default/ApplicationGatewaySslPredefinedPolicy/AppGwSslPolicy20170401",
"properties": {
"cipherSuites": [
"TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256",
"TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384",
"TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA",
"TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA"
],
"minProtocolVersion": "TLSv1_1"
}
},
{
"name": "AppGwSslPolicy20170401S",
"id": "/subscriptions/subid/resourceGroups//providers/Microsoft.Network/ApplicationGatewayAvailableSslOptions/default/ApplicationGatewaySslPredefinedPolicy/AppGwSslPolicy20170401S",
"properties": {
"cipherSuites": [
"TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256",
"TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384",
"TLS_ECDHE_ECDSA_WITH_AES_128_CBC_SHA",
"TLS_ECDHE_ECDSA_WITH_AES_256_CBC_SHA"
],
"minProtocolVersion": "TLSv1_2"
}
}
]
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@
"ipTags": {
"type": "array",
"items": {
"$ref": "#/definitions/IpTag"
"$ref": "./publicIpAddress.json#/definitions/IpTag"
},
"description": "The list of tags associated with the public IP prefix."
},
Expand Down Expand Up @@ -434,19 +434,6 @@
},
"description": "Response for ListPublicIpPrefixes API service call."
},
"IpTag": {
"properties": {
"ipTagType": {
"type": "string",
"description": "Gets or sets the ipTag type: Example FirstPartyUsage."
},
"tag": {
"type": "string",
"description": "Gets or sets value of the IpTag associated with the public IP. Example SQL, Storage etc"
}
},
"description": "Contains the IpTag associated with the object"
},
"ReferencedPublicIpAddress": {
"properties": {
"id": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@
"ipTags": {
"type": "array",
"items": {
"$ref": "#/definitions/IpTag"
"$ref": "./publicIpAddress.json#/definitions/IpTag"
},
"description": "The list of tags associated with the public IP prefix."
},
Expand Down Expand Up @@ -434,19 +434,6 @@
},
"description": "Response for ListPublicIpPrefixes API service call."
},
"IpTag": {
"properties": {
"ipTagType": {
"type": "string",
"description": "Gets or sets the ipTag type: Example FirstPartyUsage."
},
"tag": {
"type": "string",
"description": "Gets or sets value of the IpTag associated with the public IP. Example SQL, Storage etc"
}
},
"description": "Contains the IpTag associated with the object"
},
"ReferencedPublicIpAddress": {
"properties": {
"id": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@
"ipTags": {
"type": "array",
"items": {
"$ref": "#/definitions/IpTag"
"$ref": "./publicIpAddress.json#/definitions/IpTag"
},
"description": "The list of tags associated with the public IP prefix."
},
Expand Down Expand Up @@ -434,19 +434,6 @@
},
"description": "Response for ListPublicIpPrefixes API service call."
},
"IpTag": {
"properties": {
"ipTagType": {
"type": "string",
"description": "Gets or sets the ipTag type: Example FirstPartyUsage."
},
"tag": {
"type": "string",
"description": "Gets or sets value of the IpTag associated with the public IP. Example SQL, Storage etc"
}
},
"description": "Contains the IpTag associated with the object"
},
"ReferencedPublicIpAddress": {
"properties": {
"id": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -352,7 +352,7 @@
"ipTags": {
"type": "array",
"items": {
"$ref": "#/definitions/IpTag"
"$ref": "./publicIpAddress.json#/definitions/IpTag"
},
"description": "The list of tags associated with the public IP prefix."
},
Expand Down Expand Up @@ -434,19 +434,6 @@
},
"description": "Response for ListPublicIpPrefixes API service call."
},
"IpTag": {
"properties": {
"ipTagType": {
"type": "string",
"description": "Gets or sets the ipTag type: Example FirstPartyUsage."
},
"tag": {
"type": "string",
"description": "Gets or sets value of the IpTag associated with the public IP. Example SQL, Storage etc"
}
},
"description": "Contains the IpTag associated with the object"
},
"ReferencedPublicIpAddress": {
"properties": {
"id": {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
{
"parameters": {
"api-version": "2019-07-01",
"subscriptionId": "subid",
"resourceGroupName": "rg1",
"networkWatcherName": "nw1",
"connectionMonitorName": "cm1",
"parameters": {
"location": "eastus",
"properties": {
"source": {
"resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Compute/virtualMachines/vm1"
},
"destination": {
"address": "bing.com",
"port": 80
},
"monitoringIntervalInSeconds": 60
}
}
},
"responses": {
"200": {
"body": {
"name": "cm1",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkWatchers/nw1/connectionMonitors/cm1",
"etag": "W/\"e7497f26-5f09-4559-900b-fe98f3dedb6f\"",
"properties": {
"provisioningState": "Updating",
"source": {
"resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Compute/virtualMachines/vm1",
"port": 0
},
"destination": {
"address": "bing.com",
"port": 80
},
"monitoringIntervalInSeconds": 60,
"autoStart": true,
"monitoringStatus": "NotStarted"
},
"location": "eastus",
"type": "Microsoft.Network/networkWatchers/connectionMonitors"
}
},
"201": {
"body": {
"name": "cm1",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkWatchers/nw1/connectionMonitors/cm1",
"etag": "W/\"e7497f26-5f09-4559-900b-fe98f3dedb6f\"",
"properties": {
"provisioningState": "Updating",
"source": {
"resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Compute/virtualMachines/vm1",
"port": 0
},
"destination": {
"address": "bing.com",
"port": 80
},
"monitoringIntervalInSeconds": 60,
"autoStart": true,
"monitoringStatus": "NotStarted"
},
"location": "eastus",
"type": "Microsoft.Network/networkWatchers/connectionMonitors"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
{
"parameters": {
"api-version": "2019-07-01",
"subscriptionId": "subid",
"resourceGroupName": "rg1",
"networkWatcherName": "nw1",
"connectionMonitorName": "cm1"
},
"responses": {
"204": {},
"202": {}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
{
"parameters": {
"api-version": "2019-07-01",
"subscriptionId": "subid",
"resourceGroupName": "rg1",
"networkWatcherName": "nw1",
"connectionMonitorName": "cm1"
},
"responses": {
"200": {
"body": {
"name": "cm1",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkWatchers/nw1/connectionMonitors/cm1",
"etag": "W/\"00000000-0000-0000-0000-000000000000\"",
"properties": {
"provisioningState": "Succeeded",
"source": {
"resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Compute/virtualMachines/vm1",
"port": 0
},
"destination": {
"address": "bing.com",
"port": 80
},
"monitoringIntervalInSeconds": 60,
"autoStart": true,
"startTime": "2018-01-08T03:42:33.3387305Z",
"monitoringStatus": "Running"
},
"location": "centraluseuap",
"type": "Microsoft.Network/networkWatchers/connectionMonitors"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
{
"parameters": {
"api-version": "2019-07-01",
"subscriptionId": "subid",
"resourceGroupName": "rg1",
"networkWatcherName": "nw1"
},
"responses": {
"200": {
"body": {
"value": [
{
"name": "cm1",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkWatchers/nw1/connectionMonitors/cm1",
"etag": "W/\"00000000-0000-0000-0000-000000000000\"",
"properties": {
"provisioningState": "Succeeded",
"source": {
"resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Compute/virtualMachines/vm1",
"port": 0
},
"destination": {
"address": "bing.com",
"port": 80
},
"monitoringIntervalInSeconds": 60,
"autoStart": true,
"startTime": "2018-01-08T03:42:33.3387305Z",
"monitoringStatus": "Running"
},
"location": "centraluseuap",
"type": "Microsoft.Network/networkWatchers/connectionMonitors"
},
{
"name": "cm2",
"id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/networkWatchers/nw1/connectionMonitors/cm2",
"etag": "W/\"00000000-0000-0000-0000-000000000000\"",
"properties": {
"provisioningState": "Succeeded",
"source": {
"resourceId": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Compute/virtualMachines/vm2",
"port": 0
},
"destination": {
"address": "google.com",
"port": 80
},
"monitoringIntervalInSeconds": 30,
"autoStart": true,
"startTime": "2018-01-08T05:42:33.3387305Z",
"monitoringStatus": "Running"
},
"location": "centraluseuap",
"type": "Microsoft.Network/networkWatchers/connectionMonitors"
}
]
}
}
}
}
Loading

0 comments on commit 8c247fc

Please sign in to comment.