Skip to content

Commit 4f3d08a

Browse files
author
Samuel Anudeep
committed
Merge pull request #254 from MabOneSdk/anudeeb-dev1
Fixed bug: Having repeated same keyword in HydraAdapter.HydraAdapter
2 parents 940c945 + 2479325 commit 4f3d08a

File tree

21 files changed

+35
-29
lines changed

21 files changed

+35
-29
lines changed

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/ContainerAPIs.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
using System.Text;
2020
using System.Threading.Tasks;
2121

22-
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapter
22+
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapterNS
2323
{
2424
public partial class HydraAdapter
2525
{

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/ItemAPIs.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
using System.Threading.Tasks;
2020
using Microsoft.Azure.Management.RecoveryServices.Backup.Models;
2121

22-
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapter
22+
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapterNS
2323
{
2424
public partial class HydraAdapter
2525
{

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/JobAPIs.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
using System;
1616
using Microsoft.Azure.Management.RecoveryServices.Backup.Models;
1717

18-
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapter
18+
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapterNS
1919
{
2020
public partial class HydraAdapter
2121
{

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/OperationStatusAPIs.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
using System.Threading.Tasks;
2020
using Microsoft.Azure.Management.RecoveryServices.Backup.Models;
2121

22-
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapter
22+
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapterNS
2323
{
2424
public partial class HydraAdapter
2525
{

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/PolicyAPIs.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
using System.Collections.Generic;
2020
using Microsoft.Azure.Management.RecoveryServices.Backup.Models;
2121

22-
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapter
22+
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapterNS
2323
{
2424
public partial class HydraAdapter
2525
{

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/ProtectableItemAPI.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
using System.Threading.Tasks;
2020
using Microsoft.Azure.Management.RecoveryServices.Backup.Models;
2121

22-
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapter
22+
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapterNS
2323
{
2424
public partial class HydraAdapter
2525
{

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/RecoveryPointsAPIs.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
using System.Text;
2020
using System.Threading.Tasks;
2121

22-
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapter
22+
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapterNS
2323
{
2424
public partial class HydraAdapter
2525
{

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/BMSAPIs/RestoreDiskAPIs.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
using System.Threading.Tasks;
88
using Microsoft.Azure.Commands.RecoveryServices.Backup.Properties;
99

10-
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapter
10+
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapterNS
1111
{
1212
public partial class HydraAdapter
1313
{

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/ClientProxy.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
using System.Text;
2121
using System.Threading.Tasks;
2222

23-
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapter
23+
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapterNS
2424
{
2525
public partial class ClientProxy<TClient, THeader> : ClientProxyBase
2626
where TClient : ServiceClient<TClient>

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/ClientProxyBase.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
2323
using Microsoft.Azure.Commands.RecoveryServices.Backup.Properties;
2424

25-
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapter
25+
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapterNS
2626
{
2727
public class ClientProxyBase
2828
{

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/CommonHelpers.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
using System;
1616
using System.Globalization;
1717

18-
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapter
18+
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapterNS
1919
{
2020
public class CommonHelpers
2121
{

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.HydraAdapter/HydraAdapter.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
using RecoveryServicesModelsNS = Microsoft.Azure.Management.RecoveryServices.Backup.Models;
2121
using RecoveryServicesNS = Microsoft.Azure.Management.RecoveryServices.Backup;
2222

23-
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapter
23+
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapterNS
2424
{
2525
public partial class HydraAdapter
2626
{

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/IPsBackupProvider.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15+
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapterNS;
1516
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
1617
using Microsoft.Azure.Management.RecoveryServices.Backup.Models;
1718
using System;
@@ -24,7 +25,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ProviderModel
2425
{
2526
public interface IPsBackupProvider
2627
{
27-
void Initialize(ProviderData providerData, HydraAdapter.HydraAdapter hydraAdapter);
28+
void Initialize(ProviderData providerData, HydraAdapter hydraAdapter);
2829

2930
BaseRecoveryServicesJobResponse EnableProtection();
3031

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/AzureSqlPsBackupProvider.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,13 @@
1818
using System.Text;
1919
using System.Threading.Tasks;
2020
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
21+
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapterNS;
2122

2223
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ProviderModel
2324
{
2425
public class AzureSqlPsBackupProvider : IPsBackupProvider
2526
{
26-
public void Initialize(ProviderData providerData, HydraAdapter.HydraAdapter hydraAdapter)
27+
public void Initialize(ProviderData providerData, HydraAdapter hydraAdapter)
2728
{
2829
throw new NotImplementedException();
2930
}

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/DpmPsBackupProvider.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,16 @@
2020
using System.Threading.Tasks;
2121
using Microsoft.Azure.Management.RecoveryServices.Backup.Models;
2222
using Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers;
23+
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapterNS;
2324

2425
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ProviderModel
2526
{
2627
public class DpmPsBackupProvider : IPsBackupProvider
2728
{
2829
ProviderData ProviderData { get; set; }
29-
HydraAdapter.HydraAdapter HydraAdapter { get; set; }
30+
HydraAdapter HydraAdapter { get; set; }
3031

31-
public void Initialize(ProviderData providerData, HydraAdapter.HydraAdapter hydraAdapter)
32+
public void Initialize(ProviderData providerData, HydraAdapter hydraAdapter)
3233
{
3334
this.ProviderData = providerData;
3435
this.HydraAdapter = hydraAdapter;

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/IaasVmPsBackupProvider.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
using Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers;
2525
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
2626
using Microsoft.Azure.Commands.RecoveryServices.Backup.Properties;
27-
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapter;
27+
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapterNS;
2828
using Microsoft.WindowsAzure.Commands.Utilities.Common;
2929

3030
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ProviderModel
@@ -37,9 +37,9 @@ public class IaasVmPsBackupProvider : IPsBackupProvider
3737
private const string classicComputeAzureVMVersion = "Microsoft.ClassicCompute";
3838

3939
ProviderData ProviderData { get; set; }
40-
HydraAdapter.HydraAdapter HydraAdapter { get; set; }
40+
HydraAdapter HydraAdapter { get; set; }
4141

42-
public void Initialize(ProviderData providerData, HydraAdapter.HydraAdapter hydraAdapter)
42+
public void Initialize(ProviderData providerData, HydraAdapter hydraAdapter)
4343
{
4444
this.ProviderData = providerData;
4545
this.HydraAdapter = hydraAdapter;

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/MabPsBackupProvider.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,15 +20,16 @@
2020
using Microsoft.Azure.Management.RecoveryServices.Backup.Models;
2121
using Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers;
2222
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
23+
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapterNS;
2324

2425
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ProviderModel
2526
{
2627
public class MabPsBackupProvider : IPsBackupProvider
2728
{
2829
ProviderData ProviderData { get; set; }
29-
HydraAdapter.HydraAdapter HydraAdapter { get; set; }
30+
HydraAdapter HydraAdapter { get; set; }
3031

31-
public void Initialize(ProviderData providerData, HydraAdapter.HydraAdapter hydraAdapter)
32+
public void Initialize(ProviderData providerData, HydraAdapter hydraAdapter)
3233
{
3334
this.ProviderData = providerData;
3435
this.HydraAdapter = hydraAdapter;

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/PsBackupProviderManager.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
// limitations under the License.
1313
// ----------------------------------------------------------------------------------
1414

15+
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapterNS;
1516
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
1617
using System;
1718
using System.Collections.Generic;
@@ -24,12 +25,12 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ProviderModel
2425
public class PsBackupProviderManager
2526
{
2627
ProviderData providerData;
27-
HydraAdapter.HydraAdapter hydraAdapter;
28+
HydraAdapter hydraAdapter;
2829

29-
public PsBackupProviderManager(Dictionary<System.Enum, object> providerParams, HydraAdapter.HydraAdapter hydraAdapterIn)
30+
public PsBackupProviderManager(Dictionary<System.Enum, object> providerParams, HydraAdapter hydraAdapterIn)
3031
: this(new ProviderData(providerParams), hydraAdapterIn) { }
3132

32-
public PsBackupProviderManager(ProviderData providerDataIn, HydraAdapter.HydraAdapter hydraAdapterIn)
33+
public PsBackupProviderManager(ProviderData providerDataIn, HydraAdapter hydraAdapterIn)
3334
{
3435
providerData = providerDataIn;
3536
hydraAdapter = hydraAdapterIn;

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Cmdlets/ProtectionPolicy/PolicyCmdletHelpers.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
2727
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ProviderModel;
2828
using Microsoft.Azure.Commands.RecoveryServices.Backup.Properties;
29+
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapterNS;
2930

3031
namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
3132
{
@@ -53,7 +54,7 @@ public static void ValidateProtectionPolicyName(string policyName)
5354
}
5455

5556
public static ProtectionPolicyResponse GetProtectionPolicyByName(string policyName,
56-
HydraAdapter.HydraAdapter hydraAdapter)
57+
HydraAdapter hydraAdapter)
5758
{
5859
ProtectionPolicyResponse response = null;
5960

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/Commands.RecoveryServices.Backup.Cmdlets.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@
8181
</ItemGroup>
8282
<ItemGroup>
8383
<Compile Include="Cmdlets\Backup\BackupAzureRmRecoveryServicesItem.cs" />
84-
<Compile Include="Cmdlets\Container\GetAzureRmBackupManagementServer.cs" />
84+
<Compile Include="Cmdlets\Container\GetAzureRmRecoveryServicesBackupManagementServer.cs" />
8585
<Compile Include="Cmdlets\Container\GetAzureRmRecoveryServicesContainer.cs" />
8686
<Compile Include="Cmdlets\Container\UnregisterAzureRmBackupManagementServer.cs" />
8787
<Compile Include="Cmdlets\Container\UnregisterAzureRmRecoveryServicesBackupContainer.cs" />

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup/RecoveryServicesBackupCmdletBase.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
using System.Net;
2424
using System.Text;
2525
using System.Threading.Tasks;
26-
using HydraAdapterNS = Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapter;
26+
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapterNS;
2727
using Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.Models;
2828
using Microsoft.Azure.Commands.RecoveryServices.Backup.Helpers;
2929
using Microsoft.Azure.Management.RecoveryServices.Backup.Models;
@@ -42,12 +42,12 @@ public abstract class RecoveryServicesBackupCmdletBase : AzureRMCmdlet
4242
// in seconds
4343
private int _defaultSleepForOperationTracking = 5;
4444

45-
protected HydraAdapterNS.HydraAdapter HydraAdapter { get; set; }
45+
protected HydraAdapter HydraAdapter { get; set; }
4646

4747
protected void InitializeAzureBackupCmdlet()
4848
{
4949
var cloudServicesClient = AzureSession.ClientFactory.CreateClient<CloudServiceManagementClient>(DefaultContext, AzureEnvironment.Endpoint.ResourceManager);
50-
HydraAdapter = new HydraAdapterNS.HydraAdapter(cloudServicesClient.Credentials, cloudServicesClient.BaseUri);
50+
HydraAdapter = new HydraAdapter(cloudServicesClient.Credentials, cloudServicesClient.BaseUri);
5151
Logger.Instance = new Logger(WriteWarning, WriteDebug, WriteVerbose, ThrowTerminatingError);
5252
}
5353

0 commit comments

Comments
 (0)