diff --git a/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/DelegatedNetwork.json b/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/DelegatedNetwork.json index 765caf2e42c3..8d03de36a68f 100644 --- a/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/DelegatedNetwork.json +++ b/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/DelegatedNetwork.json @@ -744,42 +744,6 @@ }, "x-ms-azure-resource": true }, - "DelegatedSubnetResource": { - "description": "Represents an instance of a DelegatedSubnet resource.", - "type": "object", - "properties": { - "id": { - "type": "string", - "readOnly": true, - "description": "An identifier that represents the DelegatedSubnet resource." - }, - "name": { - "type": "string", - "readOnly": true, - "description": "The name of the DelegatedSubnet resource." - }, - "type": { - "type": "string", - "readOnly": true, - "description": "The type of the DelegatedSubnet resource.(Microsoft.DelegatedNetwork/delegatedSubnet)" - }, - "location": { - "type": "string", - "description": "Location of the DelegatedSubnet resource." - } - }, - "x-ms-azure-resource": true - }, - "DelegatedSubnetParameters": { - "description": "DelegatedSubnet Parameters", - "type": "object", - "properties": { - "controllerID": { - "type": "string", - "description": "Delegated Network Controller ID" - } - } - }, "DelegatedControllers": { "description": "An array of Delegated controller resources.", "type": "object", @@ -796,36 +760,25 @@ "value" ] }, - "DelegatedSubnetList": { - "description": "An array of Delegated subnets resources.", - "type": "object", - "properties": { - "value": { - "type": "array", - "items": { - "$ref": "#/definitions/DelegatedSubnet" - }, - "description": "An array of Delegated subnets resources." - } - }, - "required": [ - "value" - ] - }, "ControllerTypeParameters": { "description": "Details of controller type.", "type": "object", "properties": { "controllerType": { "type": "string", - "description": "Type of Delegated controller." - }, - "kubernetesProperties": { - "type": "array", - "description": "properties of kubernetes clusters", - "items": { - "$ref": "#/definitions/KubernetesProperties" + "description": "Type of controller", + "enum": [ + "Kubernetes" + ], + "x-ms-enum": { + "name": "ControllerType", + "modelAsString": true } + }, + "properties": { + "x-ms-client-flatten": true, + "description": "Controller properties", + "$ref": "#/definitions/ControllerInstanceProperties" } } }, @@ -835,7 +788,7 @@ "properties": { "properties": { "x-ms-client-flatten": true, - "$ref": "#/definitions/ControllerProperties", + "$ref": "#/definitions/ControllerResponseProperties", "description": "Properties of the provision operation request." } }, @@ -845,7 +798,7 @@ } ] }, - "ControllerProperties": { + "ControllerResponseProperties": { "description": "Properties of Delegated controller resource.", "type": "object", "properties": { @@ -864,26 +817,18 @@ "readOnly": true, "description": "The current state of dnc controller resource." }, - "type": { - "type": "string", - "description": "Type of dnc controller." - }, - "resourceGuid": { + "dncAppId": { "type": "string", - "description": "Gets or sets resource GUID property of the controller resource." - }, - "dncAppID": { - "type": "string", - "description": "Get controller AAD ID." + "description": "The current state of dnc controller resource." }, "dncEndpoint": { "type": "string", - "description": "Dnc Endpoint url." + "description": "dnc endpoint url that customers can use to connect to" } } }, - "KubernetesProperties": { - "description": "Properties of kubernetes cluster", + "ControllerInstanceProperties": { + "description": "Properties of orchestrator", "type": "object", "properties": { "serverAppID": { @@ -904,13 +849,65 @@ } } }, + "DelegatedSubnetResource": { + "description": "Represents an instance of a DelegatedSubnet resource.", + "type": "object", + "properties": { + "id": { + "type": "string", + "readOnly": true, + "description": "An identifier that represents the DelegatedSubnet resource." + }, + "name": { + "type": "string", + "readOnly": true, + "description": "The name of the DelegatedSubnet resource." + }, + "type": { + "type": "string", + "readOnly": true, + "description": "The type of the DelegatedSubnet resource.(Microsoft.DelegatedNetwork/delegatedSubnet)" + }, + "location": { + "type": "string", + "description": "Location of the DelegatedSubnet resource." + } + }, + "x-ms-azure-resource": true + }, + "DelegatedSubnetParameters": { + "description": "DelegatedSubnet Parameters", + "type": "object", + "properties": { + "controllerID": { + "type": "string", + "description": "Delegated Network Controller ARM resource ID" + } + } + }, + "DelegatedSubnetList": { + "description": "An array of Delegated subnets resources.", + "type": "object", + "properties": { + "value": { + "type": "array", + "items": { + "$ref": "#/definitions/DelegatedSubnet" + }, + "description": "An array of Delegated subnets resources." + } + }, + "required": [ + "value" + ] + }, "DelegatedSubnet": { "description": "Delegated subnet details", "type": "object", "properties": { "properties": { "x-ms-client-flatten": true, - "$ref": "#/definitions/DelegatedSubnetProperties", + "$ref": "#/definitions/DelegatedSubnetResponseProperties", "description": "Properties of the delegated subnet request" } }, @@ -920,7 +917,7 @@ } ] }, - "DelegatedSubnetProperties": { + "DelegatedSubnetResponseProperties": { "description": "Properties of delegated subnet resource.", "type": "object", "properties": { @@ -938,6 +935,10 @@ }, "readOnly": true, "description": "The current state of delegated subnet resource." + }, + "resourceGuid": { + "type": "string", + "description": "Guid for the resource(delegatedSubnet) created" } } }, diff --git a/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/delegatedNetworkControllerListByRG.json b/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/delegatedNetworkControllerListByRG.json index d3a54ef39f49..4ef9119e545b 100644 --- a/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/delegatedNetworkControllerListByRG.json +++ b/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/delegatedNetworkControllerListByRG.json @@ -16,10 +16,8 @@ "type": "Microsoft.DelegatedNetwork/controller", "properties": { "state": "Succeeded", - "type": "Kubernetes", - "resourceGuid": "a182cbcf-e8ea-4175-ac2b-ad36a73f9801", - "dncAppID": "ac6192d7-503f-477a-9cfe-4efc3ee2b645", - "dncEndpoint": "https://uscentral.dnc.azure.com/" + "dncAppId": "ac1192d7-503f-477a-9cfe-4efc3ee2bd60", + "dncEndpoint": "https://orch.useast.dnc.azure.com" } } ] diff --git a/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/delegatedNetworkControllerListBySub.json b/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/delegatedNetworkControllerListBySub.json index 05746dacf340..1ea3ec7ab0c8 100644 --- a/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/delegatedNetworkControllerListBySub.json +++ b/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/delegatedNetworkControllerListBySub.json @@ -15,9 +15,8 @@ "type": "Microsoft.DelegatedNetwork/controller", "properties": { "state": "Succeeded", - "type": "Kubernetes", - "resourceGuid": "a182cbcf-e8ea-4175-ac2b-ad36a73f9801", - "dncAppID": "ac6192d7-503f-477a-9cfe-4efc3ee2b645" + "dncAppId": "ac1192d7-503f-477a-9cfe-4efc3ee2bd60", + "dncEndpoint": "https://orch.useast.dnc.azure.com" } } ] diff --git a/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/delegatedSubnetListByRG.json b/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/delegatedSubnetListByRG.json index 59125195bac0..3118b8b5b991 100644 --- a/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/delegatedSubnetListByRG.json +++ b/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/delegatedSubnetListByRG.json @@ -15,7 +15,8 @@ "name": "delegated1", "type": "Microsoft.DelegatedNetwork/delegatedSubnets", "properties": { - "state": "Succeeded" + "state": "Succeeded", + "resourceGuid": "5a82cbcf-e8ea-4175-ac2b-ad36a73f9801" } } ] diff --git a/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/delegatedSubnetListBySub.json b/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/delegatedSubnetListBySub.json index f3f1eca8d07a..eac3db04c096 100644 --- a/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/delegatedSubnetListBySub.json +++ b/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/delegatedSubnetListBySub.json @@ -14,7 +14,8 @@ "name": "delegated1", "type": "Microsoft.DelegatedNetwork/delegatedSubnets", "properties": { - "state": "Succeeded" + "state": "Succeeded", + "resourceGuid": "5a82cbcf-e8ea-4175-ac2b-ad36a73f9801" } } ] diff --git a/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/deleteDelegatedSubnet.json b/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/deleteDelegatedSubnet.json index df1bd55b9c1a..b1e8c5f1c8bb 100644 --- a/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/deleteDelegatedSubnet.json +++ b/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/deleteDelegatedSubnet.json @@ -7,7 +7,7 @@ "resourceName": "delegated1", "api-version": "2020-08-08-preview", "delegatedSubnetParameters": { - "controllerID": "a182cbcf-e8ea-4175-ac2b-ad36a73f9801" + "controllerID": "/subscriptions/613192d7-503f-477a-9cfe-4efc3ee2bd60/resourceGroups/TestRG/providers/Microsoft.DelegatedNetwork/controller/dnctestcontroller" } }, "responses": { diff --git a/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/getController.json b/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/getController.json index a14080a78ed4..6fa0fd517f29 100644 --- a/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/getController.json +++ b/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/getController.json @@ -15,10 +15,8 @@ "type": "Microsoft.DelegatedNetwork/controller", "properties": { "state": "Succeeded", - "type": "Kubernetes", - "resourceGuid": "a182cbcf-e8ea-4175-ac2b-ad36a73f9801", - "dncAppID": "ac6192d7-503f-477a-9cfe-4efc3ee2b645", - "dncEndpoint": "https://uscentral.dnc.azure.com/" + "dncAppId": "ac1192d7-503f-477a-9cfe-4efc3ee2bd60", + "dncEndpoint": "https://orch.useast.dnc.azure.com" } } } diff --git a/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/getDelegatedSubnet.json b/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/getDelegatedSubnet.json index e43f1783eb9f..79100cab522b 100644 --- a/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/getDelegatedSubnet.json +++ b/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/getDelegatedSubnet.json @@ -16,7 +16,8 @@ "name": "delegated1", "type": "Microsoft.DelegatedNetwork/delegatedSubnets", "properties": { - "state": "Succeeded" + "state": "Succeeded", + "resourceGuid": "5a82cbcf-e8ea-4175-ac2b-ad36a73f9801" } } } diff --git a/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/patchController.json b/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/patchController.json index cd5bc1ca436a..629ac7b2f344 100644 --- a/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/patchController.json +++ b/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/patchController.json @@ -6,14 +6,12 @@ "api-version": "2020-08-08-preview", "controllerParameters": { "controllerType": "Kubernetes", - "kubernetesProperties": [ - { - "serverAppID": "546192d7-503f-477a-9cfe-4efc3ee2b6e1", - "serverTenantID": "da6192d7-503f-477a-9cfe-4efc3ee2b6c3", - "clusterRootCA": "ddsadsad344mfdsfdl", - "apiServerEndpoint": "https://testk8s.cloudapp.net" - } - ] + "properties": { + "serverAppID": "546192d7-503f-477a-9cfe-4efc3ee2b6e1", + "serverTenantID": "da6192d7-503f-477a-9cfe-4efc3ee2b6c3", + "clusterRootCA": "ddsadsad344mfdsfdl", + "apiServerEndpoint": "https://testk8s.cloudapp.net" + } } }, "responses": { @@ -26,10 +24,8 @@ "type": "Microsoft.DelegatedNetwork/controller", "properties": { "state": "Succeeded", - "type": "Kubernetes", - "resourceGuid": "a182cbcf-e8ea-4175-ac2b-ad36a73f9801", - "dncAppID": "ac6192d7-503f-477a-9cfe-4efc3ee2b645", - "dncEndpoint": "https://uscentral.dnc.azure.com/" + "dncAppId": "ac1192d7-503f-477a-9cfe-4efc3ee2bd60", + "dncEndpoint": "https://orch.useast.dnc.azure.com" } } }, @@ -41,8 +37,7 @@ "name": "dnctestcontroller", "type": "Microsoft.DelegatedNetwork/controller", "properties": { - "state": "Provisioning", - "type": "Kubernetes" + "state": "Provisioning" } } } diff --git a/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/patchDelegatedSubnet.json b/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/patchDelegatedSubnet.json index 6a4fc4db79ca..9441a459a8d6 100644 --- a/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/patchDelegatedSubnet.json +++ b/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/patchDelegatedSubnet.json @@ -7,7 +7,7 @@ "resourceName": "delegated1", "api-version": "2020-08-08-preview", "delegatedSubnetParameters": { - "controllerID": "a182cbcf-e8ea-4175-ac2b-ad36a73f9801" + "controllerID": "/subscriptions/613192d7-503f-477a-9cfe-4efc3ee2bd60/resourceGroups/TestRG/providers/Microsoft.DelegatedNetwork/controller/dnctestcontroller" } }, "responses": { @@ -19,7 +19,8 @@ "name": "delegated1", "type": "Microsoft.DelegatedNetwork/delegatedSubnets", "properties": { - "state": "Succeeded" + "state": "Succeeded", + "resourceGuid": "5a82cbcf-e8ea-4175-ac2b-ad36a73f9801" } } }, diff --git a/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/putController.json b/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/putController.json index cd5bc1ca436a..629ac7b2f344 100644 --- a/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/putController.json +++ b/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/putController.json @@ -6,14 +6,12 @@ "api-version": "2020-08-08-preview", "controllerParameters": { "controllerType": "Kubernetes", - "kubernetesProperties": [ - { - "serverAppID": "546192d7-503f-477a-9cfe-4efc3ee2b6e1", - "serverTenantID": "da6192d7-503f-477a-9cfe-4efc3ee2b6c3", - "clusterRootCA": "ddsadsad344mfdsfdl", - "apiServerEndpoint": "https://testk8s.cloudapp.net" - } - ] + "properties": { + "serverAppID": "546192d7-503f-477a-9cfe-4efc3ee2b6e1", + "serverTenantID": "da6192d7-503f-477a-9cfe-4efc3ee2b6c3", + "clusterRootCA": "ddsadsad344mfdsfdl", + "apiServerEndpoint": "https://testk8s.cloudapp.net" + } } }, "responses": { @@ -26,10 +24,8 @@ "type": "Microsoft.DelegatedNetwork/controller", "properties": { "state": "Succeeded", - "type": "Kubernetes", - "resourceGuid": "a182cbcf-e8ea-4175-ac2b-ad36a73f9801", - "dncAppID": "ac6192d7-503f-477a-9cfe-4efc3ee2b645", - "dncEndpoint": "https://uscentral.dnc.azure.com/" + "dncAppId": "ac1192d7-503f-477a-9cfe-4efc3ee2bd60", + "dncEndpoint": "https://orch.useast.dnc.azure.com" } } }, @@ -41,8 +37,7 @@ "name": "dnctestcontroller", "type": "Microsoft.DelegatedNetwork/controller", "properties": { - "state": "Provisioning", - "type": "Kubernetes" + "state": "Provisioning" } } } diff --git a/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/putDelegatedSubnet.json b/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/putDelegatedSubnet.json index 6a4fc4db79ca..9441a459a8d6 100644 --- a/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/putDelegatedSubnet.json +++ b/specification/dnc/resource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/putDelegatedSubnet.json @@ -7,7 +7,7 @@ "resourceName": "delegated1", "api-version": "2020-08-08-preview", "delegatedSubnetParameters": { - "controllerID": "a182cbcf-e8ea-4175-ac2b-ad36a73f9801" + "controllerID": "/subscriptions/613192d7-503f-477a-9cfe-4efc3ee2bd60/resourceGroups/TestRG/providers/Microsoft.DelegatedNetwork/controller/dnctestcontroller" } }, "responses": { @@ -19,7 +19,8 @@ "name": "delegated1", "type": "Microsoft.DelegatedNetwork/delegatedSubnets", "properties": { - "state": "Succeeded" + "state": "Succeeded", + "resourceGuid": "5a82cbcf-e8ea-4175-ac2b-ad36a73f9801" } } },