[spp] [PATCH 2/2] spp-ctl: add port add and del APIs for spp_primary
yasufum.o at gmail.com
yasufum.o at gmail.com
Tue Jul 16 09:30:57 CEST 2019
From: Yasufumi Ogawa <yasufum.o at gmail.com>
This update is to add REST APIs for adding ro deleting to spp_primary.
Here is an example for adding `vhost:1`.
$ curl -X PUT -H 'application/json' -d \
'{"action": "add", "port": "vhost:1"}' \
http://127.0.0.1:7777/v1/primary/ports
Signed-off-by: Yasufumi Ogawa <yasufum.o at gmail.com>
---
src/spp-ctl/spp_proc.py | 8 ++++++++
src/spp-ctl/spp_webapi.py | 20 ++++++++++++++++++++
2 files changed, 28 insertions(+)
diff --git a/src/spp-ctl/spp_proc.py b/src/spp-ctl/spp_proc.py
index fe7ecea..2bc14e6 100644
--- a/src/spp-ctl/spp_proc.py
+++ b/src/spp-ctl/spp_proc.py
@@ -292,6 +292,14 @@ class PrimaryProc(SppProc):
def clear(self):
return "clear"
+ @exec_command
+ def port_add(self, port):
+ return "add {port}".format(**locals())
+
+ @exec_command
+ def port_del(self, port):
+ return "del {port}".format(**locals())
+
@exec_command
def do_launch_sec_proc(self, args):
proc_name = args['proc_name']
diff --git a/src/spp-ctl/spp_webapi.py b/src/spp-ctl/spp_webapi.py
index 7f2baad..89b188a 100644
--- a/src/spp-ctl/spp_webapi.py
+++ b/src/spp-ctl/spp_webapi.py
@@ -452,6 +452,8 @@ class V1PrimaryHandler(BaseHandler):
def set_route(self):
self.route('/status', 'GET', callback=self.get_status)
self.route('/status', 'DELETE', callback=self.clear_status)
+ self.route('/ports', 'PUT',
+ callback=self.primary_port)
self.route('/launch', 'PUT',
callback=self.launch_sec_proc)
self.route('/', 'DELETE', callback=self.pri_exit)
@@ -478,6 +480,24 @@ class V1PrimaryHandler(BaseHandler):
proc = self._get_proc()
proc.clear()
+ # TODO(yasufum) change name and make it to shared method
+ def _validate_nfv_port(self, body):
+ for key in ['action', 'port']:
+ if key not in body:
+ raise KeyRequired(key)
+ if body['action'] not in ["add", "del"]:
+ raise KeyInvalid('action', body['action'])
+ self._validate_port(body['port'])
+
+ def primary_port(self, body):
+ self._validate_nfv_port(body)
+ proc = self._get_proc()
+
+ if body['action'] == "add":
+ proc.port_add(body['port'])
+ else:
+ proc.port_del(body['port'])
+
def launch_sec_proc(self, body): # the arg should be "body"
for key in ['client_id', 'proc_name', 'eal', 'app']:
if key not in body:
--
2.17.1
More information about the spp
mailing list