phut 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4fad4e339b0567eea737186ddc07e11e497cbe39
-  data.tar.gz: d02b67ed0f66b6996d3d6f0d2145ab101f12e71b
+  metadata.gz: c4f3795a4ddd93016e7806acc680a6965fba9326
+  data.tar.gz: 85718cdee25a39e9c98459b130905424e82ca650
 SHA512:
-  metadata.gz: 737c98a5b5ca84e1eefb335ae109a7f000e370216dc48aca7070e84bacfaab65cc2eb51357110fae28fca43fb34877de72571782303cd1ae92b30386b90b3e37
-  data.tar.gz: 5b8c95ba65bcea39de90f4d93866b8bf79e6b2ac1d979aaba6247ea705676015826c7d0801a9501a947c5c9aeb70465cf12f672521b612414781384e9c09bd2f
+  metadata.gz: 168f91c85e0689c8748c78c85d884772a31e3b03292284d6e641c5f776b0a0ddd013cec6c9d8a985df9b529aee489fee71f9fe79f59972971f6aefbb6fd20fcc
+  data.tar.gz: e6e37c6265e7061bc2f5cb50410d8a7f8c438e7be62cb642719d00e242d5e1d9444aad60491c57c6eb6c4c45adf804c8bccb24b0d1ecca224d6b6690012a3850

data/.travis.yml

@@ -12,8 +12,6 @@ rvm:
 
 before_install:
   - gem update bundler
-  - sudo apt-get update -qq
-  - sudo apt-get install libpcap-dev -qq
 
 matrix:
   allow_failures:

data/CHANGELOG.md

@@ -3,6 +3,11 @@
 ## develop (unreleased)
 
 
+## 0.3.0 (3/17/2015)
+### Changes
+* [#20](https://github.com/trema/phut/pull/20): Use apt installed version of Open vSwitch.
+
+
 ## 0.2.4 (3/12/2015)
 ### Misc
 * Pio 0.18.2.

data/Rakefile

@@ -2,7 +2,7 @@ $LOAD_PATH.unshift File.join(File.dirname(__FILE__), 'lib')
 
 require 'rake/clean'
 
-task default: :openvswitch
+task default: :test
 task test: [:spec, :cucumber, :quality]
 task quality: [:rubocop, :reek, :flog]
 task travis: [:spec, 'cucumber:travis', :quality]

data/bin/phut

@@ -38,6 +38,9 @@ module Phut
         Pry::Commands.block_command 'vswitch' do |dpid|
           Phut::OpenVswitch.new(dpid).run
         end
+        Pry::Commands.block_command 'dump_flows' do |dpid|
+          puts Phut::OpenVswitch.new(dpid).dump_flows
+        end
         Pry::Commands.block_command 'kill' do |dpid|
           Phut::OpenVswitch.new(dpid).shutdown
         end

data/features/dsl_vswitch.feature

@@ -6,7 +6,7 @@ Feature: The vswitch DSL directive.
     vswitch { dpid '0xabc' }
     """
     When I do phut run "network.conf"
-    Then a vswitch named "0xabc" launches
+    Then a vswitch named "0xabc" should be running
 
   @sudo
   Scenario: phut run with "vswitch { dpid NUMBER }"
@@ -15,7 +15,7 @@ Feature: The vswitch DSL directive.
     vswitch { dpid 0xabc }
     """
     When I do phut run "network.conf"
-    Then a vswitch named "0xabc" launches
+    Then a vswitch named "0xabc" should be running
 
   @sudo
   Scenario: phut run with "vswitch { datapath_id STRING }"
@@ -24,7 +24,7 @@ Feature: The vswitch DSL directive.
     vswitch { datapath_id '0xabc' }
     """
     When I do phut run "network.conf"
-    Then a vswitch named "0xabc" launches
+    Then a vswitch named "0xabc" should be running
 
   @sudo
   Scenario: phut run with "vswitch { datapath_id NUMBER }"
@@ -33,7 +33,7 @@ Feature: The vswitch DSL directive.
     vswitch { datapath_id 0xabc }
     """
     When I do phut run "network.conf"
-    Then a vswitch named "0xabc" launches
+    Then a vswitch named "0xabc" should be running
 
   @sudo
   Scenario: phut run with "vswitch(alias) { ... }"
@@ -42,4 +42,4 @@ Feature: The vswitch DSL directive.
     vswitch('my_switch') { datapath_id '0xabc' }
     """
     When I do phut run "network.conf"
-    Then a vswitch named "my_switch" launches
+    Then a vswitch named "my_switch" should be running

data/features/phut.feature

@@ -1,5 +1,4 @@
 Feature: phut command
-
   Scenario: phut --version
     When I successfully run `phut --version`
     Then the output should match /\d+\.\d+\.\d+/

data/features/shell.feature

@@ -1,37 +1,43 @@
 Feature: Shell
   Background:
     Given I run `phut -v` interactively
-    And I type "pid_dir '.'"
-    And I type "log_dir '.'"
-    And I type "socket_dir '.'"
+    And I wait for stdout to contain "phut>"
 
   @shell
   Scenario: vswitch NUMBER
     When I type "vswitch 0xabc"
     And I type "quit"
-    Then a file named "open_vswitch.0xabc.pid" should exist
-    And a file named "open_vswitch.0xabc.log" should exist
+    And I run `sleep 1`
+    Then a vswitch named "0xabc" should be running
 
   @shell
   Scenario: vswitch STRING
     When I type "vswitch '0xabc'"
     And I type "quit"
-    Then a file named "open_vswitch.0xabc.pid" should exist
-    And a file named "open_vswitch.0xabc.log" should exist
+    And I run `sleep 1`
+    Then a vswitch named "0xabc" should be running
+
+  @shell
+  Scenario: dump_flows
+    Given I type "vswitch '0xabc'"
+    When I type "dump_flows 0xabc"
+    And I type "quit"
+    And I run `sleep 1`
+    Then the output should contain "NXST_FLOW reply"
 
   @shell
   Scenario: vswitch twice and fail
     And I type "vswitch 0xabc"
     When I type "vswitch 0xabc"
     And I type "quit"
-    Then the output should contain "already running!"
+    Then the output should contain "Open vSwitch (dpid = 0xabc) is already running!"
 
   @shell
   Scenario: Kill and .pid is deleted
     And I type "vswitch 0xabc"
     When I type "kill 0xabc"
     And I type "quit"
-    Then a file named "open_vswitch.0xabc.pid" should not exist
+    Then a vswitch named "0xabc" should not be running
 
   @shell
   Scenario: Kill without run and fail

data/features/step_definitions/phut_steps.rb

@@ -6,11 +6,12 @@ When(/^I do phut run "(.*?)"$/) do |file_name|
   step %(I run `phut -v run #{run_opts} #{@config_file}`)
 end
 
-Then(/^a vswitch named "(.*?)" launches$/) do |name|
-  in_current_dir do
-    pid_file = File.join(File.expand_path(@pid_dir), "open_vswitch.#{name}.pid")
-    step %(a file named "#{pid_file}" should exist)
-  end
+Then(/^a vswitch named "(.*?)" should be running$/) do |name|
+  expect(system("sudo ovs-vsctl br-exists #{name}")).to be(true)
+end
+
+Then(/^a vswitch named "(.*?)" should not be running$/) do |name|
+  expect(system("sudo ovs-vsctl br-exists #{name}")).to be(false)
 end
 
 Then(/^a vhost named "(.*?)" launches$/) do |name|

data/features/support/hooks.rb

@@ -11,10 +11,6 @@ Before('@sudo') do
   @aruba_timeout_seconds = 10
 end
 
-Before('@shell') do
-  fail 'sudo authentication failed' unless system 'sudo -v'
-end
-
 After('@sudo') do
   in_current_dir do
     Phut.pid_dir = @pid_dir
@@ -24,11 +20,12 @@ After('@sudo') do
   end
 end
 
+Before('@shell') do
+  fail 'sudo authentication failed' unless system 'sudo -v'
+end
+
 After('@shell') do
-  in_current_dir do
-    Dir.glob(File.join(Dir.getwd, '*.pid')).each do |each|
-      pid = IO.read(each).to_i
-      run "sudo kill #{pid}"
-    end
+  `sudo ovs-vsctl list-br`.split("\n").each do |each|
+    run "sudo ovs-vsctl del-br #{each}"
   end
 end

data/lib/phut/configuration.rb

@@ -28,8 +28,8 @@ module Phut
 
     def run
       links.each(&:run)
-      vswitches.each(&:run)
       vhosts.each { |each| each.run vhosts }
+      vswitches.each(&:run)
     end
 
     def stop

data/lib/phut/open_vswitch.rb

@@ -7,11 +7,6 @@ module Phut
   class OpenVswitch
     include ShellRunner
 
-    OPENFLOWD =
-      "#{Phut.root}/vendor/openvswitch-1.2.2.trema1/tests/test-openflowd"
-    OFCTL =
-      "#{Phut.root}/vendor/openvswitch-1.2.2.trema1/utilities/ovs-ofctl"
-
     attr_reader :dpid
     alias_method :datapath_id, :dpid
     attr_writer :interfaces
@@ -31,17 +26,25 @@ module Phut
       "vswitch (name = #{name}, dpid = #{format('%#x', @dpid)})"
     end
 
+    # rubocop:disable AbcSize
     def run
-      sh "sudo #{OPENFLOWD} #{options.join ' '}"
+      sh "sudo ovs-vsctl add-br #{name}"
+      sh "sudo /sbin/sysctl -w net.ipv6.conf.#{name}.disable_ipv6=1 -q"
+      @interfaces.each { |each| sh "sudo ovs-vsctl add-port #{name} #{each}" }
+      sh "sudo ovs-vsctl set-controller #{name} tcp:127.0.0.1:6633"\
+         " -- set controller #{name} connection-mode=out-of-band"
+      sh "sudo ovs-vsctl set bridge #{name} protocols=OpenFlow10" \
+         " other-config:datapath-id=#{dpid_zero_filled}"
+      sh "sudo ovs-vsctl set-fail-mode #{name} secure"
     rescue
       raise "Open vSwitch (dpid = #{@dpid}) is already running!"
     end
     alias_method :start, :run
+    # rubocop:enable AbcSize
 
     def stop
       fail "Open vSwitch (dpid = #{@dpid}) is not running!" unless running?
-      pid = IO.read(pid_file).chomp
-      sh "sudo kill #{pid}"
+      sh "sudo ovs-vsctl del-br #{name}"
     end
     alias_method :shutdown, :stop
 
@@ -51,19 +54,19 @@ module Phut
     end
 
     def bring_port_up(port_number)
-      sh "sudo #{OFCTL} mod-port #{network_device} #{port_number} up"
+      sh "sudo ovs-ofctl mod-port #{name} #{port_number} up"
     end
 
     def bring_port_down(port_number)
-      sh "sudo #{OFCTL} mod-port #{network_device} #{port_number} down"
+      sh "sudo ovs-ofctl mod-port #{name} #{port_number} down"
     end
 
     def dump_flows
-      `sudo #{OFCTL} dump-flows #{network_device}`
+      `sudo ovs-ofctl dump-flows #{name}`
     end
 
     def running?
-      FileTest.exists?(pid_file)
+      system "sudo ovs-vsctl br-exists #{name}"
     end
 
     private
@@ -73,44 +76,13 @@ module Phut
       start
     end
 
-    def pid_file
-      "#{Phut.pid_dir}/open_vswitch.#{name}.pid"
-    end
-
     def network_device
       "vsw_#{name}"
     end
 
-    # rubocop:disable MethodLength
-    def options
-      %W(--detach
-         --out-of-band
-         --fail=closed
-         --inactivity-probe=180
-         --rate-limit=40000
-         --burst-limit=20000
-         --pidfile=#{pid_file}
-         --verbose=ANY:file:#{logging_level}
-         --verbose=ANY:console:err
-         --log-file=#{Phut.log_dir}/open_vswitch.#{name}.log
-         --datapath-id=#{dpid_zero_filled}
-         --unixctl=#{Phut.socket_dir}/open_vswitch.#{name}.ctl
-         netdev@#{network_device} tcp:127.0.0.1:6633) +
-        ports_option
-    end
-    # rubocop:enable MethodLength
-
     def dpid_zero_filled
       hex = format('%x', @dpid)
       '0' * (16 - hex.length) + hex
     end
-
-    def logging_level
-      @logger.level == Logger::DEBUG ? 'dbg' : 'info'
-    end
-
-    def ports_option
-      @interfaces.empty? ? [] : ["--ports=#{@interfaces.join(',')}"]
-    end
   end
 end

data/lib/phut/version.rb

@@ -1,4 +1,4 @@
 # Base module.
 module Phut
-  VERSION = '0.2.4'
+  VERSION = '0.3.0'
 end

data/phut.gemspec

@@ -18,8 +18,6 @@ Gem::Specification.new do |gem|
   gem.executables = %w(phut vhost)
   gem.files = `git ls-files`.split("\n")
 
-  gem.extensions = ['Rakefile']
-
   gem.extra_rdoc_files = ['README.md']
   gem.test_files = `git ls-files -- {spec,features}/*`.split("\n")
 
@@ -34,8 +32,8 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'yard', '~> 0.8.7.6'
 
   # Development
-  gem.add_development_dependency 'byebug', '~> 3.5.1'
-  gem.add_development_dependency 'guard', '~> 2.12.4'
+  gem.add_development_dependency 'byebug', '~> 4.0.2'
+  gem.add_development_dependency 'guard', '~> 2.12.5'
   gem.add_development_dependency 'guard-bundler', '~> 2.1.0'
   gem.add_development_dependency 'guard-cucumber', '~> 1.5.4'
   gem.add_development_dependency 'guard-rspec', '~> 4.5.0'
@@ -48,7 +46,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'cucumber', '~> 1.3.19'
   gem.add_development_dependency 'flog', '~> 4.3.2'
   gem.add_development_dependency 'rake'
-  gem.add_development_dependency 'reek', '~> 2.0.1'
+  gem.add_development_dependency 'reek', '~> 2.0.2'
   gem.add_development_dependency 'rspec', '~> 3.2.0'
   gem.add_development_dependency 'rspec-given', '~> 3.7.0'
   gem.add_development_dependency 'rubocop', '~> 0.29.1'

data/spec/phut/open_vswitch_spec.rb

@@ -13,7 +13,8 @@ describe Phut::OpenVswitch do
       describe '#run' do
         When { vswitch.run }
         Then do
-          expect(vswitch).to have_received(:sh).with(/test-openflowd/)
+          expect(vswitch).to(have_received(:sh).
+                             with('sudo ovs-vsctl add-br 0xabc'))
         end
       end
     end

data/tasks/cucumber.rake

@@ -1,10 +1,8 @@
 begin
   require 'cucumber/rake/task'
 
-  task cucumber: :openvswitch
   Cucumber::Rake::Task.new
 
-  task 'cucumber:travis' => :openvswitch
   Cucumber::Rake::Task.new('cucumber:travis') do |task|
     task.cucumber_opts = '--tags ~@sudo --tags ~@shell'
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phut
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - Yasuhito Takamiya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-12 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -86,28 +86,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.5.1
+        version: 4.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.5.1
+        version: 4.0.2
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.4
+        version: 2.12.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.12.4
+        version: 2.12.5
 - !ruby/object:Gem::Dependency
   name: guard-bundler
   requirement: !ruby/object:Gem::Requirement
@@ -254,14 +254,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: 2.0.2
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -310,8 +310,7 @@ email:
 executables:
 - phut
 - vhost
-extensions:
-- Rakefile
+extensions: []
 extra_rdoc_files:
 - README.md
 files:
@@ -360,15 +359,10 @@ files:
 - tasks/cucumber.rake
 - tasks/flog.rake
 - tasks/gem.rake
-- tasks/openvswitch.rake
 - tasks/reek.rake
 - tasks/relish.rake
 - tasks/rspec.rake
 - tasks/rubocop.rake
-- vendor/.gitignore
-- vendor/README.md
-- vendor/openvswitch-1.2.2.trema1.tar.gz
-- vendor/openvswitch-1.2.2_librt-check.diff
 homepage: http://github.com/trema/phut
 licenses:
 - GPL3

data/tasks/openvswitch.rake

@@ -1,26 +0,0 @@
-require 'phut'
-require 'tmpdir'
-
-def openvswitch_srcdir
-  File.join Phut.root, 'vendor/openvswitch-1.2.2.trema1'
-end
-
-desc 'Build Open vSwitch'
-task openvswitch: Phut::OpenVswitch::OPENFLOWD
-
-file Phut::OpenVswitch::OPENFLOWD do
-  sh 'tar xzf ./vendor/openvswitch-1.2.2.trema1.tar.gz -C vendor'
-  cd openvswitch_srcdir do
-    sh "./configure --with-rundir=#{Dir.tmpdir}"
-    sh 'make'
-  end
-end
-
-task clean: 'openvswitch:clean'
-task 'openvswitch:clean' do
-  FileTest.exist?(openvswitch_srcdir) && cd(openvswitch_srcdir) do
-    sh 'make clean'
-  end
-end
-
-CLOBBER.include(openvswitch_srcdir) if FileTest.exists?(openvswitch_srcdir)