Merge pull request #159 from MabOneSdk/dev1-anudeeb

Samuel Anudeep · Samuel Anudeep · commit f79d121fe3fc · 2015-10-01T20:00:41.000+05:30
Fix for Bug 4751044. Signed off by SureshT and Vsarg.
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/Commands.AzureBackup.Test.csproj b/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/Commands.AzureBackup.Test.csproj
@@ -40,7 +40,8 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Azure.Management.BackupServicesManagement, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.BackupServices.1.0.4-preview\lib\net40\Microsoft.Azure.Management.BackupServicesManagement.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.BackupServices.1.0.5-preview\lib\net40\Microsoft.Azure.Management.BackupServicesManagement.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/packages.config b/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/packages.config
@@ -4,7 +4,7 @@
   <package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Common.Authentication" version="1.3.1-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
-  <package id="Microsoft.Azure.Management.BackupServices" version="1.0.4-preview" targetFramework="net45" />
+  <package id="Microsoft.Azure.Management.BackupServices" version="1.0.5-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Resources" version="2.18.7-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Test.Framework" version="1.0.5715.36130-prerelease" targetFramework="net45" />
   <package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.5715.36130-prerelease" targetFramework="net45" />
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Container/EnableAzureRMBackupContainerReregistration.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Container/EnableAzureRMBackupContainerReregistration.cs
@@ -46,6 +46,8 @@ protected override void ProcessRecord()
                 {
                     case AzureBackupContainerType.Windows:
                     case AzureBackupContainerType.SCDPM:
+                    case AzureBackupContainerType.AzureBackupServer:
+                    case AzureBackupContainerType.Other:
                         AzureBackupClient.EnableMachineContainerReregistration(Container.ResourceGroupName, Container.ResourceName, Container.Id);
                         break;
                     default:
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Container/GetAzureRMBackupContainer.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Container/GetAzureRMBackupContainer.cs
@@ -60,6 +60,8 @@ protected override void ProcessRecord()
                 {
                     case AzureBackupContainerType.Windows:
                     case AzureBackupContainerType.SCDPM:
+                    case AzureBackupContainerType.AzureBackupServer:
+                    case AzureBackupContainerType.Other:
                         containers.AddRange(GetMachineContainers(Vault.ResourceGroupName, Vault.Name));
                         break;
                     case AzureBackupContainerType.AzureVM:
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Container/UnregisterAzureRMBackupContainer.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Container/UnregisterAzureRMBackupContainer.cs
@@ -47,6 +47,8 @@ protected override void ProcessRecord()
                 {
                     case AzureBackupContainerType.Windows:
                     case AzureBackupContainerType.SCDPM:
+                    case AzureBackupContainerType.AzureBackupServer:
+                    case AzureBackupContainerType.Other:
                         DeleteServer();
                         break;
                     case AzureBackupContainerType.AzureVM:
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Commands.AzureBackup.csproj b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Commands.AzureBackup.csproj
@@ -57,7 +57,8 @@
       <HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.NetFramework.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.Management.BackupServicesManagement, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.BackupServices.1.0.4-preview\lib\net40\Microsoft.Azure.Management.BackupServicesManagement.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.BackupServices.1.0.5-preview\lib\net40\Microsoft.Azure.Management.BackupServicesManagement.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Helpers/ContainerHelpers.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Helpers/ContainerHelpers.cs
@@ -38,33 +38,37 @@ internal class ContainerHelpers
     {
         private static readonly Regex ResourceGroupRegex = new Regex(@"/subscriptions/(?<subscriptionsId>.+)/resourceGroups/(?<resourceGroupName>.+)/providers/(?<providersName>.+)/BackupVault/(?<BackupVaultName>.+)/containers/(?<containersName>.+)", RegexOptions.Compiled);
 
-        internal static AzureBackupContainerType GetContainerType(string customerType)
+        internal static AzureBackupContainerType GetContainerType(string customerTypeString)
         {
-            CustomerType type = (CustomerType)Enum.Parse(typeof(CustomerType), customerType);
-
             AzureBackupContainerType containerType = 0;
+            CustomerType customerType = CustomerType.Invalid;
 
-            switch (type)
+            if (Enum.TryParse<CustomerType>(customerTypeString, out customerType))
             {
-                case CustomerType.DPM:
-                    containerType = AzureBackupContainerType.SCDPM;
-                    break;
-                case CustomerType.InMage:
-                    break;
-                case CustomerType.Invalid:
-                    break;
-                case CustomerType.ManagedContainer:
-                    break;
-                case CustomerType.OBS:
-                    containerType = AzureBackupContainerType.Windows;
-                    break;
-                case CustomerType.SBS:
-                    containerType = AzureBackupContainerType.Windows;
-                    break;
-                case CustomerType.SqlPaaS:
-                    break;
-                default:
-                    break;
+                switch (customerType)
+                {
+                    case CustomerType.DPM:
+                        containerType = AzureBackupContainerType.SCDPM;
+                        break;
+                    case CustomerType.OBS:
+                        containerType = AzureBackupContainerType.Windows;
+                        break;
+                    case CustomerType.SBS:
+                        containerType = AzureBackupContainerType.Windows;
+                        break;
+                    case CustomerType.DPMVenus:
+                        containerType = AzureBackupContainerType.AzureBackupServer;
+                        break;
+                    case CustomerType.Invalid:
+                        break;
+                    default:
+                        containerType = AzureBackupContainerType.Other;
+                        break;
+                }
+            }
+            else if (!string.IsNullOrEmpty(customerTypeString))
+            {
+                containerType = AzureBackupContainerType.Other;
             }
 
             return containerType;
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Models/AzureBackupEnums.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Models/AzureBackupEnums.cs
@@ -25,6 +25,8 @@ public enum AzureBackupContainerType
         Windows = 1,
         SCDPM,
         AzureVM,
+        AzureBackupServer,
+        Other,
     }
 
     public enum DataSourceType
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/packages.config b/src/ResourceManager/AzureBackup/Commands.AzureBackup/packages.config
@@ -4,7 +4,7 @@
   <package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Common.Authentication" version="1.3.1-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
-  <package id="Microsoft.Azure.Management.BackupServices" version="1.0.4-preview" targetFramework="net45" />
+  <package id="Microsoft.Azure.Management.BackupServices" version="1.0.5-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Resources" version="2.18.7-preview" targetFramework="net45" />
   <package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />

Original file line number	Diff line number	Diff line change
`@@ -46,6 +46,8 @@ protected override void ProcessRecord()`
`46`	`46`	`{`
`47`	`47`	`case AzureBackupContainerType.Windows:`
`48`	`48`	`case AzureBackupContainerType.SCDPM:`
	`49`	`+ case AzureBackupContainerType.AzureBackupServer:`
	`50`	`+ case AzureBackupContainerType.Other:`
`49`	`51`	`AzureBackupClient.EnableMachineContainerReregistration(Container.ResourceGroupName, Container.ResourceName, Container.Id);`
`50`	`52`	`break;`
`51`	`53`	`default:`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,8 @@ protected override void ProcessRecord()`
`60`	`60`	`{`
`61`	`61`	`case AzureBackupContainerType.Windows:`
`62`	`62`	`case AzureBackupContainerType.SCDPM:`
	`63`	`+ case AzureBackupContainerType.AzureBackupServer:`
	`64`	`+ case AzureBackupContainerType.Other:`
`63`	`65`	`containers.AddRange(GetMachineContainers(Vault.ResourceGroupName, Vault.Name));`
`64`	`66`	`break;`
`65`	`67`	`case AzureBackupContainerType.AzureVM:`
Original file line number	Diff line number	Diff line change
`@@ -47,6 +47,8 @@ protected override void ProcessRecord()`
`47`	`47`	`{`
`48`	`48`	`case AzureBackupContainerType.Windows:`
`49`	`49`	`case AzureBackupContainerType.SCDPM:`
	`50`	`+ case AzureBackupContainerType.AzureBackupServer:`
	`51`	`+ case AzureBackupContainerType.Other:`
`50`	`52`	`DeleteServer();`
`51`	`53`	`break;`
`52`	`54`	`case AzureBackupContainerType.AzureVM:`
Original file line number	Diff line number	Diff line change
`@@ -25,6 +25,8 @@ public enum AzureBackupContainerType`
`25`	`25`	`Windows = 1,`
`26`	`26`	`SCDPM,`
`27`	`27`	`AzureVM,`
	`28`	`+ AzureBackupServer,`
	`29`	`+ Other,`
`28`	`30`	`}`
`29`	`31`
`30`	`32`	`public enum DataSourceType`