From 5f8867a3454164ad20ae427dc9d2c7d65ea00a90 Mon Sep 17 00:00:00 2001 From: Marcel Enguehard Date: Mon, 9 Oct 2017 08:44:59 +0200 Subject: Several fixes related to async_set, ip addressing, and memif interfaces for VPP Change-Id: I26b7928751f41ea66ba47bb1becac33cf5195915 Signed-off-by: Marcel Enguehard --- vicn/resource/vpp/vpp_commands.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'vicn/resource/vpp/vpp_commands.py') diff --git a/vicn/resource/vpp/vpp_commands.py b/vicn/resource/vpp/vpp_commands.py index acc89640..e0b71517 100644 --- a/vicn/resource/vpp/vpp_commands.py +++ b/vicn/resource/vpp/vpp_commands.py @@ -6,6 +6,7 @@ CMD_VPP_DISABLE = 'systemctl disable vpp.service' # 'sleep 1' ensures that VPP has enough time to start CMD_VPP_START = ''' flock /tmp/vppctl.lock -c "systemctl start vpp" +sleep 2 ''' CMD_VPP_STOP = ''' flock /tmp/vppctl.lock -c "systemctl stop vpp" @@ -25,7 +26,7 @@ vppctl_wrapper set interface state {vpp_interface.device_name} up # generated by VPP, preventing any reboot of VPP and recreation of commands CMD_VPP_CREATE_MEMIFACE = ''' # Create vpp interface from shared_memory -vppctl_wrapper create memif key {key} socket {vpp_interface.parent.path_unix_socket}{vpp_interface.parent.socket_name} hw-addr {vpp_interface.parent.mac_address} {master_slave} +vppctl_wrapper create memif {key_label} {key} socket {vpp_interface.parent.path_unix_socket}{vpp_interface.parent.socket_name} hw-addr {vpp_interface.parent.mac_address} {master_slave} ''' CMD_VPP_SET_IP = 'vppctl_wrapper set int ip address {device_name} {ip_address}/{prefix_len}' CMD_VPP_SET_UP = 'vppctl_wrapper set int state {netdevice.device_name} {state}' -- cgit 1.2.3-korg