Skip to content

Pikumar3 #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 12, 2015
Merged

Pikumar3 #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
03fce5b
pipeline changes.
pikumarmsft16 Jun 12, 2015
e5b742e
Merge branch 'dev' into pikumar3
pikumarmsft16 Jun 12, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupContainerCmdletBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}
2 changes: 1 addition & 1 deletion src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupDSCmdletBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; }

Expand Down
8 changes: 4 additions & 4 deletions src/ResourceManager/AzureBackup/Commands.AzureBackup/AzureBackupItemCmdletBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...ger/AzureBackup/Commands.AzureBackup/Cmdlets/DataSource/Disable-AzureBackupProtection .cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)]
Expand Down
20 changes: 13 additions & 7 deletions ...ager/AzureBackup/Commands.AzureBackup/Cmdlets/DataSource/Enable-AzureBackupProtection .cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand All @@ -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
Expand Down
12 changes: 6 additions & 6 deletions ...ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/DataSource/GetAzureBackupItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
Expand Down Expand Up @@ -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);
});
}

Expand Down
4 changes: 0 additions & 4 deletions src/ResourceManager/AzureBackup/Commands.AzureBackup/Models/AzureBackupItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down