phut 0.6.1 → 0.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d3154248cc5c06ba4b45575fa25f1199e8305430
-  data.tar.gz: b6f4eb3d52c9ec624c539a6fcbd4026879c2e70b
+  metadata.gz: cc1003ee6a5a95a02df6ec9e078d0a0af4d28695
+  data.tar.gz: 6edafd0300df63624d9bb2a55c2a4a8bc7f6e613
 SHA512:
-  metadata.gz: 33c9b7c2b74092e5e75b6893dd73d4f3552281b7ca6c84088c2560a492d8e5a8c96bf63ad9f3db54e31aa7c23588304c96030e82e622e77418830296fee9f6f2
-  data.tar.gz: b65ad6847e693199626e071f70f8db09cacf2755f073af6f9f72b75080fc99c0c8e6aac97d96eea7a7ce08e8c18b6c879f8385e220e53e1d8b6e9e446635bf46
+  metadata.gz: 3f1005ad8db1a26a5879d5c5e3e1e9d1cebf58bdf9ccf5a3fbd6ea4380719ebbf17878d62db89a0a7add60c4b2c019fc66d95a3a06d3cfdb6157635afde89222
+  data.tar.gz: 37a6403bf6e10848fe58bb779156bdcb5c8ffc27290e2ea94bf037de78b94e1d9b3acc7870eebbd3e5d10a1fc924bd0e60e02ebca26674451fc07795dfda6322

data/CHANGELOG.md

@@ -3,6 +3,11 @@
 ## develop (unreleased)
 
 
+## 0.6.2 (6/3/2015)
+### Bugs fixed
+* Delete a vhost.*.ctl socket file after the vhost process is killed.
+
+
 ## 0.6.1 (6/1/2015)
 ### Bugs fixed
 * Use the default port number (6653) if `port` attribute is not set.

data/bin/phut

@@ -101,9 +101,19 @@ module Phut
       end
     end
 
+    desc 'Kills a vswitch or a vhost'
+    arg_name 'NAME'
     command :kill do |c|
-      c.action do |_global_options, _options, args|
-        args.each { |each| Phut::OpenVswitch.new(each).shutdown }
+      c.desc 'Location to find socket files'
+      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
+        end
       end
     end
 

data/features/phut_kill.feature

@@ -0,0 +1,27 @@
+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/step_definitions/phut_steps.rb

@@ -6,6 +6,11 @@ When(/^I do phut run "(.*?)"$/) do |file_name|
   step %(I run `phut -v run #{run_opts} #{@config_file}`)
 end
 
+When(/^I do phut kill "(.*?)"$/) do |name|
+  run_opts = "-s #{@socket_dir}"
+  step %(I successfully run `phut -v kill #{run_opts} #{name}`)
+end
+
 Then(/^a vswitch named "(.*?)" should be running$/) do |name|
   expect(system("sudo ovs-vsctl br-exists br#{name}")).to be_truthy
 end

data/lib/phut/version.rb

@@ -1,4 +1,4 @@
 # Base module.
 module Phut
-  VERSION = '0.6.1'
+  VERSION = '0.6.2'
 end

data/lib/phut/vhost_daemon.rb

@@ -113,6 +113,7 @@ module Phut
       @logger.error $ERROR_INFO if $ERROR_INFO
       @logger.info 'Shutting down...'
       FileUtils.rm pid_file if running?
+      DRb.stop_service
       fail $ERROR_INFO if $ERROR_INFO
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phut
 version: !ruby/object:Gem::Version
-  version: 0.6.1
+  version: 0.6.2
 platform: ruby
 authors:
 - Yasuhito Takamiya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-01 00:00:00.000000000 Z
+date: 2015-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -348,6 +348,7 @@ files:
 - features/dsl_vhost.feature
 - features/dsl_vswitch.feature
 - features/phut.feature
+- features/phut_kill.feature
 - features/shell.feature
 - features/step_definitions/phut_steps.rb
 - features/support/env.rb