lib/ovsimager/dotwriter.rb in ovsimager-0.0.5 vs lib/ovsimager/dotwriter.rb in ovsimager-0.0.6

@@ -53,11 +53,11 @@
       def initialize(dot, dot_peers)
         @dot = dot
         @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
           label += "<BR/>#{tag}#{remote && remote.gsub('>','&gt;')}"
         end
@@ -74,16 +74,17 @@
             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}>]"
+        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
 
       private
@@ -102,11 +103,12 @@
         @dot = dot
         @dot_peers = dot_peers
         @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
 
   end