Skip to content

Commit

Permalink
API Spec change for DNC RP (#10819)
Browse files Browse the repository at this point in the history
* updated apispec

* spell error fix

* removed dncappid from response

* updated apispec

* Added appid and endpoint in response

* adde controller id in delegated subnet response

* updated examples

* updated

* updated apispec

* spell check and prettier fix

* spell check fix

* updated title same in all files

* updated operationid

* reverting to new change

* addressed review comments

* addressed feedback comments

* spell check fix

* updated readme.md

* updated definition name

* addressed feedback comments

* fixed lint issue
  • Loading branch information
tamilmani1989 authored Sep 27, 2020
1 parent 7d9eaf4 commit 25e3eaa
Show file tree
Hide file tree
Showing 25 changed files with 2,168 additions and 1,133 deletions.

This file was deleted.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,15 @@
"body": {
"value": [
{
"id": "/subscriptions/613192d7-503f-477a-9cfe-4efc3ee2bd60/resourceGroups/TestRG/providers/Microsoft.DelegatedNetwork/controller/dnctestcontroller1",
"id": "/subscriptions/613192d7-503f-477a-9cfe-4efc3ee2bd60/resourceGroups/TestRG/providers/Microsoft.DelegatedNetwork/controller/testcontroller",
"location": "West US",
"name": "dnctestcontroller1",
"name": "testcontroller",
"type": "Microsoft.DelegatedNetwork/controller",
"properties": {
"state": "Succeeded",
"provisioningState": "Succeeded",
"resourceGuid": "5a82cbcf-e8ea-4175-ac2b-ad36a73f9801",
"dncAppId": "ac1192d7-503f-477a-9cfe-4efc3ee2bd60",
"dncTenantId": "66192d7-503f-477a-9cfe-4efc3ee2bd60",
"dncEndpoint": "https://orch.useast.dnc.azure.com"
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,15 @@
"body": {
"value": [
{
"id": "/subscriptions/613192d7-503f-477a-9cfe-4efc3ee2bd60/resourceGroups/TestRG/providers/Microsoft.DelegatedNetwork/controller/dnctestcontroller1",
"id": "/subscriptions/613192d7-503f-477a-9cfe-4efc3ee2bd60/resourceGroups/TestRG/providers/Microsoft.DelegatedNetwork/controller/testcontroller",
"location": "West US",
"name": "dnctestcontroller1",
"name": "testcontroller",
"type": "Microsoft.DelegatedNetwork/controller",
"properties": {
"state": "Succeeded",
"provisioningState": "Succeeded",
"resourceGuid": "5a82cbcf-e8ea-4175-ac2b-ad36a73f9801",
"dncAppId": "ac1192d7-503f-477a-9cfe-4efc3ee2bd60",
"dncTenantId": "66192d7-503f-477a-9cfe-4efc3ee2bd60",
"dncEndpoint": "https://orch.useast.dnc.azure.com"
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,33 @@
"description": "Delete a Controller Service instance."
}
},
{
"name": "Microsoft.DelegatedNetwork/orchestratorInstances/write",
"display": {
"provider": "Microsoft Delegated Network Service",
"resource": "Microsoft Delegated Network orchestratorInstance",
"operation": "Create or update a orchestratorInstance.",
"description": "Create or update a orchestratorInstance."
}
},
{
"name": "Microsoft.DelegatedNetwork/controller/read",
"display": {
"provider": "Microsoft Delegated Network Service",
"resource": "Microsoft Delegated Network orchestratorInstance",
"operation": "Get a orchestratorInstances.",
"description": "Get a orchestratorInstance."
}
},
{
"name": "Microsoft.DelegatedNetwork/controller/delete",
"display": {
"provider": "Microsoft Delegated Network Service",
"resource": "Microsoft Delegated Network orchestratorInstance",
"operation": "Delete a orchestratorInstance.",
"description": "Delete a orchestratorInstance."
}
},
{
"name": "Microsoft.DelegatedNetwork/delegatedSubnets/write",
"display": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,19 @@
"body": {
"value": [
{
"id": "/subscriptions/613192d7-503f-477a-9cfe-4efc3ee2bd60/resourceGroups/TestRG/providers/Microsoft.Network/virtualNetworks/testvnet/subnets/testsubnet/providers/Microsoft.DelegatedNetwork/delegatedSubnets/delegated1",
"id": "/subscriptions/613192d7-503f-477a-9cfe-4efc3ee2bd60/resourceGroups/TestRG/providers/Microsoft.DelegatedNetwork/delegatedSubnets/delegated1",
"location": "West US",
"name": "delegated1",
"type": "Microsoft.DelegatedNetwork/delegatedSubnets",
"properties": {
"state": "Succeeded",
"resourceGuid": "5a82cbcf-e8ea-4175-ac2b-ad36a73f9801"
"provisioningState": "Succeeded",
"resourceGuid": "5a82cbcf-e8ea-4175-ac2b-ad36a73f9801",
"subnetDetails": {
"id": "/subscriptions/613192d7-503f-477a-9cfe-4efc3ee2bd60/resourceGroups/TestRG/providers/Microsoft.Network/virtualNetworks/testvnet/subnets/testsubnet"
},
"controllerDetails": {
"id": "/subscriptions/613192d7-503f-477a-9cfe-4efc3ee2bd60/resourceGroups/TestRG/providers/Microsoft.DelegatedNetwork/controller/dnctestcontroller"
}
}
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,14 @@
"name": "delegated1",
"type": "Microsoft.DelegatedNetwork/delegatedSubnets",
"properties": {
"state": "Succeeded",
"resourceGuid": "5a82cbcf-e8ea-4175-ac2b-ad36a73f9801"
"provisioningState": "Succeeded",
"resourceGuid": "5a82cbcf-e8ea-4175-ac2b-ad36a73f9801",
"subnetDetails": {
"id": "/subscriptions/613192d7-503f-477a-9cfe-4efc3ee2bd60/resourceGroups/TestRG/providers/Microsoft.Network/virtualNetworks/testvnet/subnets/testsubnet"
},
"controllerDetails": {
"id": "/subscriptions/613192d7-503f-477a-9cfe-4efc3ee2bd60/resourceGroups/TestRG/providers/Microsoft.DelegatedNetwork/controller/dnctestcontroller"
}
}
}
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"parameters": {
"subscriptionId": "613192d7-503f-477a-9cfe-4efc3ee2bd60",
"resourceGroupName": "TestRG",
"resourceName": "dnctestcontroller",
"resourceName": "testcontroller",
"api-version": "2020-08-08-preview"
},
"responses": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,8 @@
"parameters": {
"subscriptionId": "613192d7-503f-477a-9cfe-4efc3ee2bd60",
"resourceGroupName": "TestRG",
"vnetName": "testvnet",
"subnetName": "testsubnet",
"resourceName": "delegated1",
"api-version": "2020-08-08-preview",
"delegatedSubnetParameters": {
"controllerID": "/subscriptions/613192d7-503f-477a-9cfe-4efc3ee2bd60/resourceGroups/TestRG/providers/Microsoft.DelegatedNetwork/controller/dnctestcontroller"
}
"api-version": "2020-08-08-preview"
},
"responses": {
"200": {
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
{
"parameters": {
"subscriptionId": "613192d7-503f-477a-9cfe-4efc3ee2bd60",
"resourceGroupName": "TestRG",
"resourceName": "k8stest1",
"api-version": "2020-08-08-preview"
},
"responses": {
"200": {
"headers": {},
"description": "OK."
},
"202": {
"headers": {},
"description": "Accepted."
},
"204": {
"headers": {}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,22 @@
"parameters": {
"subscriptionId": "613192d7-503f-477a-9cfe-4efc3ee2bd60",
"resourceGroupName": "TestRG",
"resourceName": "dnctestcontroller",
"resourceName": "testcontroller",
"api-version": "2020-08-08-preview"
},
"responses": {
"200": {
"headers": {},
"body": {
"id": "/subscriptions/613192d7-503f-477a-9cfe-4efc3ee2bd60/resourceGroups/TestRG/providers/Microsoft.DelegatedNetwork/controller/dnctestcontroller",
"id": "/subscriptions/613192d7-503f-477a-9cfe-4efc3ee2bd60/resourceGroups/TestRG/providers/Microsoft.DelegatedNetwork/controller/testcontroller",
"location": "West US",
"name": "dnctestcontroller",
"name": "testcontroller",
"type": "Microsoft.DelegatedNetwork/controller",
"properties": {
"state": "Succeeded",
"provisioningState": "Succeeded",
"resourceGuid": "5a82cbcf-e8ea-4175-ac2b-ad36a73f9801",
"dncAppId": "ac1192d7-503f-477a-9cfe-4efc3ee2bd60",
"dncTenantId": "66192d7-503f-477a-9cfe-4efc3ee2bd60",
"dncEndpoint": "https://orch.useast.dnc.azure.com"
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,26 @@
"parameters": {
"subscriptionId": "613192d7-503f-477a-9cfe-4efc3ee2bd60",
"resourceGroupName": "TestRG",
"vnetName": "testvnet",
"subnetName": "testsubnet",
"resourceName": "delegated1",
"api-version": "2020-08-08-preview"
},
"responses": {
"200": {
"headers": {},
"body": {
"id": "/subscriptions/613192d7-503f-477a-9cfe-4efc3ee2bd60/resourceGroups/TestRG/providers/Microsoft.Network/virtualNetworks/testvnet/subnets/testsubnet/providers/Microsoft.DelegatedNetwork/delegatedSubnets/delegated1",
"id": "/subscriptions/613192d7-503f-477a-9cfe-4efc3ee2bd60/resourceGroups/TestRG/providers/Microsoft.DelegatedNetwork/delegatedSubnets/delegated1",
"location": "West US",
"name": "delegated1",
"type": "Microsoft.DelegatedNetwork/delegatedSubnets",
"properties": {
"state": "Succeeded",
"resourceGuid": "5a82cbcf-e8ea-4175-ac2b-ad36a73f9801"
"provisioningState": "Succeeded",
"resourceGuid": "5a82cbcf-e8ea-4175-ac2b-ad36a73f9801",
"subnetDetails": {
"id": "/subscriptions/613192d7-503f-477a-9cfe-4efc3ee2bd60/resourceGroups/TestRG/providers/Microsoft.Network/virtualNetworks/testvnet/subnets/testsubnet"
},
"controllerDetails": {
"id": "/subscriptions/613192d7-503f-477a-9cfe-4efc3ee2bd60/resourceGroups/TestRG/providers/Microsoft.DelegatedNetwork/controller/dnctestcontroller"
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
{
"parameters": {
"subscriptionId": "613192d7-503f-477a-9cfe-4efc3ee2bd60",
"resourceGroupName": "TestRG",
"resourceName": "testk8s1",
"api-version": "2020-08-08-preview"
},
"responses": {
"200": {
"headers": {},
"body": {
"id": "/subscriptions/613192d7-503f-477a-9cfe-4efc3ee2bd60/resourceGroups/TestRG/providers/Microsoft.DelegatedNetwork/orchestrators/testk8s1",
"location": "West US",
"name": "testk8s1",
"type": "Microsoft.DelegatedNetwork/orchestrators",
"kind": "Kubernetes",
"identity": {
"principalId": "7a2192d7-503f-477a-9cfe-4efc3ee2bd60",
"tenantId": "3e2192d7-503f-477a-9cfe-4efc3ee2bd60",
"type": "SystemAssigned"
},
"properties": {
"provisioningState": "Succeeded",
"resourceGuid": "1b2192d7-503f-477a-9cfe-4efc3ee2bd60",
"orchestratorAppId": "546192d7-503f-477a-9cfe-4efc3ee2b6e1",
"orchestratorTenantId": "da6192d7-503f-477a-9cfe-4efc3ee2b6c3",
"clusterRootCA": "ddsadsad344mfdsfdl",
"apiServerEndpoint": "https://testk8s.cloudapp.net",
"controllerDetails": {
"id": "/subscriptions/613192d7-503f-477a-9cfe-4efc3ee2bd60/resourceGroups/TestRG/providers/Microsoft.DelegatedNetwork/controller/testcontroller"
}
}
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
{
"parameters": {
"subscriptionId": "50016170-c839-41ba-a724-51e9df440b9e",
"api-version": "2020-08-08-preview",
"resourceGroupName": "testRG"
},
"responses": {
"200": {
"headers": {},
"body": {
"value": [
{
"id": "/subscriptions/613192d7-503f-477a-9cfe-4efc3ee2bd60/resourceGroups/TestRG/providers/Microsoft.DelegatedNetwork/orchestrators/testk8s1",
"location": "West US",
"name": "testk8s1",
"type": "Microsoft.DelegatedNetwork/orchestrators",
"kind": "Kubernetes",
"identity": {
"principalId": "7a2192d7-503f-477a-9cfe-4efc3ee2bd60",
"tenantId": "3e2192d7-503f-477a-9cfe-4efc3ee2bd60",
"type": "SystemAssigned"
},
"properties": {
"provisioningState": "Succeeded",
"resourceGuid": "1b2192d7-503f-477a-9cfe-4efc3ee2bd60",
"orchestratorAppId": "546192d7-503f-477a-9cfe-4efc3ee2b6e1",
"orchestratorTenantId": "da6192d7-503f-477a-9cfe-4efc3ee2b6c3",
"clusterRootCA": "ddsadsad344mfdsfdl",
"apiServerEndpoint": "https://testk8s.cloudapp.net",
"controllerDetails": {
"id": "/subscriptions/613192d7-503f-477a-9cfe-4efc3ee2bd60/resourceGroups/TestRG/providers/Microsoft.DelegatedNetwork/controller/testcontroller"
}
}
}
]
}
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
{
"parameters": {
"subscriptionId": "50016170-c839-41ba-a724-51e9df440b9e",
"api-version": "2020-08-08-preview"
},
"responses": {
"200": {
"headers": {},
"body": {
"value": [
{
"id": "/subscriptions/613192d7-503f-477a-9cfe-4efc3ee2bd60/resourceGroups/TestRG/providers/Microsoft.DelegatedNetwork/orchestrators/testk8s1",
"location": "West US",
"name": "testk8s1",
"type": "Microsoft.DelegatedNetwork/orchestrators",
"kind": "Kubernetes",
"identity": {
"principalId": "7a2192d7-503f-477a-9cfe-4efc3ee2bd60",
"tenantId": "3e2192d7-503f-477a-9cfe-4efc3ee2bd60",
"type": "SystemAssigned"
},
"properties": {
"provisioningState": "Succeeded",
"resourceGuid": "1b2192d7-503f-477a-9cfe-4efc3ee2bd60",
"orchestratorAppId": "546192d7-503f-477a-9cfe-4efc3ee2b6e1",
"orchestratorTenantId": "da6192d7-503f-477a-9cfe-4efc3ee2b6c3",
"clusterRootCA": "ddsadsad344mfdsfdl",
"apiServerEndpoint": "https://testk8s.cloudapp.net",
"controllerDetails": {
"id": "/subscriptions/613192d7-503f-477a-9cfe-4efc3ee2bd60/resourceGroups/TestRG/providers/Microsoft.DelegatedNetwork/controller/testcontroller"
}
}
}
]
}
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,44 +2,33 @@
"parameters": {
"subscriptionId": "613192d7-503f-477a-9cfe-4efc3ee2bd60",
"resourceGroupName": "TestRG",
"resourceName": "dnctestcontroller",
"resourceName": "testcontroller",
"api-version": "2020-08-08-preview",
"controllerParameters": {
"controllerType": "Kubernetes",
"properties": {
"serverAppID": "546192d7-503f-477a-9cfe-4efc3ee2b6e1",
"serverTenantID": "da6192d7-503f-477a-9cfe-4efc3ee2b6c3",
"clusterRootCA": "ddsadsad344mfdsfdl",
"apiServerEndpoint": "https://testk8s.cloudapp.net"
"parameters": {
"tags": {
"key": "value"
}
}
},
"responses": {
"200": {
"headers": {},
"body": {
"id": "/subscriptions/613192d7-503f-477a-9cfe-4efc3ee2bd60/resourceGroups/TestRG/providers/Microsoft.DelegatedNetwork/controller/dnctestcontroller",
"id": "/subscriptions/613192d7-503f-477a-9cfe-4efc3ee2bd60/resourceGroups/TestRG/providers/Microsoft.DelegatedNetwork/controller/testcontroller",
"location": "West US",
"name": "dnctestcontroller",
"name": "testcontroller",
"type": "Microsoft.DelegatedNetwork/controller",
"tags": {
"key": "value"
},
"properties": {
"state": "Succeeded",
"provisioningState": "Succeeded",
"resourceGuid": "5a82cbcf-e8ea-4175-ac2b-ad36a73f9801",
"dncAppId": "ac1192d7-503f-477a-9cfe-4efc3ee2bd60",
"dncTenantId": "66192d7-503f-477a-9cfe-4efc3ee2bd60",
"dncEndpoint": "https://orch.useast.dnc.azure.com"
}
}
},
"201": {
"headers": {},
"body": {
"id": "/subscriptions/613192d7-503f-477a-9cfe-4efc3ee2bd60/resourceGroups/TestRG/providers/Microsoft.DelegatedNetwork/controller/dnctestcontroller",
"location": "West US",
"name": "dnctestcontroller",
"type": "Microsoft.DelegatedNetwork/controller",
"properties": {
"state": "Provisioning"
}
}
}
}
}
Loading

0 comments on commit 25e3eaa

Please sign in to comment.