phut 0.6.2 → 0.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cc1003ee6a5a95a02df6ec9e078d0a0af4d28695
-  data.tar.gz: 6edafd0300df63624d9bb2a55c2a4a8bc7f6e613
+  metadata.gz: 4760c8bc9db6a1b1f752aa738aa5eb844c8059e4
+  data.tar.gz: f5d34bbee5fdeb48167a8e7f2170a2193fbe073c
 SHA512:
-  metadata.gz: 3f1005ad8db1a26a5879d5c5e3e1e9d1cebf58bdf9ccf5a3fbd6ea4380719ebbf17878d62db89a0a7add60c4b2c019fc66d95a3a06d3cfdb6157635afde89222
-  data.tar.gz: 37a6403bf6e10848fe58bb779156bdcb5c8ffc27290e2ea94bf037de78b94e1d9b3acc7870eebbd3e5d10a1fc924bd0e60e02ebca26674451fc07795dfda6322
+  metadata.gz: 45d1513fcbbeba14e3b8f83c3d3842350721db909edaaa24d42e6dbce603957f8b90fa4701690086cdae7864c187f996c852db7163d4860342fc7c757a523aaf
+  data.tar.gz: 68877bd84eb271c7e54a0bec0e2860a0b1239f0a45ae55389f564531b8ae1db4721acde1a223b69c8a6ec4994b1a904d0a4a47e306cfaa5214e2af710bc7d6f2

data/CHANGELOG.md

@@ -3,6 +3,11 @@
 ## develop (unreleased)
 
 
+## 0.6.3 (6/4/2015)
+### Bugs fixed
+* [#23](https://github.com/trema/phut/pull/23): Fix vhost restart failure.
+
+
 ## 0.6.2 (6/3/2015)
 ### Bugs fixed
 * Delete a vhost.*.ctl socket file after the vhost process is killed.

data/bin/phut

@@ -53,10 +53,8 @@ module Phut
     command :run do |c|
       c.desc 'Location to put pid files'
       c.flag [:p, :pid_dir], default_value: Phut.pid_dir
-
       c.desc 'Location to put log files'
       c.flag [:l, :log_dir], default_value: Phut.log_dir
-
       c.desc 'Location to put socket files'
       c.flag [:s, :socket_dir], default_value: Phut.socket_dir
 

data/lib/phut/configuration.rb

@@ -4,8 +4,6 @@ require 'phut/open_vswitch'
 module Phut
   # Parsed DSL data.
   class Configuration
-    attr_reader :links
-
     def initialize(logger = NullLogger.new)
       @all = {}
       @links = []
@@ -28,12 +26,10 @@ module Phut
     end
     # rubocop:enable MethodLength
 
-    def find_network_device_by_name(name)
-      @links.each do |each|
-        device = each.find_network_device_by_name(name)
-        return device if device
-      end
-      fail "No network device found for #{name}."
+    def update_connections
+      update_vswitch_ports
+      update_vhost_interfaces
+      self
     end
 
     def vswitches
@@ -45,7 +41,7 @@ module Phut
     end
 
     def run
-      links.each(&:run)
+      @links.each(&:run)
       vhosts.each { |each| each.run vhosts }
       vswitches.each(&:run)
     end
@@ -53,7 +49,7 @@ module Phut
     def stop
       vswitches.each(&:maybe_stop)
       vhosts.each(&:maybe_stop)
-      links.each(&:maybe_stop)
+      @links.each(&:maybe_stop)
     end
 
     def add_vswitch(name, attrs)
@@ -78,5 +74,35 @@ module Phut
       conflict = @all[name]
       fail "The name #{name} conflicts with #{conflict}." if conflict
     end
+
+    def update_vswitch_ports
+      @links.each do |each|
+        maybe_connect_link_to_vswitch each
+      end
+    end
+
+    def maybe_connect_link_to_vswitch(link)
+      vswitches_connected_to(link).each do |each|
+        each.add_network_device link.find_network_device(each)
+      end
+    end
+
+    def vswitches_connected_to(link)
+      vswitches.select { |each| link.connect_to?(each) }
+    end
+
+    def update_vhost_interfaces
+      vhosts.each do |each|
+        each.network_device = find_network_device(each)
+      end
+    end
+
+    def find_network_device(vhost)
+      @links.each do |each|
+        device = each.find_network_device(vhost)
+        return device if device
+      end
+      fail "No network device found for #{vhost}."
+    end
   end
 end

data/lib/phut/open_vswitch.rb

@@ -77,6 +77,11 @@ module Phut
       system "sudo ovs-vsctl br-exists #{bridge_name}"
     end
 
+    def add_network_device(network_device)
+      network_device.port_number = @network_devices.size + 1
+      @network_devices << network_device
+    end
+
     private
 
     def bridge_name

data/lib/phut/parser.rb

@@ -6,43 +6,14 @@ module Phut
   # Configuration DSL parser.
   class Parser
     def initialize(logger = NullLogger.new)
-      @config = Configuration.new(logger)
-      @port_number = Hash.new(0)
+      @logger = logger
     end
 
     def parse(file)
-      Syntax.new(@config).instance_eval IO.read(file), file
-      connect_links_to_switches
-      connect_links_to_vhosts
-      @config
-    end
-
-    private
-
-    def connect_links_to_switches
-      @config.links.each do |each|
-        maybe_assign_network_device_to_vswitch each
-      end
-    end
-
-    def connect_links_to_vhosts
-      @config.vhosts.each do |each|
-        each.network_device = @config.find_network_device_by_name(each.name)
+      Configuration.new(@logger).tap do |configuration|
+        Syntax.new(configuration).instance_eval IO.read(file), file
+        configuration.update_connections
       end
     end
-
-    def maybe_assign_network_device_to_vswitch(link)
-      @config.vswitches.each do |each|
-        switch_name = each.name
-        network_device = link.find_network_device_by_name(switch_name)
-        next unless network_device
-        network_device.port_number = new_port_number(switch_name)
-        each.network_devices << network_device
-      end
-    end
-
-    def new_port_number(switch_name)
-      @port_number[switch_name] += 1
-    end
   end
 end

data/lib/phut/version.rb

@@ -1,4 +1,4 @@
 # Base module.
 module Phut
-  VERSION = '0.6.2'
+  VERSION = '0.6.3'
 end

data/lib/phut/vhost.rb

@@ -30,7 +30,8 @@ module Phut
     end
 
     def run(all_hosts = [])
-      sh "rvmsudo vhost run #{run_options all_hosts}"
+      @all_hosts ||= all_hosts
+      sh "rvmsudo vhost run #{run_options}"
     end
 
     def stop
@@ -49,20 +50,20 @@ module Phut
 
     private
 
-    def run_options(all_hosts)
+    def run_options
       ["-n #{name}",
        "-I #{@network_device}",
        "-i #{@ip_address}",
        "-m #{@mac_address}",
-       "-a #{arp_entries all_hosts}",
+       "-a #{arp_entries}",
        @promisc ? '--promisc' : nil,
        "-P #{Phut.pid_dir}",
        "-L #{Phut.log_dir}",
        "-S #{Phut.socket_dir}"].compact.join(' ')
     end
 
-    def arp_entries(all_hosts)
-      all_hosts.map do |each|
+    def arp_entries
+      @all_hosts.map do |each|
         "#{each.ip_address}/#{each.mac_address}"
       end.join(',')
     end

data/lib/phut/vhost_daemon.rb

@@ -49,7 +49,7 @@ module Phut
     private
 
     def start_logging
-      @logger = Logger.new(log_file)
+      @logger = Logger.new(File.open(log_file, 'a'))
       @logger.info("#{@options.fetch(:name)} started " \
                    "(interface = #{@options.fetch(:interface)}," \
                    " IP address = #{@options.fetch(:ip_address)}," \

data/lib/phut/virtual_link.rb

@@ -17,6 +17,10 @@ module Phut
         @name.gsub('.', '_') + port_number_string
       end
 
+      def inspect
+        to_s
+      end
+
       private
 
       def port_number_string
@@ -58,11 +62,17 @@ module Phut
     end
 
     def up?
-      /^#{@device_a}\s+Link encap:Ethernet/ =~ `ifconfig -a`
+      /^#{@device_a}\s+Link encap:Ethernet/ =~ `ifconfig -a` || false
     end
 
-    def find_network_device_by_name(name)
-      [@device_a, @device_b].find { |each| each.name == name }
+    def connect_to?(vswitch)
+      find_network_device(vswitch) || false
+    end
+
+    def find_network_device(vswitch_or_vhost)
+      [@device_a, @device_b].detect do |each|
+        each.name == vswitch_or_vhost.name
+      end
     end
 
     private

data/spec/phut/parser_spec.rb

@@ -3,16 +3,18 @@ require 'stringio'
 
 describe Phut::Parser do
   describe '#parse' do
-    Given { allow(IO).to receive(:read).with('CONFIG_FILE').and_return(string) }
-    Given(:config) { Phut::Parser.new.parse 'CONFIG_FILE' }
+    Given do
+      allow(IO).to receive(:read).with('CONFIGURATION_FILE').and_return(string)
+    end
+    Given(:configuration) { Phut::Parser.new.parse 'CONFIGURATION_FILE' }
 
     context "with 'vswitch { dpid '0xabc' }'" do
       When(:string) { "vswitch { dpid '0xabc' }" }
 
       describe '#vswitch' do
-        Then { config.vswitches.size == 1 }
-        Then { config.fetch('0xabc').datapath_id == 0xabc }
-        Then { config.fetch('0xabc').dpid == 0xabc }
+        Then { configuration.vswitches.size == 1 }
+        Then { configuration.fetch('0xabc').datapath_id == 0xabc }
+        Then { configuration.fetch('0xabc').dpid == 0xabc }
       end
     end
 
@@ -20,9 +22,9 @@ describe Phut::Parser do
       When(:string) { "vswitch { datapath_id '0xabc' }" }
 
       describe '#vswitch' do
-        Then { config.vswitches.size == 1 }
-        Then { config.fetch('0xabc').dpid == 0xabc }
-        Then { config.fetch('0xabc').datapath_id == 0xabc }
+        Then { configuration.vswitches.size == 1 }
+        Then { configuration.fetch('0xabc').dpid == 0xabc }
+        Then { configuration.fetch('0xabc').datapath_id == 0xabc }
       end
     end
 
@@ -30,39 +32,39 @@ describe Phut::Parser do
       When(:string) { "vswitch('my_controller') { dpid '0xabc' }" }
 
       describe '#vswitch' do
-        Then { config.vswitches.size == 1 }
-        Then { config.fetch('my_controller').dpid == 0xabc }
-        Then { config.fetch('my_controller').datapath_id == 0xabc }
+        Then { configuration.vswitches.size == 1 }
+        Then { configuration.fetch('my_controller').dpid == 0xabc }
+        Then { configuration.fetch('my_controller').datapath_id == 0xabc }
       end
     end
 
     context "with 'vhost { ip '192.168.0.1' }' ..." do
       When(:string) do
-        <<-CONFIG
+        <<-CONFIGURATION
         vhost { ip '192.168.0.1' }
         vhost { ip '192.168.0.2' }
         link '192.168.0.1', '192.168.0.2'
-CONFIG
+CONFIGURATION
       end
 
       describe '#vhost' do
-        Then { config.vhosts.size == 2 }
-        Then { config.fetch('192.168.0.1').ip_address == '192.168.0.1' }
+        Then { configuration.vhosts.size == 2 }
+        Then { configuration.fetch('192.168.0.1').ip_address == '192.168.0.1' }
       end
     end
 
     context "with 'vhost('host1') { ip '192.168.0.1' }' ..." do
       When(:string) do
-        <<-CONFIG
+        <<-CONFIGURATION
         vhost('host1') { ip '192.168.0.1' }
         vhost('host2') { ip '192.168.0.2' }
         link 'host1', 'host2'
-CONFIG
+CONFIGURATION
       end
 
       describe '#vhost' do
-        Then { config.vhosts.size == 2 }
-        Then { config.fetch('host1').ip_address == '192.168.0.1' }
+        Then { configuration.vhosts.size == 2 }
+        Then { configuration.fetch('host1').ip_address == '192.168.0.1' }
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phut
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.3
 platform: ruby
 authors:
 - Yasuhito Takamiya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-03 00:00:00.000000000 Z
+date: 2015-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli