phut 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e6e236d2b8034b01009ef0c8fd37e105117c33c
-  data.tar.gz: d2557b337615017c4bac9a19f1c52965b114b8cc
+  metadata.gz: 0ef918284af69d747340059b8a92a410fd291856
+  data.tar.gz: 4c2ae440238a04ba768123ed7091f9fb1fed9955
 SHA512:
-  metadata.gz: a9951dde073ebe00310e93d2102ee7ee070fceff3af82962ac3d76beb70d09b77a78ea25707396d45ef3587d792764cb98b7b80b8078f4280d0ef0b3dcaae7ee
-  data.tar.gz: 63519f2963d5ca9d16778982ac62aa41f6f660f8c96b06815112b6f289610e22434ec1e1370616e43e1c9f9537992e2ad9d383dd7742fbf1fdfd3bd48f9f7133
+  metadata.gz: 581acfd2cff43bc01d6cb4d2aff4a4b87bc018cb0e1b85f43cd2af7d3b8e6f669e58c18fe7ba3b919223da07908cb7c7e974490749dd3a2ab1dc2bb8da3474c7
+  data.tar.gz: 3df8308962938c722d63dcc1fb17b1a58727b390d3f346a4b3cf221644b77076ea18be7bdc2c3a0b60a18b687c2103d63561be9023d1f369e45918b3421f1031

data/CHANGELOG.md

@@ -3,6 +3,12 @@
 ## develop (unreleased)
 
 
+## 0.6.0 (6/1/2015)
+### Changes
+* [#21](https://github.com/trema/phut/pull/21): Use IANA-assigned port number 6653.
+* [#21](https://github.com/trema/phut/pull/21): Add `port` attribute to `vswitch` directive.
+
+
 ## 0.5.0 (4/22/2015)
 ### Misc
 * Pio 0.20.0 (preliminary support of OpenFlow 1.3).

data/features/dsl_vswitch.feature

@@ -1,6 +1,6 @@
+@sudo
 Feature: The vswitch DSL directive.
-  @sudo
-  Scenario: phut run with "vswitch { dpid STRING }"
+  Scenario: vswitch { dpid STRING }
     Given a file named "network.conf" with:
     """
     vswitch { dpid '0xabc' }
@@ -8,8 +8,7 @@ Feature: The vswitch DSL directive.
     When I do phut run "network.conf"
     Then a vswitch named "0xabc" should be running
 
-  @sudo
-  Scenario: phut run with "vswitch { dpid NUMBER }"
+  Scenario: vswitch { dpid NUMBER }
     Given a file named "network.conf" with:
     """
     vswitch { dpid 0xabc }
@@ -17,8 +16,7 @@ Feature: The vswitch DSL directive.
     When I do phut run "network.conf"
     Then a vswitch named "0xabc" should be running
 
-  @sudo
-  Scenario: phut run with "vswitch { datapath_id STRING }"
+  Scenario: vswitch { datapath_id STRING }
     Given a file named "network.conf" with:
     """
     vswitch { datapath_id '0xabc' }
@@ -26,8 +24,7 @@ Feature: The vswitch DSL directive.
     When I do phut run "network.conf"
     Then a vswitch named "0xabc" should be running
 
-  @sudo
-  Scenario: phut run with "vswitch { datapath_id NUMBER }"
+  Scenario: vswitch { datapath_id NUMBER }
     Given a file named "network.conf" with:
     """
     vswitch { datapath_id 0xabc }
@@ -35,8 +32,18 @@ Feature: The vswitch DSL directive.
     When I do phut run "network.conf"
     Then a vswitch named "0xabc" should be running
 
-  @sudo
-  Scenario: phut run with "vswitch(alias) { ... }"
+  Scenario: vswitch { dpid ...; port NUMBER }
+    Given a file named "network.conf" with:
+    """
+    vswitch {
+      datapath_id 0xabc
+      port 1234
+    }
+    """
+    When I do phut run "network.conf"
+    Then a vswitch named "0xabc" (controller port = 1234) should be running
+
+  Scenario: vswitch(alias) { ... }
     Given a file named "network.conf" with:
     """
     vswitch('my_switch') { datapath_id '0xabc' }

data/features/step_definitions/phut_steps.rb

@@ -10,6 +10,13 @@ Then(/^a vswitch named "(.*?)" should be running$/) do |name|
   expect(system("sudo ovs-vsctl br-exists br#{name}")).to be_truthy
 end
 
+# rubocop:disable LineLength
+Then(/^a vswitch named "([^"]*)" \(controller port = (\d+)\) should be running$/) do |name, port_number|
+  step %(a vswitch named "#{name}" should be running)
+  step %(the output should contain "ovs-vsctl set-controller br#{name} tcp:127.0.0.1:#{port_number}")
+end
+# rubocop:enable LineLength
+
 Then(/^a vswitch named "(.*?)" should not be running$/) do |name|
   expect(system("sudo ovs-vsctl br-exists br#{name}")).to be_falsey
 end

data/lib/phut/configuration.rb

@@ -58,7 +58,8 @@ module Phut
 
     def add_vswitch(name, attrs)
       check_name_conflict name
-      @all[name] = OpenVswitch.new(attrs[:dpid], name, @logger)
+      @all[name] =
+        OpenVswitch.new(attrs[:dpid], attrs[:port_number], name, @logger)
     end
 
     def add_vhost(name, attrs)

data/lib/phut/open_vswitch.rb

@@ -11,8 +11,10 @@ module Phut
     alias_method :datapath_id, :dpid
     attr_reader :network_devices
 
-    def initialize(dpid, name = nil, logger = NullLogger.new)
+    def initialize(dpid, port_number = 6653,
+                   name = nil, logger = NullLogger.new)
       @dpid = dpid
+      @port_number = port_number
       @name = name
       @network_devices = []
       @logger = logger
@@ -37,8 +39,9 @@ module Phut
       sh "sudo ovs-vsctl set bridge #{bridge_name}" \
          " protocols=#{open_flow_protocol}" \
          " other-config:datapath-id=#{dpid_zero_filled}"
-      sh "sudo ovs-vsctl set-controller #{bridge_name} tcp:127.0.0.1:6633"\
-         " -- set controller #{bridge_name} connection-mode=out-of-band"
+      sh "sudo ovs-vsctl set-controller #{bridge_name} "\
+         "tcp:127.0.0.1:#{@port_number} "\
+         "-- set controller #{bridge_name} connection-mode=out-of-band"
       sh "sudo ovs-vsctl set-fail-mode #{bridge_name} secure"
     rescue
       raise "Open vSwitch (dpid = #{@dpid}) is already running!"

data/lib/phut/syntax.rb

@@ -22,6 +22,10 @@ module Phut
       end
       alias_method :datapath_id, :dpid
 
+      def port(port_no)
+        @attributes[:port_number] = port_no
+      end
+
       def [](key)
         @attributes[key]
       end

data/lib/phut/version.rb

@@ -1,4 +1,4 @@
 # Base module.
 module Phut
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

data/phut.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |gem|
   gem.name = 'phut'
   gem.version = Phut::VERSION
   gem.summary = 'Virtual network in seconds.'
-  gem.description = 'A simple ruby network emulator '\
+  gem.description = 'A simple network emulator '\
                     'with capabilities similar to mininet.'
 
   gem.license = 'GPL3'
@@ -23,7 +23,7 @@ Gem::Specification.new do |gem|
 
   gem.required_ruby_version = '>= 2.0.0'
 
-  gem.add_dependency 'gli', '~> 2.13.0'
+  gem.add_dependency 'gli', '~> 2.13.1'
   gem.add_dependency 'pio', '~> 0.20.0'
   gem.add_dependency 'pry', '~> 0.10.1'
 
@@ -32,11 +32,11 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'yard', '~> 0.8.7.6'
 
   # Development
-  gem.add_development_dependency 'byebug', '~> 4.0.5'
+  gem.add_development_dependency 'byebug', '~> 5.0.0'
   gem.add_development_dependency 'guard', '~> 2.12.5'
   gem.add_development_dependency 'guard-bundler', '~> 2.1.0'
   gem.add_development_dependency 'guard-cucumber', '~> 1.6.0'
-  gem.add_development_dependency 'guard-rspec', '~> 4.5.0'
+  gem.add_development_dependency 'guard-rspec', '~> 4.5.1'
   gem.add_development_dependency 'guard-rubocop', '~> 1.2.0'
 
   # Test
@@ -47,8 +47,8 @@ Gem::Specification.new do |gem|
   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', '~> 2.1.0'
+  gem.add_development_dependency 'reek', '~> 2.2.1'
   gem.add_development_dependency 'rspec', '~> 3.2.0'
   gem.add_development_dependency 'rspec-given', '~> 3.7.0'
-  gem.add_development_dependency 'rubocop', '~> 0.30.0'
+  gem.add_development_dependency 'rubocop', '~> 0.31.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phut
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Yasuhito Takamiya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-22 00:00:00.000000000 Z
+date: 2015-06-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 2.13.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: 2.13.1
 - !ruby/object:Gem::Dependency
   name: pio
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.5
+        version: 5.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.5
+        version: 5.0.0
 - !ruby/object:Gem::Dependency
   name: guard
   requirement: !ruby/object:Gem::Requirement
@@ -142,14 +142,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: 4.5.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 4.5.0
+        version: 4.5.1
 - !ruby/object:Gem::Dependency
   name: guard-rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -268,14 +268,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 2.2.1
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -310,15 +310,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.30.0
+        version: 0.31.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.30.0
-description: A simple ruby network emulator with capabilities similar to mininet.
+        version: 0.31.0
+description: A simple network emulator with capabilities similar to mininet.
 email:
 - yasuhito@gmail.com
 executables:
@@ -402,7 +402,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Virtual network in seconds.