Skip to content

hydra recording with csm changes #54

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
pikumarmsft merged 1 commit into from
Aug 14, 2015
Merged

hydra recording with csm changes #54

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
83 changes: 35 additions & 48 deletions src/ResourceManagement/AzureBackup/BackupServices.Tests/BackupServices.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,54 +50,41 @@
<None Include="app.config">
<SubType>Designer</SubType>
</None>
<None Include="SessionRecords\BackupServices.Tests.ContainerTests\EnableContainerReregistrationSetsReregisterFlag.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\BackupServices.Tests.ContainerTests\ListContainersByFriendlyNameAndStatusReturnsValidResponse.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\BackupServices.Tests.ContainerTests\ListContainersByFriendlyNameReturnsValidResponse.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\BackupServices.Tests.ContainerTests\ListContainersByStatusReturnsValidResponse.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\BackupServices.Tests.ContainerTests\ListContainersReturnsNonZeroContainers.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\BackupServices.Tests.ContainerTests\ListMarsContainersByTypeAndFriendlyNameReturnsSameContainer.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\BackupServices.Tests.ContainerTests\ListMarsContainersByTypeReturnsNonZeroContainers.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\BackupServices.Tests.ContainerTests\UnregisterContainerDeletesContainer.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\BackupServices.Tests.VaultTests\CreateOrUpdateVaultReturnsValidCodeTest.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\BackupServices.Tests.VaultTests\DeleteVaultRemovesVaultTest.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\BackupServices.Tests.VaultTests\GetResourceStorageConfigReturnsStorageTypeTest.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\BackupServices.Tests.VaultTests\GetVaultReturnsSameVaultTest.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\BackupServices.Tests.VaultTests\ListVaultsByResourceGroupReturnsVaultsinResourceGroup.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\BackupServices.Tests.VaultTests\ListVaultsReturnsVaultsInSubscriptionTest.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\BackupServices.Tests.VaultTests\UpdateStorageTypeReturnsValidCodeTest.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\BackupServices.Tests.VaultTests\UploadCertReturnsValidResponseTest.json">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="SessionRecords\BackupServices.Tests.BackUpTests\TriggerBackUpTest.json" />
<None Include="SessionRecords\BackupServices.Tests.ContainerTests\EnableContainerReregistrationSetsReregisterFlag.json" />
<None Include="SessionRecords\BackupServices.Tests.ContainerTests\ListContainersByFriendlyNameAndStatusReturnsValidResponse.json" />
<None Include="SessionRecords\BackupServices.Tests.ContainerTests\ListContainersByFriendlyNameReturnsValidResponse.json" />
<None Include="SessionRecords\BackupServices.Tests.ContainerTests\ListContainersByStatusReturnsValidResponse.json" />
<None Include="SessionRecords\BackupServices.Tests.ContainerTests\ListContainersReturnsNonZeroContainers.json" />
<None Include="SessionRecords\BackupServices.Tests.ContainerTests\ListMarsContainersByTypeAndFriendlyNameReturnsSameContainer.json" />
<None Include="SessionRecords\BackupServices.Tests.ContainerTests\ListMarsContainersByTypeReturnsNonZeroContainers.json" />
<None Include="SessionRecords\BackupServices.Tests.ContainerTests\RefreshContainerTest.json" />
<None Include="SessionRecords\BackupServices.Tests.ContainerTests\RegisterContainerTest.json" />
<None Include="SessionRecords\BackupServices.Tests.ContainerTests\UnregisterContainerDeletesContainer.json" />
<None Include="SessionRecords\BackupServices.Tests.ContainerTests\UnregisterContainerTest.json" />
<None Include="SessionRecords\BackupServices.Tests.CSMAzureBackupItem\DisableAzureBackupProtectionTest.json" />
<None Include="SessionRecords\BackupServices.Tests.CSMAzureBackupItem\EnableAzureBackupProtectionTest.json" />
<None Include="SessionRecords\BackupServices.Tests.CSMAzureBackupItem\ListAzureBackupItemDSTest.json" />
<None Include="SessionRecords\BackupServices.Tests.CSMAzureBackupItem\ListAzureBackupItemPOTest.json" />
<None Include="SessionRecords\BackupServices.Tests.CSMAzureBackupItem\UpdateAzureBackupProtectionTest.json" />
<None Include="SessionRecords\BackupServices.Tests.JobsTests\CancelJobTest.json" />
<None Include="SessionRecords\BackupServices.Tests.JobsTests\GetJobDetailsTest.json" />
<None Include="SessionRecords\BackupServices.Tests.JobsTests\ListGetJobsTest.json" />
<None Include="SessionRecords\BackupServices.Tests.ProtectionPolicyTests\AddProtectionPolicyTest.json" />
<None Include="SessionRecords\BackupServices.Tests.ProtectionPolicyTests\DeleteProtectionPolicyTest.json" />
<None Include="SessionRecords\BackupServices.Tests.ProtectionPolicyTests\ListProtectionPolicyTest.json" />
<None Include="SessionRecords\BackupServices.Tests.ProtectionPolicyTests\UpdateProtectionPolicyTest.json" />
<None Include="SessionRecords\BackupServices.Tests.RecoveryPointTests\GetRecoveryPointTest.json" />
<None Include="SessionRecords\BackupServices.Tests.RecoveryPointTests\ListRecoveryPointTest.json" />
<None Include="SessionRecords\BackupServices.Tests.RestoreTests\TriggerRestoreTest.json" />
<None Include="SessionRecords\BackupServices.Tests.VaultTests\CreateOrUpdateVaultReturnsValidCodeTest.json" />
<None Include="SessionRecords\BackupServices.Tests.VaultTests\DeleteVaultRemovesVaultTest.json" />
<None Include="SessionRecords\BackupServices.Tests.VaultTests\GetResourceStorageConfigReturnsStorageTypeTest.json" />
<None Include="SessionRecords\BackupServices.Tests.VaultTests\GetVaultReturnsSameVaultTest.json" />
<None Include="SessionRecords\BackupServices.Tests.VaultTests\ListVaultsByResourceGroupReturnsVaultsinResourceGroup.json" />
<None Include="SessionRecords\BackupServices.Tests.VaultTests\ListVaultsReturnsVaultsInSubscriptionTest.json" />
<None Include="SessionRecords\BackupServices.Tests.VaultTests\UpdateStorageTypeReturnsValidCodeTest.json" />
<None Include="SessionRecords\BackupServices.Tests.VaultTests\UploadCertReturnsValidResponseTest.json" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
Expand Down
2 changes: 0 additions & 2 deletions src/ResourceManagement/AzureBackup/BackupServices.Tests/ScenarioTests/CSMAzureBackupItem.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,8 +148,6 @@ public void ListAzureBackupItemDSTest()
Assert.True(!string.IsNullOrEmpty(ds.Properties.ContainerId), "ContainerId can't be null or empty");
Assert.True(!string.IsNullOrEmpty(ds.Properties.FriendlyName), "FriendlyName can't be null or empty");
Assert.True(!string.IsNullOrEmpty(ds.Properties.ItemType), "ItemType can't be null or empty");
Assert.True(!string.IsNullOrEmpty(ds.Properties.LastBackupJobId), "LastBackupJobId can't be null or empty");
Assert.True(!string.IsNullOrEmpty(ds.Properties.LastBackupStatus), "LastBackupStatus can't be null or empty");
Assert.True(!string.IsNullOrEmpty(ds.Properties.ProtectionPolicyId), "ProtectionPolicyId can't be null or empty");
Assert.True(!string.IsNullOrEmpty(ds.Properties.ProtectionStatus), "ProtectionStatus can't be null or empty");
Assert.True(!string.IsNullOrEmpty(ds.Properties.RecoveryPointsCount.ToString()), "RecoveryPointsCount can't be null or empty");
Expand Down
6 changes: 4 additions & 2 deletions ...urceManagement/AzureBackup/BackupServices.Tests/ScenarioTests/CSMProtectionPolicyTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public void ListProtectionPolicyTest()
Assert.True(!string.IsNullOrEmpty(ppo.Name), "Policy Name can't be null or empty");
if(ppo.Properties.BackupSchedule.ScheduleRun == "Daily")
{
Assert.True(ppo.Properties.LtrRetentionPolicy.DailySchedule == null, "Daily RetentionType can't be null or empty for Daily Schedule");
Assert.True(ppo.Properties.LtrRetentionPolicy.DailySchedule != null, "Daily RetentionType can't be null or empty for Daily Schedule");

}
else
Expand All @@ -57,6 +57,7 @@ public void AddProtectionPolicyTest()
var addProtectionPolicyRequest = new CSMAddProtectionPolicyRequest();
string policyName = ConfigurationManager.AppSettings["PolicyName"];
addProtectionPolicyRequest.PolicyName = ConfigurationManager.AppSettings["PolicyName"];
addProtectionPolicyRequest.Properties = new CSMAddProtectionPolicyRequestProperties();
addProtectionPolicyRequest.Properties.PolicyName = ConfigurationManager.AppSettings["PolicyName"];
addProtectionPolicyRequest.Properties.BackupSchedule = backupSchedule;
addProtectionPolicyRequest.Properties.WorkloadType = ConfigurationManager.AppSettings["WorkloadType"];
Expand All @@ -77,6 +78,7 @@ public void UpdateProtectionPolicyTest()
var backupSchedule = GetBackupSchedule();

var updateProtectionPolicyRequest = new CSMUpdateProtectionPolicyRequest();
updateProtectionPolicyRequest.Properties = new CSMUpdateProtectionPolicyRequestProperties();
updateProtectionPolicyRequest.Properties.PolicyName = ConfigurationManager.AppSettings["ModifiedPolicyName"];
string policyName = ConfigurationManager.AppSettings["PolicyName"];
updateProtectionPolicyRequest.Properties.BackupSchedule = backupSchedule;
Expand All @@ -94,7 +96,7 @@ public void DeleteProtectionPolicyTest()
{
context.Start();
var client = GetServiceClient<BackupServicesManagementClient>();
string policyName = ConfigurationManager.AppSettings["PolicyName"];
string policyName = ConfigurationManager.AppSettings["ModifiedPolicyName"];
var response = client.CSMProtectionPolicy.Delete(policyName, GetCustomRequestHeaders());

Assert.Equal(HttpStatusCode.NoContent, response.StatusCode);
Expand Down
72 changes: 72 additions & 0 deletions ...ckupServices.Tests/SessionRecords/BackupServices.Tests.BackUpTests/TriggerBackUpTest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
{
"Entries": [
{
"RequestUri": "/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/registeredContainers/iaasvmcontainer%3Bhydrarecordvm%3Bhydrarecordvm/protectedItems/iaasvmcontainer%3Bhydrarecordvm%3Bhydrarecordvm/backup?api-version=2014-09-01",
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvZjUzMDNhMGItZmFlNC00Y2RiLWI0NGQtMGU0YzAzMmRkZTI2L3Jlc291cmNlR3JvdXBzL2JhY2t1cHJnL3Byb3ZpZGVycy9NaWNyb3NvZnQuQmFja3VwL0JhY2t1cFZhdWx0L2JhY2t1cHJuL3JlZ2lzdGVyZWRDb250YWluZXJzL2lhYXN2bWNvbnRhaW5lciUzQmh5ZHJhcmVjb3Jkdm0lM0JoeWRyYXJlY29yZHZtL3Byb3RlY3RlZEl0ZW1zL2lhYXN2bWNvbnRhaW5lciUzQmh5ZHJhcmVjb3Jkdm0lM0JoeWRyYXJlY29yZHZtL2JhY2t1cD9hcGktdmVyc2lvbj0yMDE0LTA5LTAx",
"RequestMethod": "POST",
"RequestBody": "",
"RequestHeaders": {
"Accept-Language": [
"en-us"
],
"x-ms-client-request-id": [
"f03afff5-d083-4674-b709-243fcfcf1d77"
],
"User-Agent": [
"Microsoft.Azure.Management.BackupServices.BackupServicesManagementClient/0.0.0.0"
]
},
"ResponseBody": "\"2e6d306d-57aa-479b-9ded-0a2ab871974c\"",
"ResponseHeaders": {
"Content-Length": [
"38"
],
"Content-Type": [
"application/json"
],
"Expires": [
"-1"
],
"Pragma": [
"no-cache"
],
"x-ms-request-id": [
"c0f23ad8-7df7-49b8-ad2e-c9c94e6c825c"
],
"x-ms-client-request-id": [
"f03afff5-d083-4674-b709-243fcfcf1d77",
"f03afff5-d083-4674-b709-243fcfcf1d77"
],
"Strict-Transport-Security": [
"max-age=31536000; includeSubDomains"
],
"x-ms-ratelimit-remaining-subscription-writes": [
"1199"
],
"x-ms-correlation-request-id": [
"c0f23ad8-7df7-49b8-ad2e-c9c94e6c825c"
],
"x-ms-routing-request-id": [
"CENTRALUS:20150813T165043Z:c0f23ad8-7df7-49b8-ad2e-c9c94e6c825c"
],
"Cache-Control": [
"no-cache"
],
"Date": [
"Thu, 13 Aug 2015 16:50:43 GMT"
],
"Server": [
"Microsoft-IIS/8.0"
],
"X-Powered-By": [
"ASP.NET"
]
},
"StatusCode": 202
}
],
"Names": {},
"Variables": {
"SubscriptionId": "f5303a0b-fae4-4cdb-b44d-0e4c032dde26"
}
}
70 changes: 70 additions & 0 deletions ...sionRecords/BackupServices.Tests.CSMAzureBackupItem/DisableAzureBackupProtectionTest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
{
"Entries": [
{
"RequestUri": "/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/registeredContainers/iaasvmcontainer%3Bhydrarecordvm%3Bhydrarecordvm/protectedItems/iaasvmcontainer%3Bhydrarecordvm%3Bhydrarecordvm?api-version=2014-09-01",
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvZjUzMDNhMGItZmFlNC00Y2RiLWI0NGQtMGU0YzAzMmRkZTI2L3Jlc291cmNlR3JvdXBzL2JhY2t1cHJnL3Byb3ZpZGVycy9NaWNyb3NvZnQuQmFja3VwL0JhY2t1cFZhdWx0L2JhY2t1cHJuL3JlZ2lzdGVyZWRDb250YWluZXJzL2lhYXN2bWNvbnRhaW5lciUzQmh5ZHJhcmVjb3Jkdm0lM0JoeWRyYXJlY29yZHZtL3Byb3RlY3RlZEl0ZW1zL2lhYXN2bWNvbnRhaW5lciUzQmh5ZHJhcmVjb3Jkdm0lM0JoeWRyYXJlY29yZHZtP2FwaS12ZXJzaW9uPTIwMTQtMDktMDE=",
"RequestMethod": "DELETE",
"RequestBody": "",
"RequestHeaders": {
"Accept-Language": [
"en-us"
],
"x-ms-client-request-id": [
"24379c2e-699f-4257-a872-2cf62dca9428"
],
"User-Agent": [
"Microsoft.Azure.Management.BackupServices.BackupServicesManagementClient/0.0.0.0"
]
},
"ResponseBody": "\"1d03bcc9-00d5-40ec-ad21-87cfe5147aec\"",
"ResponseHeaders": {
"Content-Length": [
"38"
],
"Content-Type": [
"application/json"
],
"Expires": [
"-1"
],
"Pragma": [
"no-cache"
],
"x-ms-request-id": [
"c9eb858d-b3e2-4d74-9ffc-e804165b0815"
],
"x-ms-client-request-id": [
"24379c2e-699f-4257-a872-2cf62dca9428",
"24379c2e-699f-4257-a872-2cf62dca9428"
],
"Strict-Transport-Security": [
"max-age=31536000; includeSubDomains"
],
"x-ms-ratelimit-remaining-subscription-writes": [
"1198"
],
"x-ms-correlation-request-id": [
"c9eb858d-b3e2-4d74-9ffc-e804165b0815"
],
"x-ms-routing-request-id": [
"CENTRALUS:20150813T152754Z:c9eb858d-b3e2-4d74-9ffc-e804165b0815"
],
"Cache-Control": [
"no-cache"
],
"Date": [
"Thu, 13 Aug 2015 15:27:54 GMT"
],
"Server": [
"Microsoft-IIS/8.0"
],
"X-Powered-By": [
"ASP.NET"
]
},
"StatusCode": 202
}
],
"Names": {},
"Variables": {}
}
76 changes: 76 additions & 0 deletions ...ssionRecords/BackupServices.Tests.CSMAzureBackupItem/EnableAzureBackupProtectionTest.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
{
"Entries": [
{
"RequestUri": "/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/registeredContainers/iaasvmcontainer%3Bhydrarecordvm%3Bhydrarecordvm/protectedItems/iaasvmcontainer%3Bhydrarecordvm%3Bhydrarecordvm?api-version=2014-09-01",
"EncodedRequestUri": "L3N1YnNjcmlwdGlvbnMvZjUzMDNhMGItZmFlNC00Y2RiLWI0NGQtMGU0YzAzMmRkZTI2L3Jlc291cmNlR3JvdXBzL2JhY2t1cHJnL3Byb3ZpZGVycy9NaWNyb3NvZnQuQmFja3VwL0JhY2t1cFZhdWx0L2JhY2t1cHJuL3JlZ2lzdGVyZWRDb250YWluZXJzL2lhYXN2bWNvbnRhaW5lciUzQmh5ZHJhcmVjb3Jkdm0lM0JoeWRyYXJlY29yZHZtL3Byb3RlY3RlZEl0ZW1zL2lhYXN2bWNvbnRhaW5lciUzQmh5ZHJhcmVjb3Jkdm0lM0JoeWRyYXJlY29yZHZtP2FwaS12ZXJzaW9uPTIwMTQtMDktMDE=",
"RequestMethod": "PUT",
"RequestBody": "{\r\n \"properties\": {\r\n \"policyId\": \"/subscriptions/f5303a0b-fae4-4cdb-b44d-0e4c032dde26/resourceGroups/backuprg/providers/Microsoft.Backup/BackupVault/backuprn/protectionPolicies/ProtPolicy01\"\r\n }\r\n}",
"RequestHeaders": {
"Content-Type": [
"application/json"
],
"Content-Length": [
"203"
],
"Accept-Language": [
"en-us"
],
"x-ms-client-request-id": [
"0b674ff5-f40d-450f-8ad1-18320466be81"
],
"User-Agent": [
"Microsoft.Azure.Management.BackupServices.BackupServicesManagementClient/0.0.0.0"
]
},
"ResponseBody": "\"a19cf5c9-26f3-432d-9156-e8c3fe7a5755\"",
"ResponseHeaders": {
"Content-Length": [
"38"
],
"Content-Type": [
"application/json"
],
"Expires": [
"-1"
],
"Pragma": [
"no-cache"
],
"x-ms-request-id": [
"6661a1e1-903f-4bc5-820d-b2c993035a0f"
],
"x-ms-client-request-id": [
"0b674ff5-f40d-450f-8ad1-18320466be81",
"0b674ff5-f40d-450f-8ad1-18320466be81"
],
"Strict-Transport-Security": [
"max-age=31536000; includeSubDomains"
],
"x-ms-ratelimit-remaining-subscription-writes": [
"1198"
],
"x-ms-correlation-request-id": [
"6661a1e1-903f-4bc5-820d-b2c993035a0f"
],
"x-ms-routing-request-id": [
"CENTRALUS:20150813T152815Z:6661a1e1-903f-4bc5-820d-b2c993035a0f"
],
"Cache-Control": [
"no-cache"
],
"Date": [
"Thu, 13 Aug 2015 15:28:15 GMT"
],
"Server": [
"Microsoft-IIS/8.0"
],
"X-Powered-By": [
"ASP.NET"
]
},
"StatusCode": 202
}
],
"Names": {},
"Variables": {}
}
Loading