azure 0.6.3 → 0.6.4

data/test/integration/cloud_service/Cloud_Delete_test.rb

@@ -0,0 +1,44 @@
+#-------------------------------------------------------------------------
+# Copyright 2013 Microsoft Open Technologies, Inc.
+#
+# 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 Azure::CloudServiceManagementService do
+
+  subject { Azure::CloudServiceManagementService.new }
+
+  let(:options) do
+    {
+      location: 'West US',
+      description: 'Test'
+    }
+  end
+
+  before do
+    Loggerx.expects(:puts).returns(nil).at_least(0)
+  end
+
+  describe '#delete_cloud_service' do
+    before do
+      @cloud_name = random_string('test-service-cloud', 10)
+      subject.create_cloud_service(@cloud_name, options)
+    end
+
+    it 'Deletes the cloud service in Windows Azure.' do
+      subject.delete_cloud_service(@cloud_name)
+      present = subject.get_cloud_service(@cloud_name)
+      assert_equal present, false
+    end
+  end
+end

data/test/integration/vm/VM_Create_test.rb

@@ -50,7 +50,7 @@ describe Azure::VirtualMachineManagementService do
     {
       storage_account_name: storage_account_name,
       cloud_service_name: cloud_service_name,
-      vm_size: 'Small'
+      vm_size: 'Basic_A0'
     }
   end
 
@@ -67,27 +67,73 @@ describe Azure::VirtualMachineManagementService do
 
   describe '#deployment' do
 
+    describe '#add_role' do
+      before do
+        @vm_obj = subject.create_virtual_machine(params, options)
+        params[:cloud_service_name] = options[:cloud_service_name]
+        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
+        vm = subject.add_role(params, options)
+        vm.cloud_service_name.must_equal params[:cloud_service_name]
+        vm.vm_name.must_equal params[:vm_name]
+        vm.deployment_name.must_equal @vm_obj.deployment_name
+        vm.os_type.must_equal 'Linux'
+      end
+
+      it 'should add role and create new storage account' 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.deployment_name.must_equal @vm_obj.deployment_name
+      end
+    end
+
+    describe '#virtual_network' do
+      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
+        vnet_service = Azure::VirtualNetworkManagementService
+        vnet_service.new.set_network_configuration(
+          options[:virtual_network_name],
+          affinity_gorup_name,
+          ['172.16.0.0/12']
+        ) rescue nil
+        subject.create_virtual_machine(params, options)
+      end
+
+      it 'should provision virtual machine in a existing virtual network' do
+        virtual_machine = subject.get_virtual_machine(virtual_machine_name, cloud_service_name)
+        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]
+      end
+    end
+
     it 'should set options hash with valid cloud_service_name, deployment_name, storage_account_name and virtual network' do
       csn = options[:cloud_service_name]
       options[:availability_set_name] = 'aval-set-test'
-      vm = subject.create_virtual_machine(params, options, false)
+      vm = subject.create_virtual_machine(params, options)
       vm.must_be_kind_of Azure::VirtualMachineManagement::VirtualMachine
       vm.cloud_service_name.wont_be_nil
       vm.vm_name.must_equal virtual_machine_name
       vm.deployment_name.wont_be_nil
       vm.deployment_name.must_equal vm.cloud_service_name
       vm.os_type.must_equal 'Linux'
-      vm.role_size.must_equal 'Small'
+      vm.role_size.must_equal 'Basic_A0'
       vm.availability_set_name.must_equal 'aval-set-test'
       options[:storage_account_name].wont_be_nil
       assert_match(/^#{params[:vm_name] + '-service'}*/, csn)
-      # Test for add role
-      params[:vm_name] = 'test-add-role-vm'
-      vm = subject.create_virtual_machine(params, options, true)
-      vm.cloud_service_name.must_equal csn
-      vm.vm_name.must_equal params[:vm_name]
-      vm.deployment_name.wont_be_nil
-      vm.os_type.must_equal 'Linux'
     end
 
     it 'should creates http and https enabled winrm virtual machine without certificate.' do

data/test/integration/vm/VM_Operations_test.rb

@@ -64,7 +64,7 @@ describe Azure::VirtualMachineManagementService do
       before do
         subject.shutdown_virtual_machine(vm_name, csn)
       end
-      
+
       it 'starts virtual machine' do
         subject.start_virtual_machine(vm_name, csn)
         vm = subject.get_virtual_machine(vm_name, csn)
@@ -107,9 +107,8 @@ describe Azure::VirtualMachineManagementService do
 
     describe '#add_data_disk' do
       it 'add data disk to virtual machine' do
-        lun = rand(1..15)
         others = { disk_size: 100 }
-        subject.add_data_disk(vm_name, csn , lun, others)
+        subject.add_data_disk(vm_name, csn, others)
         dms = VirtualMachineDiskManagementService.new
         disks = dms.list_virtual_machine_disks
         disks = disks.select { |x| (/#{csn}/ =~ x.name) && x.os_type.empty? }
@@ -119,7 +118,7 @@ describe Azure::VirtualMachineManagementService do
     end
 
     describe 'Add, Update, Delete endpoints' do
-      
+
       it 'should add endpoints to virtual machine.' do
         ep1 =  {
           name: 'endpoint-1',

data/test/unit/cloud_service_management/cloud_service_management_service_test.rb

@@ -12,73 +12,73 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #--------------------------------------------------------------------------
-require "test_helper"
+require 'test_helper'
 
 describe Azure::CloudServiceManagementService do
 
   subject { Azure::CloudServiceManagementService.new }
-  let(:request_path) {'/services/hostedservices'}
-  let(:cloud_services_xml) { Fixtures["list_cloud_services"] }
+  let(:request_path) { '/services/hostedservices' }
+  let(:cloud_services_xml) { Fixtures['list_cloud_services'] }
   let(:method) { :get }
-  let(:mock_request){ mock() }
-  let(:response) {
-    response = mock()
+  let(:mock_request) { mock }
+  let(:response) do
+    response = mock
     response.stubs(:body).returns(cloud_services_xml)
     response
-  }
+  end
   let(:response_body) { Nokogiri::XML response.body }
 
-  before{
+  before do
     Loggerx.expects(:puts).returns(nil).at_least(0)
-  }
+  end
 
-  describe "#list_cloud_services" do
-    before {
+  describe '#list_cloud_services' do
+    before do
       ManagementHttpRequest.stubs(:new).with(method, request_path, nil).returns(mock_request)
       mock_request.expects(:call).returns(response_body)
-    }
-  
-    it "assembles a URI for the request" do
+    end
+
+    it 'assembles a URI for the request' do
       subject.list_cloud_services
     end
-  
-    it "sets the properties of the CloudService instance" do
+
+    it 'sets the properties of the CloudService instance' do
       cloud_service = subject.list_cloud_services.first
       cloud_service.name.must_equal 'cloud-service-1'
     end
-  
-    it "returns a list of cloud services for the subscription" do
+
+    it 'returns a list of cloud services for the subscription' do
       results = subject.list_cloud_services
       results.must_be_kind_of Array
       results.length.must_equal 2
       results.first.must_be_kind_of Azure::CloudServiceManagement::CloudService
     end
   end
-  
-  describe "#get_cloud_service" do
-    before {
+
+  describe '#get_cloud_service' do
+    before do
       ManagementHttpRequest.stubs(:new).with(method, request_path, nil).returns(mock_request)
       mock_request.expects(:call).returns(response_body)
-    }
-  
-    it "assembles a URI for the request" do
+    end
+
+    it 'assembles a URI for the request' do
       subject.get_cloud_service 'cloud-service-1'
     end
-  
-    it "returns true if found cloud service with given name" do
+
+    it 'returns true if found cloud service with given name' do
       result = subject.get_cloud_service 'cloud-service-1'
       result.must_equal true
     end
-  
+
     it "returns false if cloud service with given name doesn't exists" do
       result = subject.get_cloud_service 'cloud-service-3'
       result.must_equal false
     end
   end
 
-  describe "#create_cloud_service" do
-  
-    it "Create cloud service return message if cloud service exists of given name." do
+  describe '#create_cloud_service' do
+
+    it 'Create cloud service return message if cloud service exists of given name.' do
       ManagementHttpRequest.any_instance.expects(:call).returns response_body
       msg = subject.create_cloud_service 'cloud-service-1'
       assert_match(/^Cloud service cloud-service-1 already exists*/, msg)

data/test/unit/cloud_service_management/serialization_test.rb

@@ -59,7 +59,7 @@ describe Azure::CloudServiceManagement::Serialization do
   end
 
   describe '#cloud_services_to_xml' do
-    let(:cloud_service_name) {'cloud-service'}
+    let(:cloud_service_name) { 'cloud-service' }
 
     it 'accepts an name and options hash' do
       subject.cloud_services_to_xml cloud_service_name
@@ -68,9 +68,9 @@ describe Azure::CloudServiceManagement::Serialization do
     it 'uses name for label if label not provided' do
       results = subject.cloud_services_to_xml(
         cloud_service_name,
-        {
-          location: 'East Asia'
-        }
+
+        location: 'East Asia'
+
       )
 
       doc = Nokogiri::XML(results)
@@ -80,10 +80,10 @@ describe Azure::CloudServiceManagement::Serialization do
     it 'uses label when label is provided' do
       results = subject.cloud_services_to_xml(
         cloud_service_name,
-        {
-          location: 'East Asia',
-          label: 'My Label'
-        }
+
+        location: 'East Asia',
+        label: 'My Label'
+
       )
 
       doc = Nokogiri::XML(results)
@@ -92,7 +92,7 @@ describe Azure::CloudServiceManagement::Serialization do
 
     it 'serializes the argument to xml' do
       results = subject.cloud_services_to_xml(
-        cloud_service_name, { location: 'West US' }
+        cloud_service_name,  location: 'West US'
       )
       results.must_be_kind_of String
       doc = Nokogiri::XML results
@@ -103,10 +103,10 @@ describe Azure::CloudServiceManagement::Serialization do
     it 'uses affinity_group if provided and ignores location' do
       results = subject.cloud_services_to_xml(
         cloud_service_name,
-        {
-          affinity_group_name: 'my-affinity-group',
-          location: 'West US'
-        }
+
+        affinity_group_name: 'my-affinity-group',
+        location: 'West US'
+
       )
       results.must_be_kind_of String
       doc = Nokogiri::XML results
@@ -119,9 +119,9 @@ describe Azure::CloudServiceManagement::Serialization do
     it 'uses location when affinity group not provided' do
       results = subject.cloud_services_to_xml(
         cloud_service_name,
-        {
-          location: 'East Asia'
-        }
+
+        location: 'East Asia'
+
       )
 
       doc = Nokogiri::XML(results)
@@ -137,9 +137,9 @@ describe Azure::CloudServiceManagement::Serialization do
       }
       results = subject.cloud_services_to_xml(
         cloud_service_name,
-        {
-          extended_properties: xtended_props
-        }
+
+        extended_properties: xtended_props
+
       )
 
       doc = Nokogiri::XML(results)
@@ -159,7 +159,7 @@ describe Azure::CloudServiceManagement::Serialization do
     it 'serializes the options hash to xml' do
       results = subject.cloud_services_to_xml(
         cloud_service_name,
-        { location: 'East US' }
+        location: 'East US'
       )
       doc = Nokogiri::XML results
       doc.css('Location').text.must_equal 'East US'

data/test/unit/virtual_machine_image_management/serialization_test.rb

@@ -12,24 +12,24 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #--------------------------------------------------------------------------
-require "test_helper"
+require 'test_helper'
 
 describe Azure::VirtualMachineImageManagement::Serialization do
   subject { Azure::VirtualMachineImageManagement::Serialization }
 
-  let(:virtual_machine_images_from_xml) { Fixtures["list_images"] }
+  let(:virtual_machine_images_from_xml) { Fixtures['list_images'] }
 
-  describe "#virtual_machine_images_from_xml" do
+  describe '#virtual_machine_images_from_xml' do
 
-    it "accepts an XML string" do
+    it 'accepts an XML string' do
       subject.virtual_machine_images_from_xml Nokogiri::XML(virtual_machine_images_from_xml)
     end
 
-    it "returns an Array of VirtualMachineImageService instances" 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.count.must_equal 12
     end
   end
-end
+end

data/test/unit/virtual_machine_image_management/virtual_machine_image_management_service_test.rb

@@ -12,48 +12,48 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #--------------------------------------------------------------------------
-require "test_helper"
+require 'test_helper'
 
 describe Azure::VirtualMachineImageManagementService do
 
   subject { Azure::VirtualMachineImageManagementService.new }
 
-  let(:request_path) {'/services/images'}
-  let(:images_xml) { Fixtures["list_images"] }
+  let(:request_path) { '/services/images' }
+  let(:images_xml) { Fixtures['list_images'] }
   let(:method) { :get }
-  let(:mock_request){ mock() }
-  let(:response) {
-    response = mock()
+  let(:mock_request) { mock }
+  let(:response) do
+    response = mock
     response.stubs(:body).returns(images_xml)
     response
-  }
+  end
   let(:response_body) { Nokogiri::XML response.body }
 
-  before{
+  before do
     Loggerx.expects(:puts).returns(nil).at_least(0)
-  }
-  
-  describe "#list_virtual_machine_images" do
-    
-    before {
+  end
+
+  describe '#list_virtual_machine_images' do
+
+    before do
       ManagementHttpRequest.stubs(:new).with(
         method,
         request_path,
         nil
       ).returns(mock_request)
       mock_request.expects(:call).returns(response_body)
-    }
-  
-    it "assembles a URI for the request" do
+    end
+
+    it 'assembles a URI for the request' do
       subject.list_virtual_machine_images
     end
-  
-    it "sets the properties of the virtual machine images" do
+
+    it 'sets the properties of the virtual machine images' do
       virtual_machine_image = subject.list_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
+    it 'returns a list of virtual machine images from server' do
       results = subject.list_virtual_machine_images
       results.must_be_kind_of Array
       results.length.must_equal 12
@@ -61,5 +61,5 @@ describe Azure::VirtualMachineImageManagementService do
       results.first.must_be_kind_of image_klass
     end
   end
-  
+
 end