ovsimager 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 942f5129336b94a275250c7beace88ff2845e1c7
-  data.tar.gz: 8b573ec884c8362da8d6f9b55ae95439dbd2e128
+  metadata.gz: 0af6a722ca075a7d9bcfd9b792b892fa97e24969
+  data.tar.gz: 5dcde2f06dedfe546934483f12ea0fc4560406e5
 SHA512:
-  metadata.gz: 7b8dcce662f61b16c1f6cdb282d50f85140f64fc50bc79eb7579c8db7730e85998378f560a03396897381e95da783fdc7695b65e7c757b4b2ebc9aaba4c99759
-  data.tar.gz: d4e2dbcae2702ce811a6bc1567b58c3772bb838bfe4f95c266971e07d736dc88614aa1e3d44c116a4ef509b42e350411f2da8a6d3ec81ce5ab5a934390c2c9a3
+  metadata.gz: 699eebe74d319453352ae91953e8db5804f6f273893d9e42ea2a51d5d91cc54827c19064232f5b68b170f7181bf1cfce928503dbd287df51fb8aeac3c921630c
+  data.tar.gz: 924751e4f3d08cda2f4427e2f0ae09dd61bf467c25afca2e03253de1701f193b79481a7e2b1374bbe5a5e4c9b69748f8c4ccb866131031e570b221199c363cc3

data/lib/ovsimager/dotwriter.rb

@@ -55,7 +55,7 @@ module OVSImager
         @dot_peers = dot_peers
       end
 
-      def add_iface(name, mark, dump, inet, tag, peer, remote=nil)
+      def add_iface(name, mark, dump, inet, tag, peer, remote=nil, ns=:root)
         fill = mark ? "fillcolor=#{mark2color(mark)},style=filled," : ''
         label = "#{name}<BR/><FONT POINT-SIZE=\"10\">#{inet.join('<BR/>')}"
         if tag or remote
@@ -76,12 +76,13 @@ module OVSImager
           end
         end
         label += " </FONT>"
-        @dot.puts "    #{escape(name)} [#{fill}label=<#{label}>]"
+        ename = escape(name) + (ns == :root ? '' : "___" + escape(ns.to_s))
+        @dot.puts "    #{ename} [#{fill}label=<#{label}>]"
         if peer
           if peer[0] == ' '
-            @dot_peers << "  #{escape(peer.strip)} -- #{escape(name)}"
+            @dot_peers << "  #{escape(peer.strip)} -- #{ename}"
           elsif name <= peer
-            @dot_peers << "  #{escape(name)} -- #{escape(peer)}"
+            @dot_peers << "  #{ename} -- #{escape(peer)}"
           end
         end
       end
@@ -104,8 +105,9 @@ module OVSImager
         @nsname = nsname
       end
 
-      def add_br_iface(name)
-        @dot_peers << "  #{escape(name)} -- ns__#{escape(@nsname)} " +
+      def add_br_iface(name, ns=:root)
+        ename = escape(name) + (ns == :root ? '' : "___" + escape(ns.to_s))
+        @dot_peers << "  #{ename} -- ns__#{escape(@nsname)} " +
           "[style=dashed,lhead=cluster_ns__#{escape(@nsname)}]"
       end
     end

data/lib/ovsimager/ipnetns.rb

@@ -25,8 +25,12 @@ module OVSImager
       @ifaces
     end
 
+    def ifname_ns(iface)
+      iface[:name] + (iface[:ns] == :root ? "" : ":" + iface[:ns].to_s)
+    end
+
     def ifaces_hash()
-      @ifaces.inject({}) {|h, (ns, v)| v.each {|i| h[i[:name]] = i}; h}
+      @ifaces.inject({}) {|h, (ns, v)| v.each {|i| h[ifname_ns(i)] = i}; h}
     end
 
     def ifaces_ary()

data/lib/ovsimager/ovsimager.rb

@@ -77,14 +77,22 @@ module OVSImager
     end
 
     private
-    def show_iface_common(name, inet, patch='', tag='', ns='')
-      puts "    [#{@mark[name]||' '}] #{name}#{tag}#{patch}\t" +
-        "#{inet.join(',')}\t#{ns}"
+    def ifname_ns(iface)
+      iface[:name] + (iface[:ns] == :root ? "" : ":" + iface[:ns].to_s)
+    end
+
+    def mark(name, ns)
+      @mark[name + (ns == :root ? "" : ":" + ns.to_s)]
+    end
+
+    def show_iface_common(name, inet, patch='', tag='', ns=:root)
+      puts "    [#{mark(name, ns)||' '}] #{name}#{tag}#{patch}\t" +
+        "#{inet.join(',')}\t#{ns == :root ? '' : ns}"
     end
 
     def show_iface(iface)
       patch = iface[:peer] ? " <-> #{iface[:peer]}" : ''
-      show_iface_common(iface[:name], iface[:inet], patch)
+      show_iface_common(iface[:name], iface[:inet], patch, '', iface[:ns])
     end
 
     def show_ovsvs
@@ -94,19 +102,22 @@ module OVSImager
 
           br[:ports].each do |port|
             name = port[:name]
-            iface = @ifaces[name] || {}
+            iface = @ifaces[name]
+            _, iface = @ifaces.find {|i, _| i.split(':')[0] == name} unless iface
+            iface = {:name => name, :ns => :root} unless iface
             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]
+            ns = iface[:ns]
+            nn = ifname_ns(iface)
 
             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
+            dot_br.add_iface(name, mark(name, ns), @dump_result[name],
+                             inet, tag, peer, remote, ns)
+            @done[nn] = true
 
             port[:interfaces].each do |port_if|
               port_name = port_if[:name]
@@ -116,9 +127,9 @@ module OVSImager
                 show_iface_common(port_name, inet)
                 dot_br.add_iface(port_name, @mark[port_name],
                                  @dump_result[port_name], port_inet,
-                                 '', ' '+name)
+                                 '', ' '+name, nil, ns)
                 ###
-                @done[port_name] = true
+                @done[nn] = true
               end
             end
           end
@@ -149,16 +160,18 @@ module OVSImager
         @dotwriter.namespace(name) do |dot_ns|
           ifaces.each do |iface|
             ifname = iface[:name]
+            nn = ifname_ns(iface)
             if ifname != 'lo' and !iface[:inet].empty?
-              if @done[ifname]
-                dot_ns.add_br_iface(ifname)
+              if @done[nn]
+                dot_ns.add_br_iface(ifname, iface[:ns])
               else
-                dot_ns.add_iface(ifname, @mark[ifname], @dump_result[ifname],
-                                 iface[:inet], iface[:tag], iface[:peer])
+                dot_ns.add_iface(ifname, mark(ifname, name), @dump_result[nn],
+                                 iface[:inet], iface[:tag], iface[:peer],
+                                 remote=nil, ns=name)
               end
             end
-            show_iface iface unless @done[iface[:name]]
-            @done[iface[:name]] = true
+            show_iface iface unless @done[nn]
+            @done[nn] = true
           end
         end
       end

data/lib/ovsimager/tcpdump.rb

@@ -18,8 +18,9 @@ module OVSImager
         ping = IO.popen("ping -s #{SIZE} -c 15 #{@from?'-I '+@from:''} #{@to} >/dev/null", "r")
       end
 
-      threads = ifaces.map do |(iface, iref)|
+      threads = ifaces.map do |(nn, iref)|
         Thread.new do
+          iface = iref[:name]
           Thread.current[:iface] = iface
           ns = iref[:ns]
           nscmd = ns == :root ? '' : "ip netns exec #{ns} "
@@ -68,8 +69,9 @@ module OVSImager
           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][4][:cap] = cap if cap
+          ifname_netns = iface + (ns == :root ? "" : ":" + ns.to_s)
+          result[ifname_netns] = [req_from, req_to, rep_from, rep_to, {}]
+          result[ifname_netns][4][:cap] = cap if cap
         end
       end
       threads.each {|th| th.join(10)}

data/lib/ovsimager/version.rb

@@ -1,3 +1,3 @@
 module OVSImager
-  VERSION = "0.0.5"
+  VERSION = "0.0.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ovsimager
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - NeoCat
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2016-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler