azurex 0.6.6 → 0.6.7

data/test/unit/storage_management/storage_management_service_test.rb

@@ -92,14 +92,16 @@ 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
 
@@ -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()
@@ -168,8 +167,6 @@ describe Azure::StorageManagementService do
     before {
       ManagementHttpRequest.stubs(:new).with(method, 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) { {
@@ -183,13 +180,6 @@ describe Azure::StorageManagementService do
       }
     }
 
-    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
         subject.update_storage_account 'storage2', Hash.new
@@ -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('')
-
+      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
@@ -253,9 +237,11 @@ describe Azure::StorageManagementService do
     }
 
     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

data/test/unit/virtual_machine_image_management/serialization_test.rb

@@ -18,6 +18,7 @@ describe Azure::VirtualMachineImageManagement::Serialization do
   subject { Azure::VirtualMachineImageManagement::Serialization }
 
   let(:virtual_machine_images_from_xml) { Fixtures['list_images'] }
+  let(:virtual_machine_vmimages_from_xml) { Fixtures['list_vmimages'] }
 
   describe '#virtual_machine_images_from_xml' do
 
@@ -28,8 +29,23 @@ describe Azure::VirtualMachineImageManagement::Serialization do
     it 'returns an Array of VirtualMachineImageService instances' do
       results = subject.virtual_machine_images_from_xml Nokogiri::XML(virtual_machine_images_from_xml)
       results.must_be_kind_of Array
-      results[0].must_be_kind_of Azure::VirtualMachineImageManagement::VirtualMachineImage
+      results.first.must_be_kind_of Azure::VirtualMachineImageManagement::VirtualMachineImage
       results.count.must_equal 12
     end
+
+    it 'parses an OSImage node correctly' do
+      results = subject.virtual_machine_images_from_xml Nokogiri::XML(virtual_machine_images_from_xml)
+      results.first.name.must_equal 'RightImage-CentOS-6.2-x64-v5.8.8.1'
+      results.first.os_type.must_equal 'Linux'
+      results.first.category.must_equal 'RightScale with Linux'
+    end
+
+    it 'parses an VMImage node correctly' do
+      results = subject.virtual_machine_vmimages_from_xml Nokogiri::XML(virtual_machine_vmimages_from_xml)
+      results.first.name.must_equal 'name-of-image'
+      results.first.os_type.must_equal 'operating-system-of-image'
+      results.first.category.must_equal 'category-of-image'
+    end
+
   end
 end

data/test/unit/virtual_machine_image_management/virtual_machine_image_management_service_test.rb

@@ -18,48 +18,153 @@ describe Azure::VirtualMachineImageManagementService do
 
   subject { Azure::VirtualMachineImageManagementService.new }
 
-  let(:request_path) { '/services/images' }
+  let(:public_request_path) { '/services/images' }
+  let(:private_request_path) { '/services/vmimages' }
   let(:images_xml) { Fixtures['list_images'] }
+  let(:vmimages_xml) { Fixtures['list_vmimages'] }
   let(:method) { :get }
   let(:mock_request) { mock }
-  let(:response) do
+  let(:mock_request2) { mock }
+
+  let(:public_response) do
     response = mock
     response.stubs(:body).returns(images_xml)
     response
   end
-  let(:response_body) { Nokogiri::XML response.body }
+  let(:public_response_body) { Nokogiri::XML public_response.body }
+
+  let(:private_response) do
+    response = mock
+    response.stubs(:body).returns(vmimages_xml)
+    response
+  end
+  let(:private_response_body) { Nokogiri::XML private_response.body }
 
   before do
     Loggerx.expects(:puts).returns(nil).at_least(0)
   end
 
-  describe '#list_virtual_machine_images' do
+  describe '#list_public_virtual_machine_images' do
 
     before do
       ManagementHttpRequest.stubs(:new).with(
         method,
-        request_path,
+        public_request_path,
         nil
       ).returns(mock_request)
-      mock_request.expects(:call).returns(response_body)
+      mock_request.expects(:call).returns(public_response_body)
     end
 
     it 'assembles a URI for the request' do
-      subject.list_virtual_machine_images
+      subject.list_public_virtual_machine_images
     end
 
     it 'sets the properties of the virtual machine images' do
-      virtual_machine_image = subject.list_virtual_machine_images.first
+      virtual_machine_image = subject.list_public_virtual_machine_images.first
       virtual_machine_image.name.must_equal 'RightImage-CentOS-6.2-x64-v5.8.8.1'
     end
 
     it 'returns a list of virtual machine images from server' do
+      results = subject.list_public_virtual_machine_images
+      results.must_be_kind_of Array
+      results.length.must_equal 12
+      image_klass = Azure::VirtualMachineImageManagement::VirtualMachineImage
+      results.first.must_be_kind_of image_klass
+    end
+  end
+
+  describe '#list_private_virtual_machine_images' do
+
+    before do
+      ManagementHttpRequest.stubs(:new).with(
+        method,
+        private_request_path,
+        nil
+      ).returns(mock_request)
+      mock_request.expects(:call).returns(private_response_body)
+    end
+
+    it 'assembles a URI for the request' do
+      subject.list_private_virtual_machine_images
+    end
+
+    it 'sets the properties of the virtual machine images' do
+      virtual_machine_image = subject.list_private_virtual_machine_images.first
+      virtual_machine_image.name.must_equal 'name-of-image'
+    end
+
+    it 'returns a list of virtual machine images from server' do
+      results = subject.list_private_virtual_machine_images
+      results.must_be_kind_of Array
+      results.length.must_equal 2
+      image_klass = Azure::VirtualMachineImageManagement::VirtualMachineImage
+      results.first.must_be_kind_of image_klass
+    end
+
+  end
+
+  describe '#list_virtual_machine_images' do
+
+    before do
+      ManagementHttpRequest.stubs(:new).with(
+        method,
+        public_request_path,
+        nil
+      ).returns(mock_request)
+
+
+      ManagementHttpRequest.stubs(:new).with(
+        method,
+        private_request_path,
+        nil
+      ).returns(mock_request2)
+
+    end
+
+    it 'returns a list of virtual machine images from server when no type is specified' do
+      mock_request.expects(:call).returns(public_response_body)
+      mock_request2.expects(:call).returns(private_response_body)
+
       results = subject.list_virtual_machine_images
       results.must_be_kind_of Array
+      results.length.must_equal 14
+      image_klass = Azure::VirtualMachineImageManagement::VirtualMachineImage
+      results.first.must_be_kind_of image_klass
+    end
+
+    it 'returns a list of virtual machine images from server when :all is specified' do
+      mock_request.expects(:call).returns(public_response_body)
+      mock_request2.expects(:call).returns(private_response_body)
+
+      results = subject.list_virtual_machine_images :all
+      results.must_be_kind_of Array
+      results.length.must_equal 14
+      image_klass = Azure::VirtualMachineImageManagement::VirtualMachineImage
+      results.first.must_be_kind_of image_klass
+    end
+
+    it 'returns a list of virtual machine images from server when :public is specified' do
+      mock_request.expects(:call).returns(public_response_body)
+      mock_request2.expects(:call).never
+
+      results = subject.list_virtual_machine_images :public
+      results.must_be_kind_of Array
       results.length.must_equal 12
       image_klass = Azure::VirtualMachineImageManagement::VirtualMachineImage
       results.first.must_be_kind_of image_klass
     end
+
+    it 'returns a list of virtual machine images from server when :private is specified' do
+      mock_request.expects(:call).never
+      mock_request2.expects(:call).returns(private_response_body)
+
+      results = subject.list_virtual_machine_images :private
+      results.must_be_kind_of Array
+      results.length.must_equal 2
+      image_klass = Azure::VirtualMachineImageManagement::VirtualMachineImage
+      results.first.must_be_kind_of image_klass
+    end
+
   end
 
 end

data/test/unit/virtual_machine_management/virtual_machine_management_service_test.rb

@@ -50,6 +50,7 @@ describe Azure::VirtualMachineManagementService do
   end
   let(:location_response_body) { Nokogiri::XML location_response.body }
   let(:mock_virtual_machine_request) { mock }
+
   let(:windows_images_xml) { Fixtures['list_images'] }
   let(:images_request_path) { '/services/images' }
   let(:mock_request) { mock }
@@ -59,6 +60,15 @@ describe Azure::VirtualMachineManagementService do
     Nokogiri::XML response.body
   end
 
+  let(:vm_images_xml) { Fixtures['list_vmimages'] }
+  let(:vmimages_request_path) { '/services/vmimages' }
+  let(:vmmock_request) { mock }
+  let(:vm_response_body) do
+    response = mock
+    response.stubs(:body).returns(vm_images_xml)
+    Nokogiri::XML response.body
+  end
+
   before do
     Loggerx.stubs(:info).returns(nil)
     Loggerx.expects(:puts).returns(nil).at_least(0)
@@ -68,6 +78,13 @@ describe Azure::VirtualMachineManagementService do
       nil
     ).returns(mock_request)
     mock_request.expects(:call).returns(os_response_body).at_least(0)
+    
+    ManagementHttpRequest.stubs(:new).with(
+      :get,
+      vmimages_request_path,
+      nil
+    ).returns(vmmock_request)
+    vmmock_request.expects(:call).returns(vm_response_body).at_least(0)
   end
 
   describe '#list_virtual_machines' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: azurex
 version: !ruby/object:Gem::Version
-  version: 0.6.6
+  version: 0.6.7
 platform: ruby
 authors:
 - Microsoft Corporation
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-25 00:00:00.000000000 Z
+date: 2014-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -252,6 +252,8 @@ files:
 - lib/azure/virtual_network_management/serialization.rb
 - lib/azure/virtual_network_management/virtual_network.rb
 - lib/azure/virtual_network_management/virtual_network_management_service.rb
+- lib/core_ext/ip_addr.rb
+- lib/core_ext/string.rb
 - test/fixtures/32px-fulls-black.jpg
 - test/fixtures/affinity_group.xml
 - test/fixtures/all_containers.xml
@@ -295,6 +297,7 @@ files:
 - test/fixtures/list_storage_account_single.xml
 - test/fixtures/list_storage_accounts.xml
 - test/fixtures/list_virtual_networks.xml
+- test/fixtures/list_vmimages.xml
 - test/fixtures/logging.xml
 - test/fixtures/management_certificate.pem
 - test/fixtures/messages.xml
@@ -427,6 +430,7 @@ files:
 - test/unit/core/http/http_request_test.rb
 - test/unit/core/http/http_response_test.rb
 - test/unit/core/http/retry_policy_test.rb
+- test/unit/core_ext/string_test.rb
 - test/unit/database/serialization_test.rb
 - test/unit/database/sql_database_server_service_test.rb
 - test/unit/service/serialization_test.rb