diff --git a/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/AzureZoneCreate.json b/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/AzureZoneCreate.json index 13ec9a452d3d..a6854f47099b 100644 --- a/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/AzureZoneCreate.json +++ b/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/AzureZoneCreate.json @@ -31,7 +31,6 @@ "subnet": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/DEV/providers/Microsoft.Network/virtualNetworks/my-vnet/subnets/azureZoneSub", "vmSize": "azureZoneVMSize", "storageAccountId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/fusionGroupTestRG/providers/Microsoft.Storage/storageAccounts/myStorageAccount", - "storageAccessKey": "azureStorageAccessKey", "storageContainer": "azureZoneStorageContainer", "storageSecured": true, "provisioningState": "Accepted" @@ -52,7 +51,6 @@ "subnet": "azureZoneSub", "vmSize": "azureZoneVMSize", "storageAccountId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/fusionGroupTestRG/providers/Microsoft.Storage/storageAccounts/myStorageAccount", - "storageAccessKey": "azureStorageAccessKey", "storageContainer": "azureZoneStorageContainer", "storageSecured": true, "provisioningState": "Accepted" diff --git a/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/AzureZoneCreateHA.json b/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/AzureZoneCreateHA.json index feab8a49c1fc..ef7ce76fe07e 100644 --- a/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/AzureZoneCreateHA.json +++ b/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/AzureZoneCreateHA.json @@ -32,7 +32,6 @@ "subnet": "azureZoneSub", "vmSize": "azureZoneVMSize", "storageAccountId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/fusionGroupTestRG/providers/Microsoft.Storage/storageAccounts/myStorageAccount", - "storageAccessKey": "azureStorageAccessKey", "storageContainer": "azureZoneStorageContainer", "storageSecured": true, "nodeCount": 3, diff --git a/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/AzureZoneCreateManagedIdentity.json b/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/AzureZoneCreateManagedIdentity.json index 1e97d143f3aa..ade049151a5f 100644 --- a/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/AzureZoneCreateManagedIdentity.json +++ b/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/AzureZoneCreateManagedIdentity.json @@ -62,7 +62,6 @@ "subnet": "azureZoneSub", "vmSize": "azureZoneVMSize", "storageAccountId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/fusionGroupTestRG/providers/Microsoft.Storage/storageAccounts/myStorageAccount", - "storageAccessKey": "azureStorageAccessKey", "storageContainer": "azureZoneStorageContainer", "storageSecured": true, "provisioningState": "Accepted" diff --git a/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/AzureZoneDelete.json b/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/AzureZoneDelete.json index 9efa6897ed57..cad7bef1db1d 100644 --- a/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/AzureZoneDelete.json +++ b/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/AzureZoneDelete.json @@ -8,6 +8,7 @@ }, "responses": { "200": {}, + "202": {}, "204": {} } } diff --git a/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/AzureZoneGet.json b/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/AzureZoneGet.json index 5d14e35adfa9..8a4a466cf947 100644 --- a/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/AzureZoneGet.json +++ b/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/AzureZoneGet.json @@ -16,7 +16,6 @@ "subnet": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/DEV/providers/Microsoft.Network/virtualNetworks/my-vnet/subnets/azureZoneSub", "vmSize": "azureZoneVMSize", "storageAccountId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/fusionGroupTestRG/providers/Microsoft.Storage/storageAccounts/myStorageAccount", - "storageAccessKey": "azureStorageAccessKey", "storageContainer": "azureZoneStorageContainer", "storageSecured": true }, diff --git a/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/AzureZoneList.json b/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/AzureZoneList.json index a1d130180617..de23e5c3eb30 100644 --- a/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/AzureZoneList.json +++ b/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/AzureZoneList.json @@ -23,7 +23,6 @@ "subnet": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/DEV/providers/Microsoft.Network/virtualNetworks/my-vnet/subnets/azureZoneSub", "vmSize": "azureZoneVMSize", "storageAccountId": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/fusionGroupTestRG/providers/Microsoft.Storage/storageAccounts/myStorageAccount", - "storageAccessKey": "azureStorageAccessKey", "storageContainer": "azureZoneStorageContainer", "storageSecured": false } diff --git a/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/MigrationCreate.json b/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/MigrationCreate.json index c439a46d9c14..04a02e746dae 100644 --- a/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/MigrationCreate.json +++ b/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/MigrationCreate.json @@ -10,7 +10,7 @@ "properties": { "donor": "donorZone", "beneficiary": "beneficiaryZone", - "overwritePolicy": "CLOBBER" + "overwritePolicy": "Clobber" } } }, @@ -20,7 +20,7 @@ "properties": { "donor": "donorZone", "beneficiary": "beneficiaryZone", - "overwritePolicy": "CLOBBER" + "overwritePolicy": "Clobber" } } }, diff --git a/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/OnPremZoneCreate.json b/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/OnPremZoneCreate.json index 16ebe3561da6..8e57ee1ac590 100644 --- a/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/OnPremZoneCreate.json +++ b/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/OnPremZoneCreate.json @@ -21,7 +21,6 @@ "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/fusionGroupTestRG/providers/Wandisco.Fusion/fusionGroups/fusionGroupName/OnPremZones/OnPremZoneName", "name": "onPremZoneCreate", "properties": { - "inductionToken": "abcedfg", "provisioningState": "Accepted" }, "location": "East US", @@ -36,7 +35,6 @@ "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/fusionGroupTestRG/providers/Wandisco.Fusion/fusionGroups/fusionGroupName/OnPremZones/OnPremZoneName", "name": "onPremZoneCreate", "properties": { - "inductionToken": "abcedfg", "provisioningState": "Accepted" }, "location": "East US", diff --git a/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/OnPremZoneDelete.json b/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/OnPremZoneDelete.json index e99f07117f7b..2c42e542c4d0 100644 --- a/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/OnPremZoneDelete.json +++ b/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/OnPremZoneDelete.json @@ -17,6 +17,7 @@ }, "responses": { "200": {}, + "202": {}, "204": {} } } diff --git a/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/OnPremZoneGet.json b/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/OnPremZoneGet.json index 8c4d8fb610fa..7d6bd54f3754 100644 --- a/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/OnPremZoneGet.json +++ b/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/OnPremZoneGet.json @@ -12,7 +12,7 @@ "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/fusionGroupTestRG/providers/Wandisco.Fusion/fusionGroups/fusionGroupName/OnPremZones/OnPremZoneName", "name": "onPremZoneGet", "properties": { - "inductionToken": "ip:port:token" + "provisioningState": "Succeeded" }, "location": "East US", "type": "Wandisco.Fusion/onPremZone", diff --git a/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/OnPremZoneList.json b/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/OnPremZoneList.json index ecf79f9fc0f3..24505139679e 100644 --- a/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/OnPremZoneList.json +++ b/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/OnPremZoneList.json @@ -13,7 +13,7 @@ "id": "/subscriptions/00000000-1111-2222-3333-444444444444/resourceGroups/fusionGroupTestRG/providers/Wandisco.Fusion/fusionGroups/fusionGroupName/OnPremZones", "name": "onPremZoneGet", "properties": { - "inductionToken": "ip:port:token" + "provisioningState": "Accepted" }, "location": "East US", "type": "Wandisco.Fusion/onPremZone", diff --git a/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/PluginDelete.json b/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/PluginDelete.json index 3992dfaa22c6..41dfe8226c01 100644 --- a/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/PluginDelete.json +++ b/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/PluginDelete.json @@ -9,6 +9,7 @@ }, "responses": { "200": {}, + "202": {}, "204": {} } } diff --git a/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/ReplicationRuleDelete.json b/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/ReplicationRuleDelete.json index eb130f6112c7..8df1b00f5384 100644 --- a/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/ReplicationRuleDelete.json +++ b/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/examples/FusionGroup/ReplicationRuleDelete.json @@ -8,6 +8,7 @@ }, "responses": { "200": {}, + "202": {}, "204": {} } } diff --git a/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/fusionGroups.json b/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/fusionGroups.json index 98eee95a9b32..012879b7958d 100644 --- a/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/fusionGroups.json +++ b/specification/fusion/resource-manager/Wandisco.Fusion/2019-09-01-preview/fusionGroups.json @@ -373,7 +373,7 @@ "200": { "description": "azureZone details.", "schema": { - "$ref": "#/definitions/AzureZone" + "$ref": "#/definitions/AzureZoneResponse" } }, "default": { @@ -425,13 +425,13 @@ "200": { "description": "Updating Fusion Azure Zone.", "schema": { - "$ref": "#/definitions/AzureZone" + "$ref": "#/definitions/AzureZoneResponse" } }, "201": { "description": "Installing Fusion Azure Zone.", "schema": { - "$ref": "#/definitions/AzureZone" + "$ref": "#/definitions/AzureZoneResponse" } }, "default": { @@ -449,7 +449,10 @@ "$ref": "./examples/FusionGroup/AzureZoneCreateManagedIdentity.json" } }, - "x-ms-long-running-operation": true + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "azure-async-operation" + } }, "delete": { "tags": [ @@ -478,6 +481,9 @@ "200": { "description": "The Azure Zone was successfully deleted" }, + "202": { + "description": "The Azure Zone was accepted for deletion" + }, "204": { "description": "The Azure Zone was not found" }, @@ -493,7 +499,10 @@ "$ref": "./examples/FusionGroup/AzureZoneDelete.json" } }, - "x-ms-long-running-operation": true + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "location" + } } }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Wandisco.Fusion/fusionGroups/{fusionGroupName}/azureZones/{azureZoneName}/plugins": { @@ -652,7 +661,10 @@ "$ref": "./examples/FusionGroup/PluginCreate.json" } }, - "x-ms-long-running-operation": true + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "azure-async-operation" + } }, "delete": { "tags": [ @@ -684,6 +696,9 @@ "200": { "description": "The Plugin was successfully deleted" }, + "202": { + "description": "The Plugin was accepted for deletion" + }, "204": { "description": "The Plugin was not found" }, @@ -699,7 +714,10 @@ "$ref": "./examples/FusionGroup/PluginDelete.json" } }, - "x-ms-long-running-operation": true + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "location" + } } }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Wandisco.Fusion/fusionGroups/{fusionGroupName}/replicationRules": { @@ -848,7 +866,10 @@ "$ref": "./examples/FusionGroup/ReplicationRuleCreate.json" } }, - "x-ms-long-running-operation": true + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "azure-async-operation" + } }, "delete": { "tags": [ @@ -877,6 +898,9 @@ "200": { "description": "The Replication Rule was successfully deleted" }, + "202": { + "description": "The Replication Rule was accepted for deletion" + }, "204": { "description": "The Replication Rule was not found" }, @@ -891,6 +915,10 @@ "Successful delete": { "$ref": "./examples/FusionGroup/ReplicationRuleDelete.json" } + }, + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "location" } } }, @@ -945,8 +973,7 @@ "Successful start of Consistency Check": { "$ref": "./examples/FusionGroup/ConsistencyCheckStart.json" } - }, - "x-ms-long-running-operation": true + } } }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Wandisco.Fusion/operations": { @@ -1065,7 +1092,7 @@ "200": { "description": "onPremZone details.", "schema": { - "$ref": "#/definitions/OnPremZone" + "$ref": "#/definitions/OnPremZoneResponse" } }, "default": { @@ -1117,13 +1144,13 @@ "200": { "description": "Updating OnPrem Zone.", "schema": { - "$ref": "#/definitions/OnPremZone" + "$ref": "#/definitions/OnPremZoneResponse" } }, "201": { "description": "Creating Fusion OnPrem Zone.", "schema": { - "$ref": "#/definitions/OnPremZone" + "$ref": "#/definitions/OnPremZoneResponse" } }, "default": { @@ -1138,7 +1165,10 @@ "$ref": "./examples/FusionGroup/OnPremZoneCreate.json" } }, - "x-ms-long-running-operation": true + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "azure-async-operation" + } }, "delete": { "tags": [ @@ -1167,6 +1197,9 @@ "200": { "description": "The OnPrem Zone was successfully deleted" }, + "202": { + "description": "The OnPrem Zone was accepted for deletion" + }, "204": { "description": "The OnPrem Zone was not found" }, @@ -1182,7 +1215,10 @@ "$ref": "./examples/FusionGroup/OnPremZoneDelete.json" } }, - "x-ms-long-running-operation": true + "x-ms-long-running-operation": true, + "x-ms-long-running-operation-options": { + "final-state-via": "location" + } } }, "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Wandisco.Fusion/fusionGroups/{fusionGroupName}/replicationRules/{replicationRuleName}/migrations": { @@ -1711,6 +1747,22 @@ "$ref": "#/definitions/Resource" } ], + "properties": { + "properties": { + "description": "azure zone resource properties", + "x-ms-client-flatten": true, + "$ref": "#/definitions/AzureZoneInputProperties" + } + } + }, + "AzureZoneResponse": { + "description": "Azure Zone Response", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ], "properties": { "properties": { "description": "azure zone resource properties", @@ -1719,6 +1771,21 @@ } } }, + "AzureZoneInputProperties": { + "description": "Azure Zone", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/AzureZoneProperties" + } + ], + "properties": { + "storageAccessKey": { + "description": "Access Key for storage (use either key or identity)", + "type": "string" + } + } + }, "AzureZoneProperties": { "description": "azure zone properties", "properties": { @@ -1746,10 +1813,6 @@ "$ref": "#/definitions/VirtualMachineIdentity", "description": "Managed identity of storage account (use either key or identity)" }, - "storageAccessKey": { - "description": "Access Key for storage (use either key or identity)", - "type": "string" - }, "storageSecured": { "description": "Secure transfer required", "type": "boolean" @@ -1897,7 +1960,7 @@ "description": "The list of zones.", "type": "array", "items": { - "$ref": "#/definitions/AzureZone" + "$ref": "#/definitions/AzureZoneResponse" } } } @@ -1914,17 +1977,43 @@ "properties": { "description": "on prem zone resource properties", "x-ms-client-flatten": true, + "$ref": "#/definitions/OnPremZoneInputProperties" + } + } + }, + "OnPremZoneResponse": { + "description": "OnPrem Zone Response", + "type": "object", + "allOf": [ + { + "$ref": "#/definitions/Resource" + } + ], + "properties": { + "properties": { + "description": "on prem zone resource response properties", + "x-ms-client-flatten": true, "$ref": "#/definitions/OnPremZoneProperties" } } }, - "OnPremZoneProperties": { + "OnPremZoneInputProperties": { "description": "on prem zone properties", + "allOf": [ + { + "$ref": "#/definitions/OnPremZoneProperties" + } + ], "properties": { "inductionToken": { "description": "induction token for on prem zone", "type": "string" - }, + } + } + }, + "OnPremZoneProperties": { + "description": "on prem zone response properties", + "properties": { "provisioningState": { "title": "ProvisioningState", "description": "Provisioning State of resource", @@ -1944,7 +2033,7 @@ "description": "The list of zones.", "type": "array", "items": { - "$ref": "#/definitions/OnPremZone" + "$ref": "#/definitions/OnPremZoneResponse" } } } @@ -2215,10 +2304,25 @@ "type": "string", "description": "The overwrite policy for migration CLOBBER|SKIP_IF_SIZE_MATCH|SKIP_IF_DATE_IS_EARLIER", "enum": [ - "CLOBBER", - "SKIP_IF_SIZE_MATCH", - "SKIP_IF_DATE_IS_EARLIER" - ] + "Clobber", + "SkipIfSizeMatch", + "SkipIfDateIsEarlier" + ], + "x-ms-enum": { + "name": "LiveMigrationOverwritePolicy", + "modelAsString": false, + "values": [ + { + "value": "Clobber" + }, + { + "value": "SkipIfSizeMatch" + }, + { + "value": "SkipIfDateIsEarlier" + } + ] + } }, "state": { "description": "Running state of the migration",