Skip to content
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

Fix discriminator problem introduced by #8606 #10383

Closed
wants to merge 3 commits into from
Closed

Fix discriminator problem introduced by #8606 #10383

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3ca81d4
Fix discriminator and add the sub-types
ArcturusZhang Aug 7, 2020
88f1665
Revert the changes on description
ArcturusZhang Aug 7, 2020
c1d3172
Fix prettier
ArcturusZhang Aug 7, 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
163 changes: 104 additions & 59 deletions .../storagecache/resource-manager/Microsoft.StorageCache/stable/2019-11-01/storagecache.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1434,6 +1434,21 @@
"StorageTarget": {
"description": "A storage system being cached by a Cache.",
"type": "object",
"allOf": [
{
"$ref": "#/definitions/StorageTargetResource"
}
],
"properties": {
"properties": {
"x-ms-client-flatten": true,
"description": "StorageTarget properties",
"$ref": "#/definitions/StorageTargetProperties"
}
}
},
"StorageTargetResource": {
"description": "Resource used by a Cache.",
"properties": {
"name": {
"description": "Name of the Storage Target.",
Expand All @@ -1449,69 +1464,99 @@
"description": "Type of the Storage Target; Microsoft.StorageCache/Cache/StorageTarget",
"readOnly": true,
"type": "string"
},
"properties": {
"x-ms-client-flatten": true,
"description": "Properties of the Storage Target.",
"type": "object",
"discriminator": "targetType",
"required": [
"targetType"
],
"properties": {
"junctions": {
"description": "List of Cache namespace junctions to target for namespace associations.",
"type": "array",
"items": {
"$ref": "#/definitions/NamespaceJunction"
}
},
"targetType": {
"description": "Type of the Storage Target.",
"enum": [
"nfs3",
"clfs",
"unknown"
],
"x-ms-enum": {
"name": "StorageTargetType",
"modelAsString": true
},
"type": "string"
},
"provisioningState": {
"description": "ARM provisioning state, see https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/Addendum.md#provisioningstate-property",
"enum": [
"Succeeded",
"Failed",
"Cancelled",
"Creating",
"Deleting",
"Updating"
],
"x-ms-enum": {
"name": "ProvisioningStateType",
"modelAsString": true
},
"type": "string"
},
"nfs3": {
"description": "Properties when targetType is nfs3.",
"$ref": "#/definitions/Nfs3Target"
},
"clfs": {
"description": "Properties when targetType is clfs.",
"$ref": "#/definitions/ClfsTarget"
},
"unknown": {
"description": "Properties when targetType is unknown.",
"$ref": "#/definitions/UnknownTarget"
}
}
}
},
"x-ms-azure-resource": true
},
"StorageTargetProperties": {
"x-ms-client-flatten": true,
"type": "object",
"description": "Properties of the Storage Target.",
"discriminator": "targetType",
"required": [
"targetType"
],
"properties": {
"junctions": {
"description": "List of Cache namespace junctions to target for namespace associations.",
"type": "array",
"items": {
"$ref": "#/definitions/NamespaceJunction"
}
},
"targetType": {
"description": "Type of the Storage Target.",
"enum": [
"nfs3",
"clfs",
"unknown"
],
"x-ms-enum": {
"name": "StorageTargetType",
"modelAsString": true
},
"type": "string"
},
"provisioningState": {
"description": "ARM provisioning state, see https://github.com/Azure/azure-resource-manager-rpc/blob/master/v1.0/Addendum.md#provisioningstate-property",
"enum": [
"Succeeded",
"Failed",
"Cancelled",
"Creating",
"Deleting",
"Updating"
],
"x-ms-enum": {
"name": "ProvisioningStateType",
"modelAsString": true
},
"type": "string"
},
"nfs3": {
"description": "Properties when targetType is nfs3.",
"$ref": "#/definitions/Nfs3Target"
},
"clfs": {
"description": "Properties when targetType is clfs.",
"$ref": "#/definitions/ClfsTarget"
},
"unknown": {
"description": "Properties when targetType is unknown.",
"$ref": "#/definitions/UnknownTarget"
}
}
},
"Nfs3TargetProperties": {
"description": "An NFSv3 mount point for use as a Storage Target.",
"type": "object",
"x-ms-discriminator-value": "nfs3",
"allOf": [
{
"$ref": "#/definitions/StorageTargetProperties"
}
]
},
"ClfsTargetProperties": {
"description": "Storage container for use as a CLFS Storage Target.",
"type": "object",
"x-ms-discriminator-value": "clfs",
"allOf": [
{
"$ref": "#/definitions/StorageTargetProperties"
}
]
},
"UnknownTargetProperties": {
"description": "Storage container for use as an Unknown Storage Target.",
"type": "object",
"x-ms-discriminator-value": "unknown",
"allOf": [
{
"$ref": "#/definitions/StorageTargetProperties"
}
]
},
"NamespaceJunction": {
"description": "A namespace junction.",
"type": "object",
Expand Down