Skip to content

CMK support for VMware migration and addition of few properties for VMware DR monitoring #8390

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
weidongxu-microsoft merged 8 commits into from
Mar 10, 2020
Merged

CMK support for VMware migration and addition of few properties for VMware DR monitoring #8390

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
068363a
cmk, v2a monitotring
anmolbhatia289 Feb 13, 2020
3f176ed
property type fix
anmolbhatia289 Feb 13, 2020
a061b80
reflecting properties in examples, and adding readOnly tag
anmolbhatia289 Feb 14, 2020
4356321
spacing fixes
anmolbhatia289 Feb 14, 2020
3e9c609
added missed readOnly property
anmolbhatia289 Feb 14, 2020
ae374c5
added missed property
anmolbhatia289 Feb 14, 2020
5d24517
running prettier
anmolbhatia289 Feb 27, 2020
f6ac0b0
Fixing the sdk generation issue.
punit-bhatt Feb 28, 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
5 changes: 3 additions & 2 deletions ...crosoft.RecoveryServices/stable/2018-01-10/examples/ReplicationMigrationItems_Create.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,13 @@
"policyId": "/Subscriptions/cb53d0c3-bd59-4721-89bc-06916a9147ef/resourceGroups/resourcegroup1/providers/Microsoft.RecoveryServices/vaults/migrationvault/replicationPolicies/vmwarepolicy1",
"providerSpecificDetails": {
"instanceType": "VMwareCbt",
"disksToInclude" : [
"disksToInclude": [
{
"diskId": "disk1",
"isOSDisk": "true",
"logStorageAccountId": "/Subscriptions/cb53d0c3-bd59-4721-89bc-06916a9147ef/resourceGroups/resourcegroup1/providers/Microsoft.Storage/storageAccounts/logStorageAccount1",
"logStorageAccountSasSecretName": "logStorageSas"
"logStorageAccountSasSecretName": "logStorageSas",
"diskEncryptionSetId": "/subscriptions/cb53d0c3-bd59-4721-89bc-06916a9147ef/resourceGroups/resourcegroup1/providers/Microsoft.Compute/diskEncryptionSets/diskEncryptionSet1"
}
],
"vmwareMachineId": "/Subscriptions/cb53d0c3-bd59-4721-89bc-06916a9147ef/resourceGroups/resourcegroup1/providers/Microsoft.OffAzure/VMwareSites/vmwaresite1/machines/virtualmachine1",
Expand Down
2 changes: 1 addition & 1 deletion ...crosoft.RecoveryServices/stable/2018-01-10/examples/ReplicationMigrationItems_Resync.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,4 +49,4 @@
},
"202": {}
}
}
}
14 changes: 14 additions & 0 deletions ...essiterecovery/resource-manager/Microsoft.RecoveryServices/stable/2018-01-10/service.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16176,6 +16176,10 @@
"name": "DiskAccountType",
"modelAsString": true
}
},
"diskEncryptionSetId": {
Copy link
Copy Markdown
Contributor

@ryansbenson ryansbenson Feb 27, 2020

Choose a reason for hiding this comment

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

This appears to be the only non-readonly field your adding which constitutes a breaking change and requires a new api version.

See 'New property added to response'
https://microsoft.sharepoint.com/:w:/t/azureresourcemanagerteam/EWXsAQ1yx25KkyYCeeWGUgwBSBxEdUDEbHi6FZ__U8EOQw?e=xEcppo

I see you have the response with this field marked as readonly but it still breaks the get-put scenario called out in the doc.

Copy link
Copy Markdown
Contributor Author

@anmolbhatia289 anmolbhatia289 Feb 28, 2020

Choose a reason for hiding this comment

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

As this is an optional input property and which cannot be updated once set, won’t this be safe in the PUT -> GET -> PUT scenario? From service side, we retain the existing value of this property if a new PUT comes where this value is not set (the property is tagged as “read-only” in the response).

Copy link
Copy Markdown
Member

@weidongxu-microsoft weidongxu-microsoft Feb 28, 2020 •
edited
Loading

Choose a reason for hiding this comment

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

There is x-ms-mutability which might help in this situation (Though I am not sure how different code generator would handle it. Well at least for human reader, the intention would be clearer).

I guess we know many service actually use merge in PUT to handle backward compatibility. But that is really a service by service (or even endpoint by endpoint?) solution, so I think ARM had to ask.

"description": "The DiskEncryptionSet ARM Id.",
"type": "string"
}
}
},
Expand Down Expand Up @@ -16412,6 +16416,11 @@
"type": "integer",
"readOnly": true
},
"resyncRequired": {
"description": "A value indicating whether resync is required.",
"type": "string",
"readOnly": true
},
"resyncState": {
"description": "The resync state.",
"enum": [
Expand Down Expand Up @@ -16619,6 +16628,11 @@
"type": "string",
"readOnly": true
},
"diskEncryptionSetId": {
"description": "The DiskEncryptionSet ARM Id.",
"type": "string",
"readOnly": true
},
"seedManagedDiskId": {
"description": "The ARM Id of the seed managed disk.",
"type": "string",
Expand Down
2 changes: 1 addition & 1 deletion ...crosoft.RecoveryServices/stable/2018-07-10/examples/ReplicationMigrationItems_Create.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
"policyId": "/Subscriptions/cb53d0c3-bd59-4721-89bc-06916a9147ef/resourceGroups/resourcegroup1/providers/Microsoft.RecoveryServices/vaults/migrationvault/replicationPolicies/vmwarepolicy1",
"providerSpecificDetails": {
"instanceType": "VMwareCbt",
"disksToInclude" : [
"disksToInclude": [
{
"diskId": "disk1",
"isOSDisk": "true",
Expand Down
6 changes: 5 additions & 1 deletion ...rvices/stable/2018-07-10/examples/TargetComputeSizes_ListByReplicationProtectedItems.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,15 @@
"name": "Standard_A0",
"friendlyName": "Standard_A0",
"cpuCoresCount": 1,
"vCPUsAvailable": 1,
"memoryInGB": 0.75,
"maxDataDiskCount": 1,
"maxNicsCount": 2,
"errors": null,
"highIopsSupported": "NotSupported"
"highIopsSupported": "NotSupported",
"hyperVGenerations": [
"V1"
]
}
}
],
Expand Down
75 changes: 73 additions & 2 deletions ...essiterecovery/resource-manager/Microsoft.RecoveryServices/stable/2018-07-10/service.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -242,7 +242,6 @@
}
}
},
"x-ms-long-running-operation": true,
"x-ms-examples": {
"Gets the validation errors in case the VM is unsuitable for protection.": {
"$ref": "./examples/ReplicationEligibilityResults_List.json"
Expand Down Expand Up @@ -287,7 +286,6 @@
}
}
},
"x-ms-long-running-operation": true,
"x-ms-examples": {
"Gets the validation errors in case the VM is unsuitable for protection.": {
"$ref": "./examples/ReplicationEligibilityResults_Get.json"
Expand Down Expand Up @@ -11717,6 +11715,11 @@
"description": "The process server Id.",
"type": "string"
},
"processServerName": {
"description": "The process server name.",
"type": "string",
"readOnly": true
},
"multiVmGroupId": {
"description": "The multi vm group Id.",
"type": "string"
Expand Down Expand Up @@ -13844,6 +13847,60 @@
"agentVersionDetails": {
"$ref": "#/definitions/VersionDetails",
"description": "The agent version details."
},
"health": {
"description": "The health of Process Server.",
"enum": [
"None",
"Normal",
"Warning",
"Critical"
],
"type": "string",
"readOnly": true,
"x-ms-enum": {
"name": "ProtectionHealth",
"modelAsString": true
}
},
"psStatsRefreshTime": {
"format": "date-time",
"description": "The process server stats refresh time.",
"type": "string",
"readOnly": true
},
"throughputUploadPendingDataInBytes": {
"format": "int64",
"description": "The uploading pending data in bytes.",
"type": "integer",
"readOnly": true
},
"throughputInMBps": {
"format": "int64",
"description": "The throughput in MBps.",
"type": "integer",
"readOnly": true
},
"throughputInBytes": {
"format": "int64",
"description": "The throughput in bytes.",
"type": "integer",
"readOnly": true
},
"throughputStatus": {
"description": "The throughput status.",
"type": "string",
"readOnly": true
},
"marsCommunicationStatus": {
"description": "The MARS communication status.",
"type": "string",
"readOnly": true
},
"marsRegistrationStatus": {
"description": "The MARS registration status.",
"type": "string",
"readOnly": true
}
}
},
Expand Down Expand Up @@ -16153,6 +16210,12 @@
"description": "The maximum cpu cores count supported by target compute size.",
"type": "integer"
},
"vCPUsAvailable": {
"format": "int32",
"description": "The Available vCPUs supported by target compute size.",
"type": "integer",
"readOnly": true
},
"memoryInGB": {
"format": "double",
"description": "The maximum memory in GB supported by target compute size.",
Expand All @@ -16178,6 +16241,14 @@
"highIopsSupported": {
"description": "The value indicating whether the target compute size supports high Iops.",
"type": "string"
},
"hyperVGenerations": {
"description": "The supported HyperV Generations.",
"type": "array",
"items": {
"type": "string"
},
"readOnly": true
}
}
},
Expand Down