phut 0.7.7 → 0.7.8

data/.rspec

@@ -1,3 +0,0 @@
---require spec_helper
---order random
---color

data/Guardfile

@@ -1,29 +0,0 @@
-guard :rspec, cmd: 'bundle exec rspec' do
-  watch(%r{^spec/phut/.+_spec\.rb$})
-  watch(%r{^lib/phut/(.+)\.rb$}) { |m| "spec/phut/#{m[1]}_spec.rb" }
-  watch('spec/spec_helper.rb') { 'spec' }
-end
-
-guard :bundler do
-  watch('Gemfile')
-  watch(/^.+\.gemspec/)
-end
-
-guard :rubocop, all_on_start: false do
-  watch('Gemfile')
-  watch('Guardfile')
-  watch('Rakefile')
-  watch('bin/phut')
-  watch(/.+\.rake$/)
-  watch(/.+\.rb$/)
-  watch(%r{(?:.+/)?\.rubocop\.yml$}) { |m| File.dirname(m[0]) }
-end
-
-guard 'cucumber', cli: '--tags ~@sudo --tags ~@shell' do
-  watch('bin/phut') { 'features' }
-  watch(%r{^features/.+\.feature$})
-  watch(%r{^features/support/.+$}) { 'features' }
-  watch(%r{^features/step_definitions/(.+)_steps\.rb$}) do |m|
-    Dir[File.join("**/#{m[1]}.feature")][0] || 'features'
-  end
-end

data/features/dsl_vhost.feature

@@ -1,37 +0,0 @@
-Feature: The vhost DSL directive.
-  @sudo
-  Scenario: phut run with "vhost { ip ... }"
-    Given a file named "network.conf" with:
-    """
-    vhost { ip '192.168.0.1' }
-    vhost { ip '192.168.0.2' }
-    link '192.168.0.1', '192.168.0.2'
-    """
-    When I do phut run "network.conf"
-    Then a vhost named "192.168.0.1" launches
-    And a vhost named "192.168.0.2" launches
-
-  @sudo
-  Scenario: phut run with "vhost(alias) { ... }"
-    Given a file named "network.conf" with:
-    """
-    vhost('host1') { ip '192.168.0.1' }
-    vhost('host2') { ip '192.168.0.2' }
-    link 'host1', 'host2'
-    """
-    When I do phut run "network.conf"
-    Then a vhost named "host1" launches
-    And a vhost named "host2" launches
-
-  @sudo
-  Scenario: phut run with "vhost(alias)"
-    Given a file named "network.conf" with:
-    """
-    vhost('host1')
-    vhost('host2')
-    link 'host1', 'host2'
-    """
-    When I do phut run "network.conf"
-    Then a vhost named "host1" launches
-    And a vhost named "host2" launches
-

data/features/phut_kill.feature

@@ -1,27 +0,0 @@
-Feature: phut kill command
-  Background:
-    Given a file named "network.conf" with:
-      """
-      vswitch { datapath_id 0xabc }
-
-      vhost('host1') { ip '192.168.0.1' }
-      vhost('host2') { ip '192.168.0.2' }
-
-      link '0xabc', 'host1'
-      link '0xabc', 'host2'
-      """
-    And I do phut run "network.conf"
-
-  @sudo
-  Scenario: phut kill vswitch_name
-    When I do phut kill "0xabc"
-    And I run `sudo ovs-vsctl list-br`
-    Then the output from "sudo ovs-vsctl list-br" should not contain "br0xabc"
-
-  @sudo
-  Scenario: phut kill vhost_name
-    When I do phut kill "host1"
-    And I successfully run `sleep 5`
-    Then the following files should not exist:
-      | vhost.host1.pid |
-      | vhost.host1.ctl |

data/features/shell.feature

@@ -1,39 +0,0 @@
-Feature: Shell
-  Background:
-    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 sleep 1
-    Then a vswitch named "0xabc" should be running
-
-  @shell
-  Scenario: vswitch STRING
-    When I type "vswitch '0xabc'"
-    And I type "quit"
-    And sleep 1
-    Then a vswitch named "0xabc" should be running
-
-  @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 "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"
-    And sleep 1
-    Then a vswitch named "0xabc" should not be running
-
-  @shell
-  Scenario: Kill without run and fail
-    When I type "kill 0xabc"
-    And I type "quit"
-    Then the output should contain "Open vSwitch (dpid = 0xabc) is not running!"

data/lib/phut/configuration.rb

@@ -1,92 +0,0 @@
-require 'phut/null_logger'
-require 'phut/open_vswitch'
-
-module Phut
-  # Parsed DSL data.
-  class Configuration
-    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
-        [OpenVswitch, Vhost, Netns].each do |each|
-          found = each.find_by(name: key)
-          return found if found
-        end
-        fail "Invalid key: #{key.inspect}"
-      when Array
-        VirtualLink.each do |each|
-          return each if [each.name_a, each.name_b].sort == key.sort
-        end
-        fail "link #{key.join ' '} not found."
-      else
-        fail "Invalid key: #{key.inspect}"
-      end
-    end
-    # rubocop:enable MethodLength
-
-    def update_connections
-      update_vswitch_ports
-      update_vhost_interfaces
-      update_netns_interfaces
-      self
-    end
-
-    def run
-      [VirtualLink, Vhost, Netns, OpenVswitch].each do |klass|
-        klass.each(&:run)
-      end
-    end
-
-    def stop
-      [OpenVswitch, Vhost, Netns, VirtualLink].each do |klass|
-        klass.each(&:stop)
-      end
-    end
-
-    private
-
-    def update_vswitch_ports
-      VirtualLink.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)
-      OpenVswitch.select { |each| link.connect_to?(each) }
-    end
-
-    def update_vhost_interfaces
-      Vhost.each do |each|
-        each.network_device = find_network_device(each)
-      end
-    end
-
-    def update_netns_interfaces
-      Netns.each do |each|
-        each.network_device = find_network_device(each)
-      end
-    end
-
-    def find_network_device(vhost)
-      VirtualLink.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/null_logger.rb

@@ -1,14 +0,0 @@
-require 'logger'
-
-module Phut
-  # Null logger
-  class NullLogger < Logger
-    def initialize(*_args)
-      # noop
-    end
-
-    def add(*_args, &_block)
-      # noop
-    end
-  end
-end

data/lib/phut/virtual_link.rb

@@ -1,109 +0,0 @@
-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
-      attr_writer :port_number
-
-      def initialize(name)
-        @name = name
-      end
-
-      def to_s
-        @name.tr('.', '_') + port_number_string
-      end
-
-      def inspect
-        to_s
-      end
-
-      private
-
-      def port_number_string
-        @port_number ? '_' + @port_number.to_s : ''
-      end
-    end
-
-    include ShellRunner
-
-    attr_reader :name_a
-    attr_reader :name_b
-    attr_reader :device_a
-    attr_reader :device_b
-
-    def initialize(name_a, name_b, logger)
-      fail if name_a == name_b
-      @name_a = name_a
-      @name_b = name_b
-      @device_a = NetworkDeviceName.new(name_a)
-      @device_b = NetworkDeviceName.new(name_b)
-      @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
-      up
-    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 up?
-      /^#{@device_a}\s+Link encap:Ethernet/ =~ `LANG=C ifconfig -a` || false
-    end
-
-    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
-
-    def add
-      sh "sudo ip link add name #{@device_a} type veth peer name #{@device_b}"
-      sh "sudo /sbin/sysctl -q -w net.ipv6.conf.#{@device_a}.disable_ipv6=1"
-      sh "sudo /sbin/sysctl -q -w net.ipv6.conf.#{@device_b}.disable_ipv6=1"
-    end
-
-    def up
-      sh "sudo /sbin/ifconfig #{@device_a} up"
-      sh "sudo /sbin/ifconfig #{@device_b} up"
-    end
-  end
-end

data/spec/phut/parser_spec.rb

@@ -1,66 +0,0 @@
-require 'phut'
-require 'stringio'
-
-describe Phut::Parser do
-  describe '#parse' do
-    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 { configuration.fetch('0xabc').datapath_id == 0xabc }
-        Then { configuration.fetch('0xabc').dpid == 0xabc }
-      end
-    end
-
-    context "with 'vswitch { datapath_id '0xabc' }" do
-      When(:string) { "vswitch { datapath_id '0xabc' }" }
-
-      describe '#vswitch' do
-        Then { configuration.fetch('0xabc').dpid == 0xabc }
-        Then { configuration.fetch('0xabc').datapath_id == 0xabc }
-      end
-    end
-
-    context "with 'vswitch('my_controller') { dpid '0xabc' }'" do
-      When(:string) { "vswitch('my_controller') { dpid '0xabc' }" }
-
-      describe '#vswitch' do
-        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
-        <<-CONFIGURATION
-        vhost { ip '192.168.0.1' }
-        vhost { ip '192.168.0.2' }
-        link '192.168.0.1', '192.168.0.2'
-CONFIGURATION
-      end
-
-      describe '#vhost' do
-        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
-        <<-CONFIGURATION
-        vhost('host1') { ip '192.168.0.1' }
-        vhost('host2') { ip '192.168.0.2' }
-        link 'host1', 'host2'
-CONFIGURATION
-      end
-
-      describe '#vhost' do
-        Then { configuration.fetch('host1').ip_address == '192.168.0.1' }
-      end
-    end
-  end
-end

data/spec/phut_spec.rb

@@ -1,45 +0,0 @@
-require 'phut/setting'
-
-describe Phut do
-  Given { allow(FileTest).to receive(:directory?).and_return(true) }
-
-  describe '.pid_dir' do
-    Given(:result) { Phut.pid_dir }
-    Then { result == Dir.tmpdir }
-
-    context "pid_dir = '/tmp/pid'" do
-      Given { Phut.pid_dir = '/tmp/pid' }
-      Then { result == '/tmp/pid' }
-    end
-
-    context "pid_dir = '.'" do
-      Given { Phut.pid_dir = '.' }
-      Then { result == File.expand_path('.') }
-    end
-  end
-
-  describe '.log_dir' do
-    Given(:result) { Phut.log_dir }
-    Then { result == Dir.tmpdir }
-
-    context "log_dir = '/tmp/log'" do
-      Given { Phut.log_dir = '/tmp/log' }
-      Then { result == '/tmp/log' }
-    end
-
-    context "log_dir = '.'" do
-      Given { Phut.log_dir = '.' }
-      Then { result == File.expand_path('.') }
-    end
-  end
-
-  describe '.socket_dir' do
-    Given(:result) { Phut.socket_dir }
-    Then { result == Dir.tmpdir }
-
-    context "socket_dir = '/tmp/socket'" do
-      Given { Phut.socket_dir = '/tmp/socket' }
-      Then { result == '/tmp/socket' }
-    end
-  end
-end