Skip to content

updated apispec #10719

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
lirenhe merged 5 commits into from
Sep 16, 2020
Merged

updated apispec #10719

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7dba823
updated apispec
tamilmani1989 Sep 7, 2020
cc1464c
spell error fix
tamilmani1989 Sep 7, 2020
115a16e
removed dncappid from response
tamilmani1989 Sep 7, 2020
4d61d27
updated apispec
tamilmani1989 Sep 8, 2020
7ce45f1
Added appid and endpoint in response
tamilmani1989 Sep 14, 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
153 changes: 77 additions & 76 deletions ...ource-manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/DelegatedNetwork.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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"
}
}
},
Expand All @@ -835,7 +788,7 @@
"properties": {
"properties": {
"x-ms-client-flatten": true,
"$ref": "#/definitions/ControllerProperties",
"$ref": "#/definitions/ControllerResponseProperties",
"description": "Properties of the provision operation request."
}
},
Expand All @@ -845,7 +798,7 @@
}
]
},
"ControllerProperties": {
"ControllerResponseProperties": {
"description": "Properties of Delegated controller resource.",
"type": "object",
"properties": {
Expand All @@ -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": {
Expand All @@ -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"
}
},
Expand All @@ -920,7 +917,7 @@
}
]
},
"DelegatedSubnetProperties": {
"DelegatedSubnetResponseProperties": {
"description": "Properties of delegated subnet resource.",
"type": "object",
"properties": {
Expand All @@ -938,6 +935,10 @@
},
"readOnly": true,
"description": "The current state of delegated subnet resource."
},
"resourceGuid": {
"type": "string",
"description": "Guid for the resource(delegatedSubnet) created"
}
}
},
Expand Down
6 changes: 2 additions & 4 deletions ...egatedNetwork/preview/2020-08-08-preview/examples/delegatedNetworkControllerListByRG.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
]
Expand Down
5 changes: 2 additions & 3 deletions ...gatedNetwork/preview/2020-08-08-preview/examples/delegatedNetworkControllerListBySub.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
]
Expand Down
3 changes: 2 additions & 1 deletion ...crosoft.DelegatedNetwork/preview/2020-08-08-preview/examples/delegatedSubnetListByRG.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
"name": "delegated1",
"type": "Microsoft.DelegatedNetwork/delegatedSubnets",
"properties": {
"state": "Succeeded"
"state": "Succeeded",
"resourceGuid": "5a82cbcf-e8ea-4175-ac2b-ad36a73f9801"
}
}
]
Expand Down
3 changes: 2 additions & 1 deletion ...rosoft.DelegatedNetwork/preview/2020-08-08-preview/examples/delegatedSubnetListBySub.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,8 @@
"name": "delegated1",
"type": "Microsoft.DelegatedNetwork/delegatedSubnets",
"properties": {
"state": "Succeeded"
"state": "Succeeded",
"resourceGuid": "5a82cbcf-e8ea-4175-ac2b-ad36a73f9801"
}
}
]
Expand Down
2 changes: 1 addition & 1 deletion ...Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/deleteDelegatedSubnet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
6 changes: 2 additions & 4 deletions ...manager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/getController.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
}
}
}
Expand Down
3 changes: 2 additions & 1 deletion ...er/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/getDelegatedSubnet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,8 @@
"name": "delegated1",
"type": "Microsoft.DelegatedNetwork/delegatedSubnets",
"properties": {
"state": "Succeeded"
"state": "Succeeded",
"resourceGuid": "5a82cbcf-e8ea-4175-ac2b-ad36a73f9801"
}
}
}
Expand Down
23 changes: 9 additions & 14 deletions ...nager/Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/patchController.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -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"
}
}
},
Expand All @@ -41,8 +37,7 @@
"name": "dnctestcontroller",
"type": "Microsoft.DelegatedNetwork/controller",
"properties": {
"state": "Provisioning",
"type": "Kubernetes"
"state": "Provisioning"
}
}
}
Expand Down
5 changes: 3 additions & 2 deletions .../Microsoft.DelegatedNetwork/preview/2020-08-08-preview/examples/patchDelegatedSubnet.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand All @@ -19,7 +19,8 @@
"name": "delegated1",
"type": "Microsoft.DelegatedNetwork/delegatedSubnets",
"properties": {
"state": "Succeeded"
"state": "Succeeded",
"resourceGuid": "5a82cbcf-e8ea-4175-ac2b-ad36a73f9801"
}
}
},
Expand Down
Loading