foreman_azure_rm 2.0.7 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6b3d52bb180b583d6d307ef39a00efea028a52cb783d0f5dcfb1635e9e73c74
-  data.tar.gz: db51091159e0eb00bcf3bfe3c13d6eee7c66e4db53e49200988717ac352ad0aa
+  metadata.gz: 56702d3d39f9bc9753e04e4681b4607d073cc913c1625835dda252a8a575cb6a
+  data.tar.gz: 59999cc6458945958f13933a0a9c1b08b63d8ddad0cb6ece337b86e367948190
 SHA512:
-  metadata.gz: 0203261bd33988e9f453e8247bef50fff3c7ece7e265e7928f20c27b9c147c5f7207431056d4b5549bcfc6951456e2819e9b0d5c724eec0ee950ed09d0d64e63
-  data.tar.gz: d4a34c46a09a35b9e0bcb42df77ef24d9f6a99ce3216e72c736ffb782f18c036f523d8a0ccdaf2df009519a30aa5d54a330a5b57397aa87edb1e8a461a09549a
+  metadata.gz: beb3b60d5c7790ff3063c67634d749fa5ca13148bde4197e40f0d5014ec3bdab94956688b5a6de21fa13ee40e0edf76bccd7ce2fa6e1ebcd6be7fafb9f79057a
+  data.tar.gz: c4e0e9857dfe71bc31d09275c012ed263dde09e25d98ea5d32c75a8be812f8a325a0d5f2e9880f6a84109c9f8a6f2ff3ee5db0e1079b969c27102cd84fc2d54e

data/app/helpers/azure_compute_resource_helper.rb

@@ -0,0 +1,17 @@
+module AzureComputeResourceHelper
+  def regions_list(azurerm_cr, f)
+    begin
+      regions = azurerm_cr.regions || []
+    rescue StandardError
+      #do nothing
+      regions = []
+    rescue Exception => ex
+      return information_box("Regions could not be loaded due to exception: #{ex}")
+    end
+    selectable_f(f, :url, regions, {}, {:label => _('Azure Region'), :disabled => regions.empty?, :required => true, :help_inline_permanent => load_button_f(f, regions.present?, _("Load Regions")) })
+  end
+  def azure_doc_url
+    doc_version = Foreman::Plugin.find(:foreman_azure_rm).version.scan(/\d+\.\d+/).first + '.x'
+    "https://theforeman.org/plugins/foreman_azure/#{doc_version}"
+  end
+end

data/app/models/concerns/foreman_azure_rm/vm_extensions/managed_vm.rb

@@ -13,19 +13,7 @@ module ForemanAzureRm
         os_disk.name = "#{vm_name}-osdisk"
         os_disk.os_type = platform
         os_disk.create_option = ComputeModels::DiskCreateOptionTypes::FromImage
-        os_disk.caching = if os_disk_caching.present?
-                            case os_disk_caching
-                              when 'None'
-                                ComputeModels::CachingTypes::None
-                              when 'ReadOnly'
-                                ComputeModels::CachingTypes::ReadOnly
-                              when 'ReadWrite'
-                                ComputeModels::CachingTypes::ReadWrite
-                            end
-                          else
-                            # ARM best practices stipulate RW caching on the OS disk
-                            ComputeModels::CachingTypes::ReadWrite
-                          end
+        os_disk.caching = disk_caching(os_disk_caching)
         managed_disk_params.storage_account_type = if premium_os_disk == 'true'
                                                      ComputeModels::StorageAccountTypes::PremiumLRS
                                                    else
@@ -33,10 +21,44 @@ module ForemanAzureRm
                                                    end
         os_disk.managed_disk = managed_disk_params
         storage_profile.os_disk = os_disk
-
         storage_profile
       end
 
+      def disk_caching(disk_type_caching)
+        case disk_type_caching
+        when 'None'
+          ComputeModels::CachingTypes::None
+        when 'ReadOnly'
+          ComputeModels::CachingTypes::ReadOnly
+        when 'ReadWrite'
+          ComputeModels::CachingTypes::ReadWrite
+        when nil, ""
+          nil
+        else
+          raise RuntimeError, "Disk caching value must be either 'None', 'ReadOnly' or 'ReadWrite'."
+        end
+      end
+
+      def define_data_disks(vm_name, data_disks)
+        unless data_disks.nil?
+          disks = []
+          disk_count = 0
+          data_disks.each do |disk_num, attrs|
+            managed_data_disk = ComputeModels::ManagedDiskParameters.new
+            disk = ComputeModels::DataDisk.new
+            disk.name = "#{vm_name}-data-disk#{disk_count}"
+            disk.caching  = disk_caching(attrs[:data_disk_caching])
+            disk.disk_size_gb = attrs[:disk_size_gb]
+            disk.create_option = ComputeModels::DiskCreateOption::Empty
+            disk.lun = disk_count + 1
+            disk.managed_disk = managed_data_disk
+            disk_count += 1
+            disks << disk
+          end
+          disks
+        end
+      end
+
       def marketplace_image_reference(publisher, offer, sku, version)
         image_reference = ComputeModels::ImageReference.new
         image_reference.publisher = publisher
@@ -46,26 +68,25 @@ module ForemanAzureRm
         image_reference
       end
 
-      def define_image(image_id)
-        # If image UUID begins with / it is a custom managed image
-        # Otherwise it is a marketplace URN
-        unless image_id.start_with?('/')
+      def define_image(rg_name, image)
+        image_type, image_id = image.split('://')
+        case image_type
+        when 'marketplace'
           urn = image_id.split(':')
           publisher = urn[0]
           offer     = urn[1]
           sku       = urn[2]
           version   = urn[3]
-          image_id = nil
-        end
-
-        if image_id.nil?
-          # For marketplace image
           image_reference = marketplace_image_reference(publisher, offer, sku, version)
+        when 'custom'
+          custom_image = sdk.get_custom_image(rg_name, image_id)
+          image_reference = ComputeModels::ImageReference.new
+          image_reference.id = custom_image.id
+        when 'gallery'
+          image_reference = ComputeModels::ImageReference.new
+          image_reference.id = sdk.fetch_gallery_image_id(rg_name, image_id)
         else
-          # For custom managed image
-          image_ref = ComputeModels::ImageReference.new
-          image_ref.id = image_id
-          image_reference = image_ref
+          image_reference = nil
         end
         image_reference
       end
@@ -189,7 +210,8 @@ module ForemanAzureRm
       def create_managed_virtual_machine(vm_hash)
         vm_params = initialize_vm(vm_hash)
         vm_params.network_profile = define_network_profile(vm_hash[:network_interface_card_ids])
-        vm_params.storage_profile.image_reference = define_image(vm_hash[:image_id])
+        vm_params.storage_profile.image_reference = define_image(vm_hash[:resource_group], vm_hash[:image_id])
+        vm_params.storage_profile.data_disks = define_data_disks(vm_hash[:name], vm_hash[:data_disks])
         sdk.create_or_update_vm(vm_hash[:resource_group], vm_hash[:name], vm_params)
       end
 

data/app/models/foreman_azure_rm/azure_rm.rb

@@ -12,12 +12,14 @@ module ForemanAzureRm
     alias_attribute :region, :url
     alias_attribute :tenant, :uuid
 
-    validates :user, :password, :url, :uuid, :app_ident, :presence => true
+    validates :user, :password, :uuid, :app_ident, :presence => true
 
     has_one :key_pair, :foreign_key => :compute_resource_id, :dependent => :destroy
 
     before_create :test_connection, :setup_key_pair
 
+    validate :ensure_attributes_and_values
+
     class VMContainer
       attr_accessor :virtualmachines
       delegate :each, to: :virtualmachines
@@ -47,6 +49,15 @@ module ForemanAzureRm
       "#{name} (#{provider_friendly_name})"
     end
 
+    def ensure_attributes_and_values
+      validate_region
+    end
+
+    def validate_region
+      return unless regions.present?
+      errors.add(:region, "is not valid, must be lowercase eg. 'eastus'. No special characters allowed.") unless regions.collect(&:second).include?(region)
+    end
+
     def self.model_name
       ComputeResource.model_name
     end
@@ -56,81 +67,35 @@ module ForemanAzureRm
     end
 
     def capabilities
-      [:image]
-    end
-
-    def self.regions
-      [
-          ['West Europe', 'westeurope'],
-          ['Central US', 'centralus'],
-          ['South Central US', 'southcentralus'],
-          ['North Central US', 'northcentralus'],
-          ['West Central US', 'westcentralus'],
-          ['East US', 'eastus'],
-          ['East US 2', 'eastus2'],
-          ['West US', 'westus'],
-          ['West US 2', 'westus2'],
-          ['Canada Central', 'canadacentral'],
-          ['Canada East', 'canadaeast'],
-          ['Brazil South', 'brazilsouth'],
-          ['North Europe', 'northeurope'],
-          ['France Central', 'francecentral'],
-          ['France South', 'francesouth'],
-          ['UK South', 'uksouth'],
-          ['UK West', 'ukwest'],
-          ['Germany Central', 'germanycentral'],
-          ['Germany Northeast', 'germanynortheast'],
-          ['Germany West Central', 'germanywestcentral'],
-          ['Germany North', 'germanynorth'],
-          ['Switzerland North', 'switzerlandnorth'],
-          ['Switzerland West', 'switzerlandwest'],
-          ['Norway West', 'norwaywest'],
-          ['Norway East', 'norwayeast'],
-          ['East Asia', 'eastasia'],
-          ['Southeast Asia', 'southeastasia'],
-          ['Australia Central', 'australiacentral'],
-          ['Australia Central 2', 'australiacentral2'],
-          ['Australia East', 'australiaeast'],
-          ['Australia Southeast', 'australiasoutheast'],
-          ['China East', 'chinaeast'],
-          ['China North', 'chinanorth'],
-          ['China East 2', 'chinaeast2'],
-          ['China North 2', 'chinanorth2'],
-          ['Central India', 'centralindia'],
-          ['South India', 'southindia'],
-          ['West India', 'westindia'],
-          ['Japan East', 'japaneast'],
-          ['Japan West', 'japanwest'],
-          ['Korea Central', 'koreacentral'],
-          ['Korea South', 'koreasouth'],
-          ['South Africa North', 'southafricanorth'],
-          ['South Africa West', 'southafricawest'],
-          ['UAE Central', 'uaecentral'],
-          ['UAE North', 'uaenorth']
-      ]
-    end
-
-    validates :region, inclusion: { in: regions.collect(&:second),
-    message: "%{value} must be lowercase eg. 'eastus'. No special characters allowed." }
+      [:image, :new_volume]
+    end
+
+    def regions
+      return unless sub_id.present?
+      sdk.list_regions(sub_id).value.map { |loc| [loc.display_name, loc.name] }
+    end
 
     def resource_groups
       sdk.rgs
     end
 
     def test_connection(options = {})
-      sdk.rgs.each do |rg|
-        puts "#{rg}"
-      end
-      super(options)
+      super
+      errors[:user].empty? && errors[:password].empty? && errors[:uuid].empty? && errors[:app_ident].empty? && regions
+    rescue StandardError => e
+      errors[:base] << e.message
+    rescue Excon::Error::Socket => e
+      errors[:base] << e.message
     end
 
     def new_vm(args = {})
       return AzureRmCompute.new(sdk: sdk) if args.empty?
       opts = vm_instance_defaults.merge(args.to_h).deep_symbolize_keys
       # convert rails nested_attributes into a plain hash
-      nested_args = opts.delete(:interfaces_attributes)
-      opts[:interfaces] = nested_attributes_for(:interfaces, nested_args) if nested_args
-
+      [:interfaces, :volumes].each do |collection|
+        nested_args = opts.delete("#{collection}_attributes".to_sym)
+        opts[collection] = nested_attributes_for(collection, nested_args) if nested_args
+      end
       opts.reject! { |k, v| v.nil? }
 
       raw_vm = initialize_vm(location:        region,
@@ -149,13 +114,54 @@ module ForemanAzureRm
           ifaces << new_interface(iface_attrs)
         end
       end
-      AzureRmCompute.new(azure_vm: raw_vm ,sdk: sdk, resource_group: opts[:resource_group], nics: ifaces, script_command: opts[:script_command], script_uris: opts[:script_uris])
+
+      vols = opts.fetch(:volumes, []).map { |vols_attrs| new_volume(vols_attrs) } if opts[:volumes].present?
+
+      AzureRmCompute.new(azure_vm: raw_vm ,sdk: sdk, resource_group: opts[:resource_group], nics: ifaces, volumes: vols, script_command: opts[:script_command], script_uris: opts[:script_uris])
     end
 
     def provided_attributes
       super.merge({ :ip => :provisioning_ip_address })
     end
 
+    def image_exists?(image)
+      image_type, image_id = image.split('://')
+      case image_type
+      when 'marketplace'
+        begin
+          urn = image_id.split(':')
+          publisher = urn[0]
+          offer     = urn[1]
+          sku       = urn[2]
+          version   = urn[3]
+          if version == "latest"
+            all_versions = sdk.list_versions(region, publisher, offer, sku).map(&:name)
+            return true if all_versions.any?
+          end
+          sdk.get_marketplace_image(region, publisher, offer, sku, version).present?
+        rescue StandardError => e
+          return false
+        end
+      when 'gallery'
+        gallery_images_list = sdk.list_resources(filter: "resourceType eq 'Microsoft.Compute/galleries/images'")
+        gallery_image = gallery_images_list.detect { |gal_img| gal_img.id.split('/')[-1] == image_id }
+        if gallery_image.present?
+          rg_name = gallery_image.id.split('/')[4]
+          gallery_name = gallery_image.name.split('/')[0]
+          image_versions = sdk.list_gallery_image_versions(rg_name, gallery_name, image_id)
+          target_regions = image_versions.map do |image_version|
+            image_version.publishing_profile.target_regions.map(&:name)
+          end.flatten.uniq.map { |tgt_reg| tgt_reg.gsub(/\s+/, '').downcase }
+          return true if target_regions.include? region
+        end
+      when 'custom'
+        custom_image = sdk.list_custom_images.detect { |custom_img| custom_img.name == image_id && custom_img.location == region }
+        return custom_image.present?
+      else
+        false
+      end
+    end
+
     def available_vnets(attr = {})
       virtual_networks
     end
@@ -188,6 +194,11 @@ module ForemanAzureRm
       true
     end
 
+    def new_volume(attrs = {})
+      args = { :disk_size_gb => 0, :data_disk_caching => "", 'persisted?' => false }.merge(attrs.to_h)
+      OpenStruct.new(args)
+    end
+
     def vm_sizes
       sdk.list_vm_sizes(region)
     end
@@ -198,7 +209,8 @@ module ForemanAzureRm
 
     def vm_instance_defaults
       super.deep_merge(
-        interfaces: [new_interface]
+        interfaces: [new_interface],
+        volumes: [new_volume]
       )
     end
 
@@ -212,6 +224,10 @@ module ForemanAzureRm
       ifaces
     end
 
+    def vm_disks(vm)
+      vm.storage_profile.data_disks
+    end
+
     def vms(attrs = {})
       container = VMContainer.new
       # Load all vms of the region
@@ -276,6 +292,7 @@ module ForemanAzureRm
         image_id:                        args[:image_id],
         os_disk_caching:                 args[:os_disk_caching],
         premium_os_disk:                 args[:premium_os_disk],
+        data_disks:                      args[:volumes_attributes],
         custom_data:                     args[:user_data],
         script_command:                  args[:script_command],
         script_uris:                     args[:script_uris],
@@ -283,7 +300,7 @@ module ForemanAzureRm
       logger.debug "Virtual Machine #{args[:vm_name]} Created Successfully."
       create_vm_extension(region, args)
       # return the vm object using azure_vm
-      AzureRmCompute.new(azure_vm: vm, sdk: sdk, resource_group: args[:resource_group], nics: vm_nics(vm), script_command: user_command, script_uris: args[:script_uris])
+      AzureRmCompute.new(azure_vm: vm, sdk: sdk, resource_group: args[:resource_group], nics: vm_nics(vm), volumes: vm_disks(vm), script_command: user_command, script_uris: args[:script_uris])
     rescue RuntimeError => e
       Foreman::Logging.exception('Unhandled AzureRm error', e)
       destroy_vm vm.id if vm
@@ -310,10 +327,8 @@ module ForemanAzureRm
           end
         end
       end
-      if os_disk.present?
-        sdk.delete_disk(rg_name, os_disk.name)
-      end
-
+      sdk.delete_disk(rg_name, os_disk.name) if os_disk.present?
+      data_disks.each { |data_disk| sdk.delete_disk(rg_name, data_disk.name) } if data_disks.present?
       true
     rescue ActiveRecord::RecordNotFound
       logger.info "Could not find the selected vm."

data/app/models/foreman_azure_rm/azure_rm_compute.rb

@@ -5,6 +5,7 @@ module ForemanAzureRm
     attr_accessor :resource_group
     attr_accessor :nics
     attr_accessor :script_command, :script_uris
+    attr_accessor :volumes
 
     delegate :name, to: :azure_vm, allow_nil: true
 
@@ -12,6 +13,7 @@ module ForemanAzureRm
                    sdk: sdk,
                    resource_group: azure_vm.resource_group,
                    nics: [],
+                   volumes: [],
                    script_command: nil,
                    script_uris: nil)
 
@@ -19,6 +21,7 @@ module ForemanAzureRm
       @sdk = sdk
       @resource_group ||= resource_group
       @nics ||= nics
+      @volumes ||= volumes
       @script_command ||= script_command
       @script_uris ||= script_uris
       @azure_vm.hardware_profile ||= ComputeModels::HardwareProfile.new
@@ -119,6 +122,20 @@ module ForemanAzureRm
       []
     end
 
+    def data_disks
+      @data_disks ||= @azure_vm.storage_profile.data_disks || []
+    end
+
+    def volumes
+      return @volumes if data_disks.empty?
+      volumes = data_disks.map do |disk|
+        OpenStruct.new(:disk => disk, :persisted? => true)
+      end
+    end
+
+    def volumes_attributes=(attrs)
+    end
+
     def identity
       @azure_vm.name
     end
@@ -169,7 +186,17 @@ module ForemanAzureRm
     def image_uuid
       image = @azure_vm.storage_profile.image_reference
       return nil unless image
-      "#{image.publisher}:#{image.offer}:#{image.sku}:#{image.version}"
+      if image.id.nil?
+        return "marketplace://#{image.publisher}:#{image.offer}:#{image.sku}:#{image.version}"
+      else
+        image_rg = image.id.split('/')[4]
+        image_name = image.id.split('/')[-1]
+        if sdk.list_custom_images.find { |custom_img| custom_img.name == image_name }
+          return "custom://#{image_name}"
+        elsif sdk.fetch_gallery_image_id(image_rg, image_name)
+          return "gallery://#{image_name}"
+        end
+      end
     end
 
     alias_method :image_id, :image_uuid
@@ -188,8 +215,12 @@ module ForemanAzureRm
         # Index is based on script_command that is being injected
         # from the code in #create_vm. It can be partly hard-coded
         # since the command shall no change frequently.
-        user_cmd_index = (vm_extension.settings["commandToExecute"].index("-c"))+ 4
-        script_command = vm_extension.settings["commandToExecute"][user_cmd_index..-2]
+        if ssh_key_data.nil?
+          user_cmd_index = (vm_extension.settings["commandToExecute"].index("-c"))+ 4
+          script_command = vm_extension.settings["commandToExecute"][user_cmd_index..-2]
+        else
+          vm_extension.settings["commandToExecute"]
+        end
       else
         @script_command
       end