diff --git a/azure-mgmt-network/azure/mgmt/network/v2015_06_15/build.json b/azure-mgmt-network/azure/mgmt/network/v2015_06_15/build.json index ea3d6c47f53c..33e2617fb4ba 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2015_06_15/build.json +++ b/azure-mgmt-network/azure/mgmt/network/v2015_06_15/build.json @@ -1 +1 @@ -{"autorest": "1.2.2", "date": "2017-08-17T15:39:08Z", "version": ""} \ No newline at end of file +{"autorest": "1.2.2", "date": "2017-09-06T18:02:41Z", "version": ""} \ No newline at end of file diff --git a/azure-mgmt-network/azure/mgmt/network/v2016_09_01/build.json b/azure-mgmt-network/azure/mgmt/network/v2016_09_01/build.json index 0bf3f1b39851..35e2eaea79c1 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2016_09_01/build.json +++ b/azure-mgmt-network/azure/mgmt/network/v2016_09_01/build.json @@ -1 +1 @@ -{"autorest": "1.2.2", "date": "2017-08-17T15:40:07Z", "version": ""} \ No newline at end of file +{"autorest": "1.2.2", "date": "2017-09-06T18:03:04Z", "version": ""} \ No newline at end of file diff --git a/azure-mgmt-network/azure/mgmt/network/v2016_12_01/build.json b/azure-mgmt-network/azure/mgmt/network/v2016_12_01/build.json index 1ffb29eb7630..1fcdbe5aa142 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2016_12_01/build.json +++ b/azure-mgmt-network/azure/mgmt/network/v2016_12_01/build.json @@ -1 +1 @@ -{"autorest": "1.2.2", "date": "2017-08-17T15:41:10Z", "version": ""} \ No newline at end of file +{"autorest": "1.2.2", "date": "2017-09-06T18:03:29Z", "version": ""} \ No newline at end of file diff --git a/azure-mgmt-network/azure/mgmt/network/v2017_03_01/build.json b/azure-mgmt-network/azure/mgmt/network/v2017_03_01/build.json index 498e057b1b54..657e93cf0a82 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2017_03_01/build.json +++ b/azure-mgmt-network/azure/mgmt/network/v2017_03_01/build.json @@ -1 +1 @@ -{"autorest": "1.2.2", "date": "2017-08-17T15:42:19Z", "version": ""} \ No newline at end of file +{"autorest": "1.2.2", "date": "2017-09-06T18:03:56Z", "version": ""} \ No newline at end of file diff --git a/azure-mgmt-network/azure/mgmt/network/v2017_06_01/build.json b/azure-mgmt-network/azure/mgmt/network/v2017_06_01/build.json index 7949357cbd95..b99ebefb2d59 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2017_06_01/build.json +++ b/azure-mgmt-network/azure/mgmt/network/v2017_06_01/build.json @@ -1 +1 @@ -{"autorest": "1.2.2", "date": "2017-08-17T15:43:49Z", "version": ""} \ No newline at end of file +{"autorest": "1.2.2", "date": "2017-09-06T18:04:33Z", "version": ""} \ No newline at end of file diff --git a/azure-mgmt-network/azure/mgmt/network/v2017_08_01/build.json b/azure-mgmt-network/azure/mgmt/network/v2017_08_01/build.json index 84a188cf216c..8dd1c3c55ed9 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2017_08_01/build.json +++ b/azure-mgmt-network/azure/mgmt/network/v2017_08_01/build.json @@ -1 +1 @@ -{"autorest": "1.2.2", "date": "2017-08-17T16:04:55Z", "version": ""} \ No newline at end of file +{"autorest": "1.2.2", "date": "2017-09-06T18:05:11Z", "version": ""} \ No newline at end of file diff --git a/azure-mgmt-network/azure/mgmt/network/v2017_08_01/operations/virtual_network_gateways_operations.py b/azure-mgmt-network/azure/mgmt/network/v2017_08_01/operations/virtual_network_gateways_operations.py index e4c6386421e9..b33456e84ad2 100644 --- a/azure-mgmt-network/azure/mgmt/network/v2017_08_01/operations/virtual_network_gateways_operations.py +++ b/azure-mgmt-network/azure/mgmt/network/v2017_08_01/operations/virtual_network_gateways_operations.py @@ -687,7 +687,97 @@ def get_long_running_status(status_link, headers=None): def get_long_running_output(response): - if response.status_code not in [200]: + if response.status_code not in [200, 202]: + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp + + deserialized = None + + if response.status_code == 200: + deserialized = self._deserialize('str', response) + + if raw: + client_raw_response = ClientRawResponse(deserialized, response) + return client_raw_response + + return deserialized + + if raw: + response = long_running_send() + return get_long_running_output(response) + + long_running_operation_timeout = operation_config.get( + 'long_running_operation_timeout', + self.config.long_running_operation_timeout) + return AzureOperationPoller( + long_running_send, get_long_running_output, + get_long_running_status, long_running_operation_timeout) + + def get_vpn_profile_pacakge_url( + self, resource_group_name, virtual_network_gateway_name, custom_headers=None, raw=False, **operation_config): + """Gets pre-generated VPN profile for P2S client of the virtual network + gateway in the specified resource group. The profile needs to be + generated first using generateVpnProfile. + + :param resource_group_name: The name of the resource group. + :type resource_group_name: str + :param virtual_network_gateway_name: The name of the virtual network + gateway. + :type virtual_network_gateway_name: str + :param dict custom_headers: headers that will be added to the request + :param bool raw: returns the direct response alongside the + deserialized response + :return: + :class:`AzureOperationPoller` + instance that returns str or + :class:`ClientRawResponse` if + raw=true + :rtype: + :class:`AzureOperationPoller` + or :class:`ClientRawResponse` + :raises: :class:`CloudError` + """ + # Construct URL + url = '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualNetworkGateways/{virtualNetworkGatewayName}/getvpnprofilepackageurl' + path_format_arguments = { + 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), + 'virtualNetworkGatewayName': self._serialize.url("virtual_network_gateway_name", virtual_network_gateway_name, 'str'), + 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str') + } + url = self._client.format_url(url, **path_format_arguments) + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + # Construct headers + header_parameters = {} + header_parameters['Content-Type'] = 'application/json; charset=utf-8' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct and send request + def long_running_send(): + + request = self._client.post(url, query_parameters) + return self._client.send(request, header_parameters, **operation_config) + + def get_long_running_status(status_link, headers=None): + + request = self._client.get(status_link) + if headers: + request.headers.update(headers) + return self._client.send( + request, header_parameters, **operation_config) + + def get_long_running_output(response): + + if response.status_code not in [200, 202]: exp = CloudError(response) exp.request_id = response.headers.get('x-ms-request-id') raise exp