vagrant-xenserver 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c36e407b54f5793660b1d301dca4043ab1027588
-  data.tar.gz: a36f6232bc1afee81fbeb034a38a1b9954fde56b
+  metadata.gz: 60d23b13ffeb8978a9263bd5becf5f4c5c03dfc0
+  data.tar.gz: 25765e00e6391ff129ac939262b7efc75211dfd9
 SHA512:
-  metadata.gz: 0d0d585621e5cf7e9f0b9d9b6a73b1c264c4fa656788dd95fe8a1cc9240a162c65bc8c31b0c66f627b17b4dfcb236181c92fc44e5a4c71a3982ff2727845aac8
-  data.tar.gz: beaf065687e10e559d7eb529e4ea727f454655b0fa7340baac3fe3304f7d8bfd365415ca3078cd6f50fcb4262e0726b40f1902be5f09925d6ef5f9b793868296
+  metadata.gz: 64d00ae9d0fff98f588bd479b8c66b3af551bc274cbf37a398ad192c0c3c751d08c4d9e23dd2fdeb6a487328b7763bd4103c16ad8d950d883abba68909baeef4
+  data.tar.gz: 5dd5ac801e0b97d7adc62da6123488215723d913d72b3bc3ab8c62aabf957e6d9fcca2fb443eb2850eaa36c2baca0de1506b0eb0ed7be22d68185a223468ed48

data/README.md

@@ -9,8 +9,6 @@ control and provision machines on a XenServer host.
 ## Installation
 ```shell
 vagrant plugin install vagrant-xenserver
-# Make your linux box look like a Mac :) (maybe)
-sudo ln -s /bin/tar /bin/bsdtar
 ```
 
 ## XenServer host setup
@@ -20,7 +18,7 @@ N.B. Currently this will only work on a trunk build of XenServer:
 yum install --enablerepo=base,extras --disablerepo=citrix -y nc
 # Setup NAT - NB, this _disable the firewall_ - be careful!
 echo 1 > /proc/sys/net/ipv4/ip_forward
-/sbin/iptables -F INPUT
+/sbin/iptables -F
 
 /sbin/iptables -t nat -A POSTROUTING -o xenbr0 -j MASQUERADE
 /sbin/iptables -A INPUT -i xenbr0 -p tcp -m tcp --dport 53 -j ACCEPT

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

@@ -0,0 +1,55 @@
+require "log4r"
+require "xmlrpc/client"
+
+module VagrantPlugins
+  module XenServer
+    module Action
+      class CreateVIFs
+        def initialize(app, env)
+          @app = app
+          @logger = Log4r::Logger.new("vagrant::xenserver::actions::create_vifs")
+        end
+        
+        def call(env)
+          myvm = env[:machine].id
+
+          env[:machine].config.vm.networks.each do |type, options|
+            next if type == :forwarded_port
+            @logger.info "got an interface: #{type} #{options}"
+
+            if type == :public_network then
+              bridge = options[:bridge]
+
+              networks = env[:xc].call("network.get_all_records",env[:session])['Value']
+
+              netrefrec = networks.find { |ref,net| net['bridge']==bridge }
+              (net_ref,net_rec) = netrefrec
+
+              vif_devices = env[:xc].call("VM.get_allowed_VIF_devices",env[:session],myvm)['Value']
+              
+              vif_record = {
+                'VM' => myvm,
+                'network' => net_ref,
+                'device' => vif_devices[0],
+                'MAC' => '',
+                'MTU' => '1500',
+                'other_config' => {},
+                'qos_algorithm_type' => '',
+                'qos_algorithm_params' => {},
+                'locking_mode' => 'network_default',
+                'ipv4_allowed' => [],
+                'ipv6_allowed' => []
+              }
+              
+              vif_res = env[:xc].call("VIF.create",env[:session],vif_record)
+          
+              @logger.info("vif_res=" + vif_res.to_s)
+            end
+          end
+
+          @app.call env
+        end
+      end
+    end
+  end
+end

data/lib/vagrant-xenserver/action.rb

@@ -30,6 +30,7 @@ module VagrantPlugins
               b2.use UploadVHD
               b2.use CloneDisk
               b2.use CreateVM
+              b2.use CreateVIFs
             end
             b2.use action_boot
           end
@@ -106,6 +107,9 @@ module VagrantPlugins
             end
             b2.use ConnectXS
             b2.use DestroyVM
+            b2.use ProvisionerCleanup
+            b2.use PrepareNFSValidIds
+            b2.use SyncedFolderCleanup
           end
         end
       end
@@ -202,6 +206,7 @@ module VagrantPlugins
       end
 
       action_root = Pathname.new(File.expand_path('../action', __FILE__))
+      autoload :CreateVIFs, action_root.join("create_vifs")
       autoload :ConnectXS, action_root.join("connect_xs")
       autoload :DummyMessage, action_root.join('dummy')
       autoload :ReadState, action_root.join('read_state')

data/lib/vagrant-xenserver/version.rb

@@ -1,6 +1,6 @@
 module VagrantPlugins
   module XenServer
-    VERSION = "0.0.9"
+    VERSION = "0.0.10"
   end
 end
 

data/vagrant-xenserver.gemspec

@@ -13,6 +13,8 @@ Gem::Specification.new do |s|
   s.description   = "Enables Vagrant to manage XenServers."
 
   s.add_development_dependency "rake"
+  s.add_runtime_dependency "nokogiri", "~> 1.6.3"
+  s.add_runtime_dependency "json"
 
   s.files         = `git ls-files`.split($\)
   s.executables   = [] # gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }

metadata

@@ -1,27 +1,55 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-xenserver
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Jon Ludlam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-18 00:00:00.000000000 Z
+date: 2015-07-21 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'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.6.3
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Enables Vagrant to manage XenServers.
@@ -40,6 +68,7 @@ files:
 - lib/vagrant-xenserver/action.rb
 - lib/vagrant-xenserver/action/clone_disk.rb
 - lib/vagrant-xenserver/action/connect_xs.rb
+- lib/vagrant-xenserver/action/create_vifs.rb
 - lib/vagrant-xenserver/action/create_vm.rb
 - lib/vagrant-xenserver/action/destroy_vm.rb
 - lib/vagrant-xenserver/action/dummy.rb
@@ -76,17 +105,17 @@ 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: []
 rubyforge_project: 
-rubygems_version: 2.4.1
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: Enables Vagrant to manage XenServers.