references #180: create configs with configurator for folded setup

evb/test/scripts/createConfig.py

@@ -35,7 +35,8 @@ class CreateConfig:
         #configFile = "/nfshome0/mommsen/daq2Test/daq2val/x86_64_slc6/daq2val/29110628/configuration.xml"
         configFile = "/tmp/"+time.strftime('%d%H%M%S')+".xml"
         javaCmd = ['java','-Doracle.net.tns_admin=/etc',
-                   '-jar','/nfshome0/rcms/centralRcmsServices/staticContent/daq2_configurator/pro/lib/configurator.jar',
+                   #'-jar','/nfshome0/rcms/centralRcmsServices/staticContent/daq2_configurator/pro/lib/configurator.jar',
+                   '-jar','/nfshome0/mommsen/tmp/daq-configurator-1.11.0.jar',
                    '--properties',self.args['properties'],
                    '--batch',
                    '--nBU',self.args['nBU'],
@@ -49,11 +50,11 @@ class CreateConfig:
                             '--fbSet',self.args['fbSet']])
         if self.args['daqval']:
             javaCmd.extend(['--mainRCMSHost','cmsrc-daqvaldev.cms',
-                            '--routingOptimizer','EVB2_OPTIMIZER',
-                            '--account','daqlocal','--site','daqvaldev'])
+                            '--routingOptimizer','STATIC_OPTIMIZER',
+                            '--account','daqvaldev_DAQ3VAL_global','--site','monitoring_zone_daq3val'])
         else:
             javaCmd.extend(['--mainRCMSHost','cmsrc-daq.cms',
-                            '--routingOptimizer','GREEDY_OPTIMIZER',
+                            '--routingOptimizer','STATIC_OPTIMIZER',
                             '--account','daqlocal','--site','daq2'])
         if self.args['useBlacklist']:
             javaCmd.extend(['--blacklistSetup','.cms'])
@@ -148,8 +149,8 @@ class CreateConfig:
         nBU = 0
         xcns = re.match(r'\{(.*?)\}Partition',config.tag).group(1) ## Extract xdaq namespace
         for context in config.getiterator(str(QN(xcns,'Context'))):
+            hostType = None
             for app in context.getiterator(str(QN(xcns,'Application'))):
-                hostType = None
                 if app.attrib['class'].startswith(('evb::test::DummyFEROL','ferol::','ferol40::')):
                     hostType = 'FEROLCONTROLLER'+str(nFRL)
                     nFRL += 1
@@ -161,15 +162,18 @@ class CreateConfig:
                     fedIds = self.getFedIds(app)
                     nRU += 1
                 elif app.attrib['class'] == 'evb::BU':
-                    hostType = 'BU'+str(nBU)
-                    nBU += 1
+                    if hostType and 'RU' in hostType: #folded setup
+                        hostType = hostType.replace('RU','RUBU')
+                    else:
+                        hostType = 'BU'+str(nBU)
+                        nBU += 1
             if hostType:
                 hostName = self.getHostFromURL(context.attrib['url'])
                 symbolMap[hostType+'_SOAP_HOST_NAME'] = hostName
                 self.infoStr += "   "+hostName
                 if 'RU' in hostType:
                     self.infoStr += ' with %d FEDs: %s' % (len(fedIds),",".join(fedIds))
-                    if hostType == 'RU0':
+                    if hostType[-1] == '0':
                         self.infoStr += ' (EVM)'
                 self.infoStr += '\n'
                 context.attrib['url'] = 'http://'+hostType+'_SOAP_HOST_NAME'+':'+hostType+'_SOAP_PORT'

evb/test/scripts/createDaq3valConfigs.sh

 #!/bin/sh
 
-#swt=/DAQ3_Official/StandAlone/StandAlone_40g_infini_dropAtBU
-swt=/Test/Remi/StandAlone/StandAlone_40g_infini_dropAtBU
-hwcfg=/daq3val/eq_190329
-dir=../daq3val/20190329
+swt=/DAQ3_Official_folded/StandAlone/StandAlone_40g_infini_dropAtBU
+#swt=/Test/Remi/StandAlone/StandAlone_40g_infini_dropAtBU
+hwcfg=/daq3val/eq_200904
+dir=../daq3val/20200903
 mkdir -p $dir
 
 (
@@ -20,9 +20,17 @@ EVM_CREATE_FED1022 false
 EOF
 ) > /tmp/fed1022_$$.txt
 
-#for nbFEDs in '10' '15' '20' '25' '27' ; do
-for nbFEDs in '8' ; do
+(
+cat <<EOF
+d3vrubu-c2e33-10-01.cms
+d3vrubu-c2e34-27-01.cms
+EOF
+) > /tmp/hostlist.txt
+
+for nbFEDs in '4' '8' '12' '16' '20' '27' '36' ; do
+#for nbFEDs in '4' ; do
     fbSet=$hwcfg/evb/fb_1x${nbFEDs}
-    ./createConfig.py $fbSet $swt 2 $dir/${nbFEDs}x1x2 -s /tmp/fed1022_$$.txt --dpSet ${fbSet}/dp_1x2 --daqval -p $HOME/configurator/CONFIGURATOR_DAQ2VAL.properties
+    ./createConfig.py $fbSet $swt 2 $dir/${nbFEDs}x1x2 -s /tmp/fed1022_$$.txt --daqval -p $HOME/configurator/CONFIGURATOR_DAQ2VAL.properties --hostList /tmp/hostlist.txt
+    #./createConfig.py $fbSet $swt 2 $dir/${nbFEDs}x1x2 -s /tmp/fed1022_$$.txt --dpSet ${fbSet}/dp_2BU --daqval -p $HOME/configurator/CONFIGURATOR_DAQ2VAL.properties
     #./createConfig.py $fbSet $swt 2 $dir/${nbFEDs}x1x2_noChksums -s /tmp/$$.txt --dpSet ${fbSet}/dp_1x2 --daqval -p $HOME/configurator/CONFIGURATOR_DAQ2VAL.properties
 done