Skip to content

Fix discriminator issues in storagecache 2020-03-01 #10392

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
merged 2 commits into from
Aug 14, 2020
Merged

Fix discriminator issues in storagecache 2020-03-01 #10392

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eb176b4
Fix issues
ArcturusZhang Aug 10, 2020
3f7191a
Fix
ArcturusZhang Aug 10, 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
53 changes: 21 additions & 32 deletions .../storagecache/resource-manager/Microsoft.StorageCache/stable/2020-03-01/storagecache.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1486,18 +1486,15 @@
"allOf": [
{
"$ref": "#/definitions/StorageTargetResource"
},
{
"type": "object",
"properties": {
"properties": {
"x-ms-client-flatten": true,
"description": "StorageTarget properties",
"$ref": "#/definitions/StorageTargetProperties"
}
}
}
]
],
"properties": {
"properties": {
"x-ms-client-flatten": true,
"description": "StorageTarget properties",
"$ref": "#/definitions/StorageTargetProperties"
}
}
},
"StorageTargetResource": {
"description": "Resource used by a Cache.",
Expand All @@ -1523,12 +1520,11 @@
"StorageTargetProperties": {
"type": "object",
"description": "Properties of the Storage Target.",
"discriminator": "targetBaseType",
"discriminator": "targetType",
"required": [
"targetType"
],
"properties": {
"targetBaseType": {
"description": "Type of the Storage Target.",
"$ref": "#/definitions/StorageTargetType"
},
"junctions": {
"description": "List of Cache namespace junctions to target for namespace associations.",
"type": "array",
Expand All @@ -1538,6 +1534,15 @@
},
"targetType": {
"description": "Type of the Storage Target.",
"enum": [
"nfs3",
"clfs",
"unknown"
],
"x-ms-enum": {
"name": "StorageTargetType",
"modelAsString": true
},
"type": "string"
},
"provisioningState": {
Expand Down Expand Up @@ -1568,22 +1573,6 @@
"description": "Properties when targetType is unknown.",
"$ref": "#/definitions/UnknownTarget"
}
},
"required": [
"targetBaseType"
]
},
"StorageTargetType": {
"type": "string",
"description": "Type of the Storage Target.",
"enum": [
"nfs3",
"clfs",
"unknown"
],
"x-ms-enum": {
"name": "StorageTargetType",
"modelAsString": true
}
},
"Nfs3TargetProperties": {
Expand Down