From 346afca19c65807e4ea8a5e5bd12c96ff649c984 Mon Sep 17 00:00:00 2001 From: Nick Schonning Date: Fri, 12 Apr 2019 23:21:50 +0300 Subject: [PATCH] Resolve issue with unreferenced examples in Network specs for older API versions --- .../examples/LoadBalancerCreateWithZones.json | 12 +-- .../stable/2017-06-01/loadBalancer.json | 5 +- .../stable/2017-06-01/networkWatcher.json | 62 +++++++++++++- .../stable/2017-06-01/virtualNetwork.json | 5 +- .../stable/2017-08-01/loadBalancer.json | 4 +- .../stable/2017-09-01/loadBalancer.json | 4 +- .../stable/2017-09-01/networkWatcher.json | 62 ++++++++++++++ ...NetworkWatcherConnectionMonitorDelete.json | 13 +++ .../stable/2017-10-01/loadBalancer.json | 4 +- .../stable/2017-10-01/networkWatcher.json | 78 ++++++++++++++++++ .../stable/2017-11-01/loadBalancer.json | 2 + .../stable/2018-01-01/loadBalancer.json | 2 + ...NetworkWatcherConnectionMonitorDelete.json | 13 +++ .../stable/2018-02-01/loadBalancer.json | 2 + .../stable/2018-02-01/networkWatcher.json | 80 ++++++++++++++++++- .../HubVirtualNetworkConnectionDelete.json | 14 ---- .../HubVirtualNetworkConnectionPut.json | 54 ------------- .../stable/2018-04-01/loadBalancer.json | 2 + .../HubVirtualNetworkConnectionDelete.json | 14 ---- .../HubVirtualNetworkConnectionPut.json | 54 ------------- .../stable/2018-06-01/loadBalancer.json | 2 + .../HubVirtualNetworkConnectionDelete.json | 14 ---- .../HubVirtualNetworkConnectionPut.json | 54 ------------- ...ualNetworkCreateServiceEndpointPolicy.json | 21 +++-- .../stable/2018-07-01/loadBalancer.json | 10 ++- .../HubVirtualNetworkConnectionDelete.json | 14 ---- .../HubVirtualNetworkConnectionPut.json | 54 ------------- ...ualNetworkCreateServiceEndpointPolicy.json | 21 +++-- .../2018-08-01/expressRouteCircuit.json | 21 ++--- .../stable/2018-08-01/loadBalancer.json | 6 +- .../HubVirtualNetworkConnectionDelete.json | 14 ---- .../HubVirtualNetworkConnectionPut.json | 54 ------------- ...ualNetworkCreateServiceEndpointPolicy.json | 21 +++-- .../2018-10-01/expressRouteCircuit.json | 3 +- .../stable/2018-10-01/loadBalancer.json | 6 +- .../HubVirtualNetworkConnectionDelete.json | 14 ---- .../HubVirtualNetworkConnectionPut.json | 54 ------------- ...ualNetworkCreateServiceEndpointPolicy.json | 28 ++++--- .../2018-11-01/expressRouteCircuit.json | 3 +- .../stable/2018-11-01/loadBalancer.json | 6 +- .../HubVirtualNetworkConnectionDelete.json | 14 ---- .../HubVirtualNetworkConnectionPut.json | 54 ------------- ...ualNetworkCreateServiceEndpointPolicy.json | 19 +++-- .../2018-12-01/expressRouteCircuit.json | 11 +-- .../stable/2018-12-01/loadBalancer.json | 6 +- 45 files changed, 451 insertions(+), 559 deletions(-) create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2017-10-01/examples/NetworkWatcherConnectionMonitorDelete.json create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2018-02-01/examples/NetworkWatcherConnectionMonitorDelete.json delete mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2018-04-01/examples/HubVirtualNetworkConnectionDelete.json delete mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2018-04-01/examples/HubVirtualNetworkConnectionPut.json delete mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2018-06-01/examples/HubVirtualNetworkConnectionDelete.json delete mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2018-06-01/examples/HubVirtualNetworkConnectionPut.json delete mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2018-07-01/examples/HubVirtualNetworkConnectionDelete.json delete mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2018-07-01/examples/HubVirtualNetworkConnectionPut.json delete mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/HubVirtualNetworkConnectionDelete.json delete mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/HubVirtualNetworkConnectionPut.json delete mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2018-10-01/examples/HubVirtualNetworkConnectionDelete.json delete mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2018-10-01/examples/HubVirtualNetworkConnectionPut.json delete mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2018-11-01/examples/HubVirtualNetworkConnectionDelete.json delete mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2018-11-01/examples/HubVirtualNetworkConnectionPut.json delete mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2018-12-01/examples/HubVirtualNetworkConnectionDelete.json delete mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2018-12-01/examples/HubVirtualNetworkConnectionPut.json diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2017-06-01/examples/LoadBalancerCreateWithZones.json b/specification/network/resource-manager/Microsoft.Network/stable/2017-06-01/examples/LoadBalancerCreateWithZones.json index 7cd2247ee6d1..98aa2609d2b2 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2017-06-01/examples/LoadBalancerCreateWithZones.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2017-06-01/examples/LoadBalancerCreateWithZones.json @@ -106,9 +106,6 @@ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb", "type": "Microsoft.Network/loadBalancers", "location": "eastus", - "sku": { - "name": "Basic" - }, "properties": { "provisioningState": "Succeeded", "frontendIPConfigurations": [ @@ -170,8 +167,7 @@ }, "probe": { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/probes/probe-lb" - }, - "disableOutboundSnat": false + } } } ], @@ -222,9 +218,6 @@ "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb", "type": "Microsoft.Network/loadBalancers", "location": "eastus", - "sku": { - "name": "Basic" - }, "properties": { "provisioningState": "Succeeded", "frontendIPConfigurations": [ @@ -286,8 +279,7 @@ }, "probe": { "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/loadBalancers/lb/probes/probe-lb" - }, - "disableOutboundSnat": false + } } } ], diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2017-06-01/loadBalancer.json b/specification/network/resource-manager/Microsoft.Network/stable/2017-06-01/loadBalancer.json index d0dd79433440..4f378a93a7c7 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2017-06-01/loadBalancer.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2017-06-01/loadBalancer.json @@ -186,6 +186,9 @@ "x-ms-examples": { "Create load balancer": { "$ref": "./examples/LoadBalancerCreate.json" + }, + "Create load balancer with Frontend IP in Zone 1": { + "$ref": "./examples/LoadBalancerCreateWithZones.json" } }, "x-ms-long-running-operation": true @@ -1638,4 +1641,4 @@ "description": "Client API version." } } -} \ No newline at end of file +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2017-06-01/networkWatcher.json b/specification/network/resource-manager/Microsoft.Network/stable/2017-06-01/networkWatcher.json index 95118f90c070..215219f8dd04 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2017-06-01/networkWatcher.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2017-06-01/networkWatcher.json @@ -87,6 +87,9 @@ "$ref": "#/definitions/NetworkWatcher" } } + }, + "x-ms-examples": { + "Create Network Watcher": { "$ref": "./examples/NetworkWatcherCreate.json" } } }, "get": { @@ -124,6 +127,9 @@ "$ref": "#/definitions/NetworkWatcher" } } + }, + "x-ms-examples": { + "Get Network Watcher": { "$ref": "./examples/NetworkWatcherGet.json" } } }, "delete": { @@ -162,6 +168,9 @@ "204": { "description": "Delete successful." } + }, + "x-ms-examples": { + "Delete Network Watcher": { "$ref": "./examples/NetworkWatcherDelete.json" } } } }, @@ -195,6 +204,9 @@ } } }, + "x-ms-examples": { + "List Network Watchers": { "$ref": "./examples/NetworkWatcherList.json" } + }, "x-ms-pageable": { "nextLinkName": null } @@ -223,6 +235,9 @@ } } }, + "x-ms-examples": { + "List Network Watchers": { "$ref": "./examples/NetworkWatcherListAll.json" } + }, "x-ms-pageable": { "nextLinkName": null } @@ -273,6 +288,9 @@ "$ref": "#/definitions/Topology" } } + }, + "x-ms-examples": { + "Get Topology": { "$ref": "./examples/NetworkWatcherTopologyGet.json" } } } }, @@ -328,6 +346,9 @@ "$ref": "#/definitions/VerificationIPFlowResult" } } + }, + "x-ms-examples": { + "Verify IP Flow": { "$ref": "./examples/NetworkWatcherIpFlowVerify.json" } } } }, @@ -383,6 +404,9 @@ "$ref": "#/definitions/NextHopResult" } } + }, + "x-ms-examples": { + "Get Next Hop": { "$ref": "./examples/NetworkWatcherNextHopGet.json" } } } }, @@ -438,6 +462,9 @@ "$ref": "#/definitions/SecurityGroupViewResult" } } + }, + "x-ms-examples": { + "Get Security Group View": { "$ref": "./examples/NetworkWatcherSecurityGroupViewGet.json" } } } }, @@ -494,6 +521,9 @@ "$ref": "#/definitions/PacketCaptureResult" } } + }, + "x-ms-examples": { + "Create Packet Capture": { "$ref": "./examples/NetworkWatcherPacketCaptureCreate.json" } } }, "get": { @@ -538,6 +568,9 @@ "$ref": "#/definitions/PacketCaptureResult" } } + }, + "x-ms-examples": { + "Create Packet Capture": { "$ref": "./examples/NetworkWatcherPacketCaptureGet.json" } } }, "delete": { @@ -583,6 +616,9 @@ "202": { "description": "Accepted and the operation will complete asynchronously." } + }, + "x-ms-examples": { + "Delete Packet Capture": { "$ref": "./examples/NetworkWatcherPacketCaptureDelete.json" } } } }, @@ -630,6 +666,9 @@ "202": { "description": "Accepted and the operation will complete asynchronously." } + }, + "x-ms-examples": { + "Stop Packet Capture": { "$ref": "./examples/NetworkWatcherPacketCaptureStop.json" } } } }, @@ -686,6 +725,9 @@ "$ref": "#/definitions/PacketCaptureQueryStatusResult" } } + }, + "x-ms-examples": { + "Get Packet Capture status": { "$ref": "./examples/NetworkWatcherPacketCaptureQueryStatus.json" } } } }, @@ -726,6 +768,9 @@ } } }, + "x-ms-examples": { + "List Packet Captures": { "$ref": "./examples/NetworkWatcherPacketCapturesList.json" } + }, "x-ms-pageable": { "nextLinkName": null } @@ -783,6 +828,9 @@ "$ref": "#/definitions/TroubleshootingResult" } } + }, + "x-ms-examples": { + "Troubleshoot Resource": { "$ref": "./examples/NetworkWatcherTroubleshootGet.json" } } } }, @@ -838,6 +886,9 @@ "$ref": "#/definitions/TroubleshootingResult" } } + }, + "x-ms-examples": { + "Get Troubleshoot result": { "$ref": "./examples/NetworkWatcherTroubleshootResultQuery.json" } } } }, @@ -893,6 +944,9 @@ "$ref": "#/definitions/FlowLogInformation" } } + }, + "x-ms-examples": { + "Configure Flow Logs": { "$ref": "./examples/NetworkWatcherFlowLogConfigure.json" } } } }, @@ -948,6 +1002,9 @@ "$ref": "#/definitions/FlowLogInformation" } } + }, + "x-ms-examples": { + "Query Flow Log Status": { "$ref": "./examples/NetworkWatcherFlowLogStatusQuery.json" } } } }, @@ -1003,6 +1060,9 @@ "$ref": "#/definitions/ConnectivityInformation" } } + }, + "x-ms-examples": { + "Check Connectivity": { "$ref": "./examples/NetworkWatcherConnectivityCheck.json" } } } } @@ -2005,4 +2065,4 @@ "description": "Client API version." } } -} \ No newline at end of file +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2017-06-01/virtualNetwork.json b/specification/network/resource-manager/Microsoft.Network/stable/2017-06-01/virtualNetwork.json index a9393c41c8e0..d25175d64a62 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2017-06-01/virtualNetwork.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2017-06-01/virtualNetwork.json @@ -190,6 +190,9 @@ }, "Create virtual network with subnet": { "$ref": "./examples/VirtualNetworkCreateSubnet.json" + }, + "Create virtual network with service endpoints": { + "$ref": "./examples/VirtualNetworkCreateServiceEndpoints.json" } } } @@ -1219,4 +1222,4 @@ "description": "Client API version." } } -} \ No newline at end of file +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2017-08-01/loadBalancer.json b/specification/network/resource-manager/Microsoft.Network/stable/2017-08-01/loadBalancer.json index b4756fa12567..0697dbb0ad70 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2017-08-01/loadBalancer.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2017-08-01/loadBalancer.json @@ -180,7 +180,9 @@ } }, "x-ms-examples": { - "Create load balancer": { "$ref": "./examples/LoadBalancerCreate.json" } + "Create load balancer": { "$ref": "./examples/LoadBalancerCreate.json" }, + "Create load balancer with Standard SKU": { "$ref": "./examples/LoadBalancerCreateStandardSku.json" }, + "Create load balancer with Frontend IP in Zone 1": { "$ref": "./examples/LoadBalancerCreateWithZones.json" } }, "x-ms-long-running-operation": true } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2017-09-01/loadBalancer.json b/specification/network/resource-manager/Microsoft.Network/stable/2017-09-01/loadBalancer.json index d1b488130aad..6a38479b62b8 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2017-09-01/loadBalancer.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2017-09-01/loadBalancer.json @@ -180,7 +180,9 @@ } }, "x-ms-examples": { - "Create load balancer": { "$ref": "./examples/LoadBalancerCreate.json" } + "Create load balancer": { "$ref": "./examples/LoadBalancerCreate.json" }, + "Create load balancer with Standard SKU": { "$ref": "./examples/LoadBalancerCreateStandardSku.json" }, + "Create load balancer with Frontend IP in Zone 1": { "$ref": "./examples/LoadBalancerCreateWithZones.json" } }, "x-ms-long-running-operation": true }, diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2017-09-01/networkWatcher.json b/specification/network/resource-manager/Microsoft.Network/stable/2017-09-01/networkWatcher.json index 729305e5cb37..ab6a3b50df2f 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2017-09-01/networkWatcher.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2017-09-01/networkWatcher.json @@ -87,6 +87,9 @@ "$ref": "#/definitions/NetworkWatcher" } } + }, + "x-ms-examples": { + "Create network watcher": { "$ref": "./examples/NetworkWatcherCreate.json" } } }, "get": { @@ -124,6 +127,9 @@ "$ref": "#/definitions/NetworkWatcher" } } + }, + "x-ms-examples": { + "Get network watcher": { "$ref": "./examples/NetworkWatcherGet.json" } } }, "delete": { @@ -162,6 +168,9 @@ "204": { "description": "Delete successful." } + }, + "x-ms-examples": { + "Delete network watcher": { "$ref": "./examples/NetworkWatcherDelete.json" } } }, "patch": { @@ -246,6 +255,9 @@ }, "x-ms-pageable": { "nextLinkName": null + }, + "x-ms-examples": { + "List network watchers": { "$ref": "./examples/NetworkWatcherList.json" } } } }, @@ -274,6 +286,9 @@ }, "x-ms-pageable": { "nextLinkName": null + }, + "x-ms-examples": { + "List all network watchers": { "$ref": "./examples/NetworkWatcherListAll.json" } } } }, @@ -322,6 +337,11 @@ "$ref": "#/definitions/Topology" } } + }, + "x-ms-examples": { + "Get Topology": { + "$ref": "./examples/NetworkWatcherTopologyGet.json" + } } } }, @@ -377,6 +397,9 @@ "$ref": "#/definitions/VerificationIPFlowResult" } } + }, + "x-ms-examples": { + "Ip flow verify": { "$ref": "./examples/NetworkWatcherIpFlowVerify.json" } } } }, @@ -432,6 +455,9 @@ "$ref": "#/definitions/NextHopResult" } } + }, + "x-ms-examples": { + "Get next hop": { "$ref": "./examples/NetworkWatcherNextHopGet.json" } } } }, @@ -487,6 +513,9 @@ "$ref": "#/definitions/SecurityGroupViewResult" } } + }, + "x-ms-examples": { + "Get security group view": { "$ref": "./examples/NetworkWatcherSecurityGroupViewGet.json" } } } }, @@ -543,6 +572,9 @@ "$ref": "#/definitions/PacketCaptureResult" } } + }, + "x-ms-examples": { + "Create packet capture": { "$ref": "./examples/NetworkWatcherPacketCaptureCreate.json" } } }, "get": { @@ -587,6 +619,9 @@ "$ref": "#/definitions/PacketCaptureResult" } } + }, + "x-ms-examples": { + "Get packet capture": { "$ref": "./examples/NetworkWatcherPacketCaptureGet.json" } } }, "delete": { @@ -632,6 +667,9 @@ "202": { "description": "Accepted and the operation will complete asynchronously." } + }, + "x-ms-examples": { + "Delete packet capture": { "$ref": "./examples/NetworkWatcherPacketCaptureDelete.json" } } } }, @@ -679,6 +717,9 @@ "202": { "description": "Accepted and the operation will complete asynchronously." } + }, + "x-ms-examples": { + "Stop packet capture": { "$ref": "./examples/NetworkWatcherPacketCaptureStop.json" } } } }, @@ -735,6 +776,9 @@ "$ref": "#/definitions/PacketCaptureQueryStatusResult" } } + }, + "x-ms-examples": { + "Query packet capture status": { "$ref": "./examples/NetworkWatcherPacketCaptureQueryStatus.json" } } } }, @@ -777,6 +821,9 @@ }, "x-ms-pageable": { "nextLinkName": null + }, + "x-ms-examples": { + "List packet captures": { "$ref": "./examples/NetworkWatcherPacketCapturesList.json" } } } }, @@ -832,6 +879,9 @@ "$ref": "#/definitions/TroubleshootingResult" } } + }, + "x-ms-examples": { + "Get troubleshooting": { "$ref": "./examples/NetworkWatcherTroubleshootGet.json" } } } }, @@ -887,6 +937,9 @@ "$ref": "#/definitions/TroubleshootingResult" } } + }, + "x-ms-examples": { + "Get troubleshoot result": { "$ref": "./examples/NetworkWatcherTroubleshootResultQuery.json" } } } }, @@ -942,6 +995,9 @@ "$ref": "#/definitions/FlowLogInformation" } } + }, + "x-ms-examples": { + "Configure flow log": { "$ref": "./examples/NetworkWatcherFlowLogConfigure.json" } } } }, @@ -997,6 +1053,9 @@ "$ref": "#/definitions/FlowLogInformation" } } + }, + "x-ms-examples": { + "Get flow log status": { "$ref": "./examples/NetworkWatcherFlowLogStatusQuery.json" } } } }, @@ -1052,6 +1111,9 @@ "$ref": "#/definitions/ConnectivityInformation" } } + }, + "x-ms-examples": { + "Check connectivity": { "$ref": "./examples/NetworkWatcherConnectivityCheck.json" } } } }, diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2017-10-01/examples/NetworkWatcherConnectionMonitorDelete.json b/specification/network/resource-manager/Microsoft.Network/stable/2017-10-01/examples/NetworkWatcherConnectionMonitorDelete.json new file mode 100644 index 000000000000..4e237ea96af7 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2017-10-01/examples/NetworkWatcherConnectionMonitorDelete.json @@ -0,0 +1,13 @@ +{ + "parameters": { + "api-version": "2017-10-01", + "subscriptionId": "subid", + "resourceGroupName": "rg1", + "networkWatcherName": "nw1", + "connectionMonitorName": "cm1" + }, + "responses": { + "204": {}, + "202": {} + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2017-10-01/loadBalancer.json b/specification/network/resource-manager/Microsoft.Network/stable/2017-10-01/loadBalancer.json index c4478201f031..8798611bee13 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2017-10-01/loadBalancer.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2017-10-01/loadBalancer.json @@ -180,7 +180,9 @@ } }, "x-ms-examples": { - "Create load balancer": { "$ref": "./examples/LoadBalancerCreate.json" } + "Create load balancer": { "$ref": "./examples/LoadBalancerCreate.json" }, + "Create load balancer with Standard SKU": { "$ref": "./examples/LoadBalancerCreateStandardSku.json" }, + "Create load balancer with Frontend IP in Zone 1": { "$ref": "./examples/LoadBalancerCreateWithZones.json" } }, "x-ms-long-running-operation": true }, diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2017-10-01/networkWatcher.json b/specification/network/resource-manager/Microsoft.Network/stable/2017-10-01/networkWatcher.json index dcada8cb3720..81a677b33ed9 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2017-10-01/networkWatcher.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2017-10-01/networkWatcher.json @@ -87,6 +87,9 @@ "$ref": "#/definitions/NetworkWatcher" } } + }, + "x-ms-examples": { + "Create network watcher": { "$ref": "./examples/NetworkWatcherCreate.json" } } }, "get": { @@ -124,6 +127,9 @@ "$ref": "#/definitions/NetworkWatcher" } } + }, + "x-ms-examples": { + "Get network watcher": { "$ref": "./examples/NetworkWatcherGet.json" } } }, "delete": { @@ -162,6 +168,9 @@ "204": { "description": "Delete successful." } + }, + "x-ms-examples": { + "Delete network watcher": { "$ref": "./examples/NetworkWatcherDelete.json" } } }, "patch": { @@ -246,6 +255,9 @@ }, "x-ms-pageable": { "nextLinkName": null + }, + "x-ms-examples": { + "List network watchers": { "$ref": "./examples/NetworkWatcherList.json" } } } }, @@ -274,6 +286,9 @@ }, "x-ms-pageable": { "nextLinkName": null + }, + "x-ms-examples": { + "List all network watchers": { "$ref": "./examples/NetworkWatcherListAll.json" } } } }, @@ -382,6 +397,9 @@ "$ref": "#/definitions/VerificationIPFlowResult" } } + }, + "x-ms-examples": { + "Ip flow verify": { "$ref": "./examples/NetworkWatcherIpFlowVerify.json" } } } }, @@ -437,6 +455,9 @@ "$ref": "#/definitions/NextHopResult" } } + }, + "x-ms-examples": { + "Get next hop": { "$ref": "./examples/NetworkWatcherNextHopGet.json" } } } }, @@ -492,6 +513,9 @@ "$ref": "#/definitions/SecurityGroupViewResult" } } + }, + "x-ms-examples": { + "Get security group view": { "$ref": "./examples/NetworkWatcherSecurityGroupViewGet.json" } } } }, @@ -548,6 +572,9 @@ "$ref": "#/definitions/PacketCaptureResult" } } + }, + "x-ms-examples": { + "Create packet capture": { "$ref": "./examples/NetworkWatcherPacketCaptureCreate.json" } } }, "get": { @@ -592,6 +619,9 @@ "$ref": "#/definitions/PacketCaptureResult" } } + }, + "x-ms-examples": { + "Get packet capture": { "$ref": "./examples/NetworkWatcherPacketCaptureGet.json" } } }, "delete": { @@ -637,6 +667,9 @@ "202": { "description": "Accepted and the operation will complete asynchronously." } + }, + "x-ms-examples": { + "Delete packet capture": { "$ref": "./examples/NetworkWatcherPacketCaptureDelete.json" } } } }, @@ -684,6 +717,9 @@ "202": { "description": "Accepted and the operation will complete asynchronously." } + }, + "x-ms-examples": { + "Stop packet capture": { "$ref": "./examples/NetworkWatcherPacketCaptureStop.json" } } } }, @@ -740,6 +776,9 @@ "$ref": "#/definitions/PacketCaptureQueryStatusResult" } } + }, + "x-ms-examples": { + "Query packet capture status": { "$ref": "./examples/NetworkWatcherPacketCaptureQueryStatus.json" } } } }, @@ -782,6 +821,9 @@ }, "x-ms-pageable": { "nextLinkName": null + }, + "x-ms-examples": { + "List packet captures": { "$ref": "./examples/NetworkWatcherPacketCapturesList.json" } } } }, @@ -837,6 +879,9 @@ "$ref": "#/definitions/TroubleshootingResult" } } + }, + "x-ms-examples": { + "Get troubleshooting": { "$ref": "./examples/NetworkWatcherTroubleshootGet.json" } } } }, @@ -892,6 +937,9 @@ "$ref": "#/definitions/TroubleshootingResult" } } + }, + "x-ms-examples": { + "Get troubleshoot result": { "$ref": "./examples/NetworkWatcherTroubleshootResultQuery.json" } } } }, @@ -947,6 +995,9 @@ "$ref": "#/definitions/FlowLogInformation" } } + }, + "x-ms-examples": { + "Configure flow log": { "$ref": "./examples/NetworkWatcherFlowLogConfigure.json" } } } }, @@ -1002,6 +1053,9 @@ "$ref": "#/definitions/FlowLogInformation" } } + }, + "x-ms-examples": { + "Get flow log status": { "$ref": "./examples/NetworkWatcherFlowLogStatusQuery.json" } } } }, @@ -1057,6 +1111,9 @@ "$ref": "#/definitions/ConnectivityInformation" } } + }, + "x-ms-examples": { + "Check connectivity": { "$ref": "./examples/NetworkWatcherConnectivityCheck.json" } } } }, @@ -1239,6 +1296,9 @@ "$ref": "#/definitions/ConnectionMonitorResult" } } + }, + "x-ms-examples": { + "Create connection monitor": { "$ref": "./examples/NetworkWatcherConnectionMonitorCreate.json" } } }, "get": { @@ -1283,6 +1343,9 @@ "$ref": "#/definitions/ConnectionMonitorResult" } } + }, + "x-ms-examples": { + "Get connection monitor": { "$ref": "./examples/NetworkWatcherConnectionMonitorGet.json" } } }, "delete": { @@ -1328,6 +1391,9 @@ "202": { "description": "Accepted. The operation will complete asynchronously." } + }, + "x-ms-examples": { + "Delete connection monitor": { "$ref": "./examples/NetworkWatcherConnectionMonitorDelete.json" } } } }, @@ -1375,6 +1441,9 @@ "202": { "description": "Accepted. The operation will complete asynchronously." } + }, + "x-ms-examples": { + "Stop connection monitor": { "$ref": "./examples/NetworkWatcherConnectionMonitorStop.json" } } } }, @@ -1422,6 +1491,9 @@ "202": { "description": "Accepted. The operation will complete asynchronously." } + }, + "x-ms-examples": { + "Start connection monitor": { "$ref": "./examples/NetworkWatcherConnectionMonitorStart.json" } } } }, @@ -1475,6 +1547,9 @@ "$ref": "#/definitions/ConnectionMonitorQueryResult" } } + }, + "x-ms-examples": { + "Query connection monitor": { "$ref": "./examples/NetworkWatcherConnectionMonitorQuery.json" } } } }, @@ -1517,6 +1592,9 @@ }, "x-ms-pageable": { "nextLinkName": null + }, + "x-ms-examples": { + "List connection monitors": { "$ref": "./examples/NetworkWatcherConnectionMonitorList.json" } } } } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2017-11-01/loadBalancer.json b/specification/network/resource-manager/Microsoft.Network/stable/2017-11-01/loadBalancer.json index cc3803e932f3..662ba231a716 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2017-11-01/loadBalancer.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2017-11-01/loadBalancer.json @@ -181,6 +181,8 @@ }, "x-ms-examples": { "Create load balancer": { "$ref": "./examples/LoadBalancerCreate.json" }, + "Create load balancer with Standard SKU": { "$ref": "./examples/LoadBalancerCreateStandardSku.json" }, + "Create load balancer with Frontend IP in Zone 1": { "$ref": "./examples/LoadBalancerCreateWithZones.json" }, "Create load balancer with inbound nat pool": { "$ref": "./examples/LoadBalancerCreateWithInboundNatPool.json" } }, "x-ms-long-running-operation": true diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/loadBalancer.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/loadBalancer.json index c236645b6613..780149ea2cbe 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/loadBalancer.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-01-01/loadBalancer.json @@ -181,6 +181,8 @@ }, "x-ms-examples": { "Create load balancer": { "$ref": "./examples/LoadBalancerCreate.json" }, + "Create load balancer with Standard SKU": { "$ref": "./examples/LoadBalancerCreateStandardSku.json" }, + "Create load balancer with Frontend IP in Zone 1": { "$ref": "./examples/LoadBalancerCreateWithZones.json" }, "Create load balancer with inbound nat pool": { "$ref": "./examples/LoadBalancerCreateWithInboundNatPool.json" } }, "x-ms-long-running-operation": true diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-02-01/examples/NetworkWatcherConnectionMonitorDelete.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-02-01/examples/NetworkWatcherConnectionMonitorDelete.json new file mode 100644 index 000000000000..2f2e569eea87 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-02-01/examples/NetworkWatcherConnectionMonitorDelete.json @@ -0,0 +1,13 @@ +{ + "parameters": { + "api-version": "2018-02-01", + "subscriptionId": "subid", + "resourceGroupName": "rg1", + "networkWatcherName": "nw1", + "connectionMonitorName": "cm1" + }, + "responses": { + "204": {}, + "202": {} + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-02-01/loadBalancer.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-02-01/loadBalancer.json index 4eca08ecf581..19b59f29129b 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-02-01/loadBalancer.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-02-01/loadBalancer.json @@ -181,6 +181,8 @@ }, "x-ms-examples": { "Create load balancer": { "$ref": "./examples/LoadBalancerCreate.json" }, + "Create load balancer with Standard SKU": { "$ref": "./examples/LoadBalancerCreateStandardSku.json" }, + "Create load balancer with Frontend IP in Zone 1": { "$ref": "./examples/LoadBalancerCreateWithZones.json" }, "Create load balancer with inbound nat pool": { "$ref": "./examples/LoadBalancerCreateWithInboundNatPool.json" } }, "x-ms-long-running-operation": true diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-02-01/networkWatcher.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-02-01/networkWatcher.json index 271b73c2c21d..358a820cf612 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-02-01/networkWatcher.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-02-01/networkWatcher.json @@ -87,6 +87,9 @@ "$ref": "#/definitions/NetworkWatcher" } } + }, + "x-ms-examples": { + "Create network watcher": { "$ref": "./examples/NetworkWatcherCreate.json" } } }, "get": { @@ -124,6 +127,9 @@ "$ref": "#/definitions/NetworkWatcher" } } + }, + "x-ms-examples": { + "Get network watcher": { "$ref": "./examples/NetworkWatcherGet.json" } } }, "delete": { @@ -162,6 +168,9 @@ "204": { "description": "Delete successful." } + }, + "x-ms-examples": { + "Delete network watcher": { "$ref": "./examples/NetworkWatcherDelete.json" } } }, "patch": { @@ -246,6 +255,9 @@ }, "x-ms-pageable": { "nextLinkName": null + }, + "x-ms-examples": { + "List network watchers": { "$ref": "./examples/NetworkWatcherList.json" } } } }, @@ -274,6 +286,9 @@ }, "x-ms-pageable": { "nextLinkName": null + }, + "x-ms-examples": { + "List all network watchers": { "$ref": "./examples/NetworkWatcherListAll.json" } } } }, @@ -382,6 +397,9 @@ "$ref": "#/definitions/VerificationIPFlowResult" } } + }, + "x-ms-examples": { + "Ip flow verify": { "$ref": "./examples/NetworkWatcherIpFlowVerify.json" } } } }, @@ -437,6 +455,9 @@ "$ref": "#/definitions/NextHopResult" } } + }, + "x-ms-examples": { + "Get next hop": { "$ref": "./examples/NetworkWatcherNextHopGet.json" } } } }, @@ -492,6 +513,9 @@ "$ref": "#/definitions/SecurityGroupViewResult" } } + }, + "x-ms-examples": { + "Get security group view": { "$ref": "./examples/NetworkWatcherSecurityGroupViewGet.json" } } } }, @@ -548,6 +572,9 @@ "$ref": "#/definitions/PacketCaptureResult" } } + }, + "x-ms-examples": { + "Create packet capture": { "$ref": "./examples/NetworkWatcherPacketCaptureCreate.json" } } }, "get": { @@ -592,6 +619,9 @@ "$ref": "#/definitions/PacketCaptureResult" } } + }, + "x-ms-examples": { + "Get packet capture": { "$ref": "./examples/NetworkWatcherPacketCaptureGet.json" } } }, "delete": { @@ -637,6 +667,9 @@ "202": { "description": "Accepted and the operation will complete asynchronously." } + }, + "x-ms-examples": { + "Delete packet capture": { "$ref": "./examples/NetworkWatcherPacketCaptureDelete.json" } } } }, @@ -684,6 +717,9 @@ "202": { "description": "Accepted and the operation will complete asynchronously." } + }, + "x-ms-examples": { + "Stop packet capture": { "$ref": "./examples/NetworkWatcherPacketCaptureStop.json" } } } }, @@ -740,6 +776,9 @@ "$ref": "#/definitions/PacketCaptureQueryStatusResult" } } + }, + "x-ms-examples": { + "Query packet capture status": { "$ref": "./examples/NetworkWatcherPacketCaptureQueryStatus.json" } } } }, @@ -782,6 +821,9 @@ }, "x-ms-pageable": { "nextLinkName": null + }, + "x-ms-examples": { + "List packet captures": { "$ref": "./examples/NetworkWatcherPacketCapturesList.json" } } } }, @@ -837,6 +879,9 @@ "$ref": "#/definitions/TroubleshootingResult" } } + }, + "x-ms-examples": { + "Get troubleshooting": { "$ref": "./examples/NetworkWatcherTroubleshootGet.json" } } } }, @@ -892,6 +937,9 @@ "$ref": "#/definitions/TroubleshootingResult" } } + }, + "x-ms-examples": { + "Get troubleshoot result": { "$ref": "./examples/NetworkWatcherTroubleshootResultQuery.json" } } } }, @@ -947,6 +995,9 @@ "$ref": "#/definitions/FlowLogInformation" } } + }, + "x-ms-examples": { + "Configure flow log": { "$ref": "./examples/NetworkWatcherFlowLogConfigure.json" } } } }, @@ -1002,6 +1053,9 @@ "$ref": "#/definitions/FlowLogInformation" } } + }, + "x-ms-examples": { + "Get flow log status": { "$ref": "./examples/NetworkWatcherFlowLogStatusQuery.json" } } } }, @@ -1057,6 +1111,9 @@ "$ref": "#/definitions/ConnectivityInformation" } } + }, + "x-ms-examples": { + "Check connectivity": { "$ref": "./examples/NetworkWatcherConnectivityCheck.json" } } } }, @@ -1239,6 +1296,9 @@ "$ref": "#/definitions/ConnectionMonitorResult" } } + }, + "x-ms-examples": { + "Create connection monitor": { "$ref": "./examples/NetworkWatcherConnectionMonitorCreate.json" } } }, "get": { @@ -1283,6 +1343,9 @@ "$ref": "#/definitions/ConnectionMonitorResult" } } + }, + "x-ms-examples": { + "Get connection monitor": { "$ref": "./examples/NetworkWatcherConnectionMonitorGet.json" } } }, "delete": { @@ -1328,6 +1391,9 @@ "202": { "description": "Accepted. The operation will complete asynchronously." } + }, + "x-ms-examples": { + "Delete connection monitor": { "$ref": "./examples/NetworkWatcherConnectionMonitorDelete.json" } } } }, @@ -1375,6 +1441,9 @@ "202": { "description": "Accepted. The operation will complete asynchronously." } + }, + "x-ms-examples": { + "Stop connection monitor": { "$ref": "./examples/NetworkWatcherConnectionMonitorStop.json" } } } }, @@ -1422,6 +1491,9 @@ "202": { "description": "Accepted. The operation will complete asynchronously." } + }, + "x-ms-examples": { + "Start connection monitor": { "$ref": "./examples/NetworkWatcherConnectionMonitorStart.json" } } } }, @@ -1475,6 +1547,9 @@ "$ref": "#/definitions/ConnectionMonitorQueryResult" } } + }, + "x-ms-examples": { + "Query connection monitor": { "$ref": "./examples/NetworkWatcherConnectionMonitorQuery.json" } } } }, @@ -1517,6 +1592,9 @@ }, "x-ms-pageable": { "nextLinkName": null + }, + "x-ms-examples": { + "List connection monitors": { "$ref": "./examples/NetworkWatcherConnectionMonitorList.json" } } } } @@ -3050,4 +3128,4 @@ "description": "Client API version." } } -} \ No newline at end of file +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-04-01/examples/HubVirtualNetworkConnectionDelete.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-04-01/examples/HubVirtualNetworkConnectionDelete.json deleted file mode 100644 index c0e167e880c1..000000000000 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-04-01/examples/HubVirtualNetworkConnectionDelete.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parameters": { - "connectionName": "connection1", - "virtualHubName": "virtualHub1", - "resourceGroupName": "rg1", - "api-version": "2018-04-01", - "subscriptionId": "subid" - }, - "responses": { - "200": { }, - "202": { }, - "204": { } - } -} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-04-01/examples/HubVirtualNetworkConnectionPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-04-01/examples/HubVirtualNetworkConnectionPut.json deleted file mode 100644 index 477754977bca..000000000000 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-04-01/examples/HubVirtualNetworkConnectionPut.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "parameters": { - "connectionName": "connection1", - "virtualHubName": "virtualHub1", - "resourceGroupName": "rg1", - "api-version": "2018-04-01", - "subscriptionId": "subid", - "hubVirtualNetworkConnectionParameters": { - "properties": { - "remoteVirtualNetwork": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet1" - }, - "allowHubToRemoteVnetTransit": true, - "allowRemoteVnetToUseHubVnetGateways": false - } - } - }, - "responses": { - "200": { - "body": [ - { - "name": "connection1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsofot.Network/virtualHubs/virtualHub1/virtualHubVnetConnections/connection1", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "properties": { - "provisioningState": "Succeeded", - "remoteVirtualNetwork": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsofot.Network/virtualNetworks/vnet1" - }, - "allowHubToRemoteVnetTransit": true, - "allowRemoteVnetToUseHubVnetGateways": false - } - } - ] - }, - "201": { - "body": [ - { - "name": "connection1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsofot.Network/virtualHubs/virtualHub1/virtualHubVnetConnections/connection1", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "properties": { - "provisioningState": "Succeeded", - "remoteVirtualNetwork": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsofot.Network/virtualNetworks/vnet1" - }, - "allowHubToRemoteVnetTransit": true, - "allowRemoteVnetToUseHubVnetGateways": false - } - } - ] - } - } -} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-04-01/loadBalancer.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-04-01/loadBalancer.json index 716fc3ee1085..080e4dfe092b 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-04-01/loadBalancer.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-04-01/loadBalancer.json @@ -179,6 +179,8 @@ }, "x-ms-examples": { "Create load balancer": { "$ref": "./examples/LoadBalancerCreate.json" }, + "Create load balancer with Standard SKU": { "$ref": "./examples/LoadBalancerCreateStandardSku.json" }, + "Create load balancer with Frontend IP in Zone 1": { "$ref": "./examples/LoadBalancerCreateWithZones.json" }, "Create load balancer with inbound nat pool": { "$ref": "./examples/LoadBalancerCreateWithInboundNatPool.json" } }, "x-ms-long-running-operation": true diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-06-01/examples/HubVirtualNetworkConnectionDelete.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-06-01/examples/HubVirtualNetworkConnectionDelete.json deleted file mode 100644 index 53841d82a41d..000000000000 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-06-01/examples/HubVirtualNetworkConnectionDelete.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parameters": { - "connectionName": "connection1", - "virtualHubName": "virtualHub1", - "resourceGroupName": "rg1", - "api-version": "2018-06-01", - "subscriptionId": "subid" - }, - "responses": { - "200": { }, - "202": { }, - "204": { } - } -} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-06-01/examples/HubVirtualNetworkConnectionPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-06-01/examples/HubVirtualNetworkConnectionPut.json deleted file mode 100644 index ff8874ad2a00..000000000000 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-06-01/examples/HubVirtualNetworkConnectionPut.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "parameters": { - "connectionName": "connection1", - "virtualHubName": "virtualHub1", - "resourceGroupName": "rg1", - "api-version": "2018-06-01", - "subscriptionId": "subid", - "hubVirtualNetworkConnectionParameters": { - "properties": { - "remoteVirtualNetwork": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet1" - }, - "allowHubToRemoteVnetTransit": true, - "allowRemoteVnetToUseHubVnetGateways": false - } - } - }, - "responses": { - "200": { - "body": [ - { - "name": "connection1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsofot.Network/virtualHubs/virtualHub1/virtualHubVnetConnections/connection1", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "properties": { - "provisioningState": "Succeeded", - "remoteVirtualNetwork": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsofot.Network/virtualNetworks/vnet1" - }, - "allowHubToRemoteVnetTransit": true, - "allowRemoteVnetToUseHubVnetGateways": false - } - } - ] - }, - "201": { - "body": [ - { - "name": "connection1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsofot.Network/virtualHubs/virtualHub1/virtualHubVnetConnections/connection1", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "properties": { - "provisioningState": "Succeeded", - "remoteVirtualNetwork": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsofot.Network/virtualNetworks/vnet1" - }, - "allowHubToRemoteVnetTransit": true, - "allowRemoteVnetToUseHubVnetGateways": false - } - } - ] - } - } -} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-06-01/loadBalancer.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-06-01/loadBalancer.json index 6ee49fb09afa..12c56bda2e4d 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-06-01/loadBalancer.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-06-01/loadBalancer.json @@ -179,6 +179,8 @@ }, "x-ms-examples": { "Create load balancer": { "$ref": "./examples/LoadBalancerCreate.json" }, + "Create load balancer with Standard SKU": { "$ref": "./examples/LoadBalancerCreateStandardSku.json" }, + "Create load balancer with Frontend IP in Zone 1": { "$ref": "./examples/LoadBalancerCreateWithZones.json" }, "Create load balancer with inbound nat pool": { "$ref": "./examples/LoadBalancerCreateWithInboundNatPool.json" } }, "x-ms-long-running-operation": true diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-07-01/examples/HubVirtualNetworkConnectionDelete.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-07-01/examples/HubVirtualNetworkConnectionDelete.json deleted file mode 100644 index 6377f7bbcf4a..000000000000 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-07-01/examples/HubVirtualNetworkConnectionDelete.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parameters": { - "connectionName": "connection1", - "virtualHubName": "virtualHub1", - "resourceGroupName": "rg1", - "api-version": "2018-07-01", - "subscriptionId": "subid" - }, - "responses": { - "200": { }, - "202": { }, - "204": { } - } -} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-07-01/examples/HubVirtualNetworkConnectionPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-07-01/examples/HubVirtualNetworkConnectionPut.json deleted file mode 100644 index d76fcda7dc1c..000000000000 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-07-01/examples/HubVirtualNetworkConnectionPut.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "parameters": { - "connectionName": "connection1", - "virtualHubName": "virtualHub1", - "resourceGroupName": "rg1", - "api-version": "2018-07-01", - "subscriptionId": "subid", - "hubVirtualNetworkConnectionParameters": { - "properties": { - "remoteVirtualNetwork": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet1" - }, - "allowHubToRemoteVnetTransit": true, - "allowRemoteVnetToUseHubVnetGateways": false - } - } - }, - "responses": { - "200": { - "body": [ - { - "name": "connection1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsofot.Network/virtualHubs/virtualHub1/virtualHubVnetConnections/connection1", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "properties": { - "provisioningState": "Succeeded", - "remoteVirtualNetwork": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsofot.Network/virtualNetworks/vnet1" - }, - "allowHubToRemoteVnetTransit": true, - "allowRemoteVnetToUseHubVnetGateways": false - } - } - ] - }, - "201": { - "body": [ - { - "name": "connection1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsofot.Network/virtualHubs/virtualHub1/virtualHubVnetConnections/connection1", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "properties": { - "provisioningState": "Succeeded", - "remoteVirtualNetwork": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsofot.Network/virtualNetworks/vnet1" - }, - "allowHubToRemoteVnetTransit": true, - "allowRemoteVnetToUseHubVnetGateways": false - } - } - ] - } - } -} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-07-01/examples/VirtualNetworkCreateServiceEndpointPolicy.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-07-01/examples/VirtualNetworkCreateServiceEndpointPolicy.json index 42752bfeac0f..1d34853b3156 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-07-01/examples/VirtualNetworkCreateServiceEndpointPolicy.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-07-01/examples/VirtualNetworkCreateServiceEndpointPolicy.json @@ -1,6 +1,6 @@ { "parameters" : { - "api-version": "2018-06-01", + "api-version": "2018-07-01", "subscriptionId" : "subid", "resourceGroupName" : "vnetTest", "virtualNetworkName" : "vnet1", @@ -20,6 +20,11 @@ { "service": "Microsoft.Storage" } + ], + "serviceEndpointPolicies": [ + { + "id": "/subscriptions/subid/resourceGroups/vnetTest/providers/Microsoft.Network/serviceEndpointPolicies/ServiceEndpointPolicy1" + } ] } } @@ -46,6 +51,7 @@ { "name": "test-1", "id": "/subscriptions/subid/resourceGroups/vnetTest/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/test-1", + "type": "Microsoft.Network/virtualNetworks/subnets", "properties": { "addressPrefix": "10.0.0.0/16", "ipConfigurations": [], @@ -60,6 +66,11 @@ ] } ], + "serviceEndpointPolicies": [ + { + "id": "/subscriptions/subid/resourceGroups/vnetTest/providers/Microsoft.Network/serviceEndpointPolicies/ServiceEndpointPolicy1" + } + ], "provisioningState": "Succeeded" } } @@ -85,6 +96,7 @@ { "name": "test-1", "id": "/subscriptions/subid/resourceGroups/vnetTest/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/test-1", + "type": "Microsoft.Network/virtualNetworks/subnets", "properties": { "addressPrefix": "10.0.0.0/16", "ipConfigurations": [], @@ -101,12 +113,7 @@ ], "serviceEndpointPolicies": [ { - "provisioningState": "Succeeded", - "service": "Microsoft.Storage", - "locations": [ - "eastus2(stage)", - "usnorth(stage)" - ] + "id": "/subscriptions/subid/resourceGroups/vnetTest/providers/Microsoft.Network/serviceEndpointPolicies/ServiceEndpointPolicy1" } ], "provisioningState": "Succeeded" diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-07-01/loadBalancer.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-07-01/loadBalancer.json index 875910451b83..34c5898d6718 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-07-01/loadBalancer.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-07-01/loadBalancer.json @@ -179,6 +179,8 @@ }, "x-ms-examples": { "Create load balancer": { "$ref": "./examples/LoadBalancerCreate.json" }, + "Create load balancer with Standard SKU": { "$ref": "./examples/LoadBalancerCreateStandardSku.json" }, + "Create load balancer with Frontend IP in Zone 1": { "$ref": "./examples/LoadBalancerCreateWithZones.json" }, "Create load balancer with inbound nat pool": { "$ref": "./examples/LoadBalancerCreateWithInboundNatPool.json" } }, "x-ms-long-running-operation": true @@ -1439,13 +1441,13 @@ "provisioningState": { "type": "string", "description": "Gets the provisioning state of the PublicIP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'." - }, + }, "protocol": { "type": "string", "description": "Protocol - TCP, UDP or All", "enum": [ "Tcp", - "Udp", + "Udp", "All" ] }, @@ -1459,8 +1461,8 @@ } }, "required": [ - "backendAddressPool", - "frontendIPConfigurations", + "backendAddressPool", + "frontendIPConfigurations", "protocol" ], "description": "Outbound pool of the load balancer." diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/HubVirtualNetworkConnectionDelete.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/HubVirtualNetworkConnectionDelete.json deleted file mode 100644 index 0266b6256458..000000000000 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/HubVirtualNetworkConnectionDelete.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parameters": { - "connectionName": "connection1", - "virtualHubName": "virtualHub1", - "resourceGroupName": "rg1", - "api-version": "2018-08-01", - "subscriptionId": "subid" - }, - "responses": { - "200": { }, - "202": { }, - "204": { } - } -} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/HubVirtualNetworkConnectionPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/HubVirtualNetworkConnectionPut.json deleted file mode 100644 index 4c72c5fa764a..000000000000 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/HubVirtualNetworkConnectionPut.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "parameters": { - "connectionName": "connection1", - "virtualHubName": "virtualHub1", - "resourceGroupName": "rg1", - "api-version": "2018-08-01", - "subscriptionId": "subid", - "hubVirtualNetworkConnectionParameters": { - "properties": { - "remoteVirtualNetwork": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet1" - }, - "allowHubToRemoteVnetTransit": true, - "allowRemoteVnetToUseHubVnetGateways": false - } - } - }, - "responses": { - "200": { - "body": [ - { - "name": "connection1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsofot.Network/virtualHubs/virtualHub1/virtualHubVnetConnections/connection1", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "properties": { - "provisioningState": "Succeeded", - "remoteVirtualNetwork": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsofot.Network/virtualNetworks/vnet1" - }, - "allowHubToRemoteVnetTransit": true, - "allowRemoteVnetToUseHubVnetGateways": false - } - } - ] - }, - "201": { - "body": [ - { - "name": "connection1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsofot.Network/virtualHubs/virtualHub1/virtualHubVnetConnections/connection1", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "properties": { - "provisioningState": "Succeeded", - "remoteVirtualNetwork": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsofot.Network/virtualNetworks/vnet1" - }, - "allowHubToRemoteVnetTransit": true, - "allowRemoteVnetToUseHubVnetGateways": false - } - } - ] - } - } -} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/VirtualNetworkCreateServiceEndpointPolicy.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/VirtualNetworkCreateServiceEndpointPolicy.json index 42752bfeac0f..71ea83b50b42 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/VirtualNetworkCreateServiceEndpointPolicy.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/examples/VirtualNetworkCreateServiceEndpointPolicy.json @@ -1,6 +1,6 @@ { "parameters" : { - "api-version": "2018-06-01", + "api-version": "2018-08-01", "subscriptionId" : "subid", "resourceGroupName" : "vnetTest", "virtualNetworkName" : "vnet1", @@ -20,6 +20,11 @@ { "service": "Microsoft.Storage" } + ], + "serviceEndpointPolicies": [ + { + "id": "/subscriptions/subid/resourceGroups/vnetTest/providers/Microsoft.Network/serviceEndpointPolicies/ServiceEndpointPolicy1" + } ] } } @@ -46,6 +51,7 @@ { "name": "test-1", "id": "/subscriptions/subid/resourceGroups/vnetTest/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/test-1", + "type": "Microsoft.Network/virtualNetworks/subnets", "properties": { "addressPrefix": "10.0.0.0/16", "ipConfigurations": [], @@ -60,6 +66,11 @@ ] } ], + "serviceEndpointPolicies": [ + { + "id": "/subscriptions/subid/resourceGroups/vnetTest/providers/Microsoft.Network/serviceEndpointPolicies/ServiceEndpointPolicy1" + } + ], "provisioningState": "Succeeded" } } @@ -85,6 +96,7 @@ { "name": "test-1", "id": "/subscriptions/subid/resourceGroups/vnetTest/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/test-1", + "type": "Microsoft.Network/virtualNetworks/subnets", "properties": { "addressPrefix": "10.0.0.0/16", "ipConfigurations": [], @@ -101,12 +113,7 @@ ], "serviceEndpointPolicies": [ { - "provisioningState": "Succeeded", - "service": "Microsoft.Storage", - "locations": [ - "eastus2(stage)", - "usnorth(stage)" - ] + "id": "/subscriptions/subid/resourceGroups/vnetTest/providers/Microsoft.Network/serviceEndpointPolicies/ServiceEndpointPolicy1" } ], "provisioningState": "Succeeded" diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/expressRouteCircuit.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/expressRouteCircuit.json index eb518eeba43f..0ba3a3f3be71 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/expressRouteCircuit.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/expressRouteCircuit.json @@ -83,7 +83,7 @@ }, "x-ms-long-running-operation": true, "x-ms-examples": { - "Delete ExpressRouteCircuit Authorization": { "$ref": "./examples/ExpressRouteCircuitAuthorizationDelete.json" } + "Delete ExpressRouteCircuit Authorization": { "$ref": "./examples/ExpressRouteCircuitAuthorizationDelete.json" } } }, "get": { @@ -130,7 +130,7 @@ } }, "x-ms-examples": { - "Get ExpressRouteCircuit Authorization": { "$ref": "./examples/ExpressRouteCircuitAuthorizationGet.json" } + "Get ExpressRouteCircuit Authorization": { "$ref": "./examples/ExpressRouteCircuitAuthorizationGet.json" } } }, "put": { @@ -192,8 +192,8 @@ } }, "x-ms-long-running-operation": true, - "x-ms-examples": { - "Create ExpressRouteCircuit Authorization": { "$ref": "./examples/ExpressRouteCircuitAuthorizationCreate.json" } + "x-ms-examples": { + "Create ExpressRouteCircuit Authorization": { "$ref": "./examples/ExpressRouteCircuitAuthorizationCreate.json" } } } }, @@ -237,8 +237,8 @@ "x-ms-pageable": { "nextLinkName": "nextLink" }, - "x-ms-examples": { - "List ExpressRouteCircuit Authorization": { "$ref": "./examples/ExpressRouteCircuitAuthorizationList.json" } + "x-ms-examples": { + "List ExpressRouteCircuit Authorization": { "$ref": "./examples/ExpressRouteCircuitAuthorizationList.json" } } } }, @@ -505,7 +505,7 @@ } }, "x-ms-examples": { - "Delete ExpressRouteCircuit": { "$ref": "./examples/ExpressRouteCircuitConnectionDelete.json" } + "Delete ExpressRouteCircuit": { "$ref": "./examples/ExpressRouteCircuitConnectionDelete.json" } }, "x-ms-long-running-operation": true }, @@ -776,7 +776,8 @@ }, "x-ms-long-running-operation": true, "x-ms-examples": { - "Create ExpressRouteCircuit": { "$ref": "./examples/ExpressRouteCircuitCreate.json" } + "Create ExpressRouteCircuit": { "$ref": "./examples/ExpressRouteCircuitCreate.json" }, + "Create ExpressRouteCircuit on ExpressRoutePort": { "$ref": "./examples/ExpressRouteCircuitCreateOnExpressRoutePort.json" } } }, "patch": { @@ -1168,7 +1169,7 @@ "nextLinkName": "nextLink" }, "x-ms-examples": { - "List ExpressRouteCircuits in a subscription": { "$ref": "./examples/ExpressRouteCircuitListBySubscription.json" } + "List ExpressRouteCircuits in a subscription": { "$ref": "./examples/ExpressRouteCircuitListBySubscription.json" } } } }, @@ -1714,7 +1715,7 @@ "allowGlobalReach": { "type": "boolean", "description": "Flag to enable Global Reach on the circuit." - } + } }, "description": "Properties of ExpressRouteCircuit." }, diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/loadBalancer.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/loadBalancer.json index 8d30a27644cc..71c6a5e6f47f 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/loadBalancer.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-08-01/loadBalancer.json @@ -180,6 +180,8 @@ }, "x-ms-examples": { "Create load balancer": { "$ref": "./examples/LoadBalancerCreate.json" }, + "Create load balancer with Standard SKU": { "$ref": "./examples/LoadBalancerCreateStandardSku.json" }, + "Create load balancer with Frontend IP in Zone 1": { "$ref": "./examples/LoadBalancerCreateWithZones.json" }, "Create load balancer with inbound nat pool": { "$ref": "./examples/LoadBalancerCreateWithInboundNatPool.json" } }, "x-ms-long-running-operation": true @@ -1534,13 +1536,13 @@ "provisioningState": { "type": "string", "description": "Gets the provisioning state of the PublicIP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'." - }, + }, "protocol": { "type": "string", "description": "Protocol - TCP, UDP or All", "enum": [ "Tcp", - "Udp", + "Udp", "All" ] }, diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-10-01/examples/HubVirtualNetworkConnectionDelete.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-10-01/examples/HubVirtualNetworkConnectionDelete.json deleted file mode 100644 index 21b9be0dfbb8..000000000000 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-10-01/examples/HubVirtualNetworkConnectionDelete.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parameters": { - "connectionName": "connection1", - "virtualHubName": "virtualHub1", - "resourceGroupName": "rg1", - "api-version": "2018-10-01", - "subscriptionId": "subid" - }, - "responses": { - "200": { }, - "202": { }, - "204": { } - } -} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-10-01/examples/HubVirtualNetworkConnectionPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-10-01/examples/HubVirtualNetworkConnectionPut.json deleted file mode 100644 index 8a91d0ff750b..000000000000 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-10-01/examples/HubVirtualNetworkConnectionPut.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "parameters": { - "connectionName": "connection1", - "virtualHubName": "virtualHub1", - "resourceGroupName": "rg1", - "api-version": "2018-10-01", - "subscriptionId": "subid", - "hubVirtualNetworkConnectionParameters": { - "properties": { - "remoteVirtualNetwork": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet1" - }, - "allowHubToRemoteVnetTransit": true, - "allowRemoteVnetToUseHubVnetGateways": false - } - } - }, - "responses": { - "200": { - "body": [ - { - "name": "connection1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsofot.Network/virtualHubs/virtualHub1/virtualHubVnetConnections/connection1", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "properties": { - "provisioningState": "Succeeded", - "remoteVirtualNetwork": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsofot.Network/virtualNetworks/vnet1" - }, - "allowHubToRemoteVnetTransit": true, - "allowRemoteVnetToUseHubVnetGateways": false - } - } - ] - }, - "201": { - "body": [ - { - "name": "connection1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsofot.Network/virtualHubs/virtualHub1/virtualHubVnetConnections/connection1", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "properties": { - "provisioningState": "Succeeded", - "remoteVirtualNetwork": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsofot.Network/virtualNetworks/vnet1" - }, - "allowHubToRemoteVnetTransit": true, - "allowRemoteVnetToUseHubVnetGateways": false - } - } - ] - } - } -} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-10-01/examples/VirtualNetworkCreateServiceEndpointPolicy.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-10-01/examples/VirtualNetworkCreateServiceEndpointPolicy.json index 42752bfeac0f..2d40408026a9 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-10-01/examples/VirtualNetworkCreateServiceEndpointPolicy.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-10-01/examples/VirtualNetworkCreateServiceEndpointPolicy.json @@ -1,6 +1,6 @@ { "parameters" : { - "api-version": "2018-06-01", + "api-version": "2018-10-01", "subscriptionId" : "subid", "resourceGroupName" : "vnetTest", "virtualNetworkName" : "vnet1", @@ -20,6 +20,11 @@ { "service": "Microsoft.Storage" } + ], + "serviceEndpointPolicies": [ + { + "id": "/subscriptions/subid/resourceGroups/vnetTest/providers/Microsoft.Network/serviceEndpointPolicies/ServiceEndpointPolicy1" + } ] } } @@ -46,6 +51,7 @@ { "name": "test-1", "id": "/subscriptions/subid/resourceGroups/vnetTest/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/test-1", + "type": "Microsoft.Network/virtualNetworks/subnets", "properties": { "addressPrefix": "10.0.0.0/16", "ipConfigurations": [], @@ -60,6 +66,11 @@ ] } ], + "serviceEndpointPolicies": [ + { + "id": "/subscriptions/subid/resourceGroups/vnetTest/providers/Microsoft.Network/serviceEndpointPolicies/ServiceEndpointPolicy1" + } + ], "provisioningState": "Succeeded" } } @@ -85,6 +96,7 @@ { "name": "test-1", "id": "/subscriptions/subid/resourceGroups/vnetTest/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/test-1", + "type": "Microsoft.Network/virtualNetworks/subnets", "properties": { "addressPrefix": "10.0.0.0/16", "ipConfigurations": [], @@ -101,12 +113,7 @@ ], "serviceEndpointPolicies": [ { - "provisioningState": "Succeeded", - "service": "Microsoft.Storage", - "locations": [ - "eastus2(stage)", - "usnorth(stage)" - ] + "id": "/subscriptions/subid/resourceGroups/vnetTest/providers/Microsoft.Network/serviceEndpointPolicies/ServiceEndpointPolicy1" } ], "provisioningState": "Succeeded" diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-10-01/expressRouteCircuit.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-10-01/expressRouteCircuit.json index dcb2522f2db0..2e7059933e9c 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-10-01/expressRouteCircuit.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-10-01/expressRouteCircuit.json @@ -828,7 +828,8 @@ }, "x-ms-long-running-operation": true, "x-ms-examples": { - "Create ExpressRouteCircuit": { "$ref": "./examples/ExpressRouteCircuitCreate.json" } + "Create ExpressRouteCircuit": { "$ref": "./examples/ExpressRouteCircuitCreate.json" }, + "Create ExpressRouteCircuit on ExpressRoutePort": { "$ref": "./examples/ExpressRouteCircuitCreateOnExpressRoutePort.json" } } }, "patch": { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-10-01/loadBalancer.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-10-01/loadBalancer.json index 6f3b4caa4fab..c6205f46d40b 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-10-01/loadBalancer.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-10-01/loadBalancer.json @@ -180,6 +180,8 @@ }, "x-ms-examples": { "Create load balancer": { "$ref": "./examples/LoadBalancerCreate.json" }, + "Create load balancer with Standard SKU": { "$ref": "./examples/LoadBalancerCreateStandardSku.json" }, + "Create load balancer with Frontend IP in Zone 1": { "$ref": "./examples/LoadBalancerCreateWithZones.json" }, "Create load balancer with inbound nat pool": { "$ref": "./examples/LoadBalancerCreateWithInboundNatPool.json" } }, "x-ms-long-running-operation": true @@ -1534,13 +1536,13 @@ "provisioningState": { "type": "string", "description": "Gets the provisioning state of the PublicIP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'." - }, + }, "protocol": { "type": "string", "description": "Protocol - TCP, UDP or All", "enum": [ "Tcp", - "Udp", + "Udp", "All" ] }, diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-11-01/examples/HubVirtualNetworkConnectionDelete.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-11-01/examples/HubVirtualNetworkConnectionDelete.json deleted file mode 100644 index 5db4e3ce35b8..000000000000 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-11-01/examples/HubVirtualNetworkConnectionDelete.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parameters": { - "connectionName": "connection1", - "virtualHubName": "virtualHub1", - "resourceGroupName": "rg1", - "api-version": "2018-11-01", - "subscriptionId": "subid" - }, - "responses": { - "200": { }, - "202": { }, - "204": { } - } -} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-11-01/examples/HubVirtualNetworkConnectionPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-11-01/examples/HubVirtualNetworkConnectionPut.json deleted file mode 100644 index 397095bbdd65..000000000000 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-11-01/examples/HubVirtualNetworkConnectionPut.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "parameters": { - "connectionName": "connection1", - "virtualHubName": "virtualHub1", - "resourceGroupName": "rg1", - "api-version": "2018-11-01", - "subscriptionId": "subid", - "hubVirtualNetworkConnectionParameters": { - "properties": { - "remoteVirtualNetwork": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet1" - }, - "allowHubToRemoteVnetTransit": true, - "allowRemoteVnetToUseHubVnetGateways": false - } - } - }, - "responses": { - "200": { - "body": [ - { - "name": "connection1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsofot.Network/virtualHubs/virtualHub1/virtualHubVnetConnections/connection1", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "properties": { - "provisioningState": "Succeeded", - "remoteVirtualNetwork": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsofot.Network/virtualNetworks/vnet1" - }, - "allowHubToRemoteVnetTransit": true, - "allowRemoteVnetToUseHubVnetGateways": false - } - } - ] - }, - "201": { - "body": [ - { - "name": "connection1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsofot.Network/virtualHubs/virtualHub1/virtualHubVnetConnections/connection1", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "properties": { - "provisioningState": "Succeeded", - "remoteVirtualNetwork": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsofot.Network/virtualNetworks/vnet1" - }, - "allowHubToRemoteVnetTransit": true, - "allowRemoteVnetToUseHubVnetGateways": false - } - } - ] - } - } -} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-11-01/examples/VirtualNetworkCreateServiceEndpointPolicy.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-11-01/examples/VirtualNetworkCreateServiceEndpointPolicy.json index 4c1156614be1..0fe426f4dd03 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-11-01/examples/VirtualNetworkCreateServiceEndpointPolicy.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-11-01/examples/VirtualNetworkCreateServiceEndpointPolicy.json @@ -1,6 +1,6 @@ { "parameters" : { - "api-version": "2018-06-01", + "api-version": "2018-11-01", "subscriptionId" : "subid", "resourceGroupName" : "vnetTest", "virtualNetworkName" : "vnet1", @@ -20,11 +20,17 @@ { "service": "Microsoft.Storage" } + ], + "serviceEndpointPolicies": [ + { + "id": "/subscriptions/subid/resourceGroups/vnetTest/providers/Microsoft.Network/serviceEndpointPolicies/ServiceEndpointPolicy1" + } ] } } ] - } + }, + "location": "eastus" } }, "responses" : { @@ -33,7 +39,7 @@ "name" : "vnet1", "id" : "/subscriptions/subid/resourceGroups/vnetTest/providers/Microsoft.Network/virtualNetworks/vnet1", "type" : "Microsoft.Network/virtualNetworks", - "location" : "westus", + "location" : "eastus", "properties" : { "provisioningState" : "Succeeded", "addressSpace" : { @@ -45,6 +51,7 @@ { "name": "test-1", "id": "/subscriptions/subid/resourceGroups/vnetTest/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/test-1", + "type": "Microsoft.Network/virtualNetworks/subnets", "properties": { "addressPrefix": "10.0.0.0/16", "ipConfigurations": [], @@ -59,6 +66,11 @@ ] } ], + "serviceEndpointPolicies": [ + { + "id": "/subscriptions/subid/resourceGroups/vnetTest/providers/Microsoft.Network/serviceEndpointPolicies/ServiceEndpointPolicy1" + } + ], "provisioningState": "Succeeded" } } @@ -72,7 +84,7 @@ "name" : "vnet1", "id" : "/subscriptions/subid/resourceGroups/vnetTest/providers/Microsoft.Network/virtualNetworks/vnet1", "type" : "Microsoft.Network/virtualNetworks", - "location" : "westus", + "location" : "eastus", "properties" : { "provisioningState" : "Succeeded", "addressSpace" : { @@ -84,6 +96,7 @@ { "name": "test-1", "id": "/subscriptions/subid/resourceGroups/vnetTest/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/test-1", + "type": "Microsoft.Network/virtualNetworks/subnets", "properties": { "addressPrefix": "10.0.0.0/16", "ipConfigurations": [], @@ -100,12 +113,7 @@ ], "serviceEndpointPolicies": [ { - "provisioningState": "Succeeded", - "service": "Microsoft.Storage", - "locations": [ - "eastus2(stage)", - "usnorth(stage)" - ] + "id": "/subscriptions/subid/resourceGroups/vnetTest/providers/Microsoft.Network/serviceEndpointPolicies/ServiceEndpointPolicy1" } ], "provisioningState": "Succeeded" diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-11-01/expressRouteCircuit.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-11-01/expressRouteCircuit.json index 88da92494c44..158a892bd9d1 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-11-01/expressRouteCircuit.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-11-01/expressRouteCircuit.json @@ -828,7 +828,8 @@ }, "x-ms-long-running-operation": true, "x-ms-examples": { - "Create ExpressRouteCircuit": { "$ref": "./examples/ExpressRouteCircuitCreate.json" } + "Create ExpressRouteCircuit": { "$ref": "./examples/ExpressRouteCircuitCreate.json" }, + "Create ExpressRouteCircuit on ExpressRoutePort": { "$ref": "./examples/ExpressRouteCircuitCreateOnExpressRoutePort.json" } } }, "patch": { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-11-01/loadBalancer.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-11-01/loadBalancer.json index 003ecf74ce12..84172b78fb44 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-11-01/loadBalancer.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-11-01/loadBalancer.json @@ -180,6 +180,8 @@ }, "x-ms-examples": { "Create load balancer": { "$ref": "./examples/LoadBalancerCreate.json" }, + "Create load balancer with Standard SKU": { "$ref": "./examples/LoadBalancerCreateStandardSku.json" }, + "Create load balancer with Frontend IP in Zone 1": { "$ref": "./examples/LoadBalancerCreateWithZones.json" }, "Create load balancer with inbound nat pool": { "$ref": "./examples/LoadBalancerCreateWithInboundNatPool.json" } }, "x-ms-long-running-operation": true @@ -1534,13 +1536,13 @@ "provisioningState": { "type": "string", "description": "Gets the provisioning state of the PublicIP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'." - }, + }, "protocol": { "type": "string", "description": "Protocol - TCP, UDP or All", "enum": [ "Tcp", - "Udp", + "Udp", "All" ] }, diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-12-01/examples/HubVirtualNetworkConnectionDelete.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-12-01/examples/HubVirtualNetworkConnectionDelete.json deleted file mode 100644 index b17864d95644..000000000000 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-12-01/examples/HubVirtualNetworkConnectionDelete.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "parameters": { - "connectionName": "connection1", - "virtualHubName": "virtualHub1", - "resourceGroupName": "rg1", - "api-version": "2018-12-01", - "subscriptionId": "subid" - }, - "responses": { - "200": { }, - "202": { }, - "204": { } - } -} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-12-01/examples/HubVirtualNetworkConnectionPut.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-12-01/examples/HubVirtualNetworkConnectionPut.json deleted file mode 100644 index 82bcc0452df3..000000000000 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-12-01/examples/HubVirtualNetworkConnectionPut.json +++ /dev/null @@ -1,54 +0,0 @@ -{ - "parameters": { - "connectionName": "connection1", - "virtualHubName": "virtualHub1", - "resourceGroupName": "rg1", - "api-version": "2018-12-01", - "subscriptionId": "subid", - "hubVirtualNetworkConnectionParameters": { - "properties": { - "remoteVirtualNetwork": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/vnet1" - }, - "allowHubToRemoteVnetTransit": true, - "allowRemoteVnetToUseHubVnetGateways": false - } - } - }, - "responses": { - "200": { - "body": [ - { - "name": "connection1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsofot.Network/virtualHubs/virtualHub1/virtualHubVnetConnections/connection1", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "properties": { - "provisioningState": "Succeeded", - "remoteVirtualNetwork": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsofot.Network/virtualNetworks/vnet1" - }, - "allowHubToRemoteVnetTransit": true, - "allowRemoteVnetToUseHubVnetGateways": false - } - } - ] - }, - "201": { - "body": [ - { - "name": "connection1", - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsofot.Network/virtualHubs/virtualHub1/virtualHubVnetConnections/connection1", - "etag": "w/\\00000000-0000-0000-0000-000000000000\\", - "properties": { - "provisioningState": "Succeeded", - "remoteVirtualNetwork": { - "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsofot.Network/virtualNetworks/vnet1" - }, - "allowHubToRemoteVnetTransit": true, - "allowRemoteVnetToUseHubVnetGateways": false - } - } - ] - } - } -} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-12-01/examples/VirtualNetworkCreateServiceEndpointPolicy.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-12-01/examples/VirtualNetworkCreateServiceEndpointPolicy.json index b77eb4f07fae..487f590cde72 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-12-01/examples/VirtualNetworkCreateServiceEndpointPolicy.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-12-01/examples/VirtualNetworkCreateServiceEndpointPolicy.json @@ -20,6 +20,11 @@ { "service": "Microsoft.Storage" } + ], + "serviceEndpointPolicies": [ + { + "id": "/subscriptions/subid/resourceGroups/vnetTest/providers/Microsoft.Network/serviceEndpointPolicies/ServiceEndpointPolicy1" + } ] } } @@ -46,6 +51,7 @@ { "name": "test-1", "id": "/subscriptions/subid/resourceGroups/vnetTest/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/test-1", + "type": "Microsoft.Network/virtualNetworks/subnets", "properties": { "addressPrefix": "10.0.0.0/16", "ipConfigurations": [], @@ -60,6 +66,11 @@ ] } ], + "serviceEndpointPolicies": [ + { + "id": "/subscriptions/subid/resourceGroups/vnetTest/providers/Microsoft.Network/serviceEndpointPolicies/ServiceEndpointPolicy1" + } + ], "provisioningState": "Succeeded" } } @@ -85,6 +96,7 @@ { "name": "test-1", "id": "/subscriptions/subid/resourceGroups/vnetTest/providers/Microsoft.Network/virtualNetworks/vnet1/subnets/test-1", + "type": "Microsoft.Network/virtualNetworks/subnets", "properties": { "addressPrefix": "10.0.0.0/16", "ipConfigurations": [], @@ -101,12 +113,7 @@ ], "serviceEndpointPolicies": [ { - "provisioningState": "Succeeded", - "service": "Microsoft.Storage", - "locations": [ - "eastus2(stage)", - "usnorth(stage)" - ] + "id": "/subscriptions/subid/resourceGroups/vnetTest/providers/Microsoft.Network/serviceEndpointPolicies/ServiceEndpointPolicy1" } ], "provisioningState": "Succeeded" diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-12-01/expressRouteCircuit.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-12-01/expressRouteCircuit.json index 525c9b8db135..4bb6a34456ff 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-12-01/expressRouteCircuit.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-12-01/expressRouteCircuit.json @@ -795,11 +795,11 @@ "x-ms-pageable": { "nextLinkName": "nextLink" }, - "x-ms-examples": { - "List Peer ExpressRouteCircuit Connection": { "$ref": "./examples/PeerExpressRouteCircuitConnectionList.json" } + "x-ms-examples": { + "List Peer ExpressRouteCircuit Connection": { "$ref": "./examples/PeerExpressRouteCircuitConnectionList.json" } } } - }, + }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/expressRouteCircuits/{circuitName}": { "delete": { "tags": [ @@ -938,7 +938,8 @@ }, "x-ms-long-running-operation": true, "x-ms-examples": { - "Create ExpressRouteCircuit": { "$ref": "./examples/ExpressRouteCircuitCreate.json" } + "Create ExpressRouteCircuit": { "$ref": "./examples/ExpressRouteCircuitCreate.json" }, + "Create ExpressRouteCircuit on ExpressRoutePort": { "$ref": "./examples/ExpressRouteCircuitCreateOnExpressRoutePort.json" } } }, "patch": { @@ -1854,7 +1855,7 @@ } }, "description": "Response for ListPeeredConnections API service call retrieves all global reach peer circuit connections that belongs to a Private Peering for an ExpressRouteCircuit." - }, + }, "ExpressRouteCircuitSku": { "properties": { "name": { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2018-12-01/loadBalancer.json b/specification/network/resource-manager/Microsoft.Network/stable/2018-12-01/loadBalancer.json index 0de884639375..739614bb8776 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2018-12-01/loadBalancer.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2018-12-01/loadBalancer.json @@ -180,6 +180,8 @@ }, "x-ms-examples": { "Create load balancer": { "$ref": "./examples/LoadBalancerCreate.json" }, + "Create load balancer with Standard SKU": { "$ref": "./examples/LoadBalancerCreateStandardSku.json" }, + "Create load balancer with Frontend IP in Zone 1": { "$ref": "./examples/LoadBalancerCreateWithZones.json" }, "Create load balancer with inbound nat pool": { "$ref": "./examples/LoadBalancerCreateWithInboundNatPool.json" } }, "x-ms-long-running-operation": true @@ -1534,13 +1536,13 @@ "provisioningState": { "type": "string", "description": "Gets the provisioning state of the PublicIP resource. Possible values are: 'Updating', 'Deleting', and 'Failed'." - }, + }, "protocol": { "type": "string", "description": "Protocol - TCP, UDP or All", "enum": [ "Tcp", - "Udp", + "Udp", "All" ] },