azure 0.6.4 → 0.7.0.pre

data/test/integration/cloud_service/Cloud_Create_test.rb

@@ -15,6 +15,7 @@
 require 'integration/test_helper'
 
 describe Azure::CloudServiceManagementService do
+  include Azure::Core::Utility
 
   subject { Azure::CloudServiceManagementService.new }
   let(:options) do
@@ -25,7 +26,7 @@ describe Azure::CloudServiceManagementService do
   end
 
   before do
-    Loggerx.expects(:puts).returns(nil).at_least(0)
+    Azure::Loggerx.expects(:puts).returns(nil).at_least(0)
   end
 
   describe '#create_cloud_service' do
@@ -34,7 +35,7 @@ describe Azure::CloudServiceManagementService do
       subject.create_cloud_service(@cloud_name, options)
     end
 
-    it 'Creates a new cloud service in Windows Azure.' do
+    it 'Creates a new cloud service in Microsoft Azure.' do
       cloud_service = subject.get_cloud_service_properties(@cloud_name)
       assert cloud_service.name, @cloud_name
       assert cloud_service.location, options[:location]

data/test/integration/cloud_service/Cloud_Delete_test.rb

@@ -15,6 +15,7 @@
 require 'integration/test_helper'
 
 describe Azure::CloudServiceManagementService do
+  include Azure::Core::Utility
 
   subject { Azure::CloudServiceManagementService.new }
 
@@ -26,7 +27,7 @@ describe Azure::CloudServiceManagementService do
   end
 
   before do
-    Loggerx.expects(:puts).returns(nil).at_least(0)
+    Azure::Loggerx.expects(:puts).returns(nil).at_least(0)
   end
 
   describe '#delete_cloud_service' do
@@ -35,10 +36,10 @@ describe Azure::CloudServiceManagementService do
       subject.create_cloud_service(@cloud_name, options)
     end
 
-    it 'Deletes the cloud service in Windows Azure.' do
+    it 'Deletes the cloud service in Microsoft Azure.' do
       subject.delete_cloud_service(@cloud_name)
-      present = subject.get_cloud_service(@cloud_name)
-      assert_equal present, false
+      cloud_service = subject.get_cloud_service(@cloud_name)
+      cloud_service.must_equal nil
     end
   end
 end

data/test/integration/database/create_sql_server_firewall_test.rb

@@ -23,7 +23,7 @@ describe Azure::SqlDatabaseManagementService do
   describe "#set_sql_server_firewall_rule" do
 
     before {
-      Loggerx.expects(:puts).returns(nil).at_least(0)
+      Azure::Loggerx.expects(:puts).returns(nil).at_least(0)
     }
 
     after {

data/test/integration/database/create_sql_server_test.rb

@@ -21,7 +21,7 @@ describe Azure::SqlDatabaseManagementService do
   describe "#create_server" do
 
     before {
-      Loggerx.expects(:puts).returns(nil).at_least(0)
+      Azure::Loggerx.expects(:puts).returns(nil).at_least(0)
     }
 
     it "should be able to create a new sql database server." do

data/test/integration/database/delete_sql_server_firewall_test.rb

@@ -21,7 +21,7 @@ describe Azure::SqlDatabaseManagementService do
   subject { Azure::SqlDatabaseManagementService.new }
 
   before {
-    Loggerx.expects(:puts).returns(nil).at_least(0)
+    Azure::Loggerx.expects(:puts).returns(nil).at_least(0)
     subject.set_sql_server_firewall_rule(sql_server.name, "rule1")
     ip_range = {:start_ip_address => "10.20.30.0", :end_ip_address => "10.20.30.255"}
     subject.set_sql_server_firewall_rule(sql_server.name, "rule2", ip_range)

data/test/integration/database/delete_sql_server_test.rb

@@ -17,7 +17,7 @@ require "integration/test_helper"
 describe Azure::SqlDatabaseManagementService do
 
   before {
-    Loggerx.expects(:puts).returns(nil).at_least(0)
+    Azure::Loggerx.expects(:puts).returns(nil).at_least(0)
   }
 
   subject { Azure::SqlDatabaseManagementService.new }

data/test/integration/database/list_sql_server_firewall_test.rb

@@ -22,7 +22,7 @@ describe Azure::SqlDatabaseManagementService do
   describe "#list_sql_server_firewall_rules" do
 
     before {
-      Loggerx.expects(:puts).returns(nil).at_least(0)
+      Azure::Loggerx.expects(:puts).returns(nil).at_least(0)
       ip_range = {:start_ip_address => "10.20.30.0", :end_ip_address => "10.20.30.255"}
       subject.set_sql_server_firewall_rule(sql_server.name, "rule1", ip_range)
       subject.set_sql_server_firewall_rule(sql_server.name, "rule2")

data/test/integration/database/list_sql_servers_test.rb

@@ -21,7 +21,7 @@ describe Azure::SqlDatabaseManagementService do
   describe "#list_servers" do
 
     before {
-      Loggerx.expects(:puts).returns(nil).at_least(0)
+      Azure::Loggerx.expects(:puts).returns(nil).at_least(0)
     }
 
     it "returns a list of SQL databse servers" do

data/test/integration/database/reset_password_sql_server_test.rb

@@ -23,7 +23,7 @@ describe Azure::SqlDatabaseManagementService do
   describe "#reset_password" do
 
     before {
-      Loggerx.expects(:puts).returns(nil).at_least(0)
+      Azure::Loggerx.expects(:puts).returns(nil).at_least(0)
     }
 
     after {

data/test/integration/service_bus/queues_test.rb

@@ -17,7 +17,7 @@ require "integration/test_helper"
 describe "ServiceBus Queues" do
 
   subject { Azure::ServiceBus::ServiceBusService.new }
-  let(:name) { ServiceBusQueueNameHelper.name }
+  let(:queue_name) { ServiceBusQueueNameHelper.name }
   let(:name_alternative) { ServiceBusQueueNameHelper.name }
   let(:description) {{
     :default_message_time_to_live => 'P10675199DT2H48M5.4775807S',
@@ -44,15 +44,15 @@ describe "ServiceBus Queues" do
   after { ServiceBusQueueNameHelper.clean }
 
   it "should be able to create a new queue from a string" do
-    queue = subject.create_queue name
+    queue = subject.create_queue queue_name
     queue.must_be_kind_of Azure::ServiceBus::Queue
-    queue.name.must_equal name
+    queue.name.must_equal queue_name
   end
 
   it "should be able to create a new queue from a Queue" do
-    queue = subject.create_queue Azure::ServiceBus::Queue.new(name)
+    queue = subject.create_queue Azure::ServiceBus::Queue.new(queue_name)
     queue.must_be_kind_of Azure::ServiceBus::Queue
-    queue.name.must_equal name
+    queue.name.must_equal queue_name
   end
 
   it "should be able to create a new queue from a string and description Hash" do
@@ -88,7 +88,7 @@ describe "ServiceBus Queues" do
   end
 
   describe 'when a queue exists' do
-    before { subject.create_queue name }
+    before { subject.create_queue queue_name }
 
     describe '#delete_queue' do
       it "should raise exception if the queue cannot be deleted" do
@@ -98,17 +98,17 @@ describe "ServiceBus Queues" do
       end
 
       it "should be able to delete the queue" do
-        response = subject.delete_queue name
+        response = subject.delete_queue queue_name
         response.must_equal nil
       end
     end
 
     describe "#get_queue" do
       it "should be able to get a queue by name" do
-        result = subject.get_queue name
+        result = subject.get_queue queue_name
 
         result.must_be_kind_of Azure::ServiceBus::Queue
-        result.name.must_equal name
+        result.name.must_equal queue_name
       end
 
       it "if the queue doesn't exists it should throw" do
@@ -134,7 +134,7 @@ describe "ServiceBus Queues" do
         q1_found = false
         q2_found = false
         result.each { |q|
-          q_found = true if q.name == name
+          q_found = true if q.name == queue_name
           q1_found = true if q.name == name1
           q2_found = true if q.name == name2
         }
@@ -168,7 +168,7 @@ describe "ServiceBus Queues" do
       msg = Azure::ServiceBus::BrokeredMessage.new("some text") do |m|
         m.to = "yo"
       end
-      res = subject.send_queue_message name, msg
+      res = subject.send_queue_message queue_name, msg
       res.must_be_nil
     end
 
@@ -190,10 +190,10 @@ describe "ServiceBus Queues" do
       }}
       let(:msg) { m = Azure::ServiceBus::BrokeredMessage.new(messageContent, properties); m.to = 'me'; m }
       
-      before { subject.send_queue_message name, msg }
+      before { subject.send_queue_message queue_name, msg }
       
       it "should be able to peek a message from a queue" do
-        retrieved = subject.peek_lock_queue_message name
+        retrieved = subject.peek_lock_queue_message queue_name
         retrieved.must_be :kind_of?, Azure::ServiceBus::BrokeredMessage
 
         retrieved.body.must_equal msg.body
@@ -214,22 +214,22 @@ describe "ServiceBus Queues" do
       end
 
       it "should be able to read-delete a message from a queue" do
-        retrieved = subject.read_delete_queue_message name
+        retrieved = subject.read_delete_queue_message queue_name
 
         retrieved.must_be :kind_of?, Azure::ServiceBus::BrokeredMessage
         retrieved.body.must_equal msg.body
         retrieved.to.must_equal msg.to
 
         # it should be deleted
-        retrieved = subject.read_delete_queue_message name, { :timeout => 2 }
+        retrieved = subject.read_delete_queue_message queue_name, { :timeout => 2 }
         retrieved.must_be_nil
       end
 
       it "should be able to unlock a message from a queue" do
-        retrieved = subject.peek_lock_queue_message name, { :timeout => 2 }
+        retrieved = subject.peek_lock_queue_message queue_name, { :timeout => 2 }
 
         # There shouldn't be an available message in the queue
-        retrieved2 = subject.peek_lock_queue_message name, { :timeout => 2 }
+        retrieved2 = subject.peek_lock_queue_message queue_name, { :timeout => 2 }
         retrieved2.must_be_nil
 
         # Unlock the message
@@ -237,25 +237,25 @@ describe "ServiceBus Queues" do
         res.must_be_nil
 
         # The message should be available once again
-        retrieved = subject.peek_lock_queue_message name, { :timeout => 2 }
+        retrieved = subject.peek_lock_queue_message queue_name, { :timeout => 2 }
         retrieved.body.must_equal msg.body
       end
     
       it "should be able to delete a message from a queue" do
 
-        retrieved = subject.peek_lock_queue_message name
+        retrieved = subject.peek_lock_queue_message queue_name
         retrieved.body.must_equal msg.body
 
         subject.delete_queue_message retrieved
 
         # it should be deleted
-        retrieved = subject.peek_lock_queue_message name, { :timeout => 2 }
+        retrieved = subject.peek_lock_queue_message queue_name, { :timeout => 2 }
         assert_nil retrieved
       end
 
       it "should be able to read a message from a queue" do
-        subject.send_queue_message name, msg
-        retrieved = subject.receive_queue_message name
+        subject.send_queue_message queue_name, msg
+        retrieved = subject.receive_queue_message queue_name
 
         retrieved.must_be :kind_of?, Azure::ServiceBus::BrokeredMessage
         retrieved.body.must_equal msg.body

data/test/integration/service_bus/relay_test.rb

@@ -0,0 +1,132 @@
+#-------------------------------------------------------------------------
+# # Copyright (c) Microsoft and contributors. All rights reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#--------------------------------------------------------------------------
+require "integration/test_helper"
+
+describe "ServiceBus Relay" do
+
+  subject { Azure::ServiceBus::ServiceBusService.new }
+  let(:bus_name) { ServiceBusRelayNameHelper.name }
+  let(:name_alternative) { ServiceBusRelayNameHelper.name }
+  let(:description) {{
+    :relay_type => 'Http',
+    :requires_client_authorization => true,
+    :requires_transport_security => true
+  }}
+  let(:description_alternative) {{
+    :relay_type => 'NetTcp',
+    :requires_client_authorization => false,
+    :requires_transport_security => false
+  }}
+
+  after { ServiceBusRelayNameHelper.clean }
+
+  it "should be able to create a new relay endpoint from a string and description Hash" do
+    relay = subject.create_relay name_alternative, description_alternative
+    relay.must_be_kind_of Azure::ServiceBus::Relay
+    relay.name.must_equal name_alternative
+
+    relay.relay_type.must_equal description_alternative[:relay_type]
+    relay.requires_client_authorization.must_equal description_alternative[:requires_client_authorization]
+    relay.requires_transport_security.must_equal description_alternative[:requires_transport_security]
+  end
+
+  it "should be able to create a new relay from a Relay with a description Hash" do
+    relay = subject.create_relay Azure::ServiceBus::Relay.new(name_alternative, description_alternative)
+    relay.must_be_kind_of Azure::ServiceBus::Relay
+    relay.name.must_equal name_alternative
+
+    relay.relay_type.must_equal description_alternative[:relay_type]
+    relay.requires_client_authorization.must_equal description_alternative[:requires_client_authorization]
+    relay.requires_transport_security.must_equal description_alternative[:requires_transport_security]
+  end
+
+  describe 'when a relay exists' do
+    before { subject.create_relay bus_name, description }
+
+    describe "#get_relay" do
+      it "should be able to get a relay by name" do
+        result = subject.get_relay bus_name
+
+        result.must_be_kind_of Azure::ServiceBus::Relay
+        result.name.must_equal bus_name
+      end
+
+      it "if the relay endpoint doesn't exists it should throw" do
+        assert_raises(Azure::Core::Http::HTTPError) do
+          subject.get_relay ServiceBusRelayNameHelper.name
+        end
+      end
+    end
+
+    describe '#delete_relay' do
+      it "should raise exception if the relay endpoint cannot be deleted" do
+        assert_raises(Azure::Core::Http::HTTPError) do
+          subject.delete_relay ServiceBusRelayNameHelper.name
+        end
+      end
+
+      it "should be able to delete the relay endpoint" do
+        response = subject.delete_relay bus_name
+        response.must_equal nil
+      end
+    end
+
+    describe 'when there are multiple relay endpoints' do
+      let(:name1) { ServiceBusRelayNameHelper.name }
+      let(:name2) { ServiceBusRelayNameHelper.name }
+      before { 
+        subject.create_relay name1, description
+        subject.create_relay name2, description_alternative
+      }
+      
+      it "should be able to get a list of relays" do
+        result = subject.list_relays
+
+        result.must_be :kind_of?, Array
+        q_found = false
+        q1_found = false
+        q2_found = false
+        result.each { |q|
+          q_found = true if q.name == bus_name
+          q1_found = true if q.name == name1
+          q2_found = true if q.name == name2
+        }
+        assert (q_found and q1_found and q2_found), "list_relays did not return expected relay endpoints"
+      end
+
+      it "should be able to use $skip token with list_relays" do
+        result = subject.list_relays
+        result2 = subject.list_relays({ :skip => 1 })
+        result2.length.must_equal result.length - 1
+        result2[0].id.must_equal result[1].id
+      end
+      
+      it "should be able to use $top token with list_relays" do
+        result = subject.list_relays
+        result.length.wont_equal 1
+
+        result2 = subject.list_relays({ :top => 1 })
+        result2.length.must_equal 1
+      end
+
+      it "should be able to use $skip and $top token together with list_relays" do
+        result = subject.list_relays
+        result2 = subject.list_relays({ :skip => 1, :top => 1 })
+        result2.length.must_equal 1
+        result2[0].id.must_equal result[1].id
+      end
+    end
+  end
+end

data/test/integration/storage_management/storage_management_test.rb

@@ -15,14 +15,16 @@
 require 'integration/test_helper'
 
 describe Azure::StorageManagementService do
+
+  util = Class.new.extend(Azure::Core::Utility)
   subject { Azure::StorageManagementService.new }
-  affinity_name = random_string('affinity-group-', 10)
+  affinity_name = util.random_string('affinity-group-', 10)
   Azure::BaseManagementService.new.create_affinity_group(
     affinity_name,
     'West US',
     'Label Name'
   )
-  StorageName =  random_string('storagetest', 10)
+  StorageName =  util.random_string('storagetest', 10)
   opts = {
     affinity_group_name: affinity_name,
     label: 'storagelabel',
@@ -33,12 +35,11 @@ describe Azure::StorageManagementService do
 
   let(:affinity_group_name) { affinity_name }
   let(:storage_name) { Time.now.getutc.to_i.to_s }
-  let(:location) { 'West US' }
   let(:label) { 'Label Name' }
   let(:options) { { description: 'sample description' } }
 
   before do
-    Loggerx.expects(:puts).returns(nil).at_least(0)
+    Azure::Loggerx.expects(:puts).returns(nil).at_least(0)
   end
 
   it 'list storage accounts' do
@@ -47,9 +48,9 @@ describe Azure::StorageManagementService do
     storagelist.must_be_kind_of Array
   end
 
-  it 'get storage account' do
+  it 'get_storage_account return nil if storage account with given name not exists' do
     storage = subject.get_storage_account('nonexistentstorage')
-    storage.must_equal false
+    storage.must_equal nil
   end
 
   it 'create storage account' do
@@ -60,18 +61,18 @@ describe Azure::StorageManagementService do
       geo_replication_enabled: 'false'
     }
     subject.create_storage_account(storage_name, options)
-    present = subject.get_storage_account(storage_name)
-    present.must_equal true
+    storage_account = subject.get_storage_account(storage_name)
+    storage_account.must_be_kind_of Azure::StorageManagement::StorageAccount
     # Test for delete storage account
     subject.delete_storage_account(storage_name)
-    present = subject.get_storage_account(storage_name)
-    present.must_equal false
+    storage_account = subject.get_storage_account(storage_name)
+    storage_account.must_equal nil
   end
 
   it 'get storage account' do
     storage_name = StorageName
-    present = subject.get_storage_account(storage_name)
-    present.must_equal true
+    storage_account = subject.get_storage_account(storage_name)
+    storage_account.must_be_kind_of Azure::StorageManagement::StorageAccount
   end
 
   it 'get storage account properties' do
@@ -79,20 +80,24 @@ describe Azure::StorageManagementService do
     storage = subject.get_storage_account_properties(storage_name)
     storage.name.must_equal storage_name
     storage.label.must_equal 'storagelabel'
-    storage.geo_replication_enabled.must_equal 'true'
+    storage.account_type.must_equal 'Standard_GRS'
   end
 
-  it 'update storage account' do
-    options = {
-      label: 'labelchanged',
-      description: 'description changed'
-    }
+  it 'regenerate storage account keys' do
     storage_name = StorageName
-    subject.update_storage_account(storage_name, options)
-    storage = subject.get_storage_account_properties(storage_name)
-    storage.name.must_equal storage_name
-    storage.label.must_equal 'labelchanged'
-    subject.update_storage_account(storage_name, opts)
+    storage_keys1 = subject.regenerate_storage_account_keys(storage_name)
+    storage_keys1.primary_key.wont_be_nil
+    storage_keys1.secondary_key.wont_be_nil
+    storage_keys2 = subject.regenerate_storage_account_keys(storage_name, 'secondary')
+    storage_keys1.primary_key.must_equal storage_keys2.primary_key
+    storage_keys1.secondary_key.wont_equal storage_keys2.secondary_key
+  end
+
+  it 'get storage account keys' do
+    storage_name = StorageName
+    storage_keys1 = subject.get_storage_account_keys(storage_name)
+    storage_keys1.primary_key.wont_be_nil
+    storage_keys1.secondary_key.wont_be_nil
   end
 
   it 'get storage account properties error' do
@@ -143,18 +148,38 @@ describe Azure::StorageManagementService do
     assert_match('The affinity group does not exist.', exception.message)
   end
 
-  it 'update storage account with non existent storage name' do
-    options = {
-      label: 'labelchanged',
-      description: 'description changed'
-    }
-    storage_name = 'storage_nonexistent'
-    storage = subject.update_storage_account(storage_name, options)
-    assert_match(/Storage Account 'storage_nonexistent' does not exist. Skipped.../, storage)
-  end
-
   it 'delete storage account that does not exist' do
     msg = subject.delete_storage_account('invalidstorageaccount')
     assert_match(/The storage account 'invalidstorageaccount' was not found./, msg)
   end
+
+  describe '#update_storage_account' do
+
+    it 'update storage account with non existent storage name' do
+      options = {
+        label: 'labelchanged',
+        description: 'description changed'
+      }
+      storage_name = 'storage_nonexistent'
+      storage = subject.update_storage_account(storage_name, options)
+      error_msg = "Storage Account 'storage_nonexistent' does not exist"
+      assert_match(/#{error_msg}/, storage)
+    end
+
+    it 'update existing storage account' do
+      options = {
+        label: 'labelchanged',
+        description: 'description changed',
+        account_type: 'Standard_LRS'
+      }
+      storage_name = StorageName
+      subject.update_storage_account(storage_name, options)
+      storage = subject.get_storage_account_properties(storage_name)
+      storage.name.must_equal storage_name
+      storage.label.must_equal 'labelchanged'
+      storage.account_type.must_equal 'Standard_LRS'
+      opts[:account_type] = 'Standard_GRS'
+      subject.update_storage_account(storage_name, opts)
+    end
+  end
 end