Merge pull request #27 from MabOneSdk/pikumar3

Pikumar3
Azure · Jun 12, 2015 · a024d1c · a024d1c
2 parents 5785c7c + e5b742e
commit a024d1c
Show file tree

Hide file tree

Showing 7 changed files with 29 additions and 27 deletions.
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupContainerCmdletBase.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupContainerCmdletBase.cs
@@ -28,17 +28,17 @@ namespace Microsoft.Azure.Commands.AzureBackup.Cmdlets
 {
     public abstract class AzureBackupContainerCmdletBase : AzureBackupCmdletBase
     {
-        [Parameter(Position = 0, Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.AzureBackupContainer, ValueFromPipelineByPropertyName = true)]
+        [Parameter(Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.AzureBackupContainer, ValueFromPipeline = true)]
         [ValidateNotNullOrEmpty]
-        public AzureBackupContainer AzureBackupContainer { 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}", AzureBackupContainer.ResourceGroupName, AzureBackupContainer.ResourceName, AzureBackupContainer.Location));
+            WriteDebug(String.Format("Cmdlet called for ResourceGroupName: {0}, ResourceName: {1}, Location: {2}", container.ResourceGroupName, container.ResourceName, container.Location));
 
-            InitializeAzureBackupCmdlet(AzureBackupContainer.ResourceGroupName, AzureBackupContainer.ResourceName, AzureBackupContainer.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,7 +30,7 @@ public abstract class AzureBackupDSCmdletBase : AzureBackupCmdletBase
     {
         // ToDO:
         // Correct Help message and other attributes related to paameters
-        [Parameter(Position = 0, Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.AzureBackUpItem, ValueFromPipelineByPropertyName = true)]
+        [Parameter(Position = 0, Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.AzureBackUpItem, ValueFromPipeline = true)]
         [ValidateNotNullOrEmpty]
         public AzureBackupItem item { get; set; }
 

diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupItemCmdletBase.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupItemCmdletBase.cs
@@ -30,15 +30,15 @@ public abstract class AzureBackupItemCmdletBase : AzureBackupCmdletBase
     {
         // ToDO:
         // Correct Help message and other attributes related to paameters
-        [Parameter(Position = 0, Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.AzureBackupItem, ValueFromPipelineByPropertyName = true)]
+        [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/...ger/AzureBackup/Commands.AzureBackup/Cmdlets/DataSource/Disable-AzureBackupProtection .cs b/...ger/AzureBackup/Commands.AzureBackup/Cmdlets/DataSource/Disable-AzureBackupProtection .cs
@@ -23,7 +23,7 @@ namespace Microsoft.Azure.Commands.AzureBackup.Cmdlets.DataSource
     public class DisableAzureBackupProtection : AzureBackupDSCmdletBase
     {
         [Parameter(Position = 1, Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.RemoveProtectionOption)]
-        [ValidateSet("Invalid", "RetainBackupData", "DeleteBackupData")] 
+        [ValidateSet("RetainBackupData", "DeleteBackupData")] 
         public string RemoveProtectionOption { get; set; }
 
         [Parameter(Position = 2, Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.Reason)]

diff --git a/...ager/AzureBackup/Commands.AzureBackup/Cmdlets/DataSource/Enable-AzureBackupProtection .cs b/...ager/AzureBackup/Commands.AzureBackup/Cmdlets/DataSource/Enable-AzureBackupProtection .cs
@@ -36,7 +36,7 @@ namespace Microsoft.Azure.Commands.AzureBackup.Cmdlets
     [Cmdlet(VerbsLifecycle.Enable, "AzureBackupProtection"), OutputType(typeof(OperationResponse))]
     public class EnableAzureBackupProtection : AzureBackupItemCmdletBase
     {
-        [Parameter(Position = 1, Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.PolicyName)]
+        [Parameter(Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.PolicyName)]
         [ValidateNotNullOrEmpty]
         public AzureBackupProtectionPolicy Policy { get; set; }
         public override void ExecuteCmdlet()
@@ -48,17 +48,23 @@ public override void ExecuteCmdlet()
                 WriteVerbose("Making client call");
                 SetProtectionRequestInput input = new SetProtectionRequestInput();
                 input.PolicyId = Policy.InstanceId;
-                if (Item.GetType() == ((AzureBackupItem)Item).GetType())
+                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() == ((AzureBackupContainer)Item).GetType())
+                else if (item.GetType() == typeof(AzureBackupContainer))
                 {
-                    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);
                         input.ProtectableObjectType = DataSourceType.VM.ToString();
-                        input.ProtectableObjects.Add((Item as AzureBackupContainer).ContainerUniqueName);
+                        input.ProtectableObjects.Add((item as AzureBackupContainer).ContainerUniqueName);
+                    }
+                    else
+                    {
+                        throw new Exception("Uknown item type");
                     }
                 }
                 else

diff --git a/...ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/DataSource/GetAzureBackupItem.cs b/...ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/DataSource/GetAzureBackupItem.cs
@@ -31,15 +31,15 @@ namespace Microsoft.Azure.Commands.AzureBackup.Cmdlets
     public class GetAzureBackupItem : AzureBackupContainerCmdletBase
     {
         [Parameter(Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.ProtectionStatus)]
-        [ValidateSet("NotProtected","Protected","Protecting","NotProtected")]   
+        [ValidateSet("Protected","Protecting","NotProtected")]   
         public string ProtectionStatus { get; set; }
 
         [Parameter(Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.Status)]
-        [ValidateSet("Invalid", "IRPending", "ProtectionStopped", "ProtectionError", "Protected")]        
+        [ValidateSet("IRPending", "ProtectionStopped", "ProtectionError", "Protected")]        
         public string Status { get; set; }
 
         [Parameter(Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.Type)]
-        [ValidateSet("Invalid", "VM")]
+        [ValidateSet("VM")]
         public string Type { get; set; }
 
         public override void ExecuteCmdlet()
@@ -67,17 +67,17 @@ public override void ExecuteCmdlet()
                 };
 
                 azureBackupDatasourceListResponse = AzureBackupClient.DataSource.ListAsync(DSQueryParam, GetCustomRequestHeaders(), CmdletCancellationToken).Result;
-                azureBackupDatasourceObjects = azureBackupDatasourceListResponse.DataSources.Objects.Where(x => x.ContainerName.Equals(AzureBackupContainer.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(AzureBackupContainer.ContainerUniqueName, System.StringComparison.InvariantCultureIgnoreCase)).ToList();
+                    azureBackupPOObjects = azureBackupPOListResponse.ProtectableObject.Objects.Where(x => x.ContainerName.Equals(container.ContainerUniqueName, System.StringComparison.InvariantCultureIgnoreCase)).ToList();
                 }
 
                 WriteVerbose("Received response");
                 WriteVerbose("Converting response");
-                WriteAzureBackupProtectionPolicy(azureBackupDatasourceObjects, azureBackupPOObjects, AzureBackupContainer);
+                WriteAzureBackupProtectionPolicy(azureBackupDatasourceObjects, azureBackupPOObjects, container);
             });
         }
 

diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Models/AzureBackupItem.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Models/AzureBackupItem.cs
@@ -56,10 +56,6 @@ public class AzureBackupItem : AzureBackupItemContextObject
         /// </summary>
         public int RecoveryPointsCount { get; set; }
 
-        /// <summary>
-        /// Last Recovery Point for the Azure Backup Item
-        /// </summary>
-
         public AzureBackupItem()
             : base()
         {