Skip to content

Commit de25b84

Browse files
author
dragonfly91
committed
Handling Job instead of Getting Job
1 parent 593c5e2 commit de25b84

File tree

4 files changed

+16
-8
lines changed

4 files changed

+16
-8
lines changed

src/ResourceManager/RecoveryServices.Backup/Cmdlets/Item/EnableAzureRmRecoveryServicesProtection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public override void ExecuteCmdlet()
8383

8484
// Track Response and display job details
8585

86-
WriteObject(GetCreatedJob(itemResponse));
86+
HandleCreatedJob(itemResponse, Resources.EnableProtectionOperation);
8787
});
8888
}
8989
}

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/Properties/Resources.Designer.cs

Lines changed: 9 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/Properties/Resources.resx

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -365,4 +365,7 @@ Please contact Microsoft for further assistant.</value>
365365
<data name="OperationFailed" xml:space="preserve">
366366
<value>{0} failed. Error Code: {1}. Error Message: {2}</value>
367367
</data>
368+
<data name="TriggerBackupOperation" xml:space="preserve">
369+
<value>Trigger Backup Operation</value>
370+
</data>
368371
</root>

src/ResourceManager/RecoveryServices.Backup/RecoveryServicesBackupCmdletBase.cs

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -161,7 +161,7 @@ public BackUpOperationStatusResponse WaitForOperationCompletionUsingStatusLink(
161161
return response;
162162
}
163163

164-
protected AzureRmRecoveryServicesJobBase GetCreatedJob(BaseRecoveryServicesJobResponse itemResponse)
164+
protected void HandleCreatedJob(BaseRecoveryServicesJobResponse itemResponse, string operationName)
165165
{
166166
WriteDebug(Resources.TrackingOperationStatusURLForCompletion +
167167
itemResponse.AzureAsyncOperation);
@@ -172,26 +172,22 @@ protected AzureRmRecoveryServicesJobBase GetCreatedJob(BaseRecoveryServicesJobRe
172172

173173
WriteDebug(Resources.FinalOperationStatus + response.OperationStatus.Status);
174174

175-
AzureRmRecoveryServicesJobBase job = null;
176-
177175
if (response.OperationStatus.Properties != null &&
178176
((OperationStatusJobExtendedInfo)response.OperationStatus.Properties).JobId != null)
179177
{
180178
var jobStatusResponse = (OperationStatusJobExtendedInfo)response.OperationStatus.Properties;
181-
job = GetJobObject(jobStatusResponse.JobId);
179+
WriteObject(GetJobObject(jobStatusResponse.JobId));
182180
}
183181

184182
if (response.OperationStatus.Status == OperationStatusValues.Failed)
185183
{
186184
var errorMessage = string.Format(
187185
Resources.OperationFailed,
188-
Resources.EnableProtectionOperation,
186+
operationName,
189187
response.OperationStatus.OperationStatusError.Code,
190188
response.OperationStatus.OperationStatusError.Message);
191189
throw new Exception(errorMessage);
192190
}
193-
194-
return job;
195191
}
196192
}
197193
}

0 commit comments

Comments
 (0)