[spp] [PATCH 1/9] controller: change displaying status

[ogawa.yasufumi at lab.ntt.co.jp]

From: Yasufumi Ogawa <ogawa.yasufumi at lab.ntt.co.jp>

This update is for removing port_id from the result of status
command because bahaviour of port_id assignment is changed from
DPDK 18.02 and it possibly confuses users.

Secondary's status message is changed from

  spp > sec 1;status
  port_id:0,on,PHY,outport:none
  port_id:1,on,PHY,outport:none
  port_id:2,on,RING(0),outport:none

to be more simplified YAML like style.

  spp > sec 1;status
  status: idling
  ports:
    - 'phy:0 -> ring:0'
    - 'phy:1'
    - 'ring:0 -> phy:1'

SPP controller expects message format from secondary is as following to
decode it to show as above example.

  status: running\nports: phy:0-vhost:0,vhost:0-null

This update is only for controller. Updates for secondary processes are
included in next patches.

Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi at lab.ntt.co.jp>
---
 src/controller/conn_thread.py |  4 ++--
 src/controller/shell.py       | 22 +++++++++++++++++++++-
 2 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/src/controller/conn_thread.py b/src/controller/conn_thread.py
index 1620046..039a3ad 100644
--- a/src/controller/conn_thread.py
+++ b/src/controller/conn_thread.py
@@ -49,8 +49,8 @@ class ConnectionThread(threading.Thread):
                 # 1024 stands for bytes of data to be received
                 data = self.conn.recv(1024)
                 if data:
-                    spp_common.SEC2MAIN[self.client_id].put(
-                        "recv:%s:{%s}" % (str(self.conn.fileno()), data))
+                    msg = "%s" % data
+                    spp_common.SEC2MAIN[self.client_id].put(msg)
                 else:
                     spp_common.SEC2MAIN[self.client_id].put(
                         "closing:" + str(self.conn))
diff --git a/src/controller/shell.py b/src/controller/shell.py
index 91b78f1..4bca3e5 100644
--- a/src/controller/shell.py
+++ b/src/controller/shell.py
@@ -88,6 +88,23 @@ class Shell(cmd.Cmd, object):
         for i in spp_common.SECONDARY_LIST:
             print ("Connected secondary id: %d" % i)
 
+    def print_sec_status(self, msg):
+        msg = msg.replace("\x00", "")  # remove null chars in msg from sec
+        status, ports = msg.split("\n")
+        res = "%s\nports:\n" % status
+        port_list = ports.split(' ')[1].split(',')
+
+        tmp = []
+        for p in port_list:
+            p1, p2 = p.split('-')
+            if p2 == 'null':
+                tmp.append("  - '%s'" % p1)
+            else:
+                tmp.append("  - '%s -> %s'" % (p1, p2))
+        tmp.sort()
+        res += "\n".join(tmp)
+        print(res)
+
     def command_primary(self, command):
         """Send command to primary process"""
 
@@ -107,7 +124,10 @@ class Shell(cmd.Cmd, object):
         if sec_id in spp_common.SECONDARY_LIST:
             spp_common.MAIN2SEC[sec_id].put(command)
             recv = spp_common.SEC2MAIN[sec_id].get(True)
-            print (recv)
+            if command == 'status':
+                self.print_sec_status(recv)
+            else:
+                print(recv)
             return self.CMD_OK, recv
         else:
             message = "secondary id %d not exist" % sec_id
-- 
2.7.4