Skip to content

Commit

Permalink
[Resources] Import APIs for subscriptions.json file (Azure#12964)
Browse files Browse the repository at this point in the history
* copy from 2020-01-01/subscriptions.json

* add changes for extended location

* Add examples copied from 2020-01-01

* add example for getting locations with extended locations

* add reference to example file

* Add extended location to resource definition.

* resolve comments

* update readme.md for subscriptions

* update error responses in subscriptions spec

* revert changes in common types

* remove changes in 2020-10-01. add 2021-01-01.

* copy subscriptions.json

* add changes for extended locations in 2021-01-01

* update version to 2021-01-01

* revert unwanted changes

* Fix readme

* add x-ms-mutability to extendedLocation property
  • Loading branch information
Tiano2017 authored Mar 31, 2021
1 parent 5a260d4 commit 9af1923
Show file tree
Hide file tree
Showing 9 changed files with 1,112 additions and 23 deletions.
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
{
"parameters": {
"body": [
{
"Name": "isxbox",
"Type": "ResourceProviderTestHost/TestResourceType"
}
],
"api-version": "2021-01-01"
},
"responses": {
"200": {
"body": {
"name": "isxbox",
"type": "ResourceProviderTestHost/TestResourceType",
"status": "Allowed"
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
{
"parameters": {
"subscriptionId": "291bba3f-e0a5-47bc-a099-3bdcb2a50a05",
"api-version": "2021-01-01"
},
"responses": {
"200": {
"body": [
{
"id": "/subscriptions/291bba3f-e0a5-47bc-a099-3bdcb2a50a05/locations/eastus",
"name": "eastus",
"type": "Region",
"displayName": "East US",
"regionalDisplayName": "(US) East US",
"metadata": {
"regionType": "Physical",
"regionCategory": "Recommended",
"geographyGroup": "US",
"longitude": "-79.8164",
"latitude": "37.3719",
"physicalLocation": "Virginia",
"pairedRegion": [
{
"name": "westus",
"id": "/subscriptions/291bba3f-e0a5-47bc-a099-3bdcb2a50a05/locations/westus"
}
]
}
},
{
"id": "/subscriptions/291bba3f-e0a5-47bc-a099-3bdcb2a50a05/locations/eastus2",
"name": "eastus2",
"type": "Region",
"displayName": "East US 2",
"regionalDisplayName": "(US) East US 2",
"metadata": {
"regionType": "Physical",
"regionCategory": "Recommended",
"geographyGroup": "US",
"longitude": "-78.3889",
"latitude": "36.6681",
"physicalLocation": "Virginia",
"pairedRegion": [
{
"name": "centralus",
"id": "/subscriptions/291bba3f-e0a5-47bc-a099-3bdcb2a50a05/locations/centralus"
}
]
}
}
]
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,83 @@
{
"parameters": {
"subscriptionId": "291bba3f-e0a5-47bc-a099-3bdcb2a50a05",
"api-version": "2021-01-01",
"includeExtendedLocations": "true"
},
"responses": {
"200": {
"body": [
{
"id": "/subscriptions/291bba3f-e0a5-47bc-a099-3bdcb2a50a05/locations/eastus",
"name": "eastus",
"type": "Region",
"displayName": "East US",
"regionalDisplayName": "(US) East US",
"metadata": {
"regionType": "Physical",
"regionCategory": "Recommended",
"geographyGroup": "US",
"longitude": "-79.8164",
"latitude": "37.3719",
"physicalLocation": "Virginia",
"pairedRegion": [
{
"name": "westus",
"id": "/subscriptions/291bba3f-e0a5-47bc-a099-3bdcb2a50a05/locations/westus"
}
]
}
},
{
"id": "/subscriptions/291bba3f-e0a5-47bc-a099-3bdcb2a50a05/locations/eastus2",
"name": "eastus2",
"type": "Region",
"displayName": "East US 2",
"regionalDisplayName": "(US) East US 2",
"metadata": {
"regionType": "Physical",
"regionCategory": "Recommended",
"geographyGroup": "US",
"longitude": "-78.3889",
"latitude": "36.6681",
"physicalLocation": "Virginia",
"pairedRegion": [
{
"name": "centralus",
"id": "/subscriptions/291bba3f-e0a5-47bc-a099-3bdcb2a50a05/locations/centralus"
}
]
}
},
{
"id": "/subscriptions/291bba3f-e0a5-47bc-a099-3bdcb2a50a05/locations/westus/edgeZones/microsoftlosangeles1",
"name": "microsoftlosangeles1",
"type": "EdgeZone",
"displayName": "Microsoft Los Angeles 1",
"regionalDisplayName": "Microsoft Los Angeles 1",
"metadata": {
"regionType": "Physical",
"regionCategory": "Extended",
"longitude": "-118.235374",
"latitude": "34.058414",
"homeLocation": "westus"
}
},
{
"id": "/subscriptions/291bba3f-e0a5-47bc-a099-3bdcb2a50a05/locations/eastus2euap/edgeZones/microsoftrrdclab1",
"name": "microsoftrrdclab1",
"type": "EdgeZone",
"displayName": "Microsoft RRDC Lab 1",
"regionalDisplayName": "Microsoft RRDC Lab 1",
"metadata": {
"regionType": "Physical",
"regionCategory": "Extended",
"longitude": "-122.03197",
"latitude": "47.69106",
"homeLocation": "eastus2euap"
}
}
]
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
{
"parameters": {
"subscriptionId": "291bba3f-e0a5-47bc-a099-3bdcb2a50a05",
"api-version": "2021-01-01"
},
"responses": {
"200": {
"body": {
"id": "/subscriptions/291bba3f-e0a5-47bc-a099-3bdcb2a50a05",
"subscriptionId": "291bba3f-e0a5-47bc-a099-3bdcb2a50a05",
"tenantId": "31c75423-32d6-4322-88b7-c478bdde4858",
"displayName": "Example Subscription",
"state": "Enabled",
"subscriptionPolicies": {
"locationPlacementId": "Internal_2014-09-01",
"quotaId": "Internal_2014-09-01",
"spendingLimit": "Off"
},
"authorizationSource": "Bypassed",
"managedByTenants": [
{
"tenantId": "8f70baf1-1f6e-46a2-a1ff-238dac1ebfb7"
}
],
"tags": {
"tagKey1": "tagValue1",
"tagKey2": "tagValue2"
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
{
"parameters": {
"api-version": "2021-01-01"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/subscriptions/291bba3f-e0a5-47bc-a099-3bdcb2a50a05",
"subscriptionId": "291bba3f-e0a5-47bc-a099-3bdcb2a50a05",
"tenantId": "31c75423-32d6-4322-88b7-c478bdde4858",
"displayName": "Example Subscription",
"state": "Enabled",
"subscriptionPolicies": {
"locationPlacementId": "Internal_2014-09-01",
"quotaId": "Internal_2014-09-01",
"spendingLimit": "Off"
},
"authorizationSource": "RoleBased",
"managedByTenants": [
{
"tenantId": "8f70baf1-1f6e-46a2-a1ff-238dac1ebfb7"
}
],
"tags": {
"tagKey1": "tagValue1",
"tagKey2": "tagValue2"
}
},
{
"id": "/subscriptions/72ac930a-f34e-42d8-b06d-dc2a9e12ed71",
"subscriptionId": "72ac930a-f34e-42d8-b06d-dc2a9e12ed71",
"tenantId": "2a0ff0de-96b2-4859-bb7c-a430d07a3e0c",
"displayName": "Example Subscription2",
"state": "Enabled",
"subscriptionPolicies": {
"locationPlacementId": "Internal_2014-09-01",
"quotaId": "Internal_2014-09-01",
"spendingLimit": "Off"
},
"authorizationSource": "RoleBased",
"managedByTenants": [
{
"tenantId": "8f70baf1-1f6e-46a2-a1ff-238dac1ebfb7"
},
{
"tenantId": "f7fb6af2-321d-47c8-9c0f-b0239eaad39a"
}
],
"tags": {
"tagKey1": "tagValue1",
"tagKey2": "tagValue2"
}
}
],
"nextLink": "..."
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
{
"parameters": {
"api-version": "2021-01-01"
},
"responses": {
"200": {
"body": {
"value": [
{
"id": "/tenants/a70a1586-9c4a-4373-b907-1d310660dbd1",
"tenantId": "a70a1586-9c4a-4373-b907-1d310660dbd1",
"countryCode": "US",
"displayName": "Test_Test_aad50",
"domains": [
"aad50.ccsctp.net"
],
"tenantCategory": "ManagedBy",
"defaultDomain": "aad50.ccsctp.net",
"tenantType": "AAD"
},
{
"id": "/tenants/83abe5cd-bcc3-441a-bd86-e6a75360cecc",
"tenantId": "83abe5cd-bcc3-441a-bd86-e6a75360cecc",
"countryCode": "US",
"displayName": "Contoso Corp.",
"domains": [
"auxteststagemanual.ccsctp.net"
],
"tenantCategory": "Home",
"defaultDomain": "auxteststagemanual.ccsctp.net",
"tenantType": "AAD"
},
{
"id": "/tenants/daea2e9b-847b-4c93-850d-2aa6f2d7af33",
"tenantId": "daea2e9b-847b-4c93-850d-2aa6f2d7af33",
"countryCode": "US",
"displayName": "TEST_TEST_RDV",
"domains": [
"rdvmohoro.ccsctp.net",
"rdvmohoro.mail.ccsctp.net",
"rdvmohoro.com"
],
"tenantCategory": "ProjectedBy",
"defaultDomain": "rdvmohoro.ccsctp.net",
"tenantType": "AAD",
"tenantBrandingLogoUrl": "logo1.logo.rdvmohoro.com"
}
],
"nextLink": "..."
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -5381,6 +5381,26 @@
],
"description": "Resource information."
},
"ExtendedLocation": {
"properties": {
"type": {
"type": "string",
"enum": [
"EdgeZone"
],
"x-ms-enum": {
"name": "ExtendedLocationType",
"modelAsString": true
},
"description": "The extended location type."
},
"name": {
"type": "string",
"description": "The extended location name."
}
},
"description": "Resource extended location."
},
"GenericResourceExpanded": {
"properties": {
"createdTime": {
Expand Down Expand Up @@ -5954,6 +5974,14 @@
"type": "string",
"description": "Resource location"
},
"extendedLocation": {
"$ref": "#/definitions/ExtendedLocation",
"x-ms-mutability": [
"read",
"create"
],
"description": "Resource extended location."
},
"tags": {
"type": "object",
"additionalProperties": {
Expand Down
Loading

0 comments on commit 9af1923

Please sign in to comment.