Modify ServiceManagementBaseCmdlet

huangpf · huangpf · commit 6e65540ec84c · 2015-07-01T16:30:43.000-07:00
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/BaseAzureServiceExtensionCmdlet.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/Extensions/Common/BaseAzureServiceExtensionCmdlet.cs
@@ -280,7 +280,7 @@ protected DeploymentGetResponse GetDeployment(string slot)
                 {
                     if (ex.Response.StatusCode != HttpStatusCode.NotFound && IsVerbose() == false)
                     {
-                        this.WriteExceptionDetails(ex);
+                        WriteExceptionError(ex);
                     }
                 }
             });
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/HostedServices/GetAzureRole.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/HostedServices/GetAzureRole.cs
@@ -163,7 +163,7 @@ private DeploymentGetResponse GetCurrentDeployment(out OperationStatusResponse o
 
             DeploymentGetResponse deploymentGetResponse = null;
             InvokeInOperationContext(() => deploymentGetResponse = this.ComputeClient.Deployments.GetBySlot(this.ServiceName, slot));
-            operation = GetOperationNewSM(deploymentGetResponse.RequestId);
+            operation = GetOperation(deploymentGetResponse.RequestId);
 
             WriteVerboseWithTimestamp(Resources.GetDeploymentCompletedOperation);
 
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/HostedServices/NewAzureDeployment.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/HostedServices/NewAzureDeployment.cs
@@ -170,7 +170,7 @@ public virtual void NewPaaSDeploymentProcess()
                     {
                         if (ex.Response.StatusCode != HttpStatusCode.NotFound && IsVerbose() == false)
                         {
-                            this.WriteExceptionDetails(ex);
+                            WriteExceptionError(ex);
                         }
                     }
 
@@ -225,7 +225,7 @@ public virtual void NewPaaSDeploymentProcess()
                 }
                 catch (CloudException ex)
                 {
-                    this.WriteExceptionDetails(ex);
+                    WriteExceptionError(ex);
                 }
             });
         }
@@ -249,7 +249,7 @@ private void AssertNoPersistenVmRoleExistsInDeployment(string slot)
                 {
                     if (ex.Response.StatusCode != HttpStatusCode.NotFound && IsVerbose() == false)
                     {
-                        this.WriteExceptionDetails(ex);
+                        WriteExceptionError(ex);
                     }
                 }
             });
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/HostedServices/SetAzureDeployment.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/HostedServices/SetAzureDeployment.cs
@@ -175,7 +175,7 @@ public void ExecuteCommand()
                     {
                         if (ex.Response.StatusCode != HttpStatusCode.NotFound && IsVerbose() == false)
                         {
-                            this.WriteExceptionDetails(ex);
+                            WriteExceptionError(ex);
                         }
                     }
 
@@ -263,7 +263,7 @@ public void ExecuteCommand()
                     }
                     catch (CloudException ex)
                     {
-                        this.WriteExceptionDetails(ex);
+                        WriteExceptionError(ex);
                     }
                 });
             }
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/HostedServices/SetAzureRole.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/HostedServices/SetAzureRole.cs
@@ -110,7 +110,7 @@ private DeploymentGetResponse GetCurrentDeployment(out OperationStatusResponse o
 
             WriteVerboseWithTimestamp(Resources.GetDeploymentBeginOperation);
             DeploymentGetResponse deploymentGetResponse = this.ComputeClient.Deployments.GetBySlot(this.ServiceName, slot);
-            operation = GetOperationNewSM(deploymentGetResponse.RequestId);
+            operation = GetOperation(deploymentGetResponse.RequestId);
             WriteVerboseWithTimestamp(Resources.GetDeploymentCompletedOperation);
 
             return deploymentGetResponse;
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/DSC/GetAzureVMDscExtensionStatus.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/DSC/GetAzureVMDscExtensionStatus.cs
@@ -150,7 +150,7 @@ internal void GetCurrentDeployment()
                         return;
                     
                     CurrentDeploymentNewSM = ComputeClient.Deployments.GetBySlot(Service, NSM.DeploymentSlot.Production);
-                    GetDeploymentOperationNewSM = GetOperationNewSM(CurrentDeploymentNewSM.RequestId);
+                    GetDeploymentOperationNewSM = GetOperation(CurrentDeploymentNewSM.RequestId);
                     WriteVerboseWithTimestamp(Resources.GetDeploymentCompletedOperation);
                 }
                 catch (CloudException ex)
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/IaaSDeploymentManagementCmdletBase.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/IaaSDeploymentManagementCmdletBase.cs
@@ -68,7 +68,7 @@ protected virtual void ExecuteCommand()
                     try
                     {
                         CurrentDeploymentNewSM = this.ComputeClient.Deployments.GetBySlot(this.ServiceName, DeploymentSlot.Production);
-                        GetDeploymentOperationNewSM = GetOperationNewSM(CurrentDeploymentNewSM.RequestId);
+                        GetDeploymentOperationNewSM = GetOperation(CurrentDeploymentNewSM.RequestId);
                         WriteVerboseWithTimestamp(Resources.GetDeploymentCompletedOperation);
                     }
                     catch (CloudException ex)
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Network/GetAzureVNetConfig.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Network/GetAzureVNetConfig.cs
@@ -48,7 +48,7 @@ public VirtualNetworkConfigContext GetVirtualNetworkConfigProcess()
                     WriteVerboseWithTimestamp(string.Format(Resources.AzureVNetConfigBeginOperation, CommandRuntime.ToString()));
 
                     var netcfg = this.NetworkClient.Networks.GetConfiguration();
-                    var operation = GetOperationNewSM(netcfg.RequestId);
+                    var operation = GetOperation(netcfg.RequestId);
 
                     WriteVerboseWithTimestamp(string.Format(Resources.AzureVNetConfigCompletedOperation, CommandRuntime.ToString()));
 
@@ -81,7 +81,7 @@ public VirtualNetworkConfigContext GetVirtualNetworkConfigProcess()
                     }
                     else
                     {
-                        this.WriteExceptionDetails(ex);
+                        WriteExceptionError(ex);
                     }
                 }
             });
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Network/GetAzureVNetSite.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Network/GetAzureVNetSite.cs
@@ -60,7 +60,7 @@ public IEnumerable<VirtualNetworkSiteContext> GetVirtualNetworkSiteProcess()
                         }
                     }
 
-                    var operation = GetOperationNewSM(response.RequestId);
+                    var operation = GetOperation(response.RequestId);
                     WriteVerboseWithTimestamp(string.Format(Resources.AzureVNetSiteCompletedOperation, CommandRuntime.ToString()));
                     result = sites.Select(site => ContextFactory<NetworkListResponse.VirtualNetworkSite, VirtualNetworkSiteContext>(site, operation));
                 }
@@ -72,7 +72,7 @@ public IEnumerable<VirtualNetworkSiteContext> GetVirtualNetworkSiteProcess()
                     }
                     else
                     {
-                        this.WriteExceptionDetails(ex);
+                        WriteExceptionError(ex);
                     }
                 }
             });
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/PersistentVMs/GetAzureRemoteDesktopFile.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/PersistentVMs/GetAzureRemoteDesktopFile.cs
@@ -79,7 +79,7 @@ protected override void ExecuteCommand()
                     }
                 }
 
-                var operation = GetOperationNewSM(desktopFileResponse.RequestId);
+                var operation = GetOperation(desktopFileResponse.RequestId);
 
                 WriteVerboseWithTimestamp(string.Format(Resources.AzureRemoteDesktopCompletedOperation, CommandRuntime));
 
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/PersistentVMs/NewAzureQuickVM.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/PersistentVMs/NewAzureQuickVM.cs
@@ -238,7 +238,7 @@ public void NewAzureVMProcess()
                 }
                 catch (CloudException ex)
                 {
-                    this.WriteExceptionDetails(ex);
+                    WriteExceptionError(ex);
                     return;
                 }
             }
@@ -354,7 +354,7 @@ public void NewAzureVMProcess()
                     throw new Exception(Resources.ServiceDoesNotExistSpecifyLocationOrAffinityGroup);
                 }
 
-                this.WriteExceptionDetails(ex);
+                WriteExceptionError(ex);
             }
         }
 
@@ -549,7 +549,7 @@ protected bool DoesCloudServiceExist(string serviceName)
                 {
                     return false;
                 }
-                this.WriteExceptionDetails(ex);
+                WriteExceptionError(ex);
             }
 
             return false;
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/PersistentVMs/NewAzureVM.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/PersistentVMs/NewAzureVM.cs
@@ -200,7 +200,7 @@ public void NewAzureVMProcess()
                         if (existingService == null || existingService.Properties == null)
                         {
                             // The same service name is already used by another subscription.
-                            this.WriteExceptionDetails(ex);
+                            WriteExceptionError(ex);
                             return;
                         }
                         else if ((string.IsNullOrEmpty(existingService.Properties.Location) &&
@@ -217,13 +217,13 @@ public void NewAzureVMProcess()
                             // The same service name is already created under the same subscription,
                             // but its affinity group or location is not matched with the given parameter.
                             this.WriteWarning("Location or AffinityGroup name is not matched with the existing service");
-                            this.WriteExceptionDetails(ex);
+                            WriteExceptionError(ex);
                             return;
                         }
                     }
                     else
                     {
-                        this.WriteExceptionDetails(ex);
+                        WriteExceptionError(ex);
                         return;
                     }
                 }
@@ -335,7 +335,7 @@ public void NewAzureVMProcess()
                     }
                     else
                     {
-                        this.WriteExceptionDetails(ex);
+                        WriteExceptionError(ex);
                     }
 
                     return;
diff --git a/src/ServiceManagement/Services/Commands.Utilities/Common/ServiceManagementBaseCmdlet.cs b/src/ServiceManagement/Services/Commands.Utilities/Common/ServiceManagementBaseCmdlet.cs

Original file line number	Diff line number	Diff line change
`@@ -280,7 +280,7 @@ protected DeploymentGetResponse GetDeployment(string slot)`
`280`	`280`	`{`
`281`	`281`	`if (ex.Response.StatusCode != HttpStatusCode.NotFound && IsVerbose() == false)`
`282`	`282`	`{`
`283`		`- this.WriteExceptionDetails(ex);`
	`283`	`+ WriteExceptionError(ex);`
`284`	`284`	`}`
`285`	`285`	`}`
`286`	`286`	`});`
Original file line number	Diff line number	Diff line change
`@@ -170,7 +170,7 @@ public virtual void NewPaaSDeploymentProcess()`
`170`	`170`	`{`
`171`	`171`	`if (ex.Response.StatusCode != HttpStatusCode.NotFound && IsVerbose() == false)`
`172`	`172`	`{`
`173`		`- this.WriteExceptionDetails(ex);`
	`173`	`+ WriteExceptionError(ex);`
`174`	`174`	`}`
`175`	`175`	`}`
`176`	`176`
`@@ -225,7 +225,7 @@ public virtual void NewPaaSDeploymentProcess()`
`225`	`225`	`}`
`226`	`226`	`catch (CloudException ex)`
`227`	`227`	`{`
`228`		`- this.WriteExceptionDetails(ex);`
	`228`	`+ WriteExceptionError(ex);`
`229`	`229`	`}`
`230`	`230`	`});`
`231`	`231`	`}`
`@@ -249,7 +249,7 @@ private void AssertNoPersistenVmRoleExistsInDeployment(string slot)`
`249`	`249`	`{`
`250`	`250`	`if (ex.Response.StatusCode != HttpStatusCode.NotFound && IsVerbose() == false)`
`251`	`251`	`{`
`252`		`- this.WriteExceptionDetails(ex);`
	`252`	`+ WriteExceptionError(ex);`
`253`	`253`	`}`
`254`	`254`	`}`
`255`	`255`	`});`
Original file line number	Diff line number	Diff line change
`@@ -175,7 +175,7 @@ public void ExecuteCommand()`
`175`	`175`	`{`
`176`	`176`	`if (ex.Response.StatusCode != HttpStatusCode.NotFound && IsVerbose() == false)`
`177`	`177`	`{`
`178`		`- this.WriteExceptionDetails(ex);`
	`178`	`+ WriteExceptionError(ex);`
`179`	`179`	`}`
`180`	`180`	`}`
`181`	`181`
`@@ -263,7 +263,7 @@ public void ExecuteCommand()`
`263`	`263`	`}`
`264`	`264`	`catch (CloudException ex)`
`265`	`265`	`{`
`266`		`- this.WriteExceptionDetails(ex);`
	`266`	`+ WriteExceptionError(ex);`
`267`	`267`	`}`
`268`	`268`	`});`
`269`	`269`	`}`
Original file line number	Diff line number	Diff line change
`@@ -150,7 +150,7 @@ internal void GetCurrentDeployment()`
`150`	`150`	`return;`
`151`	`151`
`152`	`152`	`CurrentDeploymentNewSM = ComputeClient.Deployments.GetBySlot(Service, NSM.DeploymentSlot.Production);`
`153`		`- GetDeploymentOperationNewSM = GetOperationNewSM(CurrentDeploymentNewSM.RequestId);`
	`153`	`+ GetDeploymentOperationNewSM = GetOperation(CurrentDeploymentNewSM.RequestId);`
`154`	`154`	`WriteVerboseWithTimestamp(Resources.GetDeploymentCompletedOperation);`
`155`	`155`	`}`
`156`	`156`	`catch (CloudException ex)`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ protected virtual void ExecuteCommand()`
`68`	`68`	`try`
`69`	`69`	`{`
`70`	`70`	`CurrentDeploymentNewSM = this.ComputeClient.Deployments.GetBySlot(this.ServiceName, DeploymentSlot.Production);`
`71`		`- GetDeploymentOperationNewSM = GetOperationNewSM(CurrentDeploymentNewSM.RequestId);`
	`71`	`+ GetDeploymentOperationNewSM = GetOperation(CurrentDeploymentNewSM.RequestId);`
`72`	`72`	`WriteVerboseWithTimestamp(Resources.GetDeploymentCompletedOperation);`
`73`	`73`	`}`
`74`	`74`	`catch (CloudException ex)`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,7 @@ public VirtualNetworkConfigContext GetVirtualNetworkConfigProcess()`
`48`	`48`	`WriteVerboseWithTimestamp(string.Format(Resources.AzureVNetConfigBeginOperation, CommandRuntime.ToString()));`
`49`	`49`
`50`	`50`	`var netcfg = this.NetworkClient.Networks.GetConfiguration();`
`51`		`- var operation = GetOperationNewSM(netcfg.RequestId);`
	`51`	`+ var operation = GetOperation(netcfg.RequestId);`
`52`	`52`
`53`	`53`	`WriteVerboseWithTimestamp(string.Format(Resources.AzureVNetConfigCompletedOperation, CommandRuntime.ToString()));`
`54`	`54`
`@@ -81,7 +81,7 @@ public VirtualNetworkConfigContext GetVirtualNetworkConfigProcess()`
`81`	`81`	`}`
`82`	`82`	`else`
`83`	`83`	`{`
`84`		`- this.WriteExceptionDetails(ex);`
	`84`	`+ WriteExceptionError(ex);`
`85`	`85`	`}`
`86`	`86`	`}`
`87`	`87`	`});`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public IEnumerable<VirtualNetworkSiteContext> GetVirtualNetworkSiteProcess()`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`
`63`		`- var operation = GetOperationNewSM(response.RequestId);`
	`63`	`+ var operation = GetOperation(response.RequestId);`
`64`	`64`	`WriteVerboseWithTimestamp(string.Format(Resources.AzureVNetSiteCompletedOperation, CommandRuntime.ToString()));`
`65`	`65`	`result = sites.Select(site => ContextFactory<NetworkListResponse.VirtualNetworkSite, VirtualNetworkSiteContext>(site, operation));`
`66`	`66`	`}`
`@@ -72,7 +72,7 @@ public IEnumerable<VirtualNetworkSiteContext> GetVirtualNetworkSiteProcess()`
`72`	`72`	`}`
`73`	`73`	`else`
`74`	`74`	`{`
`75`		`- this.WriteExceptionDetails(ex);`
	`75`	`+ WriteExceptionError(ex);`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`	`});`
Original file line number	Diff line number	Diff line change
`@@ -79,7 +79,7 @@ protected override void ExecuteCommand()`
`79`	`79`	`}`
`80`	`80`	`}`
`81`	`81`
`82`		`- var operation = GetOperationNewSM(desktopFileResponse.RequestId);`
	`82`	`+ var operation = GetOperation(desktopFileResponse.RequestId);`
`83`	`83`
`84`	`84`	`WriteVerboseWithTimestamp(string.Format(Resources.AzureRemoteDesktopCompletedOperation, CommandRuntime));`
`85`	`85`
Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ public void NewAzureVMProcess()`
`238`	`238`	`}`
`239`	`239`	`catch (CloudException ex)`
`240`	`240`	`{`
`241`		`- this.WriteExceptionDetails(ex);`
	`241`	`+ WriteExceptionError(ex);`
`242`	`242`	`return;`
`243`	`243`	`}`
`244`	`244`	`}`
`@@ -354,7 +354,7 @@ public void NewAzureVMProcess()`
`354`	`354`	`throw new Exception(Resources.ServiceDoesNotExistSpecifyLocationOrAffinityGroup);`
`355`	`355`	`}`
`356`	`356`
`357`		`- this.WriteExceptionDetails(ex);`
	`357`	`+ WriteExceptionError(ex);`
`358`	`358`	`}`
`359`	`359`	`}`
`360`	`360`
`@@ -549,7 +549,7 @@ protected bool DoesCloudServiceExist(string serviceName)`
`549`	`549`	`{`
`550`	`550`	`return false;`
`551`	`551`	`}`
`552`		`- this.WriteExceptionDetails(ex);`
	`552`	`+ WriteExceptionError(ex);`
`553`	`553`	`}`
`554`	`554`
`555`	`555`	`return false;`
Original file line number	Diff line number	Diff line change
`@@ -200,7 +200,7 @@ public void NewAzureVMProcess()`
`200`	`200`	`if (existingService == null \|\| existingService.Properties == null)`
`201`	`201`	`{`
`202`	`202`	`// The same service name is already used by another subscription.`
`203`		`- this.WriteExceptionDetails(ex);`
	`203`	`+ WriteExceptionError(ex);`
`204`	`204`	`return;`
`205`	`205`	`}`
`206`	`206`	`else if ((string.IsNullOrEmpty(existingService.Properties.Location) &&`
`@@ -217,13 +217,13 @@ public void NewAzureVMProcess()`
`217`	`217`	`// The same service name is already created under the same subscription,`
`218`	`218`	`// but its affinity group or location is not matched with the given parameter.`
`219`	`219`	`this.WriteWarning("Location or AffinityGroup name is not matched with the existing service");`
`220`		`- this.WriteExceptionDetails(ex);`
	`220`	`+ WriteExceptionError(ex);`
`221`	`221`	`return;`
`222`	`222`	`}`
`223`	`223`	`}`
`224`	`224`	`else`
`225`	`225`	`{`
`226`		`- this.WriteExceptionDetails(ex);`
	`226`	`+ WriteExceptionError(ex);`
`227`	`227`	`return;`
`228`	`228`	`}`
`229`	`229`	`}`
`@@ -335,7 +335,7 @@ public void NewAzureVMProcess()`
`335`	`335`	`}`
`336`	`336`	`else`
`337`	`337`	`{`
`338`		`- this.WriteExceptionDetails(ex);`
	`338`	`+ WriteExceptionError(ex);`
`339`	`339`	`}`
`340`	`340`
`341`	`341`	`return;`