Changes related to setting VpnClient AAD authentication options to Vi…

…rtual network gateway resource & Advertising virtual Wan 2 released APIs. (#5935) * Changes related to setting VpnClient AAD authentication options to Virtual network gateway resource. * Advertising virtual Wan 2 released APIs through swagger * Incorporate code review comments * Minor format fixes * Add newly added param:usePolicyBasedTrafficSelectors to VpnConnection resource.
Azure · May 16, 2019 · 80b5637 · 80b5637
1 parent c93c04f
commit 80b5637
Show file tree

Hide file tree

Showing 10 changed files with 250 additions and 10 deletions.
diff --git a/...anager/Microsoft.Network/stable/2019-04-01/examples/P2SVpnGatewayGetConnectionHealth.json b/...anager/Microsoft.Network/stable/2019-04-01/examples/P2SVpnGatewayGetConnectionHealth.json
@@ -0,0 +1,50 @@
+{
+  "parameters": {
+    "gatewayName": "p2sVpnGateway1",
+    "resourceGroupName": "rg1",
+    "api-version": "2019-04-01",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "200": {
+      "body": {
+        "name": "p2sVpnGateway1",
+      "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/P2SvpnGateways/p2sVpnGateway1",
+        "etag": "w/\\00000000-0000-0000-0000-000000000000\\",
+        "location": "West US",
+        "type": "Microsoft.Network/p2sVpnGateways",
+        "properties": {
+          "provisioningState": "Succeeded",
+          "virtualHub": {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1"
+          },
+        "p2SVpnServerConfiguration": {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualWans/virtualWan1/p2sVpnServerConfigurations/p2sVpnServerConfiguration1"
+        },
+        "vpnClientAddressPool": {
+            "addressPrefixes": [
+                "101.3.0.0/16"
+            ]
+        },
+        "customRoutes": {
+            "addressPrefixes": [
+                "101.168.0.6/32"
+            ]
+        },
+        "vpnGatewayScaleUnit": 1,
+        "vpnClientConnectionHealth": {
+            "vpnClientConnectionsCount": 2,
+            "allocatedIpAddresses": [
+            "1.1.1.1",
+            "2.2.2.2"
+            ],
+            "totalIngressBytesTransferred":2000,
+            "totalEgressBytesTransferred":3000
+        }
+        }
+      }
+    },
+    "202": {
+    }
+  }
+}
diff --git a/...source-manager/Microsoft.Network/stable/2019-04-01/examples/VirtualNetworkGatewayGet.json b/...source-manager/Microsoft.Network/stable/2019-04-01/examples/VirtualNetworkGatewayGet.json
@@ -42,6 +42,16 @@
                     "vpnType": "RouteBased",
                     "enableBgp": false,
                     "activeActive": false,
+                    "vpnClientConfiguration": {
+                        "vpnClientProtocols": [
+                            "OpenVPN"
+                        ],
+                        "vpnClientRootCertificates": [],
+                        "vpnClientRevokedCertificates": [],
+                        "aadTenant": "https://login.microsoftonline.com/99163270-c9ab-4279-bb12-5353ed9bf6e1",
+                        "aadAudience": "fd11706c-e78c-4828-8be7-ac7dcefd4b17",
+                        "aadIssuer": "https://sts.windows.net/99163270-c9ab-4279-bb12-5353ed9bf6e1/"
+                    },
                     "bgpSettings": {
                         "asn": 65514,
                         "bgpPeeringAddress": "10.0.1.30",

diff --git a/...ource-manager/Microsoft.Network/stable/2019-04-01/examples/VirtualNetworkGatewayList.json b/...ource-manager/Microsoft.Network/stable/2019-04-01/examples/VirtualNetworkGatewayList.json
@@ -96,9 +96,14 @@
                             "enableBgp": false,
                             "activeActive": false,
                             "vpnClientConfiguration": {
-                                "vpnClientProtocols": [],
-                                "vpnClientRootCertificates": [],
-                                "vpnClientRevokedCertificates": []
+                            "vpnClientProtocols": [
+                                "OpenVPN"
+                            ],
+                            "vpnClientRootCertificates": [],
+                            "vpnClientRevokedCertificates": [],
+                            "aadTenant": "https://login.microsoftonline.com/99163270-c9ab-4279-bb12-5353ed9bf6e1",
+                            "aadAudience": "fd11706c-e78c-4828-8be7-ac7dcefd4b17",
+                            "aadIssuer": "https://sts.windows.net/99163270-c9ab-4279-bb12-5353ed9bf6e1/"
                             },
                             "bgpSettings": {
                                 "asn": 65515,

diff --git a/...rce-manager/Microsoft.Network/stable/2019-04-01/examples/VirtualNetworkGatewayUpdate.json b/...rce-manager/Microsoft.Network/stable/2019-04-01/examples/VirtualNetworkGatewayUpdate.json
@@ -81,11 +81,13 @@
                     "activeActive": false,
                     "vpnClientConfiguration": {
                         "vpnClientProtocols": [
-                            "SSTP",
-                            "IkeV2"
+                            "OpenVPN"
                         ],
                         "vpnClientRootCertificates": [],
-                        "vpnClientRevokedCertificates": []
+                        "vpnClientRevokedCertificates": [],
+                        "aadTenant": "",
+                        "aadAudience": "",
+                        "aadIssuer": ""
                     },
                     "bgpSettings": {
                         "asn": 65515,
@@ -138,11 +140,13 @@
                     "activeActive": false,
                     "vpnClientConfiguration": {
                         "vpnClientProtocols": [
-                            "SSTP",
-                            "IkeV2"
+                            "OpenVPN"
                         ],
                         "vpnClientRootCertificates": [],
-                        "vpnClientRevokedCertificates": []
+                        "vpnClientRevokedCertificates": [],
+                        "aadTenant": "https://login.microsoftonline.com/99163270-c9ab-4279-bb12-5353ed9bf6e1",
+                        "aadAudience": "fd11706c-e78c-4828-8be7-ac7dcefd4b17",
+                        "aadIssuer": "https://sts.windows.net/99163270-c9ab-4279-bb12-5353ed9bf6e1/"
                     },
                     "bgpSettings": {
                         "asn": 65515,

diff --git a/...twork/resource-manager/Microsoft.Network/stable/2019-04-01/examples/VpnConnectionGet.json b/...twork/resource-manager/Microsoft.Network/stable/2019-04-01/examples/VpnConnectionGet.json
@@ -25,6 +25,7 @@
           "connectionBandwidth": 100,
           "sharedKey": "key",
           "enableBgp": false,
+          "usePolicyBasedTrafficSelectors": false,	  
           "useLocalAzureIpAddress": false,
           "ipsecPolicies": [ ]
         }

diff --git a/...work/resource-manager/Microsoft.Network/stable/2019-04-01/examples/VpnConnectionList.json b/...work/resource-manager/Microsoft.Network/stable/2019-04-01/examples/VpnConnectionList.json
@@ -25,6 +25,7 @@
             "connectionBandwidth": 100,
             "sharedKey": "key",
             "enableBgp": false,
+            "usePolicyBasedTrafficSelectors": false,
             "useLocalAzureIpAddress": false,
             "ipsecPolicies": [ ]
           }

diff --git a/...twork/resource-manager/Microsoft.Network/stable/2019-04-01/examples/VpnConnectionPut.json b/...twork/resource-manager/Microsoft.Network/stable/2019-04-01/examples/VpnConnectionPut.json
@@ -33,6 +33,7 @@
         "connectionBandwidth": 100,
         "sharedKey": "key",
         "enableBgp": false,
+        "usePolicyBasedTrafficSelectors": false,		
         "useLocalAzureIpAddress": false,
         "ipsecPolicies": [ ]
       }
@@ -54,6 +55,7 @@
         "connectionBandwidth": 100,
         "sharedKey": "key",
         "enableBgp": false,
+        "usePolicyBasedTrafficSelectors": false,		
         "useLocalAzureIpAddress": false,
         "ipsecPolicies": [ ]
       }

diff --git a/...etwork/resource-manager/Microsoft.Network/stable/2019-04-01/examples/VpnGatewayReset.json b/...etwork/resource-manager/Microsoft.Network/stable/2019-04-01/examples/VpnGatewayReset.json
@@ -0,0 +1,53 @@
+{
+  "parameters": {
+    "gatewayName": "vpngw",
+    "resourceGroupName": "rg1",
+    "api-version": "2019-04-01",
+    "subscriptionId": "subid"
+  },
+  "responses": {
+    "202" : { },
+    "200": {
+      "body": {
+        "name": "vpngw",
+        "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw",
+        "etag": "w/\\00000000-0000-0000-0000-000000000000\\",
+        "location": "West US",
+        "type": "Microsoft.Network/vpnGateways",
+        "properties": {
+          "provisioningState": "Succeeded",
+          "virtualHub": {
+            "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualHubs/virtualHub1"
+          },
+          "connections": [
+            {
+              "name": "vpnConnection1",
+              "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnGateways/vpngw/vpnConnections/vpnConnection1",
+              "etag": "w/\\00000000-0000-0000-0000-000000000000\\",
+              "properties": {
+                "provisioningState": "Succeeded",
+                "remoteVpnSite": {
+                  "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/vpnSites/vpnSite1"
+                },
+                "connectionStatus": "Connected",
+                "ingressBytesTransferred": 0,
+                "egressBytesTransferred": 0,
+                "routingWeight": 0,
+                "connectionBandwidth": 100,
+                "sharedKey": "key",
+                "enableBgp": false,
+                "useLocalAzureIpAddress": false,
+                "ipsecPolicies": [ ]
+              }
+            }
+          ],
+          "bgpSettings": {
+            "asn": 65514,
+            "bgpPeeringAddress": "10.0.1.30",
+            "peerWeight": 0
+          }
+        }
+      }
+    }
+  }
+}
diff --git a/...n/network/resource-manager/Microsoft.Network/stable/2019-04-01/virtualNetworkGateway.json b/...n/network/resource-manager/Microsoft.Network/stable/2019-04-01/virtualNetworkGateway.json
@@ -1873,6 +1873,18 @@
         "radiusServerSecret": {
           "type": "string",
           "description": "The radius secret property of the VirtualNetworkGateway resource for vpn client connection."
+        },
+        "aadTenant": {
+          "type": "string",
+          "description": "The AADTenant property of the VirtualNetworkGateway resource for vpn client connection used for AAD authentication."
+        },
+        "aadAudience": {
+          "type": "string",
+          "description": "The AADAudience property of the VirtualNetworkGateway resource for vpn client connection used for AAD authentication."
+        },
+        "aadIssuer": {
+          "type": "string",
+          "description": "The AADIssuer property of the VirtualNetworkGateway resource for vpn client connection used for AAD authentication."
         }
       },
       "description": "VpnClientConfiguration for P2S client."

diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/virtualWan.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/virtualWan.json
@@ -1390,6 +1390,55 @@
         }
       }
     },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnGateways/{gatewayName}/reset": {
+      "post": {
+        "tags": [
+          "VpnGateways"
+        ],
+        "operationId": "VpnGateways_Reset",
+        "description": "Resets the primary of the vpn gateway in the specified resource group.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The resource group name of the VpnGateway."
+          },
+          {
+            "name": "gatewayName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the gateway."
+          },
+          {
+            "$ref": "./network.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./network.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "202": {
+            "description": "Accepted and the operation will complete asynchronously."
+          },
+          "200": {
+            "description": "Request successful. The operation reset the primary of the VpnGateway.",
+            "schema": {
+              "$ref": "#/definitions/VpnGateway"
+            }
+          }
+        },
+        "x-ms-examples": {
+          "ResetVpnGateway": { "$ref": "./examples/VpnGatewayReset.json" }
+        },
+        "x-ms-long-running-operation": true,
+        "x-ms-long-running-operation-options": {
+          "final-state-via": "location"
+        }
+      }
+    },	
     "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/vpnGateways": {
       "get": {
         "operationId": "VpnGateways_ListByResourceGroup",
@@ -2300,7 +2349,56 @@
           "final-state-via": "location"
         }
       }
-    }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/p2svpnGateways/{gatewayName}/getP2sVpnConnectionHealth": {
+      "post": {
+        "tags": [
+          "P2SVpnGateways"
+        ],
+        "operationId": "P2sVpnGateways_GetP2sVpnConnectionHealth",
+        "description": "Gets the connection health of P2S clients of the virtual wan P2SVpnGateway in the specified resource group.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the resource group."
+          },
+          {
+            "name": "gatewayName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the P2SVpnGateway."
+          },
+          {
+            "$ref": "./network.json#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "./network.json#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "P2S Vpn Gateway with P2S connection health details.",
+            "schema": {
+              "$ref": "#/definitions/P2SVpnGateway"
+            }
+          },
+          "202": {
+            "description": "Accepted and the operation will complete asynchronously."
+          }
+        },
+        "x-ms-examples": {
+          "P2SVpnGatewayGetConnectionHealth": { "$ref": "./examples/P2SVpnGatewayGetConnectionHealth.json" }
+        },
+        "x-ms-long-running-operation": true,
+        "x-ms-long-running-operation-options": {
+          "final-state-via": "location"
+        }
+      }
+    }	
   },
   "definitions": {
     "VirtualWanProperties": {
@@ -2708,6 +2806,10 @@
           "type": "boolean",
           "description": "EnableBgp flag"
         },
+        "usePolicyBasedTrafficSelectors": {
+          "type": "boolean",
+          "description": "Enable policy-based traffic selectors."
+        },		
         "ipsecPolicies": {
           "type": "array",
           "items": {