fog-proxmox 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2da1266e1cd899b4ef2ce96900766c67b11d297dfa848506e8f7d8a7c7031e5e
-  data.tar.gz: 852cb9477eb4805ac46bb1fae257060aca5d9f85fed4e3d66ca065d441b7b0d5
+  metadata.gz: '0808e35cf05f51aeb72e25ccbfb66c9cb0176364e0d4b298e5e09a9237c0f940'
+  data.tar.gz: 012e341f0dfe2c74108f65fb68d9cc29b03b2003b9ca7335fe6aa1038e930bc9
 SHA512:
-  metadata.gz: d16c053380031b61e5dd8a4bcfc3f6ab983a7ba8338672d45f73bb111bf9dd9becdaba20121afa9bc10f132ca2e15d862a98b8c8731784a527c17fa874116af7
-  data.tar.gz: 040d7125c1b9cd56377637da745a6e781598678a12623b437bcbc086d657d647d00f9df68597682f951195bbd4fc9d71a6310f79058aafb7f96503fdbfec5bfe
+  metadata.gz: 6ab7a7772ade522ab830167f8ca3909a4a32cd6eea3954cfec40243cfab9dd345693fe226fd98d552b848c2b0f506393f25c295ca0169fe1df8c4ca95ea7d92b
+  data.tar.gz: 6a87af1859adc1c4deda619d0eb706369384dda48778531f0366cfc934945b20e6ae3230384e25423a82e405d6fd095e7ffad494d18e33e09a1777d5d8ead31c

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    fog-proxmox (0.5.3)
+    fog-proxmox (0.5.4)
       fog-core (~> 1.45)
       fog-json (~> 1.0)
       ipaddress (~> 0.8)
@@ -143,4 +143,4 @@ DEPENDENCIES
   webmock (~> 3.4)
 
 BUNDLED WITH
-   1.16.5
+   1.17.1

data/lib/fog/compute/proxmox/models/disk.rb

@@ -47,6 +47,7 @@ module Fog
         attribute :snapshot
         attribute :backup
         attribute :aio
+        attribute :mp
 
         def controller
           Fog::Proxmox::DiskHelper.extract_controller(id)

data/lib/fog/proxmox/version.rb

@@ -19,6 +19,6 @@
 
 module Fog
   module Proxmox
-    VERSION = '0.5.3'
+    VERSION = '0.5.4'
   end
 end

data/spec/compute_spec.rb

@@ -41,15 +41,15 @@ describe Fog::Compute::Proxmox do
       node_name = 'pve'
       node = @service.nodes.find_by_id node_name
       tasks = node.tasks.search(options)
-      # tasks.wont_be_nil
-      # tasks.wont_be_empty
+      tasks.wont_be_nil
+      tasks.wont_be_empty
       # Get task
       upid = tasks[0].upid
       task = node.tasks.find_by_id(upid)
-      # task.wont_be_nil
+      task.wont_be_nil
       # Stop task
       task.stop
-      # task.exitstatus.must_equal 'OK'
+      task.exitstatus.must_equal 'OK'
     end
   end
 
@@ -60,12 +60,12 @@ describe Fog::Compute::Proxmox do
       node = @service.nodes.find_by_id node_name
       # Get statistics data
       data = node.statistics
-      # data.wont_be_nil
-      # data.wont_be_empty
+      data.wont_be_nil
+      data.wont_be_empty
       # Get statistics image
       data = node.statistics('rrd', { timeframe: 'hour', ds: 'cpu,memused', cf: 'AVERAGE' })
-      # data.wont_be_nil
-      # data['image'].wont_be_nil
+      data.wont_be_nil
+      data['image'].wont_be_nil
     end
   end
 
@@ -76,15 +76,15 @@ describe Fog::Compute::Proxmox do
       node = @service.nodes.find_by_id node_name
       # List all storages
       storages = node.storages.all
-      # storages.wont_be_nil
-      # storages.wont_be_empty
+      storages.wont_be_nil
+      storages.wont_be_empty
       # List by content type
       storages = node.storages.list_by_content_type 'iso'
-      # storages.wont_be_nil
-      # storages.wont_be_empty
+      storages.wont_be_nil
+      storages.wont_be_empty
       # Get storage
       storage = node.storages.find_by_id('local')
-      # storage.wont_be_nil
+      storage.wont_be_nil
     end
   end
 
@@ -97,26 +97,26 @@ describe Fog::Compute::Proxmox do
       server_hash = { vmid: vmid }
       # Check valid vmid
       valid = node.servers.id_valid? vmid
-      # valid.must_equal true
+      valid.must_equal true
       # Check not valid vmid
       valid = node.servers.id_valid? 99
-      # valid.must_equal false
+      valid.must_equal false
       # Create 1st time
       node.servers.create(server_hash)
       # Check already used vmid
       valid = node.servers.id_valid? vmid
-      # valid.must_equal false
+      valid.must_equal false
       # Clone server
       newid = node.servers.next_id
       # Get server
       server = node.servers.get vmid
-      # server.wont_be_nil
+      server.wont_be_nil
       # Backup it
       server.backup(compress: 'lzo')
       # Get this backup image
       # Find available backup volumes
       volume = server.backups.first
-      # volume.wont_be_nil
+      volume.wont_be_nil
       # Restore it
       server.restore(volume, storage: 'local')
       # Delete it
@@ -141,16 +141,16 @@ describe Fog::Compute::Proxmox do
       clone.template
       # Get clone disk image
       image = clone.images.first
-      # image.wont_be_nil
+      image.wont_be_nil
       # Delete clone
       clone.destroy
-      # proc do
-      #   node.servers.get newid
-      # end.must_raise Excon::Errors::InternalServerError
+      proc do
+        node.servers.get newid
+      end.must_raise Excon::Errors::InternalServerError
       # Create 2nd time must fails
-      # proc do
-      #   node.servers.create server_hash
-      # end.must_raise Excon::Errors::InternalServerError
+      proc do
+        node.servers.create server_hash
+      end.must_raise Excon::Errors::InternalServerError
       # Update config server
       # Add empty cdrom
       config_hash = { ide2: 'none,media=cdrom' }
@@ -167,104 +167,104 @@ describe Fog::Compute::Proxmox do
       config_hash = { onboot: 1, keyboard: 'fr', ostype: 'l26', kvm: 0 }
       server.update(config_hash)
       # server config
-      #config = server.config
-      #config.identity.must_equal vmid
+      config = server.config
+      config.identity.must_equal vmid
       disks = server.config.disks
       nics = server.config.interfaces
-      # nics.wont_be_nil
-      # nics.wont_be_empty
+      nics.wont_be_nil
+      nics.wont_be_empty
       nics.get('net0').wont_be_nil
-      # disks.wont_be_nil
-      # disks.wont_be_empty
+      disks.wont_be_nil
+      disks.wont_be_empty
       virtio0 = disks.get('virtio0')
-      # virtio0.wont_be_nil
+      virtio0.wont_be_nil
       ide2 = disks.get('ide2')
-      # ide2.wont_be_nil
+      ide2.wont_be_nil
       # Get a mac adress
       mac_address = server.config.mac_addresses.first
-      # mac_address.wont_be_nil
+      mac_address.wont_be_nil
       # all servers
       servers_all = node.servers.all
-      # servers_all.wont_be_nil
-      # servers_all.wont_be_empty
-      # servers_all.must_include server
+      servers_all.wont_be_nil
+      servers_all.wont_be_empty
+      servers_all.must_include server
       # server not running exception
-      # proc do
-      #   server.start_console(websocket: 1)
-      # end.must_raise Fog::Proxmox::Errors::ServiceError
+      proc do
+        server.start_console(websocket: 1)
+      end.must_raise Fog::Proxmox::Errors::ServiceError
       # Start server
       server.action('start')
       server.wait_for { ready? }
       status = server.ready?
-      # status.must_equal true
+      status.must_equal true
       # server vga not set exception
-      # proc do
-      #   server.start_console(websocket: 1)
-      # end.must_raise Fog::Proxmox::Errors::ServiceError
+      proc do
+        server.start_console(websocket: 1)
+      end.must_raise Fog::Proxmox::Errors::ServiceError
       # Stop server
       server.action('stop')
       server.wait_for { server.status == 'stopped' }
       status = server.status
-      # status.must_equal 'stopped'
+      status.must_equal 'stopped'
       server.update(vga: 'std')
       # Start server
       server.action('start')
       server.wait_for { ready? }
       status = server.ready?
-      # status.must_equal true
+      status.must_equal true
       vnc = server.start_console(websocket: 1)
-      # vnc['cert'].wont_be_nil
+      vnc['cert'].wont_be_nil
       port = server.connect_vnc(vnc)
-      # port.wont_be_nil
+      port.wont_be_nil
       # Stop server
       server.action('stop')
       server.wait_for { server.status == 'stopped' }
       status = server.status
-      # status.must_equal 'stopped'
+      status.must_equal 'stopped'
       server.update(serial0: 'socket', vga: 'serial0')
       # Start server
       server.action('start')
       server.wait_for { ready? }
       status = server.ready?
-      # status.must_equal true
+      status.must_equal true
       term = server.start_console
-      # term['ticket'].wont_be_nil
+      term['ticket'].wont_be_nil
       # Stop server
       server.action('stop')
       server.wait_for { server.status == 'stopped' }
       status = server.status
-      # status.must_equal 'stopped'
+      status.must_equal 'stopped'
       server.update(vga: 'qxl')
       # Start server
       server.action('start')
       server.wait_for { ready? }
       status = server.ready?
-      # status.must_equal true
+      status.must_equal true
       spice = server.start_console
-      # spice['password'].wont_be_nil
+      spice['password'].wont_be_nil
       # Suspend server
       server.action('suspend')
       server.wait_for { server.qmpstatus == 'paused' }
       qmpstatus = server.qmpstatus
-      # qmpstatus.must_equal 'paused'
+      qmpstatus.must_equal 'paused'
       # Resume server
       server.action('resume')
       server.wait_for { ready? }
       status = server.ready?
-      # status.must_equal true
+      status.must_equal true
       # Stop server
       server.action('stop')
       server.wait_for { server.status == 'stopped' }
       status = server.status
-      # status.must_equal 'stopped'
-      # proc do
-      #   server.action('hello')
-      # end.must_raise Fog::Errors::Error
+      status.must_equal 'stopped'
+      proc do
+        server.action('hello')
+      end.must_raise Fog::Errors::Error
       # Delete
       server.destroy
-      # proc do
-      #   node.servers.get vmid
-      # end.must_raise Excon::Errors::InternalServerError
+      proc do
+        node.servers.get vmid
+      end.must_raise Excon::Errors::InternalServerError
     end
   end
 
@@ -282,15 +282,15 @@ describe Fog::Compute::Proxmox do
       server.snapshots.create(snapshot_hash)
       # Find by id
       snapshot = server.snapshots.get snapname
-      # snapshot.wont_be_nil
+      snapshot.wont_be_nil
       # Update
       snapshot.description = 'Snapshot 1'
       snapshot.update
       # all snapshots
       snapshots_all = server.snapshots.all
-      # snapshots_all.wont_be_nil
-      # snapshots_all.wont_be_empty
-      # snapshots_all.must_include snapshot
+      snapshots_all.wont_be_nil
+      snapshots_all.wont_be_empty
+      snapshots_all.must_include snapshot
       # Delete
       snapshot.destroy
       server.destroy
@@ -309,26 +309,26 @@ describe Fog::Compute::Proxmox do
                          ostemplate: ostemplate, password: 'proxmox01', rootfs: 'local-lvm:1' }
       # Check valid vmid
       valid = node.containers.id_valid? vmid
-      # valid.must_equal true
+      valid.must_equal true
       # Check not valid vmid
       valid = node.containers.id_valid? 99
-      # valid.must_equal false
+      valid.must_equal false
       # Create 1st time
       node.containers.create(container_hash)
       # Check already used vmid
       valid = node.containers.id_valid? vmid
-      # valid.must_equal false
+      valid.must_equal false
       # Clone container
       newid = node.containers.next_id
       # Get container
       container = node.containers.get vmid
-      # container.wont_be_nil
+      container.wont_be_nil
       # Backup it
       container.backup(compress: 'lzo')
       # Get this backup image
       # Find available backup volumes
       backup = container.backups.first
-      # container.wont_be_nil
+      container.wont_be_nil
       # Restore it
       container.restore(backup, storage: 'local-lvm')
       # Delete it
@@ -342,7 +342,7 @@ describe Fog::Compute::Proxmox do
       container.attach(mp0, options)
       # Fetch mount points
       mount_points = container.config.mount_points
-      # mount_points.wont_be_empty
+      mount_points.wont_be_empty
       mount_points.get('mp0').wont_be_nil
       # Remove mount points
       container.detach('mp0')
@@ -356,16 +356,16 @@ describe Fog::Compute::Proxmox do
       clone.template
       # Get clone disk image
       image = clone.images.first
-      # image.wont_be_nil
+      image.wont_be_nil
       # Delete clone
       clone.destroy
-      # proc do
-      #   node.containers.get newid
-      # end.must_raise Excon::Errors::InternalServerError
+      proc do
+        node.containers.get newid
+      end.must_raise Excon::Errors::InternalServerError
       # Create 2nd time must fails
-      # proc do
-      #   node.containers.create container_hash
-      # end.must_raise Excon::Errors::InternalServerError
+      proc do
+        node.containers.create container_hash
+      end.must_raise Excon::Errors::InternalServerError
       # Update config container
       # Resize rootfs container
       container.extend('rootfs', '+5M')
@@ -380,48 +380,48 @@ describe Fog::Compute::Proxmox do
       container.update(config_hash)
       # get container config
       config = container.config
-      # config.wont_be_nil
-      # config.identity.must_equal vmid
+      config.wont_be_nil
+      config.identity.must_equal vmid
       # Get a mac address
       mac_address = container.config.mac_addresses.first
-      # mac_address.wont_be_nil
+      mac_address.wont_be_nil
       # Fetch nics
       interfaces = container.config.interfaces
-      # interfaces.wont_be_empty
-      # interfaces.get('net0').wont_be_nil
+      interfaces.wont_be_empty
+      interfaces.get('net0').wont_be_nil
       # all containers
       containers_all = node.containers.all
-      # containers_all.wont_be_nil
-      # containers_all.wont_be_empty
-      # containers_all.must_include container
+      containers_all.wont_be_nil
+      containers_all.wont_be_empty
+      containers_all.first.vmid.must_equal container.vmid.to_s
       # Start container
       container.action('start')
       container.wait_for { ready? }
       status = container.ready?
-      # status.must_equal true
+      status.must_equal true
       # Suspend container not implemented
-      # proc do
-      #   container.action('suspend')
-      # end.must_raise Fog::Errors::Error
+      proc do
+        container.action('suspend')
+      end.must_raise Fog::Errors::Error
       # Resume container not implemented
-      # proc do
-      #   container.action('resume')
-      # end.must_raise Fog::Errors::Error
+      proc do
+        container.action('resume')
+      end.must_raise Fog::Errors::Error
       # Stop container
       container.action('stop')
       container.wait_for { container.status == 'stopped' }
       status = container.status
-      # status.must_equal 'stopped'
-      # proc do
-      #   container.action('hello')
-      # end.must_raise Fog::Errors::Error
+      status.must_equal 'stopped'
+      proc do
+        container.action('hello')
+      end.must_raise Fog::Errors::Error
       # Delete
       container.destroy
       # Delete container does not delete images
       storage.volumes.each(&:destroy)
-      # proc do
-      #   node.containers.get vmid
-      # end.must_raise Excon::Errors::InternalServerError
+      proc do
+        node.containers.get vmid
+      end.must_raise Excon::Errors::InternalServerError
     end
   end
 end