foreman_virt_who_configure 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf3e0a6434aadcf921fa999536a024f8f2328dec8919d8ee421cc77f8b3ba64b
-  data.tar.gz: 730cfd8c0be2125c35ffd333d4ff24579159e558452b48a2f5f2dd22ecfa620d
+  metadata.gz: fd228676712de08fec7ea70df6af7170b14fc802ee35d1bd0d74559e8beea160
+  data.tar.gz: cd3bd04a86a3315359c302a80bd55c436c6ded0a3e569402f2455fd183b5969c
 SHA512:
-  metadata.gz: ca602bed3b8f44f51e998324605787ccf453522b6c042786cdcc747841fa4d5981c43410f297b4173dbc362b887cc4a205857c2f0f23ae73e8fb0eeb75fd7e2c
-  data.tar.gz: fb0bbcbfa473562eded59bfb96725d6d49bbf66cb1e1ca319b6126c0217645fb68e20b1d6bb01be8e0c1c7476e2febe68be5337d0ddb6f72a12fca52d4c89942
+  metadata.gz: 6fb574f47761da65869cdb11b26e26b341e674e8f4f920912bb9ed6a8b87fd2090e3ae933cc1bb8769a953109226b3727cfd740c390394f4076c42c93d47fe5b
+  data.tar.gz: a508d300b4417d3546fa27e1dee505d0197ff095578def373f38751d6368afe1989eae238068977060854b7f53887f0358fa8fcbb2f2ef9bdf4d6eb153ebef16

data/app/controllers/foreman_virt_who_configure/api/v2/configs_controller.rb

@@ -52,7 +52,7 @@ module ForemanVirtWhoConfigure
             param :hypervisor_password, String, :desc => N_("Hypervisor password, required for all hypervisor types except for libvirt"), :required => false
             param :satellite_url, String, :desc => N_("Satellite server FQDN"), :required => true
             param :debug, :bool, :desc => N_("Enable debugging output")
-            param :proxy, String, :desc => N_('HTTP proxy that should be used for communication between the server on which virt-who is running and the hypervisors and virtualization managers.'), :required => false
+            param :http_proxy_id, Integer, :desc => N_('HTTP proxy that should be used for communication between the server on which virt-who is running and the hypervisors and virtualization managers.')
             param :no_proxy, String, :desc => N_("Ignore proxy. A comma-separated list of hostnames or domains or ip addresses to ignore proxy settings for. Optionally this may be set to * to bypass proxy settings for all hostnames domains or ip addresses.")
             param :organization_id, Integer, :required => true, :desc => N_("Organization of the virt-who configuration") if ::SETTINGS[:organizations_enabled]
           end

data/app/views/foreman_virt_who_configure/api/v2/configs/main.json.rabl

@@ -2,8 +2,17 @@ object @config
 
 extends "foreman_virt_who_configure/api/v2/configs/base"
 
+glue :http_proxy do
+  attributes :url => :proxy
+end
+
 attributes :name, :interval, :organization_id, :whitelist, :blacklist, :hypervisor_id,
            :hypervisor_type, :hypervisor_server, :hypervisor_username, :debug,
            :satellite_url, :proxy, :no_proxy, :status, :last_report_at, :out_of_date_at,
            :filter_host_parents, :exclude_host_parents
+
+child :http_proxy do
+  attributes :id, :name, :url
+end
+
 attributes :listing_mode => :filtering_mode

data/db/migrate/20201211160234_add_foreign_key_proxy_id.rb

@@ -0,0 +1,5 @@
+class AddForeignKeyProxyId < ActiveRecord::Migration[6.0]
+  def change
+    add_foreign_key :foreman_virt_who_configure_configs, :http_proxies, :column => :http_proxy_id
+  end
+end

data/lib/foreman_virt_who_configure/version.rb

@@ -1,3 +1,3 @@
 module ForemanVirtWhoConfigure
-  VERSION = '0.5.4'.freeze
+  VERSION = '0.5.5'.freeze
 end

data/test/functional/api/v2/configs_controller_test.rb

@@ -78,7 +78,8 @@ class ForemanVirtWhoConfigure::Api::V2::ConfigsControllerTest < ActionController
     assert_equal 'unknown', response['status']
     assert_nil response['last_report_at']
     assert_nil response['out_of_date_at']
-    assert_equal @http_proxy.id, ForemanVirtWhoConfigure::Config.find(response['id']).http_proxy_id
+    assert_equal @http_proxy.id, response['http_proxy']['id']
+    assert_equal @http_proxy.url, response['proxy']
 
     assert_response :success
   end
@@ -140,6 +141,7 @@ class ForemanVirtWhoConfigure::Api::V2::ConfigsControllerTest < ActionController
                                                             :hypervisor_password => "password",
                                                             :debug => true,
                                                             :satellite_url => "foreman.example.com",
+                                                            :http_proxy_id => @http_proxy.id,
                                                             :organization_id => org.id }
     }, :session => set_session_user
 
@@ -158,6 +160,7 @@ class ForemanVirtWhoConfigure::Api::V2::ConfigsControllerTest < ActionController
     assert_equal 'password', new_config.hypervisor_password
     assert_equal true, new_config.debug
     assert_equal 'foreman.example.com', new_config.satellite_url
+    assert_equal @http_proxy.id, response['http_proxy']['id']
   end
 
   test "should update the config" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_virt_who_configure
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Foreman virt-who-configure team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-30 00:00:00.000000000 Z
+date: 2020-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: katello
@@ -108,6 +108,7 @@ files:
 - db/migrate/20181005065724_filter_and_exclude_host_parents.foreman_virt_who_configure.rb
 - db/migrate/20190104125749_add_kubeconfig_to_config.rb
 - db/migrate/20200728054557_refer_config_proxy_to_http_proxy.rb
+- db/migrate/20201211160234_add_foreign_key_proxy_id.rb
 - lib/foreman_virt_who_configure.rb
 - lib/foreman_virt_who_configure/engine.rb
 - lib/foreman_virt_who_configure/version.rb