diff options
| author |   Manuel Buil <mbuil@suse.com> | 2018-08-17 18:25:01 +0200 |
|---|---|---|
| committer | Manuel Buil <mbuil@suse.com> | 2018-10-26 15:30:35 +0000 |
| commit | 0393dd3f0a6380e6878d86cbba6883395252738c (patch) | |
| tree | c7f18e9d75aa65486af440b1f6314ce1295d48b4 /sfc | |
| parent | 3803460f8338aacb7fc331963e83e30347c2e998 (diff) | |
Adapt regex to new flows
ODL Fluorine changes the nsh syntax, so we should adapt it
Change-Id: I63537f9b880f14b40be2658d3a7ed2e315e86b11
Signed-off-by: Manuel Buil <mbuil@suse.com>
(cherry picked from commit 09cfe2f4b864c9566c0ffcdf2c61e7bfb5cf8454)
Diffstat (limited to 'sfc')
| -rw-r--r-- | sfc/lib/odl_utils.py | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sfc/lib/odl_utils.py b/sfc/lib/odl_utils.py index 85a8f86b..031aaa5f 100644 --- a/sfc/lib/odl_utils.py +++ b/sfc/lib/odl_utils.py @@ -24,15 +24,16 @@ ODL_PLURAL_EXCEPTIONS = { def actual_rsps_in_compute(ovs_logger, compute_ssh): ''' Example flows that match the regex (line wrapped because of flake8) - table=101, n_packets=7, n_bytes=595, priority=500,tcp,in_port=2,tp_dst=80 - actions=push_nsh,load:0x1->NXM_NX_NSH_MDTYPE[],load:0x3->NXM_NX_NSH_NP[], - load:0x27->NXM_NX_NSP[0..23],load:0xff->NXM_NX_NSI[], - load:0xffffff->NXM_NX_NSH_C1[],load:0->NXM_NX_NSH_C2[],resubmit(,17) + cookie=0xf005ba1100000002, duration=5.843s, table=101, n_packets=0, + n_bytes=0, priority=500,tcp,in_port=48,tp_dst=80 + actions=load:0x169->NXM_NX_REG2[8..31],load:0xff->NXM_NX_REG2[0..7], + resubmit(,17)', u' cookie=0xf005ba1100000002, duration=5.825s, table=101, + n_packets=2, n_bytes=684, priority=10 actions=resubmit(,17) ''' match_rsp = re.compile(r'.+' r'(tp_(?:src|dst)=[0-9]+)' r'.+' - r'load:(0x[0-9a-f]+)->NXM_NX_NSP\[0\.\.23\]' + r'actions=load:(0x[0-9a-f]+)->NXM_NX_REG2' r'.+') # First line is OFPST_FLOW reply (OF1.3) (xid=0x2): # This is not a flow so ignore |