From: ogawa.yasufumi@lab.ntt.co.jp
To: spp@dpdk.org, ferruh.yigit@intel.com, ogawa.yasufumi@lab.ntt.co.jp
Subject: [spp] [PATCH v3 9/9] controller: fix init of pcap instances
Date: Sun, 10 Feb 2019 12:08:21 +0900 [thread overview]
Message-ID: <1549768101-23049-10-git-send-email-ogawa.yasufumi@lab.ntt.co.jp> (raw)
In-Reply-To: <1549768101-23049-1-git-send-email-ogawa.yasufumi@lab.ntt.co.jp>
From: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
Instances of SppPcap are not included in `self.secondaries` member var
and terminated by `bye sec` command. This update is to include instances
to the member var.
Signed-off-by: Yasufumi Ogawa <ogawa.yasufumi@lab.ntt.co.jp>
---
src/controller/shell.py | 19 +++++++++++--------
1 file changed, 11 insertions(+), 8 deletions(-)
diff --git a/src/controller/shell.py b/src/controller/shell.py
index ec4aaab..7f7d8d3 100644
--- a/src/controller/shell.py
+++ b/src/controller/shell.py
@@ -117,9 +117,10 @@ class Shell(cmd.Cmd, object):
self.secondaries['mirror'][sec_id] = mirror.SppMirror(
self.spp_ctl_cli, sec_id)
- self.spp_pcaps = {}
+ self.secondaries['pcap'] = {}
for sec_id in self.get_sec_ids('pcap'):
- self.spp_pcaps[sec_id] = pcap.SppPcap(self.spp_ctl_cli, sec_id)
+ self.secondaries['pcap'][sec_id] = pcap.SppPcap(
+ self.spp_ctl_cli, sec_id)
# Called everytime after running command. `stop` is returned from `do_*`
# method and SPP CLI is terminated if it is True. It means that only
@@ -609,7 +610,7 @@ class Shell(cmd.Cmd, object):
if len(cmds) < 2:
print("Required an ID and ';' before the command.")
elif str.isdigit(cmds[0]):
- self.spp_pcaps[int(cmds[0])].run(cmds[1])
+ self.secondaries['pcap'][int(cmds[0])].run(cmds[1])
else:
print('Invalid command: {}'.format(tmparg))
@@ -623,8 +624,9 @@ class Shell(cmd.Cmd, object):
# Add SppPcap of sec_id if it is not exist
sec_ids = self.get_sec_ids('pcap')
for idx in sec_ids:
- if self.spp_pcaps[idx] is None:
- self.spp_pcaps[idx] = pcap.SppPcap(self.spp_ctl_cli, idx)
+ if self.secondaries['pcap'][idx] is None:
+ self.secondaries['pcap'][idx] = pcap.SppPcap(
+ self.spp_ctl_cli, idx)
if len(line.split()) == 1:
res = [str(i)+';' for i in sec_ids]
@@ -641,10 +643,11 @@ class Shell(cmd.Cmd, object):
idx = int(first_tokens[1])
# Add SppPcap of sec_id if it is not exist
- if self.spp_pcaps[idx] is None:
- self.spp_pcaps[idx] = pcap.SppPcap(self.spp_ctl_cli, idx)
+ if self.secondaries['pcap'][idx] is None:
+ self.secondaries['pcap'][idx] = pcap.SppPcap(
+ self.spp_ctl_cli, idx)
- return self.spp_pcaps[idx].complete(
+ return self.secondaries['pcap'][idx].complete(
self.get_sec_ids('pcap'), text, line, begidx, endidx)
def do_record(self, fname):
--
2.7.4
next prev parent reply other threads:[~2019-02-10 3:08 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-02-10 3:08 [spp] [PATCH v3 0/9] Introduce spp_pcap ogawa.yasufumi
2019-02-10 3:08 ` [spp] [PATCH v3 1/9] spp_pcap: add command main ogawa.yasufumi
2019-02-10 3:08 ` [spp] [PATCH v3 2/9] spp_pcap: add command parser functions ogawa.yasufumi
2019-02-10 3:08 ` [spp] [PATCH v3 3/9] spp_pcap: add management data and utilities ogawa.yasufumi
2019-02-10 3:08 ` [spp] [PATCH v3 4/9] spp_pcap: add main and related functions ogawa.yasufumi
2019-02-10 3:08 ` [spp] [PATCH v3 5/9] spp_pcap: update Makefile ogawa.yasufumi
2019-02-10 3:08 ` [spp] [PATCH v3 6/9] controller: add SppPcap class ogawa.yasufumi
2019-02-10 3:08 ` [spp] [PATCH v3 7/9] controller: add pcap command to SPP controller ogawa.yasufumi
2019-02-10 3:08 ` [spp] [PATCH v3 8/9] controlle: refactor pcap command ogawa.yasufumi
2019-02-10 3:08 ` ogawa.yasufumi [this message]
2019-02-13 5:55 ` [spp] [PATCH v3 0/9] Introduce spp_pcap Yasufumi Ogawa
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=1549768101-23049-10-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).