Wire in flow commands and parser

[netvirt.git] / resources / tools / odltools / odltools / netvirt / analyze.py

diff --git a/resources/tools/odltools/odltools/netvirt/analyze.py b/resources/tools/odltools/odltools/netvirt/analyze.py
index 35d2d7c9a2bcb277eb9cab53e7affe870796d2f7..141cdae64116e76c1979768fa4c0afc9e44f533c 100644 (file)
--- a/resources/tools/odltools/odltools/netvirt/analyze.py
+++ b/resources/tools/odltools/odltools/netvirt/analyze.py
@@ -1,20 +1,17 @@
-from odltools.netvirt import utils
 from odltools.mdsal.models import constants
 from odltools.mdsal.models import ietf_interfaces
 from odltools.mdsal.models import itm_state
 from odltools.mdsal.models import l3vpn
 from odltools.mdsal.models import neutron
 from odltools.mdsal.models.model import Model
+from odltools.netvirt import utils
+from odltools.netvirt.utils import sort
 
 
 def get_all_flows(modules=['ifm'], filter=[]):
     return []
 
 
-def sort(data, field):
-    return sorted(data, key=lambda x: x[field])
-
-
 def print_keys(ifaces, ifstates):
     print "InterfaceNames: {}\n".format(ifaces.keys())
     print
@@ -95,7 +92,7 @@ def analyze_trunks(args):
             sifstate = ifstates.get(sport_id)
             subport['SubNeutronPort'] = 'Correct' if snport else 'Wrong'
             subport['SubVpnInterface'] = 'Correct' if svpniface else 'Wrong'
-            subport['ofport'] = Model.get_ofport_from_ncid(sifstate.get('lower-layer-if')[0])
+            subport['ofport'] = Model.get_ofport_from_ncid()
             if siface:
                 vlan_mode = siface.get('odl-interface:l2vlan-mode')
                 parent_iface_id = siface.get('odl-interface:parent-interface')