Merge pull request #39 from MabOneSdk/pikumar3

pikumarmsft16 · pikumarmsft16 · commit 1393384d70fd · 2015-06-16T17:57:36.000+05:30
Used switch parameter for boolean input
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupContainerCmdletBase.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupContainerCmdletBase.cs
@@ -30,15 +30,15 @@ public abstract class AzureBackupContainerCmdletBase : AzureBackupCmdletBase
     {
         [Parameter(Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.AzureBackupContainer, ValueFromPipeline = true)]
         [ValidateNotNullOrEmpty]
-        public AzureBackupContainer container { get; set; }
+        public AzureBackupContainer Container { get; set; }
 
         public override void ExecuteCmdlet()
         {
             base.ExecuteCmdlet();
 
-            WriteDebug(String.Format("Cmdlet called for ResourceGroupName: {0}, ResourceName: {1}, Location: {2}", container.ResourceGroupName, container.ResourceName, container.Location));
+            WriteDebug(String.Format("Cmdlet called for ResourceGroupName: {0}, ResourceName: {1}, Location: {2}", Container.ResourceGroupName, Container.ResourceName, Container.Location));
 
-            InitializeAzureBackupCmdlet(container.ResourceGroupName, container.ResourceName, container.Location);
+            InitializeAzureBackupCmdlet(Container.ResourceGroupName, Container.ResourceName, Container.Location);
         }
     }
 }
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupDSCmdletBase.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupDSCmdletBase.cs
@@ -30,15 +30,15 @@ public abstract class AzureBackupDSCmdletBase : AzureBackupCmdletBase
     {
         [Parameter(Position = 0, Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.AzureBackUpItem, ValueFromPipeline = true)]
         [ValidateNotNullOrEmpty]
-        public AzureBackupItem item { get; set; }
+        public AzureBackupItem Item { get; set; }
 
         public override void ExecuteCmdlet()
         {
             base.ExecuteCmdlet();
 
-            WriteDebug(String.Format("Cmdlet called for ResourceGroupName: {0}, ResourceName: {1}", item.ResourceGroupName, item.ResourceName));
+            WriteDebug(String.Format("Cmdlet called for ResourceGroupName: {0}, ResourceName: {1}", Item.ResourceGroupName, Item.ResourceName));
 
-            InitializeAzureBackupCmdlet(item.ResourceGroupName, item.ResourceName, item.Location);
+            InitializeAzureBackupCmdlet(Item.ResourceGroupName, Item.ResourceName, Item.Location);
         }
     }
 }
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupItemCmdletBase.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupItemCmdletBase.cs
@@ -30,13 +30,13 @@ public abstract class AzureBackupItemCmdletBase : AzureBackupCmdletBase
     {
         [Parameter(Position = 0, Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.AzureBackupItem, ValueFromPipeline = true)]
         [ValidateNotNullOrEmpty]
-        public AzureBackupContainerContextObject item { get; set; }
+        public AzureBackupContainerContextObject Item { get; set; }
 
         public override void ExecuteCmdlet()
         {
             base.ExecuteCmdlet();
-            WriteDebug(String.Format("Cmdlet called for ResourceGroupName: {0}, ResourceName: {1}, Location: {2}", item.ResourceGroupName, item.ResourceName, item.Location));
-            InitializeAzureBackupCmdlet(item.ResourceGroupName, item.ResourceName, item.Location);
+            WriteDebug(String.Format("Cmdlet called for ResourceGroupName: {0}, ResourceName: {1}, Location: {2}", Item.ResourceGroupName, Item.ResourceName, Item.Location));
+            InitializeAzureBackupCmdlet(Item.ResourceGroupName, Item.ResourceName, Item.Location);
         }
     }
 }
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/BackUp/TriggerBackUp.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/BackUp/TriggerBackUp.cs
@@ -44,9 +44,9 @@ public override void ExecuteCmdlet()
                 Guid jobId = Guid.Empty;
                 MBS.OperationResponse triggerBackUpInfo =
                     AzureBackupClient.BackUp.TriggerBackUpAsync(GetCustomRequestHeaders(),
-                    item.ContainerUniqueName,
-                    item.Type,
-                    item.DataSourceId,
+                    Item.ContainerUniqueName,
+                    Item.Type,
+                    Item.DataSourceId,
                     CmdletCancellationToken).Result;
 
                 WriteVerbose("Received backup response");
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/DataSource/Disable-AzureBackupProtection .cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/DataSource/Disable-AzureBackupProtection .cs
@@ -33,8 +33,12 @@ namespace Microsoft.Azure.Commands.AzureBackup.Cmdlets.DataSource
     public class DisableAzureBackupProtection : AzureBackupDSCmdletBase
     {
         [Parameter(Position = 1, Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.RemoveProtectionOption)]
-        [ValidateSet("RetainBackupData", "DeleteBackupData")] 
-        public string RemoveProtectionOption { get; set; }
+        public SwitchParameter RemoveRecoveryPoints 
+        {
+            get { return DeleteBackupData; }
+            set { DeleteBackupData = value; } 
+        }
+        private bool DeleteBackupData;
 
         [Parameter(Position = 2, Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.Reason)]
         public string Reason { get; set; }
@@ -51,12 +55,12 @@ public override void ExecuteCmdlet()
                 WriteVerbose("Making client call");
                 RemoveProtectionRequestInput input = new RemoveProtectionRequestInput()
                 {
-                    RemoveProtectionOption = this.RemoveProtectionOption == null ? "RetainBackupData" : this.RemoveProtectionOption,
+                    RemoveProtectionOption = this.DeleteBackupData ? RemoveProtectionOptions.DeleteBackupData.ToString() : RemoveProtectionOptions.RetainBackupData.ToString(),
                     Reason = this.Reason,
                     Comments = this.Comments,
                 };
-
-                var disbaleAzureBackupProtection = AzureBackupClient.DataSource.DisableProtectionAsync(GetCustomRequestHeaders(), item.ContainerUniqueName, item.Type, item.DataSourceId, input, CmdletCancellationToken).Result;
+                WriteVerbose("RemoveProtectionOption is = " + input.RemoveProtectionOption);
+                var disbaleAzureBackupProtection = AzureBackupClient.DataSource.DisableProtectionAsync(GetCustomRequestHeaders(), Item.ContainerUniqueName, Item.Type, Item.DataSourceId, input, CmdletCancellationToken).Result;
 
                 WriteVerbose("Received response");
                 WriteVerbose("Converting response");
@@ -79,5 +83,14 @@ public void WriteAzureBackupProtectionPolicy(IEnumerable<OperationResponse> sour
 
             this.WriteObject(targetList, true);
         }
+
+        public enum RemoveProtectionOptions
+        {
+            [EnumMember]
+            DeleteBackupData,
+
+            [EnumMember]
+            RetainBackupData
+        };
     }
 }
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/DataSource/Enable-AzureBackupProtection .cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/DataSource/Enable-AzureBackupProtection .cs
@@ -45,19 +45,19 @@ public override void ExecuteCmdlet()
                 WriteVerbose("Making client call");
                 SetProtectionRequestInput input = new SetProtectionRequestInput();
                 input.PolicyId = Policy.InstanceId;
-                if (item.GetType() == typeof(AzureBackupItem))
+                if (Item.GetType() == typeof(AzureBackupItem))
                 {
-                    input.ProtectableObjectType = (item as AzureBackupItem).Type;
-                    input.ProtectableObjects.Add((item as AzureBackupItem).Name);
+                    input.ProtectableObjectType = (Item as AzureBackupItem).Type;
+                    input.ProtectableObjects.Add((Item as AzureBackupItem).Name);
                 }
-                else if (item.GetType() == typeof(AzureBackupContainer))
+                else if (Item.GetType() == typeof(AzureBackupContainer))
                 {
-                    WriteVerbose("Input is container Type = "+item.GetType());
-                    if((item as AzureBackupContainer).ContainerType == ContainerType.IaasVMContainer.ToString())
+                    WriteVerbose("Input is container Type = "+Item.GetType());
+                    if((Item as AzureBackupContainer).ContainerType == ContainerType.IaasVMContainer.ToString())
                     {
-                        WriteVerbose("container Type = " + (item as AzureBackupContainer).ContainerType);
+                        WriteVerbose("container Type = " + (Item as AzureBackupContainer).ContainerType);
                         input.ProtectableObjectType = DataSourceType.VM.ToString();
-                        input.ProtectableObjects.Add((item as AzureBackupContainer).ContainerUniqueName);
+                        input.ProtectableObjects.Add((Item as AzureBackupContainer).ContainerUniqueName);
                     }
                     else
                     {
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/DataSource/GetAzureBackupItem.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/DataSource/GetAzureBackupItem.cs
@@ -67,16 +67,16 @@ public override void ExecuteCmdlet()
                 };
 
                 azureBackupDatasourceListResponse = AzureBackupClient.DataSource.ListAsync(DSQueryParam, GetCustomRequestHeaders(), CmdletCancellationToken).Result;
-                azureBackupDatasourceObjects = azureBackupDatasourceListResponse.DataSources.Objects.Where(x => x.ContainerName.Equals(container.ContainerUniqueName, System.StringComparison.InvariantCultureIgnoreCase)).ToList();
+                azureBackupDatasourceObjects = azureBackupDatasourceListResponse.DataSources.Objects.Where(x => x.ContainerName.Equals(Container.ContainerUniqueName, System.StringComparison.InvariantCultureIgnoreCase)).ToList();
 
                 if (this.Status == null)
                 {
                     azureBackupPOListResponse = AzureBackupClient.ProtectableObject.ListAsync(POQueryParam, GetCustomRequestHeaders(), CmdletCancellationToken).Result;
-                    azureBackupPOObjects = azureBackupPOListResponse.ProtectableObject.Objects.Where(x => x.ContainerName.Equals(container.ContainerUniqueName, System.StringComparison.InvariantCultureIgnoreCase)).ToList();
+                    azureBackupPOObjects = azureBackupPOListResponse.ProtectableObject.Objects.Where(x => x.ContainerName.Equals(Container.ContainerUniqueName, System.StringComparison.InvariantCultureIgnoreCase)).ToList();
                 }
 
                 WriteVerbose("Received response");
-                WriteAzureBackupProtectionPolicy(azureBackupDatasourceObjects, azureBackupPOObjects, container);
+                WriteAzureBackupProtectionPolicy(azureBackupDatasourceObjects, azureBackupPOObjects, Container);
             });
         }
 
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/RecoveryPoint/GetAzureBackupRecoveryPoint.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/RecoveryPoint/GetAzureBackupRecoveryPoint.cs
@@ -41,9 +41,9 @@ public override void ExecuteCmdlet()
 
                 RecoveryPointListResponse recoveryPointListResponse = 
                     AzureBackupClient.RecoveryPoint.ListAsync(GetCustomRequestHeaders(),
-                    item.ContainerUniqueName,
-                    item.Type,
-                    item.DataSourceId,
+                    Item.ContainerUniqueName,
+                    Item.Type,
+                    Item.DataSourceId,
                     CmdletCancellationToken).Result;
 
                 WriteVerbose("Received recovery point response");
@@ -57,7 +57,7 @@ public override void ExecuteCmdlet()
                     {
                         WriteVerbose("Converting response");
                         recoveryPointObject = recoveryPointObjects.FirstOrDefault<RecoveryPointInfo>();
-                        WriteAzureBackupRecoveryPoint(recoveryPointObject, item);
+                        WriteAzureBackupRecoveryPoint(recoveryPointObject, Item);
                     }
                     else
                     {
@@ -68,7 +68,7 @@ public override void ExecuteCmdlet()
                 {
                     WriteVerbose("Converting response");
                     recoveryPointObjects = recoveryPointListResponse.RecoveryPoints.Objects.OrderByDescending(x => x.RecoveryPointTime);
-                    WriteAzureBackupRecoveryPoint(recoveryPointObjects, item);
+                    WriteAzureBackupRecoveryPoint(recoveryPointObjects, Item);
                 }                
             });
         }

Original file line number	Diff line number	Diff line change
`@@ -30,15 +30,15 @@ public abstract class AzureBackupContainerCmdletBase : AzureBackupCmdletBase`
`30`	`30`	`{`
`31`	`31`	`[Parameter(Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.AzureBackupContainer, ValueFromPipeline = true)]`
`32`	`32`	`[ValidateNotNullOrEmpty]`
`33`		`- public AzureBackupContainer container { get; set; }`
	`33`	`+ public AzureBackupContainer Container { get; set; }`
`34`	`34`
`35`	`35`	`public override void ExecuteCmdlet()`
`36`	`36`	`{`
`37`	`37`	`base.ExecuteCmdlet();`
`38`	`38`
`39`		`- WriteDebug(String.Format("Cmdlet called for ResourceGroupName: {0}, ResourceName: {1}, Location: {2}", container.ResourceGroupName, container.ResourceName, container.Location));`
	`39`	`+ WriteDebug(String.Format("Cmdlet called for ResourceGroupName: {0}, ResourceName: {1}, Location: {2}", Container.ResourceGroupName, Container.ResourceName, Container.Location));`
`40`	`40`
`41`		`- InitializeAzureBackupCmdlet(container.ResourceGroupName, container.ResourceName, container.Location);`
	`41`	`+ InitializeAzureBackupCmdlet(Container.ResourceGroupName, Container.ResourceName, Container.Location);`
`42`	`42`	`}`
`43`	`43`	`}`
`44`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,13 +30,13 @@ public abstract class AzureBackupItemCmdletBase : AzureBackupCmdletBase`
`30`	`30`	`{`
`31`	`31`	`[Parameter(Position = 0, Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.AzureBackupItem, ValueFromPipeline = true)]`
`32`	`32`	`[ValidateNotNullOrEmpty]`
`33`		`- public AzureBackupContainerContextObject item { get; set; }`
	`33`	`+ public AzureBackupContainerContextObject Item { get; set; }`
`34`	`34`
`35`	`35`	`public override void ExecuteCmdlet()`
`36`	`36`	`{`
`37`	`37`	`base.ExecuteCmdlet();`
`38`		`- WriteDebug(String.Format("Cmdlet called for ResourceGroupName: {0}, ResourceName: {1}, Location: {2}", item.ResourceGroupName, item.ResourceName, item.Location));`
`39`		`- InitializeAzureBackupCmdlet(item.ResourceGroupName, item.ResourceName, item.Location);`
	`38`	`+ WriteDebug(String.Format("Cmdlet called for ResourceGroupName: {0}, ResourceName: {1}, Location: {2}", Item.ResourceGroupName, Item.ResourceName, Item.Location));`
	`39`	`+ InitializeAzureBackupCmdlet(Item.ResourceGroupName, Item.ResourceName, Item.Location);`
`40`	`40`	`}`
`41`	`41`	`}`
`42`	`42`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,19 +45,19 @@ public override void ExecuteCmdlet()`
`45`	`45`	`WriteVerbose("Making client call");`
`46`	`46`	`SetProtectionRequestInput input = new SetProtectionRequestInput();`
`47`	`47`	`input.PolicyId = Policy.InstanceId;`
`48`		`- if (item.GetType() == typeof(AzureBackupItem))`
	`48`	`+ if (Item.GetType() == typeof(AzureBackupItem))`
`49`	`49`	`{`
`50`		`- input.ProtectableObjectType = (item as AzureBackupItem).Type;`
`51`		`- input.ProtectableObjects.Add((item as AzureBackupItem).Name);`
	`50`	`+ input.ProtectableObjectType = (Item as AzureBackupItem).Type;`
	`51`	`+ input.ProtectableObjects.Add((Item as AzureBackupItem).Name);`
`52`	`52`	`}`
`53`		`- else if (item.GetType() == typeof(AzureBackupContainer))`
	`53`	`+ else if (Item.GetType() == typeof(AzureBackupContainer))`
`54`	`54`	`{`
`55`		`- WriteVerbose("Input is container Type = "+item.GetType());`
`56`		`- if((item as AzureBackupContainer).ContainerType == ContainerType.IaasVMContainer.ToString())`
	`55`	`+ WriteVerbose("Input is container Type = "+Item.GetType());`
	`56`	`+ if((Item as AzureBackupContainer).ContainerType == ContainerType.IaasVMContainer.ToString())`
`57`	`57`	`{`
`58`		`- WriteVerbose("container Type = " + (item as AzureBackupContainer).ContainerType);`
	`58`	`+ WriteVerbose("container Type = " + (Item as AzureBackupContainer).ContainerType);`
`59`	`59`	`input.ProtectableObjectType = DataSourceType.VM.ToString();`
`60`		`- input.ProtectableObjects.Add((item as AzureBackupContainer).ContainerUniqueName);`
	`60`	`+ input.ProtectableObjects.Add((Item as AzureBackupContainer).ContainerUniqueName);`
`61`	`61`	`}`
`62`	`62`	`else`
`63`	`63`	`{`
Original file line number	Diff line number	Diff line change
`@@ -67,16 +67,16 @@ public override void ExecuteCmdlet()`
`67`	`67`	`};`
`68`	`68`
`69`	`69`	`azureBackupDatasourceListResponse = AzureBackupClient.DataSource.ListAsync(DSQueryParam, GetCustomRequestHeaders(), CmdletCancellationToken).Result;`
`70`		`- azureBackupDatasourceObjects = azureBackupDatasourceListResponse.DataSources.Objects.Where(x => x.ContainerName.Equals(container.ContainerUniqueName, System.StringComparison.InvariantCultureIgnoreCase)).ToList();`
	`70`	`+ azureBackupDatasourceObjects = azureBackupDatasourceListResponse.DataSources.Objects.Where(x => x.ContainerName.Equals(Container.ContainerUniqueName, System.StringComparison.InvariantCultureIgnoreCase)).ToList();`
`71`	`71`
`72`	`72`	`if (this.Status == null)`
`73`	`73`	`{`
`74`	`74`	`azureBackupPOListResponse = AzureBackupClient.ProtectableObject.ListAsync(POQueryParam, GetCustomRequestHeaders(), CmdletCancellationToken).Result;`
`75`		`- azureBackupPOObjects = azureBackupPOListResponse.ProtectableObject.Objects.Where(x => x.ContainerName.Equals(container.ContainerUniqueName, System.StringComparison.InvariantCultureIgnoreCase)).ToList();`
	`75`	`+ azureBackupPOObjects = azureBackupPOListResponse.ProtectableObject.Objects.Where(x => x.ContainerName.Equals(Container.ContainerUniqueName, System.StringComparison.InvariantCultureIgnoreCase)).ToList();`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`WriteVerbose("Received response");`
`79`		`- WriteAzureBackupProtectionPolicy(azureBackupDatasourceObjects, azureBackupPOObjects, container);`
	`79`	`+ WriteAzureBackupProtectionPolicy(azureBackupDatasourceObjects, azureBackupPOObjects, Container);`
`80`	`80`	`});`
`81`	`81`	`}`
`82`	`82`
Original file line number	Diff line number	Diff line change
`@@ -41,9 +41,9 @@ public override void ExecuteCmdlet()`
`41`	`41`
`42`	`42`	`RecoveryPointListResponse recoveryPointListResponse =`
`43`	`43`	`AzureBackupClient.RecoveryPoint.ListAsync(GetCustomRequestHeaders(),`
`44`		`- item.ContainerUniqueName,`
`45`		`- item.Type,`
`46`		`- item.DataSourceId,`
	`44`	`+ Item.ContainerUniqueName,`
	`45`	`+ Item.Type,`
	`46`	`+ Item.DataSourceId,`
`47`	`47`	`CmdletCancellationToken).Result;`
`48`	`48`
`49`	`49`	`WriteVerbose("Received recovery point response");`
`@@ -57,7 +57,7 @@ public override void ExecuteCmdlet()`
`57`	`57`	`{`
`58`	`58`	`WriteVerbose("Converting response");`
`59`	`59`	`recoveryPointObject = recoveryPointObjects.FirstOrDefault<RecoveryPointInfo>();`
`60`		`- WriteAzureBackupRecoveryPoint(recoveryPointObject, item);`
	`60`	`+ WriteAzureBackupRecoveryPoint(recoveryPointObject, Item);`
`61`	`61`	`}`
`62`	`62`	`else`
`63`	`63`	`{`
`@@ -68,7 +68,7 @@ public override void ExecuteCmdlet()`
`68`	`68`	`{`
`69`	`69`	`WriteVerbose("Converting response");`
`70`	`70`	`recoveryPointObjects = recoveryPointListResponse.RecoveryPoints.Objects.OrderByDescending(x => x.RecoveryPointTime);`
`71`		`- WriteAzureBackupRecoveryPoint(recoveryPointObjects, item);`
	`71`	`+ WriteAzureBackupRecoveryPoint(recoveryPointObjects, Item);`
`72`	`72`	`}`
`73`	`73`	`});`
`74`	`74`	`}`