azure 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2218a9a37d85a587e477daa5f91d8c06d0eb3f59
-  data.tar.gz: 39efa8b58227090e87058d9aa4765251d423f4ce
+  metadata.gz: 184071aad7a3c42ae4096da3d27aaadf01f5dd42
+  data.tar.gz: 2b8f026ba119dda6324cbaeb1c0c0857dade93b8
 SHA512:
-  metadata.gz: a47b93b9e6e87ea04bc0458569e16d3b75046f8a3ce178c4d0914078f94d4b78d4ffd3ac124c8870033f09cf2d6932fec147ed739d43f1fb71e8cb72620a32ca
-  data.tar.gz: f15f40f69a33d35902b0f585c1de2a405a7468b7c21befe2b0902d0d61da233923c8bb417b4d0212e8ddab87937a9607c32d13220e2316e9d492df2d2a314c40
+  metadata.gz: d73a29abe2a26c39630977cce42d940cc1d15b9c12eeb87aeb8cf880427691e5952e85798ad47488b0ccd8f36c8f41648bc40febe0ea32506ba78b739cd47d68
+  data.tar.gz: ed70f72f78035c46141b33d56a7b1611fd610e8c1a2eab44c944c11d78c4062006e8b8915f425c007e48402b4bdfb78c77093c8bdf7dc30979c3916a6f85d9b4

data/ChangeLog.txt

@@ -1,3 +1,10 @@
+2014.03.28 - version 0.6.3
+* Added get_cloud_service_properties method, which returns all cloud service properties (embed-detail=true), including info about all VMs
+* Added winrm_http_port and winrm_https_port to get_virtual_machine method to allow the users to configure custom ports for winrm-http and winrm-https
+* Checks if any ports are in use before adding a role in the existing cloud service
+* Auto generate public port for add role.
+* Fix issue https://github.com/WindowsAzure/azure-sdk-for-ruby/issues/130
+
 2014.03.15 - version 0.6.2
 * Restart Virtual Machine
 * Add disk to Virtual Machine

data/lib/azure/cloud_service_management/cloud_service.rb

@@ -32,7 +32,7 @@ module Azure
       attr_accessor :date_modified
       attr_accessor :extended_properties
       attr_accessor :default_winrm_certificate_thumbprint
-
+      attr_accessor :virtual_machines
     end
   end
 end

data/lib/azure/cloud_service_management/cloud_service_management_service.rb

@@ -91,6 +91,13 @@ module Azure
         flag
       end
 
+      def get_cloud_service_properties(name)
+        request_path = "/services/hostedservices/#{name}?embed-detail=true"
+        request = ManagementHttpRequest.new(:get, request_path)
+        response = request.call
+        Serialization.cloud_services_from_xml(response)
+      end
+
       # Public: Deletes the specified cloud service of given subscription id from Windows Azure.
       #
       # ==== Attributes

data/lib/azure/cloud_service_management/serialization.rb

@@ -14,6 +14,7 @@
 #--------------------------------------------------------------------------
 require 'base64'
 require 'azure/cloud_service_management/cloud_service'
+require 'azure/virtual_machine_management/serialization'
 
 module Azure
   module CloudServiceManagement
@@ -54,6 +55,8 @@ module Azure
       def self.cloud_services_from_xml(cloud_xml)
         clouds = []
         cloud_services_xml = cloud_xml.css('HostedServices HostedService')
+        cloud_services_xml = cloud_xml.css('HostedService') if \
+          cloud_services_xml.length == 0
         cloud_services_xml.each do |cloud_service_xml|
           cloud = CloudService.new
           cloud.url = xml_content(cloud_service_xml, 'Url')
@@ -80,6 +83,18 @@ module Azure
             cloud_service_xml, 'DefaultWinRMCertificateThumbprint'
           )
 
+          vms_in_deployment = {}
+
+          cloud_service_xml.css('Deployments').each do |deployxml|
+            deployment_name = xml_content(deployxml, 'Deployment Name')
+            vms = Azure::VirtualMachineManagement::Serialization.virtual_machines_from_xml(
+              deployxml, cloud.name
+            )
+
+            vms_in_deployment[deployment_name.to_sym] = vms
+          end
+
+          cloud.virtual_machines = vms_in_deployment
           clouds << cloud
         end
         clouds.compact

data/lib/azure/storage_management/serialization.rb

@@ -107,12 +107,6 @@ module Azure
           storage_accounts << storage_account
         end
 
-        # returns the first storage account if only one found
-        # This will be the case when calling the get_storage_account_properties
-        # API or if only one storage account exists for the subscription
-        return storage_accounts.first if storage_accounts.size == 1
-
-        # returns all the storage accounts, if more than 1 found
         storage_accounts.compact
       end
 

data/lib/azure/storage_management/storage_management_service.rb

@@ -67,7 +67,7 @@ module Azure
         request_path = "/services/storageservices/#{name}"
         request = ManagementHttpRequest.new(:get, request_path, nil)
         response = request.call
-        Serialization.storage_services_from_xml(response)
+        Serialization.storage_services_from_xml(response).first
       end
 
       # Public: Create a new storage account in Windows Azure.

data/lib/azure/version.rb

@@ -17,7 +17,7 @@ module Azure
   class Version
     MAJOR = 0 unless defined? MAJOR
     MINOR = 6 unless defined? MINOR
-    UPDATE = 2 unless defined? UPDATE
+    UPDATE = 3 unless defined? UPDATE
     PRE = nil unless defined? PRE
 
     class << self

data/lib/azure/virtual_machine_management/serialization.rb

@@ -91,7 +91,11 @@ module Azure
                 xml.ConfigurationSetType 'NetworkConfiguration'
                 xml.InputEndpoints do
                   default_endpoints_to_xml(xml, options)
-                  tcp_endpoints_to_xml(xml, options[:tcp_endpoints]) if options[:tcp_endpoints]
+                  tcp_endpoints_to_xml(
+                    xml,
+                    options[:tcp_endpoints],
+                    options[:existing_ports]
+                  ) if options[:tcp_endpoints]
                 end
                 if options[:virtual_network_name] && options[:subnet_name]
                   xml.SubnetNames do
@@ -127,10 +131,16 @@ module Azure
               xml.SSH do
                 xml.PublicKeys do
                   xml.PublicKey do
-                    xml.Fingerprint fingerprint
+                    xml.Fingerprint fingerprint.to_s.upcase
                     xml.Path "/home/#{params[:vm_user]}/.ssh/authorized_keys"
                   end
                 end
+                xml.KeyPairs do
+                  xml.KeyPair do
+                    xml.Fingerprint fingerprint.to_s.upcase
+                    xml.Path "/home/#{params[:vm_user]}/.ssh/id_rsa"
+                  end
+                end
               end
             end
           end
@@ -165,49 +175,64 @@ module Azure
 
       def self.default_endpoints_to_xml(xml, options)
         os_type = options[:os_type]
+        used_ports = options[:existing_ports]
         endpoints = []
         if os_type == 'Linux'
-          endpoints <<  {
+          preferred_port = '22'
+          port_already_opened?(used_ports, options[:ssh_port])
+          endpoints << {
             name: 'SSH',
-            public_port: options[:ssh_port] || '22',
+            public_port: options[:ssh_port] || assign_random_port(preferred_port, used_ports),
             protocol: 'TCP',
-            local_port: '22'
+            local_port: preferred_port
           }
         elsif os_type == 'Windows' && options[:winrm_transport]
           if options[:winrm_transport].include?('http')
-            endpoints <<  {
+            preferred_port = '5985'
+            port_already_opened?(used_ports, options[:winrm_http_port])
+            endpoints << {
               name: 'WinRm-Http',
-              public_port: '5985',
+              public_port: options[:winrm_http_port] || assign_random_port(preferred_port, used_ports),
               protocol: 'TCP',
-              local_port: '5985'
+              local_port: preferred_port
             }
           end
           if options[:winrm_transport].include?('https')
-            endpoints <<  {
+            preferred_port = '5986'
+            port_already_opened?(used_ports, options[:winrm_https_port])
+            endpoints << {
               name: 'PowerShell',
-              public_port: '5986',
+              public_port: options[:winrm_https_port] || assign_random_port(preferred_port, used_ports),
               protocol: 'TCP',
-              local_port: '5986'
+              local_port: preferred_port
             }
           end
         end
         endpoints_to_xml(xml, endpoints)
       end
 
-      def self.tcp_endpoints_to_xml(xml, tcp_endpoints)
+      def self.tcp_endpoints_to_xml(xml, tcp_endpoints, existing_ports = [])
         endpoints = []
+
         tcp_endpoints.split(',').each do |endpoint|
           ports = endpoint.split(':')
           tcp_ep = {}
+
           if ports.length > 1
-            tcp_ep[:name]  = 'TCP-PORT-' + ports[1]
+            port_already_opened?(existing_ports, ports[1])
+
+            tcp_ep[:name] = "TCP-PORT-#{ports[1]}"
             tcp_ep[:public_port] = ports[1]
           else
-            tcp_ep[:name] = 'TCP-PORT-' + ports[0]
+            port_already_opened?(existing_ports, ports[0])
+
+            tcp_ep[:name] = "TCP-PORT-#{ports[0]}"
             tcp_ep[:public_port] = ports[0]
           end
+
           tcp_ep[:local_port] = ports[0]
           tcp_ep[:protocol] = 'TCP'
+
           endpoints << tcp_ep
         end
         endpoints_to_xml(xml, endpoints)
@@ -230,17 +255,18 @@ module Azure
             vm.cloud_service_name = cloud_service_name.downcase
             vm.deployment_name = xml_content(deployXML, 'Deployment Name')
             vm.deployment_status = xml_content(deployXML, 'Deployment Status')
-            vm.virtual_network_name =  xml_content(
+            vm.virtual_network_name = xml_content(
               deployXML.css('Deployment'),
               'VirtualNetworkName'
             )
             roles.each do |role|
-              if xml_content(role, 'RoleName') ==  role_name
+              if xml_content(role, 'RoleName') == role_name
                 vm.availability_set_name = xml_content(role, 'AvailabilitySetName')
                 endpoints_from_xml(role, vm)
                 vm.os_type = xml_content(role, 'OSVirtualHardDisk OS')
                 vm.disk_name = xml_content(role, 'OSVirtualHardDisk DiskName')
                 vm.media_link = xml_content(role, 'OSVirtualHardDisk MediaLink')
+                vm.image = xml_content(role, 'OSVirtualHardDisk SourceImageName')
                 break
               end
             end
@@ -266,7 +292,7 @@ module Azure
           ep[:direct_server_return] = server_return if !server_return.empty?
           unless lb_name.empty?
             ep[:protocol] = endpoint.css('Protocol').last.text
-            ep[:load_balancer_name] =  lb_name
+            ep[:load_balancer_name] = lb_name
             lb_port = xml_content(endpoint, 'LoadBalancerProbe Port')
             lb_protocol = xml_content(endpoint, 'LoadBalancerProbe Protocol')
             lb_path = xml_content(endpoint, 'LoadBalancerProbe Path')
@@ -321,7 +347,7 @@ module Azure
           protocol = endpoint[:protocol]
           port = endpoint[:public_port]
           interval = endpoint[:load_balancer][:interval]
-          timeout =  endpoint[:load_balancer][:timeout]
+          timeout = endpoint[:load_balancer][:timeout]
           path = endpoint[:load_balancer][:path]
           balancer_name = endpoint[:load_balancer_name]
           xml.InputEndpoint do
@@ -359,7 +385,7 @@ module Azure
             xml.Lun lun
             xml.LogicalDiskSizeInGB options[:disk_size] || 1
             unless options[:import]
-              disk_name  = media_link[/([^\/]+)$/]
+              disk_name = media_link[/([^\/]+)$/]
               media_link = media_link.gsub(/#{disk_name}/, (Time.now.strftime('disk_%Y_%m_%d_%H_%M')) + '.vhd')
               xml.MediaLink media_link
             end
@@ -368,6 +394,28 @@ module Azure
         builder.doc.to_xml
       end
 
+      private
+
+      def self.port_already_opened?(existing_ports, port)
+        return false if existing_ports.nil?
+        raise "Port #{port} conflicts with a port already opened. "\
+              "Please select a different port." if existing_ports.include?(port)
+        false
+      end
+
+      def self.assign_random_port(preferred_port, used_ports)
+        random_port = nil
+        if used_ports.nil? || !used_ports.include?(preferred_port)
+          random_port = preferred_port
+        else
+          random_port = Random.new.rand(10000..65535)
+          while(used_ports.include?(random_port.to_s))
+            random_port = Random.new.rand(10000..65535)
+          end
+        end
+        random_port
+      end
+
     end
   end
 end

data/lib/azure/virtual_machine_management/virtual_machine.rb

@@ -30,7 +30,6 @@ module Azure
       attr_accessor :deployment_status
       attr_accessor :tcp_endpoints
       attr_accessor :role_size
-      attr_accessor :vm_user
       attr_accessor :image
       attr_accessor :os_type
       attr_accessor :disk_name

data/lib/azure/virtual_machine_management/virtual_machine_management_service.rb

@@ -85,6 +85,8 @@ module Azure
       # * +:ssh_private_key_file+     - String. Path of private key file.
       # * +:ssh_certificate_file+     - String. Path of certificate file.
       # * +:ssh_port+                 - Integer. Specifies the SSH port number.
+      # * +:winrm_http_port           - Integer. Specifies the WinRM HTTP port number.
+      # * +:winrm_https_port          - Integer. Specifies the WinRM HTTPS port number.
       # * +:vm_size+                  - String. Specifies the size of the virtual machine instance.
       # * +:winrm_transport+          - Array. Specifies WINRM transport protocol.
       # * +:availability_set_name+    - String. Specifies the availability set name.
@@ -131,6 +133,20 @@ module Azure
           body = Serialization.deployment_to_xml(params, options)
           path = "/services/hostedservices/#{options[:cloud_service_name]}/deployments"
         else
+          cloud_services = Azure::CloudServiceManagementService.new.get_cloud_service_properties(
+            options[:cloud_service_name]
+          )
+          existing_ports = []
+          # There should be only one cloud_serivce in the Array.
+          cloud_services.each do |cloud_service|
+            cloud_service.virtual_machines[options[:deployment_name].to_sym].each do |vm|
+              vm.tcp_endpoints.each do |endpoint|
+                existing_ports << endpoint[:public_port]
+              end
+            end
+          end
+
+          options[:existing_ports] = existing_ports
 
           Loggerx.info 'Deployment exists, adding role...'
           body = Serialization.role_to_xml(params, options).to_xml

data/test/fixtures/list_storage_account_single.xml

@@ -0,0 +1,25 @@
+
+<?xml version="1.0"?>
+<StorageServices xmlns="http://schemas.microsoft.com/windowsazure" xmlns:i="http://www.w3.org/2001/XMLSchema-instance">
+  <StorageService>
+    <Url>https://management.core.windows.net/268a3762-abcd-4cd3-a4ea-80e84bddff87/services/storageservices/storage1</Url>
+    <ServiceName>storage1</ServiceName>
+    <StorageServiceProperties>
+      <Description i:nil="true"/>
+      <Location>West US</Location>
+      <Label>c3VzZQ==</Label>
+      <Status>Created</Status>
+      <Endpoints>
+        <Endpoint>http://storage1.blob.core.windows.net/</Endpoint>
+        <Endpoint>http://storage1.queue.core.windows.net/</Endpoint>
+        <Endpoint>http://storage1.table.core.windows.net/</Endpoint>
+      </Endpoints>
+      <GeoReplicationEnabled>true</GeoReplicationEnabled>
+      <GeoPrimaryRegion>West US</GeoPrimaryRegion>
+      <StatusOfPrimary/>
+      <GeoSecondaryRegion>East US</GeoSecondaryRegion>
+      <StatusOfSecondary/>
+    </StorageServiceProperties>
+    <ExtendedProperties/>
+  </StorageService>
+</StorageServices>

data/test/integration/vm/VM_Create_test.rb

@@ -83,7 +83,6 @@ describe Azure::VirtualMachineManagementService do
       assert_match(/^#{params[:vm_name] + '-service'}*/, csn)
       # Test for add role
       params[:vm_name] = 'test-add-role-vm'
-      options[:ssh_port] = 2222
       vm = subject.create_virtual_machine(params, options, true)
       vm.cloud_service_name.must_equal csn
       vm.vm_name.must_equal params[:vm_name]

data/test/unit/storage_management/storage_management_service_test.rb

@@ -19,14 +19,25 @@ describe Azure::StorageManagementService do
   subject { Azure::StorageManagementService.new }
   let(:request_path) {'/services/storageservices'}
   let(:storage_accounts_xml) { Fixtures["list_storage_accounts"] }
+  let(:one_storage_account_xml) { Fixtures['list_storage_account_single']}
   let(:method) { :get }
   let(:mock_request){ mock() }
+
   let(:response) {
     response = mock()
     response.stubs(:body).returns(storage_accounts_xml)
     response
   }
+
+  let(:single_response) {
+    single_response = mock()
+    single_response.stubs(:body).returns(one_storage_account_xml)
+    single_response
+  }
+
   let(:response_body) {Nokogiri::XML response.body}
+  let(:single_response_body) { Nokogiri::XML single_response.body }
+
   before{
     Loggerx.expects(:puts).returns(nil).at_least(0)
   }
@@ -54,6 +65,23 @@ describe Azure::StorageManagementService do
     end
   end
 
+  describe "#list_storage_accounts_single" do
+    before {
+      ManagementHttpRequest.stubs(:new).with(
+        method, request_path, nil
+      ).returns(mock_request)
+      mock_request.expects(:call).returns(single_response_body)
+    }
+
+    it "returns an array even if single account exists" do
+      results = subject.list_storage_accounts
+      results.must_be_kind_of Array
+      results.length.must_equal 1
+      results.first.must_be_kind_of Azure::StorageManagement::StorageAccount
+      results.first.name.must_equal 'storage1'
+    end
+  end
+
   describe "#get_storage_account" do
     before {
       ManagementHttpRequest.stubs(:new).with(method, request_path, nil).returns(mock_request)

data/test/unit/virtual_machine_management/serialization_test.rb

@@ -105,7 +105,7 @@ describe Azure::VirtualMachineManagement::Serialization do
   end
 
   describe '#deployment_to_xml' do
-    let(:params)do
+    let(:params) do
       {
         vm_name: 'virtual-machine-name',
         vm_user: 'username',
@@ -125,7 +125,7 @@ describe Azure::VirtualMachineManagement::Serialization do
     end
 
     it 'returns an VirtualMachine object with correct tcp endpoints' do
-      params[:certificate] = { fingerprint: 'CFB8C256D2986559C630547F2D0' }
+      params[:certificate] = {fingerprint: 'CFB8C256D2986559C630547F2D0'}
       result = subject.deployment_to_xml params, options
       doc = Nokogiri::XML(result)
       endpoints = doc.css('Deployment RoleList ConfigurationSet InputEndpoints InputEndpoint')
@@ -160,7 +160,7 @@ describe Azure::VirtualMachineManagement::Serialization do
   describe '#add_data_disk_to_xml' do
 
     let(:options) do
-      { disk_size:  100 }
+      {disk_size: 100}
     end
     let(:media_link) { 'https://sta.blob.managment.core.net/vhds/1234.vhd' }
     let(:lun) { 5 }
@@ -169,7 +169,7 @@ describe Azure::VirtualMachineManagement::Serialization do
     end
 
     it 'returns an xml for newly created data disk' do
-      result = subject.add_data_disk_to_xml(lun, media_link , options)
+      result = subject.add_data_disk_to_xml(lun, media_link, options)
       doc = Nokogiri::XML(result)
       disk_size = doc.css('DataVirtualHardDisk LogicalDiskSizeInGB').text
       media_link = doc.css('DataVirtualHardDisk MediaLink').text
@@ -184,7 +184,7 @@ describe Azure::VirtualMachineManagement::Serialization do
     it 'returns an xml for existing data disk' do
       options[:import] = true
       options[:disk_name] = 'disk_name'
-      result = subject.add_data_disk_to_xml(lun, media_link , options)
+      result = subject.add_data_disk_to_xml(lun, media_link, options)
       doc = Nokogiri::XML(result)
       media_link = doc.css('DataVirtualHardDisk MediaLink').text
       disk_name = doc.css('DataVirtualHardDisk DiskName').text
@@ -197,10 +197,39 @@ describe Azure::VirtualMachineManagement::Serialization do
     it 'raise error when disk name is empty' do
       options[:import] = true
       exception = assert_raises(RuntimeError) do
-        subject.add_data_disk_to_xml(lun, media_link , options)
+        subject.add_data_disk_to_xml(lun, media_link, options)
       end
       assert_match(/The data disk name is not valid/i, exception.message)
     end
   end
 
+  describe '#add_data_disk_to_xml' do
+    let(:preferred_port) { '22' }
+    before do
+      subject.class.send(:public, *subject.class.private_instance_methods)
+      Loggerx.expects(:puts).returns(nil).at_least(0)
+    end
+
+    it 'returns an xml for newly created data disk' do
+      result = subject.assign_random_port(preferred_port, [preferred_port])
+      assert_operator result.to_i, :>=, 10000
+      assert_operator result.to_i, :<=, 65535
+    end
+
+    it 'returns an xml for newly created data disk' do
+      result = subject.assign_random_port(preferred_port, nil)
+      result.must_equal preferred_port
+    end
+
+    it 'returns an xml for newly created data disk' do
+      result = subject.assign_random_port(preferred_port, [])
+      result.must_equal preferred_port
+    end
+
+    it 'returns an xml for newly created data disk' do
+      result = subject.assign_random_port(preferred_port, ['1', preferred_port])
+      assert_operator result.to_i, :>=, 10000
+      assert_operator result.to_i, :<=, 65535
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: azure
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Microsoft Corporation
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-15 00:00:00.000000000 Z
+date: 2014-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -281,6 +281,7 @@ files:
 - test/fixtures/list_page_ranges.xml
 - test/fixtures/list_sql_database.xml
 - test/fixtures/list_sql_server_firewall.xml
+- test/fixtures/list_storage_account_single.xml
 - test/fixtures/list_storage_accounts.xml
 - test/fixtures/list_virtual_networks.xml
 - test/fixtures/logging.xml