Skip to content

Update CEDA ESGF index node hostname #1838

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

Merged
valeriupredoi merged 9 commits into from
Dec 5, 2022
Merged

Update CEDA ESGF index node hostname #1838

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
16a31e6
update ceda esgf node name
valeriupredoi Nov 29, 2022
3d3fde2
update ceda esgf node name
valeriupredoi Nov 29, 2022
ea6c306
update ceda esgf node name
valeriupredoi Nov 29, 2022
855de04
update ceda esgf node name
valeriupredoi Nov 29, 2022
051dc3c
update ceda esgf node name
valeriupredoi Nov 29, 2022
54fcc1e
fix bad fix
valeriupredoi Nov 29, 2022
a16484e
Update tests/unit/esgf/test_search.py
valeriupredoi Nov 29, 2022
d4d31ea
revert back to old example server
valeriupredoi Dec 2, 2022
47ed378
Merge branch 'main' into update_ceda_esgf_node_name
valeriupredoi Dec 2, 2022
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
2 changes: 1 addition & 1 deletion doc/quickstart/configure.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,7 +346,7 @@ The default settings are:
.. code-block:: yaml

urls:
- 'https://esgf-index1.ceda.ac.uk/esg-search'
- 'https://esgf.ceda.ac.uk/esg-search'
- 'https://esgf-node.llnl.gov/esg-search'
- 'https://esgf-data.dkrz.de/esg-search'
- 'https://esgf-node.ipsl.upmc.fr/esg-search'
Expand Down
2 changes: 1 addition & 1 deletion esmvalcore/config/_esgf_pyclient.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ def load_esgf_pyclient_config():
# List of available index nodes: https://esgf.llnl.gov/nodes.html
# Be careful about the url, not all search urls have CMIP3 data?
'urls': [
'https://esgf-index1.ceda.ac.uk/esg-search',
'https://esgf.ceda.ac.uk/esg-search',
'https://esgf-node.llnl.gov/esg-search',
'https://esgf-data.dkrz.de/esg-search',
'https://esgf-node.ipsl.upmc.fr/esg-search',
Expand Down
4 changes: 2 additions & 2 deletions tests/integration/esgf/search_results/Amon_r1i1p1_historical,rcp85_INM-CM4_CMIP5_tas.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@
"format": [
"netCDF, CF-1.4"
],
"index_node": "esgf-index1.ceda.ac.uk",
"index_node": "esgf.ceda.ac.uk",
Comment thread
bouweandela marked this conversation as resolved.
"instance_id": "cmip5.output1.INM.inmcm4.historical.mon.atmos.Amon.r1i1p1.v20130207.tas_Amon_inmcm4_historical_r1i1p1_185001-200512.nc",
"institute": [
"INM"
Expand Down Expand Up @@ -499,7 +499,7 @@
"format": [
"netCDF, CF-1.4"
],
"index_node": "esgf-index1.ceda.ac.uk",
"index_node": "esgf.ceda.ac.uk",
"instance_id": "cmip5.output1.INM.inmcm4.rcp85.mon.atmos.Amon.r1i1p1.v20130207.tas_Amon_inmcm4_rcp85_r1i1p1_200601-210012.nc",
"institute": [
"INM"
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/esgf/search_results/Amon_r1i1p1_historical_FIO-ESM_CMIP5_tas.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
"format": [
"netCDF, CF-1.4"
],
"index_node": "esgf-index1.ceda.ac.uk",
"index_node": "esgf.ceda.ac.uk",
"instance_id": "cmip5.output1.FIO.FIO-ESM.historical.mon.atmos.Amon.r1i1p1.v20121010.tas_Amon_FIO-ESM_historical_r1i1p1_185001-200512.nc",
"institute": [
"FIO"
Expand Down
10 changes: 5 additions & 5 deletions tests/integration/esgf/search_results/Amon_r1i1p1_rcp85_HadGEM2-CC_CMIP5_tas.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -991,7 +991,7 @@
"format": [
"netCDF, CF-1.4"
],
"index_node": "esgf-index1.ceda.ac.uk",
"index_node": "esgf.ceda.ac.uk",
"instance_id": "cmip5.output1.MOHC.HadGEM2-CC.rcp85.mon.atmos.Amon.r1i1p1.v20120531.tas_Amon_HadGEM2-CC_rcp85_r1i1p1_200512-203011.nc_1",
"institute": [
"MOHC"
Expand Down Expand Up @@ -1167,7 +1167,7 @@
"format": [
"netCDF, CF-1.4"
],
"index_node": "esgf-index1.ceda.ac.uk",
"index_node": "esgf.ceda.ac.uk",
"instance_id": "cmip5.output1.MOHC.HadGEM2-CC.rcp85.mon.atmos.Amon.r1i1p1.v20120531.tas_Amon_HadGEM2-CC_rcp85_r1i1p1_203012-205511.nc_1",
"institute": [
"MOHC"
Expand Down Expand Up @@ -1343,7 +1343,7 @@
"format": [
"netCDF, CF-1.4"
],
"index_node": "esgf-index1.ceda.ac.uk",
"index_node": "esgf.ceda.ac.uk",
"instance_id": "cmip5.output1.MOHC.HadGEM2-CC.rcp85.mon.atmos.Amon.r1i1p1.v20120531.tas_Amon_HadGEM2-CC_rcp85_r1i1p1_205512-208011.nc_1",
"institute": [
"MOHC"
Expand Down Expand Up @@ -1519,7 +1519,7 @@
"format": [
"netCDF, CF-1.4"
],
"index_node": "esgf-index1.ceda.ac.uk",
"index_node": "esgf.ceda.ac.uk",
"instance_id": "cmip5.output1.MOHC.HadGEM2-CC.rcp85.mon.atmos.Amon.r1i1p1.v20120531.tas_Amon_HadGEM2-CC_rcp85_r1i1p1_208012-209912.nc_1",
"institute": [
"MOHC"
Expand Down Expand Up @@ -1695,7 +1695,7 @@
"format": [
"netCDF, CF-1.4"
],
"index_node": "esgf-index1.ceda.ac.uk",
"index_node": "esgf.ceda.ac.uk",
"instance_id": "cmip5.output1.MOHC.HadGEM2-CC.rcp85.mon.atmos.Amon.r1i1p1.v20120531.tas_Amon_HadGEM2-CC_rcp85_r1i1p1_210001-210012.nc",
"institute": [
"MOHC"
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/config/test_esgf_pyclient.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
},
'search_connection': {
'urls': [
'https://esgf-index1.ceda.ac.uk/esg-search',
'https://esgf.ceda.ac.uk/esg-search',
'https://esgf-node.llnl.gov/esg-search',
'https://esgf-data.dkrz.de/esg-search',
'https://esgf-node.ipsl.upmc.fr/esg-search',
Expand Down
4 changes: 2 additions & 2 deletions tests/unit/esgf/test_search.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ def get_mock_connection(mocker, search_results):
cfg = {
'search_connection': {
'urls': [
'https://esgf-index1.example.com/esg-search',
'https://esgf.ceda.ac.uk/esg-search',
Comment thread
bouweandela marked this conversation as resolved.
Outdated
'https://esgf-index2.example.com/esg-search',
]
},
Expand Down Expand Up @@ -208,7 +208,7 @@ def test_esgf_search_files(mocker):
files = _search.esgf_search_files(facets)

SearchConnection.assert_called_once_with(
url='https://esgf-index1.example.com/esg-search')
url='https://esgf.ceda.ac.uk/esg-search')
Comment thread
bouweandela marked this conversation as resolved.
Outdated
Comment thread
valeriupredoi marked this conversation as resolved.
Outdated
connection = SearchConnection.return_value
connection.new_context.assert_called_with(
pyesgf.search.context.FileSearchContext,
Expand Down