Skip to content

Adding AADProperties query object for CRR #13447

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
ArcturusZhang merged 7 commits into from
Mar 25, 2021
Merged

Adding AADProperties query object for CRR #13447

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3dea79d
Adding AADProperties query object for CRR
pratimaupadhyay02 Mar 16, 2021
a36917c
Update
pratimaupadhyay02 Mar 16, 2021
a5a1ebe
Update
pratimaupadhyay02 Mar 23, 2021
8db93eb
Fixing spell check
pratimaupadhyay02 Mar 25, 2021
27eaa24
Merge https://github.com/Azure/azure-rest-api-specs
pratimaupadhyay02 Mar 25, 2021
ac008fa
Update
pratimaupadhyay02 Mar 25, 2021
5a5669b
Update
pratimaupadhyay02 Mar 25, 2021
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
45 changes: 44 additions & 1 deletion custom-words.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2112,4 +2112,47 @@ Zilla
ziplist
Zoho
zoneinfo
zset
<<<<<<< HEAD
Copy link
Member

@ArcturusZhang ArcturusZhang Mar 25, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There seems something wrong in the merging...

zset
tpgs
ProviderHub
checkin
regionality
BRCPF
IDRG
EUGPS
PLREGON
ESDNI
USUK
Resource
Metastores
maintenancewindows
Logix
Redirector
destaging
appendpos
appendblock
Exprired
azureasyncoperations
saskey
vmsize
offboard
Offboard
offboards
Offboards
FSLogix
FSLogix
privatelinkservice
natgateway
CheckfeatureSupport
Checkfeature
lifecycles
backuptype
FSLogix
unhide
privatelinkservice
natgateway
defanged
Logz
zset
BMSAAD
33 changes: 33 additions & 0 deletions ...veryservicesbackup/resource-manager/Microsoft.RecoveryServices/stable/2018-12-20/bms.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,13 @@
},
{
"$ref": "#/parameters/SubscriptionId"
},
{
"name": "$filter",
"in": "query",
"description": "OData filter options.",
"required": false,
"type": "string"
}
],
"responses": {
Expand All @@ -53,6 +60,7 @@
}
}
},
"x-ms-odata": "#/definitions/BMSAADPropertiesQueryObject",
"x-ms-examples": {
"Get AAD Properties for authentication in the third region": {
"$ref": "./examples/AzureIaasVm/BackupAadProperties_Get.json"
Expand Down Expand Up @@ -3064,6 +3072,31 @@
},
"discriminator": "jobType"
},
"BMSAADPropertiesQueryObject": {
"description": "Filters to list backup items.",
"type": "object",
"properties": {
"backupManagementType": {
"description": "Backup management type for the backed up item.",
"enum": [
"Invalid",
"AzureIaasVM",
"MAB",
"DPM",
"AzureBackupServer",
"AzureSql",
"AzureStorage",
"AzureWorkload",
"DefaultBackup"
],
"type": "string",
"x-ms-enum": {
"name": "BackupManagementType",
"modelAsString": true
}
}
}
},
"JobQueryObject": {
"description": "Filters to list the jobs.",
"type": "object",
Expand Down
3 changes: 1 addition & 2 deletions specification/recoveryservicesbackup/resource-manager/readme.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,5 +250,4 @@ See configuration in [readme.java.md](./readme.java.md)

## AzureResourceSchema

See configuration in [readme.azureresourceschema.md](./readme.azureresourceschema.md)

See configuration in [readme.azureresourceschema.md](./readme.azureresourceschema.md)