Skip to content

. #77

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.

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 24 commits into from
Aug 28, 2015
Merged

. #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
24 commits
Select commit Hold shift + click to select a range
f527230
Revert "Revert "FI from dev1 into release""
AditTulasi Aug 25, 2015
a3a87ce
Merge branch 'dev1' of https://github.com/MabOneSdk/azure-powershell …
AditTulasi Aug 25, 2015
5505ab9
updating references to hdi nuget
Aug 25, 2015
85ef6b5
updating test refs
Aug 25, 2015
c8aff29
remove app.config
Aug 25, 2015
ac98ca3
Warn users for upcoming changes to test cmdlets
vivsriaus Aug 25, 2015
05067d2
Update ChangeLog.md
markcowl Aug 25, 2015
f5bfaac
Update wix file in dev branch
markcowl Aug 26, 2015
512c3b5
Merge pull request #802 from markcowl/hdinsightwix
markcowl Aug 26, 2015
db4abf4
Merge pull request #801 from vivsriaus/WarnRGRemoveDeployment
markcowl Aug 26, 2015
bd0101f
Merge pull request #142 from Azure/dev
Aug 26, 2015
4e0e3d0
Merge pull request #143 from MabOneSdk/release
Aug 26, 2015
fabe186
Merge pull request #144 from MabOneSdk/dev1
Aug 26, 2015
8f5306b
Scrubbing help text
Aug 26, 2015
02dcf16
Merge pull request #146 from MabOneSdk/dev1-anudeeb
Aug 26, 2015
f171b44
Updating help doc
Aug 26, 2015
3b47381
Merge pull request #147 from MabOneSdk/dev1-anudeeb
Aug 26, 2015
3a6f6a8
Merge pull request #148 from MabOneSdk/dev1
Aug 26, 2015
9acf88f
Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev
Aug 26, 2015
ea96a7f
Merge pull request #799 from shefaliv/dev
markcowl Aug 26, 2015
a94d38c
Add Launch option to Get-RDP command
deepakswifty Aug 26, 2015
75b542c
update release file
deepakswifty Aug 27, 2015
d7af629
Merge pull request #804 from MabOneSdk/release
ogail Aug 27, 2015
7da0852
Merge pull request #806 from DeepakRajendranMsft/AddLaunchOptionOnRDP
ogail Aug 27, 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
4 changes: 4 additions & 0 deletions ChangeLog.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## 2015.09.03 version 0.9.8
* Azure Compute (ARM) Cmdlets
* Add -Launch parameter for Get-AzureRemoteDesktopFile cmdlet

## 2015.08.17 version 0.9.7
* Azure Profile cmdlets
* New-AzureProfile
Expand Down
100 changes: 100 additions & 0 deletions setup/azurecmdfiles.wxi

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ namespace Microsoft.Azure.Commands.AzureBackup.Cmdlets
{
public abstract class AzureRMBackupDSCmdletBase : AzureBackupCmdletBase
{
[Parameter(Position = 0, Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.AzureBackUpItem, ValueFromPipeline = true)]
[Parameter(Position = 0, Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.AzureBackupItem, ValueFromPipeline = true)]
[ValidateNotNullOrEmpty]
public AzureRMBackupItem Item { get; set; }

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
using System.Xml;
using System.Linq;
using Mgmt = Microsoft.Azure.Management.BackupServices.Models;
using Microsoft.Azure.Commands.AzureBackup.Models;


namespace Microsoft.Azure.Commands.AzureBackup.Cmdlets
Expand Down Expand Up @@ -62,6 +63,30 @@ public static class AzureBackupJobHelper
{
public static DateTime MinimumAllowedDate = new DateTime(DateTime.MinValue.Year, DateTime.MinValue.Month, DateTime.MinValue.Day, DateTime.MinValue.Hour, DateTime.MinValue.Minute, DateTime.MinValue.Second, DateTimeKind.Utc);

public static string GetTypeForPS(string itemType)
{
AzureBackupItemType managedContainerType = (AzureBackupItemType)Enum.Parse(typeof(AzureBackupItemType), itemType, true);

string returnType = string.Empty;

switch (managedContainerType)
{
case AzureBackupItemType.IaasVM:
returnType = "AzureVM";
break;
}

return returnType;
}

public static string GetTypeForService(string itemType)
{
if (itemType.CompareTo("AzureVM") == 0)
return AzureBackupItemType.IaasVM.ToString();
throw new ArgumentException("Invalid value", "itemType");
}


public static bool IsValidStatus(string inputStatus)
{
JobStatus status;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ public class GetAzureRMBackupJob : AzureBackupCmdletBase
public string Status { get; set; }

[Parameter(Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.JobFilterTypeHelpMessage, ParameterSetName = "FiltersSet")]
[ValidateSet("IaasVM")]
[ValidateSet("AzureVM")]
public string Type { get; set; }

[Parameter(Mandatory = false, HelpMessage = AzureBackupCmdletHelpMessage.JobFilterOperationHelpMessage, ParameterSetName = "FiltersSet")]
Expand All @@ -79,6 +79,11 @@ public override void ExecuteCmdlet()
JobId = Job.InstanceId;
}

if (Type != null)
{
Type = AzureBackupJobHelper.GetTypeForService(Type);
}

// validations
if (!From.HasValue)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ public class GetAzureRMBackupJobDetils : AzureBackupCmdletBase

[Parameter(Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.JobDetailsFilterJobIdHelpMessage, ParameterSetName = "IdFiltersSet")]
[ValidateNotNullOrEmpty]
public string JobID { get; set; }
public string JobId { get; set; }

[Parameter(Mandatory = true, HelpMessage = AzureBackupCmdletHelpMessage.JobDetailsFilterJobHelpMessage, ParameterSetName = "JobsFiltersSet", ValueFromPipeline = true)]
[ValidateNotNull]
Expand All @@ -53,12 +53,12 @@ public override void ExecuteCmdlet()
{
if (Job != null)
{
JobID = Job.InstanceId;
JobId = Job.InstanceId;
}

WriteDebug(String.Format(Resources.JobIdFilter, JobID));
WriteDebug(String.Format(Resources.JobIdFilter, JobId));

Mgmt.CSMJobDetailsResponse serviceJobProperties = AzureBackupClient.GetJobDetails(Vault.ResourceGroupName, Vault.Name, JobID);
Mgmt.CSMJobDetailsResponse serviceJobProperties = AzureBackupClient.GetJobDetails(Vault.ResourceGroupName, Vault.Name, JobId);
AzureRMBackupJobDetails jobDetails = new AzureRMBackupJobDetails(Vault, serviceJobProperties.JobDetailedProperties, serviceJobProperties.Name);

WriteDebug(Resources.JobResponse);
Expand Down
Loading