Remove usage of removed RPC add-entry

- add-entry RPC was deprecated since Boron
and removed for Fluorine release
- add-bindings RPC is a replacement

Change-Id: I6b4882d8dde5cfe6ff7964c43319d201c83e75dc
Signed-off-by: Ivan Hrasko <ihrasko@cisco.com>

diff --git a/csit/libraries/SXP/FilteringResources.robot b/csit/libraries/SXP/FilteringResources.robot
index a66cceaa0fcab2b0d30186bc0c863ba5c2fe6d62..bbd38e79810d8171bcabc00715e7e652a7674a19 100644 (file)
--- a/csit/libraries/SXP/FilteringResources.robot
+++ b/csit/libraries/SXP/FilteringResources.robot
@@ -6,10 +6,10 @@ Resource          ../SxpLib.robot
 Setup Nodes
     [Arguments]    ${version}=version4    ${password}=none
     : FOR    ${node}    IN RANGE    1    5
-    \    Add Binding    ${node}0    10.10.10.${node}0/32    127.0.0.${node}
-    \    Add Binding    ${node}0    10.10.${node}0.0/24    127.0.0.${node}
-    \    Add Binding    ${node}0    10.${node}0.0.0/16    127.0.0.${node}
-    \    Add Binding    ${node}0    ${node}0.0.0.0/8    127.0.0.${node}
+    \    Add Bindings    ${node}0    10.10.10.${node}0/32    127.0.0.${node}
+    \    Add Bindings    ${node}0    10.10.${node}0.0/24    127.0.0.${node}
+    \    Add Bindings    ${node}0    10.${node}0.0.0/16    127.0.0.${node}
+    \    Add Bindings    ${node}0    ${node}0.0.0.0/8    127.0.0.${node}
     Add Connection    ${version}    both    127.0.0.1    64999    127.0.0.2    ${password}
     Add Connection    ${version}    both    127.0.0.2    64999    127.0.0.1    ${password}
     Wait Until Keyword Succeeds    15    1    Verify Connection    ${version}    both    127.0.0.2

diff --git a/csit/libraries/Sxp.py b/csit/libraries/Sxp.py
index 36f30463c1e0b9ad89a3d917231a16947f40363b..1df82e816b87a85da9d6fd65bca3caf5b6f689fa 100644 (file)
--- a/csit/libraries/Sxp.py
+++ b/csit/libraries/Sxp.py
@@ -531,30 +531,6 @@ def find_binding_legacy(prefix_groups_json, sgt, prefix, source_, action):
     return found
 
 
-def add_entry_xml(sgt, prefix, ip, domain_name):
-    """Generate xml for Add Bindings request
-
-    :param sgt: Source Group Tag
-    :type sgt: str
-    :param prefix: Ipv4/6 prefix
-    :type prefix: str
-    :param ip: Ipv4 address of node
-    :type ip: str
-    :param domain_name: Name of Domain
-    :type domain_name: str
-    :returns: String containing xml data for request
-
-    """
-    templ = Template('''<input>
-  <requested-node xmlns="urn:opendaylight:sxp:controller">$ip</requested-node>
-  $domain
-  <sgt xmlns="urn:opendaylight:sxp:controller">$sgt</sgt>
-  <ip-prefix xmlns="urn:opendaylight:sxp:controller">$prefix</ip-prefix>
-</input>''')
-    data = templ.substitute({'sgt': sgt, 'prefix': prefix, 'ip': ip, 'domain': get_domain_name(domain_name)})
-    return data
-
-
 def add_connection_xml(version, mode, ip, port, node, password_, domain_name, bindings_timeout=0, security_mode=''):
     """Generate xml for Add Connection request
 

diff --git a/csit/libraries/SxpLib.robot b/csit/libraries/SxpLib.robot
index f80d370e36e41d62e639aa327e8dff5056cc6e44..24be60cee07217e6bac671ada4dd11c316ea4f5f 100644 (file)
--- a/csit/libraries/SxpLib.robot
+++ b/csit/libraries/SxpLib.robot
@@ -80,11 +80,11 @@ Verify Connection
     ${resp}    Get Connections    ${node}    ${session}    ${domain}
     Should Contain Connection    ${resp}    ${ip}    ${port}    ${mode}    ${version}    ${state}
 
-Add Binding
-    [Arguments]    ${sgt}    ${prefix}    ${node}=127.0.0.1    ${domain}=global    ${session}=session
-    [Documentation]    Add binding via RPC to Master DB of node
-    ${DATA}    Add Entry Xml    ${sgt}    ${prefix}    ${node}    ${domain}
-    Post To Controller    ${session}    add-entry    ${DATA}
+Add Bindings
+    [Arguments]    ${sgt}    ${prefixes}    ${node}=127.0.0.1    ${session}=session    ${domain}=global
+    [Documentation]    Add one or more bindings via RPC to Master DB of the node
+    ${DATA}    Add Bindings Xml    ${node}    ${domain}    ${sgt}    ${prefixes}
+    Post To Controller    ${session}    add-bindings    ${DATA}
 
 Get Bindings
     [Arguments]    ${node}=127.0.0.1    ${session}=session    ${domain}=global    ${scope}=all
@@ -254,14 +254,14 @@ Setup Topology Complex
     \    ...    ${PASSWORD}
     \    Wait Until Keyword Succeeds    15    1    Verify Connection    ${version}    both
     \    ...    127.0.0.${node}
-    \    Add Binding    ${node}0    10.10.10.${node}0/32    127.0.0.${node}
-    \    Add Binding    ${node}0    10.10.${node}0.0/24    127.0.0.${node}
-    \    Add Binding    ${node}0    10.${node}0.0.0/16    127.0.0.${node}
-    \    Add Binding    ${node}0    ${node}0.0.0.0/8    127.0.0.${node}
-    Add Binding    10    10.10.10.10/32    127.0.0.1
-    Add Binding    10    10.10.10.0/24    127.0.0.1
-    Add Binding    10    10.10.0.0/16    127.0.0.1
-    Add Binding    10    10.0.0.0/8    127.0.0.1
+    \    Add Bindings    ${node}0    10.10.10.${node}0/32    127.0.0.${node}
+    \    Add Bindings    ${node}0    10.10.${node}0.0/24    127.0.0.${node}
+    \    Add Bindings    ${node}0    10.${node}0.0.0/16    127.0.0.${node}
+    \    Add Bindings    ${node}0    ${node}0.0.0.0/8    127.0.0.${node}
+    Add Bindings    10    10.10.10.10/32    127.0.0.1
+    Add Bindings    10    10.10.10.0/24    127.0.0.1
+    Add Bindings    10    10.10.0.0/16    127.0.0.1
+    Add Bindings    10    10.0.0.0/8    127.0.0.1
 
 Verify Snapshot Was Pushed
     [Arguments]    ${snapshot_string}=22-sxp-controller-one-node.xml
@@ -301,12 +301,6 @@ Delete Domain
     ${DATA}    Delete Domain Xml    ${node}    ${domain_name}
     Post To Controller    ${session}    delete-domain    ${DATA}
 
-Add Bindings
-    [Arguments]    ${sgt}    ${prefixes}    ${node}=127.0.0.1    ${session}=session    ${domain}=global
-    [Documentation]    Add bindings via RPC to Master DB of node
-    ${DATA}    Add Bindings Xml    ${node}    ${domain}    ${sgt}    ${prefixes}
-    Post To Controller    ${session}    add-bindings    ${DATA}
-
 Delete Bindings
     [Arguments]    ${sgt}    ${prefixes}    ${node}=127.0.0.1    ${session}=session    ${domain}=global
     [Documentation]    Delete bindings via RPC from Master DB of node

diff --git a/csit/suites/sxp/basic/020_Restconf_CRUD.robot b/csit/suites/sxp/basic/020_Restconf_CRUD.robot
index 310d945de5926245052a7988dec28241cb8de5f7..af518e67b2ea52cb2cc13fd030bd39ba75a9b296 100644 (file)
--- a/csit/suites/sxp/basic/020_Restconf_CRUD.robot
+++ b/csit/suites/sxp/basic/020_Restconf_CRUD.robot
@@ -10,13 +10,13 @@ Resource          ../../../libraries/SxpLib.robot
 *** Variables ***
 
 *** Test Cases ***
-Test Add Binding
+Test Add Bindings
     [Documentation]    Test if bindings are added to Master DB
     [Tags]    Restconf CRUD    SXP
     ${resp}    Get Bindings
-    Add Binding    5230    1.1.1.1/32
+    Add Bindings    5230    1.1.1.1/32
     Wait Until Keyword Succeeds    3x    250ms    Bindings Should Contain    5230    1.1.1.1/32
-    Add Binding    30    2001:0:0:0:0:0:0:0/128
+    Add Bindings    30    2001:0:0:0:0:0:0:0/128
     Wait Until Keyword Succeeds    3x    250ms    Bindings Should Contain    30    2001:0:0:0:0:0:0:0/128
 
 Test Add Connection
@@ -32,7 +32,7 @@ Test Add Connection
 Test Delete Binding
     [Documentation]    Test if bindings are deleted from Master DB
     [Tags]    Restconf CRUD    SXP
-    Add Binding    52301    12.1.1.1/32
+    Add Bindings    52301    12.1.1.1/32
     Wait Until Keyword Succeeds    3x    250ms    Bindings Should Contain    52301    12.1.1.1/32
     Run Keyword And Expect Error    *    Delete Binding    2631    12.1.1.1/32
     Wait Until Keyword Succeeds    3x    250ms    Bindings Should Contain    52301    12.1.1.1/32
@@ -55,7 +55,7 @@ Test Delete Connection
 Test Update Binding
     [Documentation]    Test if bindings can be updated to different values
     [Tags]    Restconf CRUD    SXP
-    Add Binding    3230    1.1.1.10/32
+    Add Bindings    3230    1.1.1.10/32
     Wait Until Keyword Succeeds    3x    250ms    Bindings Should Contain    3230    1.1.1.10/32
     Update Binding    3230    1.1.1.10/32    623    10.10.10.10/32
     Wait Until Keyword Succeeds    3x    250ms    Bindings Should Not Contain    3230    1.1.1.10/32

diff --git a/csit/suites/sxp/basic/040_SSL_Passwords.robot b/csit/suites/sxp/basic/040_SSL_Passwords.robot
index 452b0f06e6e589b4642dcafbbd091883b72b4899..bde87b2948187d563bd5eb5f0f1f80894253e9b9 100644 (file)
--- a/csit/suites/sxp/basic/040_SSL_Passwords.robot
+++ b/csit/suites/sxp/basic/040_SSL_Passwords.robot
@@ -153,8 +153,8 @@ Setup SXP Environment Local
     \    ${SSL}    BuiltIn.Create Dictionary    truststore=${ssl_stores}/csit-truststore-${node}    keystore=${ssl_stores}/csit-keystore-${node}    password=${password}
     \    ${rnd_retry_time} =    BuiltIn.Evaluate    random.randint(1, 5)    modules=random
     \    SxpLib.Add Node    127.0.0.${node}    ${EMPTY}    ssl_stores=${SSL}    retry_open_timer=${rnd_retry_time}
-    \    SxpLib.Add Binding    ${node}00    1.1.1.${node}/32    127.0.0.${node}
-    \    SxpLib.Add Binding    ${node}00    2.2.2.${node}/32    127.0.0.${node}
+    \    SxpLib.Add Bindings    ${node}00    1.1.1.${node}/32    127.0.0.${node}
+    \    SxpLib.Add Bindings    ${node}00    2.2.2.${node}/32    127.0.0.${node}
 
 Verify Topology Bindings
     [Arguments]    ${node_range}

diff --git a/csit/suites/sxp/cluster-routing/020_Sxp_Node_Switching.robot b/csit/suites/sxp/cluster-routing/020_Sxp_Node_Switching.robot
index 04347aa9fab371d9975355d3394fc27e13cdedc2..def466624bbb4b4394d2c2f118c3c8a70677d642 100644 (file)
--- a/csit/suites/sxp/cluster-routing/020_Sxp_Node_Switching.robot
+++ b/csit/suites/sxp/cluster-routing/020_Sxp_Node_Switching.robot
@@ -82,7 +82,7 @@ Setup SXP Cluster Bindings
     [Arguments]    ${node}    ${session}
     [Documentation]    Setup initial bindings to SXP device
     : FOR    ${i}    IN RANGE    1    ${BINDINGS}
-    \    Add Binding    ${i}0    ${i}.${i}.${i}.${i}/32    node=${node}    session=${session}
+    \    Add Bindings    ${i}0    ${i}.${i}.${i}.${i}/32    node=${node}    session=${session}
 
 Isolate SXP Controller
     [Arguments]    ${controller_index}    ${peer_mode}

diff --git a/csit/suites/sxp/clustering/020_Bindings_consistency.robot b/csit/suites/sxp/clustering/020_Bindings_consistency.robot
index 8ca4c872ff313efa9912dc6b9eb05979e4c7652b..6c63854bb26f099f6f7bb8b28d647f12e18781a8 100644 (file)
--- a/csit/suites/sxp/clustering/020_Bindings_consistency.robot
+++ b/csit/suites/sxp/clustering/020_Bindings_consistency.robot
@@ -50,7 +50,7 @@ Setup Custom SXP Cluster
     [Documentation]    Setup custom SXP cluster topology
     Setup SXP Cluster    ${mode}
     : FOR    ${i}    IN RANGE    1    25
-    \    Add Binding    ${i}0    ${i}.${i}.${i}.${i}/32    node=${node}    session=${session}
+    \    Add Bindings    ${i}0    ${i}.${i}.${i}.${i}/32    node=${node}    session=${session}
 
 Check Bindings
     [Arguments]    ${node}    ${session}

diff --git a/csit/suites/sxp/clustering/030_RPC_functionality.robot b/csit/suites/sxp/clustering/030_RPC_functionality.robot
index 7b01841ac4d0d6fa65554e9e33d0e6862531d755..0060946802c48074137e1abe6513c90bb0835713 100644 (file)
--- a/csit/suites/sxp/clustering/030_RPC_functionality.robot
+++ b/csit/suites/sxp/clustering/030_RPC_functionality.robot
@@ -33,7 +33,7 @@ Isolate SXP Controller
     [Documentation]    Isolate one of cluster nodes and perform check that RPC changes were performed afterwards reverts isolation
     ${active_controller}    Get Active Controller
     : FOR    ${i}    IN RANGE    ${NUM_ODL_SYSTEM}
-    \    Add Binding    ${i+1}0    ${i+1}0.${i+1}0.${i+1}0.${i+1}0/32    node=${CLUSTER_NODE_ID}    session=controller${active_controller}
+    \    Add Bindings    ${i+1}0    ${i+1}0.${i+1}0.${i+1}0.${i+1}0/32    node=${CLUSTER_NODE_ID}    session=controller${active_controller}
     Isolate_Member_From_List_Or_All    ${controller_index}
     Wait Until Keyword Succeeds    240    1    Sync_Status_Should_Be_False    ${controller_index}
     Wait Until Keyword Succeeds    30    1    Check Bindings Exist

diff --git a/csit/suites/sxp/filtering/030_Inbound_Filtering_Discarding.robot b/csit/suites/sxp/filtering/030_Inbound_Filtering_Discarding.robot
index f353ee2284ea496dcba9b07eed5b071ec9a0f2f7..8955c34a7e04c650735a877327a27c5f530c6238 100644 (file)
--- a/csit/suites/sxp/filtering/030_Inbound_Filtering_Discarding.robot
+++ b/csit/suites/sxp/filtering/030_Inbound_Filtering_Discarding.robot
@@ -134,30 +134,30 @@ Setup Nodes
     \    ...    ${password}
     \    Wait Until Keyword Succeeds    15    1    Verify Connection    ${version}    both
     \    ...    127.0.0.${node}
-    \    Add Binding    ${node}0    10.10.10.${node}0/32    127.0.0.${node}
-    \    Add Binding    ${node}0    10.10.${node}0.0/24    127.0.0.${node}
-    \    Add Binding    ${node}0    10.${node}0.0.0/16    127.0.0.${node}
-    \    Add Binding    ${node}0    ${node}0.0.0.0/8    127.0.0.${node}
+    \    Add Bindings    ${node}0    10.10.10.${node}0/32    127.0.0.${node}
+    \    Add Bindings    ${node}0    10.10.${node}0.0/24    127.0.0.${node}
+    \    Add Bindings    ${node}0    10.${node}0.0.0/16    127.0.0.${node}
+    \    Add Bindings    ${node}0    ${node}0.0.0.0/8    127.0.0.${node}
     Add Connection    ${version}    both    127.0.0.5    64999    127.0.0.3    ${password}
     Add Connection    ${version}    both    127.0.0.3    64999    127.0.0.5    ${password}
     Wait Until Keyword Succeeds    15    1    Verify Connection    ${version}    both    127.0.0.5
     ...    64999    127.0.0.3
-    Add Binding    50    10.10.10.50/32    127.0.0.5
-    Add Binding    50    10.10.50.0/24    127.0.0.5
-    Add Binding    50    10.50.0.0/16    127.0.0.5
-    Add Binding    50    50.0.0.0/8    127.0.0.5
-    Add Binding    10    10.10.10.10/32    127.0.0.1
-    Add Binding    10    10.10.10.0/24    127.0.0.1
-    Add Binding    10    10.10.0.0/16    127.0.0.1
-    Add Binding    10    10.0.0.0/8    127.0.0.1
+    Add Bindings    50    10.10.10.50/32    127.0.0.5
+    Add Bindings    50    10.10.50.0/24    127.0.0.5
+    Add Bindings    50    10.50.0.0/16    127.0.0.5
+    Add Bindings    50    50.0.0.0/8    127.0.0.5
+    Add Bindings    10    10.10.10.10/32    127.0.0.1
+    Add Bindings    10    10.10.10.0/24    127.0.0.1
+    Add Bindings    10    10.10.0.0/16    127.0.0.1
+    Add Bindings    10    10.0.0.0/8    127.0.0.1
 
 Setup Nodes Legacy Par One
     [Arguments]    ${version}=version3    ${password}=none
     : FOR    ${node}    IN RANGE    1    6
-    \    Add Binding    ${node}0    10.10.10.${node}0/32    127.0.0.${node}
-    \    Add Binding    ${node}0    10.10.${node}0.0/24    127.0.0.${node}
-    \    Add Binding    ${node}0    10.${node}0.0.0/16    127.0.0.${node}
-    \    Add Binding    ${node}0    ${node}0.0.0.0/8    127.0.0.${node}
+    \    Add Bindings    ${node}0    10.10.10.${node}0/32    127.0.0.${node}
+    \    Add Bindings    ${node}0    10.10.${node}0.0/24    127.0.0.${node}
+    \    Add Bindings    ${node}0    10.${node}0.0.0/16    127.0.0.${node}
+    \    Add Bindings    ${node}0    ${node}0.0.0.0/8    127.0.0.${node}
     Add Connection    ${version}    listener    127.0.0.1    64999    127.0.0.2    ${password}
     Add Connection    ${version}    speaker    127.0.0.2    64999    127.0.0.1    ${password}
     Wait Until Keyword Succeeds    15    1    Verify Connection    ${version}    speaker    127.0.0.2
@@ -175,10 +175,10 @@ Setup Nodes Legacy Par One
 Setup Nodes Legacy Par Two
     [Arguments]    ${version}=version3    ${password}=none
     : FOR    ${node}    IN RANGE    1    6
-    \    Add Binding    ${node}0    10.10.10.${node}0/32    127.0.0.${node}
-    \    Add Binding    ${node}0    10.10.${node}0.0/24    127.0.0.${node}
-    \    Add Binding    ${node}0    10.${node}0.0.0/16    127.0.0.${node}
-    \    Add Binding    ${node}0    ${node}0.0.0.0/8    127.0.0.${node}
+    \    Add Bindings    ${node}0    10.10.10.${node}0/32    127.0.0.${node}
+    \    Add Bindings    ${node}0    10.10.${node}0.0/24    127.0.0.${node}
+    \    Add Bindings    ${node}0    10.${node}0.0.0/16    127.0.0.${node}
+    \    Add Bindings    ${node}0    ${node}0.0.0.0/8    127.0.0.${node}
     Add Connection    ${version}    speaker    127.0.0.1    64999    127.0.0.2    ${password}
     Add Connection    ${version}    listener    127.0.0.2    64999    127.0.0.1    ${password}
     Wait Until Keyword Succeeds    15    1    Verify Connection    ${version}    listener    127.0.0.2

diff --git a/csit/suites/sxp/filtering/040_Peer_Sequence_filtering.robot b/csit/suites/sxp/filtering/040_Peer_Sequence_filtering.robot
index 454e5c7b0f60ba585d8938fb2b4f87c9fe5dbb0e..8ba154cd8fd5e2e671ca6add5de4d6b4d6bec9ce 100644 (file)
--- a/csit/suites/sxp/filtering/040_Peer_Sequence_filtering.robot
+++ b/csit/suites/sxp/filtering/040_Peer_Sequence_filtering.robot
@@ -113,15 +113,15 @@ Outbound ACL Combinations Filtering
 Setup Nodes
     [Arguments]    ${version}=version4    ${password}=none
     [Documentation]    Setup Topology for PeerSequence tests
-    SxpLib.Add Binding    10    10.10.10.10/32    127.0.0.1
-    SxpLib.Add Binding    10    10.10.10.0/24    127.0.0.1
-    SxpLib.Add Binding    10    10.10.0.0/16    127.0.0.1
-    SxpLib.Add Binding    10    10.0.0.0/8    127.0.0.1
+    SxpLib.Add Bindings    10    10.10.10.10/32    127.0.0.1
+    SxpLib.Add Bindings    10    10.10.10.0/24    127.0.0.1
+    SxpLib.Add Bindings    10    10.10.0.0/16    127.0.0.1
+    SxpLib.Add Bindings    10    10.0.0.0/8    127.0.0.1
     : FOR    ${node}    IN RANGE    2    6
-    \    SxpLib.Add Binding    ${node}0    10.10.10.${node}0/32    127.0.0.${node}
-    \    SxpLib.Add Binding    ${node}0    10.10.${node}0.0/24    127.0.0.${node}
-    \    SxpLib.Add Binding    ${node}0    10.${node}0.0.0/16    127.0.0.${node}
-    \    SxpLib.Add Binding    ${node}0    ${node}0.0.0.0/8    127.0.0.${node}
+    \    SxpLib.Add Bindings    ${node}0    10.10.10.${node}0/32    127.0.0.${node}
+    \    SxpLib.Add Bindings    ${node}0    10.10.${node}0.0/24    127.0.0.${node}
+    \    SxpLib.Add Bindings    ${node}0    10.${node}0.0.0/16    127.0.0.${node}
+    \    SxpLib.Add Bindings    ${node}0    ${node}0.0.0.0/8    127.0.0.${node}
     SxpLib.Add Connection    ${version}    listener    127.0.0.1    64999    127.0.0.2    ${password}
     SxpLib.Add Connection    ${version}    speaker    127.0.0.2    64999    127.0.0.1    ${password}
     BuiltIn.Wait Until Keyword Succeeds    15    1    SxpLib.Verify Connection    ${version}    speaker    127.0.0.2
@@ -141,10 +141,10 @@ Setup Nodes Inbound Test
     [Arguments]    ${version}=version4    ${password}=none
     [Documentation]    Setup Topology for inbound PeerSequence and other filters tests
     : FOR    ${node}    IN RANGE    2    6
-    \    SxpLib.Add Binding    ${node}0    1.1.1.${node}/32    127.0.0.${node}
-    \    SxpLib.Add Binding    ${node}0    1.1.${node}.0/24    127.0.0.${node}
-    \    SxpLib.Add Binding    ${node}0    1.${node}.0.0/16    127.0.0.${node}
-    \    SxpLib.Add Binding    ${node}0    ${node}.0.0.0/8    127.0.0.${node}
+    \    SxpLib.Add Bindings    ${node}0    1.1.1.${node}/32    127.0.0.${node}
+    \    SxpLib.Add Bindings    ${node}0    1.1.${node}.0/24    127.0.0.${node}
+    \    SxpLib.Add Bindings    ${node}0    1.${node}.0.0/16    127.0.0.${node}
+    \    SxpLib.Add Bindings    ${node}0    ${node}.0.0.0/8    127.0.0.${node}
     SxpLib.Add Connection    ${version}    speaker    127.0.0.1    64999    127.0.0.2    ${password}
     SxpLib.Add Connection    ${version}    listener    127.0.0.2    64999    127.0.0.1    ${password}
     BuiltIn.Wait Until Keyword Succeeds    15    1    SxpLib.Verify Connection    ${version}    listener    127.0.0.2
@@ -167,15 +167,15 @@ Setup Nodes Inbound Test
 Setup Nodes Outbound Test
     [Arguments]    ${version}=version4    ${password}=none
     [Documentation]    Setup Topology for outbound PeerSequence and other filters tests
-    SxpLib.Add Binding    10    1.1.1.1/32    127.0.0.1
-    SxpLib.Add Binding    10    1.1.1.0/24    127.0.0.1
-    SxpLib.Add Binding    10    1.1.0.0/16    127.0.0.1
-    SxpLib.Add Binding    10    1.0.0.0/8    127.0.0.1
+    SxpLib.Add Bindings    10    1.1.1.1/32    127.0.0.1
+    SxpLib.Add Bindings    10    1.1.1.0/24    127.0.0.1
+    SxpLib.Add Bindings    10    1.1.0.0/16    127.0.0.1
+    SxpLib.Add Bindings    10    1.0.0.0/8    127.0.0.1
     : FOR    ${node}    IN RANGE    3    6
-    \    SxpLib.Add Binding    ${node}0    1.1.1.${node}/32    127.0.0.${node}
-    \    SxpLib.Add Binding    ${node}0    1.1.${node}.0/24    127.0.0.${node}
-    \    SxpLib.Add Binding    ${node}0    1.${node}.0.0/16    127.0.0.${node}
-    \    SxpLib.Add Binding    ${node}0    ${node}.0.0.0/8    127.0.0.${node}
+    \    SxpLib.Add Bindings    ${node}0    1.1.1.${node}/32    127.0.0.${node}
+    \    SxpLib.Add Bindings    ${node}0    1.1.${node}.0/24    127.0.0.${node}
+    \    SxpLib.Add Bindings    ${node}0    1.${node}.0.0/16    127.0.0.${node}
+    \    SxpLib.Add Bindings    ${node}0    ${node}.0.0.0/8    127.0.0.${node}
     SxpLib.Add Connection    ${version}    listener    127.0.0.1    64999    127.0.0.2    ${password}
     SxpLib.Add Connection    ${version}    speaker    127.0.0.2    64999    127.0.0.1    ${password}
     BuiltIn.Wait Until Keyword Succeeds    15    1    SxpLib.Verify Connection    ${version}    speaker    127.0.0.2

diff --git a/csit/suites/sxp/filtering/050_Domain_filtering.robot b/csit/suites/sxp/filtering/050_Domain_filtering.robot
index 59598aea965863f0a41b9da404fc8675a8bfa7e0..53423bedba56bff0d28528d199d4192435feba24 100644 (file)
--- a/csit/suites/sxp/filtering/050_Domain_filtering.robot
+++ b/csit/suites/sxp/filtering/050_Domain_filtering.robot
@@ -36,8 +36,8 @@ Update Messages Test
     \    Delete Binding    ${node}0    ${node}0.${node}0.0.0/16    127.0.0.${node}
     Wait Until Keyword Succeeds    15    1    Check Domain Sharing After Update
     : FOR    ${node}    IN RANGE    2    5
-    \    Add Binding    ${node}0    ${node}0.${node}0.${node}0.0/24    127.0.0.${node}
-    \    Add Binding    ${node}0    ${node}0.${node}0.0.0/16    127.0.0.${node}
+    \    Add Bindings    ${node}0    ${node}0.${node}0.${node}0.0/24    127.0.0.${node}
+    \    Add Bindings    ${node}0    ${node}0.${node}0.0.0/16    127.0.0.${node}
     Wait Until Keyword Succeeds    15    1    Check Domain Sharing
 
 Local Binding Non Transitivity Test
@@ -60,9 +60,9 @@ Local Binding Update Test
     Delete Binding    30    30.30.30.5/32    127.0.0.1    ${DOMAIN_2}
     Delete Binding    40    40.40.40.5/32    127.0.0.1    ${DOMAIN_3}
     Wait Until Keyword Succeeds    15    1    Check Domain Sharing After Update Local
-    Add Binding    20    20.20.20.5/32    127.0.0.1    ${DOMAIN_1}
-    Add Binding    30    30.30.30.5/32    127.0.0.1    ${DOMAIN_2}
-    Add Binding    40    40.40.40.5/32    127.0.0.1    ${DOMAIN_3}
+    Add Bindings    20    20.20.20.5/32    127.0.0.1    ${DOMAIN_1}
+    Add Bindings    30    30.30.30.5/32    127.0.0.1    ${DOMAIN_2}
+    Add Bindings    40    40.40.40.5/32    127.0.0.1    ${DOMAIN_3}
     Wait Until Keyword Succeeds    15    1    Check Domain Sharing Local
 
 Binding Replacement Test
@@ -70,8 +70,8 @@ Binding Replacement Test
     ...    after shared binding is removed the original binding must be propagated to Peers
     [Tags]    SXP    Domains    Filtering
     Wait Until Keyword Succeeds    15    1    Check Initialized After Update
-    Add Binding    400    35.35.35.35/32    127.0.0.4
-    Add Binding    450    35.35.35.35/32    127.0.0.1    ${DOMAIN_3}
+    Add Bindings    400    35.35.35.35/32    127.0.0.4
+    Add Bindings    450    35.35.35.35/32    127.0.0.1    ${DOMAIN_3}
     Wait Until Keyword Succeeds    15    1    Check After Update Part One
     Add Filters After Update
     Wait Until Keyword Succeeds    15    1    Check After Update Part Two
@@ -83,24 +83,24 @@ Setup Nodes Local
     [Documentation]    Setups Multi domain topology consisting of 3 specific domains and 1 default, data will be shared by filter.
     Setup SXP Environment    10
     : FOR    ${node}    IN RANGE    2    5
-    \    Add Binding    ${node}0    ${node}0.${node}0.${node}0.${node}0/32    127.0.0.${node}
-    \    Add Binding    ${node}0    ${node}0.${node}0.${node}0.0/24    127.0.0.${node}
-    \    Add Binding    ${node}0    ${node}0.${node}0.0.0/16    127.0.0.${node}
-    \    Add Binding    ${node}0    ${node}0.0.0.0/8    127.0.0.${node}
+    \    Add Bindings    ${node}0    ${node}0.${node}0.${node}0.${node}0/32    127.0.0.${node}
+    \    Add Bindings    ${node}0    ${node}0.${node}0.${node}0.0/24    127.0.0.${node}
+    \    Add Bindings    ${node}0    ${node}0.${node}0.0.0/16    127.0.0.${node}
+    \    Add Bindings    ${node}0    ${node}0.0.0.0/8    127.0.0.${node}
     \    Add Connection    ${version}    speaker    127.0.0.1    64999    127.0.0.${node}
     : FOR    ${node}    IN RANGE    5    10
     \    Add Connection    ${version}    listener    127.0.0.1    64999    127.0.0.${node}
     Add Domain    ${DOMAIN_1}
     Add Domain    ${DOMAIN_2}
     Add Domain    ${DOMAIN_3}
-    Add Binding    20    20.20.20.5/32    127.0.0.1    ${DOMAIN_1}
-    Add Binding    20    20.20.5.5/32    127.0.0.1    ${DOMAIN_1}
-    Add Binding    30    30.30.30.5/32    127.0.0.1    ${DOMAIN_2}
-    Add Binding    30    30.30.5.5/32    127.0.0.1    ${DOMAIN_2}
-    Add Binding    40    40.40.40.5/32    127.0.0.1    ${DOMAIN_3}
-    Add Binding    40    40.40.5.5/32    127.0.0.1    ${DOMAIN_3}
-    Add Binding    300    25.25.25.25/32    127.0.0.4
-    Add Binding    500    35.35.35.35/32
+    Add Bindings    20    20.20.20.5/32    127.0.0.1    ${DOMAIN_1}
+    Add Bindings    20    20.20.5.5/32    127.0.0.1    ${DOMAIN_1}
+    Add Bindings    30    30.30.30.5/32    127.0.0.1    ${DOMAIN_2}
+    Add Bindings    30    30.30.5.5/32    127.0.0.1    ${DOMAIN_2}
+    Add Bindings    40    40.40.40.5/32    127.0.0.1    ${DOMAIN_3}
+    Add Bindings    40    40.40.5.5/32    127.0.0.1    ${DOMAIN_3}
+    Add Bindings    300    25.25.25.25/32    127.0.0.4
+    Add Bindings    500    35.35.35.35/32
     # NO DOMAIN
     Add Connection    ${version}    speaker    127.0.0.8    64999
     Wait Until Keyword Succeeds    15    1    Verify Connection    ${version}    speaker    127.0.0.8

diff --git a/csit/suites/sxp/topology/010_Topology_Features.robot b/csit/suites/sxp/topology/010_Topology_Features.robot
index 07e8465b1c09a2829c3a1bde18253bf43e05e41d..3704cd4a5ef884889c873cb4ccc68c745f63307d 100644 (file)
--- a/csit/suites/sxp/topology/010_Topology_Features.robot
+++ b/csit/suites/sxp/topology/010_Topology_Features.robot
@@ -60,12 +60,12 @@ Most Recent Rule Test
     [Documentation]    Most Recent Rule
     [Tags]    SXP    Topology
     Setup Topology Fork    version4
-    Add Binding    542    5.5.5.5/32    127.0.0.2
+    Add Bindings    542    5.5.5.5/32    127.0.0.2
     Sleep    2s
-    Add Binding    543    5.5.5.5/32    127.0.0.3
-    Add Binding    100    15.15.15.15/32    127.0.0.3
+    Add Bindings    543    5.5.5.5/32    127.0.0.3
+    Add Bindings    100    15.15.15.15/32    127.0.0.3
     Sleep    2s
-    Add Binding    99    15.15.15.15/32    127.0.0.2
+    Add Bindings    99    15.15.15.15/32    127.0.0.2
     Wait Until Keyword Succeeds    4    1    Check Most Recent
 
 Shorthest Path Test
@@ -76,20 +76,20 @@ Shorthest Path Test
     Wait Until Keyword Succeeds    15    1    Verify Connection    version4    listener    127.0.0.5
     ...    64999    127.0.0.3
     Setup Topology Fork    version4
-    Add Binding    542    5.5.5.5/32    127.0.0.2
-    Add Binding    545    5.5.5.5/32    127.0.0.5
-    Add Binding    99    15.15.15.15/32    127.0.0.2
-    Add Binding    9954    105.15.125.15/32    127.0.0.5
-    Add Binding    95    15.15.15.15/32    127.0.0.5
+    Add Bindings    542    5.5.5.5/32    127.0.0.2
+    Add Bindings    545    5.5.5.5/32    127.0.0.5
+    Add Bindings    99    15.15.15.15/32    127.0.0.2
+    Add Bindings    9954    105.15.125.15/32    127.0.0.5
+    Add Bindings    95    15.15.15.15/32    127.0.0.5
     Wait Until Keyword Succeeds    4    1    Check Shorthest Path
 
 *** Keywords ***
 Setup Topology Triangel
     [Arguments]    ${version}
     [Documentation]    Setup 3 nodes connected to each other
-    Add Binding    542    5.5.5.5/32    127.0.0.2
-    Add Binding    543    5.5.5.5/32    127.0.0.3
-    Add Binding    99    15.15.15.15/32    127.0.0.3
+    Add Bindings    542    5.5.5.5/32    127.0.0.2
+    Add Bindings    543    5.5.5.5/32    127.0.0.3
+    Add Bindings    99    15.15.15.15/32    127.0.0.3
     Add Connection    ${version}    listener    127.0.0.2    64999    127.0.0.1
     Add Connection    ${version}    speaker    127.0.0.1    64999    127.0.0.2
     Wait Until Keyword Succeeds    15    1    Verify Connection    ${version}    listener    127.0.0.2
@@ -105,10 +105,10 @@ Setup Topology Triangel
 Setup Topology Linear
     [Arguments]    ${version}    ${r_version}
     [Documentation]    Setup 3 nodes connected linearly
-    Add Binding    6    56.56.56.0/24    127.0.0.2
-    Add Binding    66    9.9.9.9/32    127.0.0.2
-    Add Binding    666    2001:db8:0:0:0:0:1428:57ab/128    127.0.0.2
-    Add Binding    555    2001:db8:85a3:8d3:0:0:0:0/64    127.0.0.2
+    Add Bindings    6    56.56.56.0/24    127.0.0.2
+    Add Bindings    66    9.9.9.9/32    127.0.0.2
+    Add Bindings    666    2001:db8:0:0:0:0:1428:57ab/128    127.0.0.2
+    Add Bindings    555    2001:db8:85a3:8d3:0:0:0:0/64    127.0.0.2
     Add Connection    ${version}    listener    127.0.0.2    64999    127.0.0.1
     Add Connection    ${version}    speaker    127.0.0.1    64999    127.0.0.2
     Wait Until Keyword Succeeds    15    1    Verify Connection    ${version}    listener    127.0.0.2

diff --git a/csit/suites/sxp/topology/020_Scalability.robot b/csit/suites/sxp/topology/020_Scalability.robot
index dffd0334840b41ef29d4de83a00e39bcb281fa50..52a7f0fca5e8f74385076eb730863a901ca6a34c 100644 (file)
--- a/csit/suites/sxp/topology/020_Scalability.robot
+++ b/csit/suites/sxp/topology/020_Scalability.robot
@@ -28,7 +28,7 @@ Text Bindings export
     [Tags]    SXP    Scalability
     : FOR    ${num}    IN RANGE    2    502
     \    ${ip}    Get Ip From Number    ${num}
-    \    Add Binding    ${num}    ${ip}/32    127.0.0.2
+    \    Add Bindings    ${num}    ${ip}/32    127.0.0.2
     Add Connection    version4    listener    127.0.0.2    64999    127.0.0.1
     Add Connection    version4    speaker    127.0.0.1    64999    127.0.0.2
     Wait Until Keyword Succeeds    15    1    Verify Connection    version4    listener    127.0.0.2
@@ -39,7 +39,7 @@ Setup Mega Topology
     [Arguments]    ${version}=version4
     : FOR    ${num}    IN RANGE    2    22
     \    ${ip}    Get Ip From Number    ${num}
-    \    Add Binding    ${num}    ${ip}/32    ${ip}
+    \    Add Bindings    ${num}    ${ip}/32    ${ip}
     \    Add Connection    ${version}    listener    ${ip}    64999    127.0.0.1
     \    Add Connection    ${version}    speaker    127.0.0.1    64999    ${ip}
     \    Wait Until Keyword Succeeds    15    1    Verify Connection    ${version}    listener
@@ -52,7 +52,7 @@ Setup Complex Mega Topology
     : FOR    ${num}    IN RANGE    22    32
     \    ${ip}    Get Ip From Number    ${num}
     \    ${second_ip}    Get Ip From Number    ${second_num}
-    \    Add Binding    ${num}    ${ip}/32    ${ip}
+    \    Add Bindings    ${num}    ${ip}/32    ${ip}
     \    Add Connection    ${version}    listener    ${ip}    64999    ${second_ip}
     \    Add Connection    ${version}    speaker    ${second_ip}    64999    ${ip}
     \    Wait Until Keyword Succeeds    15    1    Verify Connection    ${version}    listener