Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/Azure/azure-rest-api-specs
Browse files Browse the repository at this point in the history
  • Loading branch information
@vrmurthy01
vrmurthy01 committed Dec 3, 2015
2 parents 7e97eeb + 5d7fa01 commit 7469327
Show file tree
Hide file tree
Showing 2 changed files with 237 additions and 35 deletions.
266 changes: 233 additions & 33 deletions arm-network/2015-06-15/swagger/network.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1104,10 +1104,10 @@
},
{
"name": "$expand",
"in": "query",
"required": false,
"type": "string",
"description": "expand references resources."
"in": "query",
"required": false,
"type": "string",
"description": "expand references resources."
}
],
"responses": {
Expand Down Expand Up @@ -1477,10 +1477,10 @@
},
{
"name": "$expand",
"in": "query",
"required": false,
"type": "string",
"description": "expand references resources."
"in": "query",
"required": false,
"type": "string",
"description": "expand references resources."
}
],
"responses": {
Expand Down Expand Up @@ -1681,10 +1681,10 @@
},
{
"name": "$expand",
"in": "query",
"required": false,
"type": "string",
"description": "expand references resources."
"in": "query",
"required": false,
"type": "string",
"description": "expand references resources."
}
],
"responses": {
Expand Down Expand Up @@ -1831,10 +1831,10 @@
},
{
"name": "$expand",
"in": "query",
"required": false,
"type": "string",
"description": "expand references resources."
"in": "query",
"required": false,
"type": "string",
"description": "expand references resources."
}
],
"responses": {
Expand Down Expand Up @@ -2034,10 +2034,10 @@
},
{
"name": "$expand",
"in": "query",
"required": false,
"type": "string",
"description": "expand references resources."
"in": "query",
"required": false,
"type": "string",
"description": "expand references resources."
}
],
"responses": {
Expand Down Expand Up @@ -2237,10 +2237,10 @@
},
{
"name": "$expand",
"in": "query",
"required": false,
"type": "string",
"description": "expand references resources."
"in": "query",
"required": false,
"type": "string",
"description": "expand references resources."
}
],
"responses": {
Expand Down Expand Up @@ -2846,10 +2846,10 @@
},
{
"name": "$expand",
"in": "query",
"required": false,
"type": "string",
"description": "expand references resources."
"in": "query",
"required": false,
"type": "string",
"description": "expand references resources."
}
],
"responses": {
Expand Down Expand Up @@ -3492,7 +3492,7 @@
"VirtualNetworkGateways"
],
"operationId": "VirtualNetworkGateways_Reset",
"description": "The Reset VirtualNetworkGateway operation resets the primary of the virtual network gatewayin the specified resource group through Network resource provider.",
"description": "The Reset VirtualNetworkGateway operation resets the primary of the virtual network gateway in the specified resource group through Network resource provider.",
"parameters": [
{
"name": "resourceGroupName",
Expand Down Expand Up @@ -3538,6 +3538,54 @@
"x-ms-long-running-operation": true
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualnetworkgateways/{virtualNetworkGatewayName}/generatevpnclientpackage": {
"post": {
"tags": [
"VirtualNetworkGateways"
],
"operationId": "VirtualNetworkGateways_Generatevpnclientpackage",
"description": "The Generatevpnclientpackage operation generates Vpn client package for P2S client of the virtual network gateway in the specified resource group through Network resource provider.",
"parameters": [
{
"name": "resourceGroupName",
"in": "path",
"required": true,
"type": "string",
"description": "The name of the resource group."
},
{
"name": "virtualNetworkGatewayName",
"in": "path",
"required": true,
"type": "string",
"description": "The name of the virtual network gateway."
},
{
"name": "parameters",
"in": "body",
"required": true,
"schema": {
"$ref": "#/definitions/VpnClientParameters"
},
"description": "Parameters supplied to the Begin Generating Virtual Network Gateway Vpn client package operation through Network resource provider."
},
{
"$ref": "#/parameters/ApiVersionParameter"
},
{
"$ref": "#/parameters/SubscriptionIdParameter"
}
],
"responses": {
"202": {
"description": "Vpn client package url",
"schema": {
"type": "string"
}
}
}
}
},
"/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/virtualnetworks/{virtualNetworkName}": {
"delete": {
"tags": [
Expand Down Expand Up @@ -3609,10 +3657,10 @@
},
{
"name": "$expand",
"in": "query",
"required": false,
"type": "string",
"description": "expand references resources."
"in": "query",
"required": false,
"type": "string",
"description": "expand references resources."
}
],
"responses": {
Expand Down Expand Up @@ -6346,6 +6394,14 @@
"$ref": "#/definitions/SubResource",
"description": "Gets or sets the reference of the LocalNetworkGateway resource which represents Local network site having default routes. Assign Null value in case of removing existing default site setting."
},
"sku": {
"$ref": "#/definitions/VirtualNetworkGatewaySku",
"description": "Gets or sets the reference of the VirtualNetworkGatewaySku resource which represents the sku selected for Virtual network gateway."
},
"vpnClientConfiguration": {
"$ref": "#/definitions/VpnClientConfiguration",
"description": "Gets or sets the reference of the VpnClientConfiguration resource which represents the P2S VpnClient configurations."
},
"resourceGuid": {
"type": "string",
"description": "Gets or sets resource guid property of the VirtualNetworkGateway resource"
Expand Down Expand Up @@ -6374,6 +6430,82 @@
],
"description": "A common class for general resource information"
},
"VpnClientConfiguration": {
"properties": {
"vpnClientAddressPool": {
"$ref": "#/definitions/AddressSpace",
"description": "Gets or sets the reference of the Address space resource which represents Address space for P2S VpnClient."
},
"vpnClientRootCertificates": {
"type": "array",
"items": {
"$ref": "#/definitions/VpnClientRootCertificate"
},
"description": "VpnClientRootCertificate for Virtual network gateway."
},
"vpnClientRevokedCertificates": {
"type": "array",
"items": {
"$ref": "#/definitions/VpnClientRevokedCertificate"
},
"description": "VpnClientRevokedCertificate for Virtual network gateway."
}
},
"description": "VpnClientConfiguration for P2S client"
},
"VirtualNetworkGatewaySku": {
"properties": {
"name": {
"type": "string",
"description": "Gateway sku name -Basic/HighPerformance/Standard",
"enum": [
"Basic",
"HighPerformance",
"Standard"
],
"x-ms-enum": {
"name": "VirtualNetworkGatewaySkuName",
"modelAsString": "True"
}
},
"tier": {
"type": "string",
"description": "Gateway sku tier -Basic/HighPerformance/Standard",
"enum": [
"Basic",
"HighPerformance",
"Standard"
],
"x-ms-enum": {
"name": "VirtualNetworkGatewaySkuTier",
"modelAsString": "True"
}
},
"capacity": {
"type": "integer",
"format": "int32",
"description": "The capacity"
}
},
"description": "VirtualNetworkGatewaySku details"
},
"VpnClientParameters": {
"properties": {
"ProcessorArchitecture": {
"type": "string",
"description": "VPN client Processor Architecture -Amd64/X86",
"enum": [
"Amd64",
"X86"
],
"x-ms-enum": {
"name": "Architecture",
"modelAsString": "True"
}
}
},
"description": "VpnClientParameters"
},
"VirtualNetworkGatewayConnectionPropertiesFormat": {
"properties": {
"virtualNetworkGateway1": {
Expand Down Expand Up @@ -6464,6 +6596,74 @@
],
"description": "A common class for general resource information"
},
"VpnClientRevokedCertificatePropertiesFormat": {
"properties": {
"thumbprint": {
"type": "string",
"description": "Gets or sets the revoked Vpn client certificate thumbprint"
},
"provisioningState": {
"type": "string",
"description": "Gets or sets Provisioning state of the VPN client revoked certificate resource Updating/Deleting/Failed"
}
},
"description": "Properties of the revoked VPN client certificate of virtual network gateway"
},
"VpnClientRevokedCertificate": {
"properties": {
"properties": {
"$ref": "#/definitions/VpnClientRevokedCertificatePropertiesFormat"
},
"name": {
"type": "string",
"description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
},
"etag": {
"type": "string",
"description": "A unique read-only string that changes whenever the resource is updated"
}
},
"allOf": [
{
"$ref": "#/definitions/SubResource"
}
],
"description": "VPN client revoked certificate of virtual network gateway"
},
"VpnClientRootCertificatePropertiesFormat": {
"properties": {
"publicCertData": {
"type": "string",
"description": "Gets or sets the certificate public data"
},
"provisioningState": {
"type": "string",
"description": "Gets or sets Provisioning state of the VPN client root certificate resource Updating/Deleting/Failed"
}
},
"description": "Properties of SSL certificates of application gateway"
},
"VpnClientRootCertificate": {
"properties": {
"properties": {
"$ref": "#/definitions/VpnClientRootCertificatePropertiesFormat"
},
"name": {
"type": "string",
"description": "Gets name of the resource that is unique within a resource group. This name can be used to access the resource"
},
"etag": {
"type": "string",
"description": "A unique read-only string that changes whenever the resource is updated"
}
},
"allOf": [
{
"$ref": "#/definitions/SubResource"
}
],
"description": "VPN client root certificate of virtual network gateway"
},
"ConnectionSharedKeyResult": {
"properties": {
"value": {
Expand Down
6 changes: 4 additions & 2 deletions search/2015-02-28/swagger/searchservice.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1195,7 +1195,8 @@
"description": "History of the recent indexer executions, sorted in reverse chronological order."
}
},
"description": "Represents the current status and execution history of an indexer."
"description": "Represents the current status and execution history of an indexer.",
"x-ms-external": true
},
"IndexerStatus": {
"type": "string",
Expand Down Expand Up @@ -1632,7 +1633,8 @@
"description": "Gets the amount of storage in bytes consumed by the index."
}
},
"description": "Statistics for a given index. Statistics are collected periodically and are not guaranteed to always be up-to-date."
"description": "Statistics for a given index. Statistics are collected periodically and are not guaranteed to always be up-to-date.",
"x-ms-external": true
},
"IndexListResult": {
"properties": {
Expand Down

0 comments on commit 7469327

Please sign in to comment.