azure 0.6.4 → 0.7.0.pre

data/test/integration/test_helper.rb

@@ -12,31 +12,27 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #--------------------------------------------------------------------------
-require "test_helper"
-require "azure"
+require 'test_helper'
+require 'azure'
 
 Azure::Core.configure do |config|
-  config.storage_access_key     = ENV.fetch("AZURE_STORAGE_ACCESS_KEY")
-  config.storage_account_name   = ENV.fetch("AZURE_STORAGE_ACCOUNT")
-  # config.storage_table_host     = ENV.fetch("AZURE_STORAGE_TABLE_HOST")
-  # config.storage_blob_host      = ENV.fetch("AZURE_STORAGE_BLOB_HOST")
-  # config.storage_queue_host     = ENV.fetch("AZURE_STORAGE_QUEUE_HOST")
-
-  config.sb_namespace  = ENV.fetch("AZURE_SERVICEBUS_NAMESPACE")
-  config.sb_access_key  = ENV.fetch("AZURE_SERVICEBUS_ACCESS_KEY")
-  # config.sb_issuer      = ENV.fetch("AZURE_SERVICEBUS_ISSUER")
+  config.storage_access_key     = ENV.fetch('AZURE_STORAGE_ACCESS_KEY')
+  config.storage_account_name   = ENV.fetch('AZURE_STORAGE_ACCOUNT')
+  config.sb_namespace  = ENV.fetch('AZURE_SERVICEBUS_NAMESPACE')
+  config.sb_access_key  = ENV.fetch('AZURE_SERVICEBUS_ACCESS_KEY')
   config.management_certificate  = ENV.fetch('AZURE_MANAGEMENT_CERTIFICATE')
-  # config.management_endpoint  = ENV.fetch("AZURE_MANAGEMENT_ENDPOINT")
-  config.subscription_id  = ENV.fetch("AZURE_SUBSCRIPTION_ID")
+  config.subscription_id  = ENV.fetch('AZURE_SUBSCRIPTION_ID')
 end
 
-StorageAccountName = random_string('storagetest',10)
+util = Class.new.extend(Azure::Core::Utility)
+
+StorageAccountName = util.random_string('storagetest',10)
 Images = Azure::VirtualMachineImageManagementService.new.list_virtual_machine_images
 LinuxImage = Images.select{|image| image.os_type == 'Linux'}.first
 WindowsImage = Images.select{|image| image.os_type == 'Windows'}.first
 WindowsImageLocation = WindowsImage.locations.split(';').first
 LinuxImageLocation = LinuxImage.locations.split(';').first
 
-MiniTest::Unit.after_tests {
+MiniTest.after_run {
   VirtualMachineNameGenerator.cleanup
 }

data/test/integration/vm/VM_Create_test.rb

@@ -15,6 +15,8 @@
 require 'integration/test_helper'
 
 describe Azure::VirtualMachineManagementService do
+  include Azure::Core::Utility
+
   subject { Azure::VirtualMachineManagementService.new }
   let(:cloud_service) { Azure::CloudServiceManagementService.new }
   let(:names) { VirtualMachineNameHelper.name }
@@ -23,7 +25,6 @@ describe Azure::VirtualMachineManagementService do
   let(:storage_account_name) { StorageAccountName }
   let(:username) { 'adminuser' }
   let(:password) { 'Admin123' }
-  let(:certificate) { Fixtures['certificate.pem'] }
   let(:private_key) { Fixtures['privatekey.key'] }
 
   let(:params)do
@@ -62,7 +63,7 @@ describe Azure::VirtualMachineManagementService do
   end
 
   before do
-    Loggerx.expects(:puts).returns(nil).at_least(0)
+    Azure::Loggerx.expects(:puts).returns(nil).at_least(0)
   end
 
   describe '#deployment' do
@@ -74,7 +75,6 @@ describe Azure::VirtualMachineManagementService do
         options.delete(:cloud_service_name)
         params.delete(:location)
         params[:vm_name] = "add-#{virtual_machine_name}"
-        sleep 30
       end
 
       it 'should add role to existing storage account and cloud service' do
@@ -89,26 +89,28 @@ describe Azure::VirtualMachineManagementService do
         params[:vm_name] = "Add-storage-#{virtual_machine_name}"
         vm = subject.add_role(params)
         vm.cloud_service_name.must_equal params[:cloud_service_name]
-        vm.vm_name.must_equal params[:vm_name].downcase
+        vm.vm_name.must_equal params[:vm_name]
         vm.deployment_name.must_equal @vm_obj.deployment_name
       end
     end
 
     describe '#virtual_network' do
+      let(:subnet_name) { 'Subnet-1' }
+      let(:geo_location) { LinuxImageLocation }
       before do
         options[:virtual_network_name] = 'v-net'
-        affinity_gorup_name = random_string('affinity-group-', 10)
-        Azure::BaseManagementService.new.create_affinity_group(
-          affinity_gorup_name,
-          params[:location],
-          'AG1'
-        ) rescue nil
+        inputoptions = {
+          subnet: [{ name: subnet_name, ip_address: '172.16.0.0', cidr: 12 }],
+          dns: [{ name: 'DNS', ip_address: '1.2.3.4' }]
+        }
         vnet_service = Azure::VirtualNetworkManagementService
         vnet_service.new.set_network_configuration(
           options[:virtual_network_name],
-          affinity_gorup_name,
-          ['172.16.0.0/12']
+          geo_location,
+          ['172.16.0.0/12'],
+          inputoptions
         ) rescue nil
+        options[:subnet_name] = subnet_name
         subject.create_virtual_machine(params, options)
       end
 
@@ -117,6 +119,7 @@ describe Azure::VirtualMachineManagementService do
         virtual_machine.must_be_kind_of Azure::VirtualMachineManagement::VirtualMachine
         virtual_machine.vm_name.must_equal virtual_machine_name
         virtual_machine.virtual_network_name.must_equal options[:virtual_network_name]
+        virtual_machine.subnet.must_equal subnet_name
       end
     end
 
@@ -147,14 +150,12 @@ describe Azure::VirtualMachineManagementService do
       end
       tcp_endpoints_names.must_include 'PowerShell'
       tcp_endpoints_names.must_include 'WinRm-Http'
-      sleep 30
     end
 
     it 'should creates https enabled winrm virtual machine using certificate.' do
       default_options.merge!(
         winrm_transport: ['https'],
-        private_key_file: private_key,
-        certificate_file: certificate
+        private_key_file: private_key
       )
       result = subject.create_virtual_machine(windows_params, default_options)
       result.must_be_kind_of Azure::VirtualMachineManagement::VirtualMachine
@@ -181,13 +182,11 @@ describe Azure::VirtualMachineManagementService do
 
     it 'created linux virtual machine should be accessible using password and certificate' do
       default_options.merge!(
-        private_key_file: private_key,
-        certificate_file: certificate
+        private_key_file: private_key
       )
       result = subject.create_virtual_machine(params, default_options)
       result.must_be_kind_of Azure::VirtualMachineManagement::VirtualMachine
       assert_equal(result.os_type, 'Linux')
-      sleep 30
     end
 
     it 'throws error as port value is beyond or less than actual range' do

data/test/integration/vm/VM_Delete_test.rb

@@ -22,7 +22,7 @@ describe Azure::VirtualMachineManagementService do
   let(:csn) { names.last }
   let(:username) { 'admin' }
   before do
-    Loggerx.expects(:puts).at_least_once.returns(nil)
+    Azure::Loggerx.expects(:puts).at_least_once.returns(nil)
     params = {
       vm_name: virtual_machine_name,
       vm_user: 'user',
@@ -35,19 +35,17 @@ describe Azure::VirtualMachineManagementService do
       cloud_service_name: csn,
     }
     subject.create_virtual_machine(params, options)
-    sleep 60
   end
 
   describe '#delete_virtual_machine' do
 
     it 'delete existing virtual machine and cloud service' do
       subject.delete_virtual_machine(virtual_machine_name, csn)
-      sleep 60
       vm = subject.get_virtual_machine(virtual_machine_name, csn)
       vm.must_be_nil
       cloud_service = Azure::CloudServiceManagementService.new
       cloud_presence = cloud_service.get_cloud_service(csn)
-      cloud_presence.must_equal false
+      cloud_presence.must_equal nil
     end
 
   end

data/test/integration/vm/VM_Operations_test.rb

@@ -20,7 +20,7 @@ describe Azure::VirtualMachineManagementService do
   subject { Azure::VirtualMachineManagementService.new }
 
   before do
-    Loggerx.expects(:puts).returns(nil).at_least(0)
+    Azure::Loggerx.expects(:puts).returns(nil).at_least(0)
     params = {
       vm_name: vm_name,
       vm_user: 'user',
@@ -35,7 +35,6 @@ describe Azure::VirtualMachineManagementService do
     vm = subject.get_virtual_machine(vm_name, csn)
     if vm.nil?
       subject.create_virtual_machine(params, options)
-      sleep 60 # Wait to finish provision.
     end
   end
 

data/test/integration/vnet/Virtual_Network_Create_test.rb

@@ -17,7 +17,7 @@ require 'support/virtual_network_helper'
 
 describe Azure::VirtualNetworkManagement::VirtualNetwork do
   let(:in_vnet_name) { 'newvnet' }
-  let(:in_affinity_name) { 'integration-test-affinity-group' }
+  let(:geo_location) { 'West US' }
   let(:in_address_space) { ['172.16.0.0/12'] }
   let(:invalid_address_space) { ['', ''] }
   let(:invalid_cidr_address_space) { ['10.0.0.0'] }
@@ -32,25 +32,19 @@ describe Azure::VirtualNetworkManagement::VirtualNetwork do
   subject { Azure::VirtualNetworkManagementService.new }
 
   before do
-    Loggerx.expects(:puts).returns(nil).at_least(0)
-
-    affinity_group_service = Azure::BaseManagementService.new
-    affinity_group_service.create_affinity_group(in_affinity_name,
-                                                 WindowsImageLocation,
-                                                 'Label'
-                                                ) rescue nil
+    Azure::Loggerx.expects(:puts).returns(nil).at_least(0)
   end
 
   describe 'Create virtual network valid params' do
     it 'Create virtual network with valid params' do
       subject.set_network_configuration(in_vnet_name,
-                                        in_affinity_name,
+                                        geo_location,
                                         in_address_space,
                                         inputoptions)
 
       VirtualNetworkHelper.check_config(subject.list_virtual_networks,
                                         in_vnet_name,
-                                        in_affinity_name,
+                                        geo_location,
                                         created_state,
                                         in_address_space,
                                         inputoptions)
@@ -66,7 +60,7 @@ describe Azure::VirtualNetworkManagement::VirtualNetwork do
 
       exception = assert_raises(RuntimeError) do
         subject.set_network_configuration(in_vnet_name,
-                                          in_affinity_name,
+                                          geo_location,
                                           in_address_space,
                                           options)
       end
@@ -78,7 +72,7 @@ describe Azure::VirtualNetworkManagement::VirtualNetwork do
     it 'Create virtual network with invalid options' do
       exception = assert_raises(RuntimeError) do
         subject.set_network_configuration(in_vnet_name,
-                                          in_affinity_name,
+                                          geo_location,
                                           invalid_address_space,
                                           inputoptions)
       end
@@ -95,12 +89,12 @@ describe Azure::VirtualNetworkManagement::VirtualNetwork do
       }
 
       subject.set_network_configuration(in_vnet_name,
-                                        in_affinity_name,
+                                        geo_location,
                                         update_address_space,
                                         update_options)
       VirtualNetworkHelper.check_config(subject.list_virtual_networks,
                                         in_vnet_name,
-                                        in_affinity_name,
+                                        geo_location,
                                         created_state,
                                         update_address_space,
                                         update_options)
@@ -111,7 +105,7 @@ describe Azure::VirtualNetworkManagement::VirtualNetwork do
     it 'Create virtual network with invalid options' do
       exception = assert_raises(RuntimeError) do
         subject.set_network_configuration(in_vnet_name,
-                                          in_affinity_name,
+                                          geo_location,
                                           invalid_cidr_address_space,
                                           inputoptions)
       end

data/test/integration/vnet/Virtual_Network_list_test.rb

@@ -19,21 +19,16 @@ describe Azure::VirtualNetworkManagement::VirtualNetwork do
   subject { Azure::VirtualNetworkManagementService.new }
 
   let(:affinity_group_name) { 'my-affinity-group' }
-  let(:location) { 'West US' }
+  let(:geo_location) { 'West US' }
   let(:vnet_name) { 'vnet-integration-test' }
 
   before do
-    Loggerx.expects(:puts).returns(nil).at_least(0)
-    affinity_group_service = Azure::BaseManagementService.new
-    affinity_group_service.create_affinity_group(affinity_group_name,
-                                                 location,
-                                                 'Label Name'
-                                                ) rescue nil
+    Azure::Loggerx.expects(:puts).returns(nil).at_least(0)
     address_space = %w(172.16.0.0/12 10.0.0.0/8 192.168.0.0/24)
     unless subject.list_virtual_networks.map(&:name).include?(vnet_name)
       subject.set_network_configuration(
         vnet_name,
-        affinity_group_name,
+        location,
         address_space
       )
     end
@@ -45,7 +40,7 @@ describe Azure::VirtualNetworkManagement::VirtualNetwork do
       virtual_networks.wont_be_nil
       virtual_networks.must_be_kind_of Array
       virtual_networks.first.must_be_kind_of(
-        Azure::VirtualNetworkManagement::VirtualNetwork
+          Azure::VirtualNetworkManagement::VirtualNetwork
       )
       assert_operator virtual_networks.size, :>=, 1
     end

data/test/support/name_generator.rb

@@ -57,6 +57,14 @@ QueueNameHelper = NameGenerator.new do |name|
   end
 end
 
+ServiceBusRelayNameHelper = NameGenerator.new do |name|
+  svc = Azure::ServiceBus::ServiceBusService.new
+  begin
+    svc.delete_relay name
+  rescue
+  end
+end
+
 ServiceBusQueueNameHelper = NameGenerator.new do |name|
   svc = Azure::ServiceBus::ServiceBusService.new
   begin

data/test/support/virtual_network_helper.rb

@@ -16,7 +16,7 @@
 class VirtualNetworkHelper
   def self.check_config(virtual_networks,
                         in_vnet_name,
-                        in_affinity_name,
+                        location,
                         created_state,
                         in_address_space,
                         inputoptions)
@@ -38,7 +38,7 @@ class VirtualNetworkHelper
 
     # Verify global properties
     created_virtual_network[0].name.must_equal in_vnet_name
-    created_virtual_network[0].affinity_group.must_equal in_affinity_name
+    created_virtual_network[0].location.must_equal location
     created_virtual_network[0].state.must_equal created_state
 
     # Verify address_space

data/test/test_helper.rb

@@ -12,42 +12,31 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #--------------------------------------------------------------------------
-require "minitest/autorun"
-require "mocha/setup"
-
-# Attempt to load turn to show formatted test results
-begin
-  require "turn"
-  Turn.config.format = :pretty
-  Turn.config.natural = true
-rescue LoadError
-end
+require 'minitest/autorun'
+require 'mocha/mini_test'
+require 'minitest/reporters'
+Minitest::Reporters.use! Minitest::Reporters::SpecReporter.new
+require 'timecop'
 
 # add to the MiniTest DSL
 module Kernel
   def need_tests_for(name)
     describe "##{name}" do
-      it "needs unit tests" do
-        skip ""
+      it 'needs unit tests' do
+        skip ''
       end
     end
   end
 end
 
 
-Dir["./test/support/**/*.rb"].each { |dep| require dep }
+Dir['./test/support/**/*.rb'].each { |dep| require dep }
 
 # mock configuration setup
 require 'azure'
 
-Azure.config.storage_account_name     = "accountname"
-Azure.config.storage_access_key       = "YWNjZXNzLWtleQ=="
-Azure.config.management_certificate   = File.expand_path("test/fixtures/management_certificate.pem")
-Azure.config.management_endpoint      = "https://management.core.windows.net"
-Azure.config.subscription_id          = "subscription-id"
-# Azure.config.storage_table_host     = 
-# Azure.config.storage_blob_host      = 
-# Azure.config.storage_queue_host     = 
-# Azure.config.sb_namespace           = 
-# Azure.config.sb_access_key          = 
-# Azure.config.sb_issuer              = 
+Azure.config.storage_account_name     = 'accountname'
+Azure.config.storage_access_key       = 'YWNjZXNzLWtleQ=='
+Azure.config.management_certificate   = File.expand_path('test/fixtures/management_certificate.pem')
+Azure.config.management_endpoint      = 'https://management.core.windows.net'
+Azure.config.subscription_id          = 'subscription-id'

data/test/unit/affinity_group/affinity_group_test.rb

@@ -23,17 +23,16 @@ describe Azure::BaseManagementService do
   let(:response_xml) { nil }
 
   before do
-    Loggerx.expects(:puts).returns(nil).at_least(0)
+    Azure::Loggerx.expects(:puts).returns(nil).at_least(0)
     mock_request.expects(:call).returns(Nokogiri::XML response_xml).at_least(0)
   end
 
   describe '#list_affinity_groups' do
     let(:request_path) { '/affinitygroups' }
     let(:response_xml) { Fixtures['list_affinity_groups'] }
-    let(:method) { :get }
 
     before do
-      ManagementHttpRequest.stubs(:new).with(method,
+      Azure::BaseManagement::ManagementHttpRequest.stubs(:new).with(:get,
                                              request_path,
                                              nil).returns(mock_request)
     end
@@ -76,10 +75,9 @@ describe Azure::BaseManagementService do
   end
 
   describe '#create_affinity_group' do
-    let(:method) { :post }
     let(:request_path) { '/affinitygroups' }
-    let(:name) { 'AG1' }
-    let(:location) { 'West US' }
+    let(:ag_name) { 'AG1' }
+    let(:geo_location) { 'West US' }
     let(:label) { 'Label Name' }
 
     let(:location_request_path) { '/locations' }
@@ -92,7 +90,7 @@ describe Azure::BaseManagementService do
     let(:location_response_body) { Nokogiri::XML location_response.body }
 
     before do
-      ManagementHttpRequest.stubs(:new).with(method,
+      Azure::BaseManagement::ManagementHttpRequest.stubs(:new).with(:post,
                                              request_path,
                                              anything).returns(mock_request)
       mock_request.expects(:call).returns(
@@ -100,13 +98,13 @@ describe Azure::BaseManagementService do
       ).at_least(0)
       mock_request = mock
 
-      ManagementHttpRequest.stubs(:new).with(:get,
+      Azure::BaseManagement::ManagementHttpRequest.stubs(:new).with(:get,
                                              location_request_path,
                                              nil).returns(mock_request)
       mock_request.expects(:call).returns(location_response_body).at_least(0)
       mock_request = mock
 
-      ManagementHttpRequest.stubs(:new).with(:get,
+      Azure::BaseManagement::ManagementHttpRequest.stubs(:new).with(:get,
                                              request_path,
                                              nil).returns(mock_request)
       mock_request.expects(:call).returns(
@@ -116,10 +114,10 @@ describe Azure::BaseManagementService do
 
     it 'error if affinity group already exists' do
       exception = assert_raises(Azure::Error::Error) do
-        subject.create_affinity_group(name, location, label)
+        subject.create_affinity_group(ag_name, geo_location, label)
       end
       assert_match(
-       /An affinity group #{name} already exists in the current subscription/i,
+       /An affinity group #{ag_name} already exists in the current subscription/i,
        exception.message
       )
     end
@@ -140,13 +138,12 @@ describe Azure::BaseManagementService do
     let(:affinity_group_name) { 'AG1' }
     let(:request_path) { '/affinitygroups/' + affinity_group_name }
     let(:response_xml) { Fixtures['affinity_group'] }
-    let(:method) { :get }
 
     before do
       Azure::BaseManagementService.any_instance.stubs(
         :affinity_group
       ).returns(true)
-      ManagementHttpRequest.stubs(:new).with(
+      Azure::BaseManagement::ManagementHttpRequest.stubs(:new).with(
         :get,
         request_path,
         nil