Merge pull request #173 from MabOneSdk/anudeeb-dev1

Samuel Anudeep · Samuel Anudeep · commit be8a5fc08388 · 2016-03-03T17:22:05.000+05:30
Passing adapter to provider model
diff --git a/src/ResourceManager/RecoveryServices.Backup/Cmdlets/Container/GetAzureRmRecoveryServicesContainer.cs b/src/ResourceManager/RecoveryServices.Backup/Cmdlets/Container/GetAzureRmRecoveryServicesContainer.cs
@@ -17,22 +17,48 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Management.Automation;
 using System.Text;
 using System.Threading.Tasks;
 
 namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
 {
-    class GetAzureRmRecoveryServicesContainer : RecoveryServicesBackupCmdletBase
+    [Cmdlet(VerbsCommon.Get, "AzureRmRecoveryServicesContainer"), OutputType(typeof(List<AzureRmRecoveryServicesContainerBase>))]
+    public class GetAzureRmRecoveryServicesContainer : RecoveryServicesBackupCmdletBase
     {
-        PsBackupProviderManager providerManager = new PsBackupProviderManager(new Dictionary<string, object>()
-            {
-                {GetContainerParams.Name.ToString(), "Param1Value"}, 
-                {GetContainerParams.Status.ToString(), "Param2Value"}
-            });
+        [Parameter(Mandatory = false, HelpMessage = "", ValueFromPipeline = true)]
+        [ValidateNotNullOrEmpty]
+        public ARSVault Vault { get; set; }
+
+        [Parameter(Mandatory = true, HelpMessage = "")]
+        [ValidateNotNullOrEmpty]
+        public ContainerType ContainerType { get; set; }
+
+        [Parameter(Mandatory = false, HelpMessage = "")]
+        [ValidateNotNullOrEmpty]
+        public string Name { get; set; }
+
+        [Parameter(Mandatory = false, HelpMessage = "")]
+        [ValidateNotNullOrEmpty]
+        public string ResourceGroupName { get; set; }
+
+        [Parameter(Mandatory = false, HelpMessage = "")]
+        [ValidateNotNullOrEmpty]
+        public ContainerRegistrationStatus Status { get; set; }
 
         public override void ExecuteCmdlet()
         {
             base.ExecuteCmdlet();
+
+            PsBackupProviderManager providerManager = new PsBackupProviderManager(new Dictionary<System.Enum, object>()
+            {
+                {GetContainerParams.Vault, Vault}, 
+                {GetContainerParams.ContainerType, ContainerType},
+                {GetContainerParams.Name, Name},
+                {GetContainerParams.ResourceGroupName, ResourceGroupName},
+                {GetContainerParams.Status, Status},
+            }, HydraAdapter);
+
             IPsBackupProvider psBackupProvider = providerManager.GetProviderInstance(ContainerType.AzureVM);
         }
     }
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Cmdlets.csproj b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Cmdlets.csproj
@@ -34,13 +34,29 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\packages\Hyak.Common.1.0.3\lib\portable-net403+win+wpa81\Hyak.Common.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.Azure.Common, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Azure.Common.Authentication, Version=1.6.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Microsoft.Azure.Common.Authentication.1.6.1-preview\lib\net45\Microsoft.Azure.Common.Authentication.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Rest.ClientRuntime, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.1.8.2\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.WindowsAzure.Management.Scheduler">
+      <HintPath>..\..\packages\Microsoft.WindowsAzure.Management.Scheduler.6.0.0\lib\net40\Microsoft.WindowsAzure.Management.Scheduler.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Management.Automation, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>C:\Windows\Microsoft.NET\assembly\GAC_MSIL\System.Management.Automation\v4.0_3.0.0.0__31bf3856ad364e35\System.Management.Automation.dll</HintPath>
     </Reference>
     <Reference Include="System.Net" />
+    <Reference Include="System.Net.Http" />
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -74,10 +90,18 @@
       <Project>{3819d8a7-c62c-4c47-8ddd-0332d9ce1252}</Project>
       <Name>Commands.ResourceManager.Common</Name>
     </ProjectReference>
+    <ProjectReference Include="..\RecoveryServices\Commands.RecoveryServices\Commands.RecoveryServices.csproj">
+      <Project>{604260dc-b392-4cf4-81ec-34b14591e2d2}</Project>
+      <Name>Commands.RecoveryServices</Name>
+    </ProjectReference>
     <ProjectReference Include="Commands.RecoveryServices.Backup.Helpers\Commands.RecoveryServices.Backup.Helpers.csproj">
       <Project>{0e1d3f36-e6c8-4764-8c7d-6f9ee537490c}</Project>
       <Name>Commands.RecoveryServices.Backup.Helpers</Name>
     </ProjectReference>
+    <ProjectReference Include="Commands.RecoveryServices.Backup.HydraAdapter\Commands.RecoveryServices.Backup.HydraAdapter.csproj">
+      <Project>{b758fec1-35c1-4f93-a954-66dd33f6e0ec}</Project>
+      <Name>Commands.RecoveryServices.Backup.HydraAdapter</Name>
+    </ProjectReference>
     <ProjectReference Include="Commands.RecoveryServices.Backup.Models\Commands.RecoveryServices.Backup.Models.csproj">
       <Project>{30b92759-50b3-494e-b9f0-ec9a2ce9d57b}</Project>
       <Name>Commands.RecoveryServices.Backup.Models</Name>
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/CommonEnums.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/CommonEnums.cs
@@ -37,4 +37,10 @@ public enum PsBackupProviderTypes
     {
         IaasVm = 1,
     }
+
+    public enum ContainerRegistrationStatus
+    {
+        Registered = 1,
+        Registering,
+    }
 }
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Commands.RecoveryServices.Backup.Providers.csproj b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Commands.RecoveryServices.Backup.Providers.csproj
@@ -30,6 +30,14 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Hyak.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\packages\Hyak.Common.1.0.3\lib\portable-net403+win+wpa81\Hyak.Common.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Azure.Common, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.Azure.Management.RecoveryServicesBackupManagement, Version=0.9.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\Commands.RecoveryServices.Backup.HydraAdapter\Resources\Microsoft.Azure.Management.RecoveryServicesBackupManagement.dll</HintPath>
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/IPsBackupProvider.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/IPsBackupProvider.cs
@@ -23,7 +23,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ProviderModel
 {
     public interface IPsBackupProvider
     {
-        void Initialize(ProviderData providerData);
+        void Initialize(ProviderData providerData, HydraAdapter.HydraAdapter hydraAdapter);
 
         BaseRecoveryServicesJobResponse EnableProtection();
 
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/IaasVmPsBackupProvider.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/Providers/IaasVmPsBackupProvider.cs
@@ -22,5 +22,49 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ProviderModel
 {
     public class IaasVmPsBackupProvider : IPsBackupProvider
     {
+        public void Initialize(ProviderData providerData, HydraAdapter.HydraAdapter hydraAdapter)
+        {
+            throw new NotImplementedException();
+        }
+
+        public Management.RecoveryServices.Backup.Models.BaseRecoveryServicesJobResponse EnableProtection()
+        {
+            throw new NotImplementedException();
+        }
+
+        public Management.RecoveryServices.Backup.Models.BaseRecoveryServicesJobResponse DisableProtection()
+        {
+            throw new NotImplementedException();
+        }
+
+        public Management.RecoveryServices.Backup.Models.BaseRecoveryServicesJobResponse TriggerBackup()
+        {
+            throw new NotImplementedException();
+        }
+
+        public Management.RecoveryServices.Backup.Models.BaseRecoveryServicesJobResponse TriggerRestore()
+        {
+            throw new NotImplementedException();
+        }
+
+        public Management.RecoveryServices.Backup.Models.ProtectedItemResponse GetProtectedItem()
+        {
+            throw new NotImplementedException();
+        }
+
+        public Management.RecoveryServices.Backup.Models.RecoveryPointResponse GetRecoveryPoint()
+        {
+            throw new NotImplementedException();
+        }
+
+        public Management.RecoveryServices.Backup.Models.ProtectionPolicyResponse CreatePolicy()
+        {
+            throw new NotImplementedException();
+        }
+
+        public Management.RecoveryServices.Backup.Models.ProtectionPolicyResponse ModifyPolicy()
+        {
+            throw new NotImplementedException();
+        }
     }
 }
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/PsBackupProviderDC.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/PsBackupProviderDC.cs
@@ -22,17 +22,17 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ProviderModel
 {
     public class ProviderData
     {
-        Dictionary<string, object> providerParameters;
+        Dictionary<System.Enum, object> providerParameters;
 
-        public Dictionary<string, object> ProviderParameters
+        public Dictionary<System.Enum, object> ProviderParameters
         {
             get
             {
                 return providerParameters;
             }
         }
 
-        public ProviderData(Dictionary<string, object> inProviderParameters)
+        public ProviderData(Dictionary<System.Enum, object> inProviderParameters)
         {
             providerParameters = inProviderParameters;
         }
diff --git a/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/PsBackupProviderManager.cs b/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/PsBackupProviderManager.cs
@@ -24,15 +24,15 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ProviderModel
     public class PsBackupProviderManager
     {
         ProviderData providerData;
+        HydraAdapter.HydraAdapter hydraAdapter;
 
-        public PsBackupProviderManager(Dictionary<string, object> providerParams)
-        {
-            providerData = new ProviderData(providerParams);
-        }
+        public PsBackupProviderManager(Dictionary<System.Enum, object> providerParams, HydraAdapter.HydraAdapter hydraAdapterIn)
+            : this(new ProviderData(providerParams), hydraAdapterIn) { }
 
-        public PsBackupProviderManager(ProviderData providerDataIn)
+        public PsBackupProviderManager(ProviderData providerDataIn, HydraAdapter.HydraAdapter hydraAdapterIn)
         {
             providerData = providerDataIn;
+            hydraAdapter = hydraAdapterIn;
         }
 
         public IPsBackupProvider GetProviderInstance(ContainerType containerType)
@@ -74,7 +74,7 @@ public IPsBackupProvider GetProviderInstance(PsBackupProviderTypes providerType)
                     break;
             }
 
-            psBackupProvider.Initialize(providerData);
+            psBackupProvider.Initialize(providerData, hydraAdapter);
 
             return psBackupProvider;
         }
diff --git a/src/ResourceManager/RecoveryServices.Backup/RecoveryServices.Backup.sln b/src/ResourceManager/RecoveryServices.Backup/RecoveryServices.Backup.sln
@@ -17,6 +17,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.RecoveryServices.B
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.RecoveryServices.Backup.Helpers", "Commands.RecoveryServices.Backup.Helpers\Commands.RecoveryServices.Backup.Helpers.csproj", "{0E1D3F36-E6C8-4764-8C7D-6F9EE537490C}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.RecoveryServices", "..\RecoveryServices\Commands.RecoveryServices\Commands.RecoveryServices.csproj", "{604260DC-B392-4CF4-81EC-34B14591E2D2}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -51,6 +53,10 @@ Global
 		{0E1D3F36-E6C8-4764-8C7D-6F9EE537490C}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0E1D3F36-E6C8-4764-8C7D-6F9EE537490C}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0E1D3F36-E6C8-4764-8C7D-6F9EE537490C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{604260DC-B392-4CF4-81EC-34B14591E2D2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{604260DC-B392-4CF4-81EC-34B14591E2D2}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{604260DC-B392-4CF4-81EC-34B14591E2D2}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{604260DC-B392-4CF4-81EC-34B14591E2D2}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/src/ResourceManager/RecoveryServices.Backup/RecoveryServicesBackupCmdletBase.cs b/src/ResourceManager/RecoveryServices.Backup/RecoveryServicesBackupCmdletBase.cs
@@ -14,6 +14,9 @@
 
 using Hyak.Common;
 using Microsoft.Azure.Commands.ResourceManager.Common;
+using Microsoft.Azure.Common.Authentication;
+using Microsoft.Azure.Common.Authentication.Models;
+using Microsoft.WindowsAzure.Management.Scheduler;
 using RecoveryServices.Backup.Properties;
 using System;
 using System.Collections.Generic;
@@ -22,6 +25,7 @@
 using System.Net;
 using System.Text;
 using System.Threading.Tasks;
+using HydraAdapterNS = Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.HydraAdapter;
 
 namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
 {
@@ -30,9 +34,12 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets
     /// </summary>
     public abstract class RecoveryServicesBackupCmdletBase : AzureRMCmdlet
     {
+        protected HydraAdapterNS.HydraAdapter HydraAdapter { get; set; }
+
         protected void InitializeAzureBackupCmdlet(string resourceGroupName, string resourceName)
         {
-
+            var cloudServicesClient = AzureSession.ClientFactory.CreateClient<CloudServiceManagementClient>(DefaultContext, AzureEnvironment.Endpoint.ResourceManager);
+            HydraAdapter = new HydraAdapterNS.HydraAdapter(cloudServicesClient.Credentials, cloudServicesClient.BaseUri);
         }
 
         protected void ExecutionBlock(Action action)

Original file line number	Diff line number	Diff line change
`@@ -37,4 +37,10 @@ public enum PsBackupProviderTypes`
`37`	`37`	`{`
`38`	`38`	`IaasVm = 1,`
`39`	`39`	`}`
	`40`	`+`
	`41`	`+ public enum ContainerRegistrationStatus`
	`42`	`+ {`
	`43`	`+ Registered = 1,`
	`44`	`+ Registering,`
	`45`	`+ }`
`40`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ProviderModel`
`23`	`23`	`{`
`24`	`24`	`public interface IPsBackupProvider`
`25`	`25`	`{`
`26`		`- void Initialize(ProviderData providerData);`
	`26`	`+ void Initialize(ProviderData providerData, HydraAdapter.HydraAdapter hydraAdapter);`
`27`	`27`
`28`	`28`	`BaseRecoveryServicesJobResponse EnableProtection();`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -22,17 +22,17 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ProviderModel`
`22`	`22`	`{`
`23`	`23`	`public class ProviderData`
`24`	`24`	`{`
`25`		`- Dictionary<string, object> providerParameters;`
	`25`	`+ Dictionary<System.Enum, object> providerParameters;`
`26`	`26`
`27`		`- public Dictionary<string, object> ProviderParameters`
	`27`	`+ public Dictionary<System.Enum, object> ProviderParameters`
`28`	`28`	`{`
`29`	`29`	`get`
`30`	`30`	`{`
`31`	`31`	`return providerParameters;`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`
`35`		`- public ProviderData(Dictionary<string, object> inProviderParameters)`
	`35`	`+ public ProviderData(Dictionary<System.Enum, object> inProviderParameters)`
`36`	`36`	`{`
`37`	`37`	`providerParameters = inProviderParameters;`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -24,15 +24,15 @@ namespace Microsoft.Azure.Commands.RecoveryServices.Backup.Cmdlets.ProviderModel`
`24`	`24`	`public class PsBackupProviderManager`
`25`	`25`	`{`
`26`	`26`	`ProviderData providerData;`
	`27`	`+ HydraAdapter.HydraAdapter hydraAdapter;`
`27`	`28`
`28`		`- public PsBackupProviderManager(Dictionary<string, object> providerParams)`
`29`		`- {`
`30`		`- providerData = new ProviderData(providerParams);`
`31`		`- }`
	`29`	`+ public PsBackupProviderManager(Dictionary<System.Enum, object> providerParams, HydraAdapter.HydraAdapter hydraAdapterIn)`
	`30`	`+ : this(new ProviderData(providerParams), hydraAdapterIn) { }`
`32`	`31`
`33`		`- public PsBackupProviderManager(ProviderData providerDataIn)`
	`32`	`+ public PsBackupProviderManager(ProviderData providerDataIn, HydraAdapter.HydraAdapter hydraAdapterIn)`
`34`	`33`	`{`
`35`	`34`	`providerData = providerDataIn;`
	`35`	`+ hydraAdapter = hydraAdapterIn;`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`public IPsBackupProvider GetProviderInstance(ContainerType containerType)`
`@@ -74,7 +74,7 @@ public IPsBackupProvider GetProviderInstance(PsBackupProviderTypes providerType)`
`74`	`74`	`break;`
`75`	`75`	`}`
`76`	`76`
`77`		`- psBackupProvider.Initialize(providerData);`
	`77`	`+ psBackupProvider.Initialize(providerData, hydraAdapter);`
`78`	`78`
`79`	`79`	`return psBackupProvider;`
`80`	`80`	`}`