Remove cust_sites/non_cust_sites/auto_approve_sites; no defaults in a…

…ssign template for them; add condtitions to template for them
dmwm · Dec 23, 2014 · 122accf · 122accf
1 parent 1b94cb8
commit 122accf
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 26 deletions.
diff --git a/src/html/ReqMgr/templates/assign.tmpl b/src/html/ReqMgr/templates/assign.tmpl
@@ -115,9 +115,7 @@
     <li>Custodial sites<br/>
         <select name="CustodialSites" class="width-50" multiple="multiple" size="10">
         #for site in $sites
-        #if $site in $cust_sites
-        <option value="$site" selected="selected">$site</option>
-        #else
+        #if $site.startswith("T1")
         <option value="$site">$site</option>
         #end if
         #end for
@@ -126,9 +124,7 @@
     <li>Non-Custodial sites<br/>
         <select name="NonCustodialSites" class="width-50" multiple="multiple" size="10">
         #for site in $sites
-        #if $site in $non_cust_sites
-        <option value="$site" selected="selected">$site</option>
-        #else
+        #if $site.startswith("T2")
         <option value="$site">$site</option>
         #end if
         #end for
@@ -137,11 +133,7 @@
     <li>Auto-Approve subscription sites<br/>
         <select name="AutoApproveSubscriptionSites" class="width-50" multiple="multiple" size="10">
         #for site in $sites
-        #if $site in $auto_approve_sites
-        <option value="$site" selected="selected">$site</option>
-        #else
         <option value="$site">$site</option>
-        #end if
         #end for
         </select>
     </li>

diff --git a/src/python/WMCore/ReqMgr/Tools/cms.py b/src/python/WMCore/ReqMgr/Tools/cms.py
@@ -32,19 +32,6 @@ def site_black_list():
     t3_sites = [s for s in sites() if s.startswith('T3_')]
     return t3_sites
 
-def cust_sites():
-    "Default custodial sites"
-    return ['T1_US_FNAL', 'T1_CH_CERN']
-
-def non_cust_sites():
-    "Default non-custodial sites, all T2"
-    t2_sites = [s for s in sites() if s.startswith('T2_')]
-    return t2_sites
-
-def auto_approve_sites():
-    "Default custodial sites"
-    return ['T1_US_FNAL', 'T1_CH_CERN']
-
 def lfn_bases():
     "Return LFN Base list"
     storeResultLFNBase = [

diff --git a/src/python/WMCore/ReqMgr/Web/ReqMgrService.py b/src/python/WMCore/ReqMgr/Web/ReqMgrService.py
@@ -34,7 +34,6 @@
 from WMCore.ReqMgr.Tools.cms import web_ui_names, next_status, sites
 from WMCore.ReqMgr.Tools.cms import lfn_bases, lfn_unmerged_bases
 from WMCore.ReqMgr.Tools.cms import site_white_list, site_black_list
-from WMCore.ReqMgr.Tools.cms import cust_sites, non_cust_sites, auto_approve_sites
 
 # WMCore modules
 from WMCore.WMSpec.WMWorkloadTools import loadSpecByType
@@ -418,8 +417,6 @@ def assign(self, **kwds):
         content = self.templatepage('assign', sort=sortby,
                 site_white_list=site_white_list(),
                 site_black_list=site_black_list(),
-                cust_sites=cust_sites(), non_cust_sites=non_cust_sites(),
-                auto_approve_sites=auto_approve_sites(),
                 user=self.user(), user_dn=self.user_dn(), requests=docs,
                 cmssw_versions=releases(), scram_arch=architectures(),
                 sites=sites(), lfn_bases=lfn_bases(),