ovsimager 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 234eece9031326d4bbc2ca1a61ea72e8252337a2
-  data.tar.gz: 0afac00d5009ca9ed6d064ba04f2837da9fcfff4
+  metadata.gz: c95b1e3a5c4aa98a5447d7e5b3a96a244537b9c1
+  data.tar.gz: a7c0ea9f9ca44e1b3dbc266a09b86840a428c8c2
 SHA512:
-  metadata.gz: 287343119b27f3522b1fa6834261aa11b9d0d95489ae81d100c4e8074fc673d010062068f3cd80ccc2b56f15bccec5eae98fff2fddc8c23504f10ec5ca22a821
-  data.tar.gz: 842bb4fd1a09597b33a02898daeb4b021ea6ff617fbe7c777c665801ca69ecf5ff4e57673d0e25d2188de7fc105a53bc2ea98f882dffe5fdbfec4b5527a82f43
+  metadata.gz: d5cc6089f1c1012e478da97d78ec10fc6942a27f0c1eadf32cdcf67f7cbb07a54133e167ed2d4f0ca341a2ed384e471b62c126174ddd2b94bb0ba3f0b9618cb5
+  data.tar.gz: 32cb75f7b6e716dd598bffc27cf51ffee2512a703529137d8ad254f60467dfc16c8022ea50f98447fffca43fe5de6696b352e5cc4c15b54fbfc11abfa6a7d3c0

data/lib/ovsimager/dotwriter.rb

@@ -5,82 +5,110 @@ module OVSImager
       @dot = File.open(fname, 'w')
       @dot.puts 'graph interfaces {'
       @dot.puts '  compound=true'
-      @dot.puts '  node [shape=rect]'
+      @dot.puts '  node [shape=rect,margin=0.1]'
       @dot_peers = []
     end
 
-    def escape(name)
-      name.to_s.gsub('-', '_')
-    end
-
-    def mark2color(mark)
-      {'<' => 'red', '>' => 'pink', '*' => 'yellow'}[mark]
-    end
-
     def finish(pngname)
       @dot.puts @dot_peers.join "\n"
       @dot.puts '}'
       @dot.close
       @dot = nil
-      system("dot -Tpng \"#{@fname}\" -o \"#{pngname}\"")
+
+      unless system("dot -Tpng \"#{@fname}\" -o \"#{pngname}\"")
+        puts "Failed to execute dot command: #$?"
+      end
     end
 
-    # For OVSVS & LinuxBridge
-    def br_begin(name, br_type)
+    # Draw OVSVS & LinuxBridge
+    def bridge(name, br_type)
       @dot.puts "  subgraph cluster_br__#{escape(name)} {"
       @dot.puts "    label = \"#{br_type}Bridge #{name}\""
-    end
 
-    def br_iface(name, mark, dump, inet, tag, peer, remote=nil)
-      fill = mark ? "fillcolor=#{mark2color(mark)},style=filled," : ''
-      label = "#{name}<BR/><FONT POINT-SIZE=\"10\">#{inet.join(',')}"
-      if tag or remote
-        label += "<BR/>#{tag}#{remote && remote.gsub('>','&gt;')}"
-      end
-      if dump
-        label += " </FONT><FONT COLOR=\"blue\">"
-        if dump[0] && dump[2] && dump[0] == dump[3] && dump[1] == dump[2]
-          label += "<BR/>[#{dump[0]} &lt;-&gt; #{dump[1]}]"
-        else
-          label += "<BR/>[#{dump[0]} --&gt; #{dump[1]}]" if dump[0]
-          label += "<BR/>[#{dump[3]} &lt;-- #{dump[2]}]" if dump[2]
-        end
-      end
-      label += " </FONT>"
-      @dot.puts "    #{escape(name)} [#{fill}label=<#{label}>]"
-      if peer && name <= peer
-        @dot_peers << "  #{escape(name)} -- #{escape(peer)}"
-      end
-    end
+      yield BridgeWriter.new(@dot, @dot_peers)
 
-    def br_end
       @dot.puts "  }"
     end
 
-    # For IPNetNS
-    def ns_begin(name)
+    # Draw IPNetNS
+    def namespace(name)
       @dot.puts "  subgraph cluster_ns__#{escape(name)} {"
       @dot.puts "  label = \"Namespace\\n#{name}\""
       @dot.puts "  style = \"filled\""
       @dot.puts "  fillcolor = \"#eeeeee\""
       @dot.puts "  ns__#{escape(name)} " +
         "[label=\"\",style=invis,width=0,height=0,margin=0]"
-      @nsname = name
+
+      yield NSWriter.new(@dot, @dot_peers, name)
+
+      @dot.puts '  }'
     end
 
-    def ns_br_iface(name)
-      @dot_peers << "  #{escape(name)} -- ns__#{escape(@nsname)} " +
-        "[style=dashed,lhead=cluster_ns__#{escape(@nsname)}]"
+    private
+    def escape(name)
+      Utils.escape_nodename(name)
     end
 
-    def ns_iface(name, mark, dump, inet, tag, peer)
-      br_iface(name, mark, dump, inet, tag, peer)
-      # @dot.puts "    #{escape(name)} -- #{escape(@last)} [style=invis]" if @last
-      # @last = name
+    class BridgeWriter
+      def initialize(dot, dot_peers)
+        @dot = dot
+        @dot_peers = dot_peers
+      end
+
+      def add_iface(name, mark, dump, inet, tag, peer, remote=nil)
+        fill = mark ? "fillcolor=#{mark2color(mark)},style=filled," : ''
+        label = "#{name}<BR/><FONT POINT-SIZE=\"10\">#{inet.join('<BR/>')}"
+        if tag or remote
+          label += "<BR/>#{tag}#{remote && remote.gsub('>','&gt;')}"
+        end
+        if dump
+          label += " </FONT><FONT COLOR=\"blue\">"
+          if dump[0] && dump[2] && dump[0] == dump[3] && dump[1] == dump[2]
+            label += "<BR/>[#{dump[0]} &lt;-&gt; #{dump[1]}]"
+          else
+            label += "<BR/>[#{dump[0]} --&gt; #{dump[1]}]" if dump[0]
+            label += "<BR/>[#{dump[3]} &lt;-- #{dump[2]}]" if dump[2]
+          end
+          if dump[4] && dump[4][:cap]
+            cap = dump[4][:cap]
+            label += "<BR/><FONT POINT-SIZE=\"10\">(#{cap[2]} #{cap[3]} " +
+              "#{cap[0]}&lt;=&gt;#{cap[1]})</FONT>"
+          end
+        end
+        label += " </FONT>"
+        @dot.puts "    #{escape(name)} [#{fill}label=<#{label}>]"
+        if peer
+          if peer[0] == ' '
+            @dot_peers << "  #{escape(peer.strip)} -- #{escape(name)}"
+          elsif name <= peer
+            @dot_peers << "  #{escape(name)} -- #{escape(peer)}"
+          end
+        end
+      end
+
+      private
+      def mark2color(mark)
+        {'<' => 'red', '>' => 'pink', '*' => 'yellow'}[mark]
+      end
+
+      def escape(name)
+        Utils.escape_nodename(name)
+      end
     end
 
-    def ns_end
-      @dot.puts '  }'
+    # Draw namespace
+    class NSWriter < BridgeWriter
+      def initialize(dot, dot_peers, nsname)
+        @dot = dot
+        @dot_peers = dot_peers
+        @nsname = nsname
+      end
+
+      def add_br_iface(name)
+        @dot_peers << "  #{escape(name)} -- ns__#{escape(@nsname)} " +
+          "[style=dashed,lhead=cluster_ns__#{escape(@nsname)}]"
+      end
     end
+
   end
 end

data/lib/ovsimager/ipnetns.rb

@@ -17,6 +17,10 @@ module OVSImager
       find_veth_pair
     end
 
+    def ns()
+      @ns
+    end
+
     def to_hash()
       @ifaces
     end
@@ -36,8 +40,9 @@ module OVSImager
     private
     def parse(out, args)
       out.split(/\n(?=[^ \s])/).map do |iface|
-        if iface.match(/^(\d+):\s+(\S+?)(?:@\S+)?:+/)
+        if iface.match(/^(\d+):\s+(\S+?)(?:@(\S+))?:+/)
           params = {:id => $1, :name => $2}
+          params[:peer] = $3 if $3 && $3 != 'NONE' && $3[0,2] != 'if'
           yield params, iface, args
         else
           STDERR.puts "IPNetNS: parse error: #{iface}"

data/lib/ovsimager/linuxbridge.rb

@@ -2,21 +2,26 @@ require_relative 'utils'
 
 module OVSImager
   class LinuxBridge
-    def initialize()
+    def initialize(ns=[])
       brctl_out = exec_brtcl
       @br = parse brctl_out
+      ns.each do |n|
+        brctl_out = exec_brtcl(n)
+        @br = @br.merge parse(brctl_out, ns)
+      end
     end
 
     def to_hash()
       return @br
     end
 
-    def exec_brtcl()
-      Utils.execute('brctl show')
+    def exec_brtcl(ns=nil)
+      ns_prefix = ns ? "ip netns exec #{ns} " : ''
+      Utils.execute(ns_prefix + 'brctl show', !!ns)
     end
 
     private
-    def parse(str)
+    def parse(str, ns=:root)
       params = {}
       str.split(/\n(?=\S)/)[1..-1].map do |br|
         data = br.split
@@ -25,6 +30,7 @@ module OVSImager
           :id => data[1],
           :stp => data[2],
           :interfaces => [data[0]] + data[3..-1],
+          :ns => ns,
         }
       end
       params

data/lib/ovsimager/ovsimager.rb

@@ -7,16 +7,17 @@ require_relative 'dotwriter'
 
 module OVSImager
   class OVSImager
-    DOT_FILENAME = 'interfaces.dot'
-    PNG_FILENAME = 'interfaces.png'
+    DEFAULT_DOT_FILENAME = 'interfaces.dot'
+    DEFAULT_PNG_FILENAME = 'interfaces.png'
 
     def initialize(dump_mode=false, ping_from=nil, ping_to=nil)
       @netns = IPNetNS.new
       @ifaces = @netns.ifaces_hash
-      @linbr = LinuxBridge.new
+      @linbr = LinuxBridge.new(@netns.ns)
       @ovsvs = OVSVS.new
 
-      @dotwriter = DotWriter.new(DOT_FILENAME)
+      @dot_filename = DEFAULT_DOT_FILENAME
+      @png_filename = DEFAULT_PNG_FILENAME
 
       @dump_mode = dump_mode
       @mark = {}
@@ -41,12 +42,17 @@ module OVSImager
                 "send ping to specified address") do |v|
           @ping_to = v
         end
+        opts.on("-o FILENAME.png", "--out FILENAME.png",
+                "output PNG filename (default: interfaces.png)") do |v|
+          @png_filename = v
+          @dot_filename = v.sub(/\.png$/i, '') + '.dot'
+        end
       end.parse!
     end
 
     def execute_dump
       return unless @dump_mode
-      tcpdump = TcpDump.new(@ping_from && @ping_to, @ping_from, @ping_to)
+      tcpdump = TcpDump.new(!!@ping_to, @ping_from, @ping_to)
       @dump_result = tcpdump.test(@ifaces)
       @dump_result.each do |(iface, result)|
         if result[0] && result[2]
@@ -60,17 +66,18 @@ module OVSImager
     end
 
     def show_all
+      @dotwriter = DotWriter.new(@dot_filename)
       show_ovsvs
       puts '-' * 80
       show_linbr
       puts '-' * 80
       show_netns
-      @dotwriter.finish(PNG_FILENAME) if @dotwriter
+      @dotwriter.finish(@png_filename)
       @dotwriter = nil
     end
 
     private
-    def show_iface_common(name, inet, patch, tag='', ns='')
+    def show_iface_common(name, inet, patch='', tag='', ns='')
       puts "    [#{@mark[name]||' '}] #{name}#{tag}#{patch}\t" +
         "#{inet.join(',')}\t#{ns}"
     end
@@ -83,62 +90,77 @@ module OVSImager
     def show_ovsvs
       @ovsvs.to_hash[:bridges].each do |br|
         puts "OVS Bridge #{br[:name]}:"
-        @dotwriter.br_begin(br[:name], 'OVS ')
-
-        br[:ports].each do |port|
-          name = port[:name]
-          iface = @ifaces[name] || {}
-          inet = iface[:inet] || []
-          tag = port[:tag] ? ' (tag=' + port[:tag] + ')' : ''
-          peer = port[:peer] || iface[:peer]
-          remote = port[:remote_ip] ?
-            " #{port[:local_ip] || ''} => #{port[:remote_ip]}" : ''
-          patch = peer ? ' <-> ' + peer : remote
-          ns = iface[:ns] == :root ? '' : iface[:ns]
-
-          show_iface_common(name, inet, patch, tag, ns)
-          @dotwriter.br_iface(name, @mark[name], @dump_result[name],
+        @dotwriter.bridge(br[:name], 'OVS ') do |dot_br|
+
+          br[:ports].each do |port|
+            name = port[:name]
+            iface = @ifaces[name] || {}
+            inet = iface[:inet] || []
+            tag = port[:tag] ? ' (tag=' + port[:tag] + ')' : ''
+            peer = port[:peer] || iface[:peer]
+            remote = port[:remote_ip] ?
+              " #{port[:local_ip] || ''} => #{port[:remote_ip]}" : ''
+            patch = peer ? ' <-> ' + peer : remote
+            ns = iface[:ns] == :root ? '' : iface[:ns]
+
+            show_iface_common(name, inet, patch, tag, ns)
+            dot_br.add_iface(name, @mark[name], @dump_result[name],
                              inet, tag, peer, remote)
-          @done[name] = true
+            @done[name] = true
+
+            port[:interfaces].each do |port_if|
+              port_name = port_if[:name]
+              if port_name != name
+                print "    "
+                port_inet = @ifaces[port_name] && @ifaces[port_name][:inet]
+                show_iface_common(port_name, inet)
+                dot_br.add_iface(port_name, @mark[port_name],
+                                 @dump_result[port_name], port_inet,
+                                 '', ' '+name)
+                ###
+                @done[port_name] = true
+              end
+            end
+          end
+
         end
-        @dotwriter.br_end
       end
     end
 
     def show_linbr
       @linbr.to_hash.each do |name, br|
         puts "Bridge #{name}"
-        @dotwriter.br_begin(name, '')
-        br[:interfaces].each do |ifname|
-          iface = @ifaces[ifname]
-          next unless iface
-          @dotwriter.br_iface(ifname, @mark[ifname], @dump_result[ifname],
-                              iface[:inet], iface[:tag], iface[:peer])
-          show_iface iface
-          @done[ifname] = true
+        @dotwriter.bridge(name, '') do |dot_br|
+          br[:interfaces].each do |ifname|
+            iface = @ifaces[ifname]
+            next unless iface
+            dot_br.add_iface(ifname, @mark[ifname], @dump_result[ifname],
+                             iface[:inet], iface[:tag], iface[:peer])
+            show_iface iface
+            @done[ifname] = true
+          end
         end
-        @dotwriter.br_end
       end
     end
 
     def show_netns
       @netns.to_hash.each do |name, ifaces|
         puts "Namespace #{name}"
-        @dotwriter.ns_begin(name)
-        ifaces.each do |iface|
-          ifname = iface[:name]
-          if ifname != 'lo' and !iface[:inet].empty?
-            if @done[ifname]
-              @dotwriter.ns_br_iface(ifname)
-            else
-              @dotwriter.ns_iface(ifname, @mark[ifname], @dump_result[ifname],
-                                  iface[:inet], iface[:tag], iface[:peer])
+        @dotwriter.namespace(name) do |dot_ns|
+          ifaces.each do |iface|
+            ifname = iface[:name]
+            if ifname != 'lo' and !iface[:inet].empty?
+              if @done[ifname]
+                dot_ns.add_br_iface(ifname)
+              else
+                dot_ns.add_iface(ifname, @mark[ifname], @dump_result[ifname],
+                                 iface[:inet], iface[:tag], iface[:peer])
+              end
             end
+            show_iface iface unless @done[iface[:name]]
+            @done[iface[:name]] = true
           end
-          show_iface iface unless @done[iface[:name]]
-          @done[iface[:name]] = true
         end
-        @dotwriter.ns_end
       end
     end
 

data/lib/ovsimager/tcpdump.rb

@@ -14,8 +14,8 @@ module OVSImager
       result = {}
       ping = nil
       if @ping
-        puts "Sending ping from #{@from} to #{@to} ..."
-        ping = IO.popen("ping -s #{SIZE} -c 15 -I #{@from} #{@to} >/dev/null", "r")
+        puts "Sending ping from #{@from||'default'} to #{@to} ..."
+        ping = IO.popen("ping -s #{SIZE} -c 15 #{@from?'-I '+@from:''} #{@to} >/dev/null", "r")
       end
 
       threads = ifaces.map do |(iface, iref)|
@@ -23,10 +23,13 @@ module OVSImager
           Thread.current[:iface] = iface
           ns = iref[:ns]
           nscmd = ns == :root ? '' : "ip netns exec #{ns} "
-          dump = IO.popen("exec #{nscmd}tcpdump -v -l -n -i #{iface} \\( icmp or udp port 4789 \\) and greater #{SIZE} 2>&1", "r")
+          dump = IO.popen("exec #{nscmd}tcpdump -v -l -n -nn -i #{iface} \\( icmp or udp port 4789 or proto gre \\) and greater #{SIZE} 2>&1", "r")
           puts dump.gets
           time_end = Time.now + 5
           req_from = req_to = rep_from = rep_to = nil
+          cap_from = cap_to = cap_type = cap_id = nil
+          cap = false
+          cap_line = 0
           while (waitmax = time_end - Time.now) > 0 do
             rs, ws, = IO.select([dump], [], [], waitmax)
             break unless rs
@@ -34,7 +37,14 @@ module OVSImager
               msg = r.gets
               break unless msg
               # puts msg
-              if msg.match(/length #{SIZE+8}/) &&
+              if msg.match(/([\da-f\.:]+)\.\d+ > ([\da-f\.:]+)\.\d+: (VXLAN).*vni (\d+)/) ||
+                  msg.match(/([\da-f\.:]+) > ([\da-f\.:]+): (GRE).*key=([\da-f]+)/)
+                cap_from = $1
+                cap_to = $2
+                cap_type = $3
+                cap_id = $4
+                cap_line = 3
+              elsif msg.match(/length #{SIZE+8}/) &&
                   msg.match(/([\da-f\.:]+) > ([\da-f\.:]+): ICMP echo (request|reply)/)
                 if $3 == 'request'
                   req_from = $1
@@ -43,14 +53,23 @@ module OVSImager
                   rep_from = $1
                   rep_to = $2
                 end
+                if cap_line > 0
+                  if $3 == 'request'
+                    cap = [cap_from, cap_to, cap_type, cap_id]
+                  else
+                    cap = [cap_to, cap_from, cap_type, cap_id]
+                  end
+                end
                 break if req_from && req_to && rep_from && rep_to
               end
+              cap_line -= 1 if cap_line > 0
             end
           end
           puts "Killing tcpdump(#{dump.pid}) on interface #{iface}."
           Process.kill('TERM', dump.pid)
           dump.close
-          result[iface] = [req_from, req_to, rep_from, rep_to]
+          result[iface] = [req_from, req_to, rep_from, rep_to, {}]
+          result[iface][4][:cap] = cap if cap
         end
       end
       threads.each {|th| th.join(10)}

data/lib/ovsimager/utils.rb

@@ -15,5 +15,9 @@ module OVSImager
       end
       return out
     end
+
+    def self.escape_nodename(name)
+      name.to_s.gsub('-', '_')
+    end
   end
 end

data/lib/ovsimager/version.rb

@@ -1,3 +1,3 @@
 module OVSImager
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ovsimager
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - NeoCat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-10 00:00:00.000000000 Z
+date: 2015-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -105,7 +105,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Draw graph of Open vSwitch virtual bridges.