Skip to content

Commit

Permalink
Add network profile in Spring payload. (Azure#10313)
Browse files Browse the repository at this point in the history
* Add network profile in Spring payload.

* Fix prettier check.

* Fix prettier.
  • Loading branch information
bowen5 authored and 00Kai0 committed Oct 12, 2020
1 parent 8c6e566 commit 2b4f3b9
Show file tree
Hide file tree
Showing 7 changed files with 132 additions and 18 deletions.
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
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
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"
}
}
}
}
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
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
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
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

0 comments on commit 2b4f3b9

Please sign in to comment.