stuartpreston-azure-sdk-for-ruby 0.7.1 → 0.7.2

data/test/support/virtual_machine_name_generator.rb

@@ -1,102 +1,102 @@
-#-------------------------------------------------------------------------
-# # 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.
-#--------------------------------------------------------------------------
-class VirtualMachineNameGenerator
-  def initialize(&cleanup_proc)
-    @cleanup_proc = cleanup_proc
-    @names = []
-    @count = rand(900)
-  end
-
-  def random_text(text)
-    @count += 1
-    text + @count.to_s + "-#{Array.new(32) { rand(36).to_s(36) }.join[0..5]}"
-  end
-
-  def name
-    vm_name = random_text('test-')
-    cloud_name = random_text(vm_name + '-service-')
-    @names << [vm_name, cloud_name]
-    [vm_name, cloud_name]
-  end
-
-  def clean
-    @names.each do |name|
-      @cleanup_proc.call(name.first, name.last)
-    end
-    @names = []
-  end
-
-  def self.cleanup
-    puts 'Running after test cleanup.'
-    # Delete virtual machines
-    virtual_machine_service = Azure::VirtualMachineManagementService.new
-    virtualmachines = virtual_machine_service.list_virtual_machines
-    azure_cloud_service = Azure::CloudServiceManagementService.new
-    virtualmachines.each do |vm|
-      vm_name = vm.vm_name + '-service-'
-      csn = vm.cloud_service_name
-      if vm.vm_name.include?('test-') && csn.include?(vm_name)
-        azure_cloud_service.delete_cloud_service_deployment(csn) rescue nil
-      end
-    end
-
-    # Delete cloud services
-    cloud_services = azure_cloud_service.list_cloud_services
-    cloud_services.each do |cloud_service|
-      csn = cloud_service.name
-      if csn.include?('test-') && csn.include?('-service-')
-        azure_cloud_service.delete_cloud_service(csn)  rescue nil
-      end
-    end
-
-    # Delete disks
-    disk_service = VirtualMachineDiskManagementService.new
-    sleep 60
-    disks = disk_service.list_virtual_machine_disks
-    disks.each do |disk|
-      name = disk.name
-      if name.include?('-service-') && name.include?('test-') && !disk.attached
-        disk_service.delete_virtual_machine_disk(name) rescue nil
-      end
-    end
-
-    # Delete storage account
-    storage_service = Azure::StorageManagementService.new
-    storage_accounts = storage_service.list_storage_accounts
-    storage_accounts.each do |storage_account|
-      if storage_account.name.include?('storagetest')
-        storage_service.delete_storage_account(storage_account.name) rescue nil
-      end
-    end
-
-    # Delete affinity groups
-    ag_service = Azure::BaseManagementService.new
-    affinity_groups = ag_service.list_affinity_groups
-    affinity_groups.each do |affinity_group|
-      if affinity_group.name.include?('affinity-group-')
-        ag_service.delete_affinity_group(affinity_group.name) rescue nil
-      end
-    end
-  end
-end
-
-VirtualMachineNameHelper = VirtualMachineNameGenerator.new do |name, cloud_name|
-  cloud_service = Azure::CloudServiceManagementService.new
-  begin
-    cloud_service.delete_cloud_service_deployment(cloud_name)
-    cloud_service.delete_cloud_service(cloud_name)
-  rescue
-  end
-end
+#-------------------------------------------------------------------------
+# # 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.
+#--------------------------------------------------------------------------
+class VirtualMachineNameGenerator
+  def initialize(&cleanup_proc)
+    @cleanup_proc = cleanup_proc
+    @names = []
+    @count = rand(900)
+  end
+
+  def random_text(text)
+    @count += 1
+    text + @count.to_s + "-#{Array.new(32) { rand(36).to_s(36) }.join[0..5]}"
+  end
+
+  def name
+    vm_name = random_text('test-')
+    cloud_name = random_text(vm_name + '-service-')
+    @names << [vm_name, cloud_name]
+    [vm_name, cloud_name]
+  end
+
+  def clean
+    @names.each do |name|
+      @cleanup_proc.call(name.first, name.last)
+    end
+    @names = []
+  end
+
+  def self.cleanup
+    puts 'Running after test cleanup.'
+    # Delete virtual machines
+    virtual_machine_service = Azure::VirtualMachineManagementService.new
+    virtualmachines = virtual_machine_service.list_virtual_machines
+    azure_cloud_service = Azure::CloudServiceManagementService.new
+    virtualmachines.each do |vm|
+      vm_name = vm.vm_name + '-service-'
+      csn = vm.cloud_service_name
+      if vm.vm_name.include?('test-') && csn.include?(vm_name)
+        azure_cloud_service.delete_cloud_service_deployment(csn) rescue nil
+      end
+    end
+
+    # Delete cloud services
+    cloud_services = azure_cloud_service.list_cloud_services
+    cloud_services.each do |cloud_service|
+      csn = cloud_service.name
+      if csn.include?('test-') && csn.include?('-service-')
+        azure_cloud_service.delete_cloud_service(csn)  rescue nil
+      end
+    end
+
+    # Delete disks
+    disk_service = VirtualMachineDiskManagementService.new
+    sleep 60
+    disks = disk_service.list_virtual_machine_disks
+    disks.each do |disk|
+      name = disk.name
+      if name.include?('-service-') && name.include?('test-') && !disk.attached
+        disk_service.delete_virtual_machine_disk(name) rescue nil
+      end
+    end
+
+    # Delete storage account
+    storage_service = Azure::StorageManagementService.new
+    storage_accounts = storage_service.list_storage_accounts
+    storage_accounts.each do |storage_account|
+      if storage_account.name.include?('storagetest')
+        storage_service.delete_storage_account(storage_account.name) rescue nil
+      end
+    end
+
+    # Delete affinity groups
+    ag_service = Azure::BaseManagementService.new
+    affinity_groups = ag_service.list_affinity_groups
+    affinity_groups.each do |affinity_group|
+      if affinity_group.name.include?('affinity-group-')
+        ag_service.delete_affinity_group(affinity_group.name) rescue nil
+      end
+    end
+  end
+end
+
+VirtualMachineNameHelper = VirtualMachineNameGenerator.new do |name, cloud_name|
+  cloud_service = Azure::CloudServiceManagementService.new
+  begin
+    cloud_service.delete_cloud_service_deployment(cloud_name)
+    cloud_service.delete_cloud_service(cloud_name)
+  rescue
+  end
+end

data/test/support/virtual_network_helper.rb

@@ -1,73 +1,73 @@
-#-------------------------------------------------------------------------
-# # 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.
-#--------------------------------------------------------------------------
-
-class VirtualNetworkHelper
-  def self.check_config(virtual_networks,
-                        in_vnet_name,
-                        in_affinity_name,
-                        created_state,
-                        in_address_space,
-                        inputoptions)
-    virtual_networks.wont_be_nil
-    virtual_networks.must_be_kind_of Array
-    virtual_networks[0].must_be_kind_of(
-      Azure::VirtualNetworkManagement::VirtualNetwork
-    )
-
-    created_virtual_network = virtual_networks.select do |x|
-      x.name == in_vnet_name
-    end
-
-    created_virtual_network.wont_be_nil
-    created_virtual_network.size.must_equal 1
-    created_virtual_network[0].must_be_kind_of(
-      Azure::VirtualNetworkManagement::VirtualNetwork
-    )
-
-    # 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].state.must_equal created_state
-
-    # Verify address_space
-    created_virtual_network[0].address_space.must_be_kind_of Array
-    created_virtual_network[0].address_space.length.must_equal 1
-    created_virtual_network[0].address_space.first.must_be_kind_of String
-    created_virtual_network[0].address_space.first.must_equal(
-      in_address_space[0]
-    )
-
-    # Verify subnets
-    created_virtual_network[0].subnets.must_be_kind_of Array
-    created_virtual_network[0].subnets.length.must_equal 1
-    created_virtual_network[0].subnets.first[:name].must_equal(
-      inputoptions[:subnet][0][:name]
-    )
-    created_virtual_network[0].subnets.first[:address_prefix].must_equal(
-      "#{inputoptions[:subnet][0][:ip_address]}/"\
-      "#{inputoptions[:subnet][0][:cidr]}"
-    )
-
-    # Verify DNS Servers
-    created_virtual_network[0].dns_servers.must_be_kind_of Array
-    created_virtual_network[0].dns_servers.length.must_equal 1
-    created_virtual_network[0].dns_servers.first[:name].must_equal(
-      inputoptions[:dns][0][:name]
-    )
-    created_virtual_network[0].dns_servers.first[:ip_address].must_equal(
-      inputoptions[:dns][0][:ip_address]
-    )
-  end
-end
+#-------------------------------------------------------------------------
+# # 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.
+#--------------------------------------------------------------------------
+
+class VirtualNetworkHelper
+  def self.check_config(virtual_networks,
+                        in_vnet_name,
+                        in_affinity_name,
+                        created_state,
+                        in_address_space,
+                        inputoptions)
+    virtual_networks.wont_be_nil
+    virtual_networks.must_be_kind_of Array
+    virtual_networks[0].must_be_kind_of(
+      Azure::VirtualNetworkManagement::VirtualNetwork
+    )
+
+    created_virtual_network = virtual_networks.select do |x|
+      x.name == in_vnet_name
+    end
+
+    created_virtual_network.wont_be_nil
+    created_virtual_network.size.must_equal 1
+    created_virtual_network[0].must_be_kind_of(
+      Azure::VirtualNetworkManagement::VirtualNetwork
+    )
+
+    # 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].state.must_equal created_state
+
+    # Verify address_space
+    created_virtual_network[0].address_space.must_be_kind_of Array
+    created_virtual_network[0].address_space.length.must_equal 1
+    created_virtual_network[0].address_space.first.must_be_kind_of String
+    created_virtual_network[0].address_space.first.must_equal(
+      in_address_space[0]
+    )
+
+    # Verify subnets
+    created_virtual_network[0].subnets.must_be_kind_of Array
+    created_virtual_network[0].subnets.length.must_equal 1
+    created_virtual_network[0].subnets.first[:name].must_equal(
+      inputoptions[:subnet][0][:name]
+    )
+    created_virtual_network[0].subnets.first[:address_prefix].must_equal(
+      "#{inputoptions[:subnet][0][:ip_address]}/"\
+      "#{inputoptions[:subnet][0][:cidr]}"
+    )
+
+    # Verify DNS Servers
+    created_virtual_network[0].dns_servers.must_be_kind_of Array
+    created_virtual_network[0].dns_servers.length.must_equal 1
+    created_virtual_network[0].dns_servers.first[:name].must_equal(
+      inputoptions[:dns][0][:name]
+    )
+    created_virtual_network[0].dns_servers.first[:ip_address].must_equal(
+      inputoptions[:dns][0][:ip_address]
+    )
+  end
+end

data/test/test_helper.rb

@@ -1,54 +1,54 @@
-#-------------------------------------------------------------------------
-# # 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 "minitest/autorun"
-require "mocha/setup"
-require 'timecop'
-
-# Attempt to load turn to show formatted test results
-begin
-  require "turn"
-  Turn.config.format = :pretty
-  Turn.config.natural = true
-rescue LoadError
-end
-
-# add to the MiniTest DSL
-module Kernel
-  def need_tests_for(name)
-    describe "##{name}" do
-      it "needs unit tests" do
-        skip ""
-      end
-    end
-  end
-end
-
-
-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          = 
+#-------------------------------------------------------------------------
+# # 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 "minitest/autorun"
+require "mocha/setup"
+require 'timecop'
+
+# Attempt to load turn to show formatted test results
+begin
+  require "turn"
+  Turn.config.format = :pretty
+  Turn.config.natural = true
+rescue LoadError
+end
+
+# add to the MiniTest DSL
+module Kernel
+  def need_tests_for(name)
+    describe "##{name}" do
+      it "needs unit tests" do
+        skip ""
+      end
+    end
+  end
+end
+
+
+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              =