From 123a3fe3504185e02551d41ead214dfab65f53dd Mon Sep 17 00:00:00 2001 From: Anton Evseev Date: Thu, 23 May 2019 10:30:56 +0300 Subject: [PATCH 1/4] Specs for ServiceTags --- .../2019-04-01/examples/ServiceTagsList.json | 88 +++++++++++ .../stable/2019-04-01/serviceTags.json | 148 ++++++++++++++++++ .../network/resource-manager/readme.md | 1 + 3 files changed, 237 insertions(+) create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/examples/ServiceTagsList.json create mode 100644 specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/serviceTags.json diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/examples/ServiceTagsList.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/examples/ServiceTagsList.json new file mode 100644 index 000000000000..aaca11bdd268 --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/examples/ServiceTagsList.json @@ -0,0 +1,88 @@ +{ + "parameters": { + "api-version": "2019-04-01", + "location": "regionName", + "subscriptionId": "subId" + }, + "responses": { + "200": { + "body": { + "name": "public", + "id": "/subscriptions/subId/providers/Microsoft.Network/serviceTags/public", + "type": "Microsoft.Network/serviceTags", + "changeNumber": "63", + "cloud": "Public", + "values": [ + { + "name": "ApiManagement", + "id": "ApiManagement", + "properties": { + "changeNumber": "7", + "region": "", + "systemService": "AzureApiManagement", + "addressPrefixes": [ + "13.64.39.16/32", + "40.74.146.80/31", + "40.74.147.32/28" + ] + } + }, + { + "name": "ApiManagement.AustraliaCentral", + "id": "ApiManagement.AustraliaCentral", + "properties": { + "changeNumber": "2", + "region": "australiacentral", + "systemService": "AzureApiManagement", + "addressPrefixes": [ + "20.36.106.68/31", + "20.36.107.176/28" + ] + } + }, + { + "name": "AppService", + "id": "AppService", + "properties": { + "changeNumber": "13", + "region": "", + "systemService": "AzureAppService", + "addressPrefixes": [ + "13.64.73.110/32", + "191.235.208.12/32", + "191.235.215.184/32" + ] + } + }, + { + "name": "ServiceBus", + "id": "ServiceBus", + "properties": { + "changeNumber": "10", + "region": "", + "systemService": "AzureServiceBus", + "addressPrefixes": [ + "23.98.82.96/29", + "40.68.127.68/32", + "40.70.146.64/29" + ] + } + }, + { + "name": "ServiceBus.EastUS2", + "id": "ServiceBus.EastUS2", + "properties": { + "changeNumber": "1", + "region": "eastus2", + "systemService": "AzureServiceBus", + "addressPrefixes": [ + "13.68.110.36/32", + "40.70.146.64/29" + ] + } + } + ] + } + } + } +} diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/serviceTags.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/serviceTags.json new file mode 100644 index 000000000000..e524af08859b --- /dev/null +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/serviceTags.json @@ -0,0 +1,148 @@ +{ + "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": "2019-04-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}/providers/Microsoft.Network/locations/{location}/serviceTags": { + "get": { + "operationId": "ServiceTags_List", + "description": "Gets a list of service tag information resources.", + "parameters": [ + { + "name": "location", + "in": "path", + "required": true, + "type": "string", + "description": "" + }, + { + "$ref": "./network.json#/parameters/ApiVersionParameter" + }, + { + "$ref": "./network.json#/parameters/SubscriptionIdParameter" + } + ], + "responses": { + "200": { + "description": "Request successful. Returns a list of service tag information resources.", + "schema": { + "$ref": "#/definitions/ServiceTagsListResult" + } + } + }, + "x-ms-examples": { + "Get list of service tags": { + "$ref": "./examples/ServiceTagsList.json" + } + } + } + } + }, + "definitions": { + "ServiceTagsListResult": { + "properties": { + "name": { + "type": "string", + "description": "The name of the cloud." + }, + "id": { + "type": "string", + "description": "The ID of the cloud." + }, + "type": { + "type": "string", + "description": "The azure resource type." + }, + "changeNumber": { + "type": "string", + "description": "The iteration number." + }, + "cloud": { + "type": "string", + "description": "The name of the cloud." + }, + "values": { + "type": "array", + "items": { + "$ref": "#/definitions/ServiceTagInformation" + }, + "description": "The list of service tag information resources." + } + }, + "description": "Response for the ListServiceTags API service call." + }, + "ServiceTagInformation": { + "properties": { + "properties": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/ServiceTagInformationPropertiesFormat", + "description": "Properties of the service tag information." + }, + "name": { + "type": "string", + "description": "The name of service tag." + }, + "id": { + "type": "string", + "description": "The ID of service tag." + } + }, + "description": "The service tag information." + }, + "ServiceTagInformationPropertiesFormat": { + "properties": { + "changeNumber": { + "type": "string", + "description": "The iteration number of service tag." + }, + "region": { + "type": "string", + "description": "The region of service tag." + }, + "systemService": { + "type": "string", + "description": "The name of system service." + }, + "addressPrefixes": { + "type": "array", + "items": { + "type": "string" + }, + "description": "The list of IP address prefixes." + } + }, + "description": "Properties of the service tag information." + } + } +} diff --git a/specification/network/resource-manager/readme.md b/specification/network/resource-manager/readme.md index 67665460f165..849a1079e94a 100644 --- a/specification/network/resource-manager/readme.md +++ b/specification/network/resource-manager/readme.md @@ -68,6 +68,7 @@ input-file: - Microsoft.Network/stable/2019-04-01/routeTable.json - Microsoft.Network/stable/2019-04-01/serviceCommunity.json - Microsoft.Network/stable/2019-04-01/serviceEndpointPolicy.json + - Microsoft.Network/stable/2019-04-01/serviceTags.json - Microsoft.Network/stable/2019-04-01/usage.json - Microsoft.Network/stable/2019-04-01/virtualNetwork.json - Microsoft.Network/stable/2019-04-01/virtualNetworkGateway.json From e68c969ca94fa217391d17e12595892432ce1c43 Mon Sep 17 00:00:00 2001 From: Anton Evseev Date: Thu, 23 May 2019 11:28:14 +0300 Subject: [PATCH 2/4] Add description --- .../Microsoft.Network/stable/2019-04-01/serviceTags.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/serviceTags.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/serviceTags.json index e524af08859b..6f5f4011338c 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/serviceTags.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/serviceTags.json @@ -44,7 +44,7 @@ "in": "path", "required": true, "type": "string", - "description": "" + "description": "The location." }, { "$ref": "./network.json#/parameters/ApiVersionParameter" From 29d966931ca26f2b962fb6b477ceec8c863d671e Mon Sep 17 00:00:00 2001 From: Anton Evseev Date: Thu, 23 May 2019 16:17:06 +0300 Subject: [PATCH 3/4] Addressed PR feedback --- .../Microsoft.Network/stable/2019-04-01/serviceTags.json | 1 - 1 file changed, 1 deletion(-) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/serviceTags.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/serviceTags.json index 6f5f4011338c..2c0d0ffd8390 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/serviceTags.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/serviceTags.json @@ -105,7 +105,6 @@ "ServiceTagInformation": { "properties": { "properties": { - "x-ms-client-flatten": true, "$ref": "#/definitions/ServiceTagInformationPropertiesFormat", "description": "Properties of the service tag information." }, From be6c18be000a610aeead7a786c79f378aebf454c Mon Sep 17 00:00:00 2001 From: Anton Evseev Date: Thu, 23 May 2019 20:48:09 +0300 Subject: [PATCH 4/4] Add read-only flags --- .../stable/2019-04-01/serviceTags.json | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/serviceTags.json b/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/serviceTags.json index 2c0d0ffd8390..9dafd19d12e7 100644 --- a/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/serviceTags.json +++ b/specification/network/resource-manager/Microsoft.Network/stable/2019-04-01/serviceTags.json @@ -74,22 +74,27 @@ "properties": { "name": { "type": "string", + "readOnly": true, "description": "The name of the cloud." }, "id": { "type": "string", + "readOnly": true, "description": "The ID of the cloud." }, "type": { "type": "string", + "readOnly": true, "description": "The azure resource type." }, "changeNumber": { "type": "string", + "readOnly": true, "description": "The iteration number." }, "cloud": { "type": "string", + "readOnly": true, "description": "The name of the cloud." }, "values": { @@ -97,6 +102,7 @@ "items": { "$ref": "#/definitions/ServiceTagInformation" }, + "readOnly": true, "description": "The list of service tag information resources." } }, @@ -106,14 +112,17 @@ "properties": { "properties": { "$ref": "#/definitions/ServiceTagInformationPropertiesFormat", + "readOnly": true, "description": "Properties of the service tag information." }, "name": { "type": "string", + "readOnly": true, "description": "The name of service tag." }, "id": { "type": "string", + "readOnly": true, "description": "The ID of service tag." } }, @@ -123,14 +132,17 @@ "properties": { "changeNumber": { "type": "string", + "readOnly": true, "description": "The iteration number of service tag." }, "region": { "type": "string", + "readOnly": true, "description": "The region of service tag." }, "systemService": { "type": "string", + "readOnly": true, "description": "The name of system service." }, "addressPrefixes": { @@ -138,6 +150,7 @@ "items": { "type": "string" }, + "readOnly": true, "description": "The list of IP address prefixes." } },