From 50b665edf57ef2b1cc8759df4ec66b98983116a3 Mon Sep 17 00:00:00 2001 From: pikumarmsft Date: Wed, 17 Jun 2015 10:49:19 +0530 Subject: [PATCH 1/2] printing OperationID --- .../Disable-AzureBackupProtection .cs | 26 +++++-------------- .../Enable-AzureBackupProtection .cs | 23 ++++------------ .../Cmdlets/DataSource/GetAzureBackupItem.cs | 6 ++--- 3 files changed, 14 insertions(+), 41 deletions(-) diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/DataSource/Disable-AzureBackupProtection .cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/DataSource/Disable-AzureBackupProtection .cs index 901073e9c917..3b8302a0b558 100644 --- a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/DataSource/Disable-AzureBackupProtection .cs +++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/DataSource/Disable-AzureBackupProtection .cs @@ -29,7 +29,7 @@ namespace Microsoft.Azure.Commands.AzureBackup.Cmdlets.DataSource /// /// Disable Azure Backup protection /// - [Cmdlet(VerbsLifecycle.Disable, "AzureBackupProtection"), OutputType(typeof(OperationResponse))] + [Cmdlet(VerbsLifecycle.Disable, "AzureBackupProtection"), OutputType(typeof(Guid))] public class DisableAzureBackupProtection : AzureBackupDSCmdletBase { [Parameter(Position = 1, Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.RemoveProtectionOption)] @@ -59,31 +59,17 @@ public override void ExecuteCmdlet() Reason = this.Reason, Comments = this.Comments, }; + WriteVerbose("RemoveProtectionOption is = " + input.RemoveProtectionOption); + Guid jobId = Guid.Empty; var disbaleAzureBackupProtection = AzureBackupClient.DataSource.DisableProtectionAsync(GetCustomRequestHeaders(), Item.ContainerUniqueName, Item.Type, Item.DataSourceId, input, CmdletCancellationToken).Result; - WriteVerbose("Received response"); + WriteVerbose("Received disable azure backup protection response"); WriteVerbose("Converting response"); - WriteAzureBackupProtectionPolicy(disbaleAzureBackupProtection); + jobId = disbaleAzureBackupProtection.OperationId; + this.WriteObject(jobId); }); } - - public void WriteAzureBackupProtectionPolicy(OperationResponse sourceOperationResponse) - { - } - - public void WriteAzureBackupProtectionPolicy(IEnumerable sourceOperationResponseList) - { - List targetList = new List(); - - foreach (var sourceOperationResponse in sourceOperationResponseList) - { - targetList.Add(sourceOperationResponse); - } - - this.WriteObject(targetList, true); - } - public enum RemoveProtectionOptions { [EnumMember] diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/DataSource/Enable-AzureBackupProtection .cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/DataSource/Enable-AzureBackupProtection .cs index 8caf9dd47612..0cb5421f96fc 100644 --- a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/DataSource/Enable-AzureBackupProtection .cs +++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/DataSource/Enable-AzureBackupProtection .cs @@ -30,7 +30,7 @@ namespace Microsoft.Azure.Commands.AzureBackup.Cmdlets /// /// Enable Azure Backup protection /// - [Cmdlet(VerbsLifecycle.Enable, "AzureBackupProtection"), OutputType(typeof(OperationResponse))] + [Cmdlet(VerbsLifecycle.Enable, "AzureBackupProtection"), OutputType(typeof(Guid))] public class EnableAzureBackupProtection : AzureBackupItemCmdletBase { [Parameter(Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.PolicyName)] @@ -69,29 +69,16 @@ public override void ExecuteCmdlet() throw new Exception("Uknown item type"); } + Guid jobId = Guid.Empty; var enableAzureBackupProtection = AzureBackupClient.DataSource.EnableProtectionAsync(GetCustomRequestHeaders(), input, CmdletCancellationToken).Result; + WriteVerbose("Received enable azure backup protection response"); WriteVerbose("Received response"); - WriteVerbose("Converting response"); - WriteAzureBackupProtectionPolicy(enableAzureBackupProtection); + jobId = enableAzureBackupProtection.OperationId; + this.WriteObject(jobId); }); } - public void WriteAzureBackupProtectionPolicy(OperationResponse sourceOperationResponse) - { - } - - public void WriteAzureBackupProtectionPolicy(IEnumerable sourceOperationResponseList) - { - List targetList = new List(); - - foreach (var sourceOperationResponse in sourceOperationResponseList) - { - targetList.Add(sourceOperationResponse); - } - - this.WriteObject(targetList, true); - } public enum ContainerType { [EnumMember] diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/DataSource/GetAzureBackupItem.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/DataSource/GetAzureBackupItem.cs index 3dfb83912256..4d6fe0b9a333 100644 --- a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/DataSource/GetAzureBackupItem.cs +++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/DataSource/GetAzureBackupItem.cs @@ -76,16 +76,16 @@ public override void ExecuteCmdlet() } WriteVerbose("Received response"); - WriteAzureBackupProtectionPolicy(azureBackupDatasourceObjects, azureBackupPOObjects, Container); + WriteAzureBackupItem(azureBackupDatasourceObjects, azureBackupPOObjects, Container); }); } - public void WriteAzureBackupProtectionPolicy(DataSourceInfo sourceItem, AzureBackupContainer azureBackupItem) + public void WriteAzureBackupItem(DataSourceInfo sourceItem, AzureBackupContainer azureBackupItem) { this.WriteObject(new AzureBackupItem(sourceItem, azureBackupItem)); } - public void WriteAzureBackupProtectionPolicy(List sourceDataSourceList, List sourcePOList, AzureBackupContainer azureBackupContainer) + public void WriteAzureBackupItem(List sourceDataSourceList, List sourcePOList, AzureBackupContainer azureBackupContainer) { List targetList = new List(); From 3c753475828d203da1823fa7885c002c5ffe454f Mon Sep 17 00:00:00 2001 From: pikumarmsft Date: Wed, 17 Jun 2015 10:51:54 +0530 Subject: [PATCH 2/2] fixed traces --- .../Cmdlets/DataSource/Disable-AzureBackupProtection .cs | 1 - .../Cmdlets/DataSource/Enable-AzureBackupProtection .cs | 1 - .../Cmdlets/DataSource/GetAzureBackupItem.cs | 2 +- 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/DataSource/Disable-AzureBackupProtection .cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/DataSource/Disable-AzureBackupProtection .cs index 3b8302a0b558..8cc27e56121a 100644 --- a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/DataSource/Disable-AzureBackupProtection .cs +++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/DataSource/Disable-AzureBackupProtection .cs @@ -65,7 +65,6 @@ public override void ExecuteCmdlet() var disbaleAzureBackupProtection = AzureBackupClient.DataSource.DisableProtectionAsync(GetCustomRequestHeaders(), Item.ContainerUniqueName, Item.Type, Item.DataSourceId, input, CmdletCancellationToken).Result; WriteVerbose("Received disable azure backup protection response"); - WriteVerbose("Converting response"); jobId = disbaleAzureBackupProtection.OperationId; this.WriteObject(jobId); }); diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/DataSource/Enable-AzureBackupProtection .cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/DataSource/Enable-AzureBackupProtection .cs index 0cb5421f96fc..5f5c88f26377 100644 --- a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/DataSource/Enable-AzureBackupProtection .cs +++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/DataSource/Enable-AzureBackupProtection .cs @@ -73,7 +73,6 @@ public override void ExecuteCmdlet() var enableAzureBackupProtection = AzureBackupClient.DataSource.EnableProtectionAsync(GetCustomRequestHeaders(), input, CmdletCancellationToken).Result; WriteVerbose("Received enable azure backup protection response"); - WriteVerbose("Received response"); jobId = enableAzureBackupProtection.OperationId; this.WriteObject(jobId); }); diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/DataSource/GetAzureBackupItem.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/DataSource/GetAzureBackupItem.cs index 4d6fe0b9a333..97ec79cbefe9 100644 --- a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/DataSource/GetAzureBackupItem.cs +++ b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/DataSource/GetAzureBackupItem.cs @@ -75,7 +75,7 @@ public override void ExecuteCmdlet() azureBackupPOObjects = azureBackupPOListResponse.ProtectableObject.Objects.Where(x => x.ContainerName.Equals(Container.ContainerUniqueName, System.StringComparison.InvariantCultureIgnoreCase)).ToList(); } - WriteVerbose("Received response"); + WriteVerbose("Received azure backup item response"); WriteAzureBackupItem(azureBackupDatasourceObjects, azureBackupPOObjects, Container); }); }