vagrant-xenserver 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 911987b6727c2c821c643fbd857f82d7022c7f48
-  data.tar.gz: 31433e632ad1fafdedeb1a83c735b64825cc20b3
+  metadata.gz: b84e9354ef528f4b70fd544bd1c5a83c791db119
+  data.tar.gz: 1c11dfe1f8bcae0c9285e66053c64ce01bfec15e
 SHA512:
-  metadata.gz: 18b372c6454cad0ee1ad976d5d920b90e6f201955c6464cf2a304eedf3d9171c8665e9ca195b2a688388ea0c88041b5950e983ae40b53e5b669f75bae1cdff7f
-  data.tar.gz: a0ae80e01bbc30ed5299828007e51022e9a1b521eac72565e414bf02fd097919a8a744848823ce5ff627f12c9a1fad0d2d9669a31620cc8726336a660dcd2762
+  metadata.gz: 974b740f5427008c0584d8f60c3cb664971ab9bd1e68b57f3844bb6381b29d6a8b240da8981d15a70883edb7aaacc011ec663159f50a3e772a84daacabbace4d
+  data.tar.gz: b862e19f37248b5a291ec4a64f69fffaa14e3cbc3e8c231b20150581a8c50009467b56f1f0ce33c3cb5ea1abf74d7d2924d0984dd897ca3caad2c6a6273a205c

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.0.5 (5 September 2014)
+
+* Upload VHDs over https rather than http
+* Suspend/Resume (Simon Beaumont)
+
 # 0.0.4 (10 July 2014)
 
 * Enable NFS synced folders

data/README.md

@@ -25,8 +25,7 @@ echo 1 > /proc/sys/net/ipv4/ip_forward
 /sbin/iptables -t nat -A POSTROUTING -o xenbr0 -j MASQUERADE
 /sbin/iptables -A INPUT -i xenbr0 -p tcp -m tcp --dport 53 -j ACCEPT
 /sbin/iptables -A INPUT -i xenbr0 -p udp -m udp --dport 53 -j ACCEPT
-/sbin/iptables -A FORWARD -i xenbr0 -o xenapi -m state --state
-RELATED,ESTABLISHED -j ACCEPT
+/sbin/iptables -A FORWARD -i xenbr0 -o xenapi -m state --state RELATED,ESTABLISHED -j ACCEPT
 /sbin/iptables -A FORWARD -i xenapi -o xenbr0 -j ACCEPT
 ```
 

data/lib/vagrant-xenserver/action/clone_disk.rb

@@ -10,7 +10,7 @@ module VagrantPlugins
       class CloneDisk
         def initialize(app, env)
           @app = app
-          @logger = Log4r::Logger.new("vagrant::xenserver::actions::upload_xva")
+          @logger = Log4r::Logger.new("vagrant::xenserver::actions::clone_disk")
         end
         
         def call(env)

data/lib/vagrant-xenserver/action/halt_vm.rb

@@ -7,7 +7,7 @@ module VagrantPlugins
       class HaltVM
         def initialize(app, env)
           @app = app
-          @logger = Log4r::Logger.new("vagrant::xenserver::actions::start_vm")
+          @logger = Log4r::Logger.new("vagrant::xenserver::actions::halt_vm")
         end
         
         def call(env)

data/lib/vagrant-xenserver/action/is_suspended.rb

@@ -0,0 +1,20 @@
+require 'log4r'
+
+module VagrantPlugins
+  module XenServer
+    module Action
+      class IsSuspended
+        def initialize(app, env)
+          @app = app
+          @logger = Log4r::Logger.new('vagrant_xenserver::action::is_suspended')
+        end
+
+        def call(env)
+          @logger.info("env[:machine].state.id="+env[:machine].state.id.to_s)
+          env[:result] = env[:machine].state.id == 'Suspended'
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-xenserver/action/maybe_upload_disk.rb

@@ -9,7 +9,7 @@ module VagrantPlugins
       class UploadXVA
         def initialize(app, env)
           @app = app
-          @logger = Log4r::Logger.new("vagrant::xenserver::actions::upload_xva")
+          @logger = Log4r::Logger.new("vagrant::xenserver::actions::maybe_upload_disk")
         end
         
         def call(env)
@@ -31,7 +31,7 @@ module VagrantPlugins
 
           task = task_result["Value"]
 
-          url = "http://#{hostname}/import?session_id=#{session}&task_id=#{task}"
+          url = "https://#{hostname}/import?session_id=#{session}&task_id=#{task}"
 
           uploader_options = {}
           uploader_options[:ui] = env[:ui]

data/lib/vagrant-xenserver/action/read_state.rb

@@ -6,7 +6,7 @@ module VagrantPlugins
       class ReadState
         def initialize(app, env)
           @app = app
-          @logger = Log4r::Logger.new("vagrant::xenserver::actions::readstate")
+          @logger = Log4r::Logger.new("vagrant::xenserver::actions::read_state")
         end
 
         def call(env)

data/lib/vagrant-xenserver/action/resume_vm.rb

@@ -0,0 +1,30 @@
+require "log4r"
+require "xmlrpc/client"
+
+module VagrantPlugins
+  module XenServer
+    module Action
+      class ResumeVM
+        def initialize(app, env)
+          @app = app
+          @logger = Log4r::Logger.new("vagrant::xenserver::actions::resume_vm")
+        end
+        
+        def call(env)
+          myvm = env[:machine].id
+          
+          resume_task = env[:xc].call("Async.VM.resume",env[:session],myvm,false,false)['Value']
+          while env[:xc].call("task.get_status",env[:session],resume_task)['Value'] == 'pending' do
+              sleep 1
+          end
+          resume_result = env[:xc].call("task.get_status",env[:session],resume_task)['Value']
+          if resume_result != "success"
+            raise Errors::APIError
+          end
+          
+          @app.call env
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-xenserver/action/suspend_vm.rb

@@ -0,0 +1,30 @@
+require "log4r"
+require "xmlrpc/client"
+
+module VagrantPlugins
+  module XenServer
+    module Action
+      class SuspendVM
+        def initialize(app, env)
+          @app = app
+          @logger = Log4r::Logger.new("vagrant::xenserver::actions::suspend_vm")
+        end
+        
+        def call(env)
+          myvm = env[:machine].id
+          
+          suspend_task = env[:xc].call("Async.VM.suspend",env[:session],myvm)['Value']
+          while env[:xc].call("task.get_status",env[:session],suspend_task)['Value'] == 'pending' do
+              sleep 1
+          end
+          suspend_result = env[:xc].call("task.get_status",env[:session],suspend_task)['Value']
+          if suspend_result != "success"
+            raise Errors::APIError
+          end
+          
+          @app.call env
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-xenserver/action/upload_vhd.rb

@@ -10,7 +10,7 @@ module VagrantPlugins
       class UploadVHD
         def initialize(app, env)
           @app = app
-          @logger = Log4r::Logger.new("vagrant::xenserver::actions::upload_xva")
+          @logger = Log4r::Logger.new("vagrant::xenserver::actions::upload_vhd")
         end
         
         def call(env)

data/lib/vagrant-xenserver/action.rb

@@ -56,6 +56,46 @@ module VagrantPlugins
         end
       end
 
+      def self.action_suspend
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use Call, IsCreated do |env, b2|
+            if !env[:result]
+              @logger.info "MessageNotCreated"
+              next
+            end
+            b2.use ConnectXS
+            b2.use Call, IsRunning do |env, b3|
+              if !env[:result]
+                @logger.info "Not running"
+                next
+              end
+              b3.use SuspendVM
+            end
+          end
+        end
+      end
+
+      def self.action_resume
+        Vagrant::Action::Builder.new.tap do |b|
+          b.use ConfigValidate
+          b.use Call, IsCreated do |env, b2|
+            if !env[:result]
+              @logger.info "MessageNotCreated"
+              next
+            end
+            b2.use ConnectXS
+            b2.use Call, IsSuspended do |env, b3|
+              if !env[:result]
+                @logger.info "Not suspended"
+                next
+              end
+              b3.use ResumeVM
+            end
+          end
+        end
+      end
+
       def self.action_destroy
         Vagrant::Action::Builder.new.tap do |b|
           b.use ConfigValidate
@@ -167,6 +207,7 @@ module VagrantPlugins
       autoload :ReadState, action_root.join('read_state')
       autoload :IsCreated, action_root.join('is_created')
       autoload :IsRunning, action_root.join('is_running')
+      autoload :IsSuspended, action_root.join('is_suspended')
       autoload :UploadXVA, action_root.join('upload_xva')
       autoload :UploadVHD, action_root.join('upload_vhd')
       autoload :CloneDisk, action_root.join('clone_disk')
@@ -174,6 +215,8 @@ module VagrantPlugins
       autoload :DestroyVM, action_root.join('destroy_vm')
       autoload :StartVM, action_root.join('start_vm')
       autoload :HaltVM, action_root.join('halt_vm')
+      autoload :SuspendVM, action_root.join('suspend_vm')
+      autoload :ResumeVM, action_root.join('resume_vm')
       autoload :ReadSSHInfo, action_root.join('read_ssh_info')
       autoload :PrepareNFSSettings, action_root.join('prepare_nfs_settings')
       autoload :PrepareNFSValidIds, action_root.join('prepare_nfs_valid_ids')

data/lib/vagrant-xenserver/version.rb

@@ -1,6 +1,6 @@
 module VagrantPlugins
   module XenServer
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-xenserver
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Jon Ludlam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-10 00:00:00.000000000 Z
+date: 2014-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -46,12 +46,15 @@ files:
 - lib/vagrant-xenserver/action/halt_vm.rb
 - lib/vagrant-xenserver/action/is_created.rb
 - lib/vagrant-xenserver/action/is_running.rb
+- lib/vagrant-xenserver/action/is_suspended.rb
 - lib/vagrant-xenserver/action/maybe_upload_disk.rb
 - lib/vagrant-xenserver/action/prepare_nfs_settings.rb
 - lib/vagrant-xenserver/action/prepare_nfs_valid_ids.rb
 - lib/vagrant-xenserver/action/read_ssh_info.rb
 - lib/vagrant-xenserver/action/read_state.rb
+- lib/vagrant-xenserver/action/resume_vm.rb
 - lib/vagrant-xenserver/action/start_vm.rb
+- lib/vagrant-xenserver/action/suspend_vm.rb
 - lib/vagrant-xenserver/action/upload_vhd.rb
 - lib/vagrant-xenserver/action/upload_xva.rb
 - lib/vagrant-xenserver/config.rb