nise-bosh-vagrant 0.4.3 → 0.5

data/bin/nise-bosh-vagrant

@@ -2,6 +2,6 @@
 $:.push File.dirname(__FILE__) + '/../lib'
 
 require "rubygems"
-require "nise-bosh-vagrant/cli"
+require "nise-bosh-vagrant"
 
-NiseBOSHVagrant::CLI.start
+NiseBOSHVagrant::CLI.start

data/lib/nise-bosh-vagrant.rb

@@ -1,5 +1,7 @@
 require 'nise-bosh-vagrant/version'
 
-require 'nise-bosh-vagrant/runer'
+require 'nise-bosh-vagrant/runner'
 
-require 'nise-bosh-vagrant/cli'
+require 'nise-bosh-vagrant/cli'
+
+require 'nise-bosh-vagrant/network_interface'

data/lib/nise-bosh-vagrant/cli.rb

@@ -27,19 +27,25 @@ EOS
 				opt :memory, "Amount of memory to allocate to the VM in MB", :type => :integer, :default => 512
 				opt :preinstall, "Preinstall hook script", :type => :string
 				opt :postinstall, "Postinstall hook script", :type => :string
-				opt :address, "IP address for the VM", :type => :string, :default => "192.168.10.10"
+				opt :address, "IP address for the VM", :type => :string
+				opt :bridge, "Use bridged network interface"
 			end
 
 			Trollop::die :manifest, "must provide a manifest file" if opts[:manifest].nil?
 			Trollop::die :manifest, "must exist" unless File.exist?(opts[:manifest])
 			Trollop::die :preinstall, "must exist" unless opts[:preinstall].nil? || File.exist?(opts[:preinstall])
 			Trollop::die :postinstall, "must exist" unless opts[:postinstall].nil? || File.exist?(opts[:postinstall])
+			Trollop::die :address, "must exist" if opts[:bridge] && opts[:address].nil?
 
 			opts[:release] = ARGV[0]
 
 			if opts[:start]
 				opts[:install] = true
 			end
+			if ! opts[:bridge]
+				opts[:address] ||= "192.168.10.10"
+			end
+
 
 			# Generate, start and prepare a fresh VM
 			runner = NiseBOSHVagrant::Runner.new(opts)

data/lib/nise-bosh-vagrant/network_interface.rb

@@ -0,0 +1,58 @@
+module NiseBOSHVagrant
+
+  class NetworkInterface
+    def self.detect
+      device_list = `VBoxManage list bridgedifs`
+      raise "VBoxManage command not found" unless $?.success?
+
+      device_list.split(/^$\n/).inject([]) { |devices, device|
+        device = Hash[*device.split("\n").map { |line| line.match(/^([^:]+): *(.*)/).captures }.flatten]
+        kernel_device_name = device["Name"].split(":")[0]
+
+        ifconfig = `ifconfig #{kernel_device_name}`
+        if match = ifconfig.match(/inet ([.0-9]+) netmask 0x([0-9a-f]+) broadcast/) # BSD
+          address = match[1]
+          mask = match[2].unpack("a2a2a2a2").map { |block| block.hex }.join(".")
+          gateway = `route -n get -ifscope #{kernel_device_name} 0.0.0.0 | grep gateway | awk '{print $2}'`.strip
+        elsif match = ifconfig.match(/inet addr:([.0-9]+)  Bcast:[.0-9]+  Mask:([.0-9]+)/) # Linux
+          address = match[1]
+          mask = match[2]
+          gateway = `ip route show oif #{kernel_device_name} | grep 'default via' | awk '{print $3}'`.strip
+        else
+          next devices
+        end
+
+        devices << self.new(device["Name"], address, mask, gateway)
+        devices
+      }
+    end
+
+    def self.find(ip_address)
+      self.detect.find do |device|
+        device.same_network?(ip_address)
+      end
+    end
+
+    attr_reader :name, :vbox_name, :ip_address, :network_mask, :gateway
+
+    def initialize(vbox_name, ip_address, network_mask, gateway)
+      @vbox_name = vbox_name
+      @ip_address = ip_address
+      @network_mask = network_mask
+      @gateway = gateway
+    end
+
+    def name()
+      vbox_name.split(":")[0]
+    end
+
+    def same_network?(address)
+      (self.class.ip_address_to_int(@ip_address) & self.class.ip_address_to_int(@network_mask)) ==
+      (self.class.ip_address_to_int(address) & self.class.ip_address_to_int(@network_mask))
+    end
+
+    def self.ip_address_to_int(ip_address)
+        ip_address.split(".").map{|s|s.to_i}.pack("C*").unpack("N")[0]
+    end
+  end
+end

data/lib/nise-bosh-vagrant/runner.rb

@@ -19,6 +19,7 @@ module NiseBOSHVagrant
 			@postinstall_file = opts[:postinstall]
 			@memory = opts[:memory]
 			@ip_address = opts[:address]
+			@bridge = opts[:bridge]
 
 			copy_file_prefix = '.nise-bosh'
 			@copy_name = {
@@ -28,6 +29,10 @@ module NiseBOSHVagrant
 				:install_script => "#{copy_file_prefix}-install.sh",
 			}
 
+			if @bridge
+				@bridge_if = NetworkInterface.find(@ip_address)
+				raise "No available interface found" if @bridge_if.nil?
+			end
 		end
 
 		def generate_vagrantfile(output_path=@vagrantfile_path)

data/lib/nise-bosh-vagrant/version.rb

@@ -1,3 +1,3 @@
 module NiseBOSHVagrant
-  VERSION = "0.4.3"
+  VERSION = "0.5"
 end

data/resources/Vagrantfile.erb

@@ -9,7 +9,12 @@ Vagrant.configure("2") do |config|
     v.customize ["modifyvm", :id, "--memory", "<%= @memory %>"]
   end
 
+<% if @bridge %>
+  config.vm.network :public_network, :bridge => "<%= @bridge_if.vbox_name %>"
+  config.vm.provision :shell, :path => "<%= File.expand_path("../scripts/bridge_interface.sh", __FILE__) %>", :args =>  "<%= @ip_address %> <%= @bridge_if.network_mask %> <%= @bridge_if.gateway %>"
+<% else %>
   config.vm.network :private_network, ip: "<%= @ip_address %>"
+<% end %>
 
   <% if not @nise_path.nil? %>config.vm.synced_folder "<%= @nise_path %>", "/home/vagrant/nise_bosh"<% end %>
   config.vm.synced_folder "./", "/home/vagrant/release"

data/scripts/bridge_interface.sh

@@ -0,0 +1,25 @@
+#!/bin/sh
+sudo /sbin/ifconfig eth1 ${1} netmask ${2} up
+sudo /sbin/route add default gw ${3} eth1
+# drop the defalt gataway of eth0
+sudo /sbin/route del default dev eth0
+
+sudo cat <<EOF | sudo tee /etc/network/interfaces > /dev/null
+# Generated by nise-bosh-vagrant
+
+# The loopback network interface
+auto lo
+iface lo inet loopback
+
+# The primary network interface
+auto eth0
+iface eth0 inet dhcp
+    post-up /bin/sleep 5; /sbin/route del default dev \$IFACE
+
+# Bridge interface
+auto eth1
+iface eth1 inet static
+    address ${1}
+    netmask ${2}
+    gateway ${3}
+EOF

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nise-bosh-vagrant
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: '0.5'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-30 00:00:00.000000000 Z
+date: 2013-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trollop
@@ -43,11 +43,13 @@ files:
 - bin/nise-bosh-vagrant
 - lib/nise-bosh-vagrant.rb
 - lib/nise-bosh-vagrant/cli.rb
+- lib/nise-bosh-vagrant/network_interface.rb
 - lib/nise-bosh-vagrant/runner.rb
 - lib/nise-bosh-vagrant/version.rb
 - nise-bosh-vagrant.gemspec
 - resources/Vagrantfile.erb
 - resources/install_release.sh.erb
+- scripts/bridge_interface.sh
 - scripts/prepare.sh
 - scripts/start.sh
 - scripts/stop.sh
@@ -65,7 +67,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 32819581895332205
+      hash: -3310966476080707238
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: