From: ogawa.yasufumi@lab.ntt.co.jp
To: ferruh.yigit@intel.com, spp@dpdk.org, ogawa.yasufumi@lab.ntt.co.jp
Subject: [spp] [PATCH 3/5] controller: add checking for add and del cmds
Date: Wed, 12 Dec 2018 11:03:13 +0900 [thread overview]
Message-ID: <1544580195-9242-4-git-send-email-ogawa.yasufumi@lab.ntt.co.jp> (raw)
In-Reply-To: <1544580195-9242-1-git-send-email-ogawa.yasufumi@lab.ntt.co.jp>
From: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
To check invalid port, add checking for `add` and `del` commands.
`add` should not accept if assigned port is already added, and `patch`
should not accept if assigned is patched.
Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
---
src/controller/commands/nfv.py | 88 +++++++++++++++++++++++++-----------------
1 file changed, 53 insertions(+), 35 deletions(-)
diff --git a/src/controller/commands/nfv.py b/src/controller/commands/nfv.py
index 7a8d073..646cdc0 100644
--- a/src/controller/commands/nfv.py
+++ b/src/controller/commands/nfv.py
@@ -44,38 +44,57 @@ class SppNfv(object):
print('Error: unknown response.')
elif cmd == 'add':
- if self.use_cache is True:
- self.ports.append(params[0])
+ if self.use_cache is False:
+ self.ports = self.get_registered_ports()
- req_params = {'action': 'add', 'port': params[0]}
+ if params[0] in self.ports:
+ print("'%s' is already added." % params[0])
+ else:
+ if self.use_cache is True:
+ self.ports.append(params[0])
- res = self.spp_ctl_cli.put('nfvs/%d/ports' %
- self.sec_id, req_params)
- if res is not None:
- error_codes = self.spp_ctl_cli.rest_common_error_codes
- if res.status_code == 204:
- print('Add %s.' % params[0])
- elif res.status_code in error_codes:
- pass
- else:
- print('Error: unknown response.')
+ req_params = {'action': 'add', 'port': params[0]}
+
+ res = self.spp_ctl_cli.put('nfvs/%d/ports' %
+ self.sec_id, req_params)
+ if res is not None:
+ error_codes = self.spp_ctl_cli.rest_common_error_codes
+ if res.status_code == 204:
+ print('Add %s.' % params[0])
+ elif res.status_code in error_codes:
+ pass
+ else:
+ print('Error: unknown response.')
elif cmd == 'del':
- if self.use_cache is True:
- if params[0] in self.ports:
- self.ports.remove(params[0])
+ if self.use_cache is False:
+ self.patches = self.get_registered_patches()
- req_params = {'action': 'del', 'port': params[0]}
- res = self.spp_ctl_cli.put('nfvs/%d/ports' %
- self.sec_id, req_params)
- if res is not None:
- error_codes = self.spp_ctl_cli.rest_common_error_codes
- if res.status_code == 204:
- print('Delete %s.' % params[0])
- elif res.status_code in error_codes:
- pass
- else:
- print('Error: unknown response.')
+ # Patched ports should not be deleted.
+ patched_ports = []
+ for pport in self.patches:
+ patched_ports.append(pport['src'])
+ patched_ports.append(pport['dst'])
+ patched_ports = list(set(patched_ports))
+
+ if params[0] in patched_ports:
+ print("Cannot delete patched port '%s'." % params[0])
+ else:
+ if self.use_cache is True:
+ if params[0] in self.ports:
+ self.ports.remove(params[0])
+
+ req_params = {'action': 'del', 'port': params[0]}
+ res = self.spp_ctl_cli.put('nfvs/%d/ports' %
+ self.sec_id, req_params)
+ if res is not None:
+ error_codes = self.spp_ctl_cli.rest_common_error_codes
+ if res.status_code == 204:
+ print('Delete %s.' % params[0])
+ elif res.status_code in error_codes:
+ pass
+ else:
+ print('Error: unknown response.')
elif cmd == 'forward' or cmd == 'stop':
if cmd == 'forward':
@@ -257,17 +276,16 @@ class SppNfv(object):
self.ports = self.get_registered_ports()
self.patches = self.get_registered_patches()
- # Used ports should not be included in the candidate of del.
- used_ports = []
- for pt in self.ports:
- for ppt in self.patches:
- if ((pt in ppt['src']) or (pt in ppt['dst'])):
- used_ports.append(pt)
- used_ports = list(set(used_ports))
+ # Patched ports should not be included in the candidate of del.
+ patched_ports = []
+ for pport in self.patches:
+ patched_ports.append(pport['src'])
+ patched_ports.append(pport['dst'])
+ patched_ports = list(set(patched_ports))
# Remove ports already used from candidate.
for kw in self.ports:
- if not (kw in used_ports):
+ if not (kw in patched_ports):
if kw.startswith(sub_tokens[1]):
if ':' in sub_tokens[1]: # exp, 'ring:' or 'ring:0'
res.append(kw.split(':')[1])
--
2.7.4
next prev parent reply other threads:[~2018-12-12 2:05 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-12-12 2:03 [spp] [PATCH 0/5] update SPP CLI ogawa.yasufumi
2018-12-12 2:03 ` [spp] [PATCH 1/5] controller: change sec command to nfv ogawa.yasufumi
2018-12-12 2:03 ` [spp] [PATCH 2/5] controller: change to exclude used port from del ogawa.yasufumi
2018-12-12 2:03 ` ogawa.yasufumi [this message]
2018-12-12 2:03 ` [spp] [PATCH 4/5] controller: refactor SppNfv class ogawa.yasufumi
2018-12-12 2:03 ` [spp] [PATCH 5/5] controller: update SppBye class ogawa.yasufumi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1544580195-9242-4-git-send-email-ogawa.yasufumi@lab.ntt.co.jp \
--to=ogawa.yasufumi@lab.ntt.co.jp \
--cc=ferruh.yigit@intel.com \
--cc=spp@dpdk.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).