Fixing small issue in ps1 file

AditTulasi · AditTulasi · commit 018cbb782e34 · 2015-06-17T13:49:40.000+05:30
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/ScenarioTests/AzureBackupTests.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/ScenarioTests/AzureBackupTests.cs
@@ -51,7 +51,7 @@ public void StopAzureBackupJobTests()
         }
         public void GetRecoveryPointTests()
         {
-            this.RunPowerShellTest("GetAzureRecoveryPointTest");
+            this.RunPowerShellTest("Test-GetAzureRecoveryPoint");
         }
 
         [Fact]
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/ScenarioTests/AzureBackupTests.ps1 b/src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/ScenarioTests/AzureBackupTests.ps1
@@ -44,7 +44,7 @@ function Test-GetAzureBackupProtectionPolicyTests
 	}
 }
 
-function GetAzureRecoveryPointTest
+function Test-GetAzureRecoveryPoint
 {
     $azureBackUpItem = New-Object Microsoft.Azure.Commands.AzureBackup.Cmdlets.AzureBackupItem
 	$azureBackUpItem.ResourceGroupName = $ResourceGroupName
@@ -57,11 +57,12 @@ function GetAzureRecoveryPointTest
 	$recoveryPoints = Get-AzureBackupRecoveryPoint -item $azureBackUpItem
 	if (!($recoveryPoints -eq $null))
 	{
-	foreach($recoveryPoint in $recoveryPoints)
-	{
-	    Assert-NotNull $recoveryPoint.RecoveryPointTime 'RecoveryPointTime should not be null'
-		Assert-NotNull $recoveryPoint.RecoveryPointType 'RecoveryPointType should not be null'
-		Assert-NotNull $recoveryPoint.RecoveryPointId  'RecoveryPointId should not be null'
+		foreach($recoveryPoint in $recoveryPoints)
+		{
+			Assert-NotNull $recoveryPoint.RecoveryPointTime 'RecoveryPointTime should not be null'
+			Assert-NotNull $recoveryPoint.RecoveryPointType 'RecoveryPointType should not be null'
+			Assert-NotNull $recoveryPoint.RecoveryPointId  'RecoveryPointId should not be null'
+		}
 	}
 }
 
@@ -118,7 +119,6 @@ function Test-EnableDisableAzureBackupProtectionTest
 	sleep(20)
 	$jobId2 = Enable-AzureBackupProtection -item $azureBackUpItem -Policy $policy 
 }
-}
 
 function BackUpAzureBackUpItemTest
 {
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Jobs/GetAzureBackupJob.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Jobs/GetAzureBackupJob.cs
@@ -61,8 +61,7 @@ public override void ExecuteCmdlet()
         {
             if (Job != null)
             {
-                this.ResourceGroupName = Job.ResourceGroupName;
-                this.ResourceName = Job.ResourceName;
+                InitializeAzureBackupCmdlet(Job.ResourceGroupName, Job.ResourceName, Job.Location);
             }
 
             base.ExecuteCmdlet();
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Jobs/GetAzureBackupJobDetails.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Jobs/GetAzureBackupJobDetails.cs
@@ -39,19 +39,13 @@ public override void ExecuteCmdlet()
         {
             if (Job != null)
             {
-                this.ResourceGroupName = Job.ResourceGroupName;
-                this.ResourceName = Job.ResourceName;
+                InitializeAzureBackupCmdlet(Job.ResourceGroupName, Job.ResourceName, Job.Location);
             }
 
             base.ExecuteCmdlet();
 
             ExecutionBlock(() =>
             {
-                //if (Job != null && JobID != null)
-                //{
-                //    throw new Exception("Please use either JobID filter or Job filter but not both.");
-                //}
-
                 if (Job != null)
                 {
                     JobID = Job.InstanceId;
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Jobs/StopAzureBackukpJob.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Jobs/StopAzureBackukpJob.cs
@@ -45,37 +45,36 @@ public override void ExecuteCmdlet()
         {
             if (Job != null)
             {
-                this.ResourceGroupName = Job.ResourceGroupName;
-                this.ResourceName = Job.ResourceName;
+                InitializeAzureBackupCmdlet(Job.ResourceGroupName, Job.ResourceName, Job.Location);
             }
 
             base.ExecuteCmdlet();
 
             ExecutionBlock(() =>
             {
-                //if (JobID != null && Job != null)
-                //{
-                //    throw new Exception("Please use either JobID filter or Job filter but not both.");
-                //}
-
                 if (Job != null)
                 {
                     JobID = Job.InstanceId;
                 }
 
                 WriteDebug("JobID is: " + JobID);
-                Task<OperationResponse> cancelTask = AzureBackupClient.Job.StopAsync(JobID, GetCustomRequestHeaders(), CmdletCancellationToken);
+                OperationResponse cancelTask = AzureBackupClient.Job.StopAsync(JobID, GetCustomRequestHeaders(), CmdletCancellationToken).Result;
 
-                if (cancelTask.IsFaulted)
+                var opStatus = AzureBackupClient.OperationStatus.GetAsync(cancelTask.OperationId.ToString(), GetCustomRequestHeaders()).Result;
+                while (opStatus.OperationStatus != "Completed")
+                {
+                    WriteDebug("Waiting for the task to complete");
+                    opStatus = AzureBackupClient.OperationStatus.GetAsync(cancelTask.OperationId.ToString(), GetCustomRequestHeaders()).Result;
+                }
+                // TODO:
+                if (opStatus.OperationResult == "Failed")
                 {
-                    WriteObject(cancelTask.Exception);
+                    var errorRecord = new ErrorRecord(new Exception("Cannot cancel job."), opStatus.Message, ErrorCategory.InvalidOperation, null);
+                    WriteError(errorRecord);
                 }
                 else
                 {
-                    OperationResponse opResponse = cancelTask.Result;
-                    // TODO
-                    // Call and wait until this  completes.
-                    WriteDebug("OpID is : " + opResponse.OperationId);
+                    WriteDebug("Triggered cancellation of job with JobID: " + JobID);
                 }
             });
         }
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Jobs/WaitAzureBackupJob.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Jobs/WaitAzureBackupJob.cs
@@ -50,9 +50,7 @@ public override void ExecuteCmdlet()
                     WriteDebug("Type of input paramter is List<AzureBackupJob>");
                     foreach (AzureBackupJob jobToWait in ((Job as PSObject).ImmediateBaseObject as List<AzureBackupJob>))
                     {
-                        this.ResourceGroupName = jobToWait.ResourceGroupName;
-                        this.ResourceName = jobToWait.ResourceName;
-                        this.Location = jobToWait.Location;
+                        InitializeAzureBackupCmdlet(jobToWait.ResourceGroupName, jobToWait.ResourceName, jobToWait.Location);
 
                         specifiedJobs.Add(jobToWait.InstanceId);
                     }
diff --git a/src/ResourceManager/AzureBackup/Commands.AzureBackup/Properties/Resources.Designer.cs b/src/ResourceManager/AzureBackup/Commands.AzureBackup/Properties/Resources.Designer.cs

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,7 @@ public void StopAzureBackupJobTests()`
`51`	`51`	`}`
`52`	`52`	`public void GetRecoveryPointTests()`
`53`	`53`	`{`
`54`		`- this.RunPowerShellTest("GetAzureRecoveryPointTest");`
	`54`	`+ this.RunPowerShellTest("Test-GetAzureRecoveryPoint");`
`55`	`55`	`}`
`56`	`56`
`57`	`57`	`[Fact]`
Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,7 @@ function Test-GetAzureBackupProtectionPolicyTests`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`
`47`		`-function GetAzureRecoveryPointTest`
	`47`	`+function Test-GetAzureRecoveryPoint`
`48`	`48`	`{`
`49`	`49`	`$azureBackUpItem = New-Object Microsoft.Azure.Commands.AzureBackup.Cmdlets.AzureBackupItem`
`50`	`50`	`$azureBackUpItem.ResourceGroupName = $ResourceGroupName`
`@@ -57,11 +57,12 @@ function GetAzureRecoveryPointTest`
`57`	`57`	`$recoveryPoints = Get-AzureBackupRecoveryPoint -item $azureBackUpItem`
`58`	`58`	`if (!($recoveryPoints -eq $null))`
`59`	`59`	`{`
`60`		`- foreach($recoveryPoint in $recoveryPoints)`
`61`		`- {`
`62`		`- Assert-NotNull $recoveryPoint.RecoveryPointTime 'RecoveryPointTime should not be null'`
`63`		`- Assert-NotNull $recoveryPoint.RecoveryPointType 'RecoveryPointType should not be null'`
`64`		`- Assert-NotNull $recoveryPoint.RecoveryPointId 'RecoveryPointId should not be null'`
	`60`	`+ foreach($recoveryPoint in $recoveryPoints)`
	`61`	`+ {`
	`62`	`+ Assert-NotNull $recoveryPoint.RecoveryPointTime 'RecoveryPointTime should not be null'`
	`63`	`+ Assert-NotNull $recoveryPoint.RecoveryPointType 'RecoveryPointType should not be null'`
	`64`	`+ Assert-NotNull $recoveryPoint.RecoveryPointId 'RecoveryPointId should not be null'`
	`65`	`+ }`
`65`	`66`	`}`
`66`	`67`	`}`
`67`	`68`
`@@ -118,7 +119,6 @@ function Test-EnableDisableAzureBackupProtectionTest`
`118`	`119`	`sleep(20)`
`119`	`120`	`$jobId2 = Enable-AzureBackupProtection -item $azureBackUpItem -Policy $policy`
`120`	`121`	`}`
`121`		`-}`
`122`	`122`
`123`	`123`	`function BackUpAzureBackUpItemTest`
`124`	`124`	`{`
Original file line number	Diff line number	Diff line change
`@@ -61,8 +61,7 @@ public override void ExecuteCmdlet()`
`61`	`61`	`{`
`62`	`62`	`if (Job != null)`
`63`	`63`	`{`
`64`		`- this.ResourceGroupName = Job.ResourceGroupName;`
`65`		`- this.ResourceName = Job.ResourceName;`
	`64`	`+ InitializeAzureBackupCmdlet(Job.ResourceGroupName, Job.ResourceName, Job.Location);`
`66`	`65`	`}`
`67`	`66`
`68`	`67`	`base.ExecuteCmdlet();`
Original file line number	Diff line number	Diff line change
`@@ -39,19 +39,13 @@ public override void ExecuteCmdlet()`
`39`	`39`	`{`
`40`	`40`	`if (Job != null)`
`41`	`41`	`{`
`42`		`- this.ResourceGroupName = Job.ResourceGroupName;`
`43`		`- this.ResourceName = Job.ResourceName;`
	`42`	`+ InitializeAzureBackupCmdlet(Job.ResourceGroupName, Job.ResourceName, Job.Location);`
`44`	`43`	`}`
`45`	`44`
`46`	`45`	`base.ExecuteCmdlet();`
`47`	`46`
`48`	`47`	`ExecutionBlock(() =>`
`49`	`48`	`{`
`50`		`- //if (Job != null && JobID != null)`
`51`		`- //{`
`52`		`- // throw new Exception("Please use either JobID filter or Job filter but not both.");`
`53`		`- //}`
`54`		`-`
`55`	`49`	`if (Job != null)`
`56`	`50`	`{`
`57`	`51`	`JobID = Job.InstanceId;`
Original file line number	Diff line number	Diff line change
`@@ -45,37 +45,36 @@ public override void ExecuteCmdlet()`
`45`	`45`	`{`
`46`	`46`	`if (Job != null)`
`47`	`47`	`{`
`48`		`- this.ResourceGroupName = Job.ResourceGroupName;`
`49`		`- this.ResourceName = Job.ResourceName;`
	`48`	`+ InitializeAzureBackupCmdlet(Job.ResourceGroupName, Job.ResourceName, Job.Location);`
`50`	`49`	`}`
`51`	`50`
`52`	`51`	`base.ExecuteCmdlet();`
`53`	`52`
`54`	`53`	`ExecutionBlock(() =>`
`55`	`54`	`{`
`56`		`- //if (JobID != null && Job != null)`
`57`		`- //{`
`58`		`- // throw new Exception("Please use either JobID filter or Job filter but not both.");`
`59`		`- //}`
`60`		`-`
`61`	`55`	`if (Job != null)`
`62`	`56`	`{`
`63`	`57`	`JobID = Job.InstanceId;`
`64`	`58`	`}`
`65`	`59`
`66`	`60`	`WriteDebug("JobID is: " + JobID);`
`67`		`- Task<OperationResponse> cancelTask = AzureBackupClient.Job.StopAsync(JobID, GetCustomRequestHeaders(), CmdletCancellationToken);`
	`61`	`+ OperationResponse cancelTask = AzureBackupClient.Job.StopAsync(JobID, GetCustomRequestHeaders(), CmdletCancellationToken).Result;`
`68`	`62`
`69`		`- if (cancelTask.IsFaulted)`
	`63`	`+ var opStatus = AzureBackupClient.OperationStatus.GetAsync(cancelTask.OperationId.ToString(), GetCustomRequestHeaders()).Result;`
	`64`	`+ while (opStatus.OperationStatus != "Completed")`
	`65`	`+ {`
	`66`	`+ WriteDebug("Waiting for the task to complete");`
	`67`	`+ opStatus = AzureBackupClient.OperationStatus.GetAsync(cancelTask.OperationId.ToString(), GetCustomRequestHeaders()).Result;`
	`68`	`+ }`
	`69`	`+ // TODO:`
	`70`	`+ if (opStatus.OperationResult == "Failed")`
`70`	`71`	`{`
`71`		`- WriteObject(cancelTask.Exception);`
	`72`	`+ var errorRecord = new ErrorRecord(new Exception("Cannot cancel job."), opStatus.Message, ErrorCategory.InvalidOperation, null);`
	`73`	`+ WriteError(errorRecord);`
`72`	`74`	`}`
`73`	`75`	`else`
`74`	`76`	`{`
`75`		`- OperationResponse opResponse = cancelTask.Result;`
`76`		`- // TODO`
`77`		`- // Call and wait until this completes.`
`78`		`- WriteDebug("OpID is : " + opResponse.OperationId);`
	`77`	`+ WriteDebug("Triggered cancellation of job with JobID: " + JobID);`
`79`	`78`	`}`
`80`	`79`	`});`
`81`	`80`	`}`
Original file line number	Diff line number	Diff line change
`@@ -50,9 +50,7 @@ public override void ExecuteCmdlet()`
`50`	`50`	`WriteDebug("Type of input paramter is List<AzureBackupJob>");`
`51`	`51`	`foreach (AzureBackupJob jobToWait in ((Job as PSObject).ImmediateBaseObject as List<AzureBackupJob>))`
`52`	`52`	`{`
`53`		`- this.ResourceGroupName = jobToWait.ResourceGroupName;`
`54`		`- this.ResourceName = jobToWait.ResourceName;`
`55`		`- this.Location = jobToWait.Location;`
	`53`	`+ InitializeAzureBackupCmdlet(jobToWait.ResourceGroupName, jobToWait.ResourceName, jobToWait.Location);`
`56`	`54`
`57`	`55`	`specifiedJobs.Add(jobToWait.InstanceId);`
`58`	`56`	`}`