diff --git a/src/ResourceManagement/SiteRecovery/SiteRecovery.Tests/Spec.TechSupport.SiteRecovery/SiteRecoveryManagementTestUtilities.cs b/src/ResourceManagement/SiteRecovery/SiteRecovery.Tests/Spec.TechSupport.SiteRecovery/SiteRecoveryManagementTestUtilities.cs index 1a3ad11c4e07..6f347070bb6d 100644 --- a/src/ResourceManagement/SiteRecovery/SiteRecovery.Tests/Spec.TechSupport.SiteRecovery/SiteRecoveryManagementTestUtilities.cs +++ b/src/ResourceManagement/SiteRecovery/SiteRecovery.Tests/Spec.TechSupport.SiteRecovery/SiteRecoveryManagementTestUtilities.cs @@ -43,6 +43,7 @@ public static RecoveryServicesManagementClient GetRecoveryServicesManagementClie } return new RecoveryServicesManagementClient( + "Microsoft.SiteRecovery", (SubscriptionCloudCredentials)environment.Credentials, environment.BaseUri).WithHandler(HttpMockServer.CreateInstance()); } @@ -101,9 +102,9 @@ public static SiteRecoveryManagementClient GetSiteRecoveryManagementClient(this } return new SiteRecoveryManagementClient( - SiteRecoveryTestsBase.MyCloudService, SiteRecoveryTestsBase.MyVaultName, SiteRecoveryTestsBase.MyResourceGroupName, + "Microsoft.SiteRecovery", (SubscriptionCloudCredentials)environment.Credentials, environment.BaseUri).WithHandler(HttpMockServer.CreateInstance()); } diff --git a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/IRecoveryServicesManagementClient.cs b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/IRecoveryServicesManagementClient.cs index 68a880e4de81..f167684a6184 100644 --- a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/IRecoveryServicesManagementClient.cs +++ b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/IRecoveryServicesManagementClient.cs @@ -73,6 +73,11 @@ int LongRunningOperationRetryTimeout get; set; } + string ResourceNamespace + { + get; set; + } + /// /// Definition of cloud service operations for the Recovery services /// extension. diff --git a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/ISiteRecoveryManagementClient.cs b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/ISiteRecoveryManagementClient.cs index 54a93f7638ac..8d079966ebb5 100644 --- a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/ISiteRecoveryManagementClient.cs +++ b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/ISiteRecoveryManagementClient.cs @@ -44,11 +44,6 @@ Uri BaseUri get; } - string CloudServiceName - { - get; set; - } - /// /// Gets subscription credentials which uniquely identify Microsoft /// Azure subscription. The subscription ID forms part of the URI for @@ -85,6 +80,11 @@ string ResourceName get; set; } + string ResourceNamespace + { + get; set; + } + /// /// Definition for Job Operations. /// diff --git a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/JobOperations.cs b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/JobOperations.cs index 10a10c3ff146..687995cd5e7a 100644 --- a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/JobOperations.cs +++ b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/JobOperations.cs @@ -109,7 +109,7 @@ public async Task BeginRestartingAsync(string jobI url = url + "/resourceGroups/"; url = url + Uri.EscapeDataString(this.Client.ResourceGroupName); url = url + "/providers/"; - url = url + "Microsoft.SiteRecovery"; + url = url + Uri.EscapeDataString(this.Client.ResourceNamespace); url = url + "/"; url = url + "SiteRecoveryVault"; url = url + "/"; @@ -272,7 +272,7 @@ public async Task BeginResumingAsync(string jobId, url = url + "/resourceGroups/"; url = url + Uri.EscapeDataString(this.Client.ResourceGroupName); url = url + "/providers/"; - url = url + "Microsoft.SiteRecovery"; + url = url + Uri.EscapeDataString(this.Client.ResourceNamespace); url = url + "/"; url = url + "SiteRecoveryVault"; url = url + "/"; @@ -450,7 +450,7 @@ public async Task GetAsync(string jobId, CustomRequestHeaders custo url = url + "/resourceGroups/"; url = url + Uri.EscapeDataString(this.Client.ResourceGroupName); url = url + "/providers/"; - url = url + "Microsoft.SiteRecovery"; + url = url + Uri.EscapeDataString(this.Client.ResourceNamespace); url = url + "/"; url = url + "SiteRecoveryVault"; url = url + "/"; @@ -2147,7 +2147,7 @@ public async Task ListAsync(JobQueryParameter parameters, Custo url = url + "/resourceGroups/"; url = url + Uri.EscapeDataString(this.Client.ResourceGroupName); url = url + "/providers/"; - url = url + "Microsoft.SiteRecovery"; + url = url + Uri.EscapeDataString(this.Client.ResourceNamespace); url = url + "/"; url = url + "SiteRecoveryVault"; url = url + "/"; diff --git a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/Models/AzureFailbackInput.cs b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/Models/AzureFailbackInput.cs new file mode 100644 index 000000000000..7a634940f14c --- /dev/null +++ b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/Models/AzureFailbackInput.cs @@ -0,0 +1,62 @@ +// +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// + +// Warning: This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if the +// code is regenerated. + +using System; +using System.Linq; +using Microsoft.Azure.Management.SiteRecovery.Models; + +namespace Microsoft.Azure.Management.SiteRecovery.Models +{ + /// + /// The HyperV Azure failback input. + /// + public partial class AzureFailbackInput : FailoverReplicationProviderSpecificInput + { + private bool _createRecoveryVmIfDoesntExist; + + /// + /// Optional. Secondary key encryption key certificate. + /// + public bool CreateRecoveryVmIfDoesntExist + { + get { return this._createRecoveryVmIfDoesntExist; } + set { this._createRecoveryVmIfDoesntExist = value; } + } + + private bool _skipDataSync; + + /// + /// Optional. Secondary key encryption key certificate. + /// + public bool SkipDataSync + { + get { return this._skipDataSync; } + set { this._skipDataSync = value; } + } + + /// + /// Initializes a new instance of the AzureFailbackInput class. + /// + public AzureFailbackInput() + { + } + } +} diff --git a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/Models/AzureFailoverInput.cs b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/Models/AzureFailoverInput.cs new file mode 100644 index 000000000000..b7436094e39e --- /dev/null +++ b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/Models/AzureFailoverInput.cs @@ -0,0 +1,73 @@ +// +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// + +// Warning: This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if the +// code is regenerated. + +using System; +using System.Linq; +using Microsoft.Azure.Management.SiteRecovery.Models; + +namespace Microsoft.Azure.Management.SiteRecovery.Models +{ + /// + /// The HyperV Azure failover input. + /// + public partial class AzureFailoverInput : FailoverReplicationProviderSpecificInput + { + private string _primaryKekCertificatePfx; + + /// + /// Optional. + /// + public string PrimaryKekCertificatePfx + { + get { return this._primaryKekCertificatePfx; } + set { this._primaryKekCertificatePfx = value; } + } + + private string _secondaryKekCertificatePfx; + + /// + /// Optional. + /// + public string SecondaryKekCertificatePfx + { + get { return this._secondaryKekCertificatePfx; } + set { this._secondaryKekCertificatePfx = value; } + } + + private string _vaultLocation; + + /// + /// Optional. + /// + public string VaultLocation + { + get { return this._vaultLocation; } + set { this._vaultLocation = value; } + } + + /// + /// Initializes a new instance of the AzureFailoverInput class. + /// + public AzureFailoverInput() + { + } + } +} diff --git a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/Models/AzureReprotectInput.cs b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/Models/AzureReprotectInput.cs new file mode 100644 index 000000000000..039ccd3acb81 --- /dev/null +++ b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/Models/AzureReprotectInput.cs @@ -0,0 +1,106 @@ +// +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// + +// Warning: This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if the +// code is regenerated. + +using System; +using System.Linq; +using Microsoft.Azure.Management.SiteRecovery.Models; + +namespace Microsoft.Azure.Management.SiteRecovery.Models +{ + /// + /// The HyperV Azure reprotect input. + /// + public partial class AzureReprotectInput : FailoverReplicationProviderSpecificInput + { + private string _hvHostVmId; + + /// + /// Optional. Secondary key encryption key certificate. + /// + public string HvHostVmId + { + get { return this._hvHostVmId; } + set { this._hvHostVmId = value; } + } + + private string _oSType; + + /// + /// Optional. Secondary key encryption key certificate. + /// + public string OSType + { + get { return this._oSType; } + set { this._oSType = value; } + } + + private string _storageAccountName; + + /// + /// Optional. Secondary key encryption key certificate. + /// + public string StorageAccountName + { + get { return this._storageAccountName; } + set { this._storageAccountName = value; } + } + + private string _storageAccountSubscriptionId; + + /// + /// Optional. Secondary key encryption key certificate. + /// + public string StorageAccountSubscriptionId + { + get { return this._storageAccountSubscriptionId; } + set { this._storageAccountSubscriptionId = value; } + } + + private string _vHDId; + + /// + /// Optional. Secondary key encryption key certificate. + /// + public string VHDId + { + get { return this._vHDId; } + set { this._vHDId = value; } + } + + private string _vmName; + + /// + /// Optional. Secondary key encryption key certificate. + /// + public string VmName + { + get { return this._vmName; } + set { this._vmName = value; } + } + + /// + /// Initializes a new instance of the AzureReprotectInput class. + /// + public AzureReprotectInput() + { + } + } +} diff --git a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/Models/DisassociateProtectionProfileInput.cs b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/Models/DisassociateProtectionProfileInput.cs index 176a450f2256..28f761758824 100644 --- a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/Models/DisassociateProtectionProfileInput.cs +++ b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/Models/DisassociateProtectionProfileInput.cs @@ -21,6 +21,7 @@ using System; using System.Linq; +using Microsoft.Azure.Management.SiteRecovery.Models; namespace Microsoft.Azure.Management.SiteRecovery.Models { @@ -62,12 +63,12 @@ public string RecoveryProtectionContainerId set { this._recoveryProtectionContainerId = value; } } - private string _replicationProviderSettings; + private ProtectionProfileProviderSpecificInput _replicationProviderSettings; /// - /// Optional. + /// Optional. the replication provider settings. /// - public string ReplicationProviderSettings + public ProtectionProfileProviderSpecificInput ReplicationProviderSettings { get { return this._replicationProviderSettings; } set { this._replicationProviderSettings = value; } diff --git a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/Models/FailoverReplicationProviderSpecificInput.cs b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/Models/FailoverReplicationProviderSpecificInput.cs new file mode 100644 index 000000000000..34dd43ed97d1 --- /dev/null +++ b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/Models/FailoverReplicationProviderSpecificInput.cs @@ -0,0 +1,40 @@ +// +// Copyright (c) Microsoft and contributors. All rights reserved. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// +// See the License for the specific language governing permissions and +// limitations under the License. +// + +// Warning: This code was generated by a tool. +// +// Changes to this file may cause incorrect behavior and will be lost if the +// code is regenerated. + +using System; +using System.Linq; + +namespace Microsoft.Azure.Management.SiteRecovery.Models +{ + /// + /// Create profile provider specific input. + /// + public partial class FailoverReplicationProviderSpecificInput + { + /// + /// Initializes a new instance of the + /// FailoverReplicationProviderSpecificInput class. + /// + public FailoverReplicationProviderSpecificInput() + { + } + } +} diff --git a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/Models/FailoverRequest.cs b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/Models/FailoverRequest.cs index 07e167fb6174..86587bbcf771 100644 --- a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/Models/FailoverRequest.cs +++ b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/Models/FailoverRequest.cs @@ -21,6 +21,7 @@ using System; using System.Linq; +using Microsoft.Azure.Management.SiteRecovery.Models; namespace Microsoft.Azure.Management.SiteRecovery.Models { @@ -51,12 +52,12 @@ public string ReplicationProvider set { this._replicationProvider = value; } } - private string _replicationProviderSettings; + private FailoverReplicationProviderSpecificInput _replicationProviderSettings; /// /// Optional. Replication provider settings. /// - public string ReplicationProviderSettings + public FailoverReplicationProviderSpecificInput ReplicationProviderSettings { get { return this._replicationProviderSettings; } set { this._replicationProviderSettings = value; } diff --git a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/Models/HyperVReplicaAzureProtectionProfileInput.cs b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/Models/HyperVReplicaAzureProtectionProfileInput.cs index d4a65660c768..cac3be7f086e 100644 --- a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/Models/HyperVReplicaAzureProtectionProfileInput.cs +++ b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/Models/HyperVReplicaAzureProtectionProfileInput.cs @@ -32,15 +32,15 @@ namespace Microsoft.Azure.Management.SiteRecovery.Models /// public partial class HyperVReplicaAzureProtectionProfileInput : ProtectionProfileProviderSpecificInput { - private int _appConsistencyFreq; + private int _applicationConsistentSnapshotFrequencyInHours; /// /// Optional. /// - public int AppConsistencyFreq + public int ApplicationConsistentSnapshotFrequencyInHours { - get { return this._appConsistencyFreq; } - set { this._appConsistencyFreq = value; } + get { return this._applicationConsistentSnapshotFrequencyInHours; } + set { this._applicationConsistentSnapshotFrequencyInHours = value; } } private string _encryption; @@ -54,15 +54,15 @@ public string Encryption set { this._encryption = value; } } - private System.TimeSpan? _onlineIrStartTime; + private System.TimeSpan? _onlineReplicationStartTime; /// /// Optional. /// - public System.TimeSpan? OnlineIrStartTime + public System.TimeSpan? OnlineReplicationStartTime { - get { return this._onlineIrStartTime; } - set { this._onlineIrStartTime = value; } + get { return this._onlineReplicationStartTime; } + set { this._onlineReplicationStartTime = value; } } private int _recoveryPointHistoryDuration; diff --git a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/Models/ProtectionProfileProviderSpecificInput.cs b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/Models/ProtectionProfileProviderSpecificInput.cs index d15f0894c6a4..c0a12f541bbd 100644 --- a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/Models/ProtectionProfileProviderSpecificInput.cs +++ b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/Models/ProtectionProfileProviderSpecificInput.cs @@ -25,7 +25,7 @@ namespace Microsoft.Azure.Management.SiteRecovery.Models { /// - /// Create profile provider specific input. + /// Profile operation provider specific input. /// public partial class ProtectionProfileProviderSpecificInput { diff --git a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/Models/RpPlannedFailoverRequest.cs b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/Models/RpPlannedFailoverRequest.cs index 0201fdcc811f..3136d338bc83 100644 --- a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/Models/RpPlannedFailoverRequest.cs +++ b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/Models/RpPlannedFailoverRequest.cs @@ -21,6 +21,7 @@ using System; using System.Linq; +using Microsoft.Azure.Management.SiteRecovery.Models; namespace Microsoft.Azure.Management.SiteRecovery.Models { @@ -51,12 +52,12 @@ public string ReplicationProvider set { this._replicationProvider = value; } } - private string _replicationProviderSettings; + private FailoverReplicationProviderSpecificInput _replicationProviderSettings; /// /// Optional. Replication provider settings. /// - public string ReplicationProviderSettings + public FailoverReplicationProviderSpecificInput ReplicationProviderSettings { get { return this._replicationProviderSettings; } set { this._replicationProviderSettings = value; } diff --git a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/Models/RpTestFailoverRequest.cs b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/Models/RpTestFailoverRequest.cs index a8b827e3aaba..530a26d7fdf3 100644 --- a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/Models/RpTestFailoverRequest.cs +++ b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/Models/RpTestFailoverRequest.cs @@ -21,6 +21,7 @@ using System; using System.Linq; +using Microsoft.Azure.Management.SiteRecovery.Models; namespace Microsoft.Azure.Management.SiteRecovery.Models { @@ -73,12 +74,12 @@ public string ReplicationProvider set { this._replicationProvider = value; } } - private string _replicationProviderSettings; + private FailoverReplicationProviderSpecificInput _replicationProviderSettings; /// /// Optional. Replication provider settings. /// - public string ReplicationProviderSettings + public FailoverReplicationProviderSpecificInput ReplicationProviderSettings { get { return this._replicationProviderSettings; } set { this._replicationProviderSettings = value; } diff --git a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/Models/RpUnplannedFailoverRequest.cs b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/Models/RpUnplannedFailoverRequest.cs index 48a61df5520f..45acd193f706 100644 --- a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/Models/RpUnplannedFailoverRequest.cs +++ b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/Models/RpUnplannedFailoverRequest.cs @@ -21,6 +21,7 @@ using System; using System.Linq; +using Microsoft.Azure.Management.SiteRecovery.Models; namespace Microsoft.Azure.Management.SiteRecovery.Models { @@ -51,12 +52,12 @@ public string ReplicationProvider set { this._replicationProvider = value; } } - private string _replicationProviderSettings; + private FailoverReplicationProviderSpecificInput _replicationProviderSettings; /// /// Optional. Replication provider settings. /// - public string ReplicationProviderSettings + public FailoverReplicationProviderSpecificInput ReplicationProviderSettings { get { return this._replicationProviderSettings; } set { this._replicationProviderSettings = value; } diff --git a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/ProtectionContainerOperations.cs b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/ProtectionContainerOperations.cs index 21689bee3a53..3c661d89d0f8 100644 --- a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/ProtectionContainerOperations.cs +++ b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/ProtectionContainerOperations.cs @@ -108,7 +108,7 @@ public async Task GetAsync(string protectionContain url = url + "/resourceGroups/"; url = url + Uri.EscapeDataString(this.Client.ResourceGroupName); url = url + "/providers/"; - url = url + "Microsoft.SiteRecovery"; + url = url + Uri.EscapeDataString(this.Client.ResourceNamespace); url = url + "/"; url = url + "SiteRecoveryVault"; url = url + "/"; @@ -608,7 +608,7 @@ public async Task ListAsync(CustomRequestHeader url = url + "/resourceGroups/"; url = url + Uri.EscapeDataString(this.Client.ResourceGroupName); url = url + "/providers/"; - url = url + "Microsoft.SiteRecovery"; + url = url + Uri.EscapeDataString(this.Client.ResourceNamespace); url = url + "/"; url = url + "SiteRecoveryVault"; url = url + "/"; diff --git a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/ProtectionEntityOperations.cs b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/ProtectionEntityOperations.cs index a6f6c95e231b..1b2d0856e5bb 100644 --- a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/ProtectionEntityOperations.cs +++ b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/ProtectionEntityOperations.cs @@ -126,7 +126,7 @@ public async Task BeginCommitFailoverAsync(string url = url + "/resourceGroups/"; url = url + Uri.EscapeDataString(this.Client.ResourceGroupName); url = url + "/providers/"; - url = url + "Microsoft.SiteRecovery"; + url = url + Uri.EscapeDataString(this.Client.ResourceNamespace); url = url + "/"; url = url + "SiteRecoveryVault"; url = url + "/"; @@ -187,7 +187,72 @@ public async Task BeginCommitFailoverAsync(string if (parameters.ReplicationProviderSettings != null) { - commitFailoverRequestValue["replicationProviderSettings"] = parameters.ReplicationProviderSettings; + JObject replicationProviderSettingsValue = new JObject(); + commitFailoverRequestValue["replicationProviderSettings"] = replicationProviderSettingsValue; + if (parameters.ReplicationProviderSettings is AzureFailoverInput) + { + replicationProviderSettingsValue["__type"] = "AzureFailoverInput"; + AzureFailoverInput derived = ((AzureFailoverInput)parameters.ReplicationProviderSettings); + + if (derived.VaultLocation != null) + { + replicationProviderSettingsValue["vaultLocation"] = derived.VaultLocation; + } + + if (derived.PrimaryKekCertificatePfx != null) + { + replicationProviderSettingsValue["primaryKekCertificatePfx"] = derived.PrimaryKekCertificatePfx; + } + + if (derived.SecondaryKekCertificatePfx != null) + { + replicationProviderSettingsValue["secondaryKekCertificatePfx"] = derived.SecondaryKekCertificatePfx; + } + } + if (parameters.ReplicationProviderSettings is AzureFailbackInput) + { + replicationProviderSettingsValue["__type"] = "AzureFailbackInput"; + AzureFailbackInput derived2 = ((AzureFailbackInput)parameters.ReplicationProviderSettings); + + replicationProviderSettingsValue["skipDataSync"] = derived2.SkipDataSync; + + replicationProviderSettingsValue["createRecoveryVmIfDoesntExist"] = derived2.CreateRecoveryVmIfDoesntExist; + } + if (parameters.ReplicationProviderSettings is AzureReprotectInput) + { + replicationProviderSettingsValue["__type"] = "AzureReprotectInput"; + AzureReprotectInput derived3 = ((AzureReprotectInput)parameters.ReplicationProviderSettings); + + if (derived3.HvHostVmId != null) + { + replicationProviderSettingsValue["hvHostVmId"] = derived3.HvHostVmId; + } + + if (derived3.VmName != null) + { + replicationProviderSettingsValue["vmName"] = derived3.VmName; + } + + if (derived3.OSType != null) + { + replicationProviderSettingsValue["oSType"] = derived3.OSType; + } + + if (derived3.VHDId != null) + { + replicationProviderSettingsValue["vHDId"] = derived3.VHDId; + } + + if (derived3.StorageAccountName != null) + { + replicationProviderSettingsValue["storageAccountName"] = derived3.StorageAccountName; + } + + if (derived3.StorageAccountSubscriptionId != null) + { + replicationProviderSettingsValue["storageAccountSubscriptionId"] = derived3.StorageAccountSubscriptionId; + } + } } if (parameters.FailoverDirection != null) @@ -331,7 +396,7 @@ public async Task BeginPlannedFailoverAsync(string url = url + "/resourceGroups/"; url = url + Uri.EscapeDataString(this.Client.ResourceGroupName); url = url + "/providers/"; - url = url + "Microsoft.SiteRecovery"; + url = url + Uri.EscapeDataString(this.Client.ResourceNamespace); url = url + "/"; url = url + "SiteRecoveryVault"; url = url + "/"; @@ -392,7 +457,72 @@ public async Task BeginPlannedFailoverAsync(string if (parameters.ReplicationProviderSettings != null) { - plannedFailoverRequestValue["replicationProviderSettings"] = parameters.ReplicationProviderSettings; + JObject replicationProviderSettingsValue = new JObject(); + plannedFailoverRequestValue["replicationProviderSettings"] = replicationProviderSettingsValue; + if (parameters.ReplicationProviderSettings is AzureFailoverInput) + { + replicationProviderSettingsValue["__type"] = "AzureFailoverInput"; + AzureFailoverInput derived = ((AzureFailoverInput)parameters.ReplicationProviderSettings); + + if (derived.VaultLocation != null) + { + replicationProviderSettingsValue["vaultLocation"] = derived.VaultLocation; + } + + if (derived.PrimaryKekCertificatePfx != null) + { + replicationProviderSettingsValue["primaryKekCertificatePfx"] = derived.PrimaryKekCertificatePfx; + } + + if (derived.SecondaryKekCertificatePfx != null) + { + replicationProviderSettingsValue["secondaryKekCertificatePfx"] = derived.SecondaryKekCertificatePfx; + } + } + if (parameters.ReplicationProviderSettings is AzureFailbackInput) + { + replicationProviderSettingsValue["__type"] = "AzureFailbackInput"; + AzureFailbackInput derived2 = ((AzureFailbackInput)parameters.ReplicationProviderSettings); + + replicationProviderSettingsValue["skipDataSync"] = derived2.SkipDataSync; + + replicationProviderSettingsValue["createRecoveryVmIfDoesntExist"] = derived2.CreateRecoveryVmIfDoesntExist; + } + if (parameters.ReplicationProviderSettings is AzureReprotectInput) + { + replicationProviderSettingsValue["__type"] = "AzureReprotectInput"; + AzureReprotectInput derived3 = ((AzureReprotectInput)parameters.ReplicationProviderSettings); + + if (derived3.HvHostVmId != null) + { + replicationProviderSettingsValue["hvHostVmId"] = derived3.HvHostVmId; + } + + if (derived3.VmName != null) + { + replicationProviderSettingsValue["vmName"] = derived3.VmName; + } + + if (derived3.OSType != null) + { + replicationProviderSettingsValue["oSType"] = derived3.OSType; + } + + if (derived3.VHDId != null) + { + replicationProviderSettingsValue["vHDId"] = derived3.VHDId; + } + + if (derived3.StorageAccountName != null) + { + replicationProviderSettingsValue["storageAccountName"] = derived3.StorageAccountName; + } + + if (derived3.StorageAccountSubscriptionId != null) + { + replicationProviderSettingsValue["storageAccountSubscriptionId"] = derived3.StorageAccountSubscriptionId; + } + } } if (parameters.FailoverDirection != null) @@ -536,7 +666,7 @@ public async Task BeginReprotectAsync(string pcNam url = url + "/resourceGroups/"; url = url + Uri.EscapeDataString(this.Client.ResourceGroupName); url = url + "/providers/"; - url = url + "Microsoft.SiteRecovery"; + url = url + Uri.EscapeDataString(this.Client.ResourceNamespace); url = url + "/"; url = url + "SiteRecoveryVault"; url = url + "/"; @@ -597,7 +727,72 @@ public async Task BeginReprotectAsync(string pcNam if (parameters.ReplicationProviderSettings != null) { - reprotectRequestValue["replicationProviderSettings"] = parameters.ReplicationProviderSettings; + JObject replicationProviderSettingsValue = new JObject(); + reprotectRequestValue["replicationProviderSettings"] = replicationProviderSettingsValue; + if (parameters.ReplicationProviderSettings is AzureFailoverInput) + { + replicationProviderSettingsValue["__type"] = "AzureFailoverInput"; + AzureFailoverInput derived = ((AzureFailoverInput)parameters.ReplicationProviderSettings); + + if (derived.VaultLocation != null) + { + replicationProviderSettingsValue["vaultLocation"] = derived.VaultLocation; + } + + if (derived.PrimaryKekCertificatePfx != null) + { + replicationProviderSettingsValue["primaryKekCertificatePfx"] = derived.PrimaryKekCertificatePfx; + } + + if (derived.SecondaryKekCertificatePfx != null) + { + replicationProviderSettingsValue["secondaryKekCertificatePfx"] = derived.SecondaryKekCertificatePfx; + } + } + if (parameters.ReplicationProviderSettings is AzureFailbackInput) + { + replicationProviderSettingsValue["__type"] = "AzureFailbackInput"; + AzureFailbackInput derived2 = ((AzureFailbackInput)parameters.ReplicationProviderSettings); + + replicationProviderSettingsValue["skipDataSync"] = derived2.SkipDataSync; + + replicationProviderSettingsValue["createRecoveryVmIfDoesntExist"] = derived2.CreateRecoveryVmIfDoesntExist; + } + if (parameters.ReplicationProviderSettings is AzureReprotectInput) + { + replicationProviderSettingsValue["__type"] = "AzureReprotectInput"; + AzureReprotectInput derived3 = ((AzureReprotectInput)parameters.ReplicationProviderSettings); + + if (derived3.HvHostVmId != null) + { + replicationProviderSettingsValue["hvHostVmId"] = derived3.HvHostVmId; + } + + if (derived3.VmName != null) + { + replicationProviderSettingsValue["vmName"] = derived3.VmName; + } + + if (derived3.OSType != null) + { + replicationProviderSettingsValue["oSType"] = derived3.OSType; + } + + if (derived3.VHDId != null) + { + replicationProviderSettingsValue["vHDId"] = derived3.VHDId; + } + + if (derived3.StorageAccountName != null) + { + replicationProviderSettingsValue["storageAccountName"] = derived3.StorageAccountName; + } + + if (derived3.StorageAccountSubscriptionId != null) + { + replicationProviderSettingsValue["storageAccountSubscriptionId"] = derived3.StorageAccountSubscriptionId; + } + } } if (parameters.FailoverDirection != null) @@ -749,7 +944,7 @@ public async Task BeginTestFailoverAsync(string pc url = url + "/resourceGroups/"; url = url + Uri.EscapeDataString(this.Client.ResourceGroupName); url = url + "/providers/"; - url = url + "Microsoft.SiteRecovery"; + url = url + Uri.EscapeDataString(this.Client.ResourceNamespace); url = url + "/"; url = url + "SiteRecoveryVault"; url = url + "/"; @@ -814,7 +1009,72 @@ public async Task BeginTestFailoverAsync(string pc if (parameters.ReplicationProviderSettings != null) { - testFailoverRequestValue["replicationProviderSettings"] = parameters.ReplicationProviderSettings; + JObject replicationProviderSettingsValue = new JObject(); + testFailoverRequestValue["replicationProviderSettings"] = replicationProviderSettingsValue; + if (parameters.ReplicationProviderSettings is AzureFailoverInput) + { + replicationProviderSettingsValue["__type"] = "AzureFailoverInput"; + AzureFailoverInput derived = ((AzureFailoverInput)parameters.ReplicationProviderSettings); + + if (derived.VaultLocation != null) + { + replicationProviderSettingsValue["vaultLocation"] = derived.VaultLocation; + } + + if (derived.PrimaryKekCertificatePfx != null) + { + replicationProviderSettingsValue["primaryKekCertificatePfx"] = derived.PrimaryKekCertificatePfx; + } + + if (derived.SecondaryKekCertificatePfx != null) + { + replicationProviderSettingsValue["secondaryKekCertificatePfx"] = derived.SecondaryKekCertificatePfx; + } + } + if (parameters.ReplicationProviderSettings is AzureFailbackInput) + { + replicationProviderSettingsValue["__type"] = "AzureFailbackInput"; + AzureFailbackInput derived2 = ((AzureFailbackInput)parameters.ReplicationProviderSettings); + + replicationProviderSettingsValue["skipDataSync"] = derived2.SkipDataSync; + + replicationProviderSettingsValue["createRecoveryVmIfDoesntExist"] = derived2.CreateRecoveryVmIfDoesntExist; + } + if (parameters.ReplicationProviderSettings is AzureReprotectInput) + { + replicationProviderSettingsValue["__type"] = "AzureReprotectInput"; + AzureReprotectInput derived3 = ((AzureReprotectInput)parameters.ReplicationProviderSettings); + + if (derived3.HvHostVmId != null) + { + replicationProviderSettingsValue["hvHostVmId"] = derived3.HvHostVmId; + } + + if (derived3.VmName != null) + { + replicationProviderSettingsValue["vmName"] = derived3.VmName; + } + + if (derived3.OSType != null) + { + replicationProviderSettingsValue["oSType"] = derived3.OSType; + } + + if (derived3.VHDId != null) + { + replicationProviderSettingsValue["vHDId"] = derived3.VHDId; + } + + if (derived3.StorageAccountName != null) + { + replicationProviderSettingsValue["storageAccountName"] = derived3.StorageAccountName; + } + + if (derived3.StorageAccountSubscriptionId != null) + { + replicationProviderSettingsValue["storageAccountSubscriptionId"] = derived3.StorageAccountSubscriptionId; + } + } } if (parameters.FailoverDirection != null) @@ -962,7 +1222,7 @@ public async Task BeginUnplannedFailoverAsync(stri url = url + "/resourceGroups/"; url = url + Uri.EscapeDataString(this.Client.ResourceGroupName); url = url + "/providers/"; - url = url + "Microsoft.SiteRecovery"; + url = url + Uri.EscapeDataString(this.Client.ResourceNamespace); url = url + "/"; url = url + "SiteRecoveryVault"; url = url + "/"; @@ -1025,7 +1285,72 @@ public async Task BeginUnplannedFailoverAsync(stri if (parameters.ReplicationProviderSettings != null) { - unplannedFailoverRequestValue["replicationProviderSettings"] = parameters.ReplicationProviderSettings; + JObject replicationProviderSettingsValue = new JObject(); + unplannedFailoverRequestValue["replicationProviderSettings"] = replicationProviderSettingsValue; + if (parameters.ReplicationProviderSettings is AzureFailoverInput) + { + replicationProviderSettingsValue["__type"] = "AzureFailoverInput"; + AzureFailoverInput derived = ((AzureFailoverInput)parameters.ReplicationProviderSettings); + + if (derived.VaultLocation != null) + { + replicationProviderSettingsValue["vaultLocation"] = derived.VaultLocation; + } + + if (derived.PrimaryKekCertificatePfx != null) + { + replicationProviderSettingsValue["primaryKekCertificatePfx"] = derived.PrimaryKekCertificatePfx; + } + + if (derived.SecondaryKekCertificatePfx != null) + { + replicationProviderSettingsValue["secondaryKekCertificatePfx"] = derived.SecondaryKekCertificatePfx; + } + } + if (parameters.ReplicationProviderSettings is AzureFailbackInput) + { + replicationProviderSettingsValue["__type"] = "AzureFailbackInput"; + AzureFailbackInput derived2 = ((AzureFailbackInput)parameters.ReplicationProviderSettings); + + replicationProviderSettingsValue["skipDataSync"] = derived2.SkipDataSync; + + replicationProviderSettingsValue["createRecoveryVmIfDoesntExist"] = derived2.CreateRecoveryVmIfDoesntExist; + } + if (parameters.ReplicationProviderSettings is AzureReprotectInput) + { + replicationProviderSettingsValue["__type"] = "AzureReprotectInput"; + AzureReprotectInput derived3 = ((AzureReprotectInput)parameters.ReplicationProviderSettings); + + if (derived3.HvHostVmId != null) + { + replicationProviderSettingsValue["hvHostVmId"] = derived3.HvHostVmId; + } + + if (derived3.VmName != null) + { + replicationProviderSettingsValue["vmName"] = derived3.VmName; + } + + if (derived3.OSType != null) + { + replicationProviderSettingsValue["oSType"] = derived3.OSType; + } + + if (derived3.VHDId != null) + { + replicationProviderSettingsValue["vHDId"] = derived3.VHDId; + } + + if (derived3.StorageAccountName != null) + { + replicationProviderSettingsValue["storageAccountName"] = derived3.StorageAccountName; + } + + if (derived3.StorageAccountSubscriptionId != null) + { + replicationProviderSettingsValue["storageAccountSubscriptionId"] = derived3.StorageAccountSubscriptionId; + } + } } if (parameters.FailoverDirection != null) @@ -1236,7 +1561,7 @@ public async Task DisableProtectionAsync(string pr url = url + "/resourceGroups/"; url = url + Uri.EscapeDataString(this.Client.ResourceGroupName); url = url + "/providers/"; - url = url + "Microsoft.SiteRecovery"; + url = url + Uri.EscapeDataString(this.Client.ResourceNamespace); url = url + "/"; url = url + "SiteRecoveryVault"; url = url + "/"; @@ -1447,7 +1772,7 @@ public async Task EnableProtectionAsync(string pro url = url + "/resourceGroups/"; url = url + Uri.EscapeDataString(this.Client.ResourceGroupName); url = url + "/providers/"; - url = url + "Microsoft.SiteRecovery"; + url = url + Uri.EscapeDataString(this.Client.ResourceNamespace); url = url + "/"; url = url + "SiteRecoveryVault"; url = url + "/"; @@ -1509,63 +1834,63 @@ public async Task EnableProtectionAsync(string pro if (input.ProviderSettings != null) { - JObject providerSettingsValue = new JObject(); - enableProtectionInputValue["ProviderSettings"] = providerSettingsValue; + JObject replicationProviderInputValue = new JObject(); + enableProtectionInputValue["replicationProviderInput"] = replicationProviderInputValue; if (input.ProviderSettings is AzureEnableProtectionInput) { - providerSettingsValue["__type"] = "AzureEnableProtectionInput"; + replicationProviderInputValue["__type"] = "AzureEnableProtectionInput"; AzureEnableProtectionInput derived = ((AzureEnableProtectionInput)input.ProviderSettings); if (derived.HvHostVmId != null) { - providerSettingsValue["HvHostVmId"] = derived.HvHostVmId; + replicationProviderInputValue["hvHostVmId"] = derived.HvHostVmId; } if (derived.VmName != null) { - providerSettingsValue["vmName"] = derived.VmName; + replicationProviderInputValue["vmName"] = derived.VmName; } if (derived.OSType != null) { - providerSettingsValue["osType"] = derived.OSType; + replicationProviderInputValue["osType"] = derived.OSType; } if (derived.VHDId != null) { - providerSettingsValue["vHDId"] = derived.VHDId; + replicationProviderInputValue["vHDId"] = derived.VHDId; } } if (input.ProviderSettings is SanEnableProtectionInput) { - providerSettingsValue["__type"] = "SanEnableProtectionInput"; + replicationProviderInputValue["__type"] = "SanEnableProtectionInput"; SanEnableProtectionInput derived2 = ((SanEnableProtectionInput)input.ProviderSettings); if (derived2.FabricId != null) { - providerSettingsValue["fabricId"] = derived2.FabricId; + replicationProviderInputValue["fabricId"] = derived2.FabricId; } if (derived2.CloudId != null) { - providerSettingsValue["cloudId"] = derived2.CloudId; + replicationProviderInputValue["cloudId"] = derived2.CloudId; } if (derived2.FabricReplicationGroupId != null) { - providerSettingsValue["fabricReplicationGroupId"] = derived2.FabricReplicationGroupId; + replicationProviderInputValue["fabricReplicationGroupId"] = derived2.FabricReplicationGroupId; } if (derived2.ReplicationType != null) { - providerSettingsValue["replicationType"] = derived2.ReplicationType; + replicationProviderInputValue["replicationType"] = derived2.ReplicationType; } - providerSettingsValue["recoveryPointObjective"] = derived2.RecoveryPointObjective; + replicationProviderInputValue["recoveryPointObjective"] = derived2.RecoveryPointObjective; if (derived2.RemoteArrayId != null) { - providerSettingsValue["remoteArrayId"] = derived2.RemoteArrayId; + replicationProviderInputValue["remoteArrayId"] = derived2.RemoteArrayId; } } } @@ -1699,7 +2024,7 @@ public async Task GetAsync(string protectionContainerI url = url + "/resourceGroups/"; url = url + Uri.EscapeDataString(this.Client.ResourceGroupName); url = url + "/providers/"; - url = url + "Microsoft.SiteRecovery"; + url = url + Uri.EscapeDataString(this.Client.ResourceNamespace); url = url + "/"; url = url + "SiteRecoveryVault"; url = url + "/"; @@ -6384,7 +6709,7 @@ public async Task ListAsync(string protectionConta url = url + "/resourceGroups/"; url = url + Uri.EscapeDataString(this.Client.ResourceGroupName); url = url + "/providers/"; - url = url + "Microsoft.SiteRecovery"; + url = url + Uri.EscapeDataString(this.Client.ResourceNamespace); url = url + "/"; url = url + "SiteRecoveryVault"; url = url + "/"; diff --git a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/ProtectionProfileOperations.cs b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/ProtectionProfileOperations.cs index 304614f6a427..67b9ea5a5acb 100644 --- a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/ProtectionProfileOperations.cs +++ b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/ProtectionProfileOperations.cs @@ -30,6 +30,7 @@ using System.Threading; using System.Threading.Tasks; using Hyak.Common; +using Hyak.Common.Internals; using Microsoft.Azure; using Microsoft.Azure.Management.SiteRecovery; using Microsoft.Azure.Management.SiteRecovery.Models; @@ -193,7 +194,7 @@ public async Task BeginAssociatingAsync(string nam url = url + "/resourceGroups/"; url = url + Uri.EscapeDataString(this.Client.ResourceGroupName); url = url + "/providers/"; - url = url + "Microsoft.SiteRecovery"; + url = url + Uri.EscapeDataString(this.Client.ResourceNamespace); url = url + "/"; url = url + "SiteRecoveryVault"; url = url + "/"; @@ -369,7 +370,7 @@ public async Task BeginCreatingAsync(CreateProtect url = url + "/resourceGroups/"; url = url + Uri.EscapeDataString(this.Client.ResourceGroupName); url = url + "/providers/"; - url = url + "Microsoft.SiteRecovery"; + url = url + Uri.EscapeDataString(this.Client.ResourceNamespace); url = url + "/"; url = url + "SiteRecoveryVault"; url = url + "/"; @@ -489,18 +490,37 @@ public async Task BeginCreatingAsync(CreateProtect replicationProviderSettingsValue["recoveryPointHistoryDuration"] = derived2.RecoveryPointHistoryDuration; - replicationProviderSettingsValue["appConsistencyFreq"] = derived2.AppConsistencyFreq; + replicationProviderSettingsValue["applicationConsistentSnapshotFrequencyInHours"] = derived2.ApplicationConsistentSnapshotFrequencyInHours; replicationProviderSettingsValue["replicationInterval"] = derived2.ReplicationInterval; - if (derived2.OnlineIrStartTime != null) + if (derived2.OnlineReplicationStartTime != null) { - replicationProviderSettingsValue["onlineIrStartTime"] = derived2.OnlineIrStartTime.Value.ToString(); + replicationProviderSettingsValue["onlineReplicationStartTime"] = derived2.OnlineReplicationStartTime.Value.ToString(); } if (derived2.StorageAccounts != null) { - replicationProviderSettingsValue["storageAccounts"] = derived2.StorageAccounts.ToString(); + if (derived2.StorageAccounts is ILazyCollection == false || ((ILazyCollection)derived2.StorageAccounts).IsInitialized) + { + JArray storageAccountsArray = new JArray(); + foreach (CustomerStorageAccount storageAccountsItem in derived2.StorageAccounts) + { + JObject customerStorageAccountValue = new JObject(); + storageAccountsArray.Add(customerStorageAccountValue); + + if (storageAccountsItem.StorageAccountName != null) + { + customerStorageAccountValue["storageAccountName"] = storageAccountsItem.StorageAccountName; + } + + if (storageAccountsItem.SubscriptionId != null) + { + customerStorageAccountValue["subscriptionId"] = storageAccountsItem.SubscriptionId; + } + } + replicationProviderSettingsValue["storageAccounts"] = storageAccountsArray; + } } if (derived2.Encryption != null) @@ -655,7 +675,7 @@ public async Task BeginDeletingAsync(string name, url = url + "/resourceGroups/"; url = url + Uri.EscapeDataString(this.Client.ResourceGroupName); url = url + "/providers/"; - url = url + "Microsoft.SiteRecovery"; + url = url + Uri.EscapeDataString(this.Client.ResourceNamespace); url = url + "/"; url = url + "SiteRecoveryVault"; url = url + "/"; @@ -831,7 +851,7 @@ public async Task BeginDissociatingAsync(string na url = url + "/resourceGroups/"; url = url + Uri.EscapeDataString(this.Client.ResourceGroupName); url = url + "/providers/"; - url = url + "Microsoft.SiteRecovery"; + url = url + Uri.EscapeDataString(this.Client.ResourceNamespace); url = url + "/"; url = url + "SiteRecoveryVault"; url = url + "/"; @@ -890,7 +910,123 @@ public async Task BeginDissociatingAsync(string na if (input.ReplicationProviderSettings != null) { - disassociateProtectionProfileInputValue["replicationProviderSettings"] = input.ReplicationProviderSettings; + JObject replicationProviderSettingsValue = new JObject(); + disassociateProtectionProfileInputValue["replicationProviderSettings"] = replicationProviderSettingsValue; + if (input.ReplicationProviderSettings is HyperVReplicaProtectionProfileInput) + { + replicationProviderSettingsValue["__type"] = "HyperVReplicaProtectionProfileInput"; + HyperVReplicaProtectionProfileInput derived = ((HyperVReplicaProtectionProfileInput)input.ReplicationProviderSettings); + + replicationProviderSettingsValue["replicationFrequencyInSeconds"] = derived.ReplicationFrequencyInSeconds; + + replicationProviderSettingsValue["recoveryPoints"] = derived.RecoveryPoints; + + replicationProviderSettingsValue["applicationConsistentSnapshotFrequencyInHours"] = derived.ApplicationConsistentSnapshotFrequencyInHours; + + if (derived.Compression != null) + { + replicationProviderSettingsValue["compression"] = derived.Compression; + } + + if (derived.InitialReplicationMethod != null) + { + replicationProviderSettingsValue["initialReplicationMethod"] = derived.InitialReplicationMethod; + } + + if (derived.OnlineReplicationStartTime != null) + { + replicationProviderSettingsValue["onlineReplicationStartTime"] = derived.OnlineReplicationStartTime.Value.ToString(); + } + + if (derived.OfflineReplicationImportPath != null) + { + replicationProviderSettingsValue["offlineReplicationImportPath"] = derived.OfflineReplicationImportPath; + } + + if (derived.OfflineReplicationExportPath != null) + { + replicationProviderSettingsValue["offlineReplicationExportPath"] = derived.OfflineReplicationExportPath; + } + + replicationProviderSettingsValue["replicationPort"] = derived.ReplicationPort; + + replicationProviderSettingsValue["allowedAuthenticationType"] = derived.AllowedAuthenticationType; + + if (derived.ReplicaDeletion != null) + { + replicationProviderSettingsValue["replicaDeletion"] = derived.ReplicaDeletion; + } + } + if (input.ReplicationProviderSettings is HyperVReplicaAzureProtectionProfileInput) + { + replicationProviderSettingsValue["__type"] = "HyperVReplicaAzureProtectionProfileInput"; + HyperVReplicaAzureProtectionProfileInput derived2 = ((HyperVReplicaAzureProtectionProfileInput)input.ReplicationProviderSettings); + + replicationProviderSettingsValue["recoveryPointHistoryDuration"] = derived2.RecoveryPointHistoryDuration; + + replicationProviderSettingsValue["applicationConsistentSnapshotFrequencyInHours"] = derived2.ApplicationConsistentSnapshotFrequencyInHours; + + replicationProviderSettingsValue["replicationInterval"] = derived2.ReplicationInterval; + + if (derived2.OnlineReplicationStartTime != null) + { + replicationProviderSettingsValue["onlineReplicationStartTime"] = derived2.OnlineReplicationStartTime.Value.ToString(); + } + + if (derived2.StorageAccounts != null) + { + if (derived2.StorageAccounts is ILazyCollection == false || ((ILazyCollection)derived2.StorageAccounts).IsInitialized) + { + JArray storageAccountsArray = new JArray(); + foreach (CustomerStorageAccount storageAccountsItem in derived2.StorageAccounts) + { + JObject customerStorageAccountValue = new JObject(); + storageAccountsArray.Add(customerStorageAccountValue); + + if (storageAccountsItem.StorageAccountName != null) + { + customerStorageAccountValue["storageAccountName"] = storageAccountsItem.StorageAccountName; + } + + if (storageAccountsItem.SubscriptionId != null) + { + customerStorageAccountValue["subscriptionId"] = storageAccountsItem.SubscriptionId; + } + } + replicationProviderSettingsValue["storageAccounts"] = storageAccountsArray; + } + } + + if (derived2.Encryption != null) + { + replicationProviderSettingsValue["encryption"] = derived2.Encryption; + } + } + if (input.ReplicationProviderSettings is SanProtectionProfileInput) + { + replicationProviderSettingsValue["__type"] = "SanProtectionProfileInput"; + SanProtectionProfileInput derived3 = ((SanProtectionProfileInput)input.ReplicationProviderSettings); + + if (derived3.CloudId != null) + { + replicationProviderSettingsValue["cloudId"] = derived3.CloudId; + } + + if (derived3.RemoteCloudId != null) + { + replicationProviderSettingsValue["remoteCloudId"] = derived3.RemoteCloudId; + } + + if (derived3.ArrayUniqueId != null) + { + replicationProviderSettingsValue["arrayUniqueId"] = derived3.ArrayUniqueId; + } + + if (derived3.RemoteArrayUniqueId != null) + { + replicationProviderSettingsValue["remoteArrayUniqueId"] = derived3.RemoteArrayUniqueId; + } + } } disassociateProtectionProfileInputValue["primaryProtectionContainerId"] = input.PrimaryProtectionContainerId; @@ -1029,7 +1165,7 @@ public async Task BeginUpdatingAsync(UpdateProtect url = url + "/resourceGroups/"; url = url + Uri.EscapeDataString(this.Client.ResourceGroupName); url = url + "/providers/"; - url = url + "Microsoft.SiteRecovery"; + url = url + Uri.EscapeDataString(this.Client.ResourceNamespace); url = url + "/"; url = url + "SiteRecoveryVault"; url = url + "/"; @@ -1134,18 +1270,37 @@ public async Task BeginUpdatingAsync(UpdateProtect replicationProviderSettingsValue["recoveryPointHistoryDuration"] = derived2.RecoveryPointHistoryDuration; - replicationProviderSettingsValue["appConsistencyFreq"] = derived2.AppConsistencyFreq; + replicationProviderSettingsValue["applicationConsistentSnapshotFrequencyInHours"] = derived2.ApplicationConsistentSnapshotFrequencyInHours; replicationProviderSettingsValue["replicationInterval"] = derived2.ReplicationInterval; - if (derived2.OnlineIrStartTime != null) + if (derived2.OnlineReplicationStartTime != null) { - replicationProviderSettingsValue["onlineIrStartTime"] = derived2.OnlineIrStartTime.Value.ToString(); + replicationProviderSettingsValue["onlineReplicationStartTime"] = derived2.OnlineReplicationStartTime.Value.ToString(); } if (derived2.StorageAccounts != null) { - replicationProviderSettingsValue["storageAccounts"] = derived2.StorageAccounts.ToString(); + if (derived2.StorageAccounts is ILazyCollection == false || ((ILazyCollection)derived2.StorageAccounts).IsInitialized) + { + JArray storageAccountsArray = new JArray(); + foreach (CustomerStorageAccount storageAccountsItem in derived2.StorageAccounts) + { + JObject customerStorageAccountValue = new JObject(); + storageAccountsArray.Add(customerStorageAccountValue); + + if (storageAccountsItem.StorageAccountName != null) + { + customerStorageAccountValue["storageAccountName"] = storageAccountsItem.StorageAccountName; + } + + if (storageAccountsItem.SubscriptionId != null) + { + customerStorageAccountValue["subscriptionId"] = storageAccountsItem.SubscriptionId; + } + } + replicationProviderSettingsValue["storageAccounts"] = storageAccountsArray; + } } if (derived2.Encryption != null) @@ -1492,7 +1647,7 @@ public async Task GetAsync(string protectionProfileId url = url + "/resourceGroups/"; url = url + Uri.EscapeDataString(this.Client.ResourceGroupName); url = url + "/providers/"; - url = url + "Microsoft.SiteRecovery"; + url = url + Uri.EscapeDataString(this.Client.ResourceNamespace); url = url + "/"; url = url + "SiteRecoveryVault"; url = url + "/"; @@ -4091,7 +4246,7 @@ public async Task ListAsync(CustomRequestHeaders url = url + "/resourceGroups/"; url = url + Uri.EscapeDataString(this.Client.ResourceGroupName); url = url + "/providers/"; - url = url + "Microsoft.SiteRecovery"; + url = url + Uri.EscapeDataString(this.Client.ResourceNamespace); url = url + "/"; url = url + "SiteRecoveryVault"; url = url + "/"; diff --git a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/RecoveryPlanOperations.cs b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/RecoveryPlanOperations.cs index e145a3a2406b..ffc5cd3fe828 100644 --- a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/RecoveryPlanOperations.cs +++ b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/RecoveryPlanOperations.cs @@ -110,7 +110,7 @@ public async Task BeginCommitAsync(string name, Cu url = url + "/resourceGroups/"; url = url + Uri.EscapeDataString(this.Client.ResourceGroupName); url = url + "/providers/"; - url = url + "Microsoft.SiteRecovery"; + url = url + Uri.EscapeDataString(this.Client.ResourceNamespace); url = url + "/"; url = url + "SiteRecoveryVault"; url = url + "/"; @@ -275,7 +275,7 @@ public async Task BeginCreateRecoveryPlanAsync(Rec url = url + "/resourceGroups/"; url = url + Uri.EscapeDataString(this.Client.ResourceGroupName); url = url + "/providers/"; - url = url + "Microsoft.SiteRecovery"; + url = url + Uri.EscapeDataString(this.Client.ResourceNamespace); url = url + "/"; url = url + "SiteRecoveryVault"; url = url + "/"; @@ -447,7 +447,7 @@ public async Task BeginDeleteAsync(string name, Cu url = url + "/resourceGroups/"; url = url + Uri.EscapeDataString(this.Client.ResourceGroupName); url = url + "/providers/"; - url = url + "Microsoft.SiteRecovery"; + url = url + Uri.EscapeDataString(this.Client.ResourceNamespace); url = url + "/"; url = url + "SiteRecoveryVault"; url = url + "/"; @@ -615,7 +615,7 @@ public async Task BeginRecoveryPlanPlannedFailover url = url + "/resourceGroups/"; url = url + Uri.EscapeDataString(this.Client.ResourceGroupName); url = url + "/providers/"; - url = url + "Microsoft.SiteRecovery"; + url = url + Uri.EscapeDataString(this.Client.ResourceNamespace); url = url + "/"; url = url + "SiteRecoveryVault"; url = url + "/"; @@ -679,7 +679,7 @@ public async Task BeginRecoveryPlanPlannedFailover if (input.ReplicationProviderSettings != null) { - rpPlannedFailoverRequestValue["replicationProviderSettings"] = input.ReplicationProviderSettings; + rpPlannedFailoverRequestValue["replicationProviderSettings"] = input.ReplicationProviderSettings.ToString(); } requestContent = requestDoc.ToString(Newtonsoft.Json.Formatting.Indented); @@ -818,7 +818,7 @@ public async Task BeginRecoveryPlanTestFailoverAsy url = url + "/resourceGroups/"; url = url + Uri.EscapeDataString(this.Client.ResourceGroupName); url = url + "/providers/"; - url = url + "Microsoft.SiteRecovery"; + url = url + Uri.EscapeDataString(this.Client.ResourceNamespace); url = url + "/"; url = url + "SiteRecoveryVault"; url = url + "/"; @@ -882,7 +882,7 @@ public async Task BeginRecoveryPlanTestFailoverAsy if (input.ReplicationProviderSettings != null) { - rpTestFailoverRequestValue["replicationProviderSettings"] = input.ReplicationProviderSettings; + rpTestFailoverRequestValue["replicationProviderSettings"] = input.ReplicationProviderSettings.ToString(); } rpTestFailoverRequestValue["networkType"] = input.NetworkType; @@ -1021,7 +1021,7 @@ public async Task BeginRecoveryPlanUnplannedFailov url = url + "/resourceGroups/"; url = url + Uri.EscapeDataString(this.Client.ResourceGroupName); url = url + "/providers/"; - url = url + "Microsoft.SiteRecovery"; + url = url + Uri.EscapeDataString(this.Client.ResourceNamespace); url = url + "/"; url = url + "SiteRecoveryVault"; url = url + "/"; @@ -1085,7 +1085,7 @@ public async Task BeginRecoveryPlanUnplannedFailov if (input.ReplicationProviderSettings != null) { - rpUnplannedFailoverRequestValue["replicationProviderSettings"] = input.ReplicationProviderSettings; + rpUnplannedFailoverRequestValue["replicationProviderSettings"] = input.ReplicationProviderSettings.ToString(); } rpUnplannedFailoverRequestValue["sourceSiteOperations"] = input.SourceSiteOperations; @@ -1210,7 +1210,7 @@ public async Task BeginReprotectAsync(string name, url = url + "/resourceGroups/"; url = url + Uri.EscapeDataString(this.Client.ResourceGroupName); url = url + "/providers/"; - url = url + "Microsoft.SiteRecovery"; + url = url + Uri.EscapeDataString(this.Client.ResourceNamespace); url = url + "/"; url = url + "SiteRecoveryVault"; url = url + "/"; @@ -1375,7 +1375,7 @@ public async Task BeginUpdateRecoveryPlanAsync(Rec url = url + "/resourceGroups/"; url = url + Uri.EscapeDataString(this.Client.ResourceGroupName); url = url + "/providers/"; - url = url + "Microsoft.SiteRecovery"; + url = url + Uri.EscapeDataString(this.Client.ResourceNamespace); url = url + "/"; url = url + "SiteRecoveryVault"; url = url + "/"; @@ -1736,7 +1736,7 @@ public async Task GetAsync(string name, CustomRequestHeade url = url + "/resourceGroups/"; url = url + Uri.EscapeDataString(this.Client.ResourceGroupName); url = url + "/providers/"; - url = url + "Microsoft.SiteRecovery"; + url = url + Uri.EscapeDataString(this.Client.ResourceNamespace); url = url + "/"; url = url + "SiteRecoveryVault"; url = url + "/"; @@ -3724,7 +3724,7 @@ public async Task GetRecoveryPlanXmlAsync(string name, Cus url = url + "/resourceGroups/"; url = url + Uri.EscapeDataString(this.Client.ResourceGroupName); url = url + "/providers/"; - url = url + "Microsoft.SiteRecovery"; + url = url + Uri.EscapeDataString(this.Client.ResourceNamespace); url = url + "/"; url = url + "SiteRecoveryVault"; url = url + "/"; @@ -4133,7 +4133,7 @@ public async Task ListAsync(CustomRequestHeaders custo url = url + "/resourceGroups/"; url = url + Uri.EscapeDataString(this.Client.ResourceGroupName); url = url + "/providers/"; - url = url + "Microsoft.SiteRecovery"; + url = url + Uri.EscapeDataString(this.Client.ResourceNamespace); url = url + "/"; url = url + "SiteRecoveryVault"; url = url + "/"; diff --git a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/RecoveryServicesManagementClient.cs b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/RecoveryServicesManagementClient.cs index 06a5c505543f..55c79631f6a9 100644 --- a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/RecoveryServicesManagementClient.cs +++ b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/RecoveryServicesManagementClient.cs @@ -90,6 +90,14 @@ public int LongRunningOperationRetryTimeout set { this._longRunningOperationRetryTimeout = value; } } + private string _resourceNamespace; + + public string ResourceNamespace + { + get { return this._resourceNamespace; } + set { this._resourceNamespace = value; } + } + private IResourceGroupsOperations _resourceGroup; /// @@ -142,6 +150,9 @@ public RecoveryServicesManagementClient() /// Initializes a new instance of the RecoveryServicesManagementClient /// class. /// + /// + /// Required. + /// /// /// Required. Gets subscription credentials which uniquely identify /// Microsoft Azure subscription. The subscription ID forms part of @@ -151,9 +162,13 @@ public RecoveryServicesManagementClient() /// Optional. Gets the URI used as the base for all cloud service /// requests. /// - public RecoveryServicesManagementClient(SubscriptionCloudCredentials credentials, Uri baseUri) + public RecoveryServicesManagementClient(string resourceNamespace, SubscriptionCloudCredentials credentials, Uri baseUri) : this() { + if (resourceNamespace == null) + { + throw new ArgumentNullException("resourceNamespace"); + } if (credentials == null) { throw new ArgumentNullException("credentials"); @@ -162,6 +177,7 @@ public RecoveryServicesManagementClient(SubscriptionCloudCredentials credentials { throw new ArgumentNullException("baseUri"); } + this._resourceNamespace = resourceNamespace; this._credentials = credentials; this._baseUri = baseUri; @@ -172,18 +188,26 @@ public RecoveryServicesManagementClient(SubscriptionCloudCredentials credentials /// Initializes a new instance of the RecoveryServicesManagementClient /// class. /// + /// + /// Required. + /// /// /// Required. Gets subscription credentials which uniquely identify /// Microsoft Azure subscription. The subscription ID forms part of /// the URI for every service call. /// - public RecoveryServicesManagementClient(SubscriptionCloudCredentials credentials) + public RecoveryServicesManagementClient(string resourceNamespace, SubscriptionCloudCredentials credentials) : this() { + if (resourceNamespace == null) + { + throw new ArgumentNullException("resourceNamespace"); + } if (credentials == null) { throw new ArgumentNullException("credentials"); } + this._resourceNamespace = resourceNamespace; this._credentials = credentials; this._baseUri = new Uri("https://management.core.windows.net"); @@ -213,6 +237,9 @@ public RecoveryServicesManagementClient(HttpClient httpClient) /// Initializes a new instance of the RecoveryServicesManagementClient /// class. /// + /// + /// Required. + /// /// /// Required. Gets subscription credentials which uniquely identify /// Microsoft Azure subscription. The subscription ID forms part of @@ -225,9 +252,13 @@ public RecoveryServicesManagementClient(HttpClient httpClient) /// /// The Http client /// - public RecoveryServicesManagementClient(SubscriptionCloudCredentials credentials, Uri baseUri, HttpClient httpClient) + public RecoveryServicesManagementClient(string resourceNamespace, SubscriptionCloudCredentials credentials, Uri baseUri, HttpClient httpClient) : this(httpClient) { + if (resourceNamespace == null) + { + throw new ArgumentNullException("resourceNamespace"); + } if (credentials == null) { throw new ArgumentNullException("credentials"); @@ -236,6 +267,7 @@ public RecoveryServicesManagementClient(SubscriptionCloudCredentials credentials { throw new ArgumentNullException("baseUri"); } + this._resourceNamespace = resourceNamespace; this._credentials = credentials; this._baseUri = baseUri; @@ -246,6 +278,9 @@ public RecoveryServicesManagementClient(SubscriptionCloudCredentials credentials /// Initializes a new instance of the RecoveryServicesManagementClient /// class. /// + /// + /// Required. + /// /// /// Required. Gets subscription credentials which uniquely identify /// Microsoft Azure subscription. The subscription ID forms part of @@ -254,13 +289,18 @@ public RecoveryServicesManagementClient(SubscriptionCloudCredentials credentials /// /// The Http client /// - public RecoveryServicesManagementClient(SubscriptionCloudCredentials credentials, HttpClient httpClient) + public RecoveryServicesManagementClient(string resourceNamespace, SubscriptionCloudCredentials credentials, HttpClient httpClient) : this(httpClient) { + if (resourceNamespace == null) + { + throw new ArgumentNullException("resourceNamespace"); + } if (credentials == null) { throw new ArgumentNullException("credentials"); } + this._resourceNamespace = resourceNamespace; this._credentials = credentials; this._baseUri = new Uri("https://management.core.windows.net"); @@ -282,6 +322,7 @@ protected override void Clone(ServiceClient cl { RecoveryServicesManagementClient clonedClient = ((RecoveryServicesManagementClient)client); + clonedClient._resourceNamespace = this._resourceNamespace; clonedClient._credentials = this._credentials; clonedClient._baseUri = this._baseUri; clonedClient._apiVersion = this._apiVersion; diff --git a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/ServerOperations.cs b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/ServerOperations.cs index 4dfb57affaf7..59f04083997e 100644 --- a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/ServerOperations.cs +++ b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/ServerOperations.cs @@ -105,7 +105,7 @@ public async Task GetAsync(string serverId, CustomRequestHeaders url = url + "/resourceGroups/"; url = url + Uri.EscapeDataString(this.Client.ResourceGroupName); url = url + "/providers/"; - url = url + "Microsoft.SiteRecovery"; + url = url + Uri.EscapeDataString(this.Client.ResourceNamespace); url = url + "/"; url = url + "SiteRecoveryVault"; url = url + "/"; @@ -355,7 +355,7 @@ public async Task ListAsync(CustomRequestHeaders customReque url = url + "/resourceGroups/"; url = url + Uri.EscapeDataString(this.Client.ResourceGroupName); url = url + "/providers/"; - url = url + "Microsoft.SiteRecovery"; + url = url + Uri.EscapeDataString(this.Client.ResourceNamespace); url = url + "/"; url = url + "SiteRecoveryVault"; url = url + "/"; diff --git a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/SiteRecoveryManagementClient.cs b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/SiteRecoveryManagementClient.cs index 948b21678947..9c135dba6ad3 100644 --- a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/SiteRecoveryManagementClient.cs +++ b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/SiteRecoveryManagementClient.cs @@ -50,14 +50,6 @@ public Uri BaseUri get { return this._baseUri; } } - private string _cloudServiceName; - - public string CloudServiceName - { - get { return this._cloudServiceName; } - set { this._cloudServiceName = value; } - } - private SubscriptionCloudCredentials _credentials; /// @@ -108,6 +100,14 @@ public string ResourceName set { this._resourceName = value; } } + private string _resourceNamespace; + + public string ResourceNamespace + { + get { return this._resourceNamespace; } + set { this._resourceNamespace = value; } + } + private IJobOperations _jobs; /// @@ -195,15 +195,15 @@ public SiteRecoveryManagementClient() /// Initializes a new instance of the SiteRecoveryManagementClient /// class. /// - /// - /// Required. - /// /// /// Required. /// /// /// Required. /// + /// + /// Required. + /// /// /// Required. Gets subscription credentials which uniquely identify /// Microsoft Azure subscription. The subscription ID forms part of @@ -213,13 +213,9 @@ public SiteRecoveryManagementClient() /// Optional. Gets the URI used as the base for all cloud service /// requests. /// - public SiteRecoveryManagementClient(string cloudServiceName, string resourceName, string resourceGroupName, SubscriptionCloudCredentials credentials, Uri baseUri) + public SiteRecoveryManagementClient(string resourceName, string resourceGroupName, string resourceNamespace, SubscriptionCloudCredentials credentials, Uri baseUri) : this() { - if (cloudServiceName == null) - { - throw new ArgumentNullException("cloudServiceName"); - } if (resourceName == null) { throw new ArgumentNullException("resourceName"); @@ -228,6 +224,10 @@ public SiteRecoveryManagementClient(string cloudServiceName, string resourceName { throw new ArgumentNullException("resourceGroupName"); } + if (resourceNamespace == null) + { + throw new ArgumentNullException("resourceNamespace"); + } if (credentials == null) { throw new ArgumentNullException("credentials"); @@ -236,9 +236,9 @@ public SiteRecoveryManagementClient(string cloudServiceName, string resourceName { throw new ArgumentNullException("baseUri"); } - this._cloudServiceName = cloudServiceName; this._resourceName = resourceName; this._resourceGroupName = resourceGroupName; + this._resourceNamespace = resourceNamespace; this._credentials = credentials; this._baseUri = baseUri; @@ -249,27 +249,23 @@ public SiteRecoveryManagementClient(string cloudServiceName, string resourceName /// Initializes a new instance of the SiteRecoveryManagementClient /// class. /// - /// - /// Required. - /// /// /// Required. /// /// /// Required. /// + /// + /// Required. + /// /// /// Required. Gets subscription credentials which uniquely identify /// Microsoft Azure subscription. The subscription ID forms part of /// the URI for every service call. /// - public SiteRecoveryManagementClient(string cloudServiceName, string resourceName, string resourceGroupName, SubscriptionCloudCredentials credentials) + public SiteRecoveryManagementClient(string resourceName, string resourceGroupName, string resourceNamespace, SubscriptionCloudCredentials credentials) : this() { - if (cloudServiceName == null) - { - throw new ArgumentNullException("cloudServiceName"); - } if (resourceName == null) { throw new ArgumentNullException("resourceName"); @@ -278,13 +274,17 @@ public SiteRecoveryManagementClient(string cloudServiceName, string resourceName { throw new ArgumentNullException("resourceGroupName"); } + if (resourceNamespace == null) + { + throw new ArgumentNullException("resourceNamespace"); + } if (credentials == null) { throw new ArgumentNullException("credentials"); } - this._cloudServiceName = cloudServiceName; this._resourceName = resourceName; this._resourceGroupName = resourceGroupName; + this._resourceNamespace = resourceNamespace; this._credentials = credentials; this._baseUri = new Uri("https://management.core.windows.net"); @@ -317,15 +317,15 @@ public SiteRecoveryManagementClient(HttpClient httpClient) /// Initializes a new instance of the SiteRecoveryManagementClient /// class. /// - /// - /// Required. - /// /// /// Required. /// /// /// Required. /// + /// + /// Required. + /// /// /// Required. Gets subscription credentials which uniquely identify /// Microsoft Azure subscription. The subscription ID forms part of @@ -338,13 +338,9 @@ public SiteRecoveryManagementClient(HttpClient httpClient) /// /// The Http client /// - public SiteRecoveryManagementClient(string cloudServiceName, string resourceName, string resourceGroupName, SubscriptionCloudCredentials credentials, Uri baseUri, HttpClient httpClient) + public SiteRecoveryManagementClient(string resourceName, string resourceGroupName, string resourceNamespace, SubscriptionCloudCredentials credentials, Uri baseUri, HttpClient httpClient) : this(httpClient) { - if (cloudServiceName == null) - { - throw new ArgumentNullException("cloudServiceName"); - } if (resourceName == null) { throw new ArgumentNullException("resourceName"); @@ -353,6 +349,10 @@ public SiteRecoveryManagementClient(string cloudServiceName, string resourceName { throw new ArgumentNullException("resourceGroupName"); } + if (resourceNamespace == null) + { + throw new ArgumentNullException("resourceNamespace"); + } if (credentials == null) { throw new ArgumentNullException("credentials"); @@ -361,9 +361,9 @@ public SiteRecoveryManagementClient(string cloudServiceName, string resourceName { throw new ArgumentNullException("baseUri"); } - this._cloudServiceName = cloudServiceName; this._resourceName = resourceName; this._resourceGroupName = resourceGroupName; + this._resourceNamespace = resourceNamespace; this._credentials = credentials; this._baseUri = baseUri; @@ -374,15 +374,15 @@ public SiteRecoveryManagementClient(string cloudServiceName, string resourceName /// Initializes a new instance of the SiteRecoveryManagementClient /// class. /// - /// - /// Required. - /// /// /// Required. /// /// /// Required. /// + /// + /// Required. + /// /// /// Required. Gets subscription credentials which uniquely identify /// Microsoft Azure subscription. The subscription ID forms part of @@ -391,13 +391,9 @@ public SiteRecoveryManagementClient(string cloudServiceName, string resourceName /// /// The Http client /// - public SiteRecoveryManagementClient(string cloudServiceName, string resourceName, string resourceGroupName, SubscriptionCloudCredentials credentials, HttpClient httpClient) + public SiteRecoveryManagementClient(string resourceName, string resourceGroupName, string resourceNamespace, SubscriptionCloudCredentials credentials, HttpClient httpClient) : this(httpClient) { - if (cloudServiceName == null) - { - throw new ArgumentNullException("cloudServiceName"); - } if (resourceName == null) { throw new ArgumentNullException("resourceName"); @@ -406,13 +402,17 @@ public SiteRecoveryManagementClient(string cloudServiceName, string resourceName { throw new ArgumentNullException("resourceGroupName"); } + if (resourceNamespace == null) + { + throw new ArgumentNullException("resourceNamespace"); + } if (credentials == null) { throw new ArgumentNullException("credentials"); } - this._cloudServiceName = cloudServiceName; this._resourceName = resourceName; this._resourceGroupName = resourceGroupName; + this._resourceNamespace = resourceNamespace; this._credentials = credentials; this._baseUri = new Uri("https://management.core.windows.net"); @@ -434,9 +434,9 @@ protected override void Clone(ServiceClient client { SiteRecoveryManagementClient clonedClient = ((SiteRecoveryManagementClient)client); - clonedClient._cloudServiceName = this._cloudServiceName; clonedClient._resourceName = this._resourceName; clonedClient._resourceGroupName = this._resourceGroupName; + clonedClient._resourceNamespace = this._resourceNamespace; clonedClient._credentials = this._credentials; clonedClient._baseUri = this._baseUri; clonedClient._apiVersion = this._apiVersion; diff --git a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/VaultExtendedInfoOperations.cs b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/VaultExtendedInfoOperations.cs index 18d13f859040..d2bf942cd0d6 100644 --- a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/VaultExtendedInfoOperations.cs +++ b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/VaultExtendedInfoOperations.cs @@ -140,7 +140,7 @@ public async Task CreateExtendedInfoAsync(string resourc url = url + "/resourceGroups/"; url = url + Uri.EscapeDataString(resourceGroupName); url = url + "/providers/"; - url = url + "Microsoft.SiteRecovery"; + url = url + Uri.EscapeDataString(this.Client.ResourceNamespace); url = url + "/"; url = url + "SiteRecoveryVault"; url = url + "/"; @@ -311,7 +311,7 @@ public async Task GetExtendedInfoAsync(stri url = url + "/resourceGroups/"; url = url + Uri.EscapeDataString(resourceGroupName); url = url + "/providers/"; - url = url + "Microsoft.SiteRecovery"; + url = url + Uri.EscapeDataString(this.Client.ResourceNamespace); url = url + "/"; url = url + "SiteRecoveryVault"; url = url + "/"; @@ -550,7 +550,7 @@ public async Task UpdateExtendedInfoAsync(s url = url + "/resourceGroups/"; url = url + Uri.EscapeDataString(resourceGroupName); url = url + "/providers/"; - url = url + "Microsoft.SiteRecovery"; + url = url + Uri.EscapeDataString(this.Client.ResourceNamespace); url = url + "/"; url = url + "SiteRecoveryVault"; url = url + "/"; @@ -790,7 +790,7 @@ public async Task UploadCertificateAsync(string resou url = url + "/resourceGroups/"; url = url + Uri.EscapeDataString(resourceGroupName); url = url + "/providers/"; - url = url + "Microsoft.SiteRecovery"; + url = url + Uri.EscapeDataString(this.Client.ResourceNamespace); url = url + "/"; url = url + "SiteRecoveryVault"; url = url + "/"; diff --git a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/VaultOperations.cs b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/VaultOperations.cs index db48c8a50278..e73e229c1d03 100644 --- a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/VaultOperations.cs +++ b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Generated/VaultOperations.cs @@ -121,7 +121,7 @@ public async Task BeginCreatingAsync(string resourceGroupNa url = url + "/resourceGroups/"; url = url + Uri.EscapeDataString(resourceGroupName); url = url + "/providers/"; - url = url + "Microsoft.SiteRecovery"; + url = url + Uri.EscapeDataString(this.Client.ResourceNamespace); url = url + "/"; url = url + "SiteRecoveryVault"; url = url + "/"; @@ -408,7 +408,7 @@ public async Task BeginDeletingAsync(st url = url + "/resourceGroups/"; url = url + Uri.EscapeDataString(resourceGroupName); url = url + "/providers/"; - url = url + "Microsoft.SiteRecovery"; + url = url + Uri.EscapeDataString(this.Client.ResourceNamespace); url = url + "/"; url = url + "SiteRecoveryVault"; url = url + "/"; @@ -742,7 +742,7 @@ public async Task GetAsync(string resourceGroupName, CustomRe url = url + "/resourceGroups/"; url = url + Uri.EscapeDataString(resourceGroupName); url = url + "/providers/"; - url = url + "Microsoft.SiteRecovery"; + url = url + Uri.EscapeDataString(this.Client.ResourceNamespace); url = url + "/SiteRecoveryVault"; List queryParameters = new List(); queryParameters.Add("api-version=2015-03-15"); diff --git a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Microsoft.Azure.Management.SiteRecovery.nuget.proj b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Microsoft.Azure.Management.SiteRecovery.nuget.proj index 0e927586b52b..57879af63d8c 100644 --- a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Microsoft.Azure.Management.SiteRecovery.nuget.proj +++ b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Microsoft.Azure.Management.SiteRecovery.nuget.proj @@ -5,7 +5,7 @@ Microsoft.Azure.Management.SiteRecovery --> - 0.1.0-preview + 0.1.1-preview $(MSBuildThisFileDirectory) diff --git a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Properties/AssemblyInfo.cs b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Properties/AssemblyInfo.cs index 686c6c24f466..103cbbcbc1c9 100644 --- a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Properties/AssemblyInfo.cs +++ b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/Properties/AssemblyInfo.cs @@ -19,7 +19,7 @@ [assembly: AssemblyDescription("Hydra specification for Recovery services Management")] [assembly: AssemblyVersion("0.9.0.0")] -[assembly: AssemblyFileVersion("0.1.0.0")] +[assembly: AssemblyFileVersion("0.1.1.0")] [assembly: AssemblyCompany("Microsoft Corporation")] [assembly: AssemblyProduct("Windows Azure")] diff --git a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/SiteRecoveryManagement.csproj b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/SiteRecoveryManagement.csproj index f970f2d0423b..f4edb2ce3bd8 100644 --- a/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/SiteRecoveryManagement.csproj +++ b/src/ResourceManagement/SiteRecovery/SiteRecoveryManagement/SiteRecoveryManagement.csproj @@ -31,7 +31,10 @@ + + + @@ -40,6 +43,9 @@ + + Code + @@ -163,7 +169,9 @@ Designer - + + Designer +