From 22c4831c19ec535b621691a1a53df3b12fc08d88 Mon Sep 17 00:00:00 2001 From: Ivan Hrasko Date: Mon, 6 Aug 2018 15:49:31 +0200 Subject: [PATCH] Fix SXP robot tests unstability Change-Id: I8e86edb94142cae4113b7c73557fa5ebcdee864b Signed-off-by: Ivan Hrasko --- csit/libraries/SXP/FilteringResources.robot | 384 +++++++++--------- csit/libraries/Sxp.py | 117 ++++-- csit/libraries/SxpLib.robot | 51 ++- .../020_Binding_Origins_Checks.robot | 22 +- .../030_Inbound_Filtering_Discarding.robot | 56 +-- .../040_Peer_Sequence_filtering.robot | 200 ++++----- .../sxp/topology/010_Topology_Features.robot | 40 +- .../suites/sxp/topology/020_Scalability.robot | 2 +- 8 files changed, 484 insertions(+), 388 deletions(-) diff --git a/csit/libraries/SXP/FilteringResources.robot b/csit/libraries/SXP/FilteringResources.robot index bbd38e7981..fbd314bb28 100644 --- a/csit/libraries/SXP/FilteringResources.robot +++ b/csit/libraries/SXP/FilteringResources.robot @@ -46,32 +46,32 @@ Check One Group 4-5 : FOR ${node} IN RANGE 4 6 \ ${resp} Get Bindings 127.0.0.${node} \ Log ${resp} - \ Should Contain Binding ${resp} 10 10.10.10.10/32 sxp - \ Should Contain Binding ${resp} 10 10.10.10.0/24 sxp - \ Should Not Contain Binding ${resp} 10 10.10.0.0/16 sxp - \ Should Contain Binding ${resp} 10 10.0.0.0/8 sxp - \ Should Contain Binding ${resp} 20 10.10.10.20/32 sxp - \ Should Not Contain Binding ${resp} 20 10.10.20.0/24 sxp - \ Should Contain Binding ${resp} 20 10.20.0.0/16 sxp - \ Should Not Contain Binding ${resp} 20 20.0.0.0/8 sxp - \ Should Contain Binding ${resp} 30 10.10.10.30/32 sxp - \ Should Not Contain Binding ${resp} 30 10.10.30.0/24 sxp - \ Should Contain Binding ${resp} 30 10.30.0.0/16 sxp - \ Should Not Contain Binding ${resp} 30 30.0.0.0/8 sxp + \ Should Contain Binding ${resp} 10 10.10.10.10/32 + \ Should Contain Binding ${resp} 10 10.10.10.0/24 + \ Should Not Contain Binding ${resp} 10 10.10.0.0/16 + \ Should Contain Binding ${resp} 10 10.0.0.0/8 + \ Should Contain Binding ${resp} 20 10.10.10.20/32 + \ Should Not Contain Binding ${resp} 20 10.10.20.0/24 + \ Should Contain Binding ${resp} 20 10.20.0.0/16 + \ Should Not Contain Binding ${resp} 20 20.0.0.0/8 + \ Should Contain Binding ${resp} 30 10.10.10.30/32 + \ Should Not Contain Binding ${resp} 30 10.10.30.0/24 + \ Should Contain Binding ${resp} 30 10.30.0.0/16 + \ Should Not Contain Binding ${resp} 30 30.0.0.0/8 ${resp} Get Bindings 127.0.0.2 Log ${resp} - Should Contain Binding ${resp} 10 10.10.10.10/32 sxp - Should Contain Binding ${resp} 10 10.10.10.0/24 sxp - Should Contain Binding ${resp} 10 10.10.0.0/16 sxp - Should Contain Binding ${resp} 10 10.0.0.0/8 sxp - Should Contain Binding ${resp} 30 10.10.10.30/32 sxp - Should Contain Binding ${resp} 30 10.10.30.0/24 sxp - Should Contain Binding ${resp} 30 10.30.0.0/16 sxp - Should Contain Binding ${resp} 30 30.0.0.0/8 sxp - Should Contain Binding ${resp} 40 10.10.10.40/32 sxp - Should Contain Binding ${resp} 40 10.10.40.0/24 sxp - Should Contain Binding ${resp} 40 10.40.0.0/16 sxp - Should Contain Binding ${resp} 40 40.0.0.0/8 sxp + Should Contain Binding ${resp} 10 10.10.10.10/32 + Should Contain Binding ${resp} 10 10.10.10.0/24 + Should Contain Binding ${resp} 10 10.10.0.0/16 + Should Contain Binding ${resp} 10 10.0.0.0/8 + Should Contain Binding ${resp} 30 10.10.10.30/32 + Should Contain Binding ${resp} 30 10.10.30.0/24 + Should Contain Binding ${resp} 30 10.30.0.0/16 + Should Contain Binding ${resp} 30 30.0.0.0/8 + Should Contain Binding ${resp} 40 10.10.10.40/32 + Should Contain Binding ${resp} 40 10.10.40.0/24 + Should Contain Binding ${resp} 40 10.40.0.0/16 + Should Contain Binding ${resp} 40 40.0.0.0/8 Check Two Group 4-5 [Documentation] Check if only bindings matching filter nodes 4 and 5 @@ -82,32 +82,32 @@ Check Two Group 4-5 : FOR ${node} IN RANGE 4 6 \ ${resp} Get Bindings 127.0.0.${node} \ Log ${resp} - \ Should Not Contain Binding ${resp} 10 10.10.10.10/32 sxp - \ Should Contain Binding ${resp} 10 10.10.10.0/24 sxp - \ Should Contain Binding ${resp} 10 10.10.0.0/16 sxp - \ Should Not Contain Binding ${resp} 10 10.0.0.0/8 sxp - \ Should Not Contain Binding ${resp} 20 10.10.10.20/32 sxp - \ Should Contain Binding ${resp} 20 10.10.20.0/24 sxp - \ Should Contain Binding ${resp} 20 10.20.0.0/16 sxp - \ Should Not Contain Binding ${resp} 20 20.0.0.0/8 sxp - \ Should Not Contain Binding ${resp} 30 10.10.10.30/32 sxp - \ Should Contain Binding ${resp} 30 10.10.30.0/24 sxp - \ Should Not Contain Binding ${resp} 30 10.30.0.0/16 sxp - \ Should Not Contain Binding ${resp} 30 30.0.0.0/8 sxp + \ Should Not Contain Binding ${resp} 10 10.10.10.10/32 + \ Should Contain Binding ${resp} 10 10.10.10.0/24 + \ Should Contain Binding ${resp} 10 10.10.0.0/16 + \ Should Not Contain Binding ${resp} 10 10.0.0.0/8 + \ Should Not Contain Binding ${resp} 20 10.10.10.20/32 + \ Should Contain Binding ${resp} 20 10.10.20.0/24 + \ Should Contain Binding ${resp} 20 10.20.0.0/16 + \ Should Not Contain Binding ${resp} 20 20.0.0.0/8 + \ Should Not Contain Binding ${resp} 30 10.10.10.30/32 + \ Should Contain Binding ${resp} 30 10.10.30.0/24 + \ Should Not Contain Binding ${resp} 30 10.30.0.0/16 + \ Should Not Contain Binding ${resp} 30 30.0.0.0/8 ${resp} Get Bindings 127.0.0.2 Log ${resp} - Should Contain Binding ${resp} 10 10.10.10.10/32 sxp - Should Contain Binding ${resp} 10 10.10.10.0/24 sxp - Should Contain Binding ${resp} 10 10.10.0.0/16 sxp - Should Contain Binding ${resp} 10 10.0.0.0/8 sxp - Should Contain Binding ${resp} 30 10.10.10.30/32 sxp - Should Contain Binding ${resp} 30 10.10.30.0/24 sxp - Should Contain Binding ${resp} 30 10.30.0.0/16 sxp - Should Contain Binding ${resp} 30 30.0.0.0/8 sxp - Should Contain Binding ${resp} 40 10.10.10.40/32 sxp - Should Contain Binding ${resp} 40 10.10.40.0/24 sxp - Should Contain Binding ${resp} 40 10.40.0.0/16 sxp - Should Contain Binding ${resp} 40 40.0.0.0/8 sxp + Should Contain Binding ${resp} 10 10.10.10.10/32 + Should Contain Binding ${resp} 10 10.10.10.0/24 + Should Contain Binding ${resp} 10 10.10.0.0/16 + Should Contain Binding ${resp} 10 10.0.0.0/8 + Should Contain Binding ${resp} 30 10.10.10.30/32 + Should Contain Binding ${resp} 30 10.10.30.0/24 + Should Contain Binding ${resp} 30 10.30.0.0/16 + Should Contain Binding ${resp} 30 30.0.0.0/8 + Should Contain Binding ${resp} 40 10.10.10.40/32 + Should Contain Binding ${resp} 40 10.10.40.0/24 + Should Contain Binding ${resp} 40 10.40.0.0/16 + Should Contain Binding ${resp} 40 40.0.0.0/8 Check One Group 2-5 [Documentation] Check if only bindings matching filter nodes 2 and 5 @@ -120,32 +120,32 @@ Check One Group 2-5 : FOR ${node} IN @{list} \ ${resp} Get Bindings ${node} \ Log ${resp} - \ Should Not Contain Binding ${resp} 10 10.10.10.10/32 sxp - \ Should Contain Binding ${resp} 10 10.10.10.0/24 sxp - \ Should Contain Binding ${resp} 10 10.10.0.0/16 sxp - \ Should Not Contain Binding ${resp} 10 10.0.0.0/8 sxp - \ Should Contain Binding ${resp} 30 10.10.10.30/32 sxp - \ Should Contain Binding ${resp} 30 10.10.30.0/24 sxp - \ Should Not Contain Binding ${resp} 30 10.30.0.0/16 sxp - \ Should Not Contain Binding ${resp} 30 30.0.0.0/8 sxp - \ Should Not Contain Binding ${resp} 40 10.10.10.40/32 sxp - \ Should Contain Binding ${resp} 40 10.10.40.0/24 sxp - \ Should Not Contain Binding ${resp} 40 10.40.0.0/16 sxp - \ Should Not Contain Binding ${resp} 40 40.0.0.0/8 sxp + \ Should Not Contain Binding ${resp} 10 10.10.10.10/32 + \ Should Contain Binding ${resp} 10 10.10.10.0/24 + \ Should Contain Binding ${resp} 10 10.10.0.0/16 + \ Should Not Contain Binding ${resp} 10 10.0.0.0/8 + \ Should Contain Binding ${resp} 30 10.10.10.30/32 + \ Should Contain Binding ${resp} 30 10.10.30.0/24 + \ Should Not Contain Binding ${resp} 30 10.30.0.0/16 + \ Should Not Contain Binding ${resp} 30 30.0.0.0/8 + \ Should Not Contain Binding ${resp} 40 10.10.10.40/32 + \ Should Contain Binding ${resp} 40 10.10.40.0/24 + \ Should Not Contain Binding ${resp} 40 10.40.0.0/16 + \ Should Not Contain Binding ${resp} 40 40.0.0.0/8 ${resp} Get Bindings 127.0.0.4 Log ${resp} - Should Contain Binding ${resp} 10 10.10.10.10/32 sxp - Should Contain Binding ${resp} 10 10.10.10.0/24 sxp - Should Contain Binding ${resp} 10 10.10.0.0/16 sxp - Should Contain Binding ${resp} 10 10.0.0.0/8 sxp - Should Contain Binding ${resp} 20 10.10.10.20/32 sxp - Should Contain Binding ${resp} 20 10.10.20.0/24 sxp - Should Contain Binding ${resp} 20 10.20.0.0/16 sxp - Should Contain Binding ${resp} 20 20.0.0.0/8 sxp - Should Contain Binding ${resp} 30 10.10.10.30/32 sxp - Should Contain Binding ${resp} 30 10.10.30.0/24 sxp - Should Contain Binding ${resp} 30 10.30.0.0/16 sxp - Should Contain Binding ${resp} 30 30.0.0.0/8 sxp + Should Contain Binding ${resp} 10 10.10.10.10/32 + Should Contain Binding ${resp} 10 10.10.10.0/24 + Should Contain Binding ${resp} 10 10.10.0.0/16 + Should Contain Binding ${resp} 10 10.0.0.0/8 + Should Contain Binding ${resp} 20 10.10.10.20/32 + Should Contain Binding ${resp} 20 10.10.20.0/24 + Should Contain Binding ${resp} 20 10.20.0.0/16 + Should Contain Binding ${resp} 20 20.0.0.0/8 + Should Contain Binding ${resp} 30 10.10.10.30/32 + Should Contain Binding ${resp} 30 10.10.30.0/24 + Should Contain Binding ${resp} 30 10.30.0.0/16 + Should Contain Binding ${resp} 30 30.0.0.0/8 Check Two Group 2-5 [Documentation] Check if only bindings matching filter nodes 2 and 5 @@ -156,32 +156,32 @@ Check Two Group 2-5 : FOR ${node} IN @{list} \ ${resp} Get Bindings ${node} \ Log ${resp} - \ Should Not Contain Binding ${resp} 10 10.10.10.10/32 sxp - \ Should Not Contain Binding ${resp} 10 10.10.10.0/24 sxp - \ Should Not Contain Binding ${resp} 10 10.10.0.0/16 sxp - \ Should Not Contain Binding ${resp} 10 10.0.0.0/8 sxp - \ Should Contain Binding ${resp} 30 10.10.10.30/32 sxp - \ Should Contain Binding ${resp} 30 10.10.30.0/24 sxp - \ Should Not Contain Binding ${resp} 30 10.30.0.0/16 sxp - \ Should Not Contain Binding ${resp} 30 30.0.0.0/8 sxp - \ Should Contain Binding ${resp} 40 10.10.10.40/32 sxp - \ Should Contain Binding ${resp} 40 10.10.40.0/24 sxp - \ Should Not Contain Binding ${resp} 40 10.40.0.0/16 sxp - \ Should Not Contain Binding ${resp} 40 40.0.0.0/8 sxp + \ Should Not Contain Binding ${resp} 10 10.10.10.10/32 + \ Should Not Contain Binding ${resp} 10 10.10.10.0/24 + \ Should Not Contain Binding ${resp} 10 10.10.0.0/16 + \ Should Not Contain Binding ${resp} 10 10.0.0.0/8 + \ Should Contain Binding ${resp} 30 10.10.10.30/32 + \ Should Contain Binding ${resp} 30 10.10.30.0/24 + \ Should Not Contain Binding ${resp} 30 10.30.0.0/16 + \ Should Not Contain Binding ${resp} 30 30.0.0.0/8 + \ Should Contain Binding ${resp} 40 10.10.10.40/32 + \ Should Contain Binding ${resp} 40 10.10.40.0/24 + \ Should Not Contain Binding ${resp} 40 10.40.0.0/16 + \ Should Not Contain Binding ${resp} 40 40.0.0.0/8 ${resp} Get Bindings 127.0.0.4 Log ${resp} - Should Contain Binding ${resp} 10 10.10.10.10/32 sxp - Should Contain Binding ${resp} 10 10.10.10.0/24 sxp - Should Contain Binding ${resp} 10 10.10.0.0/16 sxp - Should Contain Binding ${resp} 10 10.0.0.0/8 sxp - Should Contain Binding ${resp} 20 10.10.10.20/32 sxp - Should Contain Binding ${resp} 20 10.10.20.0/24 sxp - Should Contain Binding ${resp} 20 10.20.0.0/16 sxp - Should Contain Binding ${resp} 20 20.0.0.0/8 sxp - Should Contain Binding ${resp} 30 10.10.10.30/32 sxp - Should Contain Binding ${resp} 30 10.10.30.0/24 sxp - Should Contain Binding ${resp} 30 10.30.0.0/16 sxp - Should Contain Binding ${resp} 30 30.0.0.0/8 sxp + Should Contain Binding ${resp} 10 10.10.10.10/32 + Should Contain Binding ${resp} 10 10.10.10.0/24 + Should Contain Binding ${resp} 10 10.10.0.0/16 + Should Contain Binding ${resp} 10 10.0.0.0/8 + Should Contain Binding ${resp} 20 10.10.10.20/32 + Should Contain Binding ${resp} 20 10.10.20.0/24 + Should Contain Binding ${resp} 20 10.20.0.0/16 + Should Contain Binding ${resp} 20 20.0.0.0/8 + Should Contain Binding ${resp} 30 10.10.10.30/32 + Should Contain Binding ${resp} 30 10.10.30.0/24 + Should Contain Binding ${resp} 30 10.30.0.0/16 + Should Contain Binding ${resp} 30 30.0.0.0/8 Check One Group 4-2 [Documentation] Check if only bindings matching filter from node 4 and 2 are propagated to SXP-DB other nodes @@ -191,28 +191,28 @@ Check One Group 4-2 ... Info regarding filtering https://wiki.opendaylight.org/view/SXP:Beryllium:Developer_Guide ${resp} Get Bindings 127.0.0.5 Log ${resp} - Should Contain Binding ${resp} 10 10.10.10.10/32 sxp - Should Contain Binding ${resp} 10 10.10.10.0/24 sxp - Should Contain Binding ${resp} 10 10.10.0.0/16 sxp - Should Contain Binding ${resp} 10 10.0.0.0/8 sxp - Should Contain Binding ${resp} 20 10.10.10.20/32 sxp - Should Not Contain Binding ${resp} 20 10.10.20.0/24 sxp - Should Contain Binding ${resp} 20 10.20.0.0/16 sxp - Should Not Contain Binding ${resp} 20 20.0.0.0/8 sxp - Should Contain Binding ${resp} 30 10.10.10.30/32 sxp - Should Contain Binding ${resp} 30 10.10.30.0/24 sxp - Should Contain Binding ${resp} 30 10.30.0.0/16 sxp - Should Contain Binding ${resp} 30 30.0.0.0/8 sxp - Should Contain Binding ${resp} 40 10.10.10.40/32 sxp - Should Not Contain Binding ${resp} 40 10.10.40.0/24 sxp - Should Contain Binding ${resp} 40 10.40.0.0/16 sxp - Should Not Contain Binding ${resp} 40 40.0.0.0/8 sxp + Should Contain Binding ${resp} 10 10.10.10.10/32 + Should Contain Binding ${resp} 10 10.10.10.0/24 + Should Contain Binding ${resp} 10 10.10.0.0/16 + Should Contain Binding ${resp} 10 10.0.0.0/8 + Should Contain Binding ${resp} 20 10.10.10.20/32 + Should Not Contain Binding ${resp} 20 10.10.20.0/24 + Should Contain Binding ${resp} 20 10.20.0.0/16 + Should Not Contain Binding ${resp} 20 20.0.0.0/8 + Should Contain Binding ${resp} 30 10.10.10.30/32 + Should Contain Binding ${resp} 30 10.10.30.0/24 + Should Contain Binding ${resp} 30 10.30.0.0/16 + Should Contain Binding ${resp} 30 30.0.0.0/8 + Should Contain Binding ${resp} 40 10.10.10.40/32 + Should Not Contain Binding ${resp} 40 10.10.40.0/24 + Should Contain Binding ${resp} 40 10.40.0.0/16 + Should Not Contain Binding ${resp} 40 40.0.0.0/8 ${resp} Get Bindings 127.0.0.3 Log ${resp} - Should Contain Binding ${resp} 50 10.10.10.50/32 sxp - Should Contain Binding ${resp} 50 10.10.50.0/24 sxp - Should Contain Binding ${resp} 50 10.50.0.0/16 sxp - Should Contain Binding ${resp} 50 50.0.0.0/8 sxp + Should Contain Binding ${resp} 50 10.10.10.50/32 + Should Contain Binding ${resp} 50 10.10.50.0/24 + Should Contain Binding ${resp} 50 10.50.0.0/16 + Should Contain Binding ${resp} 50 50.0.0.0/8 Check Two Group 4-2 [Documentation] Check if only bindings matching filter from node 4 and 2 are propagated to SXP-DB of other nodes @@ -221,28 +221,28 @@ Check Two Group 4-2 ... Info regarding filtering https://wiki.opendaylight.org/view/SXP:Beryllium:Developer_Guide ${resp} Get Bindings 127.0.0.5 Log ${resp} - Should Contain Binding ${resp} 10 10.10.10.10/32 sxp - Should Contain Binding ${resp} 10 10.10.10.0/24 sxp - Should Contain Binding ${resp} 10 10.10.0.0/16 sxp - Should Contain Binding ${resp} 10 10.0.0.0/8 sxp - Should Contain Binding ${resp} 20 10.10.10.20/32 sxp - Should Contain Binding ${resp} 20 10.10.20.0/24 sxp - Should Contain Binding ${resp} 20 10.20.0.0/16 sxp - Should Not Contain Binding ${resp} 20 20.0.0.0/8 sxp - Should Contain Binding ${resp} 30 10.10.10.30/32 sxp - Should Contain Binding ${resp} 30 10.10.30.0/24 sxp - Should Contain Binding ${resp} 30 10.30.0.0/16 sxp - Should Contain Binding ${resp} 30 30.0.0.0/8 sxp - Should Contain Binding ${resp} 40 10.10.10.40/32 sxp - Should Contain Binding ${resp} 40 10.10.40.0/24 sxp - Should Contain Binding ${resp} 40 10.40.0.0/16 sxp - Should Not Contain Binding ${resp} 40 40.0.0.0/8 sxp + Should Contain Binding ${resp} 10 10.10.10.10/32 + Should Contain Binding ${resp} 10 10.10.10.0/24 + Should Contain Binding ${resp} 10 10.10.0.0/16 + Should Contain Binding ${resp} 10 10.0.0.0/8 + Should Contain Binding ${resp} 20 10.10.10.20/32 + Should Contain Binding ${resp} 20 10.10.20.0/24 + Should Contain Binding ${resp} 20 10.20.0.0/16 + Should Not Contain Binding ${resp} 20 20.0.0.0/8 + Should Contain Binding ${resp} 30 10.10.10.30/32 + Should Contain Binding ${resp} 30 10.10.30.0/24 + Should Contain Binding ${resp} 30 10.30.0.0/16 + Should Contain Binding ${resp} 30 30.0.0.0/8 + Should Contain Binding ${resp} 40 10.10.10.40/32 + Should Contain Binding ${resp} 40 10.10.40.0/24 + Should Contain Binding ${resp} 40 10.40.0.0/16 + Should Not Contain Binding ${resp} 40 40.0.0.0/8 ${resp} Get Bindings 127.0.0.3 Log ${resp} - Should Contain Binding ${resp} 50 10.10.10.50/32 sxp - Should Contain Binding ${resp} 50 10.10.50.0/24 sxp - Should Contain Binding ${resp} 50 10.50.0.0/16 sxp - Should Contain Binding ${resp} 50 50.0.0.0/8 sxp + Should Contain Binding ${resp} 50 10.10.10.50/32 + Should Contain Binding ${resp} 50 10.10.50.0/24 + Should Contain Binding ${resp} 50 10.50.0.0/16 + Should Contain Binding ${resp} 50 50.0.0.0/8 Check Three Group 4-2 [Documentation] Check if only bindings matching filter from node 4 and 2 are propagated to SXP-DB of other nodes @@ -251,22 +251,22 @@ Check Three Group 4-2 ... Info regarding filtering https://wiki.opendaylight.org/view/SXP:Beryllium:Developer_Guide ${resp} Get Bindings 127.0.0.5 Log ${resp} - Should Contain Binding ${resp} 10 10.10.10.10/32 sxp - Should Contain Binding ${resp} 10 10.10.10.0/24 sxp - Should Contain Binding ${resp} 10 10.10.0.0/16 sxp - Should Contain Binding ${resp} 10 10.0.0.0/8 sxp - Should Not Contain Binding ${resp} 20 10.10.10.20/32 sxp - Should Not Contain Binding ${resp} 20 10.10.20.0/24 sxp - Should Not Contain Binding ${resp} 20 10.20.0.0/16 sxp - Should Not Contain Binding ${resp} 20 20.0.0.0/8 sxp - Should Contain Binding ${resp} 30 10.10.10.30/32 sxp - Should Contain Binding ${resp} 30 10.10.30.0/24 sxp - Should Contain Binding ${resp} 30 10.30.0.0/16 sxp - Should Contain Binding ${resp} 30 30.0.0.0/8 sxp - Should Not Contain Binding ${resp} 40 10.10.10.40/32 sxp - Should Not Contain Binding ${resp} 40 10.10.40.0/24 sxp - Should Not Contain Binding ${resp} 40 10.40.0.0/16 sxp - Should Not Contain Binding ${resp} 40 40.0.0.0/8 sxp + Should Contain Binding ${resp} 10 10.10.10.10/32 + Should Contain Binding ${resp} 10 10.10.10.0/24 + Should Contain Binding ${resp} 10 10.10.0.0/16 + Should Contain Binding ${resp} 10 10.0.0.0/8 + Should Not Contain Binding ${resp} 20 10.10.10.20/32 + Should Not Contain Binding ${resp} 20 10.10.20.0/24 + Should Not Contain Binding ${resp} 20 10.20.0.0/16 + Should Not Contain Binding ${resp} 20 20.0.0.0/8 + Should Contain Binding ${resp} 30 10.10.10.30/32 + Should Contain Binding ${resp} 30 10.10.30.0/24 + Should Contain Binding ${resp} 30 10.30.0.0/16 + Should Contain Binding ${resp} 30 30.0.0.0/8 + Should Not Contain Binding ${resp} 40 10.10.10.40/32 + Should Not Contain Binding ${resp} 40 10.10.40.0/24 + Should Not Contain Binding ${resp} 40 10.40.0.0/16 + Should Not Contain Binding ${resp} 40 40.0.0.0/8 Check One Group 5-3 [Documentation] Check if only bindings matching filter from node 5 and 3 are propagated to SXP-DB of other nodes @@ -276,28 +276,28 @@ Check One Group 5-3 ... Info regarding filtering https://wiki.opendaylight.org/view/SXP:Beryllium:Developer_Guide ${resp} Get Bindings 127.0.0.4 Log ${resp} - Should Contain Binding ${resp} 10 10.10.10.10/32 sxp - Should Contain Binding ${resp} 10 10.10.10.0/24 sxp - Should Contain Binding ${resp} 10 10.10.0.0/16 sxp - Should Contain Binding ${resp} 10 10.0.0.0/8 sxp - Should Contain Binding ${resp} 20 10.10.10.20/32 sxp - Should Contain Binding ${resp} 20 10.10.20.0/24 sxp - Should Contain Binding ${resp} 20 10.20.0.0/16 sxp - Should Contain Binding ${resp} 20 20.0.0.0/8 sxp - Should Contain Binding ${resp} 30 10.10.10.30/32 sxp - Should Not Contain Binding ${resp} 30 10.10.30.0/24 sxp - Should Not Contain Binding ${resp} 30 10.30.0.0/16 sxp - Should Not Contain Binding ${resp} 30 30.0.0.0/8 sxp - Should Not Contain Binding ${resp} 50 10.10.10.50/32 sxp - Should Not Contain Binding ${resp} 50 10.10.50.0/24 sxp - Should Contain Binding ${resp} 50 10.50.0.0/16 sxp - Should Not Contain Binding ${resp} 50 50.0.0.0/8 sxp + Should Contain Binding ${resp} 10 10.10.10.10/32 + Should Contain Binding ${resp} 10 10.10.10.0/24 + Should Contain Binding ${resp} 10 10.10.0.0/16 + Should Contain Binding ${resp} 10 10.0.0.0/8 + Should Contain Binding ${resp} 20 10.10.10.20/32 + Should Contain Binding ${resp} 20 10.10.20.0/24 + Should Contain Binding ${resp} 20 10.20.0.0/16 + Should Contain Binding ${resp} 20 20.0.0.0/8 + Should Contain Binding ${resp} 30 10.10.10.30/32 + Should Not Contain Binding ${resp} 30 10.10.30.0/24 + Should Not Contain Binding ${resp} 30 10.30.0.0/16 + Should Not Contain Binding ${resp} 30 30.0.0.0/8 + Should Not Contain Binding ${resp} 50 10.10.10.50/32 + Should Not Contain Binding ${resp} 50 10.10.50.0/24 + Should Contain Binding ${resp} 50 10.50.0.0/16 + Should Not Contain Binding ${resp} 50 50.0.0.0/8 ${resp} Get Bindings 127.0.0.2 Log ${resp} - Should Contain Binding ${resp} 40 10.10.10.40/32 sxp - Should Contain Binding ${resp} 40 10.10.40.0/24 sxp - Should Contain Binding ${resp} 40 10.40.0.0/16 sxp - Should Contain Binding ${resp} 40 40.0.0.0/8 sxp + Should Contain Binding ${resp} 40 10.10.10.40/32 + Should Contain Binding ${resp} 40 10.10.40.0/24 + Should Contain Binding ${resp} 40 10.40.0.0/16 + Should Contain Binding ${resp} 40 40.0.0.0/8 Check Two Group 5-3 [Documentation] Check if only bindings matching filter from node 5 and 3 are propagated to SXP-DB of other nodes @@ -306,25 +306,25 @@ Check Two Group 5-3 ... Info regarding filtering https://wiki.opendaylight.org/view/SXP:Beryllium:Developer_Guide ${resp} Get Bindings 127.0.0.4 Log ${resp} - Should Contain Binding ${resp} 10 10.10.10.10/32 sxp - Should Contain Binding ${resp} 10 10.10.10.0/24 sxp - Should Contain Binding ${resp} 10 10.10.0.0/16 sxp - Should Contain Binding ${resp} 10 10.0.0.0/8 sxp - Should Contain Binding ${resp} 20 10.10.10.20/32 sxp - Should Contain Binding ${resp} 20 10.10.20.0/24 sxp - Should Contain Binding ${resp} 20 10.20.0.0/16 sxp - Should Contain Binding ${resp} 20 20.0.0.0/8 sxp - Should Contain Binding ${resp} 30 10.10.10.30/32 sxp - Should Contain Binding ${resp} 30 10.10.30.0/24 sxp - Should Contain Binding ${resp} 30 10.30.0.0/16 sxp - Should Not Contain Binding ${resp} 30 30.0.0.0/8 sxp - Should Not Contain Binding ${resp} 50 10.10.10.50/32 sxp - Should Not Contain Binding ${resp} 50 10.10.50.0/24 sxp - Should Not Contain Binding ${resp} 50 10.50.0.0/16 sxp - Should Not Contain Binding ${resp} 50 50.0.0.0/8 sxp + Should Contain Binding ${resp} 10 10.10.10.10/32 + Should Contain Binding ${resp} 10 10.10.10.0/24 + Should Contain Binding ${resp} 10 10.10.0.0/16 + Should Contain Binding ${resp} 10 10.0.0.0/8 + Should Contain Binding ${resp} 20 10.10.10.20/32 + Should Contain Binding ${resp} 20 10.10.20.0/24 + Should Contain Binding ${resp} 20 10.20.0.0/16 + Should Contain Binding ${resp} 20 20.0.0.0/8 + Should Contain Binding ${resp} 30 10.10.10.30/32 + Should Contain Binding ${resp} 30 10.10.30.0/24 + Should Contain Binding ${resp} 30 10.30.0.0/16 + Should Not Contain Binding ${resp} 30 30.0.0.0/8 + Should Not Contain Binding ${resp} 50 10.10.10.50/32 + Should Not Contain Binding ${resp} 50 10.10.50.0/24 + Should Not Contain Binding ${resp} 50 10.50.0.0/16 + Should Not Contain Binding ${resp} 50 50.0.0.0/8 ${resp} Get Bindings 127.0.0.2 Log ${resp} - Should Contain Binding ${resp} 40 10.10.10.40/32 sxp - Should Contain Binding ${resp} 40 10.10.40.0/24 sxp - Should Contain Binding ${resp} 40 10.40.0.0/16 sxp - Should Contain Binding ${resp} 40 40.0.0.0/8 sxp + Should Contain Binding ${resp} 40 10.10.10.40/32 + Should Contain Binding ${resp} 40 10.10.40.0/24 + Should Contain Binding ${resp} 40 10.40.0.0/16 + Should Contain Binding ${resp} 40 40.0.0.0/8 diff --git a/csit/libraries/Sxp.py b/csit/libraries/Sxp.py index 33b317fced..0757687f75 100644 --- a/csit/libraries/Sxp.py +++ b/csit/libraries/Sxp.py @@ -902,8 +902,8 @@ def delete_node_xml(node_id): return data -def add_domain_xml(node_id, name, sgt, prefixes, origin): - """Generate xml for Add Domain request +def add_domain_xml_fluorine(node_id, name, sgt, prefixes, origin): + """Generate xml for Add Domain request (Fluorine version: bindings with origin) :param node_id: Id of node :type node_id: str @@ -918,19 +918,19 @@ def add_domain_xml(node_id, name, sgt, prefixes, origin): :returns: String containing xml data for request """ - bindings = '' - for prefix in prefixes.split(','): - bindings += '\n' + '' + prefix + '' - master_database = '' - if bindings: - master_database += ''' - - $sgt - $bindings - - ''' - master_database = Template(master_database).substitute(({'sgt': sgt, 'bindings': bindings})) + if prefixes != 'None': + xml_prefixes = '' + for prefix in prefixes.split(','): + xml_prefixes += '\n' + '' + prefix + '' + if xml_prefixes: + master_database += ''' + + $sgt + $xml_prefixes + + ''' + master_database = Template(master_database).substitute(({'sgt': sgt, 'xml_prefixes': xml_prefixes})) templ = Template(''' $id @@ -943,6 +943,44 @@ def add_domain_xml(node_id, name, sgt, prefixes, origin): return data +def add_domain_xml_oxygen(node_id, name, sgt, prefixes): + """Generate xml for Add Domain request (Oxygen version: bindings without origin) + + :param node_id: Id of node + :type node_id: str + :param name: Name of Domain + :type name: str + :param sgt: Security group + :type sgt: int + :param prefixes: List of ip-prefixes + :type prefixes: str + :returns: String containing xml data for request + + """ + master_database = '' + if prefixes != 'None': + xml_prefixes = '' + for prefix in prefixes.split(','): + xml_prefixes += '\n' + '' + prefix + '' + if xml_prefixes: + master_database += ''' + + $sgt + $xml_prefixes + + ''' + master_database = Template(master_database).substitute(({'sgt': sgt, 'xml_prefixes': xml_prefixes})) + + templ = Template(''' + $id + $name + $master_database +''') + + data = templ.substitute({'name': name, 'id': node_id, 'master_database': master_database}) + return data + + def delete_domain_xml(node_id, name): """Generate xml for Remove Domain request @@ -970,8 +1008,8 @@ def get_domain_name(domain_name): return '' + domain_name + '' -def add_bindings_xml(node_id, domain, sgt, prefixes, origin): - """Generate xml for Add Bindings request +def add_bindings_xml_fluorine(node_id, domain, sgt, prefixes, origin): + """Generate xml for Add Bindings request (Fluorine version with origin type) :param node_id: Id of node :type node_id: str @@ -986,9 +1024,9 @@ def add_bindings_xml(node_id, domain, sgt, prefixes, origin): :returns: String containing xml data for request """ - bindings = '' + xml_prefixes = '' for prefix in prefixes.split(','): - bindings += '\n' + '' + prefix + '' + xml_prefixes += '\n' + '' + prefix + '' templ = Template(''' $id $name @@ -996,11 +1034,40 @@ def add_bindings_xml(node_id, domain, sgt, prefixes, origin): $sgt - $bindings + $xml_prefixes ''') - data = templ.substitute({'name': domain, 'id': node_id, 'sgt': sgt, 'bindings': bindings, 'origin': origin}) + data = templ.substitute({'name': domain, 'id': node_id, 'sgt': sgt, 'xml_prefixes': xml_prefixes, 'origin': origin}) + return data + + +def add_bindings_xml_oxygen(node_id, domain, sgt, prefixes): + """Generate xml for Add Bindings request (Oxygen version without origin type) + + :param node_id: Id of node + :type node_id: str + :param domain: Name of Domain + :type domain: str + :param sgt: Security group + :type sgt: int + :param prefixes: List of ip-prefixes + :type prefixes: str + :returns: String containing xml data for request + + """ + xml_prefixes = '' + for prefix in prefixes.split(','): + xml_prefixes += '\n' + '' + prefix + '' + templ = Template(''' + $id + $name + + $sgt + $xml_prefixes + +''') + data = templ.substitute({'name': domain, 'id': node_id, 'sgt': sgt, 'xml_prefixes': xml_prefixes}) return data @@ -1013,23 +1080,23 @@ def delete_bindings_xml(node_id, domain, sgt, prefixes): :type domain: str :param sgt: Security group :type sgt: int - :param prefixes: List of ip-prefixes + :param prefixes: Comma separated list of ip-prefixes :type prefixes: str :returns: String containing xml data for request """ - bindings = '' + xml_prefixes = '' for prefix in prefixes.split(','): - bindings += '\n' + '' + prefix + '' + xml_prefixes += '\n' + '' + prefix + '' templ = Template(''' $id $name $sgt - $bindings + $xml_prefixes ''') - data = templ.substitute({'name': domain, 'id': node_id, 'sgt': sgt, 'bindings': bindings}) + data = templ.substitute({'name': domain, 'id': node_id, 'sgt': sgt, 'xml_prefixes': xml_prefixes}) return data diff --git a/csit/libraries/SxpLib.robot b/csit/libraries/SxpLib.robot index 8d25a248f5..2db5fbc603 100644 --- a/csit/libraries/SxpLib.robot +++ b/csit/libraries/SxpLib.robot @@ -3,6 +3,7 @@ Documentation Library containing Keywords used for SXP testing Library Collections Library RequestsLibrary Library ./Sxp.py +Resource CompareStream.robot Resource KarafKeywords.robot Resource TemplatedRequests.robot Resource Utils.robot @@ -78,9 +79,22 @@ Verify Connection Should Contain Connection ${resp} ${ip} ${port} ${mode} ${version} ${state} Add Bindings - [Arguments] ${sgt} ${prefixes} ${origin}=LOCAL ${node}=127.0.0.1 ${session}=session ${domain}=global - [Documentation] Add/Update one or more bindings via RPC to Master DB of the node - ${data} = Sxp.Add Bindings Xml ${node} ${domain} ${sgt} ${prefixes} ${origin} + [Arguments] ${sgt} ${prefixes} ${node}=127.0.0.1 ${session}=session ${domain}=global ${origin}=LOCAL + [Documentation] Based on ODL version decide if bindings will be added with or without origin type (introduced in Fluorine) + CompareStream.Run_Keyword_If_At_Least_Fluorine Add Bindings Fluorine ${sgt} ${prefixes} ${node} ${session} ${domain} + ... ${origin} + CompareStream.Run_Keyword_If_At_Most_Oxygen Add Bindings Oxygen ${sgt} ${prefixes} ${node} ${session} ${domain} + +Add Bindings Fluorine + [Arguments] ${sgt} ${prefixes} ${node} ${session} ${domain} ${origin} + [Documentation] Add/Update one or more bindings with origin type via RPC to Master DB of the node + ${data} = Sxp.Add Bindings Xml Fluorine ${node} ${domain} ${sgt} ${prefixes} ${origin} + Post To Controller ${session} add-bindings ${data} + +Add Bindings Oxygen + [Arguments] ${sgt} ${prefixes} ${node} ${session} ${domain} + [Documentation] Add/Update one or more bindings without origin type via RPC to Master DB of the node + ${data} = Sxp.Add Bindings Xml Oxygen ${node} ${domain} ${sgt} ${prefixes} Post To Controller ${session} add-bindings ${data} Get Bindings @@ -96,12 +110,14 @@ Clean Bindings ${resp} = Get Bindings ${node} ${session} ${domain} ${scope} @{bindings} = Sxp.Parse Bindings ${resp} : FOR ${binding} IN @{bindings} - \ Delete Bindings ${binding['sgt']} ${binding['ip-prefix']} ${node} ${domain} ${session} + \ @{prefixes_list} = collections.Get From Dictionary ${binding} ip-prefix + \ ${prefixes} = BuiltIn.Catenate SEPARATOR=, @{prefixes_list} + \ Delete Bindings ${binding['sgt']} ${prefixes} ${node} ${domain} ${session} Delete Bindings [Arguments] ${sgt} ${prefixes} ${node}=127.0.0.1 ${domain}=global ${session}=session [Documentation] Delete one or more bindings via RPC from Master DB of node - ${data} = Sxp.Delete Bindings Xml ${node} ${domain} ${sgt} @{prefixes} + ${data} = Sxp.Delete Bindings Xml ${node} ${domain} ${sgt} ${prefixes} Post To Controller ${session} delete-bindings ${data} Add PeerGroup @@ -135,7 +151,7 @@ Clean Peer Groups Add Filter [Arguments] ${name} ${type} ${entries} ${node}=127.0.0.1 ${session}=session ${policy}=auto-update [Documentation] Add Filter via RPC from Node - ${data} = BuiltIn.Run_Keyword_If_At_Least_Else carbon Add Filter Xml ${name} ${type} ${entries} + ${data} = CompareStream.Run_Keyword_If_At_Least_Else carbon Add Filter Xml ${name} ${type} ${entries} ... ${node} ${policy} ... ELSE Add Filter Xml ${name} ${type} ${entries} ${node} Post To Controller ${session} add-filter ${data} @@ -253,9 +269,22 @@ Clean SXP Session RequestsLibrary.Delete All Sessions Add Domain - [Arguments] ${domain_name} ${sgt}=None ${prefixes}='' ${origin}=LOCAL ${node}=127.0.0.1 ${session}=session - [Documentation] Add Domain with bindings via RPC - ${data} = Sxp.Add Domain Xml ${node} ${domain_name} ${sgt} ${prefixes} ${origin} + [Arguments] ${domain_name} ${sgt}=None ${prefixes}=None ${origin}=LOCAL ${node}=127.0.0.1 ${session}=session + [Documentation] Based on ODL version decide if domain's bindings will be added with or without origin type (introduced in Fluorine) + CompareStream.Run_Keyword_If_At_Least_Fluorine Add Domain Fluorine ${domain_name} ${sgt} ${prefixes} ${origin} ${node} + ... ${session} + CompareStream.Run_Keyword_If_At_Most_Oxygen Add Domain Oxygen ${domain_name} ${sgt} ${prefixes} ${node} ${session} + +Add Domain Fluorine + [Arguments] ${domain_name} ${sgt} ${prefixes} ${origin} ${node} ${session} + [Documentation] Add Domain with bindings (with origin) via RPC + ${data} = Sxp.Add Domain Xml Fluorine ${node} ${domain_name} ${sgt} ${prefixes} ${origin} + Post To Controller ${session} add-domain ${data} + +Add Domain Oxygen + [Arguments] ${domain_name} ${sgt} ${prefixes} ${node} ${session} + [Documentation] Add Domain with bindings (without origin) via RPC + ${data} = Sxp.Add Domain Xml Oxygen ${node} ${domain_name} ${sgt} ${prefixes} Post To Controller ${session} add-domain ${data} Delete Domain @@ -267,13 +296,13 @@ Delete Domain Add Bindings Range [Arguments] ${sgt} ${start} ${size} ${node}=127.0.0.1 [Documentation] Add Bindings to Node specified by range - ${prefixes} = BuiltIn.Prefix Range ${start} ${size} + ${prefixes} = Sxp.Prefix Range ${start} ${size} Add Bindings ${sgt} ${prefixes} ${node} Delete Bindings Range [Arguments] ${sgt} ${start} ${size} ${node}=127.0.0.1 [Documentation] Delete Bindings to Node specified by range - ${prefixes} = BuiltIn.Prefix Range ${start} ${size} + ${prefixes} = Sxp.Prefix Range ${start} ${size} Delete Bindings ${sgt} ${prefixes} ${node} Check Binding Range diff --git a/csit/suites/sxp/binding-origin/020_Binding_Origins_Checks.robot b/csit/suites/sxp/binding-origin/020_Binding_Origins_Checks.robot index d766c6015d..5b97776a71 100644 --- a/csit/suites/sxp/binding-origin/020_Binding_Origins_Checks.robot +++ b/csit/suites/sxp/binding-origin/020_Binding_Origins_Checks.robot @@ -12,9 +12,9 @@ Test Add Lower Priority Binding ... higher priority binding in master database for the same IP prefix [Tags] Binding Origins Checks SXP BuiltIn.Comment Add binding - SxpLib.Add Bindings 10 1.1.1.1/32 LOCAL + SxpLib.Add Bindings 10 1.1.1.1/32 origin=LOCAL BuiltIn.Comment Try to add binding with lower priority - BuiltIn.Run Keyword And Expect Error RPC result is False SxpLib.Add Bindings 20 1.1.1.1/32 NETWORK + BuiltIn.Run Keyword And Expect Error RPC result is False SxpLib.Add Bindings 20 1.1.1.1/32 origin=NETWORK BuiltIn.Comment Verify that new binding is not added and previous binding is preserved Verify Bindings Content 10 20 1.1.1.1/32 @@ -23,9 +23,9 @@ Test Add Higher Priority Binding ... lower priority binding in master database for the same IP prefix [Tags] Binding Origins Checks SXP BuiltIn.Comment Add binding - SxpLib.Add Bindings 10 1.1.1.1/32 NETWORK + SxpLib.Add Bindings 10 1.1.1.1/32 origin=NETWORK BuiltIn.Comment Add binding with higher priority - SxpLib.Add Bindings 20 1.1.1.1/32 LOCAL + SxpLib.Add Bindings 20 1.1.1.1/32 origin=LOCAL BuiltIn.Comment Verify that new binding replaced previous binding Verify Bindings Content 20 10 1.1.1.1/32 @@ -33,7 +33,7 @@ Test Add Unknown Priority Binding [Documentation] Test that incoming binding with unknown priority cannot be added to master database [Tags] Binding Origins Checks SXP BuiltIn.Comment Try to add binding with unknown origin priority - BuiltIn.Run Keyword And Expect Error 400 != 200 SxpLib.Add Bindings 10 1.1.1.1/32 CLUSTER + BuiltIn.Run Keyword And Expect Error 400 != 200 SxpLib.Add Bindings 10 1.1.1.1/32 origin=CLUSTER BuiltIn.Comment Verify that binding is not in master database SxpLib.Bindings Should Not Contain 10 1.1.1.1/32 @@ -41,9 +41,9 @@ Test Add Lower Priority Binding To Domain [Documentation] Test that incoming binding with lower priority does not override already existing ... higher priority binding in master database for the same IP prefix BuiltIn.Comment Create custom domain with binding - SxpLib.Add Domain guest 10 1.1.1.1/32 LOCAL + SxpLib.Add Domain guest 10 1.1.1.1/32 origin=LOCAL BuiltIn.Comment Try add binding to custom domain with lower priority - BuiltIn.Run Keyword And Expect Error RPC result is False SxpLib.Add Bindings 20 1.1.1.1/32 NETWORK domain=guest + BuiltIn.Run Keyword And Expect Error RPC result is False SxpLib.Add Bindings 20 1.1.1.1/32 domain=guest origin=NETWORK BuiltIn.Comment Verify that new binding is not added and previous binding is preserved Verify Bindings Content 10 20 1.1.1.1/32 guest @@ -51,18 +51,18 @@ Test Add Higher Priority Binding To Domain [Documentation] Test that incoming binding with lower priority does not override already existing ... higher priority binding in master database for the same IP prefix BuiltIn.Comment Create custom domain with binding - SxpLib.Add Domain guest 10 1.1.1.1/32 NETWORK + SxpLib.Add Domain guest 10 1.1.1.1/32 origin=NETWORK BuiltIn.Comment Add binding to custom domain with higher priority - SxpLib.Add Bindings 20 1.1.1.1/32 LOCAL domain=guest + SxpLib.Add Bindings 20 1.1.1.1/32 domain=guest origin=LOCAL BuiltIn.Comment Verify that new binding replaced previous binding Verify Bindings Content 20 10 1.1.1.1/32 guest Test Get Bindings [Documentation] Test that when requesting for LOCAL bindings then only LOCAL bindings are returned BuiltIn.Comment Add LOCAL binding - SxpLib.Add Bindings 10 1.1.1.1/32 LOCAL + SxpLib.Add Bindings 10 1.1.1.1/32 origin=LOCAL BuiltIn.Comment Add NETWORK binding - SxpLib.Add Bindings 20 2.2.2.2/32 NETWORK + SxpLib.Add Bindings 20 2.2.2.2/32 origin=NETWORK BuiltIn.Comment Verify request for LOCAL bindings Verify Local Bindings Content 10 1.1.1.1/32 20 2.2.2.2/32 BuiltIn.Comment Verify request for ALL bindings diff --git a/csit/suites/sxp/filtering/030_Inbound_Filtering_Discarding.robot b/csit/suites/sxp/filtering/030_Inbound_Filtering_Discarding.robot index 8955c34a7e..c1865a76b9 100644 --- a/csit/suites/sxp/filtering/030_Inbound_Filtering_Discarding.robot +++ b/csit/suites/sxp/filtering/030_Inbound_Filtering_Discarding.robot @@ -200,22 +200,22 @@ Check One Group 4-2 ... permit ACL 10.0.0.0 0.254.0.0 ... Info regarding filtering https://wiki.opendaylight.org/view/SXP:Beryllium:Developer_Guide ${resp} Get Bindings 127.0.0.5 - Should Contain Binding ${resp} 10 10.10.10.10/32 sxp - Should Contain Binding ${resp} 10 10.10.10.0/24 sxp - Should Contain Binding ${resp} 10 10.10.0.0/16 sxp - Should Contain Binding ${resp} 10 10.0.0.0/8 sxp - Should Contain Binding ${resp} 20 10.10.10.20/32 sxp - Should Not Contain Binding ${resp} 20 10.10.20.0/24 sxp - Should Contain Binding ${resp} 20 10.20.0.0/16 sxp - Should Not Contain Binding ${resp} 20 20.0.0.0/8 sxp - Should Contain Binding ${resp} 30 10.10.10.30/32 sxp - Should Contain Binding ${resp} 30 10.10.30.0/24 sxp - Should Contain Binding ${resp} 30 10.30.0.0/16 sxp - Should Contain Binding ${resp} 30 30.0.0.0/8 sxp - Should Contain Binding ${resp} 40 10.10.10.40/32 sxp - Should Not Contain Binding ${resp} 40 10.10.40.0/24 sxp - Should Contain Binding ${resp} 40 10.40.0.0/16 sxp - Should Not Contain Binding ${resp} 40 40.0.0.0/8 sxp + Should Contain Binding ${resp} 10 10.10.10.10/32 + Should Contain Binding ${resp} 10 10.10.10.0/24 + Should Contain Binding ${resp} 10 10.10.0.0/16 + Should Contain Binding ${resp} 10 10.0.0.0/8 + Should Contain Binding ${resp} 20 10.10.10.20/32 + Should Not Contain Binding ${resp} 20 10.10.20.0/24 + Should Contain Binding ${resp} 20 10.20.0.0/16 + Should Not Contain Binding ${resp} 20 20.0.0.0/8 + Should Contain Binding ${resp} 30 10.10.10.30/32 + Should Contain Binding ${resp} 30 10.10.30.0/24 + Should Contain Binding ${resp} 30 10.30.0.0/16 + Should Contain Binding ${resp} 30 30.0.0.0/8 + Should Contain Binding ${resp} 40 10.10.10.40/32 + Should Not Contain Binding ${resp} 40 10.10.40.0/24 + Should Contain Binding ${resp} 40 10.40.0.0/16 + Should Not Contain Binding ${resp} 40 40.0.0.0/8 Check One Group 5-3 [Documentation] Check if only bindings matching filter from node 5 and 3 are propagated to SXP-DB of other nodes @@ -224,18 +224,18 @@ Check One Group 5-3 ... permit SGT 50 ACL 10.0.0.0 0.254.0.0 ... Info regarding filtering https://wiki.opendaylight.org/view/SXP:Beryllium:Developer_Guide ${resp} Get Bindings 127.0.0.4 - Should Contain Binding ${resp} 10 10.10.10.10/32 sxp - Should Contain Binding ${resp} 10 10.10.10.0/24 sxp - Should Contain Binding ${resp} 10 10.10.0.0/16 sxp - Should Contain Binding ${resp} 10 10.0.0.0/8 sxp - Should Contain Binding ${resp} 30 10.10.10.30/32 sxp - Should Not Contain Binding ${resp} 30 10.10.30.0/24 sxp - Should Not Contain Binding ${resp} 30 10.30.0.0/16 sxp - Should Not Contain Binding ${resp} 30 30.0.0.0/8 sxp - Should Not Contain Binding ${resp} 50 10.10.10.50/32 sxp - Should Not Contain Binding ${resp} 50 10.10.50.0/24 sxp - Should Contain Binding ${resp} 50 10.50.0.0/16 sxp - Should Not Contain Binding ${resp} 50 50.0.0.0/8 sxp + Should Contain Binding ${resp} 10 10.10.10.10/32 + Should Contain Binding ${resp} 10 10.10.10.0/24 + Should Contain Binding ${resp} 10 10.10.0.0/16 + Should Contain Binding ${resp} 10 10.0.0.0/8 + Should Contain Binding ${resp} 30 10.10.10.30/32 + Should Not Contain Binding ${resp} 30 10.10.30.0/24 + Should Not Contain Binding ${resp} 30 10.30.0.0/16 + Should Not Contain Binding ${resp} 30 30.0.0.0/8 + Should Not Contain Binding ${resp} 50 10.10.10.50/32 + Should Not Contain Binding ${resp} 50 10.10.50.0/24 + Should Contain Binding ${resp} 50 10.50.0.0/16 + Should Not Contain Binding ${resp} 50 50.0.0.0/8 Clean Nodes Clean Bindings 127.0.0.1 diff --git a/csit/suites/sxp/filtering/040_Peer_Sequence_filtering.robot b/csit/suites/sxp/filtering/040_Peer_Sequence_filtering.robot index 8ba154cd8f..6efa5702fb 100644 --- a/csit/suites/sxp/filtering/040_Peer_Sequence_filtering.robot +++ b/csit/suites/sxp/filtering/040_Peer_Sequence_filtering.robot @@ -193,10 +193,10 @@ Setup Nodes Outbound Test Check PeerSequence One [Documentation] Node 127.0.0.2 should contain only bindings with peer sequence lower or equals 1 ${resp} SxpLib.Get Bindings 127.0.0.2 - SxpLib.Should Contain Binding ${resp} 10 10.10.10.10/32 sxp - SxpLib.Should Contain Binding ${resp} 10 10.10.10.0/24 sxp - SxpLib.Should Contain Binding ${resp} 10 10.10.0.0/16 sxp - SxpLib.Should Contain Binding ${resp} 10 10.0.0.0/8 sxp + SxpLib.Should Contain Binding ${resp} 10 10.10.10.10/32 + SxpLib.Should Contain Binding ${resp} 10 10.10.10.0/24 + SxpLib.Should Contain Binding ${resp} 10 10.10.0.0/16 + SxpLib.Should Contain Binding ${resp} 10 10.0.0.0/8 : FOR ${node} IN RANGE 3 6 \ SxpLib.Should Not Contain Binding ${resp} ${node}0 10.10.10.${node}0/32 \ SxpLib.Should Not Contain Binding ${resp} ${node}0 10.10.${node}0.0/24 @@ -206,14 +206,14 @@ Check PeerSequence One Check PeerSequence Two [Documentation] Node 127.0.0.2 should contain only bindings with peer sequence lower or equals 2 ${resp} SxpLib.Get Bindings 127.0.0.2 - SxpLib.Should Contain Binding ${resp} 10 10.10.10.10/32 sxp - SxpLib.Should Contain Binding ${resp} 10 10.10.10.0/24 sxp - SxpLib.Should Contain Binding ${resp} 10 10.10.0.0/16 sxp - SxpLib.Should Contain Binding ${resp} 10 10.0.0.0/8 sxp - SxpLib.Should Contain Binding ${resp} 30 10.10.10.30/32 sxp - SxpLib.Should Contain Binding ${resp} 30 10.10.30.0/24 sxp - SxpLib.Should Contain Binding ${resp} 30 10.30.0.0/16 sxp - SxpLib.Should Contain Binding ${resp} 30 30.0.0.0/8 sxp + SxpLib.Should Contain Binding ${resp} 10 10.10.10.10/32 + SxpLib.Should Contain Binding ${resp} 10 10.10.10.0/24 + SxpLib.Should Contain Binding ${resp} 10 10.10.0.0/16 + SxpLib.Should Contain Binding ${resp} 10 10.0.0.0/8 + SxpLib.Should Contain Binding ${resp} 30 10.10.10.30/32 + SxpLib.Should Contain Binding ${resp} 30 10.10.30.0/24 + SxpLib.Should Contain Binding ${resp} 30 10.30.0.0/16 + SxpLib.Should Contain Binding ${resp} 30 30.0.0.0/8 : FOR ${node} IN RANGE 4 6 \ SxpLib.Should Not Contain Binding ${resp} ${node}0 10.10.10.${node}0/32 \ SxpLib.Should Not Contain Binding ${resp} ${node}0 10.10.${node}0.0/24 @@ -223,18 +223,18 @@ Check PeerSequence Two Check PeerSequence Three [Documentation] Node 127.0.0.2 should contain only bindings with peer sequence lower or equals 3 ${resp} SxpLib.Get Bindings 127.0.0.2 - SxpLib.Should Contain Binding ${resp} 10 10.10.10.10/32 sxp - SxpLib.Should Contain Binding ${resp} 10 10.10.10.0/24 sxp - SxpLib.Should Contain Binding ${resp} 10 10.10.0.0/16 sxp - SxpLib.Should Contain Binding ${resp} 10 10.0.0.0/8 sxp - SxpLib.Should Contain Binding ${resp} 30 10.10.10.30/32 sxp - SxpLib.Should Contain Binding ${resp} 30 10.10.30.0/24 sxp - SxpLib.Should Contain Binding ${resp} 30 10.30.0.0/16 sxp - SxpLib.Should Contain Binding ${resp} 30 30.0.0.0/8 sxp - SxpLib.Should Contain Binding ${resp} 40 10.10.10.40/32 sxp - SxpLib.Should Contain Binding ${resp} 40 10.10.40.0/24 sxp - SxpLib.Should Contain Binding ${resp} 40 10.40.0.0/16 sxp - SxpLib.Should Contain Binding ${resp} 40 40.0.0.0/8 sxp + SxpLib.Should Contain Binding ${resp} 10 10.10.10.10/32 + SxpLib.Should Contain Binding ${resp} 10 10.10.10.0/24 + SxpLib.Should Contain Binding ${resp} 10 10.10.0.0/16 + SxpLib.Should Contain Binding ${resp} 10 10.0.0.0/8 + SxpLib.Should Contain Binding ${resp} 30 10.10.10.30/32 + SxpLib.Should Contain Binding ${resp} 30 10.10.30.0/24 + SxpLib.Should Contain Binding ${resp} 30 10.30.0.0/16 + SxpLib.Should Contain Binding ${resp} 30 30.0.0.0/8 + SxpLib.Should Contain Binding ${resp} 40 10.10.10.40/32 + SxpLib.Should Contain Binding ${resp} 40 10.10.40.0/24 + SxpLib.Should Contain Binding ${resp} 40 10.40.0.0/16 + SxpLib.Should Contain Binding ${resp} 40 40.0.0.0/8 SxpLib.Should Not Contain Binding ${resp} 50 10.10.10.50/32 SxpLib.Should Not Contain Binding ${resp} 50 10.10.50.0/24 SxpLib.Should Not Contain Binding ${resp} 50 10.50.0.0/16 @@ -243,18 +243,18 @@ Check PeerSequence Three Check PeerSequence Mix [Documentation] Node 127.0.0.2 should not contain bindings with peer sequence 1 ${resp} SxpLib.Get Bindings 127.0.0.2 - SxpLib.Should Contain Binding ${resp} 10 10.10.10.10/32 sxp - SxpLib.Should Contain Binding ${resp} 10 10.10.10.0/24 sxp - SxpLib.Should Contain Binding ${resp} 10 10.10.0.0/16 sxp - SxpLib.Should Contain Binding ${resp} 10 10.0.0.0/8 sxp - SxpLib.Should Not Contain Binding ${resp} 30 10.10.10.30/32 sxp - SxpLib.Should Not Contain Binding ${resp} 30 10.10.30.0/24 sxp - SxpLib.Should Not Contain Binding ${resp} 30 10.30.0.0/16 sxp - SxpLib.Should Not Contain Binding ${resp} 30 30.0.0.0/8 sxp - SxpLib.Should Contain Binding ${resp} 40 10.10.10.40/32 sxp - SxpLib.Should Contain Binding ${resp} 40 10.10.40.0/24 sxp - SxpLib.Should Contain Binding ${resp} 40 10.40.0.0/16 sxp - SxpLib.Should Contain Binding ${resp} 40 40.0.0.0/8 sxp + SxpLib.Should Contain Binding ${resp} 10 10.10.10.10/32 + SxpLib.Should Contain Binding ${resp} 10 10.10.10.0/24 + SxpLib.Should Contain Binding ${resp} 10 10.10.0.0/16 + SxpLib.Should Contain Binding ${resp} 10 10.0.0.0/8 + SxpLib.Should Not Contain Binding ${resp} 30 10.10.10.30/32 + SxpLib.Should Not Contain Binding ${resp} 30 10.10.30.0/24 + SxpLib.Should Not Contain Binding ${resp} 30 10.30.0.0/16 + SxpLib.Should Not Contain Binding ${resp} 30 30.0.0.0/8 + SxpLib.Should Contain Binding ${resp} 40 10.10.10.40/32 + SxpLib.Should Contain Binding ${resp} 40 10.10.40.0/24 + SxpLib.Should Contain Binding ${resp} 40 10.40.0.0/16 + SxpLib.Should Contain Binding ${resp} 40 40.0.0.0/8 SxpLib.Should Contain Binding ${resp} 50 10.10.10.50/32 SxpLib.Should Contain Binding ${resp} 50 10.10.50.0/24 SxpLib.Should Contain Binding ${resp} 50 10.50.0.0/16 @@ -263,82 +263,82 @@ Check PeerSequence Mix Check Inbound PL Combinations Filtering [Documentation] Node 127.0.0.1 should containt bindings with peer sequence lower than 1 and pl 1.1.0.0/16 ${resp} SxpLib.Get Bindings 127.0.0.1 - SxpLib.Should Contain Binding ${resp} 20 1.1.1.2/32 sxp - SxpLib.Should Contain Binding ${resp} 20 1.1.2.0/24 sxp - SxpLib.Should Not Contain Binding ${resp} 20 1.2.0.0/16 sxp - SxpLib.Should Not Contain Binding ${resp} 20 2.0.0.0/8 sxp - SxpLib.Should Not Contain Binding ${resp} 30 1.1.1.3/32 sxp - SxpLib.Should Not Contain Binding ${resp} 30 1.1.3.0/24 sxp - SxpLib.Should Not Contain Binding ${resp} 30 1.3.0.0/16 sxp - SxpLib.Should Not Contain Binding ${resp} 30 3.0.0.0/8 sxp - SxpLib.Should Not Contain Binding ${resp} 40 1.1.1.4/32 sxp - SxpLib.Should Not Contain Binding ${resp} 40 1.1.4.0/24 sxp - SxpLib.Should Not Contain Binding ${resp} 40 1.4.0.0/16 sxp - SxpLib.Should Not Contain Binding ${resp} 40 4.0.0.0/8 sxp - SxpLib.Should Contain Binding ${resp} 50 1.1.1.5/32 sxp - SxpLib.Should Contain Binding ${resp} 50 1.1.5.0/24 sxp - SxpLib.Should Contain Binding ${resp} 50 1.5.0.0/16 sxp - SxpLib.Should Contain Binding ${resp} 50 5.0.0.0/8 sxp + SxpLib.Should Contain Binding ${resp} 20 1.1.1.2/32 + SxpLib.Should Contain Binding ${resp} 20 1.1.2.0/24 + SxpLib.Should Not Contain Binding ${resp} 20 1.2.0.0/16 + SxpLib.Should Not Contain Binding ${resp} 20 2.0.0.0/8 + SxpLib.Should Not Contain Binding ${resp} 30 1.1.1.3/32 + SxpLib.Should Not Contain Binding ${resp} 30 1.1.3.0/24 + SxpLib.Should Not Contain Binding ${resp} 30 1.3.0.0/16 + SxpLib.Should Not Contain Binding ${resp} 30 3.0.0.0/8 + SxpLib.Should Not Contain Binding ${resp} 40 1.1.1.4/32 + SxpLib.Should Not Contain Binding ${resp} 40 1.1.4.0/24 + SxpLib.Should Not Contain Binding ${resp} 40 1.4.0.0/16 + SxpLib.Should Not Contain Binding ${resp} 40 4.0.0.0/8 + SxpLib.Should Contain Binding ${resp} 50 1.1.1.5/32 + SxpLib.Should Contain Binding ${resp} 50 1.1.5.0/24 + SxpLib.Should Contain Binding ${resp} 50 1.5.0.0/16 + SxpLib.Should Contain Binding ${resp} 50 5.0.0.0/8 Check Inbound ACL Combinations Filtering [Documentation] Node 127.0.0.1 should containt bindings with peer sequence lower than 2 and acl 1.1.1.0 0.0.0.255 ${resp} SxpLib.Get Bindings 127.0.0.1 - SxpLib.Should Contain Binding ${resp} 20 1.1.1.2/32 sxp - SxpLib.Should Not Contain Binding ${resp} 20 1.1.2.0/24 sxp - SxpLib.Should Not Contain Binding ${resp} 20 1.2.0.0/16 sxp - SxpLib.Should Not Contain Binding ${resp} 20 2.0.0.0/8 sxp - SxpLib.Should Contain Binding ${resp} 30 1.1.1.3/32 sxp - SxpLib.Should Not Contain Binding ${resp} 30 1.1.3.0/24 sxp - SxpLib.Should Not Contain Binding ${resp} 30 1.3.0.0/16 sxp - SxpLib.Should Not Contain Binding ${resp} 30 3.0.0.0/8 sxp - SxpLib.Should Contain Binding ${resp} 40 1.1.1.4/32 sxp - SxpLib.Should Contain Binding ${resp} 40 1.1.4.0/24 sxp - SxpLib.Should Contain Binding ${resp} 40 1.4.0.0/16 sxp - SxpLib.Should Contain Binding ${resp} 40 4.0.0.0/8 sxp - SxpLib.Should Not Contain Binding ${resp} 50 1.1.1.5/32 sxp - SxpLib.Should Not Contain Binding ${resp} 50 1.1.5.0/24 sxp - SxpLib.Should Not Contain Binding ${resp} 50 1.5.0.0/16 sxp - SxpLib.Should Not Contain Binding ${resp} 50 5.0.0.0/8 sxp + SxpLib.Should Contain Binding ${resp} 20 1.1.1.2/32 + SxpLib.Should Not Contain Binding ${resp} 20 1.1.2.0/24 + SxpLib.Should Not Contain Binding ${resp} 20 1.2.0.0/16 + SxpLib.Should Not Contain Binding ${resp} 20 2.0.0.0/8 + SxpLib.Should Contain Binding ${resp} 30 1.1.1.3/32 + SxpLib.Should Not Contain Binding ${resp} 30 1.1.3.0/24 + SxpLib.Should Not Contain Binding ${resp} 30 1.3.0.0/16 + SxpLib.Should Not Contain Binding ${resp} 30 3.0.0.0/8 + SxpLib.Should Contain Binding ${resp} 40 1.1.1.4/32 + SxpLib.Should Contain Binding ${resp} 40 1.1.4.0/24 + SxpLib.Should Contain Binding ${resp} 40 1.4.0.0/16 + SxpLib.Should Contain Binding ${resp} 40 4.0.0.0/8 + SxpLib.Should Not Contain Binding ${resp} 50 1.1.1.5/32 + SxpLib.Should Not Contain Binding ${resp} 50 1.1.5.0/24 + SxpLib.Should Not Contain Binding ${resp} 50 1.5.0.0/16 + SxpLib.Should Not Contain Binding ${resp} 50 5.0.0.0/8 Check Outbound PL Combinations Filtering [Documentation] Node 127.0.0.2 should containt bindings with peer sequence lower than 1 and pl 1.1.1.0/24 ${resp} SxpLib.Get Bindings 127.0.0.2 - SxpLib.Should Contain Binding ${resp} 10 1.1.1.1/32 sxp - SxpLib.Should Contain Binding ${resp} 10 1.1.1.0/24 sxp - SxpLib.Should Not Contain Binding ${resp} 10 1.1.0.0/16 sxp - SxpLib.Should Not Contain Binding ${resp} 10 1.0.0.0/8 sxp - SxpLib.Should Contain Binding ${resp} 30 1.1.1.3/32 sxp - SxpLib.Should Not Contain Binding ${resp} 30 1.1.3.0/24 sxp - SxpLib.Should Not Contain Binding ${resp} 30 1.3.0.0/16 sxp - SxpLib.Should Not Contain Binding ${resp} 30 3.0.0.0/8 sxp - SxpLib.Should Contain Binding ${resp} 40 1.1.1.4/32 sxp - SxpLib.Should Not Contain Binding ${resp} 40 1.1.4.0/24 sxp - SxpLib.Should Not Contain Binding ${resp} 40 1.4.0.0/16 sxp - SxpLib.Should Not Contain Binding ${resp} 40 4.0.0.0/8 sxp - SxpLib.Should Not Contain Binding ${resp} 50 1.1.1.5/32 sxp - SxpLib.Should Not Contain Binding ${resp} 50 1.1.5.0/24 sxp - SxpLib.Should Not Contain Binding ${resp} 50 1.5.0.0/16 sxp - SxpLib.Should Not Contain Binding ${resp} 50 5.0.0.0/8 sxp + SxpLib.Should Contain Binding ${resp} 10 1.1.1.1/32 + SxpLib.Should Contain Binding ${resp} 10 1.1.1.0/24 + SxpLib.Should Not Contain Binding ${resp} 10 1.1.0.0/16 + SxpLib.Should Not Contain Binding ${resp} 10 1.0.0.0/8 + SxpLib.Should Contain Binding ${resp} 30 1.1.1.3/32 + SxpLib.Should Not Contain Binding ${resp} 30 1.1.3.0/24 + SxpLib.Should Not Contain Binding ${resp} 30 1.3.0.0/16 + SxpLib.Should Not Contain Binding ${resp} 30 3.0.0.0/8 + SxpLib.Should Contain Binding ${resp} 40 1.1.1.4/32 + SxpLib.Should Not Contain Binding ${resp} 40 1.1.4.0/24 + SxpLib.Should Not Contain Binding ${resp} 40 1.4.0.0/16 + SxpLib.Should Not Contain Binding ${resp} 40 4.0.0.0/8 + SxpLib.Should Not Contain Binding ${resp} 50 1.1.1.5/32 + SxpLib.Should Not Contain Binding ${resp} 50 1.1.5.0/24 + SxpLib.Should Not Contain Binding ${resp} 50 1.5.0.0/16 + SxpLib.Should Not Contain Binding ${resp} 50 5.0.0.0/8 Check Outbound ACL Combinations Filtering [Documentation] Node 127.0.0.2 should containt bindings with peer sequence equals to 0 or greter than 2 and acl 1.1.0.0 0.0.255.255 ${resp} SxpLib.Get Bindings 127.0.0.2 - SxpLib.Should Contain Binding ${resp} 10 1.1.1.1/32 sxp - SxpLib.Should Contain Binding ${resp} 10 1.1.1.0/24 sxp - SxpLib.Should Contain Binding ${resp} 10 1.1.0.0/16 sxp - SxpLib.Should Not Contain Binding ${resp} 10 1.0.0.0/8 sxp - SxpLib.Should Not Contain Binding ${resp} 30 1.1.1.3/32 sxp - SxpLib.Should Not Contain Binding ${resp} 30 1.1.3.0/24 sxp - SxpLib.Should Not Contain Binding ${resp} 30 1.3.0.0/16 sxp - SxpLib.Should Not Contain Binding ${resp} 30 3.0.0.0/8 sxp - SxpLib.Should Not Contain Binding ${resp} 40 1.1.1.4/32 sxp - SxpLib.Should Not Contain Binding ${resp} 40 1.1.4.0/24 sxp - SxpLib.Should Not Contain Binding ${resp} 40 1.4.0.0/16 sxp - SxpLib.Should Not Contain Binding ${resp} 40 4.0.0.0/8 sxp - SxpLib.Should Contain Binding ${resp} 50 1.1.1.5/32 sxp - SxpLib.Should Contain Binding ${resp} 50 1.1.5.0/24 sxp - SxpLib.Should Not Contain Binding ${resp} 50 1.5.0.0/16 sxp - SxpLib.Should Not Contain Binding ${resp} 50 5.0.0.0/8 sxp + SxpLib.Should Contain Binding ${resp} 10 1.1.1.1/32 + SxpLib.Should Contain Binding ${resp} 10 1.1.1.0/24 + SxpLib.Should Contain Binding ${resp} 10 1.1.0.0/16 + SxpLib.Should Not Contain Binding ${resp} 10 1.0.0.0/8 + SxpLib.Should Not Contain Binding ${resp} 30 1.1.1.3/32 + SxpLib.Should Not Contain Binding ${resp} 30 1.1.3.0/24 + SxpLib.Should Not Contain Binding ${resp} 30 1.3.0.0/16 + SxpLib.Should Not Contain Binding ${resp} 30 3.0.0.0/8 + SxpLib.Should Not Contain Binding ${resp} 40 1.1.1.4/32 + SxpLib.Should Not Contain Binding ${resp} 40 1.1.4.0/24 + SxpLib.Should Not Contain Binding ${resp} 40 1.4.0.0/16 + SxpLib.Should Not Contain Binding ${resp} 40 4.0.0.0/8 + SxpLib.Should Contain Binding ${resp} 50 1.1.1.5/32 + SxpLib.Should Contain Binding ${resp} 50 1.1.5.0/24 + SxpLib.Should Not Contain Binding ${resp} 50 1.5.0.0/16 + SxpLib.Should Not Contain Binding ${resp} 50 5.0.0.0/8 Clean Nodes SxpLib.Clean Bindings 127.0.0.1 diff --git a/csit/suites/sxp/topology/010_Topology_Features.robot b/csit/suites/sxp/topology/010_Topology_Features.robot index 3704cd4a5e..7ad09adcae 100644 --- a/csit/suites/sxp/topology/010_Topology_Features.robot +++ b/csit/suites/sxp/topology/010_Topology_Features.robot @@ -155,31 +155,31 @@ Check Export Part Three Check Forwarding V2=>V1 [Documentation] Check if appropriate bindings are exported per version ${resp} Get Bindings - Should Not Contain Binding ${resp} 6 56.56.56.0/24 sxp - Should Contain Binding ${resp} 66 9.9.9.9/32 sxp - Should Contain Binding ${resp} 666 2001:db8:0:0:0:0:1428:57ab/128 sxp - Should Not Contain Binding ${resp} 555 2001:db8:85a3:8d3:0:0:0:0/64 sxp + Should Not Contain Binding ${resp} 6 56.56.56.0/24 + Should Contain Binding ${resp} 66 9.9.9.9/32 + Should Contain Binding ${resp} 666 2001:db8:0:0:0:0:1428:57ab/128 + Should Not Contain Binding ${resp} 555 2001:db8:85a3:8d3:0:0:0:0/64 Log Init OK ${resp} Get Bindings 127.0.0.3 - Should Not Contain Binding ${resp} 6 56.56.56.0/24 sxp - Should Contain Binding ${resp} 66 9.9.9.9/32 sxp - Should Not Contain Binding ${resp} 666 2001:db8:0:0:0:0:1428:57ab/128 sxp - Should Not Contain Binding ${resp} 555 2001:db8:85a3:8d3:0:0:0:0/64 sxp + Should Not Contain Binding ${resp} 6 56.56.56.0/24 + Should Contain Binding ${resp} 66 9.9.9.9/32 + Should Not Contain Binding ${resp} 666 2001:db8:0:0:0:0:1428:57ab/128 + Should Not Contain Binding ${resp} 555 2001:db8:85a3:8d3:0:0:0:0/64 Log Forward OK Check Forwarding V3=>V2 [Documentation] Check if appropriate bindings are exported per version ${resp} Get Bindings - Should Contain Binding ${resp} 6 56.56.56.0/24 sxp - Should Contain Binding ${resp} 66 9.9.9.9/32 sxp - Should Contain Binding ${resp} 666 2001:db8:0:0:0:0:1428:57ab/128 sxp - Should Contain Binding ${resp} 555 2001:db8:85a3:8d3:0:0:0:0/64 sxp + Should Contain Binding ${resp} 6 56.56.56.0/24 + Should Contain Binding ${resp} 66 9.9.9.9/32 + Should Contain Binding ${resp} 666 2001:db8:0:0:0:0:1428:57ab/128 + Should Contain Binding ${resp} 555 2001:db8:85a3:8d3:0:0:0:0/64 Log Init OK ${resp} Get Bindings 127.0.0.3 - Should Not Contain Binding ${resp} 6 56.56.56.0/24 sxp - Should Contain Binding ${resp} 66 9.9.9.9/32 sxp - Should Contain Binding ${resp} 666 2001:db8:0:0:0:0:1428:57ab/128 sxp - Should Not Contain Binding ${resp} 555 2001:db8:85a3:8d3:0:0:0:0/64 sxp + Should Not Contain Binding ${resp} 6 56.56.56.0/24 + Should Contain Binding ${resp} 66 9.9.9.9/32 + Should Contain Binding ${resp} 666 2001:db8:0:0:0:0:1428:57ab/128 + Should Not Contain Binding ${resp} 555 2001:db8:85a3:8d3:0:0:0:0/64 Log Forward OK Check Forwarding V4=>V3 @@ -191,10 +191,10 @@ Check Forwarding V4=>V3 Should Contain Binding ${resp} 555 2001:db8:85a3:8d3:0:0:0:0/64 Log Init OK ${resp} Get Bindings 127.0.0.3 - Should Contain Binding ${resp} 6 56.56.56.0/24 sxp - Should Contain Binding ${resp} 66 9.9.9.9/32 sxp - Should Contain Binding ${resp} 666 2001:db8:0:0:0:0:1428:57ab/128 sxp - Should Contain Binding ${resp} 555 2001:db8:85a3:8d3:0:0:0:0/64 sxp + Should Contain Binding ${resp} 6 56.56.56.0/24 + Should Contain Binding ${resp} 66 9.9.9.9/32 + Should Contain Binding ${resp} 666 2001:db8:0:0:0:0:1428:57ab/128 + Should Contain Binding ${resp} 555 2001:db8:85a3:8d3:0:0:0:0/64 Log Forward OK Check Shorthest Path diff --git a/csit/suites/sxp/topology/020_Scalability.robot b/csit/suites/sxp/topology/020_Scalability.robot index 52a7f0fca5..e327225b34 100644 --- a/csit/suites/sxp/topology/020_Scalability.robot +++ b/csit/suites/sxp/topology/020_Scalability.robot @@ -70,7 +70,7 @@ Check Binding Range ${resp} Get Bindings ${node} : FOR ${num} IN RANGE ${start} ${end} \ ${ip} Get Ip From Number ${num} - \ Should Contain Binding ${resp} ${num} ${ip}/32 sxp + \ Should Contain Binding ${resp} ${num} ${ip}/32 Clean Nodes : FOR ${num} IN RANGE 1 32 -- 2.36.6