Skip to content

{IotHub} Update device sdk #12528

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
merged 14 commits into from
Sep 21, 2020
Merged

{IotHub} Update device sdk #12528

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
0c87c53
Update device sdk
anusapan Jul 29, 2020
d74209a
Re-record test session
anusapan Jul 30, 2020
35e7903
Merge branch 'master' of https://github.com/Azure/azure-powershell in…
anusapan Aug 10, 2020
1a8db2e
Merge branch 'master' of https://github.com/Azure/azure-powershell in…
anusapan Aug 14, 2020
015032a
Removed additional NewtonSoft reference
anusapan Aug 14, 2020
cfdcab5
Merge branch 'master' of https://github.com/Azure/azure-powershell in…
anusapan Aug 17, 2020
c80fd60
update the device sdk in dps and iothub both
anusapan Aug 17, 2020
e9dd287
Merge branch 'master' of https://github.com/Azure/azure-powershell in…
anusapan Aug 19, 2020
0addb19
Remove Iothub reference from DPS test
anusapan Aug 19, 2020
782d834
Added IotHub reference
anusapan Aug 19, 2020
7aae5c0
Update the DeviceProvisioningService SDK
anusapan Aug 19, 2020
d2cf585
Merge branch 'master' of https://github.com/Azure/azure-powershell in…
anusapan Sep 17, 2020
3192622
Reverted DPS upgrade
anusapan Sep 17, 2020
2a511a2
Update changelog
anusapan Sep 18, 2020
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
2 changes: 1 addition & 1 deletion ...ovisioningServices/DeviceProvisioningServices.Test/DeviceProvisioningServices.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Devices" Version="1.18.2" />
<PackageReference Include="Microsoft.Azure.Devices" Version="1.22.0" />
<PackageReference Include="Microsoft.Azure.Management.DeviceProvisioningServices" Version="0.10.0-preview" />
<PackageReference Include="Microsoft.Azure.Management.IotHub" Version="2.10.0-preview" />
</ItemGroup>
Expand Down
941 changes: 607 additions & 334 deletions ....DeviceProvisioningServices.Test.IotDpsAccessPolicyTests/IotDpsAccessPolicyLifeCycle.json
View file
Open in desktop

Large diffs are not rendered by default.

2,020 changes: 896 additions & 1,124 deletions ...eProvisioningServices.Test.IotDpsEnrollmentGroupTests/IotDpsEnrollmentGroupLifeCycle.json
View file
Open in desktop

Large diffs are not rendered by default.

1,931 changes: 994 additions & 937 deletions ...ands.DeviceProvisioningServices.Test.IotDpsEnrollmentTests/IotDpsEnrollmentLifeCycle.json
View file
Open in desktop

Large diffs are not rendered by default.

1,239 changes: 591 additions & 648 deletions ...mmands.DeviceProvisioningServices.Test.IotDpsLinkedHubTests/IotDpsLinkedHubLifeCycle.json
View file
Open in desktop

Large diffs are not rendered by default.

1,859 changes: 730 additions & 1,129 deletions ....DeviceProvisioningServices.Test.IotDpsRegistrationTests/IotDpsRegistrationLifeCycle.json
View file
Open in desktop

Large diffs are not rendered by default.

796 changes: 398 additions & 398 deletions .../SessionRecords/Commands.DeviceProvisioningServices.Test.IotDpsTests/IotDpsLifeCycle.json
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions src/DeviceProvisioningServices/DeviceProvisioningServices.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ScenarioTest.ResourceManage
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestFx", "..\..\tools\TestFx\TestFx.csproj", "{BC80A1D0-FFA4-43D9-AA74-799F5CB54B58}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IotHub", "..\IotHub\IotHub\IotHub.csproj", "{FD98F78A-2655-40A3-9330-A2B2CCBF7625}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IotHub", "..\IotHub\IotHub\IotHub.csproj", "{7F81FF1A-8216-4F21-BC14-53BA42FC6478}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -55,17 +55,17 @@ Global
{BC80A1D0-FFA4-43D9-AA74-799F5CB54B58}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BC80A1D0-FFA4-43D9-AA74-799F5CB54B58}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BC80A1D0-FFA4-43D9-AA74-799F5CB54B58}.Release|Any CPU.Build.0 = Release|Any CPU
{FD98F78A-2655-40A3-9330-A2B2CCBF7625}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FD98F78A-2655-40A3-9330-A2B2CCBF7625}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FD98F78A-2655-40A3-9330-A2B2CCBF7625}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FD98F78A-2655-40A3-9330-A2B2CCBF7625}.Release|Any CPU.Build.0 = Release|Any CPU
{7F81FF1A-8216-4F21-BC14-53BA42FC6478}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7F81FF1A-8216-4F21-BC14-53BA42FC6478}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7F81FF1A-8216-4F21-BC14-53BA42FC6478}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7F81FF1A-8216-4F21-BC14-53BA42FC6478}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{4802BBF0-70F7-4FCB-81A6-381810234F14} = {DB3F9035-1533-4D52-B782-285C784EFDD4}
{FD98F78A-2655-40A3-9330-A2B2CCBF7625} = {DB3F9035-1533-4D52-B782-285C784EFDD4}
{7F81FF1A-8216-4F21-BC14-53BA42FC6478} = {DB3F9035-1533-4D52-B782-285C784EFDD4}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {930E4484-D6C7-4C25-AE5B-05EDACF6ED88}
Expand Down
1 change: 1 addition & 0 deletions src/DeviceProvisioningServices/DeviceProvisioningServices/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
- Additional information about change #1
-->
## Upcoming Release
* Update devices provisioning service sdk

## Version 0.7.4
* Fixed debug: Enrollment does not retain/assign linked IotHubs while choosing Custom allocation policy. [#12154]
Expand Down
8 changes: 6 additions & 2 deletions src/DeviceProvisioningServices/DeviceProvisioningServices/DeviceProvisioningServices.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<PsModuleName>DeviceProvisioningServices</PsModuleName>
Expand All @@ -11,8 +11,12 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Devices.Provisioning.Service" Version="1.5.0" />
<PackageReference Include="Microsoft.Azure.Devices.Provisioning.Service" Version="1.6.3" />
<PackageReference Include="Microsoft.Azure.Management.DeviceProvisioningServices" Version="0.10.0-preview" />
</ItemGroup>

<ItemGroup>
<PackageReference Update="Newtonsoft.Json" Version="12.0.3" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion src/IotHub/IotHub.Test/IotHub.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Azure.Devices" Version="1.18.2" />
<PackageReference Include="Microsoft.Azure.Devices" Version="1.22.0" />
<PackageReference Include="Microsoft.Azure.Management.EventHub" Version="2.7.0" />
<PackageReference Include="Microsoft.Azure.Management.IotHub" Version="2.10.0-preview" />
</ItemGroup>
Expand Down
6 changes: 6 additions & 0 deletions src/IotHub/IotHub.Test/ScenarioTests/IotHubDPDeviceTests.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,8 @@ function Test-AzureRmIotHubDeviceLifecycle
$errorMessage = "The entered device ""fakeDevice"" doesn't exist."
Assert-ThrowsContains { New-AzIotHubSasToken -ResourceGroupName $ResourceGroupName -IotHubName $IotHubName -DeviceId "fakeDevice" } $errorMessage

Wait-Seconds 15

# Count devices
$totalDevices = Invoke-AzIotHubQuery -ResourceGroupName $ResourceGroupName -IotHubName $IotHubName -Query "select * from devices"
Assert-True { $totalDevices.Count -eq 4}
Expand Down Expand Up @@ -176,6 +178,8 @@ function Test-AzureRmIotHubDeviceLifecycle
Assert-False { $newDevice5.Capabilities.IotEdge }
Assert-True { $newDevice5.Scope -eq $newDevice4.Scope }

Wait-Seconds 15

# Get all device children
$devices = Get-AzIotHubDCL -ResourceGroupName $ResourceGroupName -IotHubName $IotHubName
Assert-True { $devices.Count -eq 3}
Expand Down Expand Up @@ -203,6 +207,8 @@ function Test-AzureRmIotHubDeviceLifecycle
$result = Remove-AzIotHubDevice -ResourceGroupName $ResourceGroupName -IotHubName $IotHubName -DeviceId $device1 -Passthru
Assert-True { $result }

Wait-Seconds 15

# Delete all devices
$result = Remove-AzIotHubDevice -ResourceGroupName $ResourceGroupName -IotHubName $IotHubName -Passthru
Assert-True { $result }
Expand Down
995 changes: 526 additions & 469 deletions ....Test.ScenarioTests.IotHubDPConfigurationTests/TestAzureIotHubConfigurationLifecycle.json
View file
Open in desktop

Large diffs are not rendered by default.

1,555 changes: 806 additions & 749 deletions ...ommands.IotHub.Test.ScenarioTests.IotHubDPDeviceTests/TestAzureIotHubDeviceLifecycle.json
View file
Open in desktop

Large diffs are not rendered by default.

1,315 changes: 686 additions & 629 deletions ...ommands.IotHub.Test.ScenarioTests.IotHubDPModuleTests/TestAzureIotHubModuleLifecycle.json
View file
Open in desktop

Large diffs are not rendered by default.

368 changes: 212 additions & 156 deletions ...Azure.Commands.IotHub.Test.ScenarioTests.IotHubDPTracingTests/TestAzureIotHubTracing.json
View file
Open in desktop

Large diffs are not rendered by default.

Loading