foreman_azure_rm 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4ed4553178840cb2968e9e328413e529cbc198c
-  data.tar.gz: ecd58fbfe5c23475b2aa81b9984ad8de5ba2cccc
+  metadata.gz: ead0b87ab5585d6ade5849a45df0b613e7edc967
+  data.tar.gz: 007eb0bd6ac272f7f6811107dbb3555241f1ea23
 SHA512:
-  metadata.gz: cf9926c2925460409da62a313ab3a8f3e5c035d433dfa86ea72a865c6a6030eed025d1e77e34a82f9a442c32480b8ab8dc230ae2db9cf02c2cb399dce46d5de1
-  data.tar.gz: 9a504b87b437b3b51e55e23667481251ac944e28665c54380e255183695d332a42e6af3deef1e7d74be90f6e661ec3fbe4268ee26e038e1f8c24f8d9559e1020
+  metadata.gz: f17f319bddd0a45e85f367d732f231b912e70d4032815f4eeece960996855e6b2f80c9e7b7b366787dbdbdb70f5a9a449e2bc9b10d76a876c1336f73df0cbe75
+  data.tar.gz: 4690f001b5e4f8efd443a1e531f0011be8a5b78f562f2fa2b909567a12701e76eba913fa08aaa4ba7d8d5854e82d4b1f7d4e1a9c1da20b099ad613e0a85e4143

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

@@ -0,0 +1,23 @@
+module ForemanAzureRM
+  module Concerns
+    module ComputeResourcesControllerExtensions
+      include Api::Version2
+      include Foreman::Controller::Parameters::ComputeResource
+
+      def available_resource_groups
+        compute_resource = ComputeResource.find_by_id(params[:id])
+        @available_resource_groups = compute_resource.available_resource_groups
+        render :available_resource_groups, :layout => 'api/v2/layouts/index_layout'
+      end
+
+      def action_permission
+        case params[:action]
+          when 'available_resource_groups'
+            :view
+          else
+            super
+        end
+      end
+    end
+  end
+end

data/app/models/concerns/fog_extensions/azurerm/compute.rb

@@ -140,9 +140,16 @@ module FogExtensions
       def create_vm_extension(vm)
         if vm[:script_command].present? && vm[:script_uris].present?
           extension = Azure::ARM::Compute::Models::VirtualMachineExtension.new
-          extension.publisher = 'Microsoft.Azure.Extensions'
-          extension.virtual_machine_extension_type = 'CustomScript'
-          extension.type_handler_version = '2.0'
+          if vm[:platform] == 'Linux'
+            extension.publisher = 'Microsoft.Azure.Extensions'
+            extension.virtual_machine_extension_type = 'CustomScript'
+            extension.type_handler_version = '2.0'
+          elsif vm[:platform] == 'Windows'
+            extension.publisher = 'Microsoft.Compute'
+            extension.virtual_machine_extension_type = 'CustomScriptExtension'
+            extension.type_handler_version = '1.7'
+          end
+
           extension.auto_upgrade_minor_version = true
           extension.location = vm['location'].gsub(/\s+/, '').downcase
           extension.settings = {

data/app/models/foreman_azure_rm/azure_rm.rb

@@ -57,6 +57,10 @@ module ForemanAzureRM
       rg_names
     end
 
+    def available_resource_groups
+      rg_client.list_resource_groups
+    end
+
     def storage_accts(location = nil)
       stripped_location = location.gsub(/\s+/, '').downcase
       acct_names        = []
@@ -82,6 +86,14 @@ module ForemanAzureRM
       end
     end
 
+    def available_networks(attr = {})
+      networks
+    end
+
+    def networks
+      subnets
+    end
+
     def virtual_networks(location = nil)
       if location.nil?
         azure_network_service.virtual_networks
@@ -91,7 +103,7 @@ module ForemanAzureRM
       end
     end
 
-    def subnets(location)
+    def subnets(location = nil)
       vnets   = virtual_networks(location)
       subnets = []
       vnets.each do |vnet|
@@ -108,14 +120,6 @@ module ForemanAzureRM
       super(options)
     end
 
-    def networks
-      subnets = []
-      virtual_networks.each do |vnet|
-        subnets << subnets(vnet.id)
-      end
-      subnets
-    end
-
     def new_interface(attr = {})
       azure_network_service.network_interfaces.new(attr)
     end
@@ -148,24 +152,24 @@ module ForemanAzureRM
     end
 
     def create_nics(args = {})
-      nics = []
+      nics               = []
       formatted_location = args[:location].gsub(/\s+/, '').downcase
       args[:interfaces_attributes].each do |nic, attrs|
-        attrs[:pubip_alloc] = attrs[:bridge]
+        attrs[:pubip_alloc]  = attrs[:bridge]
         attrs[:privip_alloc] = (attrs[:name] == 'false') ? false : true
-        pip_alloc = case attrs[:pubip_alloc]
-                    when 'Static'
-                      Fog::ARM::Network::Models::IPAllocationMethod::Static
-                    when 'Dynamic'
-                      Fog::ARM::Network::Models::IPAllocationMethod::Dynamic
-                    when 'None'
-                      nil
-                    end
-        priv_ip_alloc = if attrs[:priv_ip_alloc]
-                          Fog::ARM::Network::Models::IPAllocationMethod::Static
-                        else
-                          Fog::ARM::Network::Models::IPAllocationMethod::Dynamic
-                        end
+        pip_alloc            = case attrs[:pubip_alloc]
+                                 when 'Static'
+                                   Fog::ARM::Network::Models::IPAllocationMethod::Static
+                                 when 'Dynamic'
+                                   Fog::ARM::Network::Models::IPAllocationMethod::Dynamic
+                                 when 'None'
+                                   nil
+                               end
+        priv_ip_alloc        = if attrs[:priv_ip_alloc]
+                                 Fog::ARM::Network::Models::IPAllocationMethod::Static
+                               else
+                                 Fog::ARM::Network::Models::IPAllocationMethod::Dynamic
+                               end
         if pip_alloc.present?
           pip = azure_network_service.public_ips.create(
               name:                        "#{args[:vm_name]}-pip#{nic}",
@@ -192,7 +196,7 @@ module ForemanAzureRM
     # does not currently support creating managed VMs
     def create_vm(args = {})
       args[:vm_name] = args[:name].split('.')[0]
-      nics = create_nics(args)
+      nics           = create_nics(args)
       if args[:ssh_key_data].present?
         disable_password_auth = true
         ssh_key_path          = "/home/#{args[:username]}/.ssh/authorized_keys"
@@ -200,7 +204,7 @@ module ForemanAzureRM
         disable_password_auth = false
         ssh_key_path          = nil
       end
-      vm = client.create_managed_virtual_machine(
+      vm                       = client.create_managed_virtual_machine(
           name:                            args[:vm_name],
           location:                        args[:location],
           resource_group:                  args[:resource_group],
@@ -218,15 +222,15 @@ module ForemanAzureRM
           os_disk_size:                    args[:os_disk_size],
           premium_os_disk:                 args[:premium_os_disk],
       )
-      vm_hash                      = Fog::Compute::AzureRM::Server.parse(vm)
-      vm_hash[:password]           = args[:password]
-      vm_hash[:platform]           = args[:platform]
-      vm_hash[:puppet_master]      = args[:puppet_master]
-      vm_hash[:script_command]     = args[:script_command]
-      vm_hash[:script_uris]        = args[:script_uris]
+      vm_hash                  = Fog::Compute::AzureRM::Server.parse(vm)
+      vm_hash[:password]       = args[:password]
+      vm_hash[:platform]       = args[:platform]
+      vm_hash[:puppet_master]  = args[:puppet_master]
+      vm_hash[:script_command] = args[:script_command]
+      vm_hash[:script_uris]    = args[:script_uris]
       client.create_vm_extension(vm_hash)
       client.servers.new vm_hash
-    # fog-azure-rm raises all ARM errors as RuntimeError
+        # fog-azure-rm raises all ARM errors as RuntimeError
     rescue Fog::Errors::Error, RuntimeError => e
       Foreman::Logging.exception('Unhandled Azure RM error', e)
       destroy_vm vm.id if vm
@@ -242,8 +246,8 @@ module ForemanAzureRM
       # In ARM things must be deleted in order
       vm.destroy
       nic_ids.each do |id|
-        nic = azure_network_service.network_interfaces.get(id.split('/')[4],
-                                                           id.split('/')[-1])
+        nic   = azure_network_service.network_interfaces.get(id.split('/')[4],
+                                                             id.split('/')[-1])
         ip_id = nic.public_ip_address_id
         nic.destroy
         if ip_id.present?

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

@@ -0,0 +1 @@
+attributes :user

data/app/views/api/v2/compute_resources/available_resource_groups.rabl

@@ -0,0 +1,3 @@
+collection @available_resource_groups
+
+attribute :name, :id, :location

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

@@ -0,0 +1 @@
+attributes :user, :uuid

data/config/routes.rb

@@ -1,8 +1,15 @@
 Rails.application.routes.draw do
   scope :azure_rm, :path => '/azure_rm' do
-    get :sizes,              :controller => :hosts
-    get :subnets,            :controller => :hosts
-    get :storage_accts,      :controller => :hosts
-    get :vnets,              :controller => :hosts
+    get :sizes, :controller => :hosts
+    get :subnets, :controller => :hosts
+    get :storage_accts, :controller => :hosts
+    get :vnets, :controller => :hosts
+  end
+  namespace :api, :defaults => { :format => 'json' } do
+    scope "(:apiv)", :module => :v2, :defaults => { :apiv => 'v2' }, :apiv => /v1|v2/, :constraints => ApiConstraints.new(:version => 2, :default => true) do
+      resources :compute_resources, :except => [:new, :edit] do
+        get :available_resource_groups, :on => :member
+      end
+    end
   end
 end

data/lib/foreman_azure_rm/engine.rb

@@ -60,6 +60,8 @@ module ForemanAzureRM
 
       ::HostsController.send(:include, ForemanAzureRM::Concerns::HostsControllerExtensions)
 
+      Api::V2::ComputeResourcesController.send(:include, ForemanAzureRM::Concerns::ComputeResourcesControllerExtensions)
+
       require 'fog/azurerm/models/network/network_interface'
       require File.expand_path(
           '../../../app/models/concerns/fog_extensions/azurerm/network_interface',

data/lib/foreman_azure_rm/version.rb

@@ -1,3 +1,3 @@
 module ForemanAzureRM
-  VERSION = '1.1.1'
+  VERSION = '1.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_azure_rm
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Tyler Gregory
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-11 00:00:00.000000000 Z
+date: 2017-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-azure-rm-downgraded
@@ -52,6 +52,7 @@ files:
 - app/assets/javascripts/foreman_azure_rm/azure_rm_location_callbacks.js
 - app/assets/javascripts/foreman_azure_rm/azure_rm_size_from_location.js
 - app/assets/javascripts/foreman_azure_rm/azure_rm_subnet_from_vnet.js
+- app/controllers/foreman_azure_rm/concerns/compute_resources_controller_extensions.rb
 - app/controllers/foreman_azure_rm/concerns/hosts_controller_extensions.rb
 - app/models/concerns/fog_extensions/azurerm/compute.rb
 - app/models/concerns/fog_extensions/azurerm/data_disk.rb
@@ -63,6 +64,9 @@ files:
 - app/models/concerns/fog_extensions/azurerm/servers.rb
 - app/models/foreman_azure_rm/azure_rm.rb
 - app/overrides/add_location_size_js.rb
+- app/views/api/v1/compute_resources/azurerm.json.rabl
+- app/views/api/v2/compute_resources/available_resource_groups.rabl
+- app/views/api/v2/compute_resources/azurerm.json.rabl
 - app/views/compute_resources/form/_azurerm.html.erb
 - app/views/compute_resources/show/_azurerm.html.erb
 - app/views/compute_resources_vms/form/azurerm/_base.html.erb