X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=csit%2Flibraries%2FClusterAdmin.robot;h=e5bd1eaab2ceefed1792579b850ec498a93c3a59;hb=eccc3024893c2f150bc8118299ff472e47b412f2;hp=19d55e529a137ef37ef1c14517e46b317b53b4f2;hpb=7e5a8e3140f4ae6ae45e05047650617b3f85253a;p=integration%2Ftest.git

diff --git a/csit/libraries/ClusterAdmin.robot b/csit/libraries/ClusterAdmin.robot
index 19d55e529a..e5bd1eaab2 100644
--- a/csit/libraries/ClusterAdmin.robot
+++ b/csit/libraries/ClusterAdmin.robot
@@ -1,77 +1,107 @@
 *** Settings ***
-Documentation     Keywords wrapping controller's cluster-admin yang model rpcs.
+Documentation       Keywords wrapping controller's cluster-admin yang model rpcs.
 ...
-...               Copyright (c) 2017 Cisco Systems, Inc. and others. All rights reserved.
+...                 Copyright (c) 2017 Cisco Systems, Inc. and others. All rights reserved.
 ...
-...               This program and the accompanying materials are made available under the
-...               terms of the Eclipse Public License v1.0 which accompanies this distribution,
-...               and is available at http://www.eclipse.org/legal/epl-v10.html
-Library           XML
-Resource          ${CURDIR}/ClusterManagement.robot
-Resource          ${CURDIR}/TemplatedRequests.robot
+...                 This program and the accompanying materials are made available under the
+...                 terms of the Eclipse Public License v1.0 which accompanies this distribution,
+...                 and is available at http://www.eclipse.org/legal/epl-v10.html
+
+Library             XML
+Resource            ${CURDIR}/ClusterManagement.robot
+Resource            ${CURDIR}/TemplatedRequests.robot
+
 
 *** Variables ***
-${CLUSTERADMIN_RPC_DIR}    ${CURDIR}/../variables/mdsal/clusteradmin
-${ADD_PREFIX_SHARD_REPLICA_DIR}    ${CLUSTERADMIN_RPC_DIR}/add_prefix_shard_replica
-${ADD_SHARD_REPLICA_DIR}    ${CLUSTERADMIN_RPC_DIR}/add_shard_replica
-${MAKE_LEADER_LOCAL_DIR}    ${CLUSTERADMIN_RPC_DIR}/make_leader_local
-${REMOVE_PREFIX_SHARD_REPLICA_DIR}    ${CLUSTERADMIN_RPC_DIR}/remove_prefix_shard_replica
-${REMOVE_SHARD_REPLICA_DIR}    ${CLUSTERADMIN_RPC_DIR}/remove_shard_replica
-${GET_SHARD_ROLE_DIR}    ${CLUSTERADMIN_RPC_DIR}/get_shard_role
-${GET_PREFIX_SHARD_ROLE_DIR}    ${CLUSTERADMIN_RPC_DIR}/get_prefix_shard_role
+${CLUSTERADMIN_RPC_DIR}                 ${CURDIR}/../variables/mdsal/clusteradmin
+${ADD_PREFIX_SHARD_REPLICA_DIR}         ${CLUSTERADMIN_RPC_DIR}/add_prefix_shard_replica
+${ADD_SHARD_REPLICA_DIR}                ${CLUSTERADMIN_RPC_DIR}/add_shard_replica
+${MAKE_LEADER_LOCAL_DIR}                ${CLUSTERADMIN_RPC_DIR}/make_leader_local
+${REMOVE_PREFIX_SHARD_REPLICA_DIR}      ${CLUSTERADMIN_RPC_DIR}/remove_prefix_shard_replica
+${REMOVE_SHARD_REPLICA_DIR}             ${CLUSTERADMIN_RPC_DIR}/remove_shard_replica
+${GET_SHARD_ROLE_DIR}                   ${CLUSTERADMIN_RPC_DIR}/get_shard_role
+${GET_PREFIX_SHARD_ROLE_DIR}            ${CLUSTERADMIN_RPC_DIR}/get_prefix_shard_role
+
 
 *** Keywords ***
 Make_Leader_Local
-    [Arguments]    ${member_index}    ${shard_name}    ${shard_type}
     [Documentation]    Makes the node to be a shard leader by invoking make-leader-local rpc.
+    [Arguments]    ${member_index}    ${shard_name}    ${shard_type}
     ${session} =    ClusterManagement.Resolve_Http_Session_For_Member    member_index=${member_index}
-    &{mapping}    BuiltIn.Create_Dictionary    SHARD_NAME=${shard_name}    SHARD_TYPE=${shard_type}
-    ${text} =    TemplatedRequests.Post_As_Xml_Templated    ${MAKE_LEADER_LOCAL_DIR}    mapping=${mapping}    session=${session}
+    &{mapping} =    BuiltIn.Create_Dictionary    SHARD_NAME=${shard_name}    SHARD_TYPE=${shard_type}
+    ${text} =    TemplatedRequests.Post_As_Xml_Templated
+    ...    ${MAKE_LEADER_LOCAL_DIR}
+    ...    mapping=${mapping}
+    ...    session=${session}
 
 Add_Prefix_Shard_Replica
-    [Arguments]    ${member_index}    ${shard_prefix}    ${ds_type}
     [Documentation]    Add prefix shard replica to given member by invoking add-prefix-shard-replica rpc.
+    [Arguments]    ${member_index}    ${shard_prefix}    ${ds_type}
     ${session} =    ClusterManagement.Resolve_Http_Session_For_Member    member_index=${member_index}
-    &{mapping}    BuiltIn.Create_Dictionary    SHARD_PREFIX=${shard_prefix}    DATA_STORE_TYPE=${ds_type}
-    ${text} =    TemplatedRequests.Post_As_Xml_Templated    ${ADD_PREFIX_SHARD_REPLICA_DIR}    mapping=${mapping}    session=${session}
+    &{mapping} =    BuiltIn.Create_Dictionary    SHARD_PREFIX=${shard_prefix}    DATA_STORE_TYPE=${ds_type}
+    ${text} =    TemplatedRequests.Post_As_Xml_Templated
+    ...    ${ADD_PREFIX_SHARD_REPLICA_DIR}
+    ...    mapping=${mapping}
+    ...    session=${session}
 
 Remove_Prefix_Shard_Replica
-    [Arguments]    ${member_index}    ${shard_prefix}    ${member_name}    ${ds_type}
     [Documentation]    Remove prefix shard replica from the given member by invoking remove-prefix-shard-replica rpc.
+    [Arguments]    ${member_index}    ${shard_prefix}    ${member_name}    ${ds_type}
     ${session} =    ClusterManagement.Resolve_Http_Session_For_Member    member_index=${member_index}
-    &{mapping}    BuiltIn.Create_Dictionary    SHARD_PREFIX=${shard_prefix}    MEMBER_NAME=${member_name}    DATA_STORE_TYPE=${ds_type}
-    ${text} =    TemplatedRequests.Post_As_Xml_Templated    ${REMOVE_PREFIX_SHARD_REPLICA_DIR}    mapping=${mapping}    session=${session}
+    &{mapping} =    BuiltIn.Create_Dictionary
+    ...    SHARD_PREFIX=${shard_prefix}
+    ...    MEMBER_NAME=${member_name}
+    ...    DATA_STORE_TYPE=${ds_type}
+    ${text} =    TemplatedRequests.Post_As_Xml_Templated
+    ...    ${REMOVE_PREFIX_SHARD_REPLICA_DIR}
+    ...    mapping=${mapping}
+    ...    session=${session}
 
 Add_Shard_Replica
-    [Arguments]    ${member_index}    ${shard_name}    ${ds_type}
     [Documentation]    Add shard replica to given member by invoking add-shard-replica rpc.
+    [Arguments]    ${member_index}    ${shard_name}    ${ds_type}
     ${session} =    ClusterManagement.Resolve_Http_Session_For_Member    member_index=${member_index}
-    &{mapping}    BuiltIn.Create_Dictionary    SHARD_NAME=${shard_name}    DATA_STORE_TYPE=${ds_type}
-    ${text} =    TemplatedRequests.Post_As_Xml_Templated    ${ADD_SHARD_REPLICA_DIR}    mapping=${mapping}    session=${session}
+    &{mapping} =    BuiltIn.Create_Dictionary    SHARD_NAME=${shard_name}    DATA_STORE_TYPE=${ds_type}
+    ${text} =    TemplatedRequests.Post_As_Xml_Templated
+    ...    ${ADD_SHARD_REPLICA_DIR}
+    ...    mapping=${mapping}
+    ...    session=${session}
 
 Remove_Shard_Replica
-    [Arguments]    ${member_index}    ${shard_name}    ${member_name}    ${ds_type}
     [Documentation]    Remove shard replica from the given member by invoking remove-shard-replica rpc.
+    [Arguments]    ${member_index}    ${shard_name}    ${member_name}    ${ds_type}
     ${session} =    ClusterManagement.Resolve_Http_Session_For_Member    member_index=${member_index}
-    &{mapping}    BuiltIn.Create_Dictionary    SHARD_NAME=${shard_name}    MEMBER_NAME=${member_name}    DATA_STORE_TYPE=${ds_type}
-    ${text} =    TemplatedRequests.Post_As_Xml_Templated    ${REMOVE_SHARD_REPLICA_DIR}    mapping=${mapping}    session=${session}
+    &{mapping} =    BuiltIn.Create_Dictionary
+    ...    SHARD_NAME=${shard_name}
+    ...    MEMBER_NAME=${member_name}
+    ...    DATA_STORE_TYPE=${ds_type}
+    ${text} =    TemplatedRequests.Post_As_Xml_Templated
+    ...    ${REMOVE_SHARD_REPLICA_DIR}
+    ...    mapping=${mapping}
+    ...    session=${session}
 
 Get_Shard_Role
-    [Arguments]    ${member_index}    ${shard_name}    ${ds_type}
     [Documentation]    Get shard member role.
+    [Arguments]    ${member_index}    ${shard_name}    ${ds_type}
     ${session} =    ClusterManagement.Resolve_Http_Session_For_Member    member_index=${member_index}
-    &{mapping}    BuiltIn.Create_Dictionary    SHARD_NAME=${shard_name}    DATA_STORE_TYPE=${ds_type}
-    ${text} =    TemplatedRequests.Post_As_Xml_Templated    ${GET_SHARD_ROLE_DIR}    mapping=${mapping}    session=${session}
+    &{mapping} =    BuiltIn.Create_Dictionary    SHARD_NAME=${shard_name}    DATA_STORE_TYPE=${ds_type}
+    ${text} =    TemplatedRequests.Post_As_Xml_Templated
+    ...    ${GET_SHARD_ROLE_DIR}
+    ...    mapping=${mapping}
+    ...    session=${session}
     ${xml} =    XML.Parse_Xml    ${text}
     ${role} =    XML.Get_Element_Text    ${xml}    xpath=role
-    BuiltIn.Return_From_Keyword    ${role}
+    RETURN    ${role}
 
 Get_Prefix_Shard_Role
-    [Arguments]    ${member_index}    ${shard_prefix}    ${ds_type}
     [Documentation]    Get prefix shard member role.
+    [Arguments]    ${member_index}    ${shard_prefix}    ${ds_type}
     ${session} =    ClusterManagement.Resolve_Http_Session_For_Member    member_index=${member_index}
-    &{mapping}    BuiltIn.Create_Dictionary    SHARD_PREFIX=${shard_prefix}    DATA_STORE_TYPE=${ds_type}
-    ${text} =    TemplatedRequests.Post_As_Xml_Templated    ${GET_PREFIX_SHARD_ROLE_DIR}    mapping=${mapping}    session=${session}
+    &{mapping} =    BuiltIn.Create_Dictionary    SHARD_PREFIX=${shard_prefix}    DATA_STORE_TYPE=${ds_type}
+    ${text} =    TemplatedRequests.Post_As_Xml_Templated
+    ...    ${GET_PREFIX_SHARD_ROLE_DIR}
+    ...    mapping=${mapping}
+    ...    session=${session}
     ${xml} =    XML.Parse_Xml    ${text}
     ${role} =    XML.Get_Element_Text    ${xml}    xpath=role
-    BuiltIn.Return_From_Keyword    ${role}
+    RETURN    ${role}