azure 0.6.4 → 0.7.0.pre

data/test/unit/service/serialization_test.rb

@@ -214,7 +214,7 @@ describe Azure::Service::Serialization do
   end
 
   describe "#retention_policy_from_xml" do
-    let(:retention_policy_xml) { Nokogiri.Slop(Fixtures["storage_service_properties"]).root.Metrics.RetentionPolicy }
+    let(:retention_policy_xml) { Nokogiri.Slop(Fixtures["storage_service_properties"]).root.HourMetrics.RetentionPolicy }
     
     it "accepts an XML Node" do
       subject.retention_policy_from_xml retention_policy_xml
@@ -233,7 +233,7 @@ describe Azure::Service::Serialization do
     end
   end
 
-  describe "#metrics_to_xml" do
+  describe "#hour_metrics_to_xml" do
     let(:metrics) { 
       metrics = Azure::Service::Metrics.new
       metrics.version = "1.0"
@@ -250,20 +250,20 @@ describe Azure::Service::Serialization do
     
     it "accepts a Metrics instance and an Nokogiri::XML::Builder instance" do
       Nokogiri::XML::Builder.new do |xml|
-        subject.metrics_to_xml metrics, xml
+        subject.hour_metrics_to_xml metrics, xml
       end
     end
 
     it "adds to the XML Builder, which will create the XML graph of the provided values" do
       builder = Nokogiri::XML::Builder.new do |xml|
-        subject.metrics_to_xml metrics, xml
+        subject.hour_metrics_to_xml metrics, xml
       end
       builder.to_xml.must_equal metrics_xml
     end
   end
   
   describe "#metrics_from_xml" do
-    let(:metrics_xml) { Nokogiri.Slop(Fixtures["storage_service_properties"]).root.Metrics }
+    let(:metrics_xml) { Nokogiri.Slop(Fixtures["storage_service_properties"]).root.HourMetrics }
     let(:mock_retention_policy) { mock }
 
     before { 
@@ -362,7 +362,7 @@ describe Azure::Service::Serialization do
       retention_policy.enabled = true
       retention_policy.days = 7
 
-      metrics = service_properties.metrics = Azure::Service::Metrics.new
+      metrics = service_properties.hour_metrics = Azure::Service::Metrics.new
       metrics.version = "1.0"
       metrics.enabled = true
       metrics.include_apis = false
@@ -370,6 +370,35 @@ describe Azure::Service::Serialization do
       retention_policy.enabled = true
       retention_policy.days = 7
 
+      service_properties.minute_metrics = metrics
+
+      service_properties.cors = Azure::Service::Cors.new do |cors|
+        cors.cors_rules = []
+        cors.cors_rules.push(Azure::Service::CorsRule.new { |cors_rule|
+          cors_rule.allowed_origins = ["http://www.contoso.com", "http://dummy.uri"]
+          cors_rule.allowed_methods = ["PUT", "HEAD"]
+          cors_rule.max_age_in_seconds = 5
+          cors_rule.exposed_headers = ["x-ms-*"]
+          cors_rule.allowed_headers = ["x-ms-blob-content-type", "x-ms-blob-content-disposition"]
+        })
+
+        cors.cors_rules.push(Azure::Service::CorsRule.new { |cors_rule|
+          cors_rule.allowed_origins = ["*"]
+          cors_rule.allowed_methods = ["PUT", "GET"]
+          cors_rule.max_age_in_seconds = 5
+          cors_rule.exposed_headers = ["x-ms-*"]
+          cors_rule.allowed_headers = ["x-ms-blob-content-type", "x-ms-blob-content-disposition"]
+        })
+
+        cors.cors_rules.push(Azure::Service::CorsRule.new { |cors_rule|
+          cors_rule.allowed_origins = ["http://www.contoso.com"]
+          cors_rule.allowed_methods = ["GET"]
+          cors_rule.max_age_in_seconds = 5
+          cors_rule.exposed_headers = ["x-ms-*"]
+          cors_rule.allowed_headers = ["x-ms-client-request-id"]
+        })
+      end
+
       service_properties
     }
     
@@ -389,10 +418,12 @@ describe Azure::Service::Serialization do
     let(:service_properties_xml) { Fixtures["storage_service_properties"]}
     let(:mock_logging) { mock }
     let(:mock_metrics) { mock }
+    let(:mock_cors) { mock }
 
     before { 
       subject.expects(:logging_from_xml).returns(mock_logging)
-      subject.expects(:metrics_from_xml).returns(mock_metrics)
+      subject.expects(:metrics_from_xml).twice.returns(mock_metrics)
+      subject.expects(:cors_from_xml).returns(mock_cors)
     }
     
     it "accepts an XML string" do
@@ -407,9 +438,9 @@ describe Azure::Service::Serialization do
 
     it "sets the properties of the StorageServiceProperties instance" do
       service_properties = subject.service_properties_from_xml service_properties_xml
-      service_properties.default_service_version.must_equal "2011-08-18"
       service_properties.logging.must_equal mock_logging
-      service_properties.metrics.must_equal mock_metrics
+      service_properties.hour_metrics.must_equal mock_metrics
+      service_properties.minute_metrics.must_equal mock_metrics
     end
   end
 

data/test/unit/service/storage_service_test.rb

@@ -21,7 +21,7 @@ require "azure/service/storage_service_properties"
 describe Azure::Service::StorageService do
 
   let(:uri){ URI.parse "http://dummy.uri/resource" }
-  let(:method){ :get }
+  let(:verb){ :get }
 
   subject do
     storage_service = Azure::Service::StorageService.new
@@ -34,7 +34,7 @@ describe Azure::Service::StorageService do
     let(:mock_signer_filter){ mock() }
 
     before do 
-      Azure::Core::Http::HttpRequest.stubs(:new).with(method, uri, nil).returns(mock_request)
+      Azure::Core::Http::HttpRequest.stubs(:new).with(verb, uri, nil).returns(mock_request)
       Azure::Core::Http::SignerFilter.stubs(:new).returns(mock_signer_filter)
 
       mock_request.expects(:call)
@@ -42,7 +42,7 @@ describe Azure::Service::StorageService do
 
     it "adds a SignerFilter to the HTTP pipeline" do
       mock_request.expects(:with_filter).with(mock_signer_filter)
-      subject.call(method, uri)
+      subject.call(verb, uri)
     end
 
     describe "when passed the optional headers arguement" do
@@ -58,7 +58,7 @@ describe Azure::Service::StorageService do
 
       it "merges the custom headers with the HttpRequest headers" do
         mock_request.expects(:headers).returns(mock_headers).at_least(2)
-        subject.call(method, uri, nil, { "Custom-Header"=>"CustomValue"} )
+        subject.call(verb, uri, nil, { "Custom-Header"=>"CustomValue"} )
 
         mock_headers["Other-Header"].must_equal "SomeValue"
         mock_headers["Custom-Header"].must_equal "CustomValue"
@@ -72,8 +72,8 @@ describe Azure::Service::StorageService do
       end
 
       it "passes the body to the to HttpRequest" do
-        Azure::Core::Http::HttpRequest.stubs(:new).with(method, uri, 'body').returns(mock_request)
-        subject.call(method, uri, "body")
+        Azure::Core::Http::HttpRequest.stubs(:new).with(verb, uri, 'body').returns(mock_request)
+        subject.call(verb, uri, "body")
       end
     end
 
@@ -92,7 +92,7 @@ describe Azure::Service::StorageService do
         mock_request.expects(:with_filter).with(filter)
         mock_request.expects(:with_filter).with(filter1)
         
-        subject.call(method, uri)
+        subject.call(verb, uri)
       end
     end
   end
@@ -142,11 +142,12 @@ describe Azure::Service::StorageService do
     }
 
     let(:service_properties_uri) { URI.parse 'http://dummy.uri/service/properties' }
+    let(:service_properties_headers) { {"x-ms-version" => "2013-08-15"} }
 
     before do 
       Azure::Service::Serialization.stubs(:service_properties_from_xml).with(service_properties_xml).returns(service_properties)
       subject.stubs(:service_properties_uri).returns(service_properties_uri)
-      subject.stubs(:call).with(:get, service_properties_uri).returns(response)
+      subject.stubs(:call).with(:get, service_properties_uri, nil, service_properties_headers).returns(response)
     end
 
     it "calls the service_properties_uri method to determine the correct uri" do
@@ -155,7 +156,7 @@ describe Azure::Service::StorageService do
     end
 
     it "gets the response from the HTTP API" do
-      subject.expects(:call).with(:get, service_properties_uri).returns(response)
+      subject.expects(:call).with(:get, service_properties_uri, nil, service_properties_headers).returns(response)
       subject.get_service_properties
     end
 
@@ -180,11 +181,12 @@ describe Azure::Service::StorageService do
     }
 
     let(:service_properties_uri) { URI.parse 'http://dummy.uri/service/properties' }
+    let(:service_properties_headers) { {"x-ms-version" => "2013-08-15"} }
 
     before do 
       Azure::Service::Serialization.stubs(:service_properties_to_xml).with(service_properties).returns(service_properties_xml)
       subject.stubs(:service_properties_uri).returns(service_properties_uri)
-      subject.stubs(:call).with(:put, service_properties_uri, service_properties_xml).returns(response)
+      subject.stubs(:call).with(:put, service_properties_uri, service_properties_xml, service_properties_headers).returns(response)
     end
 
     it "calls the service_properties_uri method to determine the correct uri" do
@@ -193,7 +195,7 @@ describe Azure::Service::StorageService do
     end
 
     it "posts to the HTTP API" do
-      subject.expects(:call).with(:put, service_properties_uri, service_properties_xml).returns(response)
+      subject.expects(:call).with(:put, service_properties_uri, service_properties_xml, service_properties_headers).returns(response)
       subject.set_service_properties service_properties
     end
 

data/test/unit/storage_management/serialization_test.rb

@@ -34,7 +34,7 @@ describe Azure::StorageManagement::Serialization do
   end
 
   describe "#storage_services_to_xml" do
-    let(:storage_service_name) {'storage-service'}
+    let(:storage_service_name) { 'storage-service' }
     let(:storage_options) { {
         :extended_properties=> {
           :prop_1_name=>"prop_1_value"
@@ -57,14 +57,18 @@ describe Azure::StorageManagement::Serialization do
     end
 
     it "serializes the options hash to xml" do
-      results = subject.storage_services_to_xml(storage_service_name, {:location => 'East US'})
+      results = subject.storage_services_to_xml(storage_service_name, :location => 'East US')
       doc = Nokogiri::XML results
       doc.css('Location').text.must_equal 'East US'
       results.must_be_kind_of String
     end
 
     it "uses affinity_group from the hash instead of location" do
-      results = subject.storage_services_to_xml(storage_service_name, {:affinity_group_name => 'my-affinity-group', :location => 'East US'})
+      params = {
+        :affinity_group_name => 'my-affinity-group',
+        :location => 'East US'
+      }
+      results = subject.storage_services_to_xml(storage_service_name, params)
       doc = Nokogiri::XML results
       doc.css('AffinityGroup').text.must_equal 'my-affinity-group'
       results.must_be_kind_of String
@@ -142,15 +146,10 @@ describe Azure::StorageManagement::Serialization do
       }
     }
 
-    let(:no_options_message) {'No options specified'}
-    let(:label_or_desc_required) { 'Either one of Label or Description has to be provided. Both cannot be empty' }
-
-    it "checks if the parameter is nil" do
-      exception = assert_raises RuntimeError do
-        subject.storage_update_to_xml nil
-      end
-      assert_match no_options_message, exception.message
-    end
+    let(:no_options_message) { 'No options specified' }
+    let(:label_or_desc_required) {
+      'Either one of Label or Description has to be provided.'
+    }
 
     it "checks if the parameter is empty" do
       exception = assert_raises RuntimeError do
@@ -224,9 +223,22 @@ describe Azure::StorageManagement::Serialization do
       update_xml.css('GeoReplicationEnabled').size.must_equal(1)
       update_xml.css('ExtendedProperties ExtendedProperty').size.must_equal(1)
       update_xml.css('ExtendedProperties ExtendedProperty Name').text
-        .must_equal("#{:prop_1_name}")
+      .must_equal("#{:prop_1_name}")
       update_xml.css('ExtendedProperties ExtendedProperty Value')
-        .text.must_equal(options[:extended_properties][:prop_1_name])
+      .text.must_equal(options[:extended_properties][:prop_1_name])
     end
   end
+
+  describe "#regenerate_storage_account_keys_from_xml" do
+    let(:storage_services_access_keys) { Fixtures["storage_service_keys"] }
+
+    it "returns an Array of StorageService instances" do
+      storage_keys_xml = Nokogiri::XML(storage_services_access_keys)
+      result = subject.storage_account_keys_from_xml storage_keys_xml
+      result.must_be_kind_of Azure::StorageManagement::StorageAccountKeys
+      result.primary_key.wont_be_nil
+      result.secondary_key.wont_be_nil
+    end
+  end
+
 end

data/test/unit/storage_management/storage_management_service_test.rb

@@ -17,11 +17,11 @@ require "test_helper"
 describe Azure::StorageManagementService do
 
   subject { Azure::StorageManagementService.new }
-  let(:request_path) {'/services/storageservices'}
+  let(:request_path) { '/services/storageservices' }
   let(:storage_accounts_xml) { Fixtures["list_storage_accounts"] }
-  let(:one_storage_account_xml) { Fixtures['list_storage_account_single']}
-  let(:method) { :get }
-  let(:mock_request){ mock() }
+  let(:one_storage_account_xml) { Fixtures['list_storage_account_single'] }
+  let(:verb) { :get }
+  let(:mock_request) { mock() }
 
   let(:response) {
     response = mock()
@@ -35,16 +35,16 @@ describe Azure::StorageManagementService do
     single_response
   }
 
-  let(:response_body) {Nokogiri::XML response.body}
+  let(:response_body) { Nokogiri::XML response.body }
   let(:single_response_body) { Nokogiri::XML single_response.body }
 
-  before{
-    Loggerx.expects(:puts).returns(nil).at_least(0)
+  before {
+    Azure::Loggerx.expects(:puts).returns(nil).at_least(0)
   }
 
   describe "#list_storage_accounts" do
     before {
-      ManagementHttpRequest.stubs(:new).with(method, request_path, nil).returns(mock_request)
+      Azure::BaseManagement::ManagementHttpRequest.stubs(:new).with(verb, request_path, nil).returns(mock_request)
       mock_request.expects(:call).returns(response_body)
     }
 
@@ -67,8 +67,8 @@ describe Azure::StorageManagementService do
 
   describe "#list_storage_accounts_single" do
     before {
-      ManagementHttpRequest.stubs(:new).with(
-        method, request_path, nil
+      Azure::BaseManagement::ManagementHttpRequest.stubs(:new).with(
+          verb, request_path, nil
       ).returns(mock_request)
       mock_request.expects(:call).returns(single_response_body)
     }
@@ -84,7 +84,7 @@ describe Azure::StorageManagementService do
 
   describe "#get_storage_account" do
     before {
-      ManagementHttpRequest.stubs(:new).with(method, request_path, nil).returns(mock_request)
+      Azure::BaseManagement::ManagementHttpRequest.stubs(:new).with(verb, request_path, nil).returns(mock_request)
       mock_request.expects(:call).returns(response_body)
     }
 
@@ -92,22 +92,24 @@ describe Azure::StorageManagementService do
       subject.get_storage_account 'storage1'
     end
 
-    it "returns true if found storage account with given name" do
-      result = subject.get_storage_account 'storage1'
-      result.must_equal true
+    it "returns storage account instance" do
+      storage_account_name = 'storage1'
+      result = subject.get_storage_account storage_account_name
+      result.must_be_kind_of Azure::StorageManagement::StorageAccount
+      result.name.must_equal storage_account_name
     end
 
     it "returns false if storage account with given name doesn't exists" do
       result = subject.get_storage_account 'storage3'
-      result.must_equal false
+      result.must_equal nil
     end
   end
 
   describe "#create_storage_account" do
     let(:options) {
       {
-        location: 'East Asia',
-        description: 'Test Storage Description'
+          location: 'East Asia',
+          description: 'Test Storage Description'
       }
     }
 
@@ -133,14 +135,14 @@ describe Azure::StorageManagementService do
     end
 
     it "Create storage account return message if storage account exists of given name." do
-      ManagementHttpRequest.any_instance.expects(:call).returns response_body
+      Azure::BaseManagement::ManagementHttpRequest.any_instance.expects(:call).returns response_body
       msg = subject.create_storage_account 'storage1'
       assert_match(/^Storage Account storage1 already exist.*/, msg)
     end
 
     it "Create storage account if storage account doesn't exists of given name." do
       Azure::StorageManagementService.any_instance.stubs(:get_storage_account).with('storage3').returns(false)
-      ManagementHttpRequest.any_instance.expects(:call).returns nil
+      Azure::BaseManagement::ManagementHttpRequest.any_instance.expects(:call).returns nil
       subject.create_storage_account 'storage3'
     end
 
@@ -149,15 +151,12 @@ describe Azure::StorageManagementService do
   describe "#update_storage_account" do
     let(:updated_accounts_xml) { Fixtures["updated_storage_accounts"] }
     let(:no_options_specified) { 'No options specified' }
-    let(:update_storage_account_req) { Fixtures["update_storage_account"] }
-
-    let(:updated_storage_account_mock_request){ mock() }
-    let(:updated_storage_account_response) {
+    let(:sa_response) {
       updated_storage_account_response = mock()
       updated_storage_account_response.stubs(:body).returns(updated_accounts_xml)
       updated_storage_account_response
+      Nokogiri::XML updated_storage_account_response.body
     }
-    let(:updated_storage_account_response_body) {Nokogiri::XML updated_storage_account_response.body}
 
     let(:update_request) {
       update_request = mock()
@@ -166,10 +165,8 @@ describe Azure::StorageManagementService do
     }
 
     before {
-      ManagementHttpRequest.stubs(:new).with(method, request_path, nil).returns(mock_request)
+      Azure::BaseManagement::ManagementHttpRequest.stubs(:new).with(verb, request_path, nil).returns(mock_request)
       mock_request.expects(:call).returns(response_body)
-
-      Azure::StorageManagement::Serialization.stubs(:update_storage_account).returns(update_storage_account_req)
     }
 
     let(:options) { {
@@ -177,18 +174,11 @@ describe Azure::StorageManagementService do
         label: 'Test Label',
         geo_replication_enabled: false,
         extended_properties: {
-          prop_1_name: 'prop_1_value',
-          prop_2_name: 'prop_2_value'
+            prop_1_name: 'prop_1_value',
+            prop_2_name: 'prop_2_value'
         }
-      }
     }
-
-    it "checks if nil options is provided" do
-      exception = assert_raises RuntimeError do
-        subject.update_storage_account 'storage2', nil
-      end
-      assert_match no_options_specified, exception.message
-    end
+    }
 
     it "checks if empty options is provided" do
       exception = assert_raises RuntimeError do
@@ -203,26 +193,20 @@ describe Azure::StorageManagementService do
     end
 
     it "updates the specified account" do
-      ManagementHttpRequest.stubs(:new).with(:put, "#{request_path}/storage2", update_storage_account_req).returns(update_request)
-      update_request.expects(:call).returns('')
-
+      Azure::BaseManagement::ManagementHttpRequest.stubs(:new).with(
+        :put,
+        "#{request_path}/storage2",
+        Fixtures['update_storage_account']
+      ).returns(update_request)
+      update_request.expects(:call)
       subject.update_storage_account 'storage2', options
-
-      ManagementHttpRequest.stubs(:new).with(method, request_path, nil).returns(updated_storage_account_mock_request)
-      updated_storage_account_mock_request.expects(:call).returns(updated_storage_account_response_body)
-
-      accounts = subject.list_storage_accounts
-
-      accounts.each { |account|
-        next unless account.name == 'storage2'
-
-        account.name.must_equal 'storage2'
-        account.label.must_equal options[:label]
-        account.geo_replication_enabled.must_equal "#{options[:geo_replication_enabled]}"
-
-        account.extended_properties.each { |prop|
-          prop[:value].must_equal "#{options[:extended_properties][:"#{prop[:name]}"]}"
-        }
+      mock_request.expects(:call).returns(sa_response)
+      storage_account = subject.list_storage_accounts.last
+      storage_account.name.must_equal 'storage2'
+      storage_account.label.must_equal options[:label]
+      storage_account.geo_replication_enabled.must_equal "#{options[:geo_replication_enabled]}"
+      storage_account.extended_properties.each { |prop|
+        prop[:value].must_equal "#{options[:extended_properties][:"#{prop[:name]}"]}"
       }
     end
   end
@@ -244,18 +228,20 @@ describe Azure::StorageManagementService do
     }
 
     before {
-      ManagementHttpRequest.stubs(:new).with(
-        :get, request_path, nil
+      Azure::BaseManagement::ManagementHttpRequest.stubs(:new).with(
+          :get, request_path, nil
       ).returns(get_account_mock_request)
       get_account_mock_request.expects(:call).returns(
-        get_account_response_body
+          get_account_response_body
       )
     }
 
     it 'returns the label as a Base64 decoded string' do
-      account = subject.get_storage_account_properties(account_name)
-      account.label.must_be_kind_of(String)
-      account.label.must_equal(label)
+      storage_account = subject.get_storage_account_properties(account_name)
+      storage_account.label.must_be_kind_of(String)
+      storage_account.label.must_equal(label)
+      storage_account.account_type.must_equal 'Standard_GRS'
+      storage_account.geo_primary_region.must_equal 'West US'
     end
   end
 end