diff options
| author |   Alberto Compagno <acompagn+fdio@cisco.com> | 2017-08-28 15:42:53 +0200 |
|---|---|---|
| committer | Alberto <acompagn+fdio@cisco.com> | 2017-08-28 17:11:45 +0200 |
| commit | 190c70c461a3808297b397cda14f35867bd837f8 (patch) | |
| tree | a758805fd0db3f36499b854c2a3407346cb86d01 /vicn/resource/icn/cicn.py | |
| parent | e4d3f8ca1c9e130c4cbb3211b9ac0850c2456973 (diff) | |
Using no-pci option rather than removing the dpdk-plugin in vpp. Removed starting and stopping of vpp in the host to add the uio devices in the containers. Added executable option in the TextFile resource. vICN now deploy the vppctl_wrapper command in every container runing vpp. Several bugfixes on the cicn plugin.
Change-Id: I395bf92771bf27cf25324d208b847b640ccc475c
Signed-off-by: Alberto Compagno <acompagn+fdio@cisco.com>
Diffstat (limited to 'vicn/resource/icn/cicn.py')
| -rw-r--r-- | vicn/resource/icn/cicn.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vicn/resource/icn/cicn.py b/vicn/resource/icn/cicn.py index 76dafe0e..8ab36ec9 100644 --- a/vicn/resource/icn/cicn.py +++ b/vicn/resource/icn/cicn.py @@ -31,7 +31,7 @@ from vicn.resource.vpp.vpp_commands import CMD_VPP_ENABLE_PLUGIN CMD_VPP_CICN_GET = "vppctl_wrapper cicn show" CMD_VPP_ADD_ICN_ROUTE = 'vppctl_wrapper cicn cfg fib add prefix {route.prefix} face {route.face.id}' -CMD_VPP_ADD_ICN_FACE = 'vppctl_wrapper cicn cfg face add local {face.src_ip}:{face.src_port} remote {face.dst_ip}:{face.dst_port}' +CMD_VPP_ADD_ICN_FACE = 'vppctl_wrapper cicn cfg face add local {face.src.ip4_address}:{face.src_port} remote {face.dst.ip4_address}:{face.dst_port}' CMD_VPP_CICN_GET_CACHE_SIZE = 'vppctl_wrapper cicn show | grep "CS entries" | grep -Eo "[0-9]+"' CMD_VPP_CICN_SET_CACHE_SIZE = 'vppctl_wrapper cicn control param cs size {self.cache_size}' @@ -95,7 +95,7 @@ class CICNForwarder(Forwarder): for face in self.faces: face_task = face_task > BashTask(self.node, CMD_VPP_ADD_ICN_FACE, {'face':face}, - parse = (lambda x : parse_face(x, face)), lock = lock) + parse = (lambda x, y=face : parse_face(x, y)), lock = lock) if not self.routes: from vicn.resource.icn.route import Route |