Skip to content

Add network profile in Spring payload. #10313

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 3, 2020
Merged

Add network profile in Spring payload. #10313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6353fe2
Add network profile in Spring payload.
bowen5 Jul 31, 2020
f97800a
Fix prettier check.
bowen5 Jul 31, 2020
fa6454c
Fix prettier.
bowen5 Jul 31, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 33 additions & 0 deletions ...atform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/appplatform.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,9 @@
"x-ms-examples": {
"Services_CreateOrUpdate": {
"$ref": "./examples/Services_CreateOrUpdate.json"
},
"Services_CreateOrUpdate_VNetInjection": {
"$ref": "./examples/Services_CreateOrUpdate_VNetInjection.json"
}
}
},
Expand Down Expand Up @@ -2296,6 +2299,10 @@
"$ref": "#/definitions/TraceProperties",
"description": "Trace properties of the Service"
},
"networkProfile": {
"$ref": "#/definitions/NetworkProfile",
"description": "Network profile of the Service"
},
"version": {
"format": "int32",
"description": "Version of the Service",
Expand Down Expand Up @@ -2416,6 +2423,32 @@
}
}
},
"NetworkProfile": {
"description": "Service network profile payload",
"type": "object",
"properties": {
"serviceRuntimeSubnetId": {
"description": "Fully qualified resource Id of the subnet to host Azure Spring Cloud Service Runtime",
"type": "string"
},
"appSubnetId": {
"description": "Fully qualified resource Id of the subnet to host Azure Spring Cloud Apps",
"type": "string"
},
"serviceCidr": {
"description": "Azure Spring Cloud service reserved CIDR",
"type": "string"
},
"serviceRuntimeNetworkResourceGroup": {
"description": "Name of the resource group containing network resources of Azure Spring Cloud Service Runtime",
"type": "string"
},
"appNetworkResourceGroup": {
"description": "Name of the resource group containing network resources of Azure Spring Cloud Apps",
"type": "string"
}
}
},
"Error": {
"description": "The error code compose of code and message.",
"type": "object",
Expand Down
12 changes: 6 additions & 6 deletions ...er/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Services_CreateOrUpdate.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
}
},
"sku": {
"name": "P0",
"tier": "Premium"
"name": "S0",
"tier": "Standard"
},
"location": "eastus",
"tags": {
Expand Down Expand Up @@ -58,8 +58,8 @@
},
"type": "Microsoft.AppPlatform/Spring",
"sku": {
"name": "P0",
"tier": "Premium"
"name": "S0",
"tier": "Standard"
},
"location": "eastus",
"tags": {
Expand Down Expand Up @@ -94,8 +94,8 @@
},
"type": "Microsoft.AppPlatform/Spring",
"sku": {
"name": "P0",
"tier": "Premium"
"name": "S0",
"tier": "Standard"
},
"location": "eastus",
"tags": {
Expand Down
81 changes: 81 additions & 0 deletions ...ppPlatform/preview/2019-05-01-preview/examples/Services_CreateOrUpdate_VNetInjection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
{
"parameters": {
"resource": {
"properties": {
"networkProfile": {
"serviceRuntimeSubnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVirtualNetwork/subnets/serviceRuntime",
"appSubnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVirtualNetwork/subnets/apps",
"serviceCidr": "10.8.0.0/16,10.244.0.0/16,10.245.0.1/16",
"serviceRuntimeNetworkResourceGroup": "my-service-runtime-network-rg",
"appNetworkResourceGroup": "my-app-network-rg"
}
},
"sku": {
"name": "S0",
"tier": "Standard"
},
"location": "eastus",
"tags": {
"key1": "value1"
}
},
"api-version": "2019-05-01-preview",
"subscriptionId": "00000000-0000-0000-0000-000000000000",
"resourceGroupName": "myResourceGroup",
"serviceName": "myservice"
},
"responses": {
"201": {
"body": {
"properties": {
"provisioningState": "Creating",
"networkProfile": {
"serviceRuntimeSubnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVirtualNetwork/subnets/serviceRuntime",
"appSubnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVirtualNetwork/subnets/apps",
"serviceCidr": "10.8.0.0/16,10.244.0.0/16,10.245.0.1/16",
"serviceRuntimeNetworkResourceGroup": "my-service-runtime-network-rg",
"appNetworkResourceGroup": "my-app-network-rg"
},
"serviceId": "12345678abcd1234abcd12345678abcd"
},
"type": "Microsoft.AppPlatform/Spring",
"sku": {
"name": "S0",
"tier": "Standard"
},
"location": "eastus",
"tags": {
"key1": "value1"
},
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.AppPlatform/Spring/myservice",
"name": "myservice"
}
},
"200": {
"body": {
"properties": {
"provisioningState": "Succeeded",
"networkProfile": {
"serviceRuntimeSubnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVirtualNetwork/subnets/serviceRuntime",
"appSubnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVirtualNetwork/subnets/apps",
"serviceCidr": "10.8.0.0/16,10.244.0.0/16,10.245.0.1/16",
"serviceRuntimeNetworkResourceGroup": "my-service-runtime-network-rg",
"appNetworkResourceGroup": "my-app-network-rg"
},
"serviceId": "12345678abcd1234abcd12345678abcd"
},
"type": "Microsoft.AppPlatform/Spring",
"sku": {
"name": "S0",
"tier": "Standard"
},
"location": "eastus",
"tags": {
"key1": "value1"
},
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.AppPlatform/Spring/myservice",
"name": "myservice"
}
}
}
}
4 changes: 2 additions & 2 deletions ...ource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Services_Get.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
},
"type": "Microsoft.AppPlatform/Spring",
"sku": {
"name": "P0",
"tier": "Premium"
"name": "S0",
"tier": "Standard"
},
"location": "eastus",
"tags": {
Expand Down
4 changes: 2 additions & 2 deletions ...urce-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Services_List.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,8 @@
},
"type": "Microsoft.AppPlatform/Spring",
"sku": {
"name": "P0",
"tier": "Premium"
"name": "S0",
"tier": "Standard"
},
"location": "eastus",
"tags": {
Expand Down
4 changes: 2 additions & 2 deletions ...icrosoft.AppPlatform/preview/2019-05-01-preview/examples/Services_ListBySubscription.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,8 +31,8 @@
},
"type": "Microsoft.AppPlatform/Spring",
"sku": {
"name": "P0",
"tier": "Premium"
"name": "S0",
"tier": "Standard"
},
"location": "eastus",
"tags": {
Expand Down
12 changes: 6 additions & 6 deletions ...ce-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Services_Update.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
}
},
"sku": {
"name": "P0",
"tier": "Premium"
"name": "S0",
"tier": "Standard"
},
"location": "eastus",
"tags": {
Expand Down Expand Up @@ -58,8 +58,8 @@
},
"type": "Microsoft.AppPlatform/Spring",
"sku": {
"name": "P0",
"tier": "Premium"
"name": "S0",
"tier": "Standard"
},
"location": "eastus",
"tags": {
Expand Down Expand Up @@ -94,8 +94,8 @@
},
"type": "Microsoft.AppPlatform/Spring",
"sku": {
"name": "P0",
"tier": "Premium"
"name": "S0",
"tier": "Standard"
},
"location": "eastus",
"tags": {
Expand Down