Skip to content

Fixing couple of high priority bugs. #967

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.

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 33 commits into from
Sep 25, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
33 commits
Select commit Hold shift + click to select a range
3f2cb13
Policy Fix for Monthly Retention
pragrawa Aug 26, 2015
e6a91cc
Merge branch 'dev1' of https://github.com/MabOneSdk/azure-powershell …
pragrawa Aug 28, 2015
b151fa3
Scenario Tests improvement
swatimadhukargit Sep 8, 2015
56de02e
Merge branch 'dev' of https://github.com/Azure/azure-powershell into …
AditTulasi Sep 22, 2015
01271f6
Bug #4674630: Register-AzureRMBackupContainer failing with mixed case…
mkherani Sep 22, 2015
045092b
fixing datetime tostring locale issue
AditTulasi Sep 22, 2015
706889d
Merge pull request #149 from MabOneSdk/mkherani-dev1
mkherani Sep 22, 2015
378af92
incorporating comments from CR
AditTulasi Sep 23, 2015
8d5b896
Merge branch 'dev1' of https://github.com/MabOneSdk/azure-powershell …
AditTulasi Sep 23, 2015
405a1ff
Merge pull request #150 from MabOneSdk/dev1
AditTulasi Sep 23, 2015
e1724ad
Merge branch 'dev1' of https://github.com/MabOneSdk/azure-powershell …
pragrawa Sep 23, 2015
3245193
Merging changes from Azure release
AditTulasi Sep 23, 2015
06dd1ed
Merge branch 'release' of https://github.com/MabOneSdk/azure-powershe…
AditTulasi Sep 23, 2015
d357653
Commenting out a test case which is not relevant
AditTulasi Sep 23, 2015
6f62d3a
Adding Force Option for Remove Commandlets
pragrawa Sep 23, 2015
a3fbfe5
Adding Force Option for Remove Commandlets
pragrawa Sep 23, 2015
76327ed
Merge Conflict
pragrawa Sep 23, 2015
ad719be
Merge Conflict
pragrawa Sep 23, 2015
ca64e18
Merge Conflict
pragrawa Sep 23, 2015
58dfc04
Merge Conflict
pragrawa Sep 23, 2015
8da70da
Merge Conflict
pragrawa Sep 24, 2015
2eec883
Merge Conflict
pragrawa Sep 24, 2015
319d397
Merge pull request #145 from MabOneSdk/pragrawadev1
pragrawa Sep 24, 2015
323db1b
Scrub strings
pragrawa Sep 24, 2015
2280573
Merge pull request #151 from MabOneSdk/pragrawadev1
pragrawa Sep 24, 2015
cfacd2b
TestCases
pragrawa Sep 24, 2015
af0e6b6
TestCases
pragrawa Sep 24, 2015
a6562e5
Merge pull request #153 from MabOneSdk/pragrawadev1
pragrawa Sep 24, 2015
9730290
Removing E2ETest
pragrawa Sep 24, 2015
1b43ca4
Merge pull request #154 from MabOneSdk/pragrawadev1
pragrawa Sep 24, 2015
8b14a48
Merge branch 'dev1' into release
pragrawa Sep 24, 2015
773f445
Merge Conflict
pragrawa Sep 24, 2015
f1b0975
Merge Conflict
pragrawa Sep 24, 2015
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
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,6 @@
<Compile Include="ScenarioTests\AzureBackupItemTestCases.cs" />
<Compile Include="ScenarioTests\AzureBackupJobTests.cs" />
<Compile Include="ScenarioTests\AzureBackupPolicyTests.cs" />
<Compile Include="ScenarioTests\AzureBackupScenarioTests.cs" />
<Compile Include="ScenarioTests\AzureBackupTestBase.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="ScenarioTests\AzureBackupVaultTests.cs">
Expand Down Expand Up @@ -172,9 +171,6 @@
<None Include="ScenarioTests\AzureBackupPolicyTests.ps1">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="ScenarioTests\AzureBackupScenarioTests.ps1">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="ScenarioTests\AzureBackupVaultTests.ps1">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
Expand Down Expand Up @@ -229,9 +225,6 @@
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupPolicyTests\SetProtectionPolicyTests.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupScenarioTests\AzureBackupEndToEndTests.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupVaultTests\AzureBackupVaultScenarioTests.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
Expand All @@ -248,7 +241,9 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup />
<ItemGroup>
<Folder Include="SessionRecords\Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupScenarioTests\" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Expand All @@ -259,7 +254,7 @@
<Error Condition="!Exists('..\..\..\packages\xunit.runner.visualstudio.2.1.0-beta4-build1109\build\net20\xunit.runner.visualstudio.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.runner.visualstudio.2.1.0-beta4-build1109\build\net20\xunit.runner.visualstudio.props'))" />
</Target>
<Import Project="..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@
# ----------------------------------------------------------------------------------

$ResourceGroupName = "backuprg"
$ResourceName = "backuprn"
$ContainerName = "iaasvmcontainer;hydrarecordvm;hydrarecordvm"
$ResourceName = "backuprn2"
$ContainerName = "iaasvmcontainer;powershellbvt1;powershellbvt1"
$ContainerType = "IaasVMContainer"
$DataSourceType = "IaasVM"
$DataSourceId = "17593283453810"
$Location = "SouthEast Asia"
$Location = "westus"
$PolicyName = "ProtPolicy01";
$PolicyId = "/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/protectionPolicies/DefaultPolicy";
$POName = "hydrarecordvm"
$itemName = "iaasvmcontainer;hydrarecordvm;hydrarecordvm"
$PolicyId = "/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn2/protectionPolicies/DefaultPolicy";
$POName = "powershellbvt1"
$itemName = "iaasvmcontainer;powershellbvt1;powershellbvt1"


function Test-GetAzureBackupItemTests
Expand Down Expand Up @@ -80,5 +80,5 @@ function Test-DisableAzureBackupProtection
$azureBackUpItem.Type = $DataSourceType
$azureBackUpItem.ItemName = $itemName
$azureBackUpItem.Name = $POName
$jobId1 = Disable-AzureRmBackupProtection -Item $azureBackUpItem
}
$jobId1 = Disable-AzureRmBackupProtection -Item $azureBackUpItem -Force
}
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@
# ----------------------------------------------------------------------------------

$ResourceGroupName = "backuprg"
$ResourceName = "backuprn"
$ResourceName = "backuprn2"
$DataSourceType = "VM"
$Location = "SouthEast Asia"
$Location = "westus"
$PolicyName = "Policy10";
$PolicyId = "c87bbada-6e1b-4db2-b76c-9062d28959a4";
$POName = "iaasvmcontainer;hydrarecordvm;hydrarecordvm"
Expand Down Expand Up @@ -92,8 +92,9 @@ function Test-SetAzureBackupProtectionPolicyTests

function Test-RemoveAzureBackupProtectionPolicyTests
{

$vault = Get-AzureRmBackupVault -Name $ResourceName;
$protectionPolicy = Get-AzureRmBackupProtectionPolicy -vault $vault -Name $PolicyName

Remove-AzureRmBackupProtectionPolicy -ProtectionPolicy $protectionPolicy
}
Remove-AzureRmBackupProtectionPolicy -ProtectionPolicy $protectionPolicy -Force
}

This file was deleted.

This file was deleted.

Loading