From: t.moriyama <t.moriyama@users.sourceforge.jp>
Date: Tue, 11 Jun 2013 07:49:53 +0000 (+0900)
Subject: modify formatter's metadata handling
X-Git-Url: http://git.osdn.net/view?p=ti2%2Fti2.git;a=commitdiff_plain;h=be372dc78af0c9478397f1193444f162f536a9dc

modify formatter's metadata handling
---

diff --git a/linkpair/formatter/baseformatter.py b/linkpair/formatter/baseformatter.py
index aef93fd..e344a2a 100755
--- a/linkpair/formatter/baseformatter.py
+++ b/linkpair/formatter/baseformatter.py
@@ -51,12 +51,24 @@ class BaseFormatter(object):
         if "tag" in linkpair.port1.metadata:
             port1_label = port1_label + " vlan=" + \
                 linkpair.port1.metadata["tag"]
+        if "vlan_vid" in linkpair.port1.metadata:
+            port1_label = port1_label + " vid=" + \
+                linkpair.port1.metadata["vlan_vid"]
+        if "vxlan_vnid" in linkpair.port1.metadata:
+            port1_label = port1_label + " vnid=" + \
+                linkpair.port1.metadata["vxlan_vnid"]
         if "remote_ip" in linkpair.port2.metadata:
             port2_label = port2_label + " remote=" + \
                 linkpair.port2.metadata["remote_ip"]
         if "tag" in linkpair.port2.metadata:
             port2_label = port2_label + " vlan=" + \
                 linkpair.port2.metadata["tag"]
+        if "vlan_vid" in linkpair.port2.metadata:
+            port2_label = port2_label + " vid=" + \
+                linkpair.port2.metadata["vlan_vid"]
+        if "vxlan_vnid" in linkpair.port2.metadata:
+            port2_label = port2_label + " vnid=" + \
+                linkpair.port2.metadata["vxlan_vnid"]
 
         formatted_lp = linkpair.format % (
             device1_label,
diff --git a/linkpair/formatter/grapheasy.py b/linkpair/formatter/grapheasy.py
index bbf3847..d13d731 100755
--- a/linkpair/formatter/grapheasy.py
+++ b/linkpair/formatter/grapheasy.py
@@ -22,11 +22,6 @@ class GraphEasyFormatter(BaseFormatter):
     NAMESPACE_STYLE = '{ fill: green; border: none; }'
     NOT_CONNECTED_STYLE = '{ fill: #ffdddd; border: dotted; bordercolor: black; }'
 
-#    DEFAULT_FORMAT = '[ %s ] %s -- { label: "%s   %s"; } [ %s ] %s'
-#    NAMESPACE_FORMAT = '[ %s ] %s --> { label: "%s   %s"; } [ %s ] %s'
-#    PATCH_FORMAT = '[ %s ] %s <==> { label: "%s : %s"; } [ %s ] %s'
-#    VETH_FORMAT = '[ %s ] %s <--> { label: "%s \| %s"; } [ %s ] %s'
-
     DEFAULT_FORMAT = '[ %s ] %s -- { label: "%s   %s"; labelcolor: #663333; } [ %s ] %s'
     OS_ROUTING_FORMAT = '[ %s ] %s -- { label: "%s   %s"; labelcolor: #663333; } [ %s ] %s'
     NAMESPACE_FORMAT = '[ %s ] %s --> { label: "%s   %s"; labelcolor: #663333; } [ %s ] %s'
diff --git a/linkpair/formatter/graphviz_tb.py b/linkpair/formatter/graphviz_tb.py
index 604cec5..a32f547 100755
--- a/linkpair/formatter/graphviz_tb.py
+++ b/linkpair/formatter/graphviz_tb.py
@@ -134,12 +134,24 @@ node [
         if "tag" in linkpair.port1.metadata:
             port1_label = port1_label + " vlan=" + \
                 linkpair.port1.metadata["tag"]
+        if "vlan_vid" in linkpair.port1.metadata:
+            port1_label = port1_label + " vid=" + \
+                linkpair.port1.metadata["vlan_vid"] 
+        if "vxlan_vnid" in linkpair.port1.metadata:
+            port1_label = port1_label + " vnid=" + \
+                linkpair.port1.metadata["vxlan_vnid"] 
         if "remote_ip" in linkpair.port2.metadata:
             port2_label = port2_label + " remote=" + \
                 linkpair.port2.metadata["remote_ip"]
         if "tag" in linkpair.port2.metadata:
             port2_label = port2_label + " vlan=" + \
                 linkpair.port2.metadata["tag"]
+        if "vlan_vid" in linkpair.port2.metadata:
+            port2_label = port2_label + " vid=" + \
+                linkpair.port2.metadata["vlan_vid"] 
+        if "vxlan_vnid" in linkpair.port2.metadata:
+            port2_label = port2_label + " vnid=" + \
+                linkpair.port2.metadata["vxlan_vnid"] 
 
         formatted_lp = linkpair.format % (
             device1_label,
diff --git a/linkpair/formatter/springy.py b/linkpair/formatter/springy.py
index 97bd262..2b674cd 100755
--- a/linkpair/formatter/springy.py
+++ b/linkpair/formatter/springy.py
@@ -89,12 +89,24 @@ jQuery(function(){
         if "tag" in linkpair.port1.metadata:
             port1_label = port1_label + " vlan=" + \
                 linkpair.port1.metadata["tag"]
+        if "vlan_vid" in linkpair.port1.metadata:
+            port1_label = port1_label + " vid=" + \
+                linkpair.port1.metadata["vlan_vid"] 
+        if "vxlan_vnid" in linkpair.port1.metadata:
+            port1_label = port1_label + " vnid=" + \
+                linkpair.port1.metadata["vxlan_vnid"] 
         if "remote_ip" in linkpair.port2.metadata:
             port2_label = port2_label + " remote=" + \
                 linkpair.port2.metadata["remote_ip"]
         if "tag" in linkpair.port2.metadata:
             port2_label = port2_label + " vlan=" + \
                 linkpair.port2.metadata["tag"]
+        if "vlan_vid" in linkpair.port2.metadata:
+            port2_label = port2_label + " vid=" + \
+                linkpair.port2.metadata["vlan_vid"] 
+        if "vxlan_vnid" in linkpair.port2.metadata:
+            port2_label = port2_label + " vnid=" + \
+                linkpair.port2.metadata["vxlan_vnid"] 
 
         formatted_lp = linkpair.format % (
             device1_label,