DONOT COMMIT: Microsoft.StorageSync : Update Api Version 2020-09-01 (…

…preview) for InitialUploadPolicy feature. (#11392) * update initialuploadpolicy * Update test for InitialUploadPolicy setting Co-authored-by: Manish Duggal <[email protected]>
Azure · Oct 27, 2020 · e61c491 · e61c491
1 parent fae84d4
commit e61c491
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 4 deletions.
diff --git a/...rce-manager/Microsoft.StorageSync/preview/2020-09-01/examples/ServerEndpoints_Create.json b/...rce-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/...source-manager/Microsoft.StorageSync/preview/2020-09-01/examples/ServerEndpoints_Get.json b/...source-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/...er/Microsoft.StorageSync/preview/2020-09-01/examples/ServerEndpoints_ListBySyncGroup.json b/...er/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/...rce-manager/Microsoft.StorageSync/preview/2020-09-01/examples/ServerEndpoints_Update.json b/...rce-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"

diff --git a/...on/storagesync/resource-manager/Microsoft.StorageSync/preview/2020-09-01/storagesync.json b/...on/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",