foreman_azure_rm 2.0.0.pre1 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cdbc28091795bf21377b298699209cc2a0d06365858d117b9468a466fb0ffe2
-  data.tar.gz: 938f88f1ac6e6f9d9101ce57d2bf187e5c1196fd4abf68c667ae38db5c3270e2
+  metadata.gz: 3a507325a26003d06dcc112040e5915d39306b9681ec21253e618da875846e56
+  data.tar.gz: 771298a3fc115f85b24d90198ba53a5a093e85661d4aa4da958c6a01ea437b3e
 SHA512:
-  metadata.gz: c4def716d7fa2719d629c0bb9029a60e079e5578c16a33c9baa624462e3da7cdf634fa8f64070fef86bd4b615f9bccafedb427f073facad2a3e5f021bb74eedc
-  data.tar.gz: e2dbb0b84df8d5d7a62fa87486b858c5ee11cd28dcdf072ada26cbd77036942837f92f699e7738f40378cc839d0fde9cfc113d53c846b5af84af17dec14f78f4
+  metadata.gz: f29267ea139f9e9fb18697dc828d33ea30c0d5fcd433b21be427ec93912d5113b4278fbfd6ffb9282d2ad05f5d3142047b11e4b912afdb3bb5e454019599c968
+  data.tar.gz: 5603751a843f247708743e8e639b27575080ac2c709c2efbd77c591805d14713c8c3a5995610c9162f6b6c7c2d23a6f7f015204dab0641e34079c0a49a9ae69c

data/app/controllers/foreman_azure_rm/concerns/compute_resources_controller_extensions.rb

@@ -3,6 +3,15 @@ module ForemanAzureRM
     module ComputeResourcesControllerExtensions
       include Api::Version2
       include Foreman::Controller::Parameters::ComputeResource
+      extend ::Apipie::DSL::Concern
+      update_api(:create, :update) do
+        param :compute_resource, Hash do
+          # Not adding :tenant as already specified in core.
+          param :app_ident, String, :desc => N_("Client ID for AzureRM")
+          param :secret_key, String, :desc => N_("Client Secret for AzureRM")
+          param :sub_id, String, :desc => N_("Subscription ID for AzureRM")
+        end
+      end
 
       def available_resource_groups
         compute_resource = ComputeResource.find_by_id(params[:id])

data/app/controllers/foreman_azure_rm/concerns/hosts_controller_extensions.rb

@@ -1,11 +1,12 @@
 module ForemanAzureRM
   module Concerns
     module HostsControllerExtensions
+      extend ActiveSupport::Concern
 
       def sizes
-        if (azure_rm_resource = Image.unscoped.find_by_uuid(params[:image_id])).present?
-          resource = azure_rm_resource.compute_resource
-          render :json => resource.vm_sizes(params[:region_string]).map { |size| size.name }
+        azure_rm_resource = ComputeResource.unscoped.find_by_id(params[:compute_resource_id])
+        if azure_rm_resource.present?
+          render :json => azure_rm_resource.vm_sizes.map { |size| size.name }
         else
           no_sizes = _('The region you selected has no sizes associated with it')
           render :json => "[\"#{no_sizes}\"]"
@@ -13,10 +14,9 @@ module ForemanAzureRM
       end
 
       def subnets
-        azure_rm_image = Image.unscoped.find_by_uuid(params[:image_id])
-        if azure_rm_image.present?
-          azure_rm_resource = azure_rm_image.compute_resource
-          subnets           = azure_rm_resource.subnets(params[:region])
+        azure_rm_resource = ComputeResource.unscoped.find_by_id(params[:compute_resource_id])
+        if azure_rm_resource.present?
+          subnets = azure_rm_resource.subnets
           if subnets.present?
             render :json => subnets
           else

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

@@ -35,7 +35,7 @@ module ForemanAzureRM
         os_disk.managed_disk = managed_disk_params
         storage_profile.os_disk = os_disk
 
-        # Currently eliminating data disk creation since capability does not exist.
+        # TODO - disk creation for volume capability
 
         if vhd_path.nil?
           # We are using a marketplace image
@@ -72,45 +72,44 @@ module ForemanAzureRM
         network_profile
       end
 
-      def create_nics(args = {})
+      def create_nics(region, args = {})
         nics               = []
-        formatted_region = args[:azure_vm][:location].gsub(/\s+/, '').downcase
         args[:interfaces_attributes].each do |nic, attrs|
-          attrs[:pubip_alloc]  = attrs[:bridge]
-          attrs[:privip_alloc] = (attrs[:name] == 'false') ? false : true
-          pip_alloc            = case attrs[:pubip_alloc]
-                                   when 'Static'
-                                     NetworkModels::IPAllocationMethod::Static
-                                   when 'Dynamic'
-                                     NetworkModels::IPAllocationMethod::Dynamic
-                                   when 'None'
-                                     nil
-                                 end
-          priv_ip_alloc        = if attrs[:priv_ip_alloc]
-                                   NetworkModels::IPAllocationMethod::Static
-                                 else
-                                   NetworkModels::IPAllocationMethod::Dynamic
-                                 end
-          if pip_alloc.present?
+          private_ip = (attrs[:private_ip] == 'false') ? false : true
+          priv_ip_alloc       = if private_ip
+                                  NetworkModels::IPAllocationMethod::Static
+                                else
+                                  NetworkModels::IPAllocationMethod::Dynamic
+                                end
+          pub_ip_alloc        = case attrs[:public_ip]
+                                when 'Static'
+                                  NetworkModels::IPAllocationMethod::Static
+                                when 'Dynamic'
+                                  NetworkModels::IPAllocationMethod::Dynamic
+                                when 'None'
+                                  nil
+                                end
+          if pub_ip_alloc.present?
             public_ip_params = NetworkModels::PublicIPAddress.new.tap do |ip|
-              ip.location = formatted_region
-              ip.public_ipallocation_method = pip_alloc
+              ip.location = region
+              ip.public_ipallocation_method = pub_ip_alloc
             end
-            pip = sdk.create_or_update_pip(args[:azure_vm][:resource_group],
-                                           "#{args[:azure_vm][:vm_name]}-pip#{nic}",
+
+            pip = sdk.create_or_update_pip(args[:resource_group],
+                                           "#{args[:vm_name]}-pip#{nic}",
                                            public_ip_params)
           end
           new_nic = sdk.create_or_update_nic(
-            args[:azure_vm][:resource_group],
-            "#{args[:azure_vm][:vm_name]}-nic#{nic}",
+            args[:resource_group],
+            "#{args[:vm_name]}-nic#{nic}",
             NetworkModels::NetworkInterface.new.tap do |interface|
-              interface.location = formatted_region
+              interface.location = region
               interface.ip_configurations = [
                 NetworkModels::NetworkInterfaceIPConfiguration.new.tap do |nic_conf|
-                  nic_conf.name = "#{args[:azure_vm][:vm_name]}-nic#{nic}"
+                  nic_conf.name = "#{args[:vm_name]}-nic#{nic}"
                   nic_conf.private_ipallocation_method = priv_ip_alloc
-                  nic_conf.subnet = subnets(args[:azure_vm][:location]).select{ |subnet| subnet.id == attrs[:network] }.first
-                  nic_conf.public_ipaddress = pip.present? ? pip : nil
+                  nic_conf.subnet = subnets.select{ |subnet| subnet.id == attrs[:network] }.first
+                  nic_conf.public_ipaddress = pip
                 end
               ]
             end
@@ -120,7 +119,7 @@ module ForemanAzureRM
         nics
       end
 
-      def create_managed_virtual_machine(vm_hash)
+      def initialize_vm(vm_hash)
         custom_data = vm_hash[:custom_data]
         msg = "Creating Virtual Machine #{vm_hash[:name]} in Resource Group #{vm_hash[:resource_group]}."
         logger.debug msg
@@ -183,30 +182,34 @@ module ForemanAzureRM
           vm.hardware_profile = ComputeModels::HardwareProfile.new.tap do |hw_profile|
             hw_profile.vm_size = vm_hash[:vm_size]
           end
-          vm.network_profile = define_network_profile(vm_hash[:network_interface_card_ids])
         end
 
-        response = sdk.create_or_update_vm(vm_hash[:resource_group], vm_hash[:name], vm_create_params)
-        logger.debug "Virtual Machine #{vm_hash[:name]} Created Successfully."
-        response
+        vm_create_params
+      end
+
+      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])
+        sdk.create_or_update_vm(vm_hash[:resource_group], vm_hash[:name], vm_params)
       end
 
-      def create_vm_extension(args = {})
-        if args[:azure_vm][:script_command].present? || args[:azure_vm][:script_uris].present?
+      def create_vm_extension(region, args = {})
+        if args[:script_command].present? || args[:script_uris].present?
+          args[:script_uris] ||=  args[:script_uris].to_s
           extension = ComputeModels::VirtualMachineExtension.new
-          if args[:azure_vm][:platform] == 'Linux'
+          if args[:platform] == 'Linux'
             extension.publisher = 'Microsoft.Azure.Extensions'
             extension.virtual_machine_extension_type = 'CustomScript'
             extension.type_handler_version = '2.0'
           end
           extension.auto_upgrade_minor_version = true
-          extension.location = args[:azure_vm][:location].gsub(/\s+/, '').downcase
+          extension.location = region
           extension.settings = {
-                'commandToExecute' => args[:azure_vm][:script_command],
-                'fileUris'         => args[:azure_vm][:script_uris].split(',')
+                'commandToExecute' => args[:script_command],
+                'fileUris'         => args[:script_uris].split(',')
           }
-          sdk.create_or_update_vm_extensions(args[:azure_vm][:resource_group],
-                                             args[:azure_vm][:vm_name],
+          sdk.create_or_update_vm_extensions(args[:resource_group],
+                                             args[:vm_name],
                                              'ForemanCustomScript',
                                              extension)
         end

data/app/models/foreman_azure_rm/azure_rm.rb

@@ -1,6 +1,6 @@
 # This Model contains code modified as per azure-sdk
 # and removed dependencies from fog-azure-rm.
-# 
+
 require 'base64'
 
 module ForemanAzureRM
@@ -9,13 +9,10 @@ module ForemanAzureRM
     include VMExtensions::ManagedVM
     alias_attribute :sub_id, :user
     alias_attribute :secret_key, :password
-    alias_attribute :app_ident, :url
+    alias_attribute :region, :url
     alias_attribute :tenant, :uuid
 
-    validates :user, :presence => true
-    validates :password, :presence => true
-    validates :url, :presence => true
-    validates :uuid, :presence => true
+    validates :user, :password, :url, :uuid, :app_ident, :presence => true
 
     has_one :key_pair, :foreign_key => :compute_resource_id, :dependent => :destroy
 
@@ -23,6 +20,7 @@ module ForemanAzureRM
 
     class VMContainer
       attr_accessor :virtualmachines
+      delegate :each, to: :virtualmachines
 
       def initialize
         @virtualmachines = []
@@ -33,6 +31,14 @@ module ForemanAzureRM
       end
     end
 
+    def app_ident
+      attrs[:app_ident]
+    end
+
+    def app_ident=(name)
+      attrs[:app_ident] = name
+    end
+
     def sdk
       @sdk ||= ForemanAzureRM::AzureSDKAdapter.new(tenant, app_ident, secret_key, sub_id)
     end
@@ -45,7 +51,7 @@ module ForemanAzureRM
       ComputeResource.model_name
     end
 
-    def provider_friendly_name
+    def self.provider_friendly_name
       'Azure Resource Manager'
     end
 
@@ -55,33 +61,18 @@ module ForemanAzureRM
 
     def regions
       [
-          'West Europe',
-          'Central US',
-          'South Central US',
-          'North Central US',
-          'West Central US',
-          'East US',
-          'East US 2',
-          'West US',
-          'West US 2'
+          ['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']
       ]
     end
 
-    def storage_accts(region = nil)
-      stripped_region = region.gsub(/\s+/, '').downcase
-      acct_names        = []
-      if region.nil?
-        sdk.get_storage_accts.each do |acct|
-          acct_names << acct.name
-        end
-      else
-        (sdk.get_storage_accts.select { |acct| acct.region == stripped_region }).each do |acct|
-          acct_names << acct.name
-        end
-      end
-      acct_names
-    end
-
     def resource_groups
       sdk.rgs
     end
@@ -93,25 +84,39 @@ module ForemanAzureRM
       super(options)
     end
 
-    def new_vm(attr = {})
-      AzureRMCompute.new(sdk: sdk)
-    end
-
-    def stop
-      power_off
-      deallocate
+    def new_vm(args = {})
+      return AzureRMCompute.new(sdk: sdk) if args.empty? || args[:image_id].nil?
+      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
+
+      opts.reject! { |k, v| v.nil? }
+
+      raw_vm = initialize_vm(location:        region,
+                             resource_group:  opts[:resource_group],
+                             vm_size:         opts[:vm_size],
+                             username:        opts[:username],
+                             password:        opts[:password],
+                             platform:        opts[:platform],
+                             ssh_key_data:    opts[:ssh_key_data],
+                             os_disk_caching: opts[:os_disk_caching],
+                             vhd_path:        opts[:image_id],
+                             premium_os_disk: opts[:premium_os_disk]
+                            )
+      if opts[:interfaces].present?
+        ifaces = []
+        opts[:interfaces].each_with_index do |iface_attrs, i|
+          ifaces << new_interface(iface_attrs)
+        end
+      end
+      AzureRMCompute.new(azure_vm: raw_vm ,sdk: sdk, resource_group: opts[:resource_group], nics: ifaces)
     end
 
     def provided_attributes
       super.merge({ :ip => :provisioning_ip_address })
     end
 
-    def host_interfaces_attrs(host)
-      host.interfaces.select(&:physical?).each.with_index.reduce({}) do |hash, (nic, index)|
-        hash.merge(index.to_s => nic.compute_attributes.merge(ip: nic.ip, ip6: nic.ip6))
-      end
-    end
-
     def available_vnets(attr = {})
       virtual_networks
     end
@@ -120,22 +125,12 @@ module ForemanAzureRM
       subnets
     end
 
-    def available_subnets
-      subnets
-    end
-
-    def virtual_networks(region = nil)
-      if region.nil?
-        sdk.vnets
-      else
-        stripped_region = region.gsub(/\s+/, '').downcase
-        sdk.vnets.select { |vnet| vnet.location == stripped_region }
-      end
+    def virtual_networks
+      @virtual_networks ||= sdk.vnets.select { |vnet| vnet.location == region }
     end
 
-    def subnets(region = nil)
-      stripped_region = region.gsub(/\s+/, '').downcase
-      vnets   = virtual_networks(stripped_region)
+    def subnets
+      vnets   = virtual_networks
       subnets = []
       vnets.each do |vnet|
         subnets.concat(sdk.subnets(vnet.resource_group, vnet.name))
@@ -143,28 +138,46 @@ module ForemanAzureRM
       subnets
     end
 
-    def new_interface(attr = {})
-      # WIP
-      # calls nic_cards method in adapter
-      # causes compute profiles issue
-      # NetworkModels::NetworkInterface.new
+    alias_method :available_subnets, :subnets
+
+    def new_interface(attrs = {})
+      args = { :network => "", :public_ip => "", :private_ip => false, 'persisted?' => false }.merge(attrs.to_h)
+      OpenStruct.new(args)
+    end
+
+    def editable_network_interfaces?
+      true
     end
 
-    def vm_sizes(region)
+    def vm_sizes
       sdk.list_vm_sizes(region)
     end
 
+    def associated_host(vm)
+      associate_by("ip", [vm.public_ip_address, vm.private_ip_address])
+    end
+
     def vm_instance_defaults
-      ActiveSupport::HashWithIndifferentAccess.new
+      super.deep_merge(
+        interfaces: [new_interface]
+      )
+    end
+
+    def vm_nics(vm)
+      ifaces = []
+      vm.network_profile.network_interfaces.each do |nic|
+        nic_rg = (split_nic_id = nic.id.split('/'))[4]
+        nic_name = split_nic_id[-1]
+        ifaces << sdk.vm_nic(nic_rg, nic_name)
+      end
+      ifaces
     end
 
-    def vms
+    def vms(attrs = {})
       container = VMContainer.new
-      # Load all vms
-      resource_groups.each do |rg|
-        sdk.list_vms(rg).each do |vm|
-          container.virtualmachines << AzureRMCompute.new(azure_vm: vm, sdk:sdk)
-        end
+      # Load all vms of the region
+      sdk.list_vms(region).each do |vm|
+        container.virtualmachines << AzureRMCompute.new(azure_vm: vm, sdk:sdk, nics: vm_nics(vm))
       end
       container
     end
@@ -188,44 +201,46 @@ module ForemanAzureRM
     end
 
     def create_vm(args = {})
-      args[:azure_vm][:vm_name] = args[:name].split('.')[0]
-      nics = create_nics(args)
-      if args[:azure_vm][:password].present? && !args[:azure_vm][:ssh_key_data].present?
-        sudoers_cmd = "$echo #{args[:azure_vm][:password]} | sudo -S echo '\"#{args[:azure_vm][:username]}\" ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/waagent"
-        if args[:azure_vm][:script_command].present?
-          # to run the script_cmd given through form
-          # as username
-          args[:azure_vm][:script_command] =  sudoers_cmd + " ; su - \"#{args[:azure_vm][:username]}\" -c \"#{args[:azure_vm][:script_command]}\""
+      args = args.to_h.deep_symbolize_keys
+      args[:vm_name] = args[:name].split('.')[0]
+      nics = create_nics(region, args)
+      if args[:password].present? && !args[:ssh_key_data].present?
+        sudoers_cmd = "$echo #{args[:password]} | sudo -S echo '\"#{args[:username]}\" ALL=(ALL) NOPASSWD: ALL' > /etc/sudoers.d/waagent"
+        if args[:script_command].present?
+          # to run the script_cmd given through form as username
+          args[:script_command] =  sudoers_cmd + " ; su - \"#{args[:username]}\" -c \"#{args[:script_command]}\""
         else
-          args[:azure_vm][:script_command] =  sudoers_cmd
+          args[:script_command] =  sudoers_cmd
         end
         disable_password_auth = false
-      elsif args[:azure_vm][:ssh_key_data].present? && !args[:azure_vm][:password].present?
+      elsif args[:ssh_key_data].present? && !args[:password].present?
         disable_password_auth = true
       else
         disable_password_auth = false
       end
+
       vm             = create_managed_virtual_machine(
-        name:                            args[:azure_vm][:vm_name],
-        location:                        args[:azure_vm][:location],
-        resource_group:                  args[:azure_vm][:resource_group],
-        vm_size:                         args[:azure_vm][:vm_size],
-        username:                        args[:azure_vm][:username],
-        password:                        args[:azure_vm][:password],
-        ssh_key_data:                    args[:azure_vm][:ssh_key_data],
+        name:                            args[:vm_name],
+        location:                        region,
+        resource_group:                  args[:resource_group],
+        vm_size:                         args[:vm_size],
+        username:                        args[:username],
+        password:                        args[:password],
+        ssh_key_data:                    args[:ssh_key_data],
         disable_password_authentication: disable_password_auth,
         network_interface_card_ids:      nics.map(&:id),
-        platform:                        args[:azure_vm][:platform],
+        platform:                        args[:platform],
         vhd_path:                        args[:image_id],
-        os_disk_caching:                 args[:azure_vm][:os_disk_caching],
-        premium_os_disk:                 args[:azure_vm][:premium_os_disk],
+        os_disk_caching:                 args[:os_disk_caching],
+        premium_os_disk:                 args[:premium_os_disk],
         custom_data:                     args[:user_data],
-        script_command:                  args[:azure_vm][:script_command],
-        script_uris:                     args[:azure_vm][:script_uris],
+        script_command:                  args[:script_command],
+        script_uris:                     args[:script_uris],
       )
-      create_vm_extension(args)
+      logger.debug "Virtual Machine #{args[:vm_name]} Created Successfully."
+      create_vm_extension(region, args)
       # return the vm object using azure_vm
-      return_vm = AzureRMCompute.new(azure_vm: vm, sdk: sdk)
+      AzureRMCompute.new(azure_vm: vm, sdk: sdk, resource_group: args[:resource_group], nics: vm_nics(vm))
     rescue RuntimeError => e
       Foreman::Logging.exception('Unhandled Azure RM error', e)
       destroy_vm vm.id if vm
@@ -233,15 +248,13 @@ module ForemanAzureRM
     end
 
     def destroy_vm(uuid)
-      #vm.azure_vm because that's the azure object and vm is the wrapper
       vm           = find_vm_by_uuid(uuid)
-      vm_name      = vm.name
-      rg_name      = vm.azure_vm.resource_group
+      rg_name      = vm.resource_group
       os_disk      = vm.azure_vm.storage_profile.os_disk
       data_disks   = vm.azure_vm.storage_profile.data_disks
       nic_ids      = vm.network_interface_card_ids
 
-      sdk.delete_vm(rg_name, vm_name)
+      sdk.delete_vm(rg_name, vm.name)
 
       nic_ids.each do |nic_id|
         nic = sdk.vm_nic(rg_name, nic_id.split('/')[-1])

data/app/models/foreman_azure_rm/azure_rm_compute.rb

@@ -2,12 +2,29 @@ module ForemanAzureRM
   class AzureRMCompute
     attr_accessor :sdk
     attr_accessor :azure_vm
+    attr_accessor :resource_group
+    attr_accessor :nics
+    attr_accessor :image_id
 
     delegate :name, to: :azure_vm, allow_nil: true
 
-    def initialize(azure_vm: ComputeModels::VirtualMachine.new, sdk: sdk)
+    def initialize(azure_vm: ComputeModels::VirtualMachine.new,
+                   sdk: sdk,
+                   resource_group: azure_vm.resource_group,
+                   nics: [])
+
       @azure_vm = azure_vm
       @sdk = sdk
+      @resource_group ||= resource_group
+      @nics ||= nics
+      @azure_vm.hardware_profile ||= ComputeModels::HardwareProfile.new
+      @azure_vm.os_profile ||= ComputeModels::OSProfile.new
+      @azure_vm.os_profile.linux_configuration ||= ComputeModels::LinuxConfiguration.new
+      @azure_vm.os_profile.linux_configuration.ssh ||= ComputeModels::SshConfiguration.new
+      @azure_vm.os_profile.linux_configuration.ssh.public_keys ||= [ComputeModels::SshPublicKey.new]
+      @azure_vm.storage_profile ||= ComputeModels::StorageProfile.new
+      @azure_vm.storage_profile.os_disk ||= ComputeModels::OSDisk.new
+      @azure_vm.storage_profile.os_disk.managed_disk ||= ComputeModels::ManagedDiskParameters.new
     end
 
     def id
@@ -18,10 +35,6 @@ module ForemanAzureRM
       !!identity && !!id
     end
 
-    def vm_size
-      @azure_vm.hardware_profile.vm_size
-    end
-
     def wait_for(_timeout = 0, _interval = 0, &block)
       instance_eval(&block)
       return true
@@ -35,46 +48,60 @@ module ForemanAzureRM
       vm_status
     end
 
+    def start
+      sdk.start_vm(@azure_vm.resource_group, name)
+      true
+    end
+
+    def stop
+      sdk.stop_vm(@azure_vm.resource_group, name)
+      true
+    end
+
     def vm_status
       sdk.check_vm_status(@azure_vm.resource_group, name)
     end
 
     def network_interface_card_ids
+      return nil unless @azure_vm.network_profile
       nics = @azure_vm.network_profile.network_interfaces
       nics.map(&:id)
     end
 
     def provisioning_ip_address
+      public_ip_address || private_ip_address
+    end
+
+    def public_ip_address
       interfaces.each do |nic|
         nic.ip_configurations.each do |configuration|
           next unless configuration.primary
-          if configuration.public_ipaddress.present?
-            ip_id     = configuration.public_ipaddress.id
-            ip_rg     = ip_id.split('/')[4]
-            ip_name   = ip_id.split('/')[-1]
-            public_ip = sdk.public_ip(ip_rg, ip_name)
-            return public_ip.ip_address
-          else
-            return configuration.private_ipaddress
-          end
+          return nil if configuration.public_ipaddress.blank?
+          ip_id     = configuration.public_ipaddress.id
+          ip_rg     = ip_id.split('/')[4]
+          ip_name   = ip_id.split('/')[-1]
+          public_ip = sdk.public_ip(ip_rg, ip_name)
+          return public_ip.ip_address
         end
-      end    
+      end
     end
 
-    def interfaces
-      interfaces = []
-      unless network_interface_card_ids.nil?
-        network_interface_card_ids.each do |nic_id|
-          nic_rg   = nic_id.split('/')[4]
-          nic_name = nic_id.split('/')[-1]
-          interfaces << sdk.vm_nic(nic_rg, nic_name)
+    def private_ip_address
+      interfaces.each do |nic|
+        nic.ip_configurations.each do |configuration|
+          next unless configuration.primary
+          if configuration.private_ipaddress.present?
+            return private_ip_address = configuration.private_ipaddress
+          end
         end
       end
-      interfaces
     end
 
-    def interfaces=(setifaces)
-      @azure_vm.network_profile.network_interfaces = setifaces
+    def interfaces
+      nics
+    end
+
+    def interfaces_attributes=(attrs)
     end
 
     def ip_addresses
@@ -89,7 +116,45 @@ module ForemanAzureRM
       @azure_vm.name = setuuid
     end
 
-    def image_id
+    # Following properties are for AzureRM
+    # These are not part of Foreman's interface
+
+    def vm_size
+      @azure_vm.hardware_profile.vm_size
+    end
+
+    def platform
+      @azure_vm.storage_profile.os_disk.os_type
+    end
+
+    def username
+      @azure_vm.os_profile.admin_username
+    end
+
+    def password
+      @azure_vm.os_profile.admin_password
+    end
+
+    def ssh_key_data
+      # since you can only give one additional
+      # sshkey through foreman's UI
+      sshkey = @azure_vm.os_profile.linux_configuration.ssh.public_keys[1]
+      return unless sshkey.present?
+      sshkey.key_data
+    end
+
+    def premium_os_disk
+      @azure_vm.storage_profile.os_disk.managed_disk.storage_account_type
+    end
+
+    def os_disk_caching
+      @azure_vm.storage_profile.os_disk.caching
+    end
+
+    def script_command
+    end
+
+    def script_uris
     end
   end
 end

data/app/views/api/v2/compute_resources/azurerm.json.rabl

@@ -1 +1 @@
-attributes :user, :uuid
+attributes :tenant, :app_ident, :sub_id, :secret_key, :region

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

@@ -1,8 +1,10 @@
-<%= text_f f, :url, :label => _('Client ID'), :required => true %>
+<%= text_f f, :app_ident, :label => _('Client ID'), :required => true %>
 <%= password_f f, :password, :label => _('Client Secret'), :keep_value => true, :required => true %>
 <%= text_f f, :user, :label => _('Subscription ID'), :required => true %>
 <%= text_f f, :uuid, :label => _('Tenant ID'), :required => true %>
 
+<%= selectable_f(f, :url, f.object.regions, {}, {:label => _('Azure Region'), :required => true }) %>
+
 <div class="col-md-offset-2">
     <%= test_connection_button_f(f, true) %>
 </div>

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

@@ -2,16 +2,17 @@
    os ||= nil
    images = possible_images(compute_resource, arch, os)
    resource_groups = compute_resource.resource_groups
+   compute_resource_id = compute_resource.id
 %>
 
-<script>
+<script >
     function azure_rm_region_callback() {
         azure_rm_get_size_from_region();
         azure_rm_subnets_from_region();
     }
 
     function azure_rm_get_size_from_region() {
-        var region = $('#azure_rm_region').val();
+        var compute_resource = <%=compute_resource_id%>;
         var size_spinner = $('#azure_rm_size_spinner');
         var sizes = $('#azure_rm_size');
         var imageId = $('#azure_rm_image_id').val();
@@ -22,7 +23,7 @@
         }
         size_spinner.removeClass('hide');
         $.ajax({
-            data: {"region_string": region, "image_id": imageId},
+            data: {"image_id": imageId, "compute_resource_id": compute_resource},
             type: 'get',
             url: '/azure_rm/sizes',
             complete: function () {
@@ -50,14 +51,14 @@
     function azure_rm_subnets_from_region() {
         var imageId = $('#azure_rm_image_id').val();
         var subnets = $('#azure_rm_subnet');
-        var region = $('#azure_rm_region').val();
+        var compute_resource = <%=compute_resource_id%>;
         if (typeof tfm == 'undefined') {  // earlier than 1.13
             foreman.tools.showSpinner();
         } else {
             tfm.tools.showSpinner();
         }
         $.ajax({
-            data: {"image_id": imageId, "region": region},
+            data: {"image_id": imageId, "compute_resource_id": compute_resource},
             type: 'get',
             url: '/azure_rm/subnets',
             complete: function () {
@@ -84,109 +85,102 @@
     }
 </script>
 
-<% #This view has been modified and wraps the properties of azure_vm
-   # using fields_for rails method.
+<% # This view has been modified and refers to the properties wrapper class %>
+
+<%= selectable_f f, :resource_group, resource_groups,
+               { :include_blank => true },
+               {
+                   :disabled => resource_groups.empty?,
+                   :label    => _('Resource Group'),
+                   :required => true,
+                   :id       => 'azure_rm_rg',
+                   :help_inline => spinner_button_f(f, _('Reload Images, Sizes, vNets'),
+                     'azure_rm_region_callback();',
+                    {
+                      :id => 'load_subnets_btn',
+                      :spinner_id => 'load_subnets_indicator',
+                      :class         => 'btn-success',
+                      :spinner_class => 'spinner-inverse'
+                    })
+               }
 %>
 
-<%= f.fields_for :azure_vm do |vm_f| %>
+<%= selectable_f f, :vm_size, compute_resource.vm_sizes.map { |size| size.name },
+               {},
+               {
+                   :label    => _('VM Size'),
+                   :required => true,
+                   :id       => 'azure_rm_size'
+               }
+%>
 
-  <%= selectable_f vm_f, :location, compute_resource.regions,
-               { :include_blank => _('Please select an Azure region') },
+<%= selectable_f f, :platform, %w(Linux Windows),
+               {},
                {
-                   :label       => _('Azure Region'),
-                   :required    => true,
-                   :id          => 'azure_rm_region',
-                   :label_size  => "col-md-2",
-                   :onchange    => 'azure_rm_region_callback();',
-                   :help_inline => spinner_button_f(f, _('Reload Images, Sizes, vNets'),
-                                                    'azure_rm_region_callback();',
-                                                    {
-                                                        :id            => 'load_subnets_btn',
-                                                        :spinner_id    => 'load_subnets_indicator',
-                                                        :class         => 'btn-success',
-                                                        :spinner_class => 'spinner-inverse'
-                                                    })
+                   :label    => _('Platform'),
+                   :required => true
                }
-  %>
+%>
 
-  <%= selectable_f vm_f, :resource_group, resource_groups,
-                 { :include_blank => true },
-                 {
-                     :disabled => resource_groups.empty?,
-                     :label    => _('Resource Group'),
-                     :required => true,
-                     :id       => 'azure_rm_rg'
-                 }
-  %>
+<%= text_f f, :username,
+         {
+             :label    => _('Username'),
+             :required => true
+         }
+%>
 
-  <%= selectable_f vm_f, :vm_size, [],
-                 { :include_blank => _('Please first select an Azure region') },
-                 {
-                     :label    => _('VM Size'),
-                     :required => true,
-                     :id       => 'azure_rm_size'
-                 }
-  %>
+<%= password_f f, :password,
+         {
+             :label    => _('Password'),
+             :required => true,
+             :placeholder => "********",
+             :value => f.object.password
 
-  <%= selectable_f vm_f, :platform, %w(Linux Windows),
-                 {},
-                 {
-                     :label    => _('Platform'),
-                     :required => true
-                 }
-  %>
+         }
+%>
 
-  <%= text_f vm_f, :username,
-           {
-               :label    => _('Username'),
-               :required => true
-           }
-  %>
+<%= textarea_f f, :ssh_key_data,
+             {
+                 :label => _('SSH Key')
+             }
+%>
 
-  <%= password_f vm_f, :password,
-           {
-               :label    => _('Password'),
-               :required => true,
-               :placeholder => "********"
-           }
-  %>
+<%= checkbox_f f, :premium_os_disk,
+             {    :checked => f.object.premium_os_disk == "Premium_LRS",
+                  :label => _('Premium OS Disk'),
+                  :label_size => "col-md-2"
+             },
+             'true',
+             'false'
+%>
 
-  <%= textarea_f vm_f, :ssh_key_data,
+<%= selectable_f f, :os_disk_caching, %w(None ReadOnly ReadWrite),
+               {},
                {
-                   :label => _('SSH Key')
+                   :label    => _('OS Disk Caching'),
+                   :required => true,
+                   :class    => "col-md-2"
                }
-  %>
+%>
 
-  <%= checkbox_f vm_f, :premium_os_disk,
-               {
-                   :label => _('Premium OS Disk'), :label_size => "col-md-2"
-               },
-               'true',
-               'false'
-  %>
+<%= text_f f, :script_command,
+         {
+             :label => _('Custom Script Command'),
+             :help_inline => _("To perform commands as root, prefix it with 'sudo'.")
+         }
+%>
 
-  <%= selectable_f vm_f, :os_disk_caching, %w(None ReadOnly ReadWrite),
-                 {},
-                 {
-                     :label    => _('OS Disk Caching'),
-                     :required => true,
-                     :class    => "col-md-2"
-                 }
-  %>
+<%= text_f f, :script_uris,
+         {
+             :label => _('Comma seperated file URIs')
+         }
+%>
 
-  <%= text_f vm_f, :script_command,
-           {
-               :label => _('Custom Script Command'),
-               :help_inline => _("To perform commands as root, prefix it with 'sudo'.")
-           }
-  %>
+<% checked = params[:host] && params[:host][:compute_attributes] && params[:host][:compute_attributes][:start] || '1'
+%>
 
-  <%= text_f vm_f, :script_uris,
-           {
-               :label => _('Comma seperated file URIs')
-           }
-  %>
-<% end %>
+<%= checkbox_f f, :start, { :checked => (checked == '1'), :help_inline => _("Power ON this machine upon creation"), :label => _('Start'), :label_size => "col-md-2" } if new_vm && controller_name != "compute_attributes" 
+%>
 
 <div id="image_selection">
   <%= select_f f, :image_id, images, :uuid, :name,

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

@@ -1,5 +1,8 @@
-<%= selectable_f f, :network, [],
-                 { :include_blank => _('Please first select an image and an Azure region')},
+<% nat = compute_resource.subnets.collect { |s| [ "#{s.id.split('/')[8]}-#{s.name} #{s.address_prefix}", s.id ] } %>
+
+<%= selectable_f f, :network, options_for_select(nat,
+                    :selected => f.object.network),
+                 { :include_blank => _('Select') },
                  {
                    :label => _('Azure Subnet'),
                    :required => true,
@@ -8,16 +11,21 @@
                  }
 %>
 
-<%= selectable_f f, :bridge, ['None', 'Dynamic', 'Static'],
+<%= selectable_f f, :public_ip, options_for_select(['None', 'Dynamic', 'Static'],
+                    :selected => f.object.public_ip),
                  {},
                  {
-                     :label => _("Public IP"),
-                     :label_size => "col-md-2"
+                    :label => _("Public IP"),
+                    :label_size => "col-md-2"
                  }
 %>
 
-<%= checkbox_f f, :name,
-               { :label => _("Static Private IP"), :label_size => "col-md-2" },
-               'true',
-               'false'
-%>
+<%= checkbox_f f, :private_ip,
+               {
+                 :label => _("Static Private IP"),
+                 :label_size => "col-md-2"
+               },
+             'true',
+             'false'
+
+%>

data/app/views/compute_resources_vms/index/_azurerm.html.erb

@@ -6,14 +6,14 @@
       <th><%= _('Resource Group') %></th>
       <th><%= _('Region') %></th>
       <th><%= _('State') %></th>
-      <th></th>
+      <th><%= _('Actions') %></th>
     </tr>
   </thead>
   <% @vms.each do |vm| %>
     <tr>
       <td><%= link_to_if_authorized vm.name, hash_for_compute_resource_vm_path(:compute_resource_id => @compute_resource, :id => vm.identity).merge(:auth_object => @compute_resource, :authorizer => :authorizer) %></td>
       <td><%= vm.vm_size %></td>
-      <td><%= vm.azure_vm.resource_group %></td>
+      <td><%= vm.resource_group %></td>
       <td><%= vm.azure_vm.location %></td>
       <td> <span <%= vm_power_class(vm.ready?) %>> <%= vm_state(vm) %> </span> </td>
       <td>

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, :help_inline => _("Password to authenticate with - used for SSH finish step.") %>
-<%= image_field(f, :label => _("Managed Image ID or Marketplace URN")) %>
+<%= image_field(f, :label => _("Marketplace Image URN"), :help_inline => _("Marketplace URN (e.g. OpenLogic:CentOS:7.5:latest)")) %>
 <%= checkbox_f f, :user_data, :help_inline => _("Does this image support user data input?") %>

data/lib/foreman_azure_rm.rb

@@ -1,5 +1,17 @@
 require 'foreman_azure_rm/engine.rb'
+require 'azure_mgmt_resources'
+require 'azure_mgmt_network'
+require 'azure_mgmt_storage'
+require 'azure_mgmt_compute'
 
 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
 
+  StorageModels = Storage::Models
+  NetworkModels = Network::Models
+  ComputeModels = Compute::Models
+  ResourceModels = Resources::Models
 end

data/lib/foreman_azure_rm/azure_sdk_adapter.rb

@@ -1,14 +1,4 @@
 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
-
-  StorageModels = Storage::Models
-  NetworkModels = Network::Models
-  ComputeModels = Compute::Models
-  ResourceModels = Resources::Models
-
   class AzureSDKAdapter
     def initialize(tenant, app_ident, secret_key, sub_id)
       @tenant           = tenant
@@ -56,8 +46,8 @@ module ForemanAzureRM
       network_client.virtual_networks.list_all
     end
 
-    def subnets(resource_group, vnet_name)
-      network_client.subnets.list(resource_group, vnet_name)
+    def subnets(rg_name, vnet_name)
+      network_client.subnets.list(rg_name, vnet_name)
     end
 
     def public_ip(rg_name, pip_name)
@@ -68,14 +58,19 @@ module ForemanAzureRM
       network_client.network_interfaces.get(rg_name, nic_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
+
     def list_vm_sizes(region)
+      return [] unless region.present?
       stripped_region = region.gsub(/\s+/, '').downcase
       compute_client.virtual_machine_sizes.list(stripped_region).value()
     end
 
-    def list_vms(rg_name)
+    def list_vms(region)
       # List all VMs in a resource group
-      virtual_machines = compute_client.virtual_machines.list(rg_name)
+      virtual_machines = compute_client.virtual_machines.list_by_location(region)
     end
 
     def get_vm(rg_name, vm_name)
@@ -137,5 +132,14 @@ module ForemanAzureRM
       end
       vm_status
     end
+
+    def start_vm(rg_name, vm_name)
+      compute_client.virtual_machines.start(rg_name, vm_name)
+    end
+
+    def stop_vm(rg_name, vm_name)
+      compute_client.virtual_machines.power_off(rg_name, vm_name)
+      compute_client.virtual_machines.deallocate(rg_name, vm_name)
+    end
   end
 end

data/lib/foreman_azure_rm/engine.rb

@@ -4,13 +4,19 @@ module ForemanAzureRM
 
     #autoloading all files inside lib dir
     config.autoload_paths += Dir["#{config.root}/lib"]
-    config.autoload_paths += Dir["#{config.root}/app/models/concerns"]
+    config.autoload_paths += Dir["#{config.root}/app/models/concerns/foreman_azure_rm/vm_extensions/"]
 
     initializer 'foreman_azure_rm.register_plugin', :before => :finisher_hook do
       Foreman::Plugin.register :foreman_azure_rm do
         requires_foreman '>= 1.17'
         compute_resource ForemanAzureRM::AzureRM
-        parameter_filter ComputeResource, :azure_vm, :tenant, :app_ident, :secret_key, :sub_id
+        parameter_filter ComputeResource, :azure_vm, :tenant, :app_ident, :secret_key, :sub_id, :region
+      end
+    end
+
+    initializer "foreman_azure_rm.add_rabl_view_path" do
+      Rabl.configure do |config|
+        config.view_paths << ForemanAzureRM::Engine.root.join('app', 'views')
       end
     end
 

data/lib/foreman_azure_rm/version.rb

@@ -1,3 +1,3 @@
 module ForemanAzureRM
-  VERSION = '2.0.0.pre1'.freeze
+  VERSION = '2.0.1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_azure_rm
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre1
+  version: 2.0.1
 platform: ruby
 authors:
 - Aditi Puntambekar
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-21 00:00:00.000000000 Z
+date: 2019-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: deface
@@ -169,9 +169,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6