Skip to content

Azure Machine Learning WebServicesRP new API version #3036

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shahabhijeet merged 17 commits into from
Apr 6, 2017
Merged

Azure Machine Learning WebServicesRP new API version #3036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
b242ffe
Initial change for a new version
NonStatic2014 Jan 6, 2017
60f1db8
Update the POST operation id
NonStatic2014 Jan 12, 2017
3a65817
POST method update
NonStatic2014 Jan 14, 2017
ee71483
Make the POST call long running operation and handle the request id.
NonStatic2014 Mar 8, 2017
964f948
Merge branch 'AutoRest' of https://github.com/nonstatic2014/azure-sdk…
NonStatic2014 Mar 8, 2017
366f97a
Update existing test cases to work with new API version.
NonStatic2014 Mar 9, 2017
d18179c
Add new test case for POST
NonStatic2014 Mar 9, 2017
2b0727a
Add test case for large payload scenario.
NonStatic2014 Mar 9, 2017
15f68d8
Description update according to swagger update
NonStatic2014 Mar 10, 2017
d889213
Update generate.cmd to point to new swagger spec
NonStatic2014 Mar 10, 2017
89bea37
Suppress CredScan message for certificate thumbprint, which is for en…
NonStatic2014 Mar 16, 2017
f09574b
Replace real thumbprints with dummy strings
NonStatic2014 Mar 16, 2017
7c527df
More thumbprints replaced with dummy strings
NonStatic2014 Mar 17, 2017
4e55fcf
Replace hardcoded web service keys with dummy strings
NonStatic2014 Mar 17, 2017
6507d34
Replace keys and thumbprints with dummy strings
NonStatic2014 Mar 17, 2017
1f87ba4
Remove all encrypted content which were treated as credentials by Cre…
NonStatic2014 Mar 18, 2017
2e8b58b
Update .net SDK with the latest swagger.
NonStatic2014 Apr 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
138 changes: 134 additions & 4 deletions ...ResourceManagement/MachineLearning/MachineLearning.Tests/ScenarioTests/WebServiceTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ namespace MachineLearning.Tests.ScenarioTests
{
public class WebServiceTests : BaseScenarioTests
{
private const string DefaultLocation = "South Central US";
private const string DefaultLocation = "West Central US";
private const string TestServiceNamePrefix = "amlws";
private const string TestCommitmentPlanNamePrefix = "amlcp";
private const string TestResourceGroupNamePrefix = "amlrg";
Expand All @@ -42,6 +42,7 @@ public class WebServiceTests : BaseScenarioTests
/// is working as expected, re-record the test against Prod before submitting an official pull request.
/// </summary>
private readonly string TestServiceDefinitionFile;
private readonly string TestServiceDefinitionFileWithLargePayload;

private const int AsyncOperationPollingIntervalSeconds = 5;

Expand All @@ -56,6 +57,7 @@ private delegate void AMLWebServiceTestDelegate(
public WebServiceTests()
{
TestServiceDefinitionFile = Path.Combine(Directory.GetCurrentDirectory(), "TestData", "GraphWebServiceDefinition_Prod.json");
TestServiceDefinitionFileWithLargePayload = Path.Combine(Directory.GetCurrentDirectory(), "TestData", "GraphWebServiceDefinition_LargePayload_Prod.json");
}

[Fact]
Expand Down Expand Up @@ -93,6 +95,13 @@ public void CreateGetRemoveGraphWebService()
Assert.NotNull(expectedCloudException.Body);
Assert.True(string.Equals(expectedCloudException.Body.Code, "NotFound"));
}
catch (Exception ex)
{
Trace.TraceError("Caught unexpected exception: ");
Trace.TraceError(ex.Message);

throw;
}
finally
{
// Remove the web service
Expand Down Expand Up @@ -141,6 +150,13 @@ public void CreateAndUpdateOnGraphWebService()
Assert.Equal(serviceKeys.Primary, serviceUpdates.Properties.Keys.Primary);
Assert.Equal(serviceKeys.Secondary, serviceDefinition.Properties.Keys.Secondary);
}
catch (Exception ex)
{
Trace.TraceError("Caught unexpected exception: ");
Trace.TraceError(ex.Message);

throw;
}
finally
{
// Remove the web service
Expand All @@ -149,6 +165,113 @@ public void CreateAndUpdateOnGraphWebService()
});
}

[Fact]
public void CreateAndPostOnGraphWebService()
{
const string NewRegion = "southcentralus";

this.RunAMLWebServiceTestScenario((webServiceName, resourceGroupName, resourcesClient, amlServicesClient, cpResourceId, storageAccount) =>
{
try
{
// Create and validate the AML service resource
var serviceDefinition = WebServiceTests.GetServiceDefinitionFromTestData(this.TestServiceDefinitionFile, cpResourceId, storageAccount);
var webService = amlServicesClient.WebServices.CreateOrUpdateWithRequestId(serviceDefinition, resourceGroupName, webServiceName);
WebServiceTests.ValidateWebServiceResource(amlServicesClient.SubscriptionId, resourceGroupName, webServiceName, webService, serviceDefinition);

//Validate that the expected not found exception is thrown before create the regional properties
var expectedCloudException = Assert.Throws<CloudException>(() => amlServicesClient.WebServices.Get(resourceGroupName, webServiceName, NewRegion));
Assert.NotNull(expectedCloudException.Body);
Assert.True(string.Equals(expectedCloudException.Body.Code, "NotFound"));

// Submit some updates to this resource
amlServicesClient.WebServices.CreateRegionalPropertiesWithRequestId(resourceGroupName, webServiceName, NewRegion);

// Retrieve the AML web service after POST
var retrievedService = amlServicesClient.WebServices.Get(resourceGroupName, webServiceName, NewRegion);
WebServiceTests.ValidateWebServiceResource(amlServicesClient.SubscriptionId, resourceGroupName, webServiceName, retrievedService);
Assert.NotNull(retrievedService.Properties);
var properties = retrievedService.Properties as WebServicePropertiesForGraph;
Assert.NotNull(properties);
Assert.NotNull(properties.Package);
Assert.NotNull(properties.Package.Nodes);
Assert.NotNull(properties.Package.Nodes["node1"]);
Assert.NotNull(properties.Package.Nodes["node1"].Parameters);
Assert.NotNull(properties.Package.Nodes["node1"].Parameters["Account Key"]);

WebServiceParameter param = properties.Package.Nodes["node1"].Parameters["Account Key"];

string expectedThumbprint = "ONE_THUMBPRINT";
Assert.Equal(expectedThumbprint, param.CertificateThumbprint);
}
catch (Exception ex)
{
Trace.TraceError("Caught unexpected exception: ");
Trace.TraceError(ex.Message);

throw;
}
finally
{
// Remove the web service
BaseScenarioTests.DisposeOfTestResource(() => amlServicesClient.WebServices.RemoveWithRequestId(resourceGroupName, webServiceName));
}
});
}

[Fact]
public void CreateGetRemoveGraphWebServiceWithLargePayload()
{
this.RunAMLWebServiceTestScenario((webServiceName, resourceGroupName, resourcesClient, amlServicesClient, cpResourceId, storageAccount) =>
{
bool serviceWasRemoved = false;
try
{
//Validate expected NO-OP behavior on deleting a non existing service
amlServicesClient.WebServices.RemoveWithRequestId(resourceGroupName, webServiceName);

// Create and validate the AML service resource
var serviceDefinition = WebServiceTests.GetServiceDefinitionFromTestData(this.TestServiceDefinitionFileWithLargePayload, cpResourceId, storageAccount);
var webService = amlServicesClient.WebServices.CreateOrUpdateWithRequestId(serviceDefinition, resourceGroupName, webServiceName);
WebServiceTests.ValidateWebServiceResource(amlServicesClient.SubscriptionId, resourceGroupName, webServiceName, webService);

// Retrieve the AML web service after creation
var retrievedService = amlServicesClient.WebServices.Get(resourceGroupName, webServiceName);
WebServiceTests.ValidateWebServiceResource(amlServicesClient.SubscriptionId, resourceGroupName, webServiceName, retrievedService);

// Retrieve the AML web service's keys
WebServiceKeys serviceKeys = amlServicesClient.WebServices.ListKeys(resourceGroupName, webServiceName);
Assert.NotNull(serviceKeys);
Assert.Equal(serviceKeys.Primary, serviceDefinition.Properties.Keys.Primary);
Assert.Equal(serviceKeys.Secondary, serviceDefinition.Properties.Keys.Secondary);

// Remove the web service
amlServicesClient.WebServices.RemoveWithRequestId(resourceGroupName, webServiceName);
serviceWasRemoved = true;

//Validate that the expected not found exception is thrown after deletion when trying to access the service
var expectedCloudException = Assert.Throws<CloudException>(() => amlServicesClient.WebServices.Get(resourceGroupName, webServiceName));
Assert.NotNull(expectedCloudException.Body);
Assert.True(string.Equals(expectedCloudException.Body.Code, "NotFound"));
}
catch (Exception ex)
{
Trace.TraceError("Caught unexpected exception: ");
Trace.TraceError(ex.Message);

throw;
}
finally
{
// Remove the web service
if (!serviceWasRemoved)
{
BaseScenarioTests.DisposeOfTestResource(() => amlServicesClient.WebServices.RemoveWithRequestId(resourceGroupName, webServiceName));
}
}
});
}

[Fact]
public void CreateAndListWebServices()
{
Expand Down Expand Up @@ -189,9 +312,9 @@ public void CreateAndListWebServices()
Assert.True(servicesList.Any(svc => string.Equals(svc.Id, service3ExpectedId, StringComparison.OrdinalIgnoreCase)));

// Validate that all services are called when getting the AML service resource list for the subscription
var servicesInSubscription = amlServicesClient.WebServices.List();
var servicesInSubscription = amlServicesClient.WebServices.ListBySubscriptionIdWithHttpMessagesAsync().Result;
Assert.NotNull(servicesInSubscription);
servicesList = servicesInSubscription.ToList();
servicesList = servicesInSubscription.Body.ToList();
Assert.NotNull(servicesList);
Assert.True(servicesList.Count >= 4);
Assert.True(servicesList.Any(svc => string.Equals(svc.Id, service1ExpectedId, StringComparison.OrdinalIgnoreCase)));
Expand All @@ -200,6 +323,13 @@ public void CreateAndListWebServices()
string otherServiceExpectedId = string.Format(CultureInfo.InvariantCulture, WebServiceTests.ResourceIdFormat, amlServicesClient.SubscriptionId, otherResourceGroupName, otherServiceName);
Assert.True(servicesList.Any(svc => string.Equals(svc.Id, otherServiceExpectedId, StringComparison.OrdinalIgnoreCase)));
}
catch(Exception ex)
{
Trace.TraceError("Caught unexpected exception: ");
Trace.TraceError(ex.Message);

throw;
}
finally
{
// Remove the resources created by the test
Expand Down Expand Up @@ -342,7 +472,7 @@ private static void ValidateWebServiceResource(string subscriptionId, string res

private static Tuple<DeploymentExtended, GenericResource> CreateCommitmentPlanResource(string resourceGroupName, string commitmentPlanName, string deploymentName, ResourceManagementClient resourcesClient, string cpApiVersion)
{
string deploymentParams = @"{'planName': {'value': '" + commitmentPlanName + "'}, 'planSkuName': {'value': 'PLAN_SKU_NAME'}, 'planSkuTier': {'value': 'PLAN_SKU_TIER'}, 'apiVersion': {'value': '" + cpApiVersion + "'}}";
string deploymentParams = @"{'planName': {'value': '" + commitmentPlanName + "'}, 'planSkuName': {'value': 'S1'}, 'planSkuTier': {'value': 'Standard'}, 'apiVersion': {'value': '" + cpApiVersion + "'}}";
var deploymentProperties = new DeploymentProperties
{
Template = JObject.Parse(File.ReadAllText(Path.Combine(Directory.GetCurrentDirectory(), "TestData", "DeployCommitmentPlanTemplate.json"))),
Expand Down
Loading