From 2bc49d8ef0486fbf236cf8f4520f7e340eab9f2d Mon Sep 17 00:00:00 2001 From: Rhea Khanna Date: Mon, 8 Apr 2019 09:58:21 -0700 Subject: [PATCH 01/13] Add new Nat Gateway resource --- .../2019-02-01/examples/NatGatewayCreate.json | 89 ++++ .../2019-02-01/examples/NatGatewayDelete.json | 13 + .../2019-02-01/examples/NatGatewayGet.json | 41 ++ .../2019-02-01/examples/NatGatewayList.json | 72 ++++ .../examples/NatGatewayListAll.json | 71 +++ .../examples/NatGatewayUpdateTags.json | 50 +++ .../stable/2019-02-01/natGateway.json | 407 ++++++++++++++++++ .../stable/2019-02-01/virtualNetwork.json | 4 + .../network/resource-manager/readme.md | 4 + 9 files changed, 751 insertions(+) create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayCreate.json create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayDelete.json create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayGet.json create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayList.json create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayListAll.json create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayUpdateTags.json create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/natGateway.json diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayCreate.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayCreate.json new file mode 100644 index 000000000000..c174565608df --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayCreate.json @@ -0,0 +1,89 @@ +{ + "parameters":{ + "api-version":"2018-12-01", + "subscriptionId":"subid", + "resourceGroupName":"rg1", + "natGatewayName":"test-natgateway", + "parameters":{ + "properties":{ + "publicIpAddresses":[ + { + "id":"/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPAddresses/PublicIpAddress1" + } + ], + "publicIpPrefixes":[ + { + "id":"/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPPrefixes/PublicIpPrefix1" + } + ], + "subnets":[ + { + "id":"/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/subnet1" + } + ] + } + } + }, + "responses":{ + "200":{ + "body":{ + "name":"test-natGateway", + "sku":{ + "name":"Standard" + }, + "id":"/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/natGateways/test-natGateway", + "location":"westus", + "properties":{ + "idleTimeoutInMinutes":5, + "provisioningState":"Succeeded", + "publicIpAddresses":[ + { + "id":"/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPAddresses/PublicIpAddress1" + } + ], + "publicIpPrefixes":[ + { + "id":"/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPPrefixes/PublicIpPrefix1" + } + ], + "subnets":[ + { + "id":"/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/subnet1" + } + ] + }, + "type":"Microsoft.Network/natGateways" + } + }, + "201":{ + "body":{ + "name":"test-natGateway", + "sku":{ + "name":"Standard" + }, + "id":"/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/natGateways/test-natGateway", + "location":"westus", + "properties":{ + "idleTimeoutInMinutes":5, + "provisioningState":"Succeeded", + "publicIpAddresses":[ + { + "id":"/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPAddresses/PublicIpAddress1" + } + ], + "publicIpPrefixes":[ + { + "id":"/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPPrefixes/PublicIpPrefix1" + } + ], + "subnets":[ + { + "id":"/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/subnet1" + } + ] + }, + "type":"Microsoft.Network/natGateways" + } + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayDelete.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayDelete.json new file mode 100644 index 000000000000..efb515130341 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayDelete.json @@ -0,0 +1,13 @@ +{ + "parameters" : { + "api-version": "2018-12-01", + "subscriptionId" : "subid", + "resourceGroupName": "rg1", + "natGatewayName": "test-natGateway" + }, + "responses" : { + "200" : { }, + "202" : { }, + "204" : { } + } + } diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayGet.json new file mode 100644 index 000000000000..d5790c562e04 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayGet.json @@ -0,0 +1,41 @@ +{ + "parameters" : { + "api-version": "2018-12-01", + "subscriptionId" : "subid", + "resourceGroupName": "rg1", + "natGatewayName": "test-natGateway" + }, + "responses" : { + "200" : { + "body" : { + "name" : "test-natGateway", + "sku": { + "name": "Standard" + }, + "id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/natGateways/test-natGateway", + "location" : "westus", + "properties" : { + "idleTimeoutInMinutes" : 5, + "provisioningState": "Succeeded", + "publicIpAddresses": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPAddresses/PublicIpAddress1" + } + ], + "publicIpPrefixes": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPPrefixes/PublicIpPrefix1" + } + ], + "subnets": [ + { + "id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/subnet1" + } + ] + }, + "type" : "Microsoft.Network/natGateways" + } + } + } + } + diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayList.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayList.json new file mode 100644 index 000000000000..831b17e29253 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayList.json @@ -0,0 +1,72 @@ +{ + "parameters" : { + "api-version": "2018-12-01", + "subscriptionId" : "subid", + "resourceGroupName" : "rg1" + }, + "responses" : { + "200" : { + "body" : { + "value" : [ + { + "name" : "test-natGateway", + "sku": { + "name": "Standard" + }, + "id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/natGateway/test-natGateway", + "location" : "westus", + "properties" : { + "idleTimeoutInMinutes" : 5, + "provisioningState": "Succeeded", + "publicIpAddresses": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPAddresses/PublicIpAddress1" + } + ], + "publicIpPrefixes": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPPrefixes/PublicIpPrefix1" + } + ], + "subnets": [ + { + "id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/subnet1" + } + ] + }, + "type" : "Microsoft.Network/natGateways" + }, + { + "name" : "test-natGateway2", + "sku": { + "name": "Standard" + }, + "id" : "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/natGateway/test-natGateway2", + "location" : "westus", + "properties" : { + "idleTimeoutInMinutes" : 5, + "provisioningState": "Succeeded", + "publicIpAddresses": [ + { + "id": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/publicIPAddresses/PublicIpAddress1" + } + ], + "publicIpPrefixes": [ + { + "id": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/publicIPPrefixes/PublicIpPrefix1" + } + ], + "subnets": [ + { + "id" : "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/subnet1" + } + ] + }, + "type" : "Microsoft.Network/natGateways" + } + ] + } + } + } + } + diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayListAll.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayListAll.json new file mode 100644 index 000000000000..79745cd8b47f --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayListAll.json @@ -0,0 +1,71 @@ +{ + "parameters" : { + "api-version": "2018-12-01", + "subscriptionId" : "subid" + }, + "responses" : { + "200" : { + "body" : { + "value" : [ + { + "name" : "test-natGateway", + "sku": { + "name": "Standard" + }, + "id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/natGateways/test-natGateway", + "location" : "westus", + "properties" : { + "idleTimeoutInMinutes" : 5, + "provisioningState": "Succeeded", + "publicIpAddresses": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPAddresses/PublicIpAddress1" + } + ], + "publicIpPrefixes": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPPrefixes/PublicIpPrefix1" + } + ], + "subnets": [ + { + "id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/subnet1" + } + ] + }, + "type" : "Microsoft.Network/natGateways" + }, + { + "name" : "test-natGateway2", + "sku": { + "name": "Standard" + }, + "id" : "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/natGatewayes/test-natGateway2", + "location" : "westus", + "properties" : { + "idleTimeoutInMinutes" : 5, + "provisioningState": "Succeeded", + "publicIpAddresses": [ + { + "id": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/publicIPAddresses/PublicIpAddress1" + } + ], + "publicIpPrefixes": [ + { + "id": "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/publicIPPrefixes/PublicIpPrefix1" + } + ], + "subnets": [ + { + "id" : "/subscriptions/subid/resourceGroups/rg2/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/subnet1" + } + ] + }, + "type" : "Microsoft.Network/natGateways" + } + ] + } + } + } + } + diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayUpdateTags.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayUpdateTags.json new file mode 100644 index 000000000000..a0b1b0a304cc --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayUpdateTags.json @@ -0,0 +1,50 @@ +{ + "parameters" : { + "api-version": "2018-12-01", + "subscriptionId" : "subid", + "resourceGroupName": "rg1", + "natGatewayName": "test-natGateway", + "parameters": { + "tags": { + "tag1": "value1", + "tag2": "value2" + } + } + }, + "responses" : { + "200" : { + "body" : { + "name" : "test-natGateway", + "sku": { + "name": "Standard" + }, + "id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/natGateways/test-natGateway", + "location" : "westus", + "properties" : { + "idleTimeoutInMinutes" : 5, + "provisioningState": "Succeeded", + "publicIpAddresses": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPAddresses/PublicIpAddress1" + } + ], + "publicIpPrefixes": [ + { + "id": "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/publicIPPrefixes/PublicIpPrefix1" + } + ], + "subnets": [ + { + "id" : "/subscriptions/subid/resourceGroups/rg1/providers/Microsoft.Network/virtualNetworks/test-vnet/subnets/subnet1" + } + ] + }, + "tags": { + "tag1": "value1", + "tag2": "value2" + }, + "type" : "Microsoft.Network/natGateways" + } + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/natGateway.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/natGateway.json new file mode 100644 index 000000000000..cf2459b26120 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/natGateway.json @@ -0,0 +1,407 @@ +{ + "swagger": "2.0", + "info": { + "title": "NetworkManagementClient", + "description": "The Microsoft Azure Network management API provides a RESTful set of web services that interact with Microsoft Azure Networks service to manage your network resources. The API has entities that capture the relationship between an end user and the Microsoft Azure Networks service.", + "version": "2018-12-01" + }, + "host": "management.azure.com", + "schemes": [ + "https" + ], + "consumes": [ + "application/json" + ], + "produces": [ + "application/json" + ], + "security": [ + { + "azure_auth": [ + "user_impersonation" + ] + } + ], + "securityDefinitions": { + "azure_auth": { + "type": "oauth2", + "authorizationUrl": "https://login.microsoftonline.com/common/oauth2/authorize", + "flow": "implicit", + "description": "Azure Active Directory OAuth2 Flow", + "scopes": { + "user_impersonation": "impersonate your user account" + } + } + }, + "paths": { + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/natGateways/{natGatewayName}": { + "delete": { + "tags": [ + "NatGateways" + ], + "operationId": "NatGateways_Delete", + "description": "Deletes the specified nat gateway.", + "parameters": [ + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group." + }, + { + "name": "natGatewayName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the nat gateway." + }, + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "204": { + "description": "Request successful. Resource does not exist." + }, + "202": { + "description": "Accepted and the operation will complete asynchronously." + }, + "200": { + "description": "Delete successful." + } + }, + "x-ms-examples": { + "Delete nat gateway": { "$ref": "./examples/NatGatewayDelete.json" } + }, + "x-ms-long-running-operation": true + }, + "get": { + "tags": [ + "NatGateways" + ], + "operationId": "NatGateways_Get", + "description": "Gets the specified nat gateway in a specified resource group.", + "parameters": [ + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group." + }, + { + "name": "natGatewayName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the nat gateway." + }, + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + }, + { + "name": "$expand", + "in": "query", + "required": false, + "type": "string", + "description": "Expands referenced resources." + } + ], + "responses": { + "200": { + "description": "Request successful. The operation returns the resulting NatGateway resource.", + "schema": { + "$ref": "#/definitions/NatGateway" + } + } + }, + "x-ms-examples": { + "Get nat gateway": { "$ref": "./examples/NatGatewayGet.json" } + } + }, + "put": { + "tags": [ + "NatGateways" + ], + "operationId": "NatGateways_CreateOrUpdate", + "description": "Creates or updates a nat gateway.", + "parameters": [ + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group." + }, + { + "name": "natGatewayName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the nat gateway." + }, + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/NatGateway" + }, + "description": "Parameters supplied to the create or update nat gateway operation." + }, + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "201": { + "description": "Create successful. The operation returns the resulting NatGateway resource.", + "schema": { + "$ref": "#/definitions/NatGateway" + } + }, + "200": { + "description": "Update successful. The operation returns the resulting NatGateway resource.", + "schema": { + "$ref": "#/definitions/NatGateway" + } + }, + "202": { + "description": "Accepted and the operation will complete asynchronously." + } + }, + "x-ms-examples": { + "Create nat gateway": { "$ref": "./examples/NatGatewayCreate.json" } + }, + "x-ms-long-running-operation": true + }, + "patch": { + "tags": [ + "NatGateways" + ], + "operationId": "NatGateways_UpdateTags", + "description": "Updates nat gateway tags.", + "parameters": [ + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group." + }, + { + "name": "natGatewayName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the nat gateway." + }, + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "./network.json#/definitions/TagsObject" + }, + "description": "Parameters supplied to update nat gateway tags." + }, + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "Update successful. The operation returns the resulting NatGateway resource.", + "schema": { + "$ref": "#/definitions/NatGateway" + } + } + }, + "x-ms-examples": { + "Update nat gateway tags": { "$ref": "./examples/NatGatewayUpdateTags.json" } + }, + "x-ms-long-running-operation": true + } + }, + "/subscriptions/{subscriptionId}/providers/Microsoft.Network/natGateways": { + "get": { + "tags": [ + "NatGateways" + ], + "operationId": "NatGateways_ListAll", + "description": "Gets all the Nat Gateways in a subscription.", + "parameters": [ + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "Request successful. The operation returns a list of NatGateway resources.", + "schema": { + "$ref": "#/definitions/NatGatewayListResult" + } + } + }, + "x-ms-examples": { + "List all nat gateways": { "$ref": "./examples/NatGatewayListAll.json" } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Network/natGateways": { + "get": { + "tags": [ + "NatGateways" + ], + "operationId": "NatGateways_List", + "description": "Gets all nat gateways in a resource group.", + "parameters": [ + { + "name": "resourceGroupName", + "in": "path", + "required": true, + "type": "string", + "description": "The name of the resource group." + }, + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "Request successful. The operation returns a list of NatGateway resources.", + "schema": { + "$ref": "#/definitions/NatGatewayListResult" + } + } + }, + "x-ms-examples": { + "List nat gateways in resource group": { "$ref": "./examples/NatGatewayList.json" } + }, + "x-ms-pageable": { + "nextLinkName": "nextLink" + } + } + } + }, + "definitions": { + "NatGatewaySku": { + "properties": { + "name": { + "type": "string", + "description": "Name of Nat Gateway SKU.", + "enum": [ + "Basic", + "Standard" + ], + "x-ms-enum": { + "name": "NatGatewaySkuName", + "modelAsString": true + } + } + }, + "description": "SKU of nat gateway" + }, + "NatGatewayPropertiesFormat": { + "properties": { + "idleTimeoutInMinutes": { + "type": "integer", + "format": "int32", + "description": "The idle timeout of the nat gateway." + }, + "publicIpAddresses": { + "type": "array", + "items": { + "$ref": "./network.json#/definitions/SubResource" + }, + "description": "An array of public ip addresses associated with the nat gateway resource." + }, + "publicIpPrefixes": { + "type": "array", + "items": { + "$ref": "./network.json#/definitions/SubResource" + }, + "description": "An array of public ip prefixes associated with the nat gateway resource." + }, + "subnets": { + "readOnly": true, + "type": "array", + "items": { + "$ref": "./network.json#/definitions/SubResource" + }, + "description": "Gets an array of references to the subnets using this nat gateway resource." + }, + "resourceGuid": { + "type": "string", + "description": "The resource GUID property of the nat gateway resource." + }, + "provisioningState": { + "type": "string", + "description": "The provisioning state of the NatGateway resource. Possible values are: 'Updating', 'Deleting', and 'Failed'." + } + }, + "description": "Nat Gateway properties." + }, + "NatGateway": { + "properties": { + "sku": { + "$ref": "#/definitions/NatGatewaySku", + "description": "The nat gateway SKU." + }, + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/NatGatewayPropertiesFormat", + "description": "Nat Gateway properties." + }, + "etag": { + "type": "string", + "description": "A unique read-only string that changes whenever the resource is updated." + } + }, + "allOf": [ + { + "$ref": "./network.json#/definitions/Resource" + } + ], + "description": "Nat Gateway resource." + }, + "NatGatewayListResult": { + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/NatGateway" + }, + "description": "A list of Nat Gateways that exists in a resource group." + }, + "nextLink": { + "type": "string", + "description": "The URL to get the next set of results." + } + }, + "description": "Response for ListNatGateways API service call." + } + } +} \ No newline at end of file diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/virtualNetwork.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/virtualNetwork.json index e848c6f760eb..31b34cad37a1 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/virtualNetwork.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/virtualNetwork.json @@ -1029,6 +1029,10 @@ "$ref": "./routeTable.json#/definitions/RouteTable", "description": "The reference of the RouteTable resource." }, + "natGateway": { + "$ref":"./network.json#/definitions/SubResource", + "description": "Nat gateway associated with this subnet." + }, "serviceEndpoints": { "type": "array", "items": { diff --git a/specification/network/resource-manager/readme.md b/specification/network/resource-manager/readme.md index c2a83ca2ed22..62d2f67387b4 100644 --- a/specification/network/resource-manager/readme.md +++ b/specification/network/resource-manager/readme.md @@ -53,6 +53,7 @@ input-file: - Microsoft.Network/stable/2019-02-01/expressRoutePort.json - Microsoft.Network/stable/2019-02-01/interfaceEndpoint.json - Microsoft.Network/stable/2019-02-01/loadBalancer.json + - Microsoft.Network/stable/2019-02-01/natGateway.json - Microsoft.Network/stable/2019-02-01/network.json - Microsoft.Network/stable/2019-02-01/networkInterface.json - Microsoft.Network/stable/2019-02-01/networkProfile.json @@ -876,6 +877,9 @@ directive: - suppress: RequiredPropertiesMissingInResourceModel from: loadBalancer.json reason: name, id and type properties are inherited from the upper level + - suppress: RequiredPropertiesMissingInResourceModel + from: natGateway.json + reason: name, id and type properties are inherited from the upper level - suppress: RequiredPropertiesMissingInResourceModel from: networkInterface.json reason: name, id and type properties are inherited from the upper level From eafa1024f09799891f76a09f476bd406b1f5a973 Mon Sep 17 00:00:00 2001 From: Rhea Khanna Date: Mon, 8 Apr 2019 10:14:26 -0700 Subject: [PATCH 02/13] Update API version --- .../stable/2019-02-01/examples/NatGatewayCreate.json | 2 +- .../stable/2019-02-01/examples/NatGatewayDelete.json | 2 +- .../stable/2019-02-01/examples/NatGatewayGet.json | 2 +- .../stable/2019-02-01/examples/NatGatewayList.json | 2 +- .../stable/2019-02-01/examples/NatGatewayListAll.json | 2 +- .../stable/2019-02-01/examples/NatGatewayUpdateTags.json | 2 +- .../Microsoft.Network/stable/2019-02-01/natGateway.json | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayCreate.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayCreate.json index c174565608df..a6454295dc72 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayCreate.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayCreate.json @@ -1,6 +1,6 @@ { "parameters":{ - "api-version":"2018-12-01", + "api-version":"2019-02-01", "subscriptionId":"subid", "resourceGroupName":"rg1", "natGatewayName":"test-natgateway", diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayDelete.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayDelete.json index efb515130341..4d4a578acb80 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayDelete.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayDelete.json @@ -1,6 +1,6 @@ { "parameters" : { - "api-version": "2018-12-01", + "api-version": "2019-02-01", "subscriptionId" : "subid", "resourceGroupName": "rg1", "natGatewayName": "test-natGateway" diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayGet.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayGet.json index d5790c562e04..d54318e2d601 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayGet.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayGet.json @@ -1,6 +1,6 @@ { "parameters" : { - "api-version": "2018-12-01", + "api-version": "2019-02-01", "subscriptionId" : "subid", "resourceGroupName": "rg1", "natGatewayName": "test-natGateway" diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayList.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayList.json index 831b17e29253..880e9a9fbd63 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayList.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayList.json @@ -1,6 +1,6 @@ { "parameters" : { - "api-version": "2018-12-01", + "api-version": "2019-02-01", "subscriptionId" : "subid", "resourceGroupName" : "rg1" }, diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayListAll.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayListAll.json index 79745cd8b47f..11f326beac4f 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayListAll.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayListAll.json @@ -1,6 +1,6 @@ { "parameters" : { - "api-version": "2018-12-01", + "api-version": "2019-02-01", "subscriptionId" : "subid" }, "responses" : { diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayUpdateTags.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayUpdateTags.json index a0b1b0a304cc..9e2ec4314ea3 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayUpdateTags.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayUpdateTags.json @@ -1,6 +1,6 @@ { "parameters" : { - "api-version": "2018-12-01", + "api-version": "2019-02-01", "subscriptionId" : "subid", "resourceGroupName": "rg1", "natGatewayName": "test-natGateway", diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/natGateway.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/natGateway.json index cf2459b26120..e62931db59fa 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/natGateway.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/natGateway.json @@ -3,7 +3,7 @@ "info": { "title": "NetworkManagementClient", "description": "The Microsoft Azure Network management API provides a RESTful set of web services that interact with Microsoft Azure Networks service to manage your network resources. The API has entities that capture the relationship between an end user and the Microsoft Azure Networks service.", - "version": "2018-12-01" + "version": "2019-02-01" }, "host": "management.azure.com", "schemes": [ From fe49a589c51461bbd7f776c50812fde616d395b9 Mon Sep 17 00:00:00 2001 From: Rhea Khanna Date: Mon, 8 Apr 2019 10:27:15 -0700 Subject: [PATCH 03/13] Update PR comments --- .../Microsoft.Network/stable/2019-02-01/natGateway.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/natGateway.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/natGateway.json index e62931db59fa..dd28bb4b72e8 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/natGateway.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/natGateway.json @@ -77,7 +77,9 @@ "x-ms-examples": { "Delete nat gateway": { "$ref": "./examples/NatGatewayDelete.json" } }, - "x-ms-long-running-operation": true + "x-ms-long-running-operation": { + "final-state-via": "location" + } }, "get": { "tags": [ @@ -183,7 +185,9 @@ "x-ms-examples": { "Create nat gateway": { "$ref": "./examples/NatGatewayCreate.json" } }, - "x-ms-long-running-operation": true + "x-ms-long-running-operation-options": { + "final-state-via": "azure-async-operation" + } }, "patch": { "tags": [ From a3493db1901a5cc4e508a060b6321465800de2e8 Mon Sep 17 00:00:00 2001 From: Rhea Khanna Date: Mon, 8 Apr 2019 10:35:52 -0700 Subject: [PATCH 04/13] Update nat gateway --- .../Microsoft.Network/stable/2019-02-01/natGateway.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/natGateway.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/natGateway.json index dd28bb4b72e8..929bd99cab63 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/natGateway.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/natGateway.json @@ -77,6 +77,7 @@ "x-ms-examples": { "Delete nat gateway": { "$ref": "./examples/NatGatewayDelete.json" } }, + "x-ms-long-running-operation": true "x-ms-long-running-operation": { "final-state-via": "location" } @@ -185,6 +186,7 @@ "x-ms-examples": { "Create nat gateway": { "$ref": "./examples/NatGatewayCreate.json" } }, + "x-ms-long-running-operation": true "x-ms-long-running-operation-options": { "final-state-via": "azure-async-operation" } From f89b36c501cc799dba3f6cae8a7450883db65a5c Mon Sep 17 00:00:00 2001 From: Rhea Khanna Date: Mon, 8 Apr 2019 10:43:44 -0700 Subject: [PATCH 05/13] Fix json errors --- .../Microsoft.Network/stable/2019-02-01/natGateway.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/natGateway.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/natGateway.json index 929bd99cab63..6baf553d9515 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/natGateway.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/natGateway.json @@ -77,7 +77,7 @@ "x-ms-examples": { "Delete nat gateway": { "$ref": "./examples/NatGatewayDelete.json" } }, - "x-ms-long-running-operation": true + "x-ms-long-running-operation": true, "x-ms-long-running-operation": { "final-state-via": "location" } @@ -186,7 +186,7 @@ "x-ms-examples": { "Create nat gateway": { "$ref": "./examples/NatGatewayCreate.json" } }, - "x-ms-long-running-operation": true + "x-ms-long-running-operation": true, "x-ms-long-running-operation-options": { "final-state-via": "azure-async-operation" } From 7fb944c4248ec2699074d765da01e91e792fd1e7 Mon Sep 17 00:00:00 2001 From: Rhea Khanna Date: Mon, 8 Apr 2019 10:57:13 -0700 Subject: [PATCH 06/13] Updated nat gateway --- .../Microsoft.Network/stable/2019-02-01/natGateway.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/natGateway.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/natGateway.json index 6baf553d9515..776e3b4ff95d 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/natGateway.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/natGateway.json @@ -78,7 +78,7 @@ "Delete nat gateway": { "$ref": "./examples/NatGatewayDelete.json" } }, "x-ms-long-running-operation": true, - "x-ms-long-running-operation": { + "x-ms-long-running-operation-options": { "final-state-via": "location" } }, From c18f034fcfc88f18800b868278125937caa41476 Mon Sep 17 00:00:00 2001 From: Rhea Khanna Date: Mon, 8 Apr 2019 13:04:29 -0700 Subject: [PATCH 07/13] Update Nat Gateway examples name --- .../{NatGatewayCreate.json => NatGatewayCreateOrUpdate.json} | 0 .../Microsoft.Network/stable/2019-02-01/natGateway.json | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/{NatGatewayCreate.json => NatGatewayCreateOrUpdate.json} (100%) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayCreate.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayCreateOrUpdate.json similarity index 100% rename from specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayCreate.json rename to specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayCreateOrUpdate.json diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/natGateway.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/natGateway.json index 776e3b4ff95d..0d134d7405cb 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/natGateway.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/natGateway.json @@ -184,7 +184,7 @@ } }, "x-ms-examples": { - "Create nat gateway": { "$ref": "./examples/NatGatewayCreate.json" } + "Create nat gateway": { "$ref": "./examples/NatGatewayCreateOrUpdate.json" } }, "x-ms-long-running-operation": true, "x-ms-long-running-operation-options": { From 7627a36985d44ac7b4dc955be5d478925adcc17a Mon Sep 17 00:00:00 2001 From: Rhea Khanna Date: Mon, 8 Apr 2019 13:28:57 -0700 Subject: [PATCH 08/13] Update Examples with 202 --- .../stable/2019-02-01/examples/NatGatewayCreateOrUpdate.json | 1 + .../Microsoft.Network/stable/2019-02-01/natGateway.json | 5 ++++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayCreateOrUpdate.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayCreateOrUpdate.json index a6454295dc72..d4c96a7f45b2 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayCreateOrUpdate.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/examples/NatGatewayCreateOrUpdate.json @@ -55,6 +55,7 @@ "type":"Microsoft.Network/natGateways" } }, + "202" : { }, "201":{ "body":{ "name":"test-natGateway", diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/natGateway.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/natGateway.json index 0d134d7405cb..ab65533e4a43 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/natGateway.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/natGateway.json @@ -180,7 +180,10 @@ } }, "202": { - "description": "Accepted and the operation will complete asynchronously." + "description": "Accepted and the operation will complete asynchronously.", + "schema": { + "$ref": "#/definitions/NatGateway" + } } }, "x-ms-examples": { From 938bbbefc9365d6e75793fe0e80e614b2c7007cf Mon Sep 17 00:00:00 2001 From: Rhea Khanna Date: Mon, 8 Apr 2019 18:35:19 -0700 Subject: [PATCH 09/13] Need to update with latest master since network.csproj is failing on azure-powershell --- .../Microsoft.Network/stable/2019-02-01/azureFirewall.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/azureFirewall.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/azureFirewall.json index 366c5fed2a7e..e20bdb88d065 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/azureFirewall.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/azureFirewall.json @@ -736,7 +736,8 @@ "description":"The action type of a rule collection", "enum":[ "Allow", - "Deny" + "Deny", + "Alert" ], "x-ms-enum":{ "name":"AzureFirewallRCActionType", From 66b630dbddb69d5a29c0b1d105bd2f857e756625 Mon Sep 17 00:00:00 2001 From: Rhea Khanna Date: Wed, 10 Apr 2019 16:54:44 -0700 Subject: [PATCH 10/13] azure firewall revert alert --- .../Microsoft.Network/stable/2019-02-01/azureFirewall.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/azureFirewall.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/azureFirewall.json index e20bdb88d065..366c5fed2a7e 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/azureFirewall.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/azureFirewall.json @@ -736,8 +736,7 @@ "description":"The action type of a rule collection", "enum":[ "Allow", - "Deny", - "Alert" + "Deny" ], "x-ms-enum":{ "name":"AzureFirewallRCActionType", From 790b06b205496071539329965d6d29f21ccce600 Mon Sep 17 00:00:00 2001 From: Rhea Khanna Date: Wed, 10 Apr 2019 17:18:52 -0700 Subject: [PATCH 11/13] Update NatGateway --- .../Microsoft.Network/stable/2019-02-01/natGateway.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/natGateway.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/natGateway.json index ab65533e4a43..2d4b3c8935e3 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/natGateway.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/natGateway.json @@ -360,7 +360,7 @@ "items": { "$ref": "./network.json#/definitions/SubResource" }, - "description": "Gets an array of references to the subnets using this nat gateway resource." + "description": "An array of references to the subnets using this nat gateway resource." }, "resourceGuid": { "type": "string", From 50e6cff0eb99c574a257d62525c1734eb5b8b1c9 Mon Sep 17 00:00:00 2001 From: Rhea Khanna Date: Thu, 11 Apr 2019 08:49:23 -0700 Subject: [PATCH 12/13] Update nat gateway tags --- .../Microsoft.Network/stable/2019-02-01/natGateway.json | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/natGateway.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/natGateway.json index 2d4b3c8935e3..c00e3693a8c5 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/natGateway.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/natGateway.json @@ -241,8 +241,7 @@ }, "x-ms-examples": { "Update nat gateway tags": { "$ref": "./examples/NatGatewayUpdateTags.json" } - }, - "x-ms-long-running-operation": true + } } }, "/subscriptions/{subscriptionId}/providers/Microsoft.Network/natGateways": { From 62f7d2ed3c7216404cc5d6ae9f250fb3152e72c0 Mon Sep 17 00:00:00 2001 From: Rhea Khanna Date: Fri, 12 Apr 2019 13:03:12 -0700 Subject: [PATCH 13/13] Remove basic sku since it is not supported --- .../Microsoft.Network/stable/2019-02-01/natGateway.json | 1 - 1 file changed, 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/natGateway.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/natGateway.json index c00e3693a8c5..460187282935 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/natGateway.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-02-01/natGateway.json @@ -321,7 +321,6 @@ "type": "string", "description": "Name of Nat Gateway SKU.", "enum": [ - "Basic", "Standard" ], "x-ms-enum": {