Do not use different prefix in cluster tests

The different prefix was used as a workaround
for an issue that is already fixed.
On the other hand, prefix shard creation is not notified abou that,
so it is easiest to just the original prefix.

Change-Id: Ic83ce679e2a04fb05e9d897d2e04ffaafd05bdd5
Signed-off-by: Vratko Polak <vrpolak@cisco.com>

diff --git a/csit/libraries/controller/DdbCommons.robot b/csit/libraries/controller/DdbCommons.robot
index 88a9fe3fe8cff2dea29eb254c3b6094d16862d85..5502a724185a1e571228dce07c87ef742883cf73 100644 (file)
--- a/csit/libraries/controller/DdbCommons.robot
+++ b/csit/libraries/controller/DdbCommons.robot
@@ -28,7 +28,7 @@ ${TRANSACTION_PRODUCTION_TIME_2X_REQ_TIMEOUT}    ${2*${REQUEST_TIMEOUT}}
 ${TRANSACTION_PRODUCTION_TIME}    ${40}
 ${SLEEP_AFTER_TRANSACTIONS_INIT}    5s
 ${ID_PREFIX}      prefix-
-${ID_PREFIX2}     different-prefix-
+${ID_PREFIX2}     prefix-    # different-prefix- has been used before, but currently is neither needed nor supported
 ${SIMPLE_TX}      ${False}
 ${CHAINED_TX}     ${True}
 ${ISOLATED_TRANS_TRUE}    ${True}

diff --git a/csit/suites/controller/dom_data_broker/leader_isolation_prefbasedshard.robot b/csit/suites/controller/dom_data_broker/leader_isolation_prefbasedshard.robot
index 4601c06ab433d4b252b7010bfae67d3b0fc6152a..41bc3e490625bbd972fd130289492ccecad6c07f 100644 (file)
--- a/csit/suites/controller/dom_data_broker/leader_isolation_prefbasedshard.robot
+++ b/csit/suites/controller/dom_data_broker/leader_isolation_prefbasedshard.robot
@@ -22,18 +22,6 @@ Resource          ${CURDIR}/../../../libraries/controller/DdbCommons.robot
 Resource          ${CURDIR}/../../../libraries/SetupUtils.robot
 
 *** Test Cases ***
-Healing_Within_Request_Timeout
-    [Documentation]    The isolated node (leader) is rejoined as soon as new leader is elected and
-    ...    and within request timeout.
-    ${HEAL_WITHIN_REQUEST_TIMEOUT}
-
-Restart
-    [Documentation]    Restart odl.
-    [Setup]    SetupUtils.Setup_Test_With_Logging_And_Without_Fast_Failing
-    [Template]
-    DdbCommons.Restart_Test_Templ
-    [Teardown]    SetupUtils.Teardown_Test_Show_Bugs_If_Test_Failed
-
 Healing_After_Request_Timeout
     [Documentation]    The isolated node (leader) is rejoined after request timeout.
     ${HEAL_AFTER_REQUEST_TIMEOUT}