Remove separate XRootD standalone port

All XRootD implementations use /etc/xrootd/config.d so they can't be
installed side-by-side and be expected to work

Author: brianhlin

osgtest/tests/test_150_xrootd.py

@@ -6,8 +6,6 @@
 import osgtest.library.osgunittest as osgunittest
 
 
-XROOTD_PORT = 1096  # chosen so it doesn't conflict w/ the stashcache instances
-
 XROOTD_CFG_TEXT = """\
 cms.space min 2g 5g
 xrootd.seclib /usr/lib64/libXrdSec-4.so
@@ -20,7 +18,6 @@
     %s
 acc.authdb /etc/xrootd/auth_file
 ofs.authorize
-xrd.port %d
 """
 
 AUTHFILE_TEXT = """\
@@ -41,7 +38,6 @@ def test_01_start_xrootd(self):
         core.config['certs.xrootdkey'] = '/etc/grid-security/xrd/xrdkey.pem'
         core.config['xrootd.config'] = '/etc/xrootd/xrootd-clustered.cfg'
         core.config['xrootd.config-extra'] = '/etc/xrootd/config.d/99-osg-test.cfg'
-        core.config['xrootd.port'] = XROOTD_PORT
         core.config['xrootd.multiuser'] = False
         core.state['xrootd.started-server'] = False
         core.state['xrootd.backups-exist'] = False
@@ -69,12 +65,13 @@ def test_01_start_xrootd(self):
 
         if core.PackageVersion('xrootd') < '1:4.9.0':
             files.append(core.config['xrootd.config'],
-                         XROOTD_CFG_TEXT % (sec_protocol, core.config['xrootd.port']),
+                         XROOTD_CFG_TEXT % sec_protocol,
                          owner='xrootd', backup=True)
         else:
             files.write(core.config['xrootd.config-extra'],
-                        XROOTD_CFG_TEXT % (sec_protocol, core.config['xrootd.port']),
+                        XROOTD_CFG_TEXT % sec_protocol,
                         owner='xrootd', backup=True, chmod=0o644)
+
         authfile = '/etc/xrootd/auth_file'
         files.write(authfile, AUTHFILE_TEXT, owner="xrootd", chown=(user.pw_uid, user.pw_gid))
 

osgtest/tests/test_450_xrootd.py

@@ -29,7 +29,7 @@ def test_01_xrdcp_local_to_server(self):
         os.chown(temp_dir, user[2], user[3])
         hostname = socket.getfqdn()
         os.chmod(temp_dir, 0o777)
-        xrootd_url = 'root://%s:%d/%s/copied_file.txt' % (hostname, core.config['xrootd.port'], temp_dir)
+        xrootd_url = 'root://%s/%s/copied_file.txt' % (hostname, temp_dir)
         command = ('xrdcp', '--debug', '3', TestXrootd.__data_path, xrootd_url)
 
         status, stdout, stderr = core.system(command, user=True)
@@ -62,7 +62,7 @@ def test_03_xrdcp_server_to_local(self):
         f = open(temp_source_dir + "/copied_file.txt", "w")
         f.write("This is some test data for an xrootd test.")
         f.close()
-        xrootd_url = 'root://%s:%d/%s/copied_file.txt' % (hostname, core.config['xrootd.port'], temp_source_dir)
+        xrootd_url = 'root://%s/%s/copied_file.txt' % (hostname, temp_source_dir)
         local_path = temp_target_dir + '/copied_file.txt'
         command = ('xrdcp', '--debug', '3', xrootd_url, local_path)
 
@@ -86,12 +86,12 @@ def test_04_xrootd_fuse(self):
             os.mkdir(TestXrootd.__fuse_path)
         hostname = socket.getfqdn()
 
-        #For some reason, sub process hangs on fuse processes, use os.system
-        os.system("mount -t fuse -o rdr=root://localhost:%d//tmp,uid=xrootd xrootdfs %s" %
-                  (core.config['xrootd.port'], TestXrootd.__fuse_path))
+        # For some reason, sub process hangs on fuse processes, use os.system
+        os.system("mount -t fuse -o rdr=root://localhost//tmp,uid=xrootd xrootdfs %s" %
+                  TestXrootd.__fuse_path)
 
         # Copy a file in and see if it made it into the fuse mount
-        xrootd_url = 'root://%s:%d/%s/copied_file.txt' % (hostname, core.config['xrootd.port'], "/tmp")
+        xrootd_url = 'root://%s/%s/copied_file.txt' % (hostname, "/tmp")
         core.system(['xrdcp', '--debug', '3', TestXrootd.__data_path, xrootd_url], user=True)
 
         self.assert_(os.path.isfile("/tmp/copied_file.txt"), "Test file not uploaded to FUSE mount")