azure 0.7.0 → 0.7.1

data/lib/azure/version.rb

@@ -17,7 +17,7 @@ module Azure
   class Version
     MAJOR = 0 unless defined? MAJOR
     MINOR = 7 unless defined? MINOR
-    UPDATE = 0 unless defined? UPDATE
+    UPDATE = 1 unless defined? UPDATE
     PRE = nil unless defined? PRE
 
     class << self

data/lib/azure/virtual_machine_management/virtual_machine_management_service.rb

@@ -174,8 +174,8 @@ module Azure
         image = get_image(params[:image])
         options[:os_type] = image.os_type
         validate_deployment_params(params, options, true)
-        cloud_service = client.cloud_service_management
-        cloud_service = cloud_service.get_cloud_service_properties(params[:cloud_service_name])
+        cloud_services = client.cloud_service_management
+        cloud_service = cloud_services.get_cloud_service_properties(params[:cloud_service_name])
         deployment_name = cloud_service.deployment_name
         Azure::Loggerx.error_with_exit "Deployment doesn't exists." if cloud_service && deployment_name.empty?
         others = {}
@@ -195,6 +195,7 @@ module Azure
             existing_ports << endpoint[:public_port]
           end
         end
+        cloud_services.upload_certificate(options[:cloud_service_name], params[:certificate]) unless params[:certificate].empty?
         options[:existing_ports] = existing_ports
         body = Serialization.role_to_xml(params, image, options).to_xml
         path = "/services/hostedservices/#{cloud_service.name}/deployments/#{deployment_name}/roles"
@@ -235,10 +236,10 @@ module Azure
           # Wait for 180s for disk to be released.
           disk = nil
           18.times do
-            print '# '
+            Azure::Loggerx.info '# '
             disk = disk_management_service.get_virtual_machine_disk(disk_name)
             unless disk.attached
-              print "Disk released.\n"
+              Azure::Loggerx.info "Disk released.\n"
               break
             end
             sleep 10

data/lib/azure/virtual_network_management/serialization.rb

@@ -171,7 +171,7 @@ module Azure
         dns_list = {}
         dns_list.merge!(merge_dns(new_dns_servers))
         dns_list.merge!(merge_dns(dns_servers))
-        
+
         dns_list.each do |name, ip_address|
           xml.DnsServer('name' => name, 'IPAddress' => ip_address)
         end
@@ -179,7 +179,7 @@ module Azure
 
       def self.merge_dns(dns_list)
         new_dns_list = {}
-        
+
         dns_list.each do |dns|
           unless dns_list.include?(dns[:name])
             new_dns_list.merge!(dns[:name] => dns[:ip_address])

data/test/fixtures/list_os_images.xml

@@ -61,7 +61,7 @@
     <Eula>http://www.ubuntu.com/project/about-ubuntu/licensing;http://www.ubuntu.com/aboutus/privacypolicy;http://www.ubuntu.com/aboutus/privacypolicy</Eula>
     <Description>Ubuntu Server 12.04.2 LTS (amd64 20130325) for Microsoft Azure. Ubuntu Server is the world's most popular Linux for cloud environments. Updates and patches for Ubuntu 12.04.2 LTS will be available until 2017-04-26.  Ubuntu Server is the perfect platform for all workloads from web applications to NoSQL databases and Hadoop. More information can be found at:
 http://www.ubuntu.com/business/server</Description>
-  </OSImage> 
+  </OSImage>
   <OSImage>
     <Category>SUSE</Category>
     <Label>SUSE Linux Enterprise Server 11 Service Pack 2</Label>

data/test/fixtures/list_virtual_networks.xml

@@ -89,4 +89,3 @@
 		</Subnets>
 	</VirtualNetworkSite>
 </VirtualNetworkSites>
-

data/test/fixtures/management_certificate.pem

@@ -0,0 +1,55 @@
+Bag Attributes
+    localKeyID: 01 00 00 00
+    friendlyName: {D4417DE0-CB19-4947-B5B4-DE6D7F72171D}
+    Microsoft CSP Name: Microsoft Software Key Storage Provider
+Key Attributes: <No Attributes>
+-----BEGIN PRIVATE KEY-----
+MIIEvQIBADANBgkqhkiG9w0BAQEFAASCBKcwggSjAgEAAoIBAQDlVqp43jiBkO2M
+YOpCqofHsFHaooZCmYSAxyZGyxQLPEc4Zvft0uzIdQy6QnzN+MQkQ8hWrL+BNp2S
+NYPFIXY9HYz5BZBMomM/lTsZltLgJSQENE6jTomznCgRy4GNg0hkaGkuhSSbWmBC
+jmlfJXkbZgfGuc5Lz8BZYPWO5hvP23XIRnVIW44oKcQfvkS80qyyzFNa0vdp3rov
+WdKV3QfScDIgTr0FQDANYTYWBV/r4xnXndjLOxgVwU3Kp0WPUkCz3uloMRGWs974
+bpWGwnOblJb4j0X7Q46rTZ4f4HGZlKbeRV/MtPcrZJ+V6ovQ9tz1sUbbCbn4ABag
+m+6NCcqRAgMBAAECggEAHHRMidsOeTrlUke7AQL9/j9o5H7KOCyqdTzgSaPMLJmx
+v3R9GeeT48osBlcV+4a8MMCtNF3SE+LWGYwkuXptnGcUdNglH3D9befi0Ym2R8Or
+7I6d3CK0MJH1IcIVZJyviG+w7ynrURAdRdy8A6dXV5go6lXm296co3ZFeVGhDUCR
+838zthk0Ltf347nLerhJUhJAIOX7Ct21xMOrbT5KfOVThgTxrZKmP29ORMoqnXN8
+8SdpHsdqdNro8uSEARyG80g4ZZVPVqZqRLr+cX080lJ4p8GPf/nPOWGGrtGCCEgI
+1FCX8aWH3PGOSLqo3boSiZfrLHT5BhJsXD/OXJZPzQKBgQD9vl+jiZSHPoo63/JO
+uKS0kGos6ZZc4WvjXx6JBrtnsOdw9YBAPKEY9VYyKi3fnv1v1gIB65e9rfeF+PmI
+KXKLwLcZWFRbaaB3xs3Bxo0Yn1tRRvANDAKR8Xfl77B06j2kKrPmfdEbmd3hHJqN
+ZYG4hj+PR1SQ+0jvwSg7cPtwrQKBgQDnYLxxoejm+JrEVGebvKv3AWDshBN+91dX
+iM4u5zke4qzocp0RYpjIjkUIb6Y/jwxscZmgetu9keDBAFCPU2ReTjFGmHZiip72
+xxQLF2dxlqgcSzURW9SjbstB0LUyxbTwIYTTOavHBrvnkw9S4rgLVHTVWzzInWag
+iw4lbfBp9QKBgC7KTS6F7zqlQK4sn6z+hXi6bKnNhSmpc9CguKvB7wrm5zbAPp8Z
+zwcgLn3fo0fqNIfL6eDaxcd3bf5pc/I02meE6P6meB/HMY0Fe72w1FHnCNrK/vcY
+8Nxir55Z/asBis5cBYKKTuYNEIozURij0DDrqIrON3zoqYF0l+umIOedAoGAYiTn
+ai/qkeaMB5Fh7W6HZxvfmBOiDW4vT0MJal3MHey6uVK8iz5OXmvynlR1qWotM+av
+6qGSigPR2Swf/9u4rEPwpOhQ9xWjvjvNpbLEvyrPnkjMdtOEC9sYPo+f/KxeRqmB
+JPPGiIKzu9PmYRsoRC4L7OBplRMnEBxL4NaUbu0CgYEA2z7BuOzuE3QmxaNzbP7+
+PWkRg0JEFksN/8bRo6fuVMaosEs4jZunCyPk0ne//p+dcKE8cInC9/jGJs5XutUi
+L8KuTu3ljFOLE/y+8FHR/Hxpvzp8k6iDPl7mvvZJ7gt2aO9IZq3XHoRLbgSUPo2X
+YlXoh+vo+SQVRQtbxpuk1gM=
+-----END PRIVATE KEY-----
+Bag Attributes
+    localKeyID: 01 00 00 00
+    friendlyName: Ruby SDK
+subject=/CN=Windows Azure Tools
+issuer=/CN=Windows Azure Tools
+-----BEGIN CERTIFICATE-----
+MIICxDCCAaygAwIBAgIQQ86pQDjNkolP6pILfxFhITANBgkqhkiG9w0BAQUFADAe
+MRwwGgYDVQQDExNXaW5kb3dzIEF6dXJlIFRvb2xzMB4XDTEzMDUxNjA0NDgzNloX
+DTE0MDUxNjA0NDgzNlowHjEcMBoGA1UEAxMTV2luZG93cyBBenVyZSBUb29sczCC
+ASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAOVWqnjeOIGQ7Yxg6kKqh8ew
+UdqihkKZhIDHJkbLFAs8Rzhm9+3S7Mh1DLpCfM34xCRDyFasv4E2nZJ1g8Uhdj0d
+jPkFkEyiYz+VOxmW0uAlJCQ0TqNOibOcKBHLgY2DSGRoaS6FJJtaYEKOaV8leRtm
+B8a5zkvPsFlg9Y7mG8/bdchGdUhbjigpxB++RLzSrLLMU1rS92neui9Z0pXdB9Jw
+MiBOvQVAMA1hNhYFX+vjGded2Ms7GBXBTcqnRY9SQLPe6WgxEZaz3vaulYbCc5uU
+lviPRftDjqtNnh/gcZmUpt5FX8y09ytkn5Xqi9D23PWxRtsJufgAFqCb7o0JypEC
+AwEAATANBgkqhkiG9w0BAQUFAAOCAQEAFkhTUWZN3xvh50zvDBRJgvc83kx61Npl
+J1G6F98aa+mdZmkbXLdNt+dHR+aGg/0RAs97yPoSc9km5uedEpQQD0xDh9X84jSv
+GnrGTsmjBMJvE8jhT0P/zGfTKfncQOx00cVcNm5F1GdWsni7OcVuOLQ+0se8VHsR
+JSQBBWQVZOXJp2zYs935jrI47bCCNSNFQ1sAvxFdMeBZKwtmvhp1c6Zl3j/KVbvL
+S0Izpu1vXvozNDo6HmJPhpONU6qlMfU2iSzUQN21PRt82vMOVx4xyBzbm6vPc50g
+PR10SWXaXL/UmBlxfJ3nhD1YgqIQtWMdbSQ81j3MzrGrrlIdjPUFOw==
+-----END CERTIFICATE-----

data/test/fixtures/management_certificate.publishsettings

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PublishData>
+  <PublishProfile
+    SchemaVersion="2.0"
+    PublishMethod="AzureServiceManagementAPI">
+    <Subscription
+      ServiceManagementUrl="https://management.core.windows.net"
+      Id="subscription-id"
+      Name="Fixtures Publish Settings"
+      ManagementCertificate="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" />
+  </PublishProfile>
+</PublishData>

data/test/fixtures/updated_storage_accounts.xml

@@ -42,14 +42,14 @@
       <AccountType>Standard_GRS</AccountType>
     </StorageServiceProperties>
     <ExtendedProperties>
-    	<ExtendedProperty>
-    		<Name>prop_1_name</Name>
-    		<Value>prop_1_value</Value>
-    	</ExtendedProperty>
-    	<ExtendedProperty>
-    		<Name>prop_2_name</Name>
-    		<Value>prop_2_value</Value>
-    	</ExtendedProperty>
+	<ExtendedProperty>
+		<Name>prop_1_name</Name>
+		<Value>prop_1_value</Value>
+	</ExtendedProperty>
+	<ExtendedProperty>
+		<Name>prop_2_name</Name>
+		<Value>prop_2_value</Value>
+	</ExtendedProperty>
     </ExtendedProperties>
   </StorageService>
 </StorageServices>

data/test/integration/blob/blob_metadata_test.rb

@@ -18,13 +18,13 @@ require "azure/blob/blob_service"
 describe Azure::Blob::BlobService do
   subject { Azure::Blob::BlobService.new }
   after { TableNameHelper.clean }
-  
+
   describe '#set/get_blob_metadata' do
     let(:container_name) { ContainerNameHelper.name }
     let(:blob_name) { "blobname" }
     let(:length) { 1024 }
     let(:metadata){ {"custommetadata" => "CustomMetadataValue"} }
-    before { 
+    before {
       subject.create_container container_name
       subject.create_page_blob container_name, blob_name, length
     }
@@ -40,7 +40,7 @@ describe Azure::Blob::BlobService do
       }
     end
 
-    describe 'when a blob has a snapshot' do 
+    describe 'when a blob has a snapshot' do
       let(:snapshot) { subject.create_blob_snapshot container_name, blob_name, {:metadata => metadata }}
       before { s = snapshot }
 
@@ -53,7 +53,7 @@ describe Azure::Blob::BlobService do
           blob.metadata.must_include k
           blob.metadata[k].must_equal v
         }
-          
+
       end
 
       it 'errors if the snapshot does not exist' do
@@ -62,7 +62,7 @@ describe Azure::Blob::BlobService do
         end
       end
     end
-    
+
     it 'errors if the blob name does not exist' do
       assert_raises(Azure::Core::Http::HTTPError) do
         subject.get_blob_metadata container_name, "thisblobdoesnotexist"

data/test/integration/blob/blob_pages_test.rb

@@ -18,17 +18,17 @@ require 'azure/blob/blob_service'
 describe Azure::Blob::BlobService do
   subject { Azure::Blob::BlobService.new }
   after { TableNameHelper.clean }
-  
+
   let(:container_name) { ContainerNameHelper.name }
   let(:blob_name) { 'blobname' }
   let(:blob_name2) { 'blobname2' }
   let(:length) { 2560 }
-  before { 
+  before {
     subject.create_container container_name
     subject.create_page_blob container_name, blob_name, length
     subject.create_page_blob container_name, blob_name2, length
   }
-  
+
   describe '#create_blob_pages' do
     it 'creates pages in a page blob' do
       content = ''
@@ -67,7 +67,7 @@ describe Azure::Blob::BlobService do
   end
 
   describe '#clear_blob_pages' do
-    before { 
+    before {
       content = ''
       512.times.each{|i| content << '@' }
 
@@ -100,7 +100,7 @@ describe Azure::Blob::BlobService do
   end
 
   describe '#list_page_blob_ranges' do
-    before { 
+    before {
       content = ''
       512.times.each{|i| content << '@' }
 

data/test/integration/blob/blob_properties_test.rb

@@ -23,7 +23,7 @@ describe Azure::Blob::BlobService do
     let(:container_name) { ContainerNameHelper.name }
     let(:blob_name) { "blobname" }
     let(:length) { 1024 }
-    before { 
+    before {
       subject.create_container container_name
       subject.create_page_blob container_name, blob_name, length
     }
@@ -47,7 +47,7 @@ describe Azure::Blob::BlobService do
       before {
         subject.set_blob_properties container_name, blob_name, options
       }
-      
+
       it 'gets properties for a blob snapshot' do
         snapshot = subject.create_blob_snapshot container_name, blob_name
         blob = subject.get_blob_properties container_name, blob_name, { :snapshot => snapshot }
@@ -64,7 +64,7 @@ describe Azure::Blob::BlobService do
         end
       end
     end
-    
+
     it 'errors if the blob name does not exist' do
       assert_raises(Azure::Core::Http::HTTPError) do
         subject.get_blob_properties container_name, "thisblobdoesnotexist"

data/test/integration/blob/block_blob_test.rb

@@ -18,19 +18,68 @@ require 'base64'
 
 describe Azure::Blob::BlobService do
   subject { Azure::Blob::BlobService.new }
-  after { TableNameHelper.clean }
 
   let(:container_name) { ContainerNameHelper.name }
   let(:blob_name) { "blobname" }
   let(:content) { content = ""; 512.times.each{|i| content << "@" }; content }
-  before { 
-    subject.create_container container_name
-  }
-  
+  let(:file_path) { "/tmp/azure-sdk-for-ruby-blob.txt" }
+
+  before { subject.create_container container_name }
+  after { ContainerNameHelper.clean }
+
   describe '#create_block_blob' do
-    it 'creates a page blob' do
-      blob = subject.create_block_blob container_name, blob_name, content
+    it 'creates a block blob with String body (default encoding)' do
+      subject.create_block_blob container_name, blob_name, content
+      blob = subject.get_blob_properties container_name, blob_name
+      blob.name.must_equal blob_name
+      blob.properties[:content_encoding].must_equal content.encoding.to_s.downcase
+    end
+
+    it 'creates a block blob with String body (content-encoding)' do
+      options = {
+        :content_encoding=>"ascii"
+      }
+
+      subject.create_block_blob container_name, blob_name, content, options
+      blob = subject.get_blob_properties container_name, blob_name
       blob.name.must_equal blob_name
+      blob.properties[:content_encoding].must_equal options[:content_encoding]
+    end  
+
+    it 'creates a block blob with IO body (default encoding)' do
+      begin 
+        File.delete(file_path) if File.exist?(file_path)
+        File.write(file_path, content);         
+        file = File.open(file_path)
+
+        subject.create_block_blob container_name, blob_name, file
+        blob = subject.get_blob_properties container_name, blob_name
+        blob.name.must_equal blob_name
+        blob.properties[:content_encoding].must_equal file.external_encoding.to_s.downcase
+      ensure 
+        file.close if file
+        File.delete(file_path) if File.exist?(file_path)
+      end 
+    end
+
+    it 'creates a block blob with IO body (content-encoding)' do
+      begin 
+        options = {
+          :content_encoding=>"ascii"
+        }
+        
+        File.delete(file_path) if File.exist?(file_path)
+        File.write(file_path, content); 
+        file = File.open(file_path)
+
+        subject.create_block_blob container_name, blob_name, file, options
+        blob = subject.get_blob_properties container_name, blob_name
+        blob.name.must_equal blob_name
+        blob.properties[:content_encoding].must_equal options[:content_encoding]
+      ensure 
+        file.close if file
+        File.delete(file_path) if File.exist?(file_path)
+      end 
     end
 
     it 'sets additional properties when the options hash is used' do
@@ -78,7 +127,7 @@ describe Azure::Blob::BlobService do
 
   describe '#commit_blob_blocks' do
     let(:blocklist) { [["anyblockid0"], ["anyblockid1"]] }
-    before { 
+    before {
       blocklist.each { |block_entry|
         subject.create_blob_block container_name, blob_name, block_entry[0], content
       }
@@ -111,8 +160,8 @@ describe Azure::Blob::BlobService do
 
   describe '#list_blob_blocks' do
     let(:blocklist) { [["anyblockid0"], ["anyblockid1"], ["anyblockid2"], ["anyblockid3"]] }
-    before { 
-      
+    before {
+
       subject.create_blob_block container_name, blob_name, blocklist[0][0], content
       subject.create_blob_block container_name, blob_name, blocklist[1][0], content
 
@@ -140,7 +189,7 @@ describe Azure::Blob::BlobService do
 
       uncommitted = result[:uncommitted]
       uncommitted.length.must_equal 2
-      
+
       expected_blocks = blocklist.slice(2..3).each
 
       uncommitted.each { |block|
@@ -156,10 +205,10 @@ describe Azure::Blob::BlobService do
 
         committed = result[:committed]
         committed.length.must_equal 0
-   
+
         uncommitted = result[:uncommitted]
         uncommitted.length.must_equal 2
-        
+
         expected_blocks = blocklist.slice(2..3).each
 
         uncommitted.each { |block|
@@ -168,13 +217,13 @@ describe Azure::Blob::BlobService do
           block.size.must_equal 512
         }
       end
-      
+
       it 'lists committed blocks only if :committed is passed' do
         result = subject.list_blob_blocks container_name, blob_name, { :blocklist_type => :committed }
 
         committed = result[:committed]
         committed.length.must_equal 2
-        
+
         expected_blocks = blocklist.slice(0..1).each
 
         committed.each { |block|

data/test/integration/blob/container/container_acl_test.rb

@@ -19,7 +19,7 @@ require "azure/service/signed_identifier"
 describe Azure::Blob::BlobService do
   subject { Azure::Blob::BlobService.new }
   after { TableNameHelper.clean }
-  
+
   describe '#set/get_container_acl' do
     let(:container_name) { ContainerNameHelper.name }
     let(:public_access_level) { :container.to_s }
@@ -31,7 +31,7 @@ describe Azure::Blob::BlobService do
       identifier.access_policy.permission = "rwd"
       [identifier]
     }
-    before { 
+    before {
       subject.create_container container_name
     }
 

data/test/integration/blob/container/container_metadata_test.rb

@@ -18,11 +18,11 @@ require "azure/blob/blob_service"
 describe Azure::Blob::BlobService do
   subject { Azure::Blob::BlobService.new }
   after { TableNameHelper.clean }
-  
+
   describe '#set/get_container_metadata' do
     let(:container_name) { ContainerNameHelper.name }
     let(:metadata) { { "CustomMetadataProperty"=>"CustomMetadataValue" } }
-    before { 
+    before {
       subject.create_container container_name
     }
 

data/test/integration/blob/container/create_container_test.rb

@@ -32,7 +32,7 @@ describe Azure::Blob::BlobService do
       metadata = { 'CustomMetadataProperty' => 'CustomMetadataValue'}
 
       container = subject.create_container container_name, { :metadata => metadata }
-      
+
       container.name.must_equal container_name
       container.metadata.must_equal metadata
       container = subject.get_container_metadata container_name
@@ -45,12 +45,12 @@ describe Azure::Blob::BlobService do
 
     it 'errors if the container already exists' do
       subject.create_container container_name
-      
+
       assert_raises(Azure::Core::Http::HTTPError) do
         subject.create_container container_name
       end
     end
-    
+
     it 'errors if the container name is invalid' do
       assert_raises(Azure::Core::Http::HTTPError) do
         subject.create_container 'this_container.cannot-exist!'