Skip to content

Commit 064327b

Browse files
ogailogail
committed
Merge pull request #200 from akromm/dev-Sql-Fixes-20150225
Dev sql fixes 20150225
2 parents 3a6dc7e + e9ca017 commit 064327b

File tree

11 files changed

+568
-17
lines changed

11 files changed

+568
-17
lines changed

‎src/ServiceManagement/Sql/Commands.SqlDatabase.Test/Commands.SqlDatabase.Test.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -143,6 +143,7 @@
143143
<Compile Include="Properties\AssemblyInfo.cs" />
144144
<Compile Include="FunctionalTests\ServerTest.cs" />
145145
<Compile Include="UnitTests\Database\Cmdlet\AzureSqlDatabaseCertAuthTests.cs" />
146+
<Compile Include="UnitTests\Database\Cmdlet\ImportExportv12Tests.cs" />
146147
<Compile Include="UnitTests\Database\Cmdlet\RecoverDatabaseTests.cs" />
147148
<Compile Include="UnitTests\Database\Cmdlet\GetRecoverableDatabaseTests.cs" />
148149
<Compile Include="UnitTests\Database\Cmdlet\GetRestorableDroppedDatabaseCertAuthTests.cs" />

‎src/ServiceManagement/Sql/Commands.SqlDatabase.Test/Resources/MockSessions.xml

Lines changed: 275 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10779,6 +10779,281 @@
1077910779
</HttpMessage>
1078010780
</Messages>
1078110781
</HttpSession>
10782+
<HttpSession>
10783+
<Name>UnitTest.ImportExportAzureSqlDatabaseTestsv12</Name>
10784+
<Messages>
10785+
<HttpMessage>
10786+
<Index>0</Index>
10787+
<RequestInfo>
10788+
<RequestUri>https://localhost:65432/00000000-0000-0000-0001-000000000001/services/sqlservers/servers/myserver01/DacOperations/Export</RequestUri>
10789+
<Method>POST</Method>
10790+
<UserAgent>Microsoft.WindowsAzure.Management.Sql.SqlManagementClient/0.9.0.0 AzurePowershell/v0.8.14</UserAgent>
10791+
<Headers>
10792+
<Header>
10793+
<Name>x-ms-version</Name>
10794+
<Value>2012-03-01</Value>
10795+
</Header>
10796+
</Headers>
10797+
<Cookies />
10798+
<RequestText>
10799+
&lt;ExportInput xmlns="http://schemas.datacontract.org/2004/07/Microsoft.SqlServer.Management.Dac.ServiceTypes"&gt;
10800+
&lt;BlobCredentials p2:type="BlobStorageAccessKeyCredentials" xmlns:p2="http://www.w3.org/2001/XMLSchema-instance"&gt;
10801+
&lt;Uri&gt;https://teststore001.blob.core.windows.net/testcontainer001/backup1&lt;/Uri&gt;
10802+
&lt;StorageAccessKey&gt;MBa5B5VhKcnx/tJlPfIOB44BiAfTkFYBb1uyMVzNFJN2S7FW10dxcC0ScfoPQJKIIi3dFaeLTuc39vATKlDrLA==&lt;/StorageAccessKey&gt;
10803+
&lt;/BlobCredentials&gt;
10804+
&lt;ConnectionInfo&gt;
10805+
&lt;DatabaseName&gt;testdb1&lt;/DatabaseName&gt;
10806+
&lt;Password&gt;Pa$$w0rd!&lt;/Password&gt;
10807+
&lt;ServerName&gt;myserver01.database.windows.net&lt;/ServerName&gt;
10808+
&lt;UserName&gt;mylogin&lt;/UserName&gt;
10809+
&lt;/ConnectionInfo&gt;
10810+
&lt;/ExportInput&gt;
10811+
</RequestText>
10812+
<ContentType>application/xml</ContentType>
10813+
<Accept i:nil="true" />
10814+
</RequestInfo>
10815+
<ResponseInfo>
10816+
<StatusCode>OK</StatusCode>
10817+
<Headers>
10818+
<Header>
10819+
<Name>x-ms-servedbyregion</Name>
10820+
<Value>ussouth</Value>
10821+
</Header>
10822+
<Header>
10823+
<Name>X-Content-Type-Options</Name>
10824+
<Value>nosniff</Value>
10825+
</Header>
10826+
<Header>
10827+
<Name>x-ms-request-id</Name>
10828+
<Value>53d57f9d1f7e10d990c974636e9b4403</Value>
10829+
</Header>
10830+
<Header>
10831+
<Name>Cache-Control</Name>
10832+
<Value>no-store,no-cache</Value>
10833+
</Header>
10834+
<Header>
10835+
<Name>Content-Type</Name>
10836+
<Value>application/xml; charset=utf-8</Value>
10837+
</Header>
10838+
<Header>
10839+
<Name>Date</Name>
10840+
<Value>Mon, 14 Oct 2013 20:00:26 GMT</Value>
10841+
</Header>
10842+
<Header>
10843+
<Name>Server</Name>
10844+
<Value>1.0.6198.12 (rd_rdfe_stable.131001-0757) Microsoft-HTTPAPI/2.0</Value>
10845+
</Header>
10846+
<Header>
10847+
<Name>X-Powered-By</Name>
10848+
<Value>ASP.NET</Value>
10849+
</Header>
10850+
</Headers>
10851+
<Cookies />
10852+
<ResponseText>&lt;guid xmlns="http://schemas.microsoft.com/2003/10/Serialization/"&gt;a0db20f9-9402-4866-bc97-6089b47218ac&lt;/guid&gt;</ResponseText>
10853+
</ResponseInfo>
10854+
</HttpMessage>
10855+
<HttpMessage>
10856+
<Index>1</Index>
10857+
<RequestInfo>
10858+
<RequestUri>https://localhost:65432/00000000-0000-0000-0001-000000000001/services/sqlservers/servers/myserver01/DacOperations/Status</RequestUri>
10859+
<Method>POST</Method>
10860+
<UserAgent>Microsoft.WindowsAzure.Management.Sql.SqlManagementClient/0.9.0.0 AzurePowershell/v0.8.14</UserAgent>
10861+
<Headers>
10862+
<Header>
10863+
<Name>x-ms-version</Name>
10864+
<Value>2012-03-01</Value>
10865+
</Header>
10866+
</Headers>
10867+
<Cookies />
10868+
<RequestText>
10869+
&lt;StatusInput xmlns="http://schemas.datacontract.org/2004/07/Microsoft.SqlServer.Management.Dac.ServiceTypes"&gt;
10870+
&lt;Password&gt;Pa$$w0rd!&lt;/Password&gt;
10871+
&lt;RequestId&gt;a0db20f9-9402-4866-bc97-6089b47218ac&lt;/RequestId&gt;
10872+
&lt;ServerName&gt;myserver01.database.windows.net&lt;/ServerName&gt;
10873+
&lt;UserName&gt;mylogin&lt;/UserName&gt;
10874+
&lt;/StatusInput&gt;
10875+
</RequestText>
10876+
<ContentType i:nil="true" />
10877+
<Accept i:nil="true" />
10878+
</RequestInfo>
10879+
<ResponseInfo>
10880+
<StatusCode>OK</StatusCode>
10881+
<Headers>
10882+
<Header>
10883+
<Name>x-ms-servedbyregion</Name>
10884+
<Value>ussouth</Value>
10885+
</Header>
10886+
<Header>
10887+
<Name>X-Content-Type-Options</Name>
10888+
<Value>nosniff</Value>
10889+
</Header>
10890+
<Header>
10891+
<Name>x-ms-request-id</Name>
10892+
<Value>5b82c182db8a1e43839e7eba409747dd</Value>
10893+
</Header>
10894+
<Header>
10895+
<Name>Cache-Control</Name>
10896+
<Value>no-store,no-cache</Value>
10897+
</Header>
10898+
<Header>
10899+
<Name>Content-Type</Name>
10900+
<Value>application/xml; charset=utf-8</Value>
10901+
</Header>
10902+
<Header>
10903+
<Name>Date</Name>
10904+
<Value>Mon, 14 Oct 2013 20:00:28 GMT</Value>
10905+
</Header>
10906+
<Header>
10907+
<Name>Server</Name>
10908+
<Value>1.0.6198.12 (rd_rdfe_stable.131001-0757) Microsoft-HTTPAPI/2.0</Value>
10909+
</Header>
10910+
<Header>
10911+
<Name>X-Powered-By</Name>
10912+
<Value>ASP.NET</Value>
10913+
</Header>
10914+
</Headers>
10915+
<Cookies />
10916+
<ResponseText>&lt;ArrayOfStatusInfo xmlns="http://schemas.datacontract.org/2004/07/Microsoft.SqlServer.Management.Dac.ServiceTypes" xmlns:i="http://www.w3.org/2001/XMLSchema-instance"&gt;&lt;StatusInfo&gt;&lt;BlobUri&gt;https://teststore001.blob.core.windows.net/testcontainer001/backup1&lt;/BlobUri&gt;&lt;DatabaseName&gt;testdb1&lt;/DatabaseName&gt;&lt;ErrorMessage i:nil="true"/&gt;&lt;LastModifiedTime&gt;2013-10-14T20:00:26.975667Z&lt;/LastModifiedTime&gt;&lt;QueuedTime&gt;2013-10-14T20:00:26.975667Z&lt;/QueuedTime&gt;&lt;RequestId&gt;a0db20f9-9402-4866-bc97-6089b47218ac&lt;/RequestId&gt;&lt;RequestType&gt;Export&lt;/RequestType&gt;&lt;ServerName&gt;myserver01.database.windows.net&lt;/ServerName&gt;&lt;Status&gt;Pending&lt;/Status&gt;&lt;/StatusInfo&gt;&lt;/ArrayOfStatusInfo&gt;</ResponseText>
10917+
</ResponseInfo>
10918+
</HttpMessage>
10919+
<HttpMessage>
10920+
<Index>2</Index>
10921+
<RequestInfo>
10922+
<RequestUri>https://localhost:65432/00000000-0000-0000-0001-000000000001/services/sqlservers/servers/myserver01/DacOperations/Import</RequestUri>
10923+
<Method>POST</Method>
10924+
<UserAgent>Microsoft.WindowsAzure.Management.Sql.SqlManagementClient/0.9.0.0 AzurePowershell/v0.8.14</UserAgent>
10925+
<Headers>
10926+
<Header>
10927+
<Name>x-ms-version</Name>
10928+
<Value>2012-03-01</Value>
10929+
</Header>
10930+
</Headers>
10931+
<Cookies />
10932+
<RequestText>
10933+
&lt;ImportInput xmlns="http://schemas.datacontract.org/2004/07/Microsoft.SqlServer.Management.Dac.ServiceTypes"&gt;
10934+
&lt;AzureEdition&gt;Business&lt;/AzureEdition&gt;
10935+
&lt;BlobCredentials p2:type="BlobStorageAccessKeyCredentials" xmlns:p2="http://www.w3.org/2001/XMLSchema-instance"&gt;
10936+
&lt;Uri&gt;https://teststore001.blob.core.windows.net/testcontainer001/backup1&lt;/Uri&gt;
10937+
&lt;StorageAccessKey&gt;MBa5B5VhKcnx/tJlPfIOB44BiAfTkFYBb1uyMVzNFJN2S7FW10dxcC0ScfoPQJKIIi3dFaeLTuc39vATKlDrLA==&lt;/StorageAccessKey&gt;
10938+
&lt;/BlobCredentials&gt;
10939+
&lt;ConnectionInfo&gt;
10940+
&lt;DatabaseName&gt;testdb2&lt;/DatabaseName&gt;
10941+
&lt;Password&gt;Pa$$w0rd!&lt;/Password&gt;
10942+
&lt;ServerName&gt;myserver01.database.windows.net&lt;/ServerName&gt;
10943+
&lt;UserName&gt;mylogin&lt;/UserName&gt;
10944+
&lt;/ConnectionInfo&gt;
10945+
&lt;DatabaseSizeInGB&gt;10&lt;/DatabaseSizeInGB&gt;
10946+
&lt;/ImportInput&gt;
10947+
</RequestText>
10948+
<ContentType>application/xml</ContentType>
10949+
<Accept i:nil="true" />
10950+
</RequestInfo>
10951+
<ResponseInfo>
10952+
<StatusCode>OK</StatusCode>
10953+
<Headers>
10954+
<Header>
10955+
<Name>x-ms-servedbyregion</Name>
10956+
<Value>ussouth</Value>
10957+
</Header>
10958+
<Header>
10959+
<Name>X-Content-Type-Options</Name>
10960+
<Value>nosniff</Value>
10961+
</Header>
10962+
<Header>
10963+
<Name>x-ms-request-id</Name>
10964+
<Value>66df8e085fe4107781bee75569a6beaf</Value>
10965+
</Header>
10966+
<Header>
10967+
<Name>Cache-Control</Name>
10968+
<Value>no-store,no-cache</Value>
10969+
</Header>
10970+
<Header>
10971+
<Name>Content-Type</Name>
10972+
<Value>application/xml; charset=utf-8</Value>
10973+
</Header>
10974+
<Header>
10975+
<Name>Date</Name>
10976+
<Value>Mon, 14 Oct 2013 20:00:54 GMT</Value>
10977+
</Header>
10978+
<Header>
10979+
<Name>Server</Name>
10980+
<Value>1.0.6198.12 (rd_rdfe_stable.131001-0757) Microsoft-HTTPAPI/2.0</Value>
10981+
</Header>
10982+
<Header>
10983+
<Name>X-Powered-By</Name>
10984+
<Value>ASP.NET</Value>
10985+
</Header>
10986+
</Headers>
10987+
<Cookies />
10988+
<ResponseText>&lt;guid xmlns="http://schemas.microsoft.com/2003/10/Serialization/"&gt;ed1806ab-d5e8-44e9-a464-16ca73936dc7&lt;/guid&gt;</ResponseText>
10989+
</ResponseInfo>
10990+
</HttpMessage>
10991+
<HttpMessage>
10992+
<Index>3</Index>
10993+
<RequestInfo>
10994+
<RequestUri>https://localhost:65432/00000000-0000-0000-0001-000000000001/services/sqlservers/servers/myserver01/DacOperations/Status</RequestUri>
10995+
<Method>POST</Method>
10996+
<UserAgent>Microsoft.WindowsAzure.Management.Sql.SqlManagementClient/0.9.0.0 AzurePowershell/v0.8.14</UserAgent>
10997+
<Headers>
10998+
<Header>
10999+
<Name>x-ms-version</Name>
11000+
<Value>2012-03-01</Value>
11001+
</Header>
11002+
</Headers>
11003+
<Cookies />
11004+
<RequestText>
11005+
&lt;StatusInput xmlns="http://schemas.datacontract.org/2004/07/Microsoft.SqlServer.Management.Dac.ServiceTypes"&gt;
11006+
&lt;Password&gt;Pa$$w0rd!&lt;/Password&gt;
11007+
&lt;RequestId&gt;ed1806ab-d5e8-44e9-a464-16ca73936dc7&lt;/RequestId&gt;
11008+
&lt;ServerName&gt;myserver01.database.windows.net&lt;/ServerName&gt;
11009+
&lt;UserName&gt;mylogin&lt;/UserName&gt;
11010+
&lt;/StatusInput&gt;
11011+
</RequestText>
11012+
<ContentType i:nil="true" />
11013+
<Accept i:nil="true" />
11014+
</RequestInfo>
11015+
<ResponseInfo>
11016+
<StatusCode>OK</StatusCode>
11017+
<Headers>
11018+
<Header>
11019+
<Name>x-ms-servedbyregion</Name>
11020+
<Value>ussouth</Value>
11021+
</Header>
11022+
<Header>
11023+
<Name>X-Content-Type-Options</Name>
11024+
<Value>nosniff</Value>
11025+
</Header>
11026+
<Header>
11027+
<Name>x-ms-request-id</Name>
11028+
<Value>cab0140b2e6e163eac6aac5e2feb89b3</Value>
11029+
</Header>
11030+
<Header>
11031+
<Name>Cache-Control</Name>
11032+
<Value>no-store,no-cache</Value>
11033+
</Header>
11034+
<Header>
11035+
<Name>Content-Type</Name>
11036+
<Value>application/xml; charset=utf-8</Value>
11037+
</Header>
11038+
<Header>
11039+
<Name>Date</Name>
11040+
<Value>Mon, 14 Oct 2013 20:01:04 GMT</Value>
11041+
</Header>
11042+
<Header>
11043+
<Name>Server</Name>
11044+
<Value>1.0.6198.12 (rd_rdfe_stable.131001-0757) Microsoft-HTTPAPI/2.0</Value>
11045+
</Header>
11046+
<Header>
11047+
<Name>X-Powered-By</Name>
11048+
<Value>ASP.NET</Value>
11049+
</Header>
11050+
</Headers>
11051+
<Cookies />
11052+
<ResponseText>&lt;ArrayOfStatusInfo xmlns="http://schemas.datacontract.org/2004/07/Microsoft.SqlServer.Management.Dac.ServiceTypes" xmlns:i="http://www.w3.org/2001/XMLSchema-instance"&gt;&lt;StatusInfo&gt;&lt;BlobUri&gt;https://teststore001.blob.core.windows.net/testcontainer001/backup1&lt;/BlobUri&gt;&lt;DatabaseName&gt;testdb2&lt;/DatabaseName&gt;&lt;ErrorMessage i:nil="true"/&gt;&lt;LastModifiedTime&gt;2013-10-14T20:00:57.5641172Z&lt;/LastModifiedTime&gt;&lt;QueuedTime&gt;2013-10-14T20:00:49.1482703Z&lt;/QueuedTime&gt;&lt;RequestId&gt;ed1806ab-d5e8-44e9-a464-16ca73936dc7&lt;/RequestId&gt;&lt;RequestType&gt;Import&lt;/RequestType&gt;&lt;ServerName&gt;myserver01.database.windows.net&lt;/ServerName&gt;&lt;Status&gt;Completed&lt;/Status&gt;&lt;/StatusInfo&gt;&lt;/ArrayOfStatusInfo&gt;</ResponseText>
11053+
</ResponseInfo>
11054+
</HttpMessage>
11055+
</Messages>
11056+
</HttpSession>
1078211057
<HttpSession>
1078311058
<Name>UnitTest.AzureSqlDatabaseCertTests</Name>
1078411059
<Messages>

0 commit comments

Comments
 (0)