commit 308a9cf274e26cfa608c5da676bf03b81d8041e6
author Gertjan Van Droogenbroeck <gertjan.van_droogenbroeck@nokia.com> Wed Oct 11 15:59:51 2017 -0500
committer khenaidoo Nursimulu <knursimu@ciena.com> Thu Oct 12 08:21:29 2017 -0700
tree 1d467d4325e4a073f4fc4599fb84c3c944e27f5c
parent ff3087fb28d57a4123f88fde9862deafafcf0d63

VOL-34 Add group printing at CLI

Change-Id: I4e8e55ffd397c3d1486dc2807e92dd87eea9856e

cli/logical_device.py

diff --git a/cli/logical_device.py b/cli/logical_device.py
index c1a9479..0545c69 100644
--- a/cli/logical_device.py
+++ b/cli/logical_device.py
@@ -23,7 +23,7 @@
 
 from cli.table import print_pb_as_table, print_pb_list_as_table
 from cli.utils import pb2dict
-from cli.utils import print_flows
+from cli.utils import print_flows, print_groups
 from voltha.protos import third_party
 from google.protobuf.empty_pb2 import Empty
 
@@ -88,6 +88,16 @@
             groups=logical_device['flow_groups']['items']
         )
 
+    def do_groups(self, _):
+        """Show flow group table for logical device"""
+        logical_device = pb2dict(self.get_logical_device(-1))
+        print_groups(
+            'Logical Device',
+            self.logical_device_id,
+            type='n/a',
+            groups=logical_device['flow_groups']['items']
+        )
+
     def do_devices(self, line):
         """List devices that belong to this logical device"""
         logical_device = self.get_logical_device()

cli/utils.py

diff --git a/cli/utils.py b/cli/utils.py
index 105931b..729c3a2 100644
--- a/cli/utils.py
+++ b/cli/utils.py
@@ -32,9 +32,9 @@
 
 
 def p_cookie(cookie):
-    cookie = str(cookie)
+    cookie =  '%x' % int(cookie)
     if len(cookie) > 8:
-        return cookie[:6] + '...'
+        return '~' + cookie[len(cookie)-8:]
     else:
         return cookie
 
@@ -152,9 +152,27 @@
 
     table.print_table(header, printfn)
 
-    # see CORD-817 (https://jira.opencord.org/browse/CORD-817)
-    # assert len(groups) == 0
 
+def print_groups(what, id, type, groups, printfn=_printfn):
+    header = ''.join([
+        '{} '.format(what),
+        colored(id, color='green', attrs=['bold']),
+        ' (type: ',
+        colored(type, color='blue'),
+        ')'
+    ]) + '\nGroups ({}):'.format(len(groups))
+
+    table = TablePrinter()
+    for i, group in enumerate(groups):
+        output_ports = []
+        for bucket in group['desc']['buckets']:
+            for action in bucket['actions']:
+                if action['type'] == 'OFPAT_OUTPUT':
+                   output_ports.append(action['output']['port'])
+        table.add_cell(i, 0, 'group_id', value=str(group['desc']['group_id']))
+        table.add_cell(i, 1, 'buckets', value=str(dict(output=output_ports)))
+
+    table.print_table(header, printfn)
 
 def dict2line(d):
     assert isinstance(d, dict)