Reqmgr2 create template changes

src/html/ReqMgr/style/main.css

@@ -75,6 +75,10 @@ input[type=text]:focus, textarea:focus {
     margin-top:6px;
     border-top-width:1px;
 }
+.replace {
+    color: blue;
+    font-weight: bold;
+}
 .ticket {
   color: #000000;
   background-color: #F5C669;

src/html/ReqMgr/templates/create.tmpl

@@ -3,12 +3,12 @@
 <header class="group">
     <nav class="navbar navbar-left">
         <ul>
-        <li id="rereco" class="menu-item"><a href="$base/create?form=rereco">ReReco</a></li>
-        <li id="mc" class="menu-item"><a href="$base/create?form=mc">MonteCarlo</a></li>
-        <li id="storeres" class="menu-item"><a href="$base/create?form=storeres">StoreResults</a></li>
-        <li id="dataproc" class="menu-item"><a href="$base/create?form=dataproc">DataProcessing</a></li>
-        <li id="resub" class="menu-item"><a href="$base/create?form=resub">Resubmission</a></li>
-        <li id="redigi" class="menu-item"><a href="$base/create?form=redigi">ReDigi</a></li>
+        <li id="ReReco" class="menu-item"><a href="$base/create?form=ReReco">ReReco</a></li>
+        <li id="MonteCarlo" class="menu-item"><a href="$base/create?form=MonteCarlo">MonteCarlo</a></li>
+        <li id="StoreResults" class="menu-item"><a href="$base/create?form=StoreResults">StoreResults</a></li>
+        <li id="DataProcessing" class="menu-item"><a href="$base/create?form=DataProcessing">DataProcessing</a></li>
+        <li id="Resubmission" class="menu-item"><a href="$base/create?form=Resubmission">Resubmission</a></li>
+        <li id="ReDigi" class="menu-item"><a href="$base/create?form=ReDigi">ReDigi</a></li>
         </ul>
     </nav>
     <nav class="navbar navbar-right">
@@ -37,6 +37,8 @@ $table
     <option value="$item">$item script</option>
     #end for
     </select>
+    </td>
+    <td>if provided, it will generate series of requests from given template</td>
     </td></tr></table>
 
     <p class="units-row">
@@ -60,6 +62,8 @@ $table
     <option value="$item">$item script</option>
     #end for
     </select>
+    </td>
+    <td>if provided, it will generate series of requests from given template</td>
     </td></tr></table>
 
     <p class="units-row">

src/html/ReqMgr/templates/json/DataProcessing.tmpl

@@ -0,0 +1,34 @@
+{
+"RequestString":"REPLACE-REQUEST",
+"PrepID":"REPLACE-PREPID",
+"Requestor":$user,
+"RequestorDN":$dn,
+"Group":$groups,
+"RequestPriority":1,
+"CMSSWVersion":$releases,
+"ScramArch": $arch,
+"IncludeParents": [true, false],
+"Campaign":"",
+"MultiCore":"",
+"Scenario":$scenarios,
+"GlobalTag":"REPLACE-TAG",
+"EnableHarvesting": false,
+"DQMConfigCacheID":"",
+"DQMSequences":"",
+"DQMUploadURL":$dqm_urls,
+"InputDataset":"REPLACE-/A/B/C",
+"OpenRunningTimeout":0,
+"DbsUrl":$dbs_url,
+"CouchDBName":$couch_dbname,
+"CouchURL":$couch_url,
+"CouchWorkloadDBName":$couch_wdbname,
+"RunWhitelist":[],
+"RunBlacklist":[],
+"BlockWhitelist":[],
+"BlockBlacklist":[],
+"TimePerEvent":12.0,
+"Memory":2300.0,
+"SizePerEvent": 512.0,
+"RequestType": "DataProcessing"
+}
+

src/html/ReqMgr/templates/json/MonteCarlo.tmpl

@@ -0,0 +1,29 @@
+{
+"RequestString":"REPLACE-REQUEST",
+"PrepID":"REPLACE-PREPID",
+"Requestor":$user,
+"RequestorDN":$dn,
+"Group":$groups,
+"RequestPriority":1,
+"CMSSWVersion":$releases,
+"ScramArch": $arch,
+"RequestNumEvents": 1000,
+"FilterEfficiency": 1.0,
+"TotalTime": 32400,
+"TimePerEvent":12.0,
+"Memory":2300.0,
+"SizePerEvent": 512.0,
+"FirstEvent": 1,
+"ConfigCacheUrl":$cc_url,
+"ConfigCacheID":$cc_id,
+"CouchDBName":$couch_dbname,
+"CouchURL":$couch_url,
+"CouchWorkloadDBName":$couch_wdbname,
+"Scenario":$scenarios,
+"GlobalTag":"REPLACE-TAG",
+"PrimaryDataset":"REPLACE-ABC",
+"DataPileup":"",
+"MCPileup":"",
+"RequestType": "MonteCarlo"
+}
+

src/html/ReqMgr/templates/json/redigi.tmpl → src/html/ReqMgr/templates/json/ReDigi.tmpl

@@ -1,37 +1,41 @@
 {
-"RequestString":"",
-"PrepID":"",
-"User":$user,
+"RequestString":"REPLACE-REQUEST",
+"PrepID":"REPLACE-PREPID",
+"Requestor":$user,
+"RequestorDN":$dn,
 "Group":$groups,
 "RequestPriority":1,
 "CMSSWVersion":$releases,
 "ScramArch": $arch,
 "IncludeParents": [true, false],
-"Campaign":"",
-"InputDataset":"",
+"Campaign":"REPLACE-CAMPAING",
+"InputDataset":"REPLACE-/A/B/C",
 "OpenRunningTimeout":0,
-"DBS":$dbs_urls,
+"DbsUrl":$dbs_url,
 "EnableHarvesting": false,
 "DQMConfigCacheID":"",
 "DQMSequences":"",
 "DQMUploadURL":$dqm_urls,
-"StepOneConfigCacheID":"",
+"StepOneConfigCacheID":"REPLACE-CACHEID",
 "StepOneOutputModuleName":"",
 "StepTwoConfigCacheID":"",
 "StepTwoOutputModuleName":"",
 "StepThreeConfigCacheID":"",
 "KeepStepOneOutput": [true, false],
 "KeepStepTwoOutput": [true, false],
-"GlobalTag":"",
+"GlobalTag":"REPLACE-TAG",
 "DataPileup":"",
 "MCPileup":"",
-"RunWhitelist":"",
-"RunBlacklist":"",
-"BlockWhitelist":"",
-"BlockBlacklist":"",
-"TimePerEvent":12,
-"Memory":2300,
-"SizePerEvent": 512,
+"RunWhitelist":[],
+"RunBlacklist":[],
+"BlockWhitelist":[],
+"BlockBlacklist":[],
+"TimePerEvent":12.0,
+"Memory":2300.0,
+"SizePerEvent": 512.0,
+"CouchDBName":$couch_dbname,
+"CouchURL":$couch_url,
+"CouchWorkloadDBName":$couch_wdbname,
 "RequestType": "DataProcessing"
 }
 

src/html/ReqMgr/templates/json/rereco.tmpl → src/html/ReqMgr/templates/json/ReReco.tmpl

@@ -1,34 +1,38 @@
 {
-"RequestString":"",
-"PrepID":"",
-"User":$user,
+"RequestString":"REPLACE-REQUEST",
+"PrepID":"REPLACE-PREPID",
+"Requestor":$user,
+"RequestorDN":$dn,
 "Group":$groups,
 "RequestPriority":1,
 "CMSSWVersion":$releases,
 "ScramArch": $arch,
 "IncludeParents": [true, false],
-"Campaign": "",
+"Campaign": "REPLACE-CAMPAING",
 "Scenario":$scenarios,
-"GlobalTag":"",
+"GlobalTag":"REPLACE-TAG",
 "EnableHarvesting": false,
 "DQMConfigCacheID":"",
 "DQMSequences":"",
 "DQMUploadURL":$dqm_urls,
-"InputDataset":"",
+"InputDataset":"REPLACE-/A/B/C",
 "OpenRunningTimeout":0,
-"DbsUrl":"$dbs_url",
+"DbsUrl":$dbs_url,
 "RunWhitelist":[],
 "RunBlacklist":[],
 "BlockWhitelist":[],
 "BlockBlacklist":[],
 "FilterEfficiency": 1,
-"ConfigCacheUrl":"$cc_url",
-"ConfigCacheID":"$cc_id",
+"ConfigCacheUrl":$cc_url,
+"ConfigCacheID":$cc_id,
+"CouchDBName":$couch_dbname,
+"CouchURL":$couch_url,
+"CouchWorkloadDBName":$couch_wdbname,
 "SplittingAlgo": "LumiBased",
 "LumisPerJob": 8,
 "inputMode": "couchDB",
-"TimePerEvent":12,
-"Memory":2300,
-"SizePerEvent": 512,
+"TimePerEvent":12.0,
+"Memory":2300.0,
+"SizePerEvent": 512.0,
 "RequestType": "ReReco"
 }

src/html/ReqMgr/templates/json/Resubmission.tmpl

@@ -0,0 +1,22 @@
+{
+"RequestName":"REPLACE-REQUEST",
+"PrepID":"REPLACE-PREPID",
+"Requestor":$user,
+"RequestorDN":$dn,
+"Group":$groups,
+"RequestPriority":1,
+"OriginalRequestName": "",
+"InitialTaskPath":"",
+"ACDCServer":"",
+"ACDCDatabase":"",
+"IgnoredOutputModules": "",
+"CollectionName":"",
+"TimePerEvent":12.0,
+"Memory":2300.0,
+"SizePerEvent": 512.0,
+"ACDCDatabase": $acdc_dbname,
+"ACDCServer": $acdc_url,
+"InitialTaskPath": "REPLACE-PATH",
+"RequestType": "Resubmission"
+}
+

src/html/ReqMgr/templates/json/StoreResults.tmpl

@@ -0,0 +1,24 @@
+{
+"RequestString":"REPLACE-REQUEST",
+"PrepID":"REPLACE-PREPID",
+"Requestor":$user,
+"RequestorDN":$dn,
+"Group":$groups,
+"RequestPriority":1,
+"AcquisitionEra":"",
+"ProcessingVersion":"",
+"GlobalTag":"REPLACE-TAG",
+"CmsPath":"REPLACE-PATH",
+"CMSSWVersion":$releases,
+"ScramArch": $arch,
+"InputDataset":"REPLACE-/A/B/C",
+"OpenRunningTimeout":"",
+"DbsUrl":$dbs_url,
+"TimePerEvent":12.0,
+"Memory":2300.0,
+"SizePerEvent": 512.0,
+"CouchURL":$couch_url,
+"CouchWorkloadDBName":$couch_wdbname,
+"RequestType": "StoreResults"
+}
+

src/python/WMCore/ReqMgr/Tools/cms.py

@@ -150,6 +150,11 @@ def dbs_urls():
         urls.append(base.replace("prod", inst))
     return urls
 
+def couch_url():
+    "Return central couch url"
+    url = "https://cmsweb.cern.ch/couchdb"
+    return url
+
 def releases():
     "Return list of CMSSW releases"
     releases=["CMSSW_7_0_0", "CMSSW_6_8_1"]