From: t.moriyama <t.moriyama@users.sourceforge.jp>
Date: Fri, 14 Jun 2013 14:12:36 +0000 (+0900)
Subject: add vlan distribute visualization to formatters
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f0b34b7f0a88c019dd84647a6f6896036c56b0f9;p=ti2%2Fti2.git

add vlan distribute visualization to formatters
---

diff --git a/linkpair/formatter/baseformatter.py b/linkpair/formatter/baseformatter.py
index 3adad92..689e3e5 100755
--- a/linkpair/formatter/baseformatter.py
+++ b/linkpair/formatter/baseformatter.py
@@ -24,7 +24,7 @@ class BaseFormatter(object):
     NAMESPACE_FORMAT = '[ %s ] %s --> { label: %s   %s; } [ %s ] %'
     PATCH_FORMAT = '[ %s ] %s <==> { label: %s  :  %s; } [ %s ] %s'
     VETH_FORMAT = '[ %s ] %s <--> { label: %s  \|  %s; } [ %s ] %s'
-    VLAN_DIST_FORMAT = '[ %s ] %s <--> { label: %s  \|  %s; } [ %s ] %s'
+    VLAN_DIST_FORMAT = '[ %s ] %s <--> { label: %s\(%s\); } [ %s ] %s'
 
     HEADER_FORMAT = ""
     FOOTER_FORMAT = ""
diff --git a/linkpair/formatter/grapheasy.py b/linkpair/formatter/grapheasy.py
index f19849d..d60a28b 100755
--- a/linkpair/formatter/grapheasy.py
+++ b/linkpair/formatter/grapheasy.py
@@ -28,7 +28,7 @@ class GraphEasyFormatter(BaseFormatter):
     NAMESPACE_FORMAT = '[ %s ] %s --> { label: "%s   %s"; labelcolor: #663333; } [ %s ] %s'
     PATCH_FORMAT = '[ %s ] %s <==> { label: "%s : %s"; labelcolor: #333366; } [ %s ] %s'
     VETH_FORMAT = '[ %s ] %s <--> { label: "%s \| %s"; labelcolor: #336633; } [ %s ] %s'
-    VLAN_DIST_FORMAT = '[ %s ] %s <--> { label: "%s \| %s"; labelcolor: #336633; } [ %s ] %s'
+    VLAN_DIST_FORMAT = '[ %s ] %s <--> { label: "%s\(%s\)"; labelcolor: #336633; } [ %s ] %s'
 
     HEADER = ""
     FOOTER = ""
diff --git a/linkpair/formatter/graphviz_tb.py b/linkpair/formatter/graphviz_tb.py
index 29b5f2f..38de89d 100755
--- a/linkpair/formatter/graphviz_tb.py
+++ b/linkpair/formatter/graphviz_tb.py
@@ -28,7 +28,7 @@ class GraphvizTBFormatter(BaseFormatter):
     NAMESPACE_FORMAT = '"%s" -> "%s" [ color="#000000", fontcolor="#663333", label = "%s     %s" ]'
     PATCH_FORMAT = '"%s" -> "%s" [ dir=both, arrowhead=box, arrowtail=box, color="#000000:#000000", fontcolor="#333366", label = "%s : %s" ]'
     VETH_FORMAT = '"%s" -> "%s" [ dir=both, arrowhead=box, arrowtail=box, color="#000000", fontcolor="#336633", label="%s \| %s" ]'
-    VLAN_DIST_FORMAT = '"%s" -> "%s" [ dir=forward, arrowhead=none, arrowtail=inv, color="#660000", fontcolor="#336633", label="%s \| %s" ]'
+    VLAN_DIST_FORMAT = '"%s" -> "%s" [ dir=forward, arrowhead=none, arrowtail=inv, color="#660000", fontcolor="#336633", label="%s\(%s\)" ]'
 
     # ADDNODE_STYLE = '"%s" [ fillcolor="#ffffff", style="filled,dotted" ]'
     ADDNODE_STYLE = '"%s" [ %s ]'
diff --git a/linkpair/formatter/springy.py b/linkpair/formatter/springy.py
index 6b2b7b7..b1c490b 100755
--- a/linkpair/formatter/springy.py
+++ b/linkpair/formatter/springy.py
@@ -28,7 +28,7 @@ class SpringyFormatter(BaseFormatter):
     NAMESPACE_FORMAT = "['%s', '%s', {%s, label: '%s %s'}]"
     PATCH_FORMAT = "['%s', '%s', {%s, label: '%s : %s'}]"
     VETH_FORMAT = "['%s', '%s', {%s, label: '%s \| %s'}]"
-    VLAN_DIST_FORMAT = "['%s', '%s', {%s, label: '%s -> %s'}]"
+    VLAN_DIST_FORMAT = "['%s', '%s', {%s, label: '%s\(%s\)'}]"
     
     ADDNODE_STYLE = "graph.addNodes('%s');"
     ADDEDGE_START = "graph.addEdges("