Use osg-xrootd-standalone for XRootD tests where available

We didn't actually start the cmsd service so it's not like we were
actually using the clustered configuration for its intended use

Author: brianhlin

osgtest/tests/test_150_xrootd.py

@@ -19,6 +19,12 @@
 ofs.authorize
 """
 
+# XRootD configuration necessaryfor osg-xrootd-standalone
+META_XROOTD_CFG_TEXT = """\
+set rootdir = /
+set resourcename = OSG_TEST_XROOTD_STANDALONE
+"""
+
 AUTHFILE_TEXT = """\
 u * /tmp a /usr/share/ r
 u = /tmp/@=/ a
@@ -37,8 +43,11 @@ def test_01_start_xrootd(self):
         core.config['xrootd.pid-file'] = '/var/run/xrootd/xrootd-default.pid'
         core.config['certs.xrootdcert'] = '/etc/grid-security/xrd/xrdcert.pem'
         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'
+        if core.rpm_is_installed('osg-xrootd-standalone'):
+            # rootdir and resourcename needs to be set early for the default osg-xrootd config
+            core.config['xrootd.config'] = '/etc/xrootd/config.d/10-osg-test.cfg'
+        else:
+            core.config['xrootd.config'] = '/etc/xrootd/config.d/99-osg-test.cfg'
         core.config['xrootd.multiuser'] = False
         core.state['xrootd.started-server'] = False
         core.state['xrootd.backups-exist'] = False
@@ -51,27 +60,25 @@ def test_01_start_xrootd(self):
         core.install_cert('certs.xrootdcert', 'certs.hostcert', 'xrootd', 0o644)
         core.install_cert('certs.xrootdkey', 'certs.hostkey', 'xrootd', 0o400)
 
-        lcmaps_packages = ('lcmaps', 'lcmaps-db-templates', 'xrootd-lcmaps', 'vo-client', 'vo-client-lcmaps-voms')
-        if all([core.rpm_is_installed(x) for x in lcmaps_packages]):
-            core.log_message("Using xrootd-lcmaps authentication")
-            sec_protocol = '-authzfun:libXrdLcmaps.so -authzfunparms:--loglevel,5'
-            if core.PackageVersion('xrootd-lcmaps') >= '1.4.0':
-                sec_protocol += ',--policy,authorize_only'
+        if core.rpm_is_installed('osg-xrootd-standalone'):
+            core.log_message("Using osg-xrootd configuration")
+            xrootd_config = META_XROOTD_CFG_TEXT
         else:
-            core.log_message("Using XRootD mapfile authentication")
-            sec_protocol = '-gridmap:/etc/grid-security/xrd/xrdmapfile'
-            files.write("/etc/grid-security/xrd/xrdmapfile", "\"%s\" vdttest" % core.config['user.cert_subject'],
-                        owner="xrootd",
-                        chown=(user.pw_uid, user.pw_gid))
-
-        if core.PackageVersion('xrootd') < '1:4.9.0':
-            files.append(core.config['xrootd.config'],
-                         XROOTD_CFG_TEXT % sec_protocol,
-                         owner='xrootd', backup=True)
-        else:
-            files.write(core.config['xrootd.config-extra'],
-                        XROOTD_CFG_TEXT % sec_protocol,
-                        owner='xrootd', backup=True, chmod=0o644)
+            lcmaps_packages = ('lcmaps', 'lcmaps-db-templates', 'xrootd-lcmaps', 'vo-client', 'vo-client-lcmaps-voms')
+            if all([core.rpm_is_installed(x) for x in lcmaps_packages]):
+                core.log_message("Using xrootd-lcmaps authentication")
+                sec_protocol = '-authzfun:libXrdLcmaps.so -authzfunparms:--loglevel,5'
+                if core.PackageVersion('xrootd-lcmaps') >= '1.4.0':
+                    sec_protocol += ',--policy,authorize_only'
+            else:
+                core.log_message("Using XRootD mapfile authentication")
+                sec_protocol = '-gridmap:/etc/grid-security/xrd/xrdmapfile'
+                files.write("/etc/grid-security/xrd/xrdmapfile", "\"%s\" vdttest" % core.config['user.cert_subject'],
+                            owner="xrootd",
+                            chown=(user.pw_uid, user.pw_gid))
+            xrootd_config = XROOTD_CFG_TEXT % sec_protocol
+
+        files.write(core.config['xrootd.config'], xrootd_config, owner='xrootd', backup=True)
 
         authfile = '/etc/xrootd/auth_file'
         files.write(authfile, AUTHFILE_TEXT, owner="xrootd", chown=(user.pw_uid, user.pw_gid))
@@ -81,28 +88,22 @@ def test_01_start_xrootd(self):
     def test_02_configure_hdfs(self):
         core.skip_ok_unless_installed('xrootd-hdfs')
         hdfs_config = "ofs.osslib /usr/lib64/libXrdHdfs.so"
-        if core.PackageVersion('xrootd') < '1:4.9.0':
-            files.append(core.config['xrootd.config'], hdfs_config, backup=False)
-        else:
-            files.append(core.config['xrootd.config-extra'], hdfs_config, backup=False)
+        files.append(core.config['xrootd.config'], hdfs_config, backup=False)
 
     def test_03_configure_multiuser(self):
         core.skip_ok_unless_installed('xrootd-multiuser', 'globus-proxy-utils', by_dependency=True)
         xrootd_multiuser_conf = "xrootd.fslib libXrdMultiuser.so default"
-        if core.PackageVersion('xrootd') < '1:4.9.0':
-            files.append(core.config['xrootd.config'], xrootd_multiuser_conf, owner='xrootd', backup=False)
-        else:
-            files.append(core.config['xrootd.config-extra'], xrootd_multiuser_conf, owner='xrootd', backup=False)
+        files.append(core.config['xrootd.config'], xrootd_multiuser_conf, owner='xrootd', backup=False)
         core.config['xrootd.multiuser'] = True
 
     def test_04_start_xrootd(self):
         core.skip_ok_unless_installed('xrootd', by_dependency=True)
         if core.el_release() < 7:
             core.config['xrootd_service'] = "xrootd"
         elif core.config['xrootd.multiuser']:
-            core.config['xrootd_service'] = "xrootd-privileged@clustered"
+            core.config['xrootd_service'] = "xrootd-privileged@standalone"
         else:
-            core.config['xrootd_service'] = "xrootd@clustered"
+            core.config['xrootd_service'] = "xrootd@standalone"
 
         service.check_start(core.config['xrootd_service'])
         core.state['xrootd.started-server'] = True

osgtest/tests/test_840_xrootd.py

@@ -12,10 +12,7 @@ def setUp(self):
 
     def test_01_stop_xrootd(self):
         if core.state['xrootd.backups-exist']:
-            if core.PackageVersion('xrootd') < '1:4.9.0':
-                files.restore(core.config['xrootd.config'], "xrootd")
-            else:
-                files.restore(core.config['xrootd.config-extra'], "xrootd")
+            files.restore(core.config['xrootd.config'], "xrootd")
             files.restore('/etc/xrootd/auth_file', "xrootd")
             if not core.rpm_is_installed('xrootd-lcmaps'):
                 files.restore('/etc/grid-security/xrd/xrdmapfile', "xrootd")