Merge pull request #42 from AsrOneSdk/sanjkuma-dev

NehaRaje · NehaRaje · commit 8bb31e392846 · 2015-02-09T15:22:47.000+05:30
Use WriteWarning instead of WriteDebug.
diff --git a/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices.Test/ScenarioTests/RecoveryServicesTests.ps1 b/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices.Test/ScenarioTests/RecoveryServicesTests.ps1
@@ -72,15 +72,15 @@ function Test-E2E_DeleteAndDissociate
                     {
                         if ($association.AssociationStatus -eq "Paired")
                         {
-                            // We have got the paired profile. Fire delete and dissociate
+                            # We have got the paired profile. Fire delete and dissociate
                             $pcPri = Get-AzureSiteRecoveryProtectionContainer -Id $association.PrimaryProtectionContainerId
                             $pcRec = Get-AzureSiteRecoveryProtectionContainer -Id $association.RecoveryProtectionContainerId
                             $job = Start-AzureSiteRecoveryProtectionProfileDissociationJob -PrimaryProtectionContainer $pcPri -RecoveryProtectionContainer $pcRec -ProtectionProfile $profile
 
 							# Validate_ProfileDissociation_JobSucceeded
 							if ($Validate_ProfileDissociation_JobSucceeded -eq $true)
 							{
-								WaitForJobCompletion -JobId $job.ID
+								WaitForJobCompletion -JobId $job.ID -NumOfSecondsToWait 600
                                 $job = Get-AzureSiteRecoveryJob -Id $job.ID
 								Assert-True { $job.State -eq "Succeeded" }
 							}
@@ -134,7 +134,7 @@ function Test-E2E_CreateAndAssociate
 			# Validate_ProfileAssociation_JobSucceeded
 			if ($Validate_ProfileAssociation_JobSucceeded -eq $true)
 			{
-				WaitForJobCompletion -JobId $job.ID
+				WaitForJobCompletion -JobId $job.ID -NumOfSecondsToWait 600
                 $job = Get-AzureSiteRecoveryJob -Id $job.ID
 				Assert-True { $job.State -eq "Succeeded" }
 			}
diff --git a/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/RecoveryServicesCmdletBase.cs b/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/RecoveryServicesCmdletBase.cs
@@ -180,9 +180,10 @@ protected void ValidateUsageById(string replicationProvider, string paramName)
             }
             else
             {
-                this.WriteDebugWithTimestamp(
+                this.WriteWarningWithTimestamp(
+                    string.Format(
                     Properties.Resources.IDBasedParamUsageNotSupportedFromNextRelease,
-                    paramName);
+                    paramName));
             }
         }
 
diff --git a/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Service/SetAzureSiteRecoveryProtectionEntity.cs b/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Service/SetAzureSiteRecoveryProtectionEntity.cs
@@ -187,9 +187,10 @@ public override void ExecuteCmdlet()
                                 }
                                 else
                                 {
-                                    this.WriteDebugWithTimestamp(
+                                    this.WriteWarningWithTimestamp(
+                                        string.Format(
                                         Properties.Resources.MandatoryParamFromNextRelease,
-                                        "ProtectionProfile");
+                                        "ProtectionProfile"));
                                     string pcId = this.ProtectionContainerId ?? this.ProtectionEntity.ProtectionContainerId;
                                     var pc = RecoveryServicesClient.GetAzureSiteRecoveryProtectionContainer(
                                         pcId);
diff --git a/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Service/StartAzureSiteRecoveryCommitFailoverJob.cs b/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Service/StartAzureSiteRecoveryCommitFailoverJob.cs
@@ -95,9 +95,10 @@ public override void ExecuteCmdlet()
             {
                 if (string.IsNullOrEmpty(this.Direction))
                 {
-                    this.WriteDebugWithTimestamp(
-                        Properties.Resources.MandatoryParamFromNextRelease,
-                        Constants.Direction);
+                    this.WriteWarningWithTimestamp(
+                        string.Format(
+                            Properties.Resources.MandatoryParamFromNextRelease,
+                            Constants.Direction));
                 }
 
                 switch (this.ParameterSetName)
diff --git a/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Service/StartAzureSiteRecoveryTestFailoverJob.cs b/src/ServiceManagement/RecoveryServices/Commands.RecoveryServices/Service/StartAzureSiteRecoveryTestFailoverJob.cs
@@ -156,16 +156,18 @@ public override void ExecuteCmdlet()
             {
                 if (this.NetworkType == null)
                 {
-                    this.WriteDebugWithTimestamp(
-                        Properties.Resources.MandatoryParamFromNextRelease,
-                        Constants.NetworkType);
+                    this.WriteWarningWithTimestamp(
+                        string.Format(
+                            Properties.Resources.MandatoryParamFromNextRelease,
+                            Constants.NetworkType));
                 }
 
                 if (this.VmNetworkId != null)
                 {
-                    this.WriteDebugWithTimestamp(
-                        Properties.Resources.IDBasedParamUsageNotSupportedFromNextRelease,
-                        "VmNetworkId");
+                    this.WriteWarningWithTimestamp(
+                        string.Format(
+                            Properties.Resources.IDBasedParamUsageNotSupportedFromNextRelease,
+                            "VmNetworkId"));
                 }
 
                 if (this.NetworkType == Constants.Existing && (this.Network == null && this.VmNetworkId == null))

Original file line number	Diff line number	Diff line change
`@@ -72,15 +72,15 @@ function Test-E2E_DeleteAndDissociate`
`72`	`72`	`{`
`73`	`73`	`if ($association.AssociationStatus -eq "Paired")`
`74`	`74`	`{`
`75`		`- // We have got the paired profile. Fire delete and dissociate`
	`75`	`+ # We have got the paired profile. Fire delete and dissociate`
`76`	`76`	`$pcPri = Get-AzureSiteRecoveryProtectionContainer -Id $association.PrimaryProtectionContainerId`
`77`	`77`	`$pcRec = Get-AzureSiteRecoveryProtectionContainer -Id $association.RecoveryProtectionContainerId`
`78`	`78`	`$job = Start-AzureSiteRecoveryProtectionProfileDissociationJob -PrimaryProtectionContainer $pcPri -RecoveryProtectionContainer $pcRec -ProtectionProfile $profile`
`79`	`79`
`80`	`80`	`# Validate_ProfileDissociation_JobSucceeded`
`81`	`81`	`if ($Validate_ProfileDissociation_JobSucceeded -eq $true)`
`82`	`82`	`{`
`83`		`- WaitForJobCompletion -JobId $job.ID`
	`83`	`+ WaitForJobCompletion -JobId $job.ID -NumOfSecondsToWait 600`
`84`	`84`	`$job = Get-AzureSiteRecoveryJob -Id $job.ID`
`85`	`85`	`Assert-True { $job.State -eq "Succeeded" }`
`86`	`86`	`}`
`@@ -134,7 +134,7 @@ function Test-E2E_CreateAndAssociate`
`134`	`134`	`# Validate_ProfileAssociation_JobSucceeded`
`135`	`135`	`if ($Validate_ProfileAssociation_JobSucceeded -eq $true)`
`136`	`136`	`{`
`137`		`- WaitForJobCompletion -JobId $job.ID`
	`137`	`+ WaitForJobCompletion -JobId $job.ID -NumOfSecondsToWait 600`
`138`	`138`	`$job = Get-AzureSiteRecoveryJob -Id $job.ID`
`139`	`139`	`Assert-True { $job.State -eq "Succeeded" }`
`140`	`140`	`}`
Original file line number	Diff line number	Diff line change
`@@ -180,9 +180,10 @@ protected void ValidateUsageById(string replicationProvider, string paramName)`
`180`	`180`	`}`
`181`	`181`	`else`
`182`	`182`	`{`
`183`		`- this.WriteDebugWithTimestamp(`
	`183`	`+ this.WriteWarningWithTimestamp(`
	`184`	`+ string.Format(`
`184`	`185`	`Properties.Resources.IDBasedParamUsageNotSupportedFromNextRelease,`
`185`		`- paramName);`
	`186`	`+ paramName));`
`186`	`187`	`}`
`187`	`188`	`}`
`188`	`189`
Original file line number	Diff line number	Diff line change
`@@ -187,9 +187,10 @@ public override void ExecuteCmdlet()`
`187`	`187`	`}`
`188`	`188`	`else`
`189`	`189`	`{`
`190`		`- this.WriteDebugWithTimestamp(`
	`190`	`+ this.WriteWarningWithTimestamp(`
	`191`	`+ string.Format(`
`191`	`192`	`Properties.Resources.MandatoryParamFromNextRelease,`
`192`		`- "ProtectionProfile");`
	`193`	`+ "ProtectionProfile"));`
`193`	`194`	`string pcId = this.ProtectionContainerId ?? this.ProtectionEntity.ProtectionContainerId;`
`194`	`195`	`var pc = RecoveryServicesClient.GetAzureSiteRecoveryProtectionContainer(`
`195`	`196`	`pcId);`
Original file line number	Diff line number	Diff line change
`@@ -95,9 +95,10 @@ public override void ExecuteCmdlet()`
`95`	`95`	`{`
`96`	`96`	`if (string.IsNullOrEmpty(this.Direction))`
`97`	`97`	`{`
`98`		`- this.WriteDebugWithTimestamp(`
`99`		`- Properties.Resources.MandatoryParamFromNextRelease,`
`100`		`- Constants.Direction);`
	`98`	`+ this.WriteWarningWithTimestamp(`
	`99`	`+ string.Format(`
	`100`	`+ Properties.Resources.MandatoryParamFromNextRelease,`
	`101`	`+ Constants.Direction));`
`101`	`102`	`}`
`102`	`103`
`103`	`104`	`switch (this.ParameterSetName)`
Original file line number	Diff line number	Diff line change
`@@ -156,16 +156,18 @@ public override void ExecuteCmdlet()`
`156`	`156`	`{`
`157`	`157`	`if (this.NetworkType == null)`
`158`	`158`	`{`
`159`		`- this.WriteDebugWithTimestamp(`
`160`		`- Properties.Resources.MandatoryParamFromNextRelease,`
`161`		`- Constants.NetworkType);`
	`159`	`+ this.WriteWarningWithTimestamp(`
	`160`	`+ string.Format(`
	`161`	`+ Properties.Resources.MandatoryParamFromNextRelease,`
	`162`	`+ Constants.NetworkType));`
`162`	`163`	`}`
`163`	`164`
`164`	`165`	`if (this.VmNetworkId != null)`
`165`	`166`	`{`
`166`		`- this.WriteDebugWithTimestamp(`
`167`		`- Properties.Resources.IDBasedParamUsageNotSupportedFromNextRelease,`
`168`		`- "VmNetworkId");`
	`167`	`+ this.WriteWarningWithTimestamp(`
	`168`	`+ string.Format(`
	`169`	`+ Properties.Resources.IDBasedParamUsageNotSupportedFromNextRelease,`
	`170`	`+ "VmNetworkId"));`
`169`	`171`	`}`
`170`	`172`
`171`	`173`	`if (this.NetworkType == Constants.Existing && (this.Network == null && this.VmNetworkId == null))`