vagrant-xenserver 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d1fce0683758256046dd20b234d1660c68ad1bed
-  data.tar.gz: d86bc2da6688246db9f00490470b5b6babc58b1e
+  metadata.gz: 911987b6727c2c821c643fbd857f82d7022c7f48
+  data.tar.gz: 31433e632ad1fafdedeb1a83c735b64825cc20b3
 SHA512:
-  metadata.gz: 7249ed71e08d00bfd2bc5ffc7aa0f24972039736c24470c0641998c8afc73eaec005e529b6b6e43adfe6fa2ce5ebd6280960fdc39cd7abe39fd5a0e42fb24df4
-  data.tar.gz: 31511d3e3dd0a97ac137b151573d3ca9ea01c0e09cf71a37c8fcb37e480d9d2f384f9c313f267e5cb92b9cfc792baf8bb211c81c9ae3f87addf5dd5aa5da8586
+  metadata.gz: 18b372c6454cad0ee1ad976d5d920b90e6f201955c6464cf2a304eedf3d9171c8665e9ca195b2a688388ea0c88041b5950e983ae40b53e5b669f75bae1cdff7f
+  data.tar.gz: a0ae80e01bbc30ed5299828007e51022e9a1b521eac72565e414bf02fd097919a8a744848823ce5ff627f12c9a1fad0d2d9669a31620cc8726336a660dcd2762

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.0.4 (10 July 2014)
+
+* Enable NFS synced folders
+* Add the halt action
+
 # 0.0.3 (8 July 2014)
 
 * Enable vagrant ssh -c

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

@@ -3,6 +3,7 @@ require "xmlrpc/client"
 require "vagrant-xenserver/util/uploader"
 require "rexml/document"
 require "json"
+require "etc"
 
 module VagrantPlugins
   module XenServer
@@ -22,10 +23,17 @@ module VagrantPlugins
           (himn_ref,himn_rec) = himn
 
           @logger.info("himn_uuid="+himn_rec['uuid'])
-
+          
+          username = Etc.getlogin
+          
           oim = env[:xc].call("VM.get_by_name_label",env[:session],"Other install media")['Value'][0]
 
-          vm_ref = env[:xc].call("VM.clone",env[:session],oim,env[:machine].box.name.to_s)['Value']
+          box_name = env[:machine].box.name.to_s
+          box_version = env[:machine].box.version.to_s
+
+          vm_name = "#{username}/#{box_name}/#{box_version}"
+
+          vm_ref = env[:xc].call("VM.clone",env[:session],oim,vm_name)['Value']
 
           vbd_record = {
             'VM' => vm_ref,

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

@@ -0,0 +1,27 @@
+require "log4r"
+require "xmlrpc/client"
+
+module VagrantPlugins
+  module XenServer
+    module Action
+      class HaltVM
+        def initialize(app, env)
+          @app = app
+          @logger = Log4r::Logger.new("vagrant::xenserver::actions::start_vm")
+        end
+        
+        def call(env)
+          myvm = env[:machine].id
+          
+          shutdown_result = env[:xc].call("VM.clean_shutdown",env[:session],myvm)
+
+          if shutdown_result["Status"] != "Success"
+            raise Errors::APIError
+          end
+          
+          @app.call env
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,51 @@
+require 'nokogiri'
+require 'socket'
+
+module VagrantPlugins
+  module XenServer
+    module Action
+      class PrepareNFSSettings
+        include Vagrant::Action::Builtin::MixinSyncedFolders
+        
+        def initialize(app,env)
+          @app = app
+          @logger = Log4r::Logger.new("vagrant::action::vm::nfs")
+        end
+
+        def call(env)
+          @machine = env[:machine]
+          @app.call(env)          
+
+          if using_nfs?
+            @logger.info("Using NFS, preparing NFS settings by reading host IP and machine IP")
+            env[:nfs_host_ip]    = read_host_ip(env[:machine],env)
+            env[:nfs_machine_ip] = env[:xs_host_ip]
+
+            @logger.info("host IP: #{env[:nfs_host_ip]} machine IP: #{env[:nfs_machine_ip]}")
+
+            raise Vagrant::Errors::NFSNoHostonlyNetwork if !env[:nfs_machine_ip] || !env[:nfs_host_ip]
+          end
+        end
+
+        # We're using NFS if we have any synced folder with NFS configured. If
+        # we are not using NFS we don't need to do the extra work to
+        # populate these fields in the environment.
+        def using_nfs?
+          !!synced_folders(@machine)[:nfs]
+        end
+
+        # Returns the IP address of the interface that will route to the xs_host
+        #
+        # @param [Machine] machine
+        # @return [String]
+        def read_host_ip(machine,env)
+          ip = Socket.getaddrinfo(env[:machine].provider_config.xs_host,nil)[0][2]
+          env[:xs_host_ip] = ip
+          re = /src ([0-9\.]+)/
+          match = `ip route get to #{ip} | head -n 1`.match re
+          match[1]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,17 @@
+module VagrantPlugins
+  module XenServer
+    module Action
+      class PrepareNFSValidIds
+        def initialize(app, env)
+          @app = app
+          @logger = Log4r::Logger.new("vagrant::xenserver::action::vm::nfs")
+        end
+
+        def call(env)
+          env[:nfs_valid_ids] = env[:xc].call("VM.get_all",env[:session])['Value']
+          @app.call(env)
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-xenserver/action.rb

@@ -7,6 +7,18 @@ module VagrantPlugins
       include Vagrant::Action::Builtin
       @logger = Log4r::Logger.new('vagrant::xenserver::action')
 
+      def self.action_boot
+	Vagrant::Action::Builder.new.tap do |b| 
+          b.use Provision
+          b.use PrepareNFSValidIds
+          b.use SyncedFolderCleanup
+          b.use SyncedFolders
+          b.use StartVM
+          b.use WaitForCommunicator, ["Running"]
+          b.use PrepareNFSSettings         
+        end
+      end
+      
       def self.action_up
 	Vagrant::Action::Builder.new.tap do |b|
           b.use HandleBox
@@ -18,14 +30,27 @@ module VagrantPlugins
               b2.use UploadVHD
               b2.use CloneDisk
               b2.use CreateVM
-              b2.use Provision
-              b2.use StartVM
-              b2.use WaitForCommunicator, ["Running"]
-
-#              b2.use ForwardPorts
-#              b2.use PrepareNFSSettings
-#              b2.use ShareFolders
-#              b2.use SetHostname
+            end
+            b2.use action_boot
+          end
+        end
+      end
+      
+      def self.action_halt
+        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 HaltVM            
             end
           end
         end
@@ -39,7 +64,6 @@ module VagrantPlugins
               @logger.info "MessageNotCreated"
               next
             end
-            
             b2.use ConnectXS
             b2.use DestroyVM
           end
@@ -149,7 +173,10 @@ module VagrantPlugins
       autoload :CreateVM, action_root.join('create_vm')
       autoload :DestroyVM, action_root.join('destroy_vm')
       autoload :StartVM, action_root.join('start_vm')
+      autoload :HaltVM, action_root.join('halt_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')
     end
   end
 end

data/lib/vagrant-xenserver/version.rb

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

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-xenserver
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Jon Ludlam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-08 00:00:00.000000000 Z
+date: 2014-07-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Enables Vagrant to manage XenServers.
@@ -43,9 +43,12 @@ files:
 - lib/vagrant-xenserver/action/create_vm.rb
 - lib/vagrant-xenserver/action/destroy_vm.rb
 - lib/vagrant-xenserver/action/dummy.rb
+- 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/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/start_vm.rb
@@ -70,12 +73,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []