Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update Rucio Int url #10855

Merged
merged 1 commit into from
Oct 7, 2021
Merged

Update Rucio Int url #10855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions deploy/WMAgent.testbed
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,5 +24,5 @@ CENTRAL_LOGDB_URL=https://cmsweb-testbed.cern.ch/couchdb/wmstats_logdb
WMARCHIVE_URL=https://cmsweb-testbed.cern.ch/wmarchive
AMQ_CREDENTIALS=
RUCIO_ACCOUNT=wma_test
RUCIO_HOST=http://cmsrucio-int.cern.ch
RUCIO_AUTH=https://cmsrucio-auth-int.cern.ch
RUCIO_HOST=http://cms-rucio-int.cern.ch
RUCIO_AUTH=https://cms-rucio-auth-int.cern.ch
6 changes: 3 additions & 3 deletions test/data/ReqMgr/validate-test-wfs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ def getRucioToken(rucioUrl):
"""
Get a Rucio token for this account
"""
mapHosts = {"http://cmsrucio-int.cern.ch": "https://cmsrucio-auth-int.cern.ch",
mapHosts = {"http://cms-rucio-int.cern.ch": "https://cms-rucio-auth-int.cern.ch",
"http://cms-rucio.cern.ch": "https://cms-rucio-auth.cern.ch"}

rucioAuth = None
Expand Down Expand Up @@ -654,7 +654,7 @@ def main():
parser.add_argument('-c', '--cms', help='CMSWEB url to talk to DBS. E.g: cmsweb.cern.ch')
parser.add_argument('-r', '--reqmgr', help='Request Manager URL. Example: couch-dev1.cern.ch')
parser.add_argument('-v', '--verbose', help='Increase output verbosity', action="store_true")
parser.add_argument('-x', '--rucio', help='Rucio url', default='cmsrucio-int.cern.ch')
parser.add_argument('-x', '--rucio', help='Rucio url', default='cms-rucio-int.cern.ch')
args = parser.parse_args()

if args.workflow:
Expand All @@ -669,7 +669,7 @@ def main():
verbose = True if args.verbose else False
cmswebUrl = "https://" + args.cms if args.cms else "https://cmsweb-testbed.cern.ch"
reqmgrUrl = "https://" + args.reqmgr if args.reqmgr else "https://cmsweb-testbed.cern.ch"
rucioUrl = "http://" + args.rucio if args.rucio else "http://cmsrucio-int.cern.ch"
rucioUrl = "http://" + args.rucio if args.rucio else "http://cms-rucio-int.cern.ch"

rucioToken = getRucioToken(rucioUrl)

Expand Down
4 changes: 2 additions & 2 deletions test/python/WMComponent_t/RucioInjector_t/RucioInjectorPoller_t.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,8 +79,8 @@ def createConfig(self):
config.RucioInjector.containerDiskRuleParams = {"weight": "ddm_quota", "copies": 2, "grouping": "DATASET"}
config.RucioInjector.containerDiskRuleRSEExpr = "(tier=2|tier=1)&cms_type=real&rse_type=DISK"
config.RucioInjector.rucioAccount = "wma_test"
config.RucioInjector.rucioUrl = "http://cmsrucio-int.cern.ch"
config.RucioInjector.rucioAuthUrl = "https://cmsrucio-auth-int.cern.ch"
config.RucioInjector.rucioUrl = "http://cms-rucio-int.cern.ch"
config.RucioInjector.rucioAuthUrl = "https://cms-rucio-auth-int.cern.ch"
return config

def stuffDatabase(self):
Expand Down
4 changes: 2 additions & 2 deletions test/python/WMCore_t/MicroService_t/MSManager_t.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ def setUp(self):
data.quotaAccount = "DataOps"
data.enableStatusTransition = True
data.rucioAccount = "wma_test"
data.rucioUrl = "http://cmsrucio-int.cern.ch"
data.rucioAuthUrl = "https://cmsrucio-auth-int.cern.ch"
data.rucioUrl = "http://cms-rucio-int.cern.ch"
data.rucioAuthUrl = "https://cms-rucio-auth-int.cern.ch"
data.phedexUrl = "https://cmsweb.cern.ch/phedex/datasvc/json/prod"
data.dbsUrl = "https://cmsweb-testbed.cern.ch/dbs/int/global/DBSReader"
data.smtpServer = "localhost"
Expand Down
4 changes: 2 additions & 2 deletions test/python/WMCore_t/MicroService_t/MSMonitor_t/MSMonitor_t.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ def setUp(self):
'phedexUrl': 'https://cmsweb-testbed.cern.ch/phedex/datasvc/json/prod',
'dbsUrl': 'https://cmsweb-testbed.cern.ch/dbs/int/global/DBSReader',
'rucioAccount': "wma_test",
'rucioUrl': "http://cmsrucio-int.cern.ch",
'rucioAuthUrl': "https://cmsrucio-auth-int.cern.ch"}
'rucioUrl': "http://cms-rucio-int.cern.ch",
'rucioAuthUrl': "https://cms-rucio-auth-int.cern.ch"}

self.ms = MSMonitor(self.msConfig)
self.ms.reqmgrAux = MockReqMgrAux()
Expand Down
4 changes: 2 additions & 2 deletions test/python/WMCore_t/MicroService_t/MSRuleCleaner_t/MSRuleCleaner_t.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ def setUp(self):
'reqmgrCacheUrl': 'https://cmsweb-testbed.cern.ch/couchdb/reqmgr_workload_cache',
'phedexUrl': 'https://cmsweb-testbed.cern.ch/phedex/datasvc/json/prod',
'dbsUrl': 'https://cmsweb-testbed.cern.ch/dbs/int/global/DBSReader',
'rucioUrl': 'http://cmsrucio-int.cern.ch',
'rucioAuthUrl': 'https://cmsrucio-auth-int.cern.ch',
'rucioUrl': 'http://cms-rucio-int.cern.ch',
'rucioAuthUrl': 'https://cms-rucio-auth-int.cern.ch',
"wmstatsUrl": "https://cmsweb-testbed.cern.ch/wmstatsserver",
"logDBUrl": "https://cmsweb-testbed.cern.ch/couchdb/wmstats_logdb",
'logDBReporter': 'reqmgr2ms_ruleCleaner',
Expand Down
4 changes: 2 additions & 2 deletions test/python/WMCore_t/MicroService_t/MSTransferor_t/MSTransferor_t.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ def setUp(self):
'rucioAccount': 'wma_test', # it should be wmcore_transferor
# 'rucioAuthUrl': 'https://cms-rucio-auth.cern.ch',
# 'rucioUrl': 'http://cms-rucio.cern.ch',
'rucioAuthUrl': 'https://cmsrucio-auth-int.cern.ch',
'rucioUrl': 'http://cmsrucio-int.cern.ch',
'rucioAuthUrl': 'https://cms-rucio-auth-int.cern.ch',
'rucioUrl': 'http://cms-rucio-int.cern.ch',
'dbsUrl': 'https://cmsweb-testbed.cern.ch/dbs/int/global/DBSReader'}

self.msTransferor = MSTransferor(self.msConfig)
Expand Down
4 changes: 2 additions & 2 deletions test/python/WMCore_t/MicroService_t/MSUnmerged_t/MSUnmerged_t.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,8 +116,8 @@ def setUp(self):
'reqmgr2Url': 'https://cmsweb-testbed.cern.ch/reqmgr2',
'rseExpr': 'cms_type=real&rse_type=DISK',
'rucioAccount': 'wmcore_transferor',
'rucioUrl': 'http://cmsrucio-int.cern.ch',
'rucioAuthUrl': 'https://cmsrucio-auth-int.cern.ch',
'rucioUrl': 'http://cms-rucio-int.cern.ch',
'rucioAuthUrl': 'https://cms-rucio-auth-int.cern.ch',
'rucioConMon': 'https://cmsweb-testbed.cern.ch/rucioconmon',
'services': ['unmerged'],
'verbose': True,
Expand Down
4 changes: 2 additions & 2 deletions test/python/WMCore_t/MicroService_t/Tools_t/PycurlRucio_t.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ class PycurlRucioTests(unittest.TestCase):

def setUp(self):
"initialization"
self.rucioUrl = "http://cmsrucio-int.cern.ch"
self.rucioAuthUrl = "https://cmsrucio-auth-int.cern.ch"
self.rucioUrl = "http://cms-rucio-int.cern.ch"
self.rucioAuthUrl = "https://cms-rucio-auth-int.cern.ch"
self.rucioAccount = "wma_test"
self.rucioScope = "cms"
#self.rucioToken, self.tokenValidity = getRucioToken(self.rucioAuthUrl, self.rucioAccount)
Expand Down
8 changes: 4 additions & 4 deletions test/python/WMCore_t/Services_t/Rucio_t/Rucio_t.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,8 +53,8 @@ def __init__(self, methodName='runTest'):
self.creds = {"client_cert": os.getenv("X509_USER_CERT", "Unknown"),
"client_key": os.getenv("X509_USER_KEY", "Unknown")}

self.defaultArgs = {"host": 'http://cmsrucio-int.cern.ch',
"auth_host": 'https://cmsrucio-auth-int.cern.ch',
self.defaultArgs = {"host": 'http://cms-rucio-int.cern.ch',
"auth_host": 'https://cms-rucio-auth-int.cern.ch',
"auth_type": "x509", "account": self.acct,
"ca_cert": False, "timeout": 30, "request_retries": 3,
"creds": self.creds}
Expand Down Expand Up @@ -105,8 +105,8 @@ def testConfig(self):
self.assertTrue(getattr(self.myRucio.cli, "user_agent").startswith("wmcore-client/"))
self.assertTrue(getattr(self.client, "user_agent").startswith("rucio-clients/"))

newParams = {"host": 'http://cmsrucio-int.cern.ch',
"auth_host": 'https://cmsrucio-auth-int.cern.ch',
newParams = {"host": 'http://cms-rucio-int.cern.ch',
"auth_host": 'https://cms-rucio-auth-int.cern.ch',
"auth_type": "x509", "account": self.acct,
"ca_cert": False, "timeout": 5}
newKeys = list(newParams)
Expand Down
4 changes: 2 additions & 2 deletions test/python/WMCore_t/Services_t/WorkQueue_t/WorkQueue_t.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,8 @@ def setUp(self):
self.queueParams = {}
self.queueParams['log_reporter'] = "Services_WorkQueue_Unittest"
self.queueParams['rucioAccount'] = "wma_test"
self.queueParams['rucioAuthUrl'] = "http://cmsrucio-int.cern.ch"
self.queueParams['rucioUrl'] = "https://cmsrucio-auth-int.cern.ch"
self.queueParams['rucioAuthUrl'] = "http://cms-rucio-int.cern.ch"
self.queueParams['rucioUrl'] = "https://cms-rucio-auth-int.cern.ch"

if PY3:
self.assertItemsEqual = self.assertCountEqual
Expand Down
4 changes: 2 additions & 2 deletions test/python/WMCore_t/WorkQueue_t/LocalQueueProfile_t.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ def setUp(self):
self.queueParams = {}
self.queueParams['log_reporter'] = "lq_profile_test"
self.queueParams['rucioAccount'] = "wma_test"
self.queueParams['rucioAuthUrl'] = "http://cmsrucio-int.cern.ch"
self.queueParams['rucioUrl'] = "https://cmsrucio-auth-int.cern.ch"
self.queueParams['rucioAuthUrl'] = "http://cms-rucio-int.cern.ch"
self.queueParams['rucioUrl'] = "https://cms-rucio-auth-int.cern.ch"

# Create queues
self.localQueue = localQueue(DbName=self.queueDB, InboxDbName=self.queueInboxDB,
Expand Down
4 changes: 2 additions & 2 deletions test/python/WMCore_t/WorkQueue_t/WorkQueueReqMgrInterface_t.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,8 @@ def getConfig(self):
def setupGlobalWorkqueue(self, **kwargs):
"""Return a workqueue instance"""
kwargs.setdefault('rucioAccount', "wmcore_transferor")
kwargs.setdefault('rucioAuthUrl', "https://cmsrucio-auth-int.cern.ch")
kwargs.setdefault('rucioUrl', "http://cmsrucio-int.cern.ch")
kwargs.setdefault('rucioAuthUrl', "https://cms-rucio-auth-int.cern.ch")
kwargs.setdefault('rucioUrl', "http://cms-rucio-int.cern.ch")
globalQ = globalQueue(DbName=self.globalQDB,
InboxDbName=self.globalQInboxDB,
QueueURL=self.globalQCouchUrl,
Expand Down
4 changes: 2 additions & 2 deletions test/python/WMCore_t/WorkQueue_t/WorkQueue_t.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ def __init__(self, methodName='runTest'):
self.queueParams = {}
self.queueParams['log_reporter'] = "WorkQueue_Unittest"
self.queueParams['rucioAccount'] = "wma_test"
self.queueParams['rucioAuthUrl'] = "http://cmsrucio-int.cern.ch"
self.queueParams['rucioUrl'] = "https://cmsrucio-auth-int.cern.ch"
self.queueParams['rucioAuthUrl'] = "http://cms-rucio-int.cern.ch"
self.queueParams['rucioUrl'] = "https://cms-rucio-auth-int.cern.ch"


def setupConfigCacheAndAgrs(self):
Expand Down