phut 0.7.4 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 703fe2a4bb37ea1ca4cadf9ddc07886897dd085a
-  data.tar.gz: 808e1dfab4de0c60cfaf70f251278388ea13a7bd
+  metadata.gz: 1c3b681d2cbe588388b838a3b6d9d888242a319a
+  data.tar.gz: 2b8602c3b6d63299c5f648256cffa40c201684c6
 SHA512:
-  metadata.gz: ec653af4dfc965654373cb287cf34d707565df9e5658ef82ef93da10bc72123b16b81b48fff7855c0bb1512831967b27e7193cfe9efc2687c34788f00c63fd3f
-  data.tar.gz: ff6403182467d4db9be23e1aa94bd3afdabd61bbfb5e96ce4bedd7fc90ad674e1d7434d758937524aa23d2a8c7c7d571d41efc172c80e8dadc1de594aad5dde3
+  metadata.gz: 6f5bca013e25718e9e209dd90e9597ea62373e914af63c5a81bd286f8aa917e7f2de6dd8cd755664cc3593545c47fd532d1e8fc844f06ad641cd97167702d8e6
+  data.tar.gz: 3b31460f0b73ca4ee302b4664504e78c359549213bc92900dc887e2c93766c73849faa2cccf80e14137cb467fb955191f1f6ed929754fda7faae19b7c48f40dc

data/.travis.yml

@@ -1,6 +1,9 @@
+sudo: false
+
 language: ruby
 
 bundler_args: --without development
+cache: bundler
 
 script: bundle exec rake travis
 

data/CHANGELOG.md

@@ -3,6 +3,11 @@
 ## develop (unreleased)
 
 
+## 0.7.5 (12/17/2015)
+### Bugs fixed
+* [#33](https://github.com/trema/phut/pull/33): Fix dump_flows in OpenFlow 1.3.
+
+
 ## 0.7.4 (11/30/2015)
 ### Bugs fixed
 * Fix NoMethodError.

data/bin/phut

@@ -41,13 +41,17 @@ module Phut
           Phut.socket_dir = dir
         end
         Pry::Commands.block_command 'vswitch' do |dpid|
-          Phut::OpenVswitch.new(dpid).run
+          if Phut::OpenVswitch.find_by(name: dpid)
+            fail(Phut::OpenVswitch::AlreadyRunning,
+                 "Open vSwitch (dpid = #{dpid}) is already running!")
+          end
+          Phut::OpenVswitch.create(dpid).run
         end
         Pry::Commands.block_command 'dump_flows' do |dpid|
-          puts Phut::OpenVswitch.new(dpid).dump_flows
+          puts Phut::OpenVswitch.dump_flows(dpid)
         end
         Pry::Commands.block_command 'kill' do |dpid|
-          Phut::OpenVswitch.new(dpid).shutdown
+          Phut::OpenVswitch.shutdown(dpid)
         end
         pry
       end
@@ -57,11 +61,11 @@ module Phut
     arg_name 'FILE'
     command :run do |c|
       c.desc 'Location to put pid files'
-      c.flag [:p, :pid_dir], default_value: Phut.pid_dir
+      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.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
+      c.flag [:S, :socket_dir], default_value: Phut.socket_dir
 
       c.action do |global_options, options, args|
         stdout_logger = Logger.new($stderr).tap do |logger|
@@ -87,19 +91,20 @@ module Phut
     arg_name 'FILE'
     command :stop do |c|
       c.desc 'Location to put pid files'
-      c.flag [:p, :pid_dir], default_value: Phut.pid_dir
-
+      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.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
+      c.flag [:S, :socket_dir], default_value: Phut.socket_dir
 
-      c.action do |global_options, _options, args|
+      c.action do |global_options, options, args|
         stdout_logger = Logger.new($stderr).tap do |logger|
           logger.formatter = proc { |_sev, _dtm, _name, msg| msg + "\n" }
           logger.level = global_options[:verbose] ? Logger::DEBUG : Logger::INFO
         end
+        Phut.pid_dir = options.fetch(:pid_dir)
+        Phut.log_dir = options.fetch(:log_dir)
+        Phut.socket_dir = options.fetch(:socket_dir)
         Phut::Parser.new(stdout_logger).parse(args[0]).stop
       end
     end
@@ -108,14 +113,14 @@ module Phut
     arg_name 'NAME'
     command :kill do |c|
       c.desc 'Location to find socket files'
-      c.flag [:s, :socket_dir], default_value: Phut.socket_dir
+      c.flag [:S, :socket_dir], default_value: Phut.socket_dir
 
       c.action do |_global_options, options, args|
         help_now! if args.size != 1
         begin
           Phut::VhostDaemon.process(args[0], options[:socket_dir]).stop
         rescue
-          Phut::OpenVswitch.new(args[0]).shutdown
+          Phut::OpenVswitch.shutdown(args[0])
         end
       end
     end

data/bin/vhost

@@ -56,7 +56,6 @@ module Phut
       command :stop do |c|
         desc 'Host name'
         c.flag [:n, :name]
-
         c.desc 'Location to put socket files'
         c.flag [:S, :socket_dir], default_value: Phut.socket_dir
 

data/features/dsl.feature

@@ -1,26 +1,26 @@
 Feature: DSL parser
   Scenario: name conflict (vsiwtch and vswitch)
     Given a file named "network.conf" with:
-    """
-    vswitch { dpid 0xabc }
-    vswitch { dpid 0xabc }
-    """
+      """ruby
+      vswitch { dpid 0xabc }
+      vswitch { dpid 0xabc }
+      """
     When I do phut run "network.conf"
     Then the exit status should not be 0
     And the stderr should contain:
-    """
-    The name 0xabc conflicts with vswitch (name = 0xabc, dpid = 0xabc).
-    """
+      """
+      The name 0xabc conflicts with vswitch (name = 0xabc, dpid = 0xabc).
+      """
 
   Scenario: name conflict (vhost and vhost)
     Given a file named "network.conf" with:
-    """
-    vhost { ip '192.168.0.1' }
-    vhost { ip '192.168.0.1' }
-    """
+      """ruby
+      vhost { ip '192.168.0.1' }
+      vhost { ip '192.168.0.1' }
+      """
     When I do phut run "network.conf"
     Then the exit status should not be 0
     And the stderr should contain:
-    """
-    The name 192.168.0.1 conflicts with vhost (name = 192.168.0.1, IP address = 192.168.0.1).
-    """
+      """
+      The name 192.168.0.1 conflicts with vhost (name = 192.168.0.1, IP address = 192.168.0.1).
+      """

data/features/shell.feature

@@ -1,20 +1,20 @@
 Feature: Shell
   Background:
-    Given I run `phut -v` interactively
-    And I wait for stdout to contain "phut>"
+    Given I wait 5 seconds for a command to start up
+    And I run `phut -v` interactively
 
   @shell
   Scenario: vswitch NUMBER
     When I type "vswitch 0xabc"
     And I type "quit"
-    And I run `sleep 1`
+    And sleep 1
     Then a vswitch named "0xabc" should be running
 
   @shell
   Scenario: vswitch STRING
     When I type "vswitch '0xabc'"
     And I type "quit"
-    And I run `sleep 1`
+    And sleep 1
     Then a vswitch named "0xabc" should be running
 
   @shell
@@ -22,7 +22,7 @@ Feature: Shell
     Given I type "vswitch '0xabc'"
     When I type "dump_flows 0xabc"
     And I type "quit"
-    And I run `sleep 1`
+    And sleep 1
     Then the output should contain "NXST_FLOW reply"
 
   @shell
@@ -37,7 +37,7 @@ Feature: Shell
     And I type "vswitch 0xabc"
     When I type "kill 0xabc"
     And I type "quit"
-    And I run `sleep 1`
+    And sleep 1
     Then a vswitch named "0xabc" should not be running
 
   @shell

data/features/step_definitions/phut_steps.rb

@@ -1,18 +1,22 @@
 require 'phut'
 
-When(/^I do phut run "(.*?)"$/) do |file_name|
-  @config_file = file_name
+When(/^I do phut run "(.*?)"$/) do |config_file|
+  @config_file = config_file
   cd('.') do
-    run_opts = "-p #{@pid_dir} -l #{@log_dir} -s #{@socket_dir}"
+    run_opts = "-P #{@pid_dir} -L #{@log_dir} -S #{@socket_dir}"
     step %(I run `phut -v run #{run_opts} #{@config_file}`)
   end
 end
 
 When(/^I do phut kill "(.*?)"$/) do |name|
-  run_opts = "-s #{@socket_dir}"
+  run_opts = "-S #{@socket_dir}"
   step %(I successfully run `phut -v kill #{run_opts} #{name}`)
 end
 
+When(/^sleep (\d+)$/) do |time|
+  sleep time.to_i
+end
+
 Then(/^a vswitch named "(.*?)" should be running$/) do |name|
   expect(system("sudo ovs-vsctl br-exists br#{name}")).to be_truthy
 end

data/features/support/hooks.rb

@@ -12,11 +12,13 @@ Before('@sudo') do
 end
 
 After('@sudo') do
-  cd('.') do
-    Phut.pid_dir = @pid_dir
-    Phut.log_dir = @log_dir
-    Phut.socket_dir = @socket_dir
-    Phut::Parser.new.parse(@config_file).stop
+  Aruba.configure do |config|
+    Dir.chdir(config.working_directory) do
+      Phut.pid_dir = @pid_dir
+      Phut.log_dir = @log_dir
+      Phut.socket_dir = @socket_dir
+      Phut::Parser.new.parse(@config_file).stop
+    end
   end
 end
 

data/lib/phut/configuration.rb

@@ -4,19 +4,25 @@ require 'phut/open_vswitch'
 module Phut
   # Parsed DSL data.
   class Configuration
-    def initialize(logger = NullLogger.new)
-      @all = {}
-      @links = []
-      @logger = logger
+    def initialize(&block)
+      OpenVswitch.all.clear
+      Vhost.all.clear
+      Netns.all.clear
+      VirtualLink.all.clear
+      block.call self
     end
 
     # rubocop:disable MethodLength
     def fetch(key)
       case key
       when String
-        @all.fetch(key)
+        [OpenVswitch, Vhost, Netns].each do |each|
+          found = each.find_by(name: key)
+          return found if found
+        end
+        fail "Invalid key: #{key.inspect}"
       when Array
-        @links.each do |each|
+        VirtualLink.each do |each|
           return each if [each.name_a, each.name_b].sort == key.sort
         end
         fail "link #{key.join ' '} not found."
@@ -33,62 +39,22 @@ module Phut
       self
     end
 
-    def vswitches
-      @all.values.select { |each| each.is_a? OpenVswitch }
-    end
-
-    def vhosts
-      @all.values.select { |each| each.is_a? Vhost }
-    end
-
-    def netnss
-      @all.values.select { |each| each.is_a? Netns }
-    end
-
     def run
-      @links.each(&:run)
-      vhosts.each { |each| each.run vhosts }
-      netnss.each(&:run)
-      vswitches.each(&:run)
+      [VirtualLink, Vhost, Netns, OpenVswitch].each do |klass|
+        klass.each(&:run)
+      end
     end
 
     def stop
-      vswitches.each(&:maybe_stop)
-      vhosts.each(&:maybe_stop)
-      netnss.each(&:maybe_stop)
-      @links.each(&:maybe_stop)
-    end
-
-    def add_vswitch(name, attrs)
-      check_name_conflict name
-      @all[name] =
-        OpenVswitch.new(attrs[:dpid], attrs[:port_number], name, @logger)
-    end
-
-    def add_vhost(name, attrs)
-      check_name_conflict name
-      @all[name] =
-        Vhost.new(attrs[:ip], attrs[:mac], attrs[:promisc], name, @logger)
-    end
-
-    def add_netns(name, attrs)
-      check_name_conflict name
-      @all[name] = Netns.new(attrs, name, @logger)
-    end
-
-    def add_link(name_a, name_b)
-      @links << VirtualLink.new(name_a, name_b, @logger)
+      [OpenVswitch, Vhost, Netns, VirtualLink].each do |klass|
+        klass.each(&:stop)
+      end
     end
 
     private
 
-    def check_name_conflict(name)
-      conflict = @all[name]
-      fail "The name #{name} conflicts with #{conflict}." if conflict
-    end
-
     def update_vswitch_ports
-      @links.each do |each|
+      VirtualLink.each do |each|
         maybe_connect_link_to_vswitch each
       end
     end
@@ -100,23 +66,23 @@ module Phut
     end
 
     def vswitches_connected_to(link)
-      vswitches.select { |each| link.connect_to?(each) }
+      OpenVswitch.select { |each| link.connect_to?(each) }
     end
 
     def update_vhost_interfaces
-      vhosts.each do |each|
+      Vhost.each do |each|
         each.network_device = find_network_device(each)
       end
     end
 
     def update_netns_interfaces
-      netnss.each do |each|
+      Netns.each do |each|
         each.network_device = find_network_device(each)
       end
     end
 
     def find_network_device(vhost)
-      @links.each do |each|
+      VirtualLink.each do |each|
         device = each.find_network_device(vhost)
         return device if device
       end

data/lib/phut/netns.rb

@@ -1,15 +1,26 @@
+require 'active_support/core_ext/class/attribute_accessors'
 require 'phut/null_logger'
 require 'phut/shell_runner'
 
 module Phut
   # `ip netns ...` command runner
   class Netns
+    cattr_accessor(:all, instance_reader: false) { [] }
+
+    def self.create(options, name, logger = NullLogger.new)
+      new(options, name, logger).tap { |netns| all << netns }
+    end
+
+    def self.each(&block)
+      all.each(&block)
+    end
+
     include ShellRunner
 
     attr_reader :name
     attr_accessor :network_device
 
-    def initialize(options, name, logger = NullLogger.new)
+    def initialize(options, name, logger)
       @name = name
       @options = options
       @logger = logger
@@ -26,7 +37,7 @@ module Phut
     end
     # rubocop:enable AbcSize
 
-    def maybe_stop
+    def stop
       sh "sudo ip netns delete #{name}"
     end
 

data/lib/phut/open_vswitch.rb

@@ -1,3 +1,4 @@
+require 'active_support/core_ext/class/attribute_accessors'
 require 'pio'
 require 'phut/null_logger'
 require 'phut/setting'
@@ -5,7 +6,43 @@ require 'phut/shell_runner'
 
 module Phut
   # Open vSwitch controller.
+  # rubocop:disable ClassLength
   class OpenVswitch
+    cattr_accessor(:all, instance_reader: false) { [] }
+
+    def self.create(dpid, port_number = 6653, name = nil,
+                    logger = NullLogger.new)
+      new(dpid, port_number, name, logger).tap do |vswitch|
+        conflict = find_by(name: vswitch.name)
+        fail "The name #{vswitch.name} conflicts with #{conflict}." if conflict
+        all << vswitch
+      end
+    end
+
+    def self.dump_flows(dpid, port_number = 6653, name = nil,
+                        logger = NullLogger.new)
+      OpenVswitch.new(dpid, port_number, name, logger).dump_flows
+    end
+
+    def self.shutdown(dpid, port_number = 6653, name = nil,
+                      logger = NullLogger.new)
+      OpenVswitch.new(dpid, port_number, name, logger).stop!
+    end
+
+    def self.find_by(queries)
+      queries.inject(all) do |memo, (attr, value)|
+        memo.find_all { |vswitch| vswitch.__send__(attr) == value }
+      end.first
+    end
+
+    def self.each(&block)
+      all.each(&block)
+    end
+
+    def self.select(&block)
+      all.select(&block)
+    end
+
     class AlreadyRunning < StandardError; end
 
     include ShellRunner
@@ -14,8 +51,7 @@ module Phut
     alias_method :datapath_id, :dpid
     attr_reader :network_devices
 
-    def initialize(dpid, port_number = 6653,
-                   name = nil, logger = NullLogger.new)
+    def initialize(dpid, port_number, name, logger)
       @dpid = dpid
       @port_number = port_number
       @name = name
@@ -54,15 +90,15 @@ module Phut
     # rubocop:enable AbcSize
 
     def stop
-      fail "Open vSwitch (dpid = #{@dpid}) is not running!" unless running?
-      sh "sudo ovs-vsctl del-br #{bridge_name}"
+      return unless running?
+      stop!
     end
-    alias_method :shutdown, :stop
 
-    def maybe_stop
-      return unless running?
-      stop
+    def stop!
+      fail "Open vSwitch (dpid = #{@dpid}) is not running!" unless running?
+      sh "sudo ovs-vsctl del-br #{bridge_name}"
     end
+    alias_method :shutdown, :stop!
 
     def bring_port_up(port_number)
       sh "sudo ovs-ofctl mod-port #{bridge_name} #{port_number} up"
@@ -73,7 +109,7 @@ module Phut
     end
 
     def dump_flows
-      `sudo ovs-ofctl dump-flows #{bridge_name}`
+      `sudo ovs-ofctl dump-flows #{bridge_name} -O #{Pio::OpenFlow.version}`
     end
 
     def running?
@@ -105,4 +141,5 @@ module Phut
       '0' * (16 - hex.length) + hex
     end
   end
+  # rubocop:enable ClassLength
 end

data/lib/phut/parser.rb

@@ -10,9 +10,9 @@ module Phut
     end
 
     def parse(file)
-      Configuration.new(@logger).tap do |configuration|
-        Syntax.new(configuration).instance_eval IO.read(file), file
-        configuration.update_connections
+      Configuration.new do |config|
+        Syntax.new(config, @logger).instance_eval IO.read(file), file
+        config.update_connections
       end
     end
   end

data/lib/phut/syntax.rb

@@ -1,128 +1,36 @@
 require 'phut/netns'
+require 'phut/syntax/netns_directive'
+require 'phut/syntax/vhost_directive'
+require 'phut/syntax/vswitch_directive'
 require 'phut/vhost'
 require 'phut/virtual_link'
 
 module Phut
   # DSL syntax definitions.
   class Syntax
-    # The 'vswitch(name) { ...attributes... }' directive.
-    class VswitchDirective
-      def initialize(alias_name, &block)
-        @attributes = { name: alias_name, port_number: 6653 }
-        instance_eval(&block)
-      end
-
-      def dpid(value)
-        dpid = if value.is_a?(String) && /^0x/=~ value
-                 value.hex
-               else
-                 value.to_i
-               end
-        @attributes[:dpid] = dpid
-        @attributes[:name] ||= format('%#x', @attributes[:dpid])
-      end
-      alias_method :datapath_id, :dpid
-
-      def port(port_no)
-        @attributes[:port_number] = port_no
-      end
-
-      def [](key)
-        @attributes[key]
-      end
-    end
-
-    # The 'vhost(name) { ...attributes... }' directive.
-    class VhostDirective
-      # Generates an unused IP address
-      class UnusedIpAddress
-        def initialize
-          @index = 0
-        end
-
-        def generate
-          @index += 1
-          "192.168.0.#{@index}"
-        end
-      end
-
-      UnusedIpAddressSingleton = UnusedIpAddress.new
-
-      def initialize(alias_name, &block)
-        @attributes =
-          { name: alias_name, mac: Pio::Mac.new(rand(0xffffffffffff + 1)) }
-        if block
-          instance_eval(&block) if block
-        else
-          @attributes[:ip] = UnusedIpAddressSingleton.generate
-        end
-      end
-
-      def ip(value)
-        @attributes[:ip] = value
-        @attributes[:name] ||= value
-      end
-
-      def mac(value)
-        @attributes[:mac] = value
-      end
-
-      def promisc(on_off)
-        @attributes[:promisc] = on_off
-      end
-
-      def [](key)
-        @attributes[key]
-      end
-    end
-
-    # The 'netns(name) { ...attributes... }' directive.
-    class NetnsDirective
-      def initialize(alias_name, &block)
-        @attributes = { name: alias_name }
-        instance_eval(&block)
-      end
-
-      def ip(value)
-        @attributes[:ip] = value
-        @attributes[:name] ||= value
-      end
-
-      def netmask(value)
-        @attributes[:netmask] = value
-      end
-
-      def route(options)
-        @attributes[:net] = options.fetch(:net)
-        @attributes[:gateway] = options.fetch(:gateway)
-      end
-
-      def [](key)
-        @attributes[key]
-      end
-    end
-
-    def initialize(config)
+    def initialize(config, logger)
       @config = config
+      @logger = logger
     end
 
     def vswitch(alias_name = nil, &block)
       attrs = VswitchDirective.new(alias_name, &block)
-      @config.add_vswitch attrs[:name], attrs
+      OpenVswitch.create(attrs[:dpid], attrs[:port], attrs[:name], @logger)
     end
 
     def vhost(alias_name = nil, &block)
       attrs = VhostDirective.new(alias_name, &block)
-      @config.add_vhost attrs[:name], attrs
+      Vhost.create(attrs[:ip], attrs[:mac], attrs[:promisc], attrs[:name],
+                   @logger)
     end
 
     def netns(name, &block)
       attrs = NetnsDirective.new(name, &block)
-      @config.add_netns attrs[:name], attrs
+      Netns.create(attrs, attrs[:name], @logger)
     end
 
     def link(name_a, name_b)
-      @config.add_link name_a, name_b
+      VirtualLink.create(name_a, name_b, @logger)
     end
   end
 end

data/lib/phut/syntax/directive.rb

@@ -0,0 +1,16 @@
+module Phut
+  class Syntax
+    # Common DSL directive
+    class Directive
+      def self.attribute(name)
+        define_method(name) do |value|
+          @attributes[name] = value
+        end
+      end
+
+      def [](key)
+        @attributes.fetch(key)
+      end
+    end
+  end
+end

data/lib/phut/syntax/netns_directive.rb

@@ -0,0 +1,25 @@
+require 'phut/syntax/directive'
+
+module Phut
+  class Syntax
+    # The 'netns(name) { ...attributes... }' directive.
+    class NetnsDirective < Directive
+      attribute :netmask
+
+      def initialize(alias_name, &block)
+        @attributes = { name: alias_name }
+        instance_eval(&block)
+      end
+
+      def ip(value)
+        @attributes[:ip] = value
+        @attributes[:name] ||= value
+      end
+
+      def route(options)
+        @attributes[:net] = options.fetch(:net)
+        @attributes[:gateway] = options.fetch(:gateway)
+      end
+    end
+  end
+end

data/lib/phut/syntax/vhost_directive.rb

@@ -0,0 +1,42 @@
+require 'phut/syntax/directive'
+
+module Phut
+  class Syntax
+    # The 'vhost(name) { ...attributes... }' directive.
+    class VhostDirective < Directive
+      # Generates an unused IP address
+      class UnusedIpAddress
+        def initialize
+          @index = 0
+        end
+
+        def generate
+          @index += 1
+          "192.168.0.#{@index}"
+        end
+      end
+
+      UnusedIpAddressSingleton = UnusedIpAddress.new
+
+      attribute :mac
+      attribute :promisc
+
+      def initialize(alias_name, &block)
+        @attributes =
+          { name: alias_name,
+            mac: Pio::Mac.new(rand(0xffffffffffff + 1)),
+            promisc: false }
+        if block
+          instance_eval(&block)
+        else
+          @attributes[:ip] = UnusedIpAddressSingleton.generate
+        end
+      end
+
+      def ip(value)
+        @attributes[:ip] = value
+        @attributes[:name] ||= value
+      end
+    end
+  end
+end

data/lib/phut/syntax/vswitch_directive.rb

@@ -0,0 +1,26 @@
+require 'phut/syntax/directive'
+
+module Phut
+  class Syntax
+    # The 'vswitch(name) { ...attributes... }' directive.
+    class VswitchDirective < Directive
+      attribute :port
+
+      def initialize(alias_name, &block)
+        @attributes = { name: alias_name, port: 6653 }
+        instance_eval(&block)
+      end
+
+      def dpid(value)
+        dpid = if value.is_a?(String) && /^0x/=~ value
+                 value.hex
+               else
+                 value.to_i
+               end
+        @attributes[:dpid] = dpid
+        @attributes[:name] ||= format('%#x', @attributes[:dpid])
+      end
+      alias_method :datapath_id, :dpid
+    end
+  end
+end

data/lib/phut/version.rb

@@ -1,4 +1,4 @@
 # Base module.
 module Phut
-  VERSION = '0.7.4'
+  VERSION = '0.7.5'
 end

data/lib/phut/vhost.rb

@@ -1,3 +1,4 @@
+require 'active_support/core_ext/class/attribute_accessors'
 require 'phut/null_logger'
 require 'phut/setting'
 require 'phut/shell_runner'
@@ -6,14 +7,35 @@ require 'pio/mac'
 module Phut
   # An interface class to vhost emulation utility program.
   class Vhost
+    cattr_accessor(:all, instance_reader: false) { [] }
+
+    def self.create(ip_address, mac_address, promisc, name = nil,
+                    logger = NullLogger.new)
+      new(ip_address, mac_address, promisc, name, logger).tap do |vhost|
+        conflict = find_by(name: vhost.name)
+        fail "The name #{vhost.name} conflicts with #{conflict}." if conflict
+        all << vhost
+      end
+    end
+
+    # This method smells of :reek:NestedIterators but ignores them
+    def self.find_by(queries)
+      queries.inject(all) do |memo, (attr, value)|
+        memo.find_all { |vhost| vhost.__send__(attr) == value }
+      end.first
+    end
+
+    def self.each(&block)
+      all.each(&block)
+    end
+
     include ShellRunner
 
     attr_reader :ip_address
     attr_reader :mac_address
     attr_accessor :network_device
 
-    def initialize(ip_address, mac_address, promisc,
-                   name = nil, logger = NullLogger.new)
+    def initialize(ip_address, mac_address, promisc, name, logger)
       @ip_address = ip_address
       @promisc = promisc
       @name = name
@@ -29,7 +51,7 @@ module Phut
       "vhost (name = #{name}, IP address = #{@ip_address})"
     end
 
-    def run(all_hosts = [])
+    def run(all_hosts = Vhost.all)
       @all_hosts ||= all_hosts
       if ENV['rvm_path']
         sh "rvmsudo vhost run #{run_options}"
@@ -40,13 +62,13 @@ module Phut
     end
 
     def stop
-      fail "vhost (name = #{name}) is not running!" unless running?
-      sh "vhost stop -n #{name} -s #{Phut.socket_dir}"
+      return unless running?
+      stop!
     end
 
-    def maybe_stop
-      return unless running?
-      stop
+    def stop!
+      fail "vhost (name = #{name}) is not running!" unless running?
+      sh "vhost stop -n #{name} -S #{Phut.socket_dir}"
     end
 
     def running?

data/lib/phut/virtual_link.rb

@@ -1,9 +1,20 @@
+require 'active_support/core_ext/class/attribute_accessors'
 require 'phut/null_logger'
 require 'phut/shell_runner'
 
 module Phut
   # Network virtual link.
   class VirtualLink
+    cattr_accessor(:all, instance_reader: false) { [] }
+
+    def self.create(name_a, name_b, logger = NullLogger.new)
+      new(name_a, name_b, logger).tap { |vlink| all << vlink }
+    end
+
+    def self.each(&block)
+      all.each(&block)
+    end
+
     # Creates a valid network device name.
     class NetworkDeviceName
       attr_reader :name
@@ -35,7 +46,7 @@ module Phut
     attr_reader :device_a
     attr_reader :device_b
 
-    def initialize(name_a, name_b, logger = NullLogger.new)
+    def initialize(name_a, name_b, logger)
       fail if name_a == name_b
       @name_a = name_a
       @name_b = name_b
@@ -44,6 +55,13 @@ module Phut
       @logger = logger
     end
 
+    def ==(other)
+      @name_a == other.name_a &&
+        @name_b == other.name_b &&
+        @device_a == other.device_a &&
+        @device_b == other.device_b
+    end
+
     def run
       stop if up?
       add
@@ -51,16 +69,16 @@ module Phut
     end
 
     def stop
+      return unless up?
+      stop!
+    end
+
+    def stop!
       sh "sudo ip link delete #{@device_a}"
     rescue
       raise "link #{@name_a} #{@name_b} does not exist!"
     end
 
-    def maybe_stop
-      return unless up?
-      stop
-    end
-
     def up?
       /^#{@device_a}\s+Link encap:Ethernet/ =~ `LANG=C ifconfig -a` || false
     end

data/phut.gemspec

@@ -23,7 +23,8 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 2.0.0'
 
-  gem.add_dependency 'gli', '~> 2.13.2'
+  gem.add_dependency 'activesupport', '~> 4.2', '>= 4.2.5'
+  gem.add_dependency 'gli', '~> 2.13.4'
   gem.add_dependency 'pio', '~> 0.30.0'
   gem.add_dependency 'pry', '~> 0.10.3'
 
@@ -32,23 +33,22 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'yard', '~> 0.8.7.6'
 
   # Development
-  gem.add_development_dependency 'byebug', '~> 7.0.0'
   gem.add_development_dependency 'guard', '~> 2.13.0'
   gem.add_development_dependency 'guard-bundler', '~> 2.1.0'
-  gem.add_development_dependency 'guard-cucumber', '~> 1.6.0'
+  gem.add_development_dependency 'guard-cucumber', '~> 2.0.0'
   gem.add_development_dependency 'guard-rspec', '~> 4.6.4'
   gem.add_development_dependency 'guard-rubocop', '~> 1.2.0'
 
   # Test
-  gem.add_development_dependency 'aruba', '~> 0.8.1'
+  gem.add_development_dependency 'aruba', '~> 0.11.2'
   gem.add_development_dependency 'codeclimate-test-reporter'
-  gem.add_development_dependency 'coveralls', '~> 0.8.3'
+  gem.add_development_dependency 'coveralls', '~> 0.8.10'
   gem.add_development_dependency 'cucumber', '~> 2.1.0'
   gem.add_development_dependency 'flay', '~> 2.6.1'
   gem.add_development_dependency 'flog', '~> 4.3.2'
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'reek', '~> 3.6.0'
-  gem.add_development_dependency 'rspec', '~> 3.3.0'
+  gem.add_development_dependency 'reek', '~> 3.7.1'
+  gem.add_development_dependency 'rspec', '~> 3.4.0'
   gem.add_development_dependency 'rspec-given', '~> 3.7.1'
-  gem.add_development_dependency 'rubocop', '~> 0.34.2'
+  gem.add_development_dependency 'rubocop', '~> 0.35.1'
 end

data/spec/phut/parser_spec.rb

@@ -12,7 +12,6 @@ describe Phut::Parser do
       When(:string) { "vswitch { dpid '0xabc' }" }
 
       describe '#vswitch' do
-        Then { configuration.vswitches.size == 1 }
         Then { configuration.fetch('0xabc').datapath_id == 0xabc }
         Then { configuration.fetch('0xabc').dpid == 0xabc }
       end
@@ -22,7 +21,6 @@ describe Phut::Parser do
       When(:string) { "vswitch { datapath_id '0xabc' }" }
 
       describe '#vswitch' do
-        Then { configuration.vswitches.size == 1 }
         Then { configuration.fetch('0xabc').dpid == 0xabc }
         Then { configuration.fetch('0xabc').datapath_id == 0xabc }
       end
@@ -32,7 +30,6 @@ describe Phut::Parser do
       When(:string) { "vswitch('my_controller') { dpid '0xabc' }" }
 
       describe '#vswitch' do
-        Then { configuration.vswitches.size == 1 }
         Then { configuration.fetch('my_controller').dpid == 0xabc }
         Then { configuration.fetch('my_controller').datapath_id == 0xabc }
       end
@@ -48,7 +45,6 @@ CONFIGURATION
       end
 
       describe '#vhost' do
-        Then { configuration.vhosts.size == 2 }
         Then { configuration.fetch('192.168.0.1').ip_address == '192.168.0.1' }
       end
     end
@@ -63,7 +59,6 @@ CONFIGURATION
       end
 
       describe '#vhost' do
-        Then { configuration.vhosts.size == 2 }
         Then { configuration.fetch('host1').ip_address == '192.168.0.1' }
       end
     end

data/spec/spec_helper.rb

@@ -8,7 +8,7 @@ if ENV['CODECLIMATE_REPO_TOKEN']
   formatters << CodeClimate::TestReporter::Formatter
 end
 
-SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[*formatters]
+SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter.new(formatters)
 SimpleCov.start { add_filter '/vendor/' }
 
 require 'rspec/given'

metadata

@@ -1,29 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: phut
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.7.5
 platform: ruby
 authors:
 - Yasuhito Takamiya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-30 00:00:00.000000000 Z
+date: 2015-12-17 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '4.2'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 4.2.5
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.2
+        version: 2.13.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.2
+        version: 2.13.4
 - !ruby/object:Gem::Dependency
   name: pio
   requirement: !ruby/object:Gem::Requirement
@@ -80,20 +100,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.7.6
-- !ruby/object:Gem::Dependency
-  name: byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 7.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 7.0.0
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +134,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 2.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.6.0
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
@@ -170,14 +176,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.11.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.1
+        version: 0.11.2
 - !ruby/object:Gem::Dependency
   name: codeclimate-test-reporter
   requirement: !ruby/object:Gem::Requirement
@@ -198,14 +204,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.10
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.3
+        version: 0.8.10
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -268,28 +274,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.7.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.6.0
+        version: 3.7.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.3.0
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: rspec-given
   requirement: !ruby/object:Gem::Requirement
@@ -310,14 +316,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.34.2
+        version: 0.35.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.34.2
+        version: 0.35.1
 description: A simple network emulator with capabilities similar to mininet.
 email:
 - yasuhito@gmail.com
@@ -332,7 +338,6 @@ files:
 - ".hound.yml"
 - ".rspec"
 - ".rubocop.yml"
-- ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
@@ -363,12 +368,15 @@ files:
 - lib/phut/setting.rb
 - lib/phut/shell_runner.rb
 - lib/phut/syntax.rb
+- lib/phut/syntax/directive.rb
+- lib/phut/syntax/netns_directive.rb
+- lib/phut/syntax/vhost_directive.rb
+- lib/phut/syntax/vswitch_directive.rb
 - lib/phut/version.rb
 - lib/phut/vhost.rb
 - lib/phut/vhost_daemon.rb
 - lib/phut/virtual_link.rb
 - phut.gemspec
-- spec/phut/open_vswitch_spec.rb
 - spec/phut/parser_spec.rb
 - spec/phut_spec.rb
 - spec/spec_helper.rb

data/.ruby-version

@@ -1 +0,0 @@
-2.0.0

data/spec/phut/open_vswitch_spec.rb

@@ -1,22 +0,0 @@
-require 'phut/open_vswitch'
-
-describe Phut::OpenVswitch do
-  describe '.new' do
-    context 'with 0xabc' do
-      Given(:vswitch) do
-        Phut::OpenVswitch.new(0xabc).tap do |vswitch|
-          allow(vswitch).to receive(:running?).and_return(false, true)
-          allow(vswitch).to receive(:sh)
-        end
-      end
-
-      describe '#run' do
-        When { vswitch.run }
-        Then do
-          expect(vswitch).to(have_received(:sh).
-                             with('sudo ovs-vsctl add-br br0xabc'))
-        end
-      end
-    end
-  end
-end