Skip to content

Commit d62b592

Browse files
author
dragonfly91
committed
Merge branch 'dev1' of https://github.com/MabOneSdk/azure-powershell into dev1
2 parents c0a3996 + 14339b3 commit d62b592

File tree

8 files changed

+25
-473
lines changed

8 files changed

+25
-473
lines changed

‎src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/ScenarioTests/AzureBackupScenarioTests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ function Test-AzureBackupEndToEnd
6969
Assert-AreEqual $item.DataSourceStatus "IRPending";
7070
Assert-AreEqual $item.ProtectionPolicyName $ProtectionPolicyName;
7171
Assert-AreEqual $item.ContainerType "AzureVM";
72-
Assert-AreEqual $item.Type "IaasVM";
72+
Assert-NotNull $item.Type;
7373
Assert-AreEqual $item.ItemName.Contains("iaasvmcontainer") "True";
7474
Assert-AreEqual $item.ItemName.Contains($VirtualMachineName) "True";
7575
Assert-AreEqual $item.ResourceGroupName $ResourceGroupName;

‎src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/SessionRecords/Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupItemTestCases/ListAzureBackupItemTests.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
"Microsoft.Azure.Management.BackupServices.BackupServicesManagementClient/0.0.0.0"
1717
]
1818
},
19-
"ResponseBody": "{\r\n \"value\": [],\r\n \"nextLink\": null\r\n}",
19+
"ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"properties\": {\r\n \"protectionStatus\": \"Protected\",\r\n \"protectionPolicyId\": \"/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/registeredContainers/iaasvmcontainer;hydrarecordvm;hydrarecordvm/protectedItems/e2epolicy1\",\r\n \"policyInconsistent\": true,\r\n \"recoveryPointsCount\": 1,\r\n \"lastRecoveryPoint\": \"2015-08-17T05:52:42.1219964Z\",\r\n \"lastBackupTime\": \"2015-08-17T05:50:43.7344613Z\",\r\n \"lastBackupStatus\": \"Completed\",\r\n \"lastBackupJobId\": \"bddc4349-d0b9-4ff0-9951-cba389d3a246\",\r\n \"friendlyName\": \"hydrarecordvm\",\r\n \"itemType\": \"IaasVM\",\r\n \"status\": \"Protected\",\r\n \"containerId\": \"/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/registeredContainers/iaasvmcontainer;hydrarecordvm;hydrarecordvm/protectedItems/iaasvmcontainer;hydrarecordvm;hydrarecordvm\"\r\n },\r\n \"id\": \"/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/registeredContainers/iaasvmcontainer;hydrarecordvm;hydrarecordvm/protectedItems/iaasvmcontainer;hydrarecordvm;hydrarecordvm\",\r\n \"name\": \"iaasvmcontainer;hydrarecordvm;hydrarecordvm\",\r\n \"type\": \"Microsoft.Backup/BackupVault/registeredContainers/protectedItems\"\r\n }\r\n ],\r\n \"nextLink\": null\r\n}",
2020
"ResponseHeaders": {
2121
"Content-Length": [
2222
"28"
@@ -80,7 +80,7 @@
8080
"Microsoft.Azure.Management.BackupServices.BackupServicesManagementClient/0.0.0.0"
8181
]
8282
},
83-
"ResponseBody": "{\r\n \"value\": [],\r\n \"nextLink\": null\r\n}",
83+
"ResponseBody": "{\r\n \"value\": [\r\n {\r\n \"properties\": {\r\n \"friendlyName\": \"hydrarecordvm\",\r\n \"itemType\": \"IaasVM\",\r\n \"status\": \"Protected\",\r\n \"containerId\": \"/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/registeredContainers/iaasvmcontainer;hydrarecordvm;hydrarecordvm/items/iaasvmcontainer;hydrarecordvm;hydrarecordvm\"\r\n },\r\n \"id\": \"/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/registeredContainers/iaasvmcontainer;hydrarecordvm;hydrarecordvm/items/iaasvmcontainer;hydrarecordvm;hydrarecordvm\",\r\n \"name\": \"iaasvmcontainer;hydrarecordvm;hydrarecordvm\",\r\n \"type\": \"Microsoft.Backup/BackupVault/registeredContainers/items\"\r\n }\r\n ],\r\n \"nextLink\": null\r\n}",
8484
"ResponseHeaders": {
8585
"Content-Length": [
8686
"28"

‎src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/SessionRecords/Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupJobTests/StopAzureRMBackupJobTests.json

Lines changed: 0 additions & 448 deletions
Large diffs are not rendered by default.

‎src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/ProtectionPolicy/NewAzureRMBackupProtectionPolicy.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,6 @@ public override void ExecuteCmdlet()
7777

7878
ProtectionPolicyHelpers.ValidateRetentionPolicy(RetentionPolicy, backupSchedule);
7979

80-
AzureRMBackupProtectionPolicy protectionPolicy = new AzureRMBackupProtectionPolicy();
81-
8280
var addCSMProtectionPolicyRequest = new CSMAddProtectionPolicyRequest();
8381
addCSMProtectionPolicyRequest.PolicyName = this.Name;
8482
addCSMProtectionPolicyRequest.Properties = new CSMAddProtectionPolicyRequestProperties();

‎src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/ProtectionPolicy/NewAzureRMBackupRetentionPolicyObject.cs

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -86,22 +86,22 @@ public override void ExecuteCmdlet()
8686
base.ExecuteCmdlet();
8787
if (DailyRetention != false)
8888
{
89-
AzureRMBackupRetentionPolicy retentionPolicy = new AzureBackupDailyRetentionPolicy("Daily", Retention);
89+
AzureRMBackupRetentionPolicy retentionPolicy = new AzureBackupDailyRetentionPolicy(RetentionType.Daily.ToString(), Retention);
9090
ProtectionPolicyHelpers.ValidateRetentionPolicy(new List<AzureRMBackupRetentionPolicy> { retentionPolicy });
9191
WriteObject(retentionPolicy);
9292
}
9393

9494
if (WeeklyRetention != false)
9595
{
9696
List<DayOfWeek> daysofWeekList = ConvertDaysOfWeek(DaysOfWeek);
97-
AzureRMBackupRetentionPolicy retentionPolicy = new AzureBackupWeeklyRetentionPolicy("Weekly", Retention, daysofWeekList);
97+
AzureRMBackupRetentionPolicy retentionPolicy = new AzureBackupWeeklyRetentionPolicy(RetentionType.Weekly.ToString(), Retention, daysofWeekList);
9898
ProtectionPolicyHelpers.ValidateRetentionPolicy(new List<AzureRMBackupRetentionPolicy> { retentionPolicy });
9999
WriteObject(retentionPolicy);
100100
}
101101

102102
if (MonthlyRetentionInDailyFormat != false)
103103
{
104-
AzureRMBackupRetentionPolicy retentionPolicy = new AzureBackupMonthlyRetentionPolicy("Monthly", Retention, RetentionFormat.Daily, DaysOfMonth,
104+
AzureRMBackupRetentionPolicy retentionPolicy = new AzureBackupMonthlyRetentionPolicy(RetentionType.Monthly.ToString(), Retention, RetentionFormat.Daily, DaysOfMonth,
105105
null, null);
106106
ProtectionPolicyHelpers.ValidateRetentionPolicy(new List<AzureRMBackupRetentionPolicy> { retentionPolicy });
107107
WriteObject(retentionPolicy);
@@ -111,7 +111,7 @@ public override void ExecuteCmdlet()
111111
{
112112
List<DayOfWeek> daysofWeekList = ConvertDaysOfWeek(DaysOfWeek);
113113
List<WeekNumber> weekNumbers = ConvertWeekNumbers(WeekNumber);
114-
AzureRMBackupRetentionPolicy retentionPolicy = new AzureBackupMonthlyRetentionPolicy("Monthly", Retention, RetentionFormat.Weekly, DaysOfMonth,
114+
AzureRMBackupRetentionPolicy retentionPolicy = new AzureBackupMonthlyRetentionPolicy(RetentionType.Monthly.ToString(), Retention, RetentionFormat.Weekly, DaysOfMonth,
115115
weekNumbers, daysofWeekList);
116116

117117
ProtectionPolicyHelpers.ValidateRetentionPolicy(new List<AzureRMBackupRetentionPolicy> { retentionPolicy });
@@ -122,7 +122,7 @@ public override void ExecuteCmdlet()
122122
if (YearlyRetentionInDailyFormat != false)
123123
{
124124
List<Month> monthsOfYear = ConvertMonthsOfYear(MonthsOfYear);
125-
AzureRMBackupRetentionPolicy retentionPolicy = new AzureBackupYearlyRetentionPolicy("Yearly", Retention, monthsOfYear, RetentionFormat.Daily,
125+
AzureRMBackupRetentionPolicy retentionPolicy = new AzureBackupYearlyRetentionPolicy(RetentionType.Yearly.ToString(), Retention, monthsOfYear, RetentionFormat.Daily,
126126
DaysOfMonth, null, null);
127127

128128
ProtectionPolicyHelpers.ValidateRetentionPolicy(new List<AzureRMBackupRetentionPolicy> { retentionPolicy });
@@ -135,7 +135,7 @@ public override void ExecuteCmdlet()
135135
List<DayOfWeek> daysofWeekList = ConvertDaysOfWeek(DaysOfWeek);
136136
List<WeekNumber> weekNumbers = ConvertWeekNumbers(WeekNumber);
137137
List<Month> monthsOfYear = ConvertMonthsOfYear(MonthsOfYear);
138-
AzureRMBackupRetentionPolicy retentionPolicy = new AzureBackupYearlyRetentionPolicy("Yearly", Retention, monthsOfYear,
138+
AzureRMBackupRetentionPolicy retentionPolicy = new AzureBackupYearlyRetentionPolicy(RetentionType.Yearly.ToString(), Retention, monthsOfYear,
139139
RetentionFormat.Weekly, DaysOfMonth, weekNumbers, daysofWeekList);
140140

141141
ProtectionPolicyHelpers.ValidateRetentionPolicy(new List<AzureRMBackupRetentionPolicy> { retentionPolicy });
@@ -145,7 +145,7 @@ public override void ExecuteCmdlet()
145145
});
146146
}
147147

148-
public List<DayOfWeek> ConvertDaysOfWeek(string[] daysOfWeek)
148+
private List<DayOfWeek> ConvertDaysOfWeek(string[] daysOfWeek)
149149
{
150150
List<DayOfWeek> ListofWeekDays = new List<DayOfWeek>();
151151

@@ -161,7 +161,7 @@ public List<DayOfWeek> ConvertDaysOfWeek(string[] daysOfWeek)
161161
return ListofWeekDays;
162162
}
163163

164-
public List<WeekNumber> ConvertWeekNumbers(string[] weekNumbers)
164+
private List<WeekNumber> ConvertWeekNumbers(string[] weekNumbers)
165165
{
166166
List<WeekNumber> ListofWeekNumbers = new List<WeekNumber>();
167167

@@ -177,7 +177,7 @@ public List<WeekNumber> ConvertWeekNumbers(string[] weekNumbers)
177177
return ListofWeekNumbers;
178178
}
179179

180-
public List<Month> ConvertMonthsOfYear(string[] monthsOfYear)
180+
private List<Month> ConvertMonthsOfYear(string[] monthsOfYear)
181181
{
182182
List<Month> ListofMonthsOfYear = new List<Month>();
183183

‎src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/ProtectionPolicy/RemoveAzureRMBackupProtectionPolicy.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,11 +40,12 @@ public override void ExecuteCmdlet()
4040
if (policyInfo != null)
4141
{
4242
AzureBackupClient.DeleteProtectionPolicy(ProtectionPolicy.ResourceGroupName, ProtectionPolicy.ResourceName, policyInfo.Name);
43-
WriteVerbose("Successfully deleted policy");
43+
WriteDebug("Successfully deleted policy");
4444
}
4545
else
4646
{
47-
WriteVerbose("Policy Not Found");
47+
var exception = new ArgumentException(string.Format("Protection Policy {0} not found.", policyInfo.Name));
48+
throw exception;
4849
}
4950
});
5051
}

‎src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/ProtectionPolicy/SetAzureRMBackupProtectionPolicy.cs

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ namespace Microsoft.Azure.Commands.AzureBackup.Cmdlets
2727
/// <summary>
2828
/// Update existing protection policy
2929
/// </summary>
30-
[Cmdlet(VerbsCommon.Set, "AzureRMBackupProtectionPolicy", DefaultParameterSetName = NoScheduleParamSet), OutputType(typeof(AzureRMBackupProtectionPolicy))]
30+
[Cmdlet(VerbsCommon.Set, "AzureRMBackupProtectionPolicy", DefaultParameterSetName = NoScheduleParamSet), OutputType(typeof(AzureRMBackupJob), typeof(IList<AzureRMBackupJob>))]
3131
public class SetAzureRMBackupProtectionPolicy : AzureBackupPolicyCmdletBase
3232
{
3333
protected const string WeeklyScheduleParamSet = "WeeklyScheduleParamSet";
@@ -71,7 +71,6 @@ public override void ExecuteCmdlet()
7171
throw new ArgumentException(String.Format("Protection policy {0} not found", ProtectionPolicy.Name));
7272
}
7373

74-
// TODO: Make the below function work with AzureBackupProtectionPolicy
7574
FillRemainingValuesForSetPolicyRequest(policyInfo, this.NewName);
7675

7776
var backupSchedule = ProtectionPolicyHelpers.FillCSMBackupSchedule(policyInfo.ScheduleType, BackupTime,
@@ -83,7 +82,6 @@ public override void ExecuteCmdlet()
8382
updateProtectionPolicyRequest.Properties.PolicyName = this.NewName;
8483
updateProtectionPolicyRequest.Properties.BackupSchedule = backupSchedule;
8584

86-
AzureRMBackupProtectionPolicy protectionPolicy = new AzureRMBackupProtectionPolicy();
8785
if (RetentionPolicy != null && RetentionPolicy.Length > 0)
8886
{
8987
updateProtectionPolicyRequest.Properties.LtrRetentionPolicy =
@@ -101,9 +99,12 @@ public override void ExecuteCmdlet()
10199

102100
if (operationId != Guid.Empty)
103101
{
104-
var operationStatus = GetOperationStatus(ProtectionPolicy.ResourceGroupName, ProtectionPolicy.ResourceName, operationId);
102+
string resourceGroupName = ProtectionPolicy.ResourceGroupName;
103+
string resourceName = ProtectionPolicy.ResourceName;
104+
var operationStatus = GetOperationStatus(resourceGroupName, resourceName, operationId);
105105
WriteDebug("Protection Policy successfully updated and created job(s) to re-configure protection on associated items");
106-
WriteObject(operationStatus.JobList);
106+
107+
WriteObject(GetCreatedJobs(resourceGroupName, resourceName, vault, operationStatus.JobList));
107108
}
108109

109110
else

‎src/ResourceManager/AzureBackup/Commands.AzureBackup/Helpers/ProtectionPolicyHelpers.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -155,13 +155,13 @@ public static void ValidateRetentionPolicy(IList<AzureRMBackupRetentionPolicy> r
155155

156156
foreach (AzureRMBackupRetentionPolicy retentionPolicy in retentionPolicyList)
157157
{
158-
if(retentionPolicy.RetentionType == "Daily")
158+
if(retentionPolicy.RetentionType == RetentionType.Daily.ToString())
159159
{
160160
ValidateDailyRetention((AzureBackupDailyRetentionPolicy)retentionPolicy);
161161
validateDailyRetention = true;
162162
dailyRetentionPolicyCount = dailyRetentionPolicyCount + 1;
163163
}
164-
else if (retentionPolicy.RetentionType == "Weekly")
164+
else if (retentionPolicy.RetentionType == RetentionType.Weekly.ToString())
165165
{
166166
ValidateWeeklyRetention((AzureBackupWeeklyRetentionPolicy)retentionPolicy);
167167
validateWeeklyRetention = true;
@@ -172,7 +172,7 @@ public static void ValidateRetentionPolicy(IList<AzureRMBackupRetentionPolicy> r
172172
}
173173
weeklyRetentionPolicyCount = weeklyRetentionPolicyCount + 1;
174174
}
175-
else if (retentionPolicy.RetentionType == "Monthly")
175+
else if (retentionPolicy.RetentionType == RetentionType.Monthly.ToString())
176176
{
177177
ValidateMonthlyRetention((AzureBackupMonthlyRetentionPolicy)retentionPolicy);
178178
if (backupSchedule != null)
@@ -182,7 +182,7 @@ public static void ValidateRetentionPolicy(IList<AzureRMBackupRetentionPolicy> r
182182
}
183183
monthlyRetentionPolicyCount = monthlyRetentionPolicyCount + 1;
184184
}
185-
else if (retentionPolicy.RetentionType == "Yearly")
185+
else if (retentionPolicy.RetentionType == RetentionType.Yearly.ToString())
186186
{
187187
ValidateYearlyRetention((AzureBackupYearlyRetentionPolicy)retentionPolicy);
188188
if (backupSchedule != null)

0 commit comments

Comments
 (0)