foreman_fog_proxmox 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 75626a2ceb3ba5b72a8938a76f9bd50ad1d337565d5eb8c9253bb76bf90b7f8f
-  data.tar.gz: d06eeccaa0e89c3e34d73d9558a80f65fadcc3f6188c7db71228debbaf223984
+  metadata.gz: 2b3332c6939c4896c597786242fb2d0a96ff206e9b4503ae540d25bc26aa46dd
+  data.tar.gz: c8c9d2808b64625cfd21dee603267df85168cfec2c199b12f60b841c40cef1c6
 SHA512:
-  metadata.gz: a93fee7915341da532c5572b40bb6f5eec03e6a3f2e9b7d6ae66ae50b89b7ae65f8806ee036a351885cd2175ba276f563e7905a5cf029200500a0b1bf97258a4
-  data.tar.gz: 96ccb17ba381f892e8c0633c9e55a773ccc7c0857be36aac42e2ce4ea0a1ba5b19c383a0a3b8e32d358ac38af3c0647e16486774dd774dd666ee9e3d9ea871ff
+  metadata.gz: f3be1549ae1d6dc713bdd8f55f14e4d72fdb8bb2f282714a4fdc2eea02a1a1439f2fb0ef1bf9b84e551c09065f2ddee5333f994ace60cb2ae4a2ee5cb096bea7
+  data.tar.gz: d70a4df6f3f87a0ab9b552c2d481ced3c971a01cfa6c28d826cb786e5dd6a7794e2af0ee6ae7bfeef7403be2d6c66f38afd51f44db0185f40168be40f1de4041

data/app/models/foreman_fog_proxmox/proxmox.rb

@@ -86,7 +86,7 @@ module ForemanFogProxmox
 
     def bridges
       node = network_client.nodes.find_by_id node_name
-      bridges = node.networks.all(type: 'bridge')
+      bridges = node.networks.all(type: 'any_bridge')
       bridges.sort_by(&:iface)
     end    
 
@@ -188,6 +188,10 @@ module ForemanFogProxmox
       vm_attrs
     end
 
+    def vms(opts = {})
+      node.servers
+    end
+
     def new_vm(attr = {})
       attr = ActiveSupport::HashWithIndifferentAccess.new(attr)
       type = attr['type']

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

@@ -18,10 +18,11 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 <%= javascript_include_tag 'foreman_fog_proxmox/proxmox_compute_resource', "data-turbolinks-track" => true %>
 
 <% nodes = f.object.nodes rescue nil %>
+<% node_name = !!f.object.node_name ? f.object.node_name : '' %>
 <%= text_f f, :url, :help_block => _("e.g. https://127.0.0.1:8006/api2/json"), :help_inline_permanent => load_button_f(f, !!nodes, _("Test failed")) %>
 <%= text_f f, :user , :help_block => _("e.g. root@pam") %>
 <%= password_f f, :password, :keep_value => true, :unset => unset_password? %>
 <%= checkbox_f f, :ssl_verify_peer, :label => _("SSL verify peer"), :checked => true, :onchange => "sslVerifyPeerSelected(this)" %>
 <%= textarea_f f, :ssl_certs, :label => _("X509 Certification Authorities"), :size => "col-md-4",
   :placeholder => _("Optionally provide a CA, or a correctly ordered CA chain. If left blank, disable ssl_verify_peer.") %>
-<%= select_f f, :node_name, nodes, :node, :node, { :include_blank => true }, :label => _('Node'), :label_size => "col-md-2", :required => true %>
+<%= select_f f, :node_name, nodes, :node, :node, { :include_blank => true }, :label => _('Node'), :label_size => "col-md-2", :required => true, :disabled => (node_name != '') %>

data/app/views/compute_resources_vms/show/_proxmox.html.erb

@@ -24,6 +24,7 @@ along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>. %>
 
     <%= prop :name %>
     <%= prop :type %>
+    <%= prop :node %>
     <%= prop :templated? %>
     <%= prop :mac %>
     <%= prop :memory %>

data/lib/foreman_fog_proxmox/version.rb

@@ -18,5 +18,5 @@
 # along with ForemanFogProxmox. If not, see <http://www.gnu.org/licenses/>.
 
 module ForemanFogProxmox
-  VERSION = '0.5.3'.freeze
+  VERSION = '0.5.4'.freeze
 end

data/test/unit/foreman_fog_proxmox/helpers/proxmox_server_helper_test.rb

@@ -48,8 +48,8 @@ class ProxmoxServerHelperTest < ActiveSupport::TestCase
           '0'=> { 'controller' => 'scsi', 'device' => '0', 'storage' => 'local-lvm', 'size' => '1073741824', 'cache' => 'none' }
         }, 
         'interfaces_attributes' => { 
-          '0' => { 'id' => 'net0', 'model' => 'virtio', 'bridge' => 'vmbr0', 'firewall' => '0', 'disconnect' => '0', 'rate' => nil },
-          '1' => { 'id' => 'net1', 'model' => 'e1000', 'bridge' => 'vmbr0', 'firewall' => '0', 'disconnect' => '0' } 
+          '0' => { 'id' => 'net0', 'model' => 'virtio', 'bridge' => 'vmbr0', 'firewall' => '0', 'link_down' => '0', 'rate' => nil },
+          '1' => { 'id' => 'net1', 'model' => 'e1000', 'bridge' => 'vmbr0', 'firewall' => '0', 'link_down' => '0' } 
         } 
       }
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_fog_proxmox
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Tristan Robert
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-22 00:00:00.000000000 Z
+date: 2018-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-proxmox