Skip to content

Commit 2b4f3b9

Browse files
bowen500Kai0
bowen5
authored and
00Kai0
committed
Add network profile in Spring payload. (Azure#10313)
* Add network profile in Spring payload. * Fix prettier check. * Fix prettier.
1 parent 8c6e566 commit 2b4f3b9

File tree

7 files changed

+132
-18
lines changed

7 files changed

+132
-18
lines changed

‎specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/appplatform.json‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -113,6 +113,9 @@
113113
"x-ms-examples": {
114114
"Services_CreateOrUpdate": {
115115
"$ref": "./examples/Services_CreateOrUpdate.json"
116+
},
117+
"Services_CreateOrUpdate_VNetInjection": {
118+
"$ref": "./examples/Services_CreateOrUpdate_VNetInjection.json"
116119
}
117120
}
118121
},
@@ -2296,6 +2299,10 @@
22962299
"$ref": "#/definitions/TraceProperties",
22972300
"description": "Trace properties of the Service"
22982301
},
2302+
"networkProfile": {
2303+
"$ref": "#/definitions/NetworkProfile",
2304+
"description": "Network profile of the Service"
2305+
},
22992306
"version": {
23002307
"format": "int32",
23012308
"description": "Version of the Service",
@@ -2416,6 +2423,32 @@
24162423
}
24172424
}
24182425
},
2426+
"NetworkProfile": {
2427+
"description": "Service network profile payload",
2428+
"type": "object",
2429+
"properties": {
2430+
"serviceRuntimeSubnetId": {
2431+
"description": "Fully qualified resource Id of the subnet to host Azure Spring Cloud Service Runtime",
2432+
"type": "string"
2433+
},
2434+
"appSubnetId": {
2435+
"description": "Fully qualified resource Id of the subnet to host Azure Spring Cloud Apps",
2436+
"type": "string"
2437+
},
2438+
"serviceCidr": {
2439+
"description": "Azure Spring Cloud service reserved CIDR",
2440+
"type": "string"
2441+
},
2442+
"serviceRuntimeNetworkResourceGroup": {
2443+
"description": "Name of the resource group containing network resources of Azure Spring Cloud Service Runtime",
2444+
"type": "string"
2445+
},
2446+
"appNetworkResourceGroup": {
2447+
"description": "Name of the resource group containing network resources of Azure Spring Cloud Apps",
2448+
"type": "string"
2449+
}
2450+
}
2451+
},
24192452
"Error": {
24202453
"description": "The error code compose of code and message.",
24212454
"type": "object",

‎specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Services_CreateOrUpdate.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
}
2020
},
2121
"sku": {
22-
"name": "P0",
23-
"tier": "Premium"
22+
"name": "S0",
23+
"tier": "Standard"
2424
},
2525
"location": "eastus",
2626
"tags": {
@@ -58,8 +58,8 @@
5858
},
5959
"type": "Microsoft.AppPlatform/Spring",
6060
"sku": {
61-
"name": "P0",
62-
"tier": "Premium"
61+
"name": "S0",
62+
"tier": "Standard"
6363
},
6464
"location": "eastus",
6565
"tags": {
@@ -94,8 +94,8 @@
9494
},
9595
"type": "Microsoft.AppPlatform/Spring",
9696
"sku": {
97-
"name": "P0",
98-
"tier": "Premium"
97+
"name": "S0",
98+
"tier": "Standard"
9999
},
100100
"location": "eastus",
101101
"tags": {

‎specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Services_CreateOrUpdate_VNetInjection.json‎

Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
{
2+
"parameters": {
3+
"resource": {
4+
"properties": {
5+
"networkProfile": {
6+
"serviceRuntimeSubnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVirtualNetwork/subnets/serviceRuntime",
7+
"appSubnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVirtualNetwork/subnets/apps",
8+
"serviceCidr": "10.8.0.0/16,10.244.0.0/16,10.245.0.1/16",
9+
"serviceRuntimeNetworkResourceGroup": "my-service-runtime-network-rg",
10+
"appNetworkResourceGroup": "my-app-network-rg"
11+
}
12+
},
13+
"sku": {
14+
"name": "S0",
15+
"tier": "Standard"
16+
},
17+
"location": "eastus",
18+
"tags": {
19+
"key1": "value1"
20+
}
21+
},
22+
"api-version": "2019-05-01-preview",
23+
"subscriptionId": "00000000-0000-0000-0000-000000000000",
24+
"resourceGroupName": "myResourceGroup",
25+
"serviceName": "myservice"
26+
},
27+
"responses": {
28+
"201": {
29+
"body": {
30+
"properties": {
31+
"provisioningState": "Creating",
32+
"networkProfile": {
33+
"serviceRuntimeSubnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVirtualNetwork/subnets/serviceRuntime",
34+
"appSubnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVirtualNetwork/subnets/apps",
35+
"serviceCidr": "10.8.0.0/16,10.244.0.0/16,10.245.0.1/16",
36+
"serviceRuntimeNetworkResourceGroup": "my-service-runtime-network-rg",
37+
"appNetworkResourceGroup": "my-app-network-rg"
38+
},
39+
"serviceId": "12345678abcd1234abcd12345678abcd"
40+
},
41+
"type": "Microsoft.AppPlatform/Spring",
42+
"sku": {
43+
"name": "S0",
44+
"tier": "Standard"
45+
},
46+
"location": "eastus",
47+
"tags": {
48+
"key1": "value1"
49+
},
50+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.AppPlatform/Spring/myservice",
51+
"name": "myservice"
52+
}
53+
},
54+
"200": {
55+
"body": {
56+
"properties": {
57+
"provisioningState": "Succeeded",
58+
"networkProfile": {
59+
"serviceRuntimeSubnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVirtualNetwork/subnets/serviceRuntime",
60+
"appSubnetId": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVirtualNetwork/subnets/apps",
61+
"serviceCidr": "10.8.0.0/16,10.244.0.0/16,10.245.0.1/16",
62+
"serviceRuntimeNetworkResourceGroup": "my-service-runtime-network-rg",
63+
"appNetworkResourceGroup": "my-app-network-rg"
64+
},
65+
"serviceId": "12345678abcd1234abcd12345678abcd"
66+
},
67+
"type": "Microsoft.AppPlatform/Spring",
68+
"sku": {
69+
"name": "S0",
70+
"tier": "Standard"
71+
},
72+
"location": "eastus",
73+
"tags": {
74+
"key1": "value1"
75+
},
76+
"id": "/subscriptions/00000000-0000-0000-0000-000000000000/resourceGroups/myResourceGroup/providers/Microsoft.AppPlatform/Spring/myservice",
77+
"name": "myservice"
78+
}
79+
}
80+
}
81+
}

‎specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Services_Get.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
},
3232
"type": "Microsoft.AppPlatform/Spring",
3333
"sku": {
34-
"name": "P0",
35-
"tier": "Premium"
34+
"name": "S0",
35+
"tier": "Standard"
3636
},
3737
"location": "eastus",
3838
"tags": {

‎specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Services_List.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
},
3333
"type": "Microsoft.AppPlatform/Spring",
3434
"sku": {
35-
"name": "P0",
36-
"tier": "Premium"
35+
"name": "S0",
36+
"tier": "Standard"
3737
},
3838
"location": "eastus",
3939
"tags": {

‎specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Services_ListBySubscription.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
},
3232
"type": "Microsoft.AppPlatform/Spring",
3333
"sku": {
34-
"name": "P0",
35-
"tier": "Premium"
34+
"name": "S0",
35+
"tier": "Standard"
3636
},
3737
"location": "eastus",
3838
"tags": {

‎specification/appplatform/resource-manager/Microsoft.AppPlatform/preview/2019-05-01-preview/examples/Services_Update.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
}
2020
},
2121
"sku": {
22-
"name": "P0",
23-
"tier": "Premium"
22+
"name": "S0",
23+
"tier": "Standard"
2424
},
2525
"location": "eastus",
2626
"tags": {
@@ -58,8 +58,8 @@
5858
},
5959
"type": "Microsoft.AppPlatform/Spring",
6060
"sku": {
61-
"name": "P0",
62-
"tier": "Premium"
61+
"name": "S0",
62+
"tier": "Standard"
6363
},
6464
"location": "eastus",
6565
"tags": {
@@ -94,8 +94,8 @@
9494
},
9595
"type": "Microsoft.AppPlatform/Spring",
9696
"sku": {
97-
"name": "P0",
98-
"tier": "Premium"
97+
"name": "S0",
98+
"tier": "Standard"
9999
},
100100
"location": "eastus",
101101
"tags": {

0 commit comments

Comments
 (0)