foreman_azure_rm 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ead0b87ab5585d6ade5849a45df0b613e7edc967
-  data.tar.gz: 007eb0bd6ac272f7f6811107dbb3555241f1ea23
+  metadata.gz: 5f5fde07cbdeff98c4fdbe93ff37e3ea3b5d49e6
+  data.tar.gz: 421a4d296cba9822c16fa9222ffe8a3a6435acf4
 SHA512:
-  metadata.gz: f17f319bddd0a45e85f367d732f231b912e70d4032815f4eeece960996855e6b2f80c9e7b7b366787dbdbdb70f5a9a449e2bc9b10d76a876c1336f73df0cbe75
-  data.tar.gz: 4690f001b5e4f8efd443a1e531f0011be8a5b78f562f2fa2b909567a12701e76eba913fa08aaa4ba7d8d5854e82d4b1f7d4e1a9c1da20b099ad613e0a85e4143
+  metadata.gz: 2bb5ada194db14c8d37e58880d8dc84d276fb53f9deb92ab819c00161a400735a0b214e95bfe3c2c03fbafd237e0831b53b878b4cf6a7e3403a109a7a3880918
+  data.tar.gz: 0e9dbf75d109f65391fbdd7e0296d7c5ebd59f1fc03459e237cd247a17fdb09f24cca0dd41920f0fb8c8362151257b4d895f719e28637757e8094641d8036acc

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

@@ -10,9 +10,27 @@ module ForemanAzureRM
         render :available_resource_groups, :layout => 'api/v2/layouts/index_layout'
       end
 
+      def available_sizes
+        compute_resource = ComputeResource.find_by_id(params[:id])
+        @available_sizes = compute_resource.vm_sizes(params[:region_id])
+        render :available_sizes, :layout => 'api/v2/layouts/index_layout'
+      end
+
+      def available_subnets
+        compute_resource = ComputeResource.find_by_id(params[:id])
+        @available_subnets = compute_resource.available_subnets
+        render :available_subnets, :layout => 'api/v2/layouts/index_layout'
+      end
+
+      def available_vnets
+        compute_resource = ComputeResource.find_by_id(params[:id])
+        @available_vnets = compute_resource.available_vnets
+        render :available_vnets, :layout => 'api/v2/layouts/index_layout'
+      end
+
       def action_permission
         case params[:action]
-          when 'available_resource_groups'
+          when 'available_resource_groups', 'available_sizes', 'available_subnets', 'available_vnets'
             :view
           else
             super

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

@@ -5,7 +5,7 @@ module ForemanAzureRM
       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[:location_string])
+          render :json => resource.vm_sizes(params[:location_string]).map { |size| size.name }
         else
           no_sizes = _('The location you selected has no sizes associated with it')
           render :json => "[\"#{no_sizes}\"]"
@@ -16,7 +16,7 @@ module ForemanAzureRM
         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[:location])
+          subnets           = azure_rm_resource.subnets(params[:location])
           if subnets.present?
             render :json => azure_rm_resource.subnets(params[:location])
           else

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

@@ -32,11 +32,7 @@ module FogExtensions
       end
 
       def list_available_sizes(location)
-        sizes = []
-        @compute_mgmt_client.virtual_machine_sizes.list(location).value().each do |vmsize|
-          sizes << vmsize.name
-        end
-        sizes
+        @compute_mgmt_client.virtual_machine_sizes.list(location).value()
       end
 
       def list_all_vms

data/app/models/foreman_azure_rm/azure_rm.rb

@@ -86,10 +86,19 @@ module ForemanAzureRM
       end
     end
 
+    def available_vnets(attr = {})
+      virtual_networks
+    end
+
     def available_networks(attr = {})
-      networks
+      subnets
+    end
+
+    def available_subnets
+      subnets
     end
 
+    # TODO Delete this
     def networks
       subnets
     end

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

@@ -0,0 +1,3 @@
+collection @available_sizes
+
+attribute :name, :number_of_cores, :os_disk_size_in_mb, :resource_disk_size_in_mb, :memory_in_mb, :max_data_disk_count

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

@@ -0,0 +1,3 @@
+collection @available_subnets
+
+attribute :name, :id, :virtual_network_name, :address_prefix, :network_security_group_id, :route_table_id, :ip_configuration_ids

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

@@ -0,0 +1,3 @@
+collection @available_vnets
+
+attribute :name, :id, :location, :resource_group, :dns_servers, :subnets, :address_prefixes

data/config/routes.rb

@@ -9,6 +9,9 @@ Rails.application.routes.draw 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
+        get :available_subnets, :on => :member
+        get :available_vnets, :on => :member
+        get '(:region_id)/available_sizes', :to => 'compute_resources#available_sizes', :on => :member
       end
     end
   end

data/lib/foreman_azure_rm/version.rb

@@ -1,3 +1,3 @@
 module ForemanAzureRM
-  VERSION = '1.2.0'
+  VERSION = '1.3.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_azure_rm
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Tyler Gregory
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-14 00:00:00.000000000 Z
+date: 2017-06-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-azure-rm-downgraded
@@ -66,6 +66,9 @@ files:
 - 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/available_sizes.rabl
+- app/views/api/v2/compute_resources/available_subnets.rabl
+- app/views/api/v2/compute_resources/available_vnets.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