[spp] [PATCH 0/2] Update of SPP Container

[spp] [PATCH 0/2] Update of SPP Container

[ogawa.yasufumi]

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

Hi,

This update is for SPP Container. Fix bug of creating `env.sh` and
change binding IP address in spp-ctl from `127.0.0.1` to given IP
address to be enabled to find from inside containers. If IP address
is not given from user, default `localhost` is assigned.

Thanks,
Yasufumi

Yasufumi Ogawa (2):
  tools/sppc: fix bug of creating env file
  spp-ctl: change to bind IP address to SPP procs

 src/spp-ctl/spp_ctl.py   |  7 ++++---
 tools/sppc/build/main.py | 21 ++++++++++++++-------
 2 files changed, 18 insertions(+), 10 deletions(-)

-- 
2.7.4

[spp] [PATCH 1/2] tools/sppc: fix bug of creating env file

[ogawa.yasufumi]

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

Build script create `env.sh` to activate config of env on the container.
This patch is to fix bug failed to created the file.

Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
---
 tools/sppc/build/main.py | 21 ++++++++++++++-------
 1 file changed, 14 insertions(+), 7 deletions(-)

diff --git a/tools/sppc/build/main.py b/tools/sppc/build/main.py
index 9618bab..dcde412 100755
--- a/tools/sppc/build/main.py
+++ b/tools/sppc/build/main.py
@@ -86,9 +86,12 @@ def create_env_sh(dst_dir, rte_sdk, target, target_dir):
     elif target == 'spp':
         contents += "export SPP_DIR=%s" % target_dir
 
-    f = open('%s/env.sh' % dst_dir, 'w')
-    f.write(contents)
-    f.close()
+    try:
+        f = open('%s/env.sh' % dst_dir, 'w')
+        f.write(contents)
+        f.close()
+    except IOError:
+        print('Error: Failed to create env.sh.')
 
 
 def main():
@@ -142,10 +145,12 @@ def main():
     # Check for just creating env.sh, or run docker build.
     if args.only_envsh is True:
         if args.dry_run is False:
-            if target == 'pktgen':
-                create_env_sh(dockerfile_dir, rte_sdk, target, pktgen_dir)
-            elif target == 'spp':
-                create_env_sh(dockerfile_dir, rte_sdk, target, spp_dir)
+            if args.target == 'pktgen':
+                create_env_sh(dockerfile_dir, rte_sdk, args.target, pktgen_dir)
+            elif args.target == 'spp':
+                create_env_sh(dockerfile_dir, rte_sdk, args.target, spp_dir)
+            elif args.target == 'dpdk':
+                create_env_sh(dockerfile_dir, rte_sdk, args.target, dpdk_dir)
             print("Info: '%s/env.sh' created." % dockerfile_dir)
             exit()
         else:
@@ -157,6 +162,8 @@ def main():
             create_env_sh(dockerfile_dir, rte_sdk, args.target, pktgen_dir)
         elif args.target == 'spp':
             create_env_sh(dockerfile_dir, rte_sdk, args.target, spp_dir)
+        elif args.target == 'dpdk':
+            create_env_sh(dockerfile_dir, rte_sdk, args.target, dpdk_dir)
 
     # Setup environment variables on host to pass 'docker build'.
     env_opts = [
-- 
2.7.4

[spp] [PATCH 2/2] spp-ctl: change to bind IP address to SPP procs

[ogawa.yasufumi]

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

Spp-ctl creates a socket with address `localhost` for SPP processes.
However, it should be able to change for some cases. For instance, SPP
container process requires to access spp-ctl running on host. It cannot
find spp-ctl from inside of container if the address is `localhost`.
This update is to change binding IP address to be found.

Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
---
 src/spp-ctl/spp_ctl.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/spp-ctl/spp_ctl.py b/src/spp-ctl/spp_ctl.py
index a22d589..0576ae1 100644
--- a/src/spp-ctl/spp_ctl.py
+++ b/src/spp-ctl/spp_ctl.py
@@ -26,6 +26,7 @@ class Controller(object):
     def __init__(self, host, pri_port, sec_port, api_port):
         self.web_server = spp_webapi.WebServer(self, host, api_port)
         self.procs = {}
+        self.ip_addr = host
         self.init_connection(pri_port, sec_port)
 
     def start(self):
@@ -34,14 +35,14 @@ class Controller(object):
     def init_connection(self, pri_port, sec_port):
         self.pri_sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         self.pri_sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-        self.pri_sock.bind(('127.0.0.1', pri_port))
+        self.pri_sock.bind((self.ip_addr, pri_port))
         self.pri_sock.listen(1)
         self.primary_listen_thread = eventlet.greenthread.spawn(
             self.accept_primary)
 
         self.sec_sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
         self.sec_sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
-        self.sec_sock.bind(('127.0.0.1', sec_port))
+        self.sec_sock.bind((self.ip_addr, sec_port))
         self.sec_sock.listen(1)
         self.secondary_listen_thread = eventlet.greenthread.spawn(
             self.accept_secondary)
@@ -142,7 +143,7 @@ class Controller(object):
         return procs
 
     def do_exit(self, proc_type, proc_id):
-            removed_id = None  # remove proc info of ID from self.procs
+        removed_id = None  # remove proc info of ID from self.procs
         for proc in self.procs.values():
             if proc.type == proc_type and proc.id == proc_id:
                 removed_id = proc.id
-- 
2.7.4