Skip to content

IoTCentral - Add ARM endpoint, update model responses/inputs, update tests #4909

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
dsgouda merged 3 commits into from
Oct 30, 2018
Merged

IoTCentral - Add ARM endpoint, update model responses/inputs, update tests #4909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6cc3144
Merge pull request #1 from Azure/psSdkJson6
r-delgadillo Oct 18, 2018
077ac93
Merge pull request #2 from Azure/psSdkJson6
r-delgadillo Oct 30, 2018
26d6cde
Add ARM endpoint, update model responses/inputs, update tests
r-delgadillo Oct 30, 2018
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
10 changes: 6 additions & 4 deletions src/SDKs/IotCentral/IotCentral.Tests/Helpers/IotCentralTestUtilities.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,13 @@ namespace IotCentral.Tests.Helpers
public class IotCentralTestUtilities
{
public static string DefaultLocation = "WestUS";
public static string DefaultIotCentralName = "dotnetsdkapp";
public static string DefaultUpdateIotCentralName = "dotnetsdkapppdate";
public static string DefaultResourceName = "dotnetsdkapp";
public static string DefaultUpdateResourceName = "dotnetsdkappupdate";
public static string DefaultSubdomain = "dotnetsdksubdomain";
public static string DefaultUpdateSubdomain = "dotnetsdksubdomainupdate";
public static string DefaultResourceGroupName = "DotNetSdkIotCentralRG";
public static string DefaultUpdateResourceGroupName = "UpdateDotNetSdkIotCentralRG";

public static string DefaultUpdateResourceGroupName = "DotNetSdkIotCentralRGUpdate";
public static IotCentralClient GetIotCentralClient(MockContext context, RecordedDelegatingHandler handler = null)
{
if (handler != null)
Expand Down
73 changes: 42 additions & 31 deletions src/SDKs/IotCentral/IotCentral.Tests/ScenarioTests/IotCentralLifeCycleTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,31 +27,32 @@ public void TestIotCentralCreateLifeCycle()
// Create Resource Group
var resourceGroup = CreateResourceGroup(IotCentralTestUtilities.DefaultResourceGroupName);

// Check if App Exists and Delete
DeleteAppIfExists(IotCentralTestUtilities.DefaultResourceGroupName, IotCentralTestUtilities.DefaultIotCentralName);

// Create App
var app = CreateIotCentral(resourceGroup, IotCentralTestUtilities.DefaultLocation, IotCentralTestUtilities.DefaultIotCentralName);
var app = CreateIotCentral(resourceGroup, IotCentralTestUtilities.DefaultLocation, IotCentralTestUtilities.DefaultResourceName, IotCentralTestUtilities.DefaultSubdomain);

// Validate resourceName and subdomain are taken
this.CheckAppNameAndSubdomainTaken(app.Name, app.Subdomain);

Assert.NotNull(app);
Assert.Equal(AppSku.S1, app.Sku.Name);
Assert.Equal(IotCentralTestUtilities.DefaultIotCentralName, app.Name);
Assert.Equal(IotCentralTestUtilities.DefaultResourceName, app.Name);
Assert.Equal(IotCentralTestUtilities.DefaultSubdomain, app.Subdomain);

// Add and Get Tags
IDictionary<string, string> tags = new Dictionary<string, string>
{
{ "key1", "value1" },
{ "key2", "value2" }
};
{
{ "key1", "value1" },
{ "key2", "value2" }
};

var appPatch = new AppPatch()
{
Tags = tags,
DisplayName = IotCentralTestUtilities.DefaultIotCentralName,
Subdomain = IotCentralTestUtilities.DefaultIotCentralName
DisplayName = IotCentralTestUtilities.DefaultResourceName,
Subdomain = IotCentralTestUtilities.DefaultSubdomain
};

app = this.iotCentralClient.Apps.Update(IotCentralTestUtilities.DefaultResourceGroupName, IotCentralTestUtilities.DefaultIotCentralName, appPatch);
app = this.iotCentralClient.Apps.Update(IotCentralTestUtilities.DefaultResourceGroupName, IotCentralTestUtilities.DefaultResourceName, appPatch);

Assert.NotNull(app);
Assert.True(app.Tags.Count().Equals(2));
Expand Down Expand Up @@ -86,43 +87,53 @@ public void TestIotCentralUpdateLifeCycle()
// Create Resource Group
var resourceGroup = CreateResourceGroup(IotCentralTestUtilities.DefaultUpdateResourceGroupName);

// Check if App Exists and Delete
DeleteAppIfExists(IotCentralTestUtilities.DefaultUpdateResourceGroupName, IotCentralTestUtilities.DefaultUpdateIotCentralName);

// Create App
var app = CreateIotCentral(resourceGroup, IotCentralTestUtilities.DefaultLocation, IotCentralTestUtilities.DefaultUpdateIotCentralName);
var app = CreateIotCentral(resourceGroup, IotCentralTestUtilities.DefaultLocation, IotCentralTestUtilities.DefaultUpdateResourceName, IotCentralTestUtilities.DefaultUpdateSubdomain);

// Validate resourceName and subdomain are taken
this.CheckAppNameAndSubdomainTaken(app.Name, app.Subdomain);

// Update App
var newSubDomain = "test-updated-sub-domain";
var newDisplayName = "test-updated-display-name";
// Add and Get Tags
IDictionary<string, string> tags = new Dictionary<string, string>
{
{ "key1", "value1" },
{ "key2", "value2" }
};

app.Subdomain = newSubDomain;
app.DisplayName = newDisplayName;
app = UpdateIotCentral(resourceGroup, app, IotCentralTestUtilities.DefaultUpdateIotCentralName);
AppPatch appPatch = new AppPatch()
{
Tags = tags,
DisplayName = newDisplayName,
Subdomain = newSubDomain
};

app = UpdateIotCentral(resourceGroup, appPatch, IotCentralTestUtilities.DefaultUpdateResourceName);

// List apps
app = iotCentralClient.Apps.ListByResourceGroup(IotCentralTestUtilities.DefaultUpdateResourceGroupName)
.FirstOrDefault(e => e.Name.Equals(IotCentralTestUtilities.DefaultUpdateIotCentralName, StringComparison.OrdinalIgnoreCase));
.FirstOrDefault(e => e.Name.Equals(IotCentralTestUtilities.DefaultUpdateResourceName, StringComparison.OrdinalIgnoreCase));

Assert.NotNull(app);
Assert.Equal(newDisplayName, app.DisplayName);
Assert.Equal(newSubDomain, app.Subdomain);
Assert.True(app.Tags.Count().Equals(2));
Assert.Equal("value2", app.Tags["key2"]);
}
}

private void DeleteAppIfExists(string resourceGroupName, string name)
private void CheckAppNameAndSubdomainTaken(string resourceName, string subdomain)
{
var info = iotCentralClient.Apps.CheckNameAvailability(name);
if (info.NameAvailable != true)
{
iotCentralClient.Apps.Delete(
resourceGroupName,
name);
OperationInputs resourceNameInputs = new OperationInputs(resourceName, "IoTApps");
OperationInputs subdomainInputs = new OperationInputs(subdomain, "IoTApps");

info = iotCentralClient.Apps.CheckNameAvailability(name);
}
// check if names are available
var resourceNameResult = iotCentralClient.Apps.CheckNameAvailability(resourceNameInputs);
var subdomainResult = iotCentralClient.Apps.CheckSubdomainAvailability(subdomainInputs);

Assert.True(info.NameAvailable, "App already exists. Unable to remove it.");
Assert.False(resourceNameResult.NameAvailable);
Assert.False(subdomainResult.NameAvailable);
}
}
}
26 changes: 13 additions & 13 deletions src/SDKs/IotCentral/IotCentral.Tests/ScenarioTests/IotCentralTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ protected void Initialize(MockContext context)
testEnv = TestEnvironmentFactory.GetTestEnvironment();
resourcesClient = IotCentralTestUtilities.GetResourceManagementClient(context, new RecordedDelegatingHandler { StatusCodeToReturn = HttpStatusCode.OK });
iotCentralClient = IotCentralTestUtilities.GetIotCentralClient(context, new RecordedDelegatingHandler { StatusCodeToReturn = HttpStatusCode.OK });

if (string.IsNullOrEmpty(Environment.GetEnvironmentVariable("AZURE_VM_TEST_LOCATION")))
{
location = IotCentralTestUtilities.DefaultLocation;
Expand All @@ -49,7 +49,7 @@ protected void Initialize(MockContext context)
}
}

protected App CreateIotCentral(ResourceGroup resourceGroup, string location, string appName)
protected App CreateIotCentral(ResourceGroup resourceGroup, string location, string appResourceName, string appSubdomain)
{
var app = new App()
{
Expand All @@ -58,31 +58,31 @@ protected App CreateIotCentral(ResourceGroup resourceGroup, string location, str
{
Name = "S1"
},
Subdomain = appName,
DisplayName = appName
Subdomain = appSubdomain,
DisplayName = appResourceName
};

return this.iotCentralClient.Apps.CreateOrUpdate(
resourceGroup.Name,
appName,
appResourceName,
app);
}

protected App UpdateIotCentral(ResourceGroup resourceGroup, App app, string appName)
protected App UpdateIotCentral(ResourceGroup resourceGroup, AppPatch app, string appResourceName)
{
return this.iotCentralClient.Apps.CreateOrUpdate(
return this.iotCentralClient.Apps.Update(
resourceGroup.Name,
appName,
appResourceName,
app);
}

protected ResourceGroup CreateResourceGroup(string resourceGroupName)
{
return this.resourcesClient.ResourceGroups.CreateOrUpdate(resourceGroupName,
new ResourceGroup
{
Location = IotCentralTestUtilities.DefaultLocation
});
return this.resourcesClient.ResourceGroups.CreateOrUpdate(resourceGroupName,
new ResourceGroup
{
Location = IotCentralTestUtilities.DefaultLocation
});
}

protected void DeleteResourceGroup(string resourceGroupName)
Expand Down
Loading