Fix to support generic format for endpoint

SiteTests/SRMv2/tests/SRMv2-get-pfn-from-tfc

@@ -55,7 +55,7 @@ else
          echo "</pre>"
       fi
 	
-      cat $SAME_SENSOR_WORK/nodes/$nodeName/pfnpath.txt | cut -d/ -f1-3 > $SAME_SENSOR_WORK/nodes/$nodeName/endpoint.txt
+      cat $SAME_SENSOR_WORK/nodes/$nodeName/pfnpath.txt | cut -d"?" -f1 > $SAME_SENSOR_WORK/nodes/$nodeName/endpoint.txt
       storagepath=`cat $SAME_SENSOR_WORK/nodes/$nodeName/pfnpath.txt | cut -d= -f2-`
       token=CMS_DEFAULT
       echo $storagepath > $SAME_SENSOR_WORK/nodes/$nodeName/SApath.txt

SiteTests/SRMv2/tests/SRMv2-lcg-cp

@@ -19,8 +19,7 @@ if [ ! -f $SAME_SENSOR_WORK/nodes/$nodeName/endpoint.txt ] ; then
     exit $SAME_WARNING
 else
     echo "Testing SRMv2 endpoint " 
-    port=`cat $SAME_SENSOR_WORK/nodes/$nodeName/endpoint.txt | cut -d : -f3 | cut -d / -f1`
-    srmv2=srm://$nodeName:$port/srm/managerv2
+    srmv2=`cat $SAME_SENSOR_WORK/nodes/$nodeName/endpoint.txt`
     echo $srmv2
 fi
 

SiteTests/SRMv2/tests/SRMv2-lcg-gt

@@ -20,8 +20,7 @@ if [ ! -f $SAME_SENSOR_WORK/nodes/$nodeName/endpoint.txt ] ; then
     exit $SAME_WARNING
 else
     echo "Testing SRMv2 endpoint " 
-    port=`cat $SAME_SENSOR_WORK/nodes/$nodeName/endpoint.txt | cut -d : -f3 | cut -d / -f1`
-    srmv2=srm://$nodeName:$port/srm/managerv2
+    srmv2=`cat $SAME_SENSOR_WORK/nodes/$nodeName/endpoint.txt`
     echo $srmv2
 fi
 

SiteTests/SRMv2/tests/SRMv2-lcg-gt-rm-gt

@@ -19,8 +19,7 @@ if [ ! -f $SAME_SENSOR_WORK/nodes/$nodeName/endpoint.txt ] ; then
     exit $SAME_WARNING
 else
     echo "Testing SRMv2 endpoint " 
-    port=`cat $SAME_SENSOR_WORK/nodes/$nodeName/endpoint.txt | cut -d : -f3 | cut -d / -f1`
-    srmv2=srm://$nodeName:$port/srm/managerv2
+    srmv2=`cat $SAME_SENSOR_WORK/nodes/$nodeName/endpoint.txt`
     echo $srmv2
 fi
 #

SiteTests/SRMv2/tests/SRMv2-lcg-ls

@@ -18,8 +18,7 @@ if [ ! -f $SAME_SENSOR_WORK/nodes/$nodeName/endpoint.txt ] ; then
     exit $SAME_WARNING
 else
     echo "Testing SRMv2 endpoint " 
-    port=`cat $SAME_SENSOR_WORK/nodes/$nodeName/endpoint.txt | cut -d : -f3 | cut -d / -f1`
-    srmv2=srm://$nodeName:$port/srm/managerv2
+    srmv2=`cat $SAME_SENSOR_WORK/nodes/$nodeName/endpoint.txt`
     echo $srmv2
 fi
 

SiteTests/SRMv2/tests/SRMv2-lcg-ls-dir

@@ -17,8 +17,7 @@ if [ ! -f $SAME_SENSOR_WORK/nodes/$nodeName/endpoint.txt ] ; then
     exit $SAME_WARNING
 else
     echo "Testing SRMv2 endpoint " 
-    port=`cat $SAME_SENSOR_WORK/nodes/$nodeName/endpoint.txt | cut -d : -f3 | cut -d / -f1`
-    srmv2=srm://$nodeName:$port/srm/managerv2
+    srmv2=`cat $SAME_SENSOR_WORK/nodes/$nodeName/endpoint.txt`
     echo $srmv2
 fi
 

SiteTests/SRMv2/tests/SRMv2-user

@@ -57,7 +57,7 @@ else
          echo "</pre>"
       fi
 	
-      cat $SAME_SENSOR_WORK/nodes/$nodeName/$pfnFilename | cut -d/ -f1-3 > $SAME_SENSOR_WORK/nodes/$nodeName/endpoint.txt
+      cat $SAME_SENSOR_WORK/nodes/$nodeName/$pfnFilename | cut -d "?" -f1 > $SAME_SENSOR_WORK/nodes/$nodeName/endpoint.txt
       storagepath=`cat $SAME_SENSOR_WORK/nodes/$nodeName/$pfnFilename | cut -d= -f2-`
       token=CMS_DEFAULT
       echo $storagepath > $SAME_SENSOR_WORK/nodes/$nodeName/userpath.txt
@@ -88,8 +88,7 @@ if [ ! -f $SAME_SENSOR_WORK/nodes/$nodeName/endpoint.txt ] ; then
     exit $SAME_WARNING
 else
     echo "Testing SRMv2 endpoint " 
-    port=`cat $SAME_SENSOR_WORK/nodes/$nodeName/endpoint.txt | cut -d : -f3 | cut -d / -f1`
-    srmv2=srm://$nodeName:$port/srm/managerv2
+    srmv2=`cat $SAME_SENSOR_WORK/nodes/$nodeName/endpoint.txt`
     echo $srmv2
 fi