Refactor server and container in server only

fog · Apr 16, 2019 · ccfc290 · ccfc290
1 parent bbf8b2e
commit ccfc290
Show file tree

Hide file tree

Showing 23 changed files with 5,254 additions and 4,329 deletions.
diff --git a/lib/fog/compute/proxmox.rb b/lib/fog/compute/proxmox.rb
@@ -47,9 +47,6 @@ class Proxmox < Fog::Service
       collection :tasks
       model :snapshot
       collection :snapshots
-      model :container
-      collection :containers
-      model :container_config
 
       # Requests
       request_path 'fog/compute/proxmox/requests'

diff --git a/lib/fog/compute/proxmox/models/container.rb b/lib/fog/compute/proxmox/models/container.rb
diff --git a/lib/fog/compute/proxmox/models/container_config.rb b/lib/fog/compute/proxmox/models/container_config.rb
diff --git a/lib/fog/compute/proxmox/models/disk.rb b/lib/fog/compute/proxmox/models/disk.rb
@@ -54,6 +54,18 @@ def cdrom?
         def rootfs?
           id == 'rootfs'
         end
+
+        def mount_point?
+          id.match(/(mp)(\d+)/)
+        end
+
+        def controller?
+          id.match(/(scsi|ide|sata|virtio)(\d+)/)
+        end
+
+        def flatten
+          Fog::Proxmox::DiskHelper.flatten(attributes)
+        end
       end
     end
   end

diff --git a/lib/fog/compute/proxmox/models/interface.rb b/lib/fog/compute/proxmox/models/interface.rb
@@ -17,6 +17,8 @@
 
 # frozen_string_literal: true
 
+require "fog/proxmox/helpers/nic_helper"
+
 module Fog
   module Compute
     class Proxmox
@@ -34,6 +36,10 @@ class Interface < Fog::Model
         attribute :rate
         attribute :queues
         attribute :tag
+
+        def flatten
+          Fog::Proxmox::NicHelper.flatten(attributes)
+        end
       end
     end
   end

diff --git a/lib/fog/compute/proxmox/models/node.rb b/lib/fog/compute/proxmox/models/node.rb
@@ -26,6 +26,8 @@
 
 # frozen_string_literal: true
 
+require 'fog/proxmox/attributes'
+
 module Fog
   module Compute
     class Proxmox
@@ -49,8 +51,7 @@ class Node < Fog::Model
 
         def initialize(new_attributes = {})
           prepare_service_value(new_attributes)
-          attributes[:node] = new_attributes['node'] unless new_attributes['node'].nil?
-          attributes[:node] = new_attributes[:node] unless new_attributes[:node].nil?
+          Fog::Proxmox::Attributes.set_attr_and_sym('node', attributes, new_attributes)
           requires :node
           initialize_tasks
           initialize_servers
@@ -77,11 +78,11 @@ def initialize_tasks
         end
 
         def initialize_servers
-          attributes[:servers] = Fog::Compute::Proxmox::Servers.new(service: service, node_id: node)
+          attributes[:servers] = Fog::Compute::Proxmox::Servers.new(service: service, node_id: node, type: 'qemu')
         end
 
         def initialize_containers
-          attributes[:containers] = Fog::Compute::Proxmox::Containers.new(service: service, node_id: node)
+          attributes[:containers] = Fog::Compute::Proxmox::Servers.new(service: service, node_id: node, type: 'lxc')
         end
 
         def initialize_storages