From ff903a9bbca4aa63ecd905fc6e80efd145b1b2d5 Mon Sep 17 00:00:00 2001 From: Manish Duggal Date: Mon, 26 Oct 2020 13:58:10 -0700 Subject: [PATCH 1/2] update initialuploadpolicy --- .../preview/2020-09-01/storagesync.json | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/specification/storagesync/resource-manager/Microsoft.StorageSync/preview/2020-09-01/storagesync.json b/specification/storagesync/resource-manager/Microsoft.StorageSync/preview/2020-09-01/storagesync.json index 14a65f0b4501..41adecbc6e1a 100644 --- a/specification/storagesync/resource-manager/Microsoft.StorageSync/preview/2020-09-01/storagesync.json +++ b/specification/storagesync/resource-manager/Microsoft.StorageSync/preview/2020-09-01/storagesync.json @@ -3447,6 +3447,10 @@ "localCacheMode": { "$ref": "#/definitions/LocalCacheMode", "description": "Policy for enabling follow-the-sun business models: link local cache to cloud behavior to pre-populate before local access." + }, + "initialUploadPolicy": { + "$ref": "#/definitions/InitialUploadPolicy", + "description": "Policy for how the initial upload sync session is performed." } } }, @@ -4438,6 +4442,10 @@ "$ref": "#/definitions/LocalCacheMode", "description": "Policy for enabling follow-the-sun business models: link local cache to cloud behavior to pre-populate before local access." }, + "initialUploadPolicy": { + "$ref": "#/definitions/InitialUploadPolicy", + "description": "Policy for how the initial upload sync session is performed." + }, "serverName": { "type": "string", "description": "Server name", @@ -4753,6 +4761,18 @@ "modelAsString": true } }, + "InitialUploadPolicy": { + "type": "string", + "description": "Policy for how the initial upload sync session is performed.", + "enum": [ + "ServerAuthoritative", + "Merge" + ], + "x-ms-enum": { + "name": "InitialUploadPolicy", + "modelAsString": true + } + }, "ServerEndpointHealthState": { "type": "string", "description": "Type of the server endpoint health state", From b5fd6bd4f8e024e1dbda426b375e9b43d0c928ac Mon Sep 17 00:00:00 2001 From: Manish Duggal Date: Mon, 26 Oct 2020 14:09:23 -0700 Subject: [PATCH 2/2] Update test for InitialUploadPolicy setting --- .../preview/2020-09-01/examples/ServerEndpoints_Create.json | 6 ++++-- .../preview/2020-09-01/examples/ServerEndpoints_Get.json | 1 + .../examples/ServerEndpoints_ListBySyncGroup.json | 4 +++- .../preview/2020-09-01/examples/ServerEndpoints_Update.json | 3 ++- 4 files changed, 10 insertions(+), 4 deletions(-) diff --git a/specification/storagesync/resource-manager/Microsoft.StorageSync/preview/2020-09-01/examples/ServerEndpoints_Create.json b/specification/storagesync/resource-manager/Microsoft.StorageSync/preview/2020-09-01/examples/ServerEndpoints_Create.json index 25a3b2868d2c..788706e294e5 100644 --- a/specification/storagesync/resource-manager/Microsoft.StorageSync/preview/2020-09-01/examples/ServerEndpoints_Create.json +++ b/specification/storagesync/resource-manager/Microsoft.StorageSync/preview/2020-09-01/examples/ServerEndpoints_Create.json @@ -15,7 +15,8 @@ "offlineDataTransfer": "on", "offlineDataTransferShareName": "myfileshare", "initialDownloadPolicy": "NamespaceThenModifiedFiles", - "localCacheMode": "UpdateLocallyCachedFiles" + "localCacheMode": "UpdateLocallyCachedFiles", + "initialUploadPolicy": "ServerAuthoritative" } }, "api-version": "2020-09-01" @@ -47,7 +48,8 @@ "cloudTieringStatus": null, "recallStatus": null, "initialDownloadPolicy": "NamespaceThenModifiedFiles", - "localCacheMode": "UpdateLocallyCachedFiles" + "localCacheMode": "UpdateLocallyCachedFiles", + "initialUploadPolicy": "ServerAuthoritative" }, "id": "/subscriptions/52b8da2f-61e0-4a1f-8dde-336911f367fb/resourceGroups/SampleResourceGroup_1/providers/Microsoft.StorageSync/storageSyncServices/SampleStorageSyncService_1/syncGroups/SampleSyncGroup_1/serverEndpoints/SampleServerEndpoint_1", "type": "Microsoft.StorageSync/storageSyncServices/syncGroups/serverEndpoints" diff --git a/specification/storagesync/resource-manager/Microsoft.StorageSync/preview/2020-09-01/examples/ServerEndpoints_Get.json b/specification/storagesync/resource-manager/Microsoft.StorageSync/preview/2020-09-01/examples/ServerEndpoints_Get.json index 67a99648af47..a99cfe0b568a 100644 --- a/specification/storagesync/resource-manager/Microsoft.StorageSync/preview/2020-09-01/examples/ServerEndpoints_Get.json +++ b/specification/storagesync/resource-manager/Microsoft.StorageSync/preview/2020-09-01/examples/ServerEndpoints_Get.json @@ -75,6 +75,7 @@ "offlineDataTransferShareName": "myfileshare", "initialDownloadPolicy": "NamespaceThenModifiedFiles", "localCacheMode": "UpdateLocallyCachedFiles", + "initialUploadPolicy": "Merge", "cloudTieringStatus": { "lastUpdatedTimestamp": "2018-06-11T23:32:51.1057915Z", "health": "Error", diff --git a/specification/storagesync/resource-manager/Microsoft.StorageSync/preview/2020-09-01/examples/ServerEndpoints_ListBySyncGroup.json b/specification/storagesync/resource-manager/Microsoft.StorageSync/preview/2020-09-01/examples/ServerEndpoints_ListBySyncGroup.json index 7b1f1e3acb73..eaff18580bb0 100644 --- a/specification/storagesync/resource-manager/Microsoft.StorageSync/preview/2020-09-01/examples/ServerEndpoints_ListBySyncGroup.json +++ b/specification/storagesync/resource-manager/Microsoft.StorageSync/preview/2020-09-01/examples/ServerEndpoints_ListBySyncGroup.json @@ -61,7 +61,8 @@ "offlineDataTransferStorageAccountTenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", "offlineDataTransferShareName": "myfileshare", "initialDownloadPolicy": "NamespaceThenModifiedFiles", - "localCacheMode": "UpdateLocallyCachedFiles" + "localCacheMode": "UpdateLocallyCachedFiles", + "initialUploadPolicy": "Merge" }, "id": "/subscriptions/52b8da2f-61e0-4a1f-8dde-336911f367fb/resourceGroups/SampleResourceGroup_1/providers/Microsoft.StorageSync/storageSyncServices/SampleStorageSyncService_1/syncGroups/SampleSyncGroup_1/serverEndpoints/SampleServerEndpoint_1", "type": "Microsoft.StorageSync/storageSyncServices/syncGroups/serverEndpoints" @@ -81,6 +82,7 @@ "tierFilesOlderThanDays": 5, "initialDownloadPolicy": "NamespaceThenModifiedFiles", "localCacheMode": "UpdateLocallyCachedFiles", + "initialUploadPolicy": "Merge", "syncStatus": { "downloadHealth": "Healthy", "uploadHealth": "Healthy", diff --git a/specification/storagesync/resource-manager/Microsoft.StorageSync/preview/2020-09-01/examples/ServerEndpoints_Update.json b/specification/storagesync/resource-manager/Microsoft.StorageSync/preview/2020-09-01/examples/ServerEndpoints_Update.json index 9f1970e01f07..bb93e80863d1 100644 --- a/specification/storagesync/resource-manager/Microsoft.StorageSync/preview/2020-09-01/examples/ServerEndpoints_Update.json +++ b/specification/storagesync/resource-manager/Microsoft.StorageSync/preview/2020-09-01/examples/ServerEndpoints_Update.json @@ -70,7 +70,8 @@ "offlineDataTransferStorageAccountTenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47", "offlineDataTransferShareName": "myfileshare", "initialDownloadPolicy": "NamespaceThenModifiedFiles", - "localCacheMode": "UpdateLocallyCachedFiles" + "localCacheMode": "UpdateLocallyCachedFiles", + "initialUploadPolicy": "Merge" }, "id": "/subscriptions/52b8da2f-61e0-4a1f-8dde-336911f367fb/resourceGroups/SampleResourceGroup_1/providers/Microsoft.StorageSync/storageSyncServices/SampleStorageSyncService_1/syncGroups/SampleSyncGroup_1/serverEndpoints/SampleServerEndpoint_1", "type": "Microsoft.StorageSync/storageSyncServices/syncGroups/serverEndpoints"