srm: drop srm version option as newer clients doesn't support it

Author: kofemann

SrmcpTests.robot

@@ -20,23 +20,18 @@ ${CLIENT}	srmcp
 ${PROTOCOL}	srm
 ${PORT}		${PROTOCOL_PORTS}[${PROTOCOL}]
 
-# Default SRM version, can be overwritten in command line call
-${SRM_VERSION}	2
-
-
-
 *** Test Cases ***
 COPY MD5
 	[Documentation]	Copy a file and use md5 for the checksum. After copying it back it should still be the same
 	SET CLIENT	${CLIENT}
 	SET PROTOCOL	${PROTOCOL}	${PORT}
 	SET HOST	${HOST}
-	SET EXTRA ARGUMENTS	-${SRM_VERSION} -cksm_type=MD5 -retry_num=0
+	SET EXTRA ARGUMENTS	-cksm_type=MD5 -retry_num=0
 	${FILE_NAME}=	REPLACE STRING	${TEST NAME}	${SPACE}	${EMPTY}
 	CREATE FILE	${LOCAL_FILE}${FILE_NAME}	This is a testfile for ${TEST NAME}
 	COPY LOCAL FILE		${LOCAL_FILE}${FILE_NAME}	${REMOTE_FILE}${FILE_NAME}
 	COMMAND SHOULD EXECUTE SUCCESSFULLY
-	SET EXTRA ARGUMENTS	-${SRM_VERSION} -retry_num=0
+	SET EXTRA ARGUMENTS	-retry_num=0
 	COPY REMOTE FILE	${REMOTE_FILE}${FILE_NAME}	${LOCAL_FILE}${FILe_NAME}1
 	COMMAND SHOULD EXECUTE SUCCESSFULLY
 	FILES SHOULD BE THE SAME	${LOCAL_FILE}${FILE_NAME}	${LOCAL_FILE}${FILE_NAME}1	hash_type=md5
@@ -47,7 +42,7 @@ COPY BAD CHECKSUM MD5
 	SET CLIENT	${CLIENT}
 	SET PROTOCOL	${PROTOCOL}	${PORT}
 	SET HOST	${HOST}
-	SET EXTRA ARGUMENTS	-${SRM_VERSION} -cksm_type=MD5 -retry_num=0
+	SET EXTRA ARGUMENTS	-cksm_type=MD5 -retry_num=0
 	${FILE_NAME}=	REPLACE STRING	${TEST NAME}	${SPACE}	${EMPTY}
 	COPY LOCAL FILE		/proc/uptime	${REMOTE_FILE}${FILE_NAME}
 	ERROR SHOULD CONTAIN		Checksum mismatch
@@ -57,7 +52,7 @@ COPY BAD CHECKSUM
 	SET CLIENT	${CLIENT}
 	SET PROTOCOL	${PROTOCOL}	${PORT}
 	SET HOST	${HOST}
-	SET EXTRA ARGUMENTS	-${SRM_VERSION} -retry_num=0
+	SET EXTRA ARGUMENTS	-retry_num=0
 	${FILE_NAME}=	REPLACE STRING	${TEST_NAME}	${SPACE}	${EMPTY}
 	COPY LOCAL FILE		/proc/uptime	${REMOTE_FILE}${FILE_NAME}
 	ERROR SHOULD CONTAIN	Checksum mismatch
@@ -67,7 +62,7 @@ COPY DIR NOT EXIST
 	SET CLIENT	${CLIENT}
 	SET PROTOCOL	${PROTOCOL}	${PORT}
 	SET HOST	${HOST}
-	SET EXTRA ARGUMENTS	-${SRM_VERSION} -retry_num=0
+	SET EXTRA ARGUMENTS	-retry_num=0
 	${FILE_NAME}=	REPLACE STRING	${TEST NAME}	${SPACE}	${EMPTY}
 	CREATE FILE	${LOCAL_FILE}${FILE_NAME}	This is a testfile for ${TEST NAME}
 	COPY LOCAL FILE		${LOCAL_FILE}${FILE_NAME}	${REMOTE_FILE}/${FILE_NAME}
@@ -89,7 +84,7 @@ COPY HTTP
 	SET CLIENT	${CLIENT}
 	SET PROTOCOL	${PROTOCOL}	${PORT}
 	SET HOST	${HOST}
-	SET EXTRA ARGUMENTS	-${SRM_VERSION} -retry_num=0
+	SET EXTRA ARGUMENTS	-retry_num=0
 	${FILE_NAME}=	REPLACE STRING	${TEST NAME}	${SPACE}	${EMPTY}
 	CREATE FILE	${LOCAL_FILE}${FILE_NAME}	This is a testfile for ${TEST NAME}
 	COPY LOCAL FILE		${LOCAL_FILE}${FILE_NAME}	${REMOTE_FILE}${FILE_NAME}

SrmlsTests.robot

@@ -17,17 +17,14 @@ ${CLIENT}	srmls
 ${PROTOCOL}	srm
 ${PORT}		${PROTOCOL_PORTS}[${PROTOCOL}]
 
-# Default SRM version, can be overwritten in command line call
-${SRM_VERSION}	2
-
 
 *** Test Cases ***
 VALID PATH
 	[Documentation]	Try to ls a valid directory path
 	SET CLIENT	${CLIENT}
 	SET PROTOCOL	${PROTOCOL}	${PORT}
 	SET HOST	${HOST}
-	SET EXTRA ARGUMENTS	-${SRM_VERSION} -retry_num=0
+	SET EXTRA ARGUMENTS	-retry_num=0
 	GET REMOTE FILES LIST	${REMOTE_DIR}
 	COMMAND SHOULD EXECUTE SUCCESSFULLY
 
@@ -36,7 +33,7 @@ INVALID PATH
 	SET CLIENT	${CLIENT}
 	SET PROTOCOL	${PROTOCOL}	${PORT}
 	SET HOST	${HOST}
-	SET EXTRA ARGUMENTS	-${SRM_VERSION} -retry_num=0
+	SET EXTRA ARGUMENTS	-retry_num=0
 	${FAKE_DIR}=	REPLACE STRING	${TEST NAME}	${SPACE}	${EMPTY}
 	GET REMOTE FILES LIST	${REMOTE_DIR}${FAKE_DIR}
 	ERROR SHOULD CONTAIN	SRM_INVALID_PATH

SrmmvTests.robot

@@ -20,17 +20,13 @@ ${PROTOCOL}	srm
 ${PORT}		${PROTOCOL_PORTS}[${PROTOCOL}]
 
 
-# Default SRM version, can be overwritten in command line call
-${SRM_VERSION}	2
-
-
 *** Test Cases ***
 SRMMV INTO SAME DIR
 	[Documentation]	Moving a file to the same directory with a different name (should just rename file)
 	SET CLIENT	srmcp
 	SET PROTOCOL	${PROTOCOL}	${PORT}
 	SET HOST	${HOST}
-	SET EXTRA ARGUMENTS	-${SRM_VERSION} -retry_num=0
+	SET EXTRA ARGUMENTS	-retry_num=0
 	${FILE_NAME}=	REPLACE STRING	${TEST NAME}	${SPACE}	${EMPTY}
 	CREATE FILE	${LOCAL_FILE}${FILE_NAME}	This is a testfile for ${TEST NAME}
 	COPY LOCAL FILE		${LOCAL_FILE}${FILE_NAME}	${REMOTE_FILE}${FILE_NAME}

SrmsetpermTests.robot

@@ -17,17 +17,13 @@ ${CLIENT}	srm-set-permissions
 ${PROTOCOL}	srm
 ${PORT}		${PROTOCOL_PORTS}[${PROTOCOL}]
 
-# Default SRM version, can be overwritten with command line call
-${SRM_VERSION}	2
-
-
 *** Test Cases ***
 CHANGE DIR PERMISSIONS
 	[Documentation]	Changes the permissions of a directory (Other gets no permissions)
 	SET CLIENT	srmmkdir
 	SET PROTOCOL	${PROTOCOL}	${PORT}
 	SET HOST	${HOST}
-	SET EXTRA ARGUMENTS	-${SRM_VERSION} -retry_num=0
+	SET EXTRA ARGUMENTS	-retry_num=0
 	${DIR_NAME}=	REPLACE STRING	${TEST NAME}	${SPACE}	${EMPTY}
 	CREATE REMOTE DIRECTORY		${REMOTE_DIR}${DIR_NAME}testdir
 	COMMAND SHOULD EXECUTE SUCCESSFULLY

SrmspaceTests.robot

@@ -19,17 +19,13 @@ ${PORT}		${PROTOCOL_PORTS}[${PROTOCOL}]
 
 ${SPACE_DESC}	robot-g2-testspace
 
-# Default SRM version, can be overwritten in command line call
-${SRM_VERSION}	2
-
-
 *** Test Cases ***
 GET SPACE TOKENS
 	[Documentation]	Checks if it can get space tokens from the host
 	SET CLIENT	srm-reserve-space
 	SET PROTOCOL	${PROTOCOL}	${PORT}
 	SET HOST	${HOST}
-	SET EXTRA ARGUMENTS	-${SRM_VERSION} -retry_num=0
+	SET EXTRA ARGUMENTS	-retry_num=0
 	${SPACE_TOKEN}=		RESERVE SPACE	${SPACE_DESC}	guaranteed_size=2	retention_policy=REPLICA
 	COMMAND SHOULD EXECUTE SUCCESSFULLY
 	SET CLIENT	srm-get-space-tokens
@@ -45,7 +41,7 @@ PUT REMOVED
 	SET CLIENT	srmcp
 	SET PROTOCOL	${PROTOCOL}	${PORT}
 	SET HOST	${HOST}
-	SET EXTRA ARGUMENTS	-${SRM_VERSION} -retry_num=0
+	SET EXTRA ARGUMENTS	-retry_num=0
 	${FILE_NAME}=	REPLACE STRING	${TEST NAME}	${SPACE}	${EMPTY}
 	CREATE FILE	${LOCAL_FILE}${FILE_NAME}	This is a testfile for ${TEST NAME}
 	COPY LOCAL FILE		${LOCAL_FILE}${FILE_NAME}	${REMOTE_FILE}${FILE_NAME}