-
Notifications
You must be signed in to change notification settings - Fork 3.9k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #33 from AzureRT/dev
Dev
- Loading branch information
Showing
55 changed files
with
1,831 additions
and
695 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| // ---------------------------------------------------------------------------------- | ||
| // | ||
| // Copyright Microsoft Corporation | ||
| // Licensed under the Apache License, Version 2.0 (the "License"); | ||
| // you may not use this file except in compliance with the License. | ||
| // You may obtain a copy of the License at | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // Unless required by applicable law or agreed to in writing, software | ||
| // distributed under the License is distributed on an "AS IS" BASIS, | ||
| // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| // See the License for the specific language governing permissions and | ||
| // limitations under the License. | ||
| // ---------------------------------------------------------------------------------- | ||
|
|
||
| using Hyak.Common; | ||
| using System; | ||
| using System.Linq; | ||
| using System.Text; | ||
|
|
||
| namespace Microsoft.WindowsAzure.Commands.Common | ||
| { | ||
| public class ComputeCloudException : CloudException | ||
| { | ||
| protected const string RequestIdHeaderInResponse = "x-ms-request-id"; | ||
|
|
||
| public ComputeCloudException(CloudException ex) | ||
| : base(GetErrorMessageWithRequestIdInfo(ex), ex) | ||
| { | ||
| } | ||
|
|
||
| protected static string GetErrorMessageWithRequestIdInfo(CloudException cloudException) | ||
| { | ||
| if (cloudException == null) | ||
| { | ||
| throw new ArgumentNullException("cloudException"); | ||
| } | ||
|
|
||
| var sb = new StringBuilder(cloudException.Message); | ||
|
|
||
| if (cloudException.Response != null) | ||
| { | ||
| var headers = cloudException.Response.Headers; | ||
| if (headers != null && headers.ContainsKey(RequestIdHeaderInResponse)) | ||
| { | ||
| if (sb.Length > 0) | ||
| { | ||
| // If the original exception message is not empty, append a new line here. | ||
| sb.Append(Environment.NewLine); | ||
| } | ||
|
|
||
| sb.AppendFormat( | ||
| Properties.Resources.ComputeCloudExceptionOperationIdMessage, | ||
| headers[RequestIdHeaderInResponse].FirstOrDefault()); | ||
| } | ||
| } | ||
|
|
||
| return sb.ToString(); | ||
| } | ||
| } | ||
| } |
11 changes: 10 additions & 1 deletion
11
src/Common/Commands.Common/Properties/Resources.Designer.cs
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -88,3 +88,4 @@ function Cleanup-Storage | |
| Write-Warning "Cannot Remove the Storage Account" | ||
| } | ||
| } | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
137 changes: 137 additions & 0 deletions
137
...Commands.ScenarioTest.ServiceManagementTests/RunServiceManagementCloudExceptionTests.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,137 @@ | ||
| { | ||
| "Entries": [ | ||
| { | ||
| "RequestUri": "/4d368445-cbb1-42a7-97a6-6850ab99f48e/services/hostedservices/*", | ||
| "EncodedRequestUri": "LzRkMzY4NDQ1LWNiYjEtNDJhNy05N2E2LTY4NTBhYjk5ZjQ4ZS9zZXJ2aWNlcy9ob3N0ZWRzZXJ2aWNlcy8lMkE=", | ||
| "RequestMethod": "GET", | ||
| "RequestBody": "", | ||
| "RequestHeaders": { | ||
| "x-ms-version": [ | ||
| "2015-04-01" | ||
| ], | ||
| "User-Agent": [ | ||
| "Microsoft.WindowsAzure.Management.Compute.ComputeManagementClient/12.0.0.0" | ||
| ] | ||
| }, | ||
| "ResponseBody": "<Error xmlns=\"http://schemas.microsoft.com/windowsazure\" xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\">\r\n <Code>BadRequest</Code>\r\n <Message>The hosted service name is invalid.</Message>\r\n</Error>", | ||
| "ResponseHeaders": { | ||
| "Content-Length": [ | ||
| "194" | ||
| ], | ||
| "Content-Type": [ | ||
| "application/xml; charset=utf-8" | ||
| ], | ||
| "x-ms-servedbyregion": [ | ||
| "ussouth3" | ||
| ], | ||
| "Strict-Transport-Security": [ | ||
| "max-age=31536000; includeSubDomains" | ||
| ], | ||
| "x-ms-request-id": [ | ||
| "8fbc1c1bfd26be549be7ac6edfe8fd67" | ||
| ], | ||
| "Cache-Control": [ | ||
| "no-cache" | ||
| ], | ||
| "Date": [ | ||
| "Wed, 24 Jun 2015 21:52:37 GMT" | ||
| ], | ||
| "Server": [ | ||
| "1.0.6198.243", | ||
| "(rd_rdfe_stable.150618-1025)", | ||
| "Microsoft-HTTPAPI/2.0" | ||
| ] | ||
| }, | ||
| "StatusCode": 400 | ||
| }, | ||
| { | ||
| "RequestUri": "/4d368445-cbb1-42a7-97a6-6850ab99f48e/services/hostedservices/*/deploymentslots/Production", | ||
| "EncodedRequestUri": "LzRkMzY4NDQ1LWNiYjEtNDJhNy05N2E2LTY4NTBhYjk5ZjQ4ZS9zZXJ2aWNlcy9ob3N0ZWRzZXJ2aWNlcy8lMkEvZGVwbG95bWVudHNsb3RzL1Byb2R1Y3Rpb24=", | ||
| "RequestMethod": "GET", | ||
| "RequestBody": "", | ||
| "RequestHeaders": { | ||
| "x-ms-version": [ | ||
| "2015-04-01" | ||
| ], | ||
| "User-Agent": [ | ||
| "Microsoft.WindowsAzure.Management.Compute.ComputeManagementClient/12.0.0.0" | ||
| ] | ||
| }, | ||
| "ResponseBody": "<Error xmlns=\"http://schemas.microsoft.com/windowsazure\" xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\">\r\n <Code>BadRequest</Code>\r\n <Message>The hosted service name is invalid.</Message>\r\n</Error>", | ||
| "ResponseHeaders": { | ||
| "Content-Length": [ | ||
| "194" | ||
| ], | ||
| "Content-Type": [ | ||
| "application/xml; charset=utf-8" | ||
| ], | ||
| "x-ms-servedbyregion": [ | ||
| "ussouth3" | ||
| ], | ||
| "Strict-Transport-Security": [ | ||
| "max-age=31536000; includeSubDomains" | ||
| ], | ||
| "x-ms-request-id": [ | ||
| "235043d87cdfbdbea385a799a177dbeb" | ||
| ], | ||
| "Cache-Control": [ | ||
| "no-cache" | ||
| ], | ||
| "Date": [ | ||
| "Wed, 24 Jun 2015 21:52:37 GMT" | ||
| ], | ||
| "Server": [ | ||
| "1.0.6198.243", | ||
| "(rd_rdfe_stable.150618-1025)", | ||
| "Microsoft-HTTPAPI/2.0" | ||
| ] | ||
| }, | ||
| "StatusCode": 400 | ||
| }, | ||
| { | ||
| "RequestUri": "/4d368445-cbb1-42a7-97a6-6850ab99f48e/affinitygroups/*", | ||
| "EncodedRequestUri": "LzRkMzY4NDQ1LWNiYjEtNDJhNy05N2E2LTY4NTBhYjk5ZjQ4ZS9hZmZpbml0eWdyb3Vwcy8lMkE=", | ||
| "RequestMethod": "GET", | ||
| "RequestBody": "", | ||
| "RequestHeaders": { | ||
| "x-ms-version": [ | ||
| "2014-10-01" | ||
| ], | ||
| "User-Agent": [ | ||
| "Microsoft.WindowsAzure.Management.ManagementClient/4.0.0.0" | ||
| ] | ||
| }, | ||
| "ResponseBody": "<Error xmlns=\"http://schemas.microsoft.com/windowsazure\" xmlns:i=\"http://www.w3.org/2001/XMLSchema-instance\">\r\n <Code>ResourceNotFound</Code>\r\n <Message>The affinity group does not exist.</Message>\r\n</Error>", | ||
| "ResponseHeaders": { | ||
| "Content-Length": [ | ||
| "199" | ||
| ], | ||
| "Content-Type": [ | ||
| "application/xml; charset=utf-8" | ||
| ], | ||
| "x-ms-servedbyregion": [ | ||
| "ussouth3" | ||
| ], | ||
| "x-ms-request-id": [ | ||
| "e7eb6116c17abe61b27520096b982601" | ||
| ], | ||
| "Cache-Control": [ | ||
| "no-cache" | ||
| ], | ||
| "Date": [ | ||
| "Wed, 24 Jun 2015 21:52:38 GMT" | ||
| ], | ||
| "Server": [ | ||
| "1.0.6198.243", | ||
| "(rd_rdfe_stable.150618-1025)", | ||
| "Microsoft-HTTPAPI/2.0" | ||
| ] | ||
| }, | ||
| "StatusCode": 404 | ||
| } | ||
| ], | ||
| "Names": {}, | ||
| "Variables": { | ||
| "SubscriptionId": "4d368445-cbb1-42a7-97a6-6850ab99f48e" | ||
| } | ||
| } |
File renamed without changes.
File renamed without changes.
Oops, something went wrong.