Skip to content

Get-Container & PS Tests #50

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
dragonfly91 merged 1 commit into from
Jun 18, 2015
Merged

Get-Container & PS Tests #50

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
24 changes: 18 additions & 6 deletions src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/Commands.AzureBackup.Test.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,12 +161,24 @@
<None Include="ScenarioTests\AzureBackupItemTestCases.ps1">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="ScenarioTests\AzureBackupPolicyTests.ps1" />
<None Include="ScenarioTests\AzureBackupContainerTests.ps1" />
<None Include="ScenarioTests\AzureBackupJobTests.ps1" />
<None Include="ScenarioTests\AzureBackupVaultTests.ps1" />
<None Include="ScenarioTests\BackupItemTests.ps1" />
<None Include="ScenarioTests\RecoveryPointTests.ps1" />
<None Include="ScenarioTests\AzureBackupPolicyTests.ps1">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="ScenarioTests\AzureBackupContainerTests.ps1">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="ScenarioTests\AzureBackupJobTests.ps1">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="ScenarioTests\AzureBackupVaultTests.ps1">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="ScenarioTests\BackupItemTests.ps1">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="ScenarioTests\RecoveryPointTests.ps1">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupContainerTests\GetAzureBackupContainerTests.json" />
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupContainerTests\RegisterAzureBackupContainerTest.json" />
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupContainerTests\UnregisterAzureBackupContainerTest.json" />
Expand Down
13 changes: 6 additions & 7 deletions ...urceManager/AzureBackup/Commands.AzureBackup/Cmdlets/Container/GetAzureBackupContainer.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@
// limitations under the License.
// ----------------------------------------------------------------------------------

using BCI = Microsoft.BackupManagementService.CommonInterface;
using BMI = Microsoft.BackupManagementService.ManagementInterface;
using Microsoft.Azure.Commands.AzureBackup.Library;
using Microsoft.Azure.Management.BackupServices.Models;
using System;
using System.Collections.Generic;
Expand Down Expand Up @@ -94,12 +93,12 @@ public override void ExecuteCmdlet()

private string ConstructQueryFilterString()
{
BMI.ContainerQueryObject containerQueryObject = new BMI.ContainerQueryObject();
ContainerQueryObject containerQueryObject = new ContainerQueryObject();

switch (Type)
{
case AzureBackupContainerTypeInput.AzureVirtualMachine:
containerQueryObject.Type = BCI.ContainerType.IaasVMContainer.ToString();
containerQueryObject.Type = ContainerType.IaasVMContainer.ToString();
break;
default:
break;
Expand All @@ -108,10 +107,10 @@ private string ConstructQueryFilterString()
switch (Status)
{
case AzureBackupContainerStatusInput.Registered:
containerQueryObject.Status = BCI.RegistrationStatus.Registered.ToString();
containerQueryObject.Status = RegistrationStatus.Registered.ToString();
break;
case AzureBackupContainerStatusInput.Registering:
containerQueryObject.Status = BCI.RegistrationStatus.Registering.ToString();
containerQueryObject.Status = RegistrationStatus.Registering.ToString();
break;
default:
break;
Expand All @@ -122,7 +121,7 @@ private string ConstructQueryFilterString()
containerQueryObject.FriendlyName = ContainerResourceName;
}

return BMI.BackupManagementAPIHelper.GetQueryString(containerQueryObject.GetNameValueCollection());
return BackupManagementAPIHelper.GetQueryString(containerQueryObject.GetNameValueCollection());
}
}
}
16 changes: 8 additions & 8 deletions src/ResourceManager/AzureBackup/Commands.AzureBackup/Commands.AzureBackup.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@
<Reference Include="Hyak.Common">
<HintPath>..\..\..\packages\Hyak.Common.1.0.2\lib\portable-net403+win+wpa81\Hyak.Common.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Common">
<Reference Include="Microsoft.Azure.Common, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
</Reference>
<Reference Include="Microsoft.Azure.Common.Authentication, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
Expand Down Expand Up @@ -86,9 +87,13 @@
<Reference Include="Microsoft.WindowsAzure.Management">
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.1.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
</Reference>
<Reference Include="Microsoft.WindowsAzure.Management.BackupServicesManagment, Version=0.0.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\..\azure-sdk-for-net\src\ResourceManagement\AzureBackup\BackupServicesManagment\bin\Net45-Debug\Microsoft.WindowsAzure.Management.BackupServicesManagment.dll</HintPath>
</Reference>
<Reference Include="Microsoft.WindowsAzure.Management.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>Cmdlets\VaultCredentials\Microsoft.WindowsAzure.Management.Common.dll</HintPath>
<HintPath>Resources\Microsoft.WindowsAzure.Management.Common.dll</HintPath>
</Reference>
<Reference Include="Microsoft.WindowsAzure.Management.Scheduler">
<HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Scheduler.6.0.0\lib\net40\Microsoft.WindowsAzure.Management.Scheduler.dll</HintPath>
Expand Down Expand Up @@ -154,6 +159,7 @@
<Compile Include="Cmdlets\Vault\GetAzureBackupVaultCredentials\VaultCredentials.cs" />
<Compile Include="Cmdlets\Vault\SetAzureBackupVaultStorageType.cs" />
<Compile Include="Library\AzureBackupCmdletHelper.cs" />
<Compile Include="Library\AzureBackupContainerCmdletHelper.cs" />
<Compile Include="Models\AzureBackupBaseObjects.cs" />
<Compile Include="Models\AzureBackupContainer.cs" />
<Compile Include="Models\AzureBackupEnums.cs" />
Expand All @@ -173,10 +179,6 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\..\azure-sdk-for-net\src\ResourceManagement\AzureBackup\BackupServicesManagment\BackupServicesManagment.csproj">
<Project>{38a6741c-77a3-42a8-a846-83373be57c7f}</Project>
<Name>BackupServicesManagment</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Common\Commands.Common\Commands.Common.csproj">
<Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
<Name>Commands.Common</Name>
Expand All @@ -202,8 +204,6 @@
</EmbeddedResource>
</ItemGroup>
<ItemGroup>
<Content Include="Resources\BackupManagementInterface.dll" />
<Content Include="Resources\BMSCommonInterface.dll" />
<Content Include="Resources\Microsoft.WindowsAzure.Management.Common.dll" />
<Content Include="Resources\Security.Cryptography.dll" />
</ItemGroup>
Expand Down
Binary file removed src/ResourceManager/AzureBackup/Commands.AzureBackup/Resources/BMSCommonInterface.dll
View file
Open in desktop
Binary file not shown.
Binary file removed src/ResourceManager/AzureBackup/Commands.AzureBackup/Resources/BackupManagementInterface.dll
View file
Open in desktop
Binary file not shown.