phut 0.7.7 → 0.7.8

data/test/phut/veth_test.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+require 'active_support/core_ext/array/access'
+require 'minitest/autorun'
+require 'phut/link'
+require 'phut/veth'
+
+module Phut
+  class VethTest < Minitest::Test
+    def test_veth_all
+      assert Veth.all.empty?
+
+      Link.create :switch1, :switch2
+      assert_equal 2, Veth.all.size
+      assert_equal 'switch1', Veth.all.sort.first.name
+      assert_equal 'switch2', Veth.all.sort.second.name
+    end
+
+    def test_name
+      assert_equal 'switch1', Veth.new(name: 'switch1', link_id: 0).name
+      assert_equal '192.168.0.1', Veth.new(name: '192.168.0.1', link_id: 0).name
+    end
+
+    def test_device
+      assert_equal 'L0_switch1', Veth.new(name: 'switch1', link_id: 0).device
+      assert_equal 'L0_c0a80001', Veth.new(name: '192.168.0.1', link_id: 0).device
+    end
+
+    private
+
+    def setup
+      log_dir = File.expand_path('../../log', __dir__)
+      Phut.logger = ::Logger.new("#{log_dir}/test.log")
+      destroy_all
+    end
+
+    def teardown
+      destroy_all
+    end
+
+    def destroy_all
+      `ifconfig -a`.split("\n").each do |each|
+        next unless /^(#{Veth::PREFIX}\S+)/ =~ each
+        system "sudo ip link delete #{Regexp.last_match(1)} 2>/dev/null"
+      end
+    end
+  end
+end

data/test/phut/vhost_test.rb

@@ -0,0 +1,56 @@
+# frozen_string_literal: true
+
+require 'faker'
+require 'phut/vhost'
+
+module Phut
+  class VhostTest < Minitest::Test
+    def test_vhost_all
+      assert Vhost.all.empty?
+    end
+
+    def test_vhost_create
+      link = Link.create('host', 'switch')
+      vhost = Vhost.create(name: 'myhost',
+                           ip_address: Faker::Internet.ip_v4_address,
+                           mac_address: Faker::Internet.mac_address,
+                           device: link.device('host'))
+
+      assert_equal 1, Vhost.all.size
+      assert_equal 'myhost', vhost.name
+      assert_equal link.device('host'), vhost.device
+    end
+
+    def test_kill
+      link = Link.create('host', 'switch')
+      vhost = Vhost.create(name: 'myhost',
+                           ip_address: Faker::Internet.ip_v4_address,
+                           mac_address: Faker::Internet.mac_address,
+                           device: link.device('host'))
+      vhost.kill
+
+      assert Vhost.all.empty?
+    end
+
+    private
+
+    def setup
+      Phut.log_dir = test_dir('log')
+      Phut.pid_dir = test_dir('tmp/pids')
+      Phut.socket_dir = test_dir('tmp/sockets')
+
+      Vhost.all.each(&:kill)
+    end
+
+    def teardown
+      Vhost.all.each(&:kill)
+      Link.destroy_all
+    end
+
+    def test_dir(path)
+      dir = File.expand_path(path, File.expand_path('../..', __dir__))
+      FileUtils.mkdir_p(dir) unless File.exist?(dir)
+      dir
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phut
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.7.8
 platform: ruby
 authors:
 - Yasuhito Takamiya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-12 00:00:00.000000000 Z
+date: 2017-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -16,48 +16,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.5
+        version: 5.1.0
   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
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.4
+        version: 2.16.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.13.4
+        version: 2.16.0
 - !ruby/object:Gem::Dependency
   name: pio
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.30.0
+        version: 0.30.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.30.0
+        version: 0.30.2
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
@@ -72,258 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.10.3
-- !ruby/object:Gem::Dependency
-  name: relish
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.7.6
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.7.6
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.13.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.13.0
-- !ruby/object:Gem::Dependency
-  name: guard-bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.1.0
-- !ruby/object:Gem::Dependency
-  name: guard-cucumber
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.0.0
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.6.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.6.4
-- !ruby/object:Gem::Dependency
-  name: guard-rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 1.2.0
-- !ruby/object:Gem::Dependency
-  name: aruba
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.11.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.11.2
-- !ruby/object:Gem::Dependency
-  name: codeclimate-test-reporter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.10
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.8.10
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.1.0
-- !ruby/object:Gem::Dependency
-  name: flay
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.6.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.6.1
-- !ruby/object:Gem::Dependency
-  name: flog
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.3.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 4.3.2
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: reek
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.7.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.7.1
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.4.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.4.0
-- !ruby/object:Gem::Dependency
-  name: rspec-given
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.7.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.7.1
-- !ruby/object:Gem::Dependency
-  name: rubocop
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.35.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.35.1
 description: A simple network emulator with capabilities similar to mininet.
 email:
 - yasuhito@gmail.com
@@ -336,35 +78,45 @@ extra_rdoc_files:
 files:
 - ".gitignore"
 - ".hound.yml"
-- ".rspec"
 - ".rubocop.yml"
 - ".travis.yml"
 - CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
-- Guardfile
+- Gemfile.lock
 - LICENSE
 - README.md
 - Rakefile
 - bin/phut
 - bin/vhost
-- features/dsl.feature
-- features/dsl_link.feature
-- features/dsl_vhost.feature
-- features/dsl_vswitch.feature
+- features/dsl/error.feature
+- features/dsl/link.feature
+- features/dsl/netns.feature
+- features/dsl/vhost.feature
+- features/dsl/vswitch.feature
 - features/phut.feature
-- features/phut_kill.feature
-- features/shell.feature
+- features/phut_run.feature
+- features/shell/vswitch#destroy.feature
+- features/shell/vswitch#ports.feature
+- features/shell/vswitch.all.feature
+- features/shell/vswitch.create.feature
+- features/shell/vswitch.destroy.feature
+- features/shell/vswitch.destroy_all.feature
+- features/step_definitions/link_steps.rb
+- features/step_definitions/netns_steps.rb
 - features/step_definitions/phut_steps.rb
+- features/step_definitions/vhost_steps.rb
+- features/step_definitions/vswitch_steps.rb
 - features/support/env.rb
 - features/support/hooks.rb
 - lib/phut.rb
-- lib/phut/configuration.rb
+- lib/phut/finder.rb
+- lib/phut/link.rb
 - lib/phut/netns.rb
-- lib/phut/null_logger.rb
 - lib/phut/open_vswitch.rb
 - lib/phut/parser.rb
 - lib/phut/raw_socket.rb
+- lib/phut/route.rb
 - lib/phut/setting.rb
 - lib/phut/shell_runner.rb
 - lib/phut/syntax.rb
@@ -373,28 +125,31 @@ files:
 - lib/phut/syntax/vhost_directive.rb
 - lib/phut/syntax/vswitch_directive.rb
 - lib/phut/version.rb
+- lib/phut/veth.rb
 - lib/phut/vhost.rb
 - lib/phut/vhost_daemon.rb
-- lib/phut/virtual_link.rb
+- lib/phut/vsctl.rb
+- lib/phut/vswitch.rb
 - phut.gemspec
-- spec/phut/parser_spec.rb
-- spec/phut_spec.rb
-- spec/spec_helper.rb
 - tasks/.gitignore
-- tasks/LICENSE
 - tasks/README.md
 - tasks/cucumber.rake
 - tasks/flay.rake
 - tasks/flog.rake
 - tasks/gem.rake
+- tasks/minitest.rake
 - tasks/reek.rake
-- tasks/relish.rake
-- tasks/rspec.rake
 - tasks/rubocop.rake
 - tasks/yard.rake
+- test/phut/link_test.rb
+- test/phut/netns_test.rb
+- test/phut/open_vswitch_test.rb
+- test/phut/veth_test.rb
+- test/phut/vhost_test.rb
 homepage: http://github.com/trema/phut
 licenses:
-- GPL3
+- GPLv2
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -404,7 +159,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -412,9 +167,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Virtual network in seconds.
 test_files: []
-has_rdoc: