foreman_azure_rm 2.0.8 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2d29d9fff7cb29f082a0c008cd3d9b79bf57f393db10f361abf90fbbd6509d5
-  data.tar.gz: 40bd288f1f3767674748b10db7592c1dfaab600dcd1d0ff87a858a63787a5690
+  metadata.gz: cca0d2f188d4731dbf29f7875aad1000fc3f176306dda4083caf2d053093f55f
+  data.tar.gz: d316ee9bb58752babbeb553ab24b9d1e62e496b1596dc0477b7ed839f45d3fc1
 SHA512:
-  metadata.gz: f602a038538c724ca912136bc02f6d6800b113eae462fdf860bcb24823af283767d95fae75811f76b622191b374dc8ebb5bb17c02656c2acf93aa2ef909fc47d
-  data.tar.gz: daf44548c0678ceb8ca3f00c7e5b7ad66f7f66ad337c2e09c2dd0b4ad697fa0ca935a0d559f3b0e39ea3b77d375315e100dfd3f5c547e60ef85eb8d76b2e23b8
+  metadata.gz: 9cef189f01b675262daed8b5a42b9a2324ad0952cda775a6484b3d45c45ff89b0742558c4a6f5d166a52bb3d5b749870a40d65d1a8e92de709e9615e2eb693de
+  data.tar.gz: b7c2a5d6fc6e5bb6b0127eb0a52a307e93abb7fafbd419d09064e8fe15e3c0d7b4e9e4c14fd7c83feff5b55687021084a25d4a6ee74bc581885aa4266ba645fe

data/app/helpers/azure_compute_resource_helper.rb

@@ -0,0 +1,13 @@
+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
+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

data/app/views/compute_resources/form/_azurerm.html.erb

@@ -3,8 +3,4 @@
 <%= text_f f, :user, :label => _('Subscription ID'), :required => true %>
 <%= text_f f, :uuid, :label => _('Tenant ID'), :required => true %>
 
-<%= selectable_f(f, :url, f.object.class.regions, {}, {:label => _('Azure Region'), :label_help => _("Some of the listed regions might not be supported for your subscription. Please verify on Azure portal."), :required => true }) %>
-
-<div class="col-md-offset-2">
-    <%= test_connection_button_f(f, true) %>
-</div>
+<%= regions_list(@compute_resource, f) %>

data/app/views/compute_resources_vms/form/azurerm/_base.html.erb

@@ -155,7 +155,7 @@
 %>
 
 <%= selectable_f f, :os_disk_caching, %w(None ReadOnly ReadWrite),
-               {   :include_blank => _('Please select OS Disk Caching method') },
+               {   :include_blank => _("Azure's Default") },
                {
                    :label    => _('OS Disk Caching'),
                    :label_help => _("Default ReadWrite"),

data/app/views/compute_resources_vms/form/azurerm/_volume.html.erb

@@ -0,0 +1,20 @@
+<%= number_f f, :disk_size_gb,
+             {
+               :class    => "col-md-2",
+               :label    => _("Size (GB)"), :label_size => "col-md-2",
+               :required => true,
+               :min      => 0,
+               :value    => f.object.disk_size_gb || f.object.disk.disk_size_gb,
+               :help_inline => _("Additional number of disks can be added based on VM Size. For more details, please refer to Microsoft Azure's documentation")
+             }
+%>
+
+<%= selectable_f f, :data_disk_caching, options_for_select(["None", "ReadOnly", "ReadWrite"],
+                    :selected => f.object.data_disk_caching || f.object.disk.caching),
+                 { :include_blank => _("Azure's default") },
+                 {
+                     :class    => "col-md-2",
+                     :label    => _('Data Disk Caching'),
+                     :required => true
+                 }
+%>

data/app/views/images/form/_azurerm.html.erb

@@ -2,5 +2,5 @@
            :help_inline         => _("The user that will be used to SSH into the VM for completion")
 %>
 <%= password_f f, :password, :keep_value => true, :help_inline => _("Password to authenticate with - used for SSH finish step.") %>
-<%= image_field(f, :label => _("Marketplace Image URN"), :help_inline => _("Marketplace URN (e.g. OpenLogic:CentOS:7.5:latest)")) %>
+<%= image_field(f, :label => _("Azure Image Name"), :help_inline => _("For custom or shared gallery image prefix the uuid with 'custom://' or 'gallery://'. For public image, prefix the uuid with 'marketplace://'.' (e.g. 'marketplace://OpenLogic:CentOS:7.5:latest' or 'custom://image-name')")) %>
 <%= checkbox_f f, :user_data, :help_inline => _("Does this image support user data input?") %>

data/db/migrate/20200507103900_fix_image_uuid_prefix.rb

@@ -0,0 +1,8 @@
+class FixImageUuidPrefix < ActiveRecord::Migration[5.2]
+  def up
+    Image.where(compute_resource: ForemanAzureRm::AzureRm.unscoped.all).update_all("uuid = concat('marketplace://', uuid)")
+  end
+
+  def down
+  end
+end

data/lib/foreman_azure_rm.rb

@@ -3,15 +3,18 @@ require 'azure_mgmt_resources'
 require 'azure_mgmt_network'
 require 'azure_mgmt_storage'
 require 'azure_mgmt_compute'
+require 'azure_mgmt_subscriptions'
 
 module ForemanAzureRm
   Storage = Azure::Storage::Profiles::Latest::Mgmt
   Network = Azure::Network::Profiles::Latest::Mgmt
   Compute = Azure::Compute::Profiles::Latest::Mgmt
   Resources = Azure::Resources::Profiles::Latest::Mgmt
+  Subscriptions = Azure::Subscriptions::Profiles::Latest::Mgmt
 
   StorageModels = Storage::Models
   NetworkModels = Network::Models
   ComputeModels = Compute::Models
   ResourceModels = Resources::Models
+  SubscriptionModels = Subscriptions::Models
 end

data/lib/foreman_azure_rm/azure_sdk_adapter.rb

@@ -23,6 +23,10 @@ module ForemanAzureRm
       @storage_client ||= Storage::Client.new(azure_credentials)
     end
 
+    def subscription_client
+      @subscription_client ||= Subscriptions::Client.new(azure_credentials)
+    end
+
     def azure_credentials
       provider = MsRestAzure::ApplicationTokenProvider.new(
       @tenant,
@@ -37,6 +41,14 @@ module ForemanAzureRm
       }
     end
 
+    def list_regions(subscription_id)
+      subscription_client.subscriptions.list_locations(subscription_id)
+    end
+
+    def list_resources(filter)
+      resource_client.resources.list(filter)
+    end
+
     def rgs
       rgs      = resource_client.resource_groups.list
       rgs.map(&:name)
@@ -58,6 +70,10 @@ module ForemanAzureRm
       network_client.network_interfaces.get(rg_name, nic_name)
     end
 
+    def vm_disk(rg_name, disk_name)
+      compute_client.disks.get(rg_name, disk_name)
+    end
+
     def get_vm_extension(rg_name, vm_name, vm_extension_name)
       compute_client.virtual_machine_extensions.get(rg_name, vm_name, vm_extension_name)
     end
@@ -77,6 +93,38 @@ module ForemanAzureRm
       compute_client.virtual_machines.get(rg_name, vm_name)
     end
 
+    def get_marketplace_image(location, publisher_name, offer, skus, version)
+      compute_client.virtual_machine_images.get(location, publisher_name, offer, skus, version)
+    end
+
+    def list_versions(location, publisher_name, offer, skus)
+      compute_client.virtual_machine_images.list(location, publisher_name, offer, skus)
+    end
+
+    def list_custom_images
+      compute_client.images.list
+    end
+
+    def get_custom_image(rg_name, image_name)
+      compute_client.images.get(rg_name, image_name)
+    end
+
+    def list_galleries
+      compute_client.galleries.list
+    end
+
+    def list_gallery_images(rg_name, gallery_name)
+      compute_client.gallery_images.list_by_gallery(rg_name, gallery_name)
+    end
+
+    def get_gallery_image(rg_name, gallery_name, gallery_image_name)
+      compute_client.gallery_images.get(rg_name, gallery_name, gallery_image_name)
+    end
+
+    def list_gallery_image_versions(rg_name, gallery_name, gallery_image_name)
+      compute_client.gallery_image_versions.list_by_gallery_image(rg_name, gallery_name, gallery_image_name)
+    end
+
     def get_storage_accts
       result = storage_client.storage_accounts.list
       result.value
@@ -113,8 +161,8 @@ module ForemanAzureRm
       compute_client.virtual_machines.delete(rg_name, vm_name)
     end
 
-    def delete_disk(rg_name, osdisk_name)
-      compute_client.disks.delete(rg_name, osdisk_name)
+    def delete_disk(rg_name, disk_name)
+      compute_client.disks.delete(rg_name, disk_name)
     end
 
     def check_vm_status(rg_name, vm_name)
@@ -141,5 +189,23 @@ module ForemanAzureRm
       compute_client.virtual_machines.power_off(rg_name, vm_name)
       compute_client.virtual_machines.deallocate(rg_name, vm_name)
     end
+
+    def self.gallery_caching(rg_name)
+      @gallery_caching ||= {}
+      @gallery_caching[rg_name] ||= {}
+    end
+
+    def actual_gallery_image_id(rg_name, image_id)
+      gallery_names = list_galleries.map(&:name)
+      gallery_names.each do |gallery|
+        gallery_image = list_gallery_images(rg_name, gallery).detect { |image| image.name == image_id }
+        return gallery_image&.id
+      end
+      nil
+    end
+
+    def fetch_gallery_image_id(rg_name, image_id)
+      AzureSdkAdapter.gallery_caching(rg_name)[image_id] ||= actual_gallery_image_id(rg_name, image_id)
+    end
   end
 end

data/lib/foreman_azure_rm/engine.rb

@@ -5,6 +5,7 @@ module ForemanAzureRm
     #autoloading all files inside lib dir
     config.eager_load_paths += Dir["#{config.root}/lib"]
     config.eager_load_paths += Dir["#{config.root}/app/models/concerns/foreman_azure_rm/vm_extensions/"]
+    config.eager_load_paths += Dir["#{config.root}/app/helpers/"]
 
     initializer 'foreman_azure_rm.register_plugin', :before => :finisher_hook do
       Foreman::Plugin.register :foreman_azure_rm do
@@ -38,6 +39,11 @@ module ForemanAzureRm
       require 'azure_mgmt_network'
       require 'azure_mgmt_storage'
       require 'azure_mgmt_compute'
+      require 'azure_mgmt_subscriptions'
+
+      # Add format validation for azure images
+      ::Image.validates :uuid, format: { with: /\A((marketplace|custom|gallery):\/\/)[^:]+(:[^:]+:[^:]+:[^:]+)?\z/,
+          message: "Incorrect UUID format" }, if: -> (image){ image.compute_resource.is_a? ForemanAzureRm::AzureRm }
 
       # Use excon as default so that HTTP Proxy settings of foreman works
       Faraday::default_adapter=:excon

data/lib/foreman_azure_rm/version.rb

@@ -1,3 +1,3 @@
 module ForemanAzureRm
-  VERSION = '2.0.8'.freeze
+  VERSION = '2.1.0'.freeze
 end

data/locale/Makefile

@@ -0,0 +1,61 @@
+#
+# Makefile for PO merging and MO generation. More info in the README.
+#
+# make all-mo (default) - generate MO files
+# make check - check translations using translate-tool
+# make tx-update - download and merge translations from Transifex
+# make clean - clean everything
+#
+DOMAIN = foreman_azure_rm
+VERSION = $(shell ruby -e 'require "rubygems";spec = Gem::Specification::load(Dir.glob("../*.gemspec")[0]);puts spec.version')
+POTFILE = $(DOMAIN).pot
+MOFILE = $(DOMAIN).mo
+POFILES = $(shell find . -name '$(DOMAIN).po')
+MOFILES = $(patsubst %.po,%.mo,$(POFILES))
+POXFILES = $(patsubst %.po,%.pox,$(POFILES))
+EDITFILES = $(patsubst %.po,%.edit.po,$(POFILES))
+
+%.mo: %.po
+	mkdir -p $(shell dirname $@)/LC_MESSAGES
+	msgfmt -o $(shell dirname $@)/LC_MESSAGES/$(MOFILE) $<
+
+# Generate MO files from PO files
+all-mo: $(MOFILES)
+
+# Check for malformed strings
+%.pox: %.po
+	msgfmt -c $<
+	pofilter --nofuzzy -t variables -t blank -t urls -t emails -t long -t newlines \
+		-t endwhitespace -t endpunc -t puncspacing -t options -t printf -t validchars --gnome $< > $@
+	cat $@
+	! grep -q msgid $@
+
+%.edit.po:
+	touch $@
+
+check: $(POXFILES)
+
+# Unify duplicate translations
+uniq-po:
+	for f in $(shell find ./ -name "*.po") ; do \
+		msguniq $$f -o $$f ; \
+	done
+
+tx-pull: $(EDITFILES)
+	tx pull -f
+	for f in $(EDITFILES) ; do \
+		sed -i 's/^\("Project-Id-Version: \).*$$/\1$(DOMAIN) $(VERSION)\\n"/' $$f; \
+	done
+
+tx-update: tx-pull
+	@echo
+	@echo Run rake plugin:gettext[$(DOMAIN)] from the Foreman installation, then make -C locale mo-files to finish
+	@echo
+
+mo-files: $(MOFILES)
+	git add $(POFILES) $(POTFILE) ../locale/*/LC_MESSAGES
+	git commit -m "i18n - pulling from tx"
+	@echo
+	@echo Changes commited!
+	@echo
+

data/locale/en/foreman_azure_rm.po

@@ -0,0 +1,171 @@
+# English translations for foreman_azure_rm package.
+# Copyright (C) 2020 THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the foreman_azure_rm package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2020.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: foreman_azure_rm 1.0.0\n"
+"Report-Msgid-Bugs-To: \n"
+"PO-Revision-Date: 2020-04-08 06:57-0400\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: English\n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"\n"
+
+msgid "%{vm_size} VM Size"
+msgstr ""
+
+msgid "Actions"
+msgstr ""
+
+msgid "Additional number of disks can be added based on VM Size. For more details, please refer to Microsoft Azure's documentation"
+msgstr ""
+
+msgid "Azure Region"
+msgstr ""
+
+msgid "Azure Resource Manager as a compute resource for Foreman"
+msgstr ""
+
+msgid "Azure Subnet"
+msgstr ""
+
+msgid "Azure's Default"
+msgstr ""
+
+msgid "Azure's default"
+msgstr ""
+
+msgid "Client ID"
+msgstr ""
+
+msgid "Client ID for AzureRm"
+msgstr ""
+
+msgid "Client Secret"
+msgstr ""
+
+msgid "Client Secret for AzureRm"
+msgstr ""
+
+msgid "Comma seperated file URIs"
+msgstr ""
+
+msgid "Custom Script Command"
+msgstr ""
+
+msgid "Data Disk Caching"
+msgstr ""
+
+msgid "Default ReadWrite"
+msgstr ""
+
+msgid "Does this image support user data input?"
+msgstr ""
+
+msgid "Image"
+msgstr ""
+
+msgid "Marketplace Image URN"
+msgstr ""
+
+msgid "Marketplace URN (e.g. OpenLogic:CentOS:7.5:latest)"
+msgstr ""
+
+msgid "Name"
+msgstr ""
+
+msgid "OS Disk Caching"
+msgstr ""
+
+msgid "Password"
+msgstr ""
+
+msgid "Password to authenticate with - used for SSH finish step."
+msgstr ""
+
+msgid "Platform"
+msgstr ""
+
+msgid "Please select a Resource Group"
+msgstr ""
+
+msgid "Please select a VM Size"
+msgstr ""
+
+msgid "Please select an image"
+msgstr ""
+
+msgid "Premium OS Disk"
+msgstr ""
+
+msgid "Properties"
+msgstr ""
+
+msgid "Public IP"
+msgstr ""
+
+msgid "Region"
+msgstr ""
+
+msgid "Reload Images, Sizes, vNets"
+msgstr ""
+
+msgid "Resource Group"
+msgstr ""
+
+msgid "SSH Key"
+msgstr ""
+
+msgid "Select"
+msgstr ""
+
+msgid "Size"
+msgstr ""
+
+msgid "Size (GB)"
+msgstr ""
+
+msgid "Some of the listed regions might not be supported for your subscription. Please verify on Azure portal."
+msgstr ""
+
+msgid "State"
+msgstr ""
+
+msgid "Static Private IP"
+msgstr ""
+
+msgid "Subscription ID"
+msgstr ""
+
+msgid "Subscription ID for AzureRm"
+msgstr ""
+
+msgid "Tenant ID"
+msgstr ""
+
+msgid "The region you selected has no sizes associated with it"
+msgstr ""
+
+msgid "The selected image has no associated compute resource"
+msgstr ""
+
+msgid "The selected region has no subnets"
+msgstr ""
+
+msgid "The user that will be used to SSH into the VM for completion"
+msgstr ""
+
+msgid "To perform commands as root, prefix it with 'sudo'"
+msgstr ""
+
+msgid "Username"
+msgstr ""
+
+msgid "VM Size"
+msgstr ""

data/locale/foreman_azure_rm.pot

@@ -0,0 +1,234 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the foreman_azure_rm package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: foreman_azure_rm 1.0.0\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2020-04-08 06:57-0400\n"
+"PO-Revision-Date: 2020-04-08 06:57-0400\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
+
+#:
+#: ../app/controllers/foreman_azure_rm/concerns/compute_resources_controller_extensions.rb:10
+msgid "Client ID for AzureRm"
+msgstr ""
+
+#:
+#: ../app/controllers/foreman_azure_rm/concerns/compute_resources_controller_extensions.rb:11
+msgid "Client Secret for AzureRm"
+msgstr ""
+
+#:
+#: ../app/controllers/foreman_azure_rm/concerns/compute_resources_controller_extensions.rb:12
+msgid "Subscription ID for AzureRm"
+msgstr ""
+
+#:
+#: ../app/controllers/foreman_azure_rm/concerns/hosts_controller_extensions.rb:11
+msgid "The region you selected has no sizes associated with it"
+msgstr ""
+
+#:
+#: ../app/controllers/foreman_azure_rm/concerns/hosts_controller_extensions.rb:23
+msgid "The selected region has no subnets"
+msgstr ""
+
+#:
+#: ../app/controllers/foreman_azure_rm/concerns/hosts_controller_extensions.rb:27
+msgid "The selected image has no associated compute resource"
+msgstr ""
+
+#: ../app/models/foreman_azure_rm/azure_rm_compute.rb:148
+msgid "%{vm_size} VM Size"
+msgstr ""
+
+#: ../app/views/compute_resources/form/_azurerm.html.erb:1
+msgid "Client ID"
+msgstr ""
+
+#: ../app/views/compute_resources/form/_azurerm.html.erb:2
+msgid "Client Secret"
+msgstr ""
+
+#: ../app/views/compute_resources/form/_azurerm.html.erb:3
+msgid "Subscription ID"
+msgstr ""
+
+#: ../app/views/compute_resources/form/_azurerm.html.erb:4
+msgid "Tenant ID"
+msgstr ""
+
+#: ../app/views/compute_resources/form/_azurerm.html.erb:6
+msgid "Azure Region"
+msgstr ""
+
+#: ../app/views/compute_resources/form/_azurerm.html.erb:6
+msgid ""
+"Some of the listed regions might not be supported for your subscription. Pleas"
+"e verify on Azure portal."
+msgstr ""
+
+#: ../app/views/compute_resources_vms/form/azurerm/_base.html.erb:91
+msgid "Please select a Resource Group"
+msgstr ""
+
+#: ../app/views/compute_resources_vms/form/azurerm/_base.html.erb:94
+#: ../app/views/compute_resources_vms/index/_azurerm.html.erb:6
+msgid "Resource Group"
+msgstr ""
+
+#: ../app/views/compute_resources_vms/form/azurerm/_base.html.erb:97
+msgid "Reload Images, Sizes, vNets"
+msgstr ""
+
+#: ../app/views/compute_resources_vms/form/azurerm/_base.html.erb:109
+msgid "Please select a VM Size"
+msgstr ""
+
+#: ../app/views/compute_resources_vms/form/azurerm/_base.html.erb:111
+msgid "VM Size"
+msgstr ""
+
+#: ../app/views/compute_resources_vms/form/azurerm/_base.html.erb:120
+msgid "Platform"
+msgstr ""
+
+#: ../app/views/compute_resources_vms/form/azurerm/_base.html.erb:127
+msgid "Username"
+msgstr ""
+
+#: ../app/views/compute_resources_vms/form/azurerm/_base.html.erb:134
+msgid "Password"
+msgstr ""
+
+#: ../app/views/compute_resources_vms/form/azurerm/_base.html.erb:144
+msgid "SSH Key"
+msgstr ""
+
+#: ../app/views/compute_resources_vms/form/azurerm/_base.html.erb:150
+msgid "Premium OS Disk"
+msgstr ""
+
+#: ../app/views/compute_resources_vms/form/azurerm/_base.html.erb:158
+msgid "Azure's Default"
+msgstr ""
+
+#: ../app/views/compute_resources_vms/form/azurerm/_base.html.erb:160
+msgid "OS Disk Caching"
+msgstr ""
+
+#: ../app/views/compute_resources_vms/form/azurerm/_base.html.erb:161
+msgid "Default ReadWrite"
+msgstr ""
+
+#: ../app/views/compute_resources_vms/form/azurerm/_base.html.erb:168
+msgid "Custom Script Command"
+msgstr ""
+
+#: ../app/views/compute_resources_vms/form/azurerm/_base.html.erb:169
+msgid "To perform commands as root, prefix it with 'sudo'"
+msgstr ""
+
+#: ../app/views/compute_resources_vms/form/azurerm/_base.html.erb:175
+msgid "Comma seperated file URIs"
+msgstr ""
+
+#: ../app/views/compute_resources_vms/form/azurerm/_base.html.erb:181
+msgid "Please select an image"
+msgstr ""
+
+#: ../app/views/compute_resources_vms/form/azurerm/_base.html.erb:184
+msgid "Image"
+msgstr ""
+
+#: ../app/views/compute_resources_vms/form/azurerm/_network.html.erb:5
+msgid "Select"
+msgstr ""
+
+#: ../app/views/compute_resources_vms/form/azurerm/_network.html.erb:7
+msgid "Azure Subnet"
+msgstr ""
+
+#: ../app/views/compute_resources_vms/form/azurerm/_network.html.erb:18
+msgid "Public IP"
+msgstr ""
+
+#: ../app/views/compute_resources_vms/form/azurerm/_network.html.erb:25
+msgid "Static Private IP"
+msgstr ""
+
+#: ../app/views/compute_resources_vms/form/azurerm/_volume.html.erb:4
+msgid "Size (GB)"
+msgstr ""
+
+#: ../app/views/compute_resources_vms/form/azurerm/_volume.html.erb:8
+msgid ""
+"Additional number of disks can be added based on VM Size. For more details, pl"
+"ease refer to Microsoft Azure's documentation"
+msgstr ""
+
+#: ../app/views/compute_resources_vms/form/azurerm/_volume.html.erb:14
+msgid "Azure's default"
+msgstr ""
+
+#: ../app/views/compute_resources_vms/form/azurerm/_volume.html.erb:17
+msgid "Data Disk Caching"
+msgstr ""
+
+#: ../app/views/compute_resources_vms/index/_azurerm.html.erb:4
+msgid "Name"
+msgstr ""
+
+#: ../app/views/compute_resources_vms/index/_azurerm.html.erb:5
+msgid "Size"
+msgstr ""
+
+#: ../app/views/compute_resources_vms/index/_azurerm.html.erb:7
+msgid "Region"
+msgstr ""
+
+#: ../app/views/compute_resources_vms/index/_azurerm.html.erb:8
+msgid "State"
+msgstr ""
+
+#: ../app/views/compute_resources_vms/index/_azurerm.html.erb:9
+msgid "Actions"
+msgstr ""
+
+#: ../app/views/compute_resources_vms/show/_azurerm.html.erb:5
+msgid "Properties"
+msgstr ""
+
+#: ../app/views/images/form/_azurerm.html.erb:2
+msgid "The user that will be used to SSH into the VM for completion"
+msgstr ""
+
+#: ../app/views/images/form/_azurerm.html.erb:4
+msgid "Password to authenticate with - used for SSH finish step."
+msgstr ""
+
+#: ../app/views/images/form/_azurerm.html.erb:5
+msgid "Marketplace Image URN"
+msgstr ""
+
+#: ../app/views/images/form/_azurerm.html.erb:5
+msgid "Marketplace URN (e.g. OpenLogic:CentOS:7.5:latest)"
+msgstr ""
+
+#: ../app/views/images/form/_azurerm.html.erb:6
+msgid "Does this image support user data input?"
+msgstr ""
+
+#: gemspec.rb:2
+msgid "Azure Resource Manager as a compute resource for Foreman"
+msgstr ""

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_azure_rm
 version: !ruby/object:Gem::Version
-  version: 2.0.8
+  version: 2.1.0
 platform: ruby
 authors:
 - Aditi Puntambekar
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-02-26 00:00:00.000000000 Z
+date: 2020-05-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -82,6 +82,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.18.7
+- !ruby/object:Gem::Dependency
+  name: azure_mgmt_subscriptions
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.18.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.18.1
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -131,6 +145,7 @@ files:
 - Rakefile
 - app/controllers/foreman_azure_rm/concerns/compute_resources_controller_extensions.rb
 - app/controllers/foreman_azure_rm/concerns/hosts_controller_extensions.rb
+- app/helpers/azure_compute_resource_helper.rb
 - app/models/concerns/foreman_azure_rm/vm_extensions/managed_vm.rb
 - app/models/foreman_azure_rm/azure_rm.rb
 - app/models/foreman_azure_rm/azure_rm_compute.rb
@@ -144,16 +159,21 @@ files:
 - app/views/compute_resources/show/_azurerm.html.erb
 - app/views/compute_resources_vms/form/azurerm/_base.html.erb
 - app/views/compute_resources_vms/form/azurerm/_network.html.erb
+- app/views/compute_resources_vms/form/azurerm/_volume.html.erb
 - app/views/compute_resources_vms/index/_azurerm.html.erb
 - app/views/compute_resources_vms/show/_azurerm.html.erb
 - app/views/images/form/_azurerm.html.erb
 - config/routes.rb
 - db/migrate/20200211073049_fix_case_azure_rm.rb
+- db/migrate/20200507103900_fix_image_uuid_prefix.rb
 - lib/foreman_azure_rm.rake
 - lib/foreman_azure_rm.rb
 - lib/foreman_azure_rm/azure_sdk_adapter.rb
 - lib/foreman_azure_rm/engine.rb
 - lib/foreman_azure_rm/version.rb
+- locale/Makefile
+- locale/en/foreman_azure_rm.po
+- locale/foreman_azure_rm.pot
 - locale/gemspec.rb
 homepage: https://github.com/theforeman/foreman_azure_rm
 licenses: