From f1d1b0b15eaefe95f824cd52d8e67f6b0dc54ae3 Mon Sep 17 00:00:00 2001 From: rowan04 Date: Tue, 22 Nov 2022 11:23:49 +0000 Subject: [PATCH 1/6] Update the example READ API output for get_cert's and get_downtime's files --- api/read/get_cert_status_changes/index.md | 6 +++--- api/read/get_cert_status_date/index.md | 6 +++--- api/read/get_downtime/index.md | 12 +++++------ .../get_downtime_nested_services/index.md | 20 +++++++++---------- api/read/get_downtime_to_broadcast/index.md | 12 +++++------ 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/api/read/get_cert_status_changes/index.md b/api/read/get_cert_status_changes/index.md index fc254b1..2729363 100644 --- a/api/read/get_cert_status_changes/index.md +++ b/api/read/get_cert_status_changes/index.md @@ -14,7 +14,7 @@ | Parameters | Effect | Format/Value(s) | Default | Example | | - | - | - | - | - | -| `site` | Only return info for site with specified site name | any site name | `all` | `?method=get_cert_status_changes&site=RAL-LCG2` | +| `site` | Only return info for site with specified site name | any site name | `all` | `?method=get_cert_status_changes&site=Izola MRF` | | `startdate` | Limit results to changes that start after specified date | date in `YYYY-MM-DD` format | none | `?method=get_cert_status_changes&startdate=2022-03-15` | | `enddate` | limit results to changes that end before specified date | date in `YYYY-MM-DD` format | none | `?method=get_cert_status_changes&enddate=2022-03-25` | @@ -31,10 +31,10 @@ This method optionally supports paging, to iterate over all results, 1663060886 - GRIDOPS-GOCDB + Izola MRF Uncertified Certified - /C=UK/O=eScience/OU=CLRC/L=RAL/CN=example user + /C=UK/O=eScience/OU=CLRC/L=RAL/CN=Gwei Jai Site is ready diff --git a/api/read/get_cert_status_date/index.md b/api/read/get_cert_status_date/index.md index e2164c0..cbf3ab9 100644 --- a/api/read/get_cert_status_date/index.md +++ b/api/read/get_cert_status_date/index.md @@ -15,7 +15,7 @@ | Parameters | Effect | Format/Value(s) | Default | Example | | - | - | - | - | - | | `certification_status` | Limit results to sites with given certification status | one of `Candidate`, `Uncertified`, `Certified`, `Closed`, `Suspended` | `all` | `?method=get_site&certification_status=Certified` | -| `roc` | Limit results to given NGI | any NGI name | `all` | `?method=get_roc_list&roc=NGI_DE` | +| `roc` | Limit results to given NGI | any NGI name | `all` | `?method=get_roc_list&roc=NGI_SI` | ### Paging @@ -27,8 +27,8 @@ This method optionally supports paging, to iterate over all results, ```xml - - GRIDOPS-GOCDB + + Izola MRF Closed 14-Jun-22 15.51.32 PM diff --git a/api/read/get_downtime/index.md b/api/read/get_downtime/index.md index 0151d3c..510f688 100644 --- a/api/read/get_downtime/index.md +++ b/api/read/get_downtime/index.md @@ -34,12 +34,12 @@ This method optionally supports paging, to iterate over all results, ```xml - - 113653G0 - host.example.com - egi.GOCDB - endpoint.example.stfc.ac.uk - GRIDOPS-GOCDB + + 119G0 + izolamrf.co.si + Site-BDII + bdii4.izolamrf.si + Izola MRF /portal/index.php?Page_Type=Downtime&id=32578 WARNING diff --git a/api/read/get_downtime_nested_services/index.md b/api/read/get_downtime_nested_services/index.md index 38aac03..c417aa6 100644 --- a/api/read/get_downtime_nested_services/index.md +++ b/api/read/get_downtime_nested_services/index.md @@ -45,19 +45,19 @@ This method optionally supports paging, to iterate over all results, /index.php?Page_Type=Downtime&id=32578 - 3180G0 - host.example.com - egi.GOCDB - gocdb.host.example.com - GRIDOPS-GOCDB + 119G0 + bdii.ipb.ac.rs + Top-BDII + gocdb.bdii.ipb.ac.rs + Izola MRF - 3190G0 - host2.example.com - egi.GOCDB - gocdb2.host.example.com - GRIDOPS-GOCDB + 119G0 + voms.ipb.ac.rs + VOMS + gocdb.voms.ipb.ac.rs + Izola MRF diff --git a/api/read/get_downtime_to_broadcast/index.md b/api/read/get_downtime_to_broadcast/index.md index fe5a12d..6654a80 100644 --- a/api/read/get_downtime_to_broadcast/index.md +++ b/api/read/get_downtime_to_broadcast/index.md @@ -28,12 +28,12 @@ This method optionally supports paging, to iterate over all results, ```xml - - 113968G0 - GRIDOPS-GOCDB - example.stfc.ac.uk - egi.GOCDB - GRIDOPS-GOCDB + + 119G0 + Izola MRF + izolamrf.co.si + bdii4.izolamrf.si + Izola MRF /portal/index.php?Page_Type=Downtime&id=32893 WARNING From facd7ad3b40bd5b8cabc2437db8459481fb2ee00 Mon Sep 17 00:00:00 2001 From: rowan04 Date: Tue, 22 Nov 2022 11:56:36 +0000 Subject: [PATCH 2/6] Update example READ API output for get_user, get_ngi, get_project_contacts and get_roc's --- api/read/get_ngi/index.md | 29 +++++----- api/read/get_project_contacts/index.md | 16 +++--- api/read/get_roc_contacts/index.md | 42 +++++++-------- api/read/get_roc_list/index.md | 4 +- api/read/get_user/index.md | 74 ++++++++++++-------------- 5 files changed, 78 insertions(+), 87 deletions(-) diff --git a/api/read/get_ngi/index.md b/api/read/get_ngi/index.md index c2f0d53..5e87460 100644 --- a/api/read/get_ngi/index.md +++ b/api/read/get_ngi/index.md @@ -14,8 +14,8 @@ | Parameters | Effect | Format/Value(s) | Default | Example | | - | - | - | - | - | -| `roc` | Limit results to sites belonging to given NGI | any NGI name | `all` | `?method=get_site&roc=NGI_DE` | -| `scope` | Show only sites with the requested scope tags | A comma separated list of scope-tag values or an empty value to return all scopes, i.e. `&scope=` | instance dependant | `?method=get_site&scope=Local` | +| `roc` | Limit results to sites belonging to given NGI | any NGI name | `all` | `?method=get_site&roc=NGI_SI` | +| `scope` | Show only sites with the requested scope tags | A comma separated list of scope-tag values or an empty value to return all scopes, i.e. `&scope=` | instance dependant | `?method=get_site&scope=EGI` | | `scope_match` | Match `all` or `any` of the specified scope-tags | `all` or `any` | `all` | `?method=get_site&scope=Local,EGI&scope_match=any` | ### Paging @@ -28,20 +28,17 @@ This method optionally supports paging, to iterate over all results, ```xml - - 35 - NGI_UK - 35 - United Kingdom NGI - email@example.com - NGI_UK - email@example.com - - email@example.com - 60 - - EGI - + + 94735D8 + NGI_SI + 11463 + An NGI based in Slovenia. + ngi-si-contact@swing-grid.si + + + ngi-si-helpdesk@swing-grid.si + ngi-si-security@swing-grid.si + 4 diff --git a/api/read/get_project_contacts/index.md b/api/read/get_project_contacts/index.md index c8f9cd0..c13bf3b 100644 --- a/api/read/get_project_contacts/index.md +++ b/api/read/get_project_contacts/index.md @@ -27,18 +27,18 @@ This method optionally supports paging, to iterate over all results, - - Example - User - Mr - example.user@stfc.ac.uk - +00 (0) 0000 000000 + + Gwei + Jai + + Gwei.Jai@izolamrf.si + +44 040 3636 3600 - /C=UK/O=eScience/OU=CLRC/L=RAL/CN=example user + /C=UK/O=eScience/OU=CLRC/L=RAL/CN=Gwei Jai - EGI CSIRT Officer + Site Operations Manager diff --git a/api/read/get_roc_contacts/index.md b/api/read/get_roc_contacts/index.md index a5d0693..53088f9 100644 --- a/api/read/get_roc_contacts/index.md +++ b/api/read/get_roc_contacts/index.md @@ -14,7 +14,7 @@ | Parameters | Effect | Format/Value(s) | Default | Example | | - | - | - | - | - | -| `roc` | Limit results to given NGI | any NGI name | `all` | `?method=get_roc_list&roc=NGI_DE` | +| `roc` | Limit results to given NGI | any NGI name | `all` | `?method=get_roc_list&roc=NGI_SI` | ### Paging @@ -26,31 +26,31 @@ This method optionally supports paging, to iterate over all results, ```xml - - EGI.eu - example@egi.eu - /portal/index.php?Page_Type=NGI&id=4 - - Example - User + + NGI_SI + ngi-si-contact@swing-grid.si + /portal/index.php?Page_Type=NGI&id=11463 + + Gwei + Jai - <EMAIL>example.user@stfc.ac.uk</EMAIL> - <TEL>+00 (0) 0000 000000</TEL> - <CERTDN>/C=UK/O=eScience/OU=CLRC/L=RAL/CN=example user</CERTDN> - <EGICHECKIN/> + <EMAIL>Gwei.Jai@izolamrf.si</EMAIL> + <TEL>+44 040 3636 3600</TEL> + <CERTDN>/C=UK/O=eScience/OU=CLRC/L=RAL/CN=Gwei Jai</CERTDN> + <EGICHECKIN>alphanumeric@egi.eu</EGICHECKIN> <IRISIAM/> - <ROLE_NAME>Regional Staff (ROD)</ROLE_NAME> + <ROLE_NAME>Site Operations Manager</ROLE_NAME> </CONTACT> - <CONTACT USER_ID="6079G0" PRIMARY_KEY="6079G0"> - <FORENAME>Example</FORENAME> - <SURNAME>User</SURNAME> - <TITLE>Dr - example.user@stfc.ac.uk - + + Yuki + Tsunoda + + Yuki.Tsunoda@izolamrf.si + +49 432 0030 8324 - alphanumeric@egi.eu + - Regional Staff (ROD) + Chief Operations Officer diff --git a/api/read/get_roc_list/index.md b/api/read/get_roc_list/index.md index 9e9a234..424c912 100644 --- a/api/read/get_roc_list/index.md +++ b/api/read/get_roc_list/index.md @@ -14,7 +14,7 @@ | Parameters | Effect | Format/Value(s) | Default | Example | | - | - | - | - | - | -| `roc` | Limit results to given NGI | any NGI name | `all` | `?method=get_roc_list&roc=NGI_DE` | +| `roc` | Limit results to given NGI | any NGI name | `all` | `?method=get_roc_list&roc=NGI_SI` | ### Paging @@ -25,6 +25,6 @@ This method does not support paging. ```xml - + ``` diff --git a/api/read/get_user/index.md b/api/read/get_user/index.md index ab994b6..8469667 100644 --- a/api/read/get_user/index.md +++ b/api/read/get_user/index.md @@ -14,11 +14,11 @@ | Parameters | Effect | Format/Value(s) | Default | Example | | - | - | - | - | - | -| `dn` | Limit results to user with given certificate DN | DN in standard string chain format | `all` | `?method=get_user&dn=/C=UK/O=eScience/OU=CLRC/L=RAL/CN=example user` | -| `dnlike` | Limit results to user with certificate that matches given wildcard | Search string (SQL syntax) | `all` | `?method=get_user&dnlike=%/OU=ngi.org%` | -| `forename` | Limit results to user(s) with given forename | any string | `all` | `?method=get_user&forename=Robert` | -| `surname` | Limit results to user(s) with given surname | any string | `all` | `?method=get_user&surname=Smith` | -| `roletype` | Limit results to user(s) with the specified role type(s) | single or comma separated list of role types (multiple roles are combined using OR) | `all` | `?method=get_user&roletype=EGI CSIRT Officer,Chief Operations Officer` | +| `dn` | Limit results to user with given certificate DN | DN in standard string chain format | `all` | `?method=get_user&dn=/C=UK/O=eScience/OU=CLRC/L=RAL/CN=Gwei Jai` | +| `dnlike` | Limit results to user with certificate that matches given wildcard | Search string (SQL syntax) | `all` | `?method=get_user&dnlike=%/OU=CLRC%` | +| `forename` | Limit results to user(s) with given forename | any string | `all` | `?method=get_user&forename=Gwei` | +| `surname` | Limit results to user(s) with given surname | any string | `all` | `?method=get_user&surname=Jai` | +| `roletype` | Limit results to user(s) with the specified role type(s) | single or comma separated list of role types (multiple roles are combined using OR) | `all` | `?method=get_user&roletype=CIC Staff,Site Operations Manager` | ### Paging @@ -30,41 +30,35 @@ This method optionally supports paging, to iterate over all results, ```xml - - Example - User - Mr - - /index.php?Page_Type=User&id=4533 - example.user@stfc.ac.uk - - - - /C=UK/O=eScience/OU=CLRC/L=RAL/CN=example user - alphanumeric@egi.eu - - - - - - - Site Security Officer - GRIDOPS-GOCDB - site - 140G0 - - EGI - - - Site Operations Manager - EOSC_Core_Topology - site - 113086G0 - - EOSCCore - - - + + Gwei + Jai + + + https://testing.host.com/portal/index.php?Page_Type=View_Object&object_id=6326&grid_id=0 + Gwei.Jai@izolamrf.si + +44 040 3636 3600 + + + /C=UK/O=eScience/OU=CLRC/L=RAL/CN=Gwei Jai + alphanumeric@egi.eu + + + + + + + + CIC Staff + NGI_SI + group + + Site Operations Manager + Site Operations Manager + NGI_SI + group + + ``` From 9816fe2c5819d7941e703839ba5662883c194c43 Mon Sep 17 00:00:00 2001 From: rowan04 Date: Wed, 23 Nov 2022 14:04:43 +0000 Subject: [PATCH 3/6] Update example read api output for get_site's and get_service's --- api/read/get_service/index.md | 50 ++++++++--------- api/read/get_service_group/index.md | 40 +++++++------- api/read/get_service_group_role/index.md | 24 ++++---- api/read/get_site/index.md | 58 ++++++++++---------- api/read/get_site_contacts/index.md | 48 ++++++++-------- api/read/get_site_count_per_country/index.md | 14 ++--- api/read/get_site_list/index.md | 10 ++-- api/read/get_site_security_info/index.md | 18 +++--- 8 files changed, 131 insertions(+), 131 deletions(-) diff --git a/api/read/get_service/index.md b/api/read/get_service/index.md index 8987567..a413437 100644 --- a/api/read/get_service/index.md +++ b/api/read/get_service/index.md @@ -15,13 +15,13 @@ | Parameters | Effect | Format/Value(s) | Default | Example | | - | - | - | - | - | -| `hostname` | Limit results to services hosted on node with given hostname | any host name | `all` | `?method=get_service_endpoint&hostname=dcache-tape.gridpp.rl.ac.uk` | -| `sitename` | Only return info for site with specified site name | any site name | `all` |`?method=get_site&sitename=RAL-LCG2` | -| `roc` | Limit results to sites belonging to given NGI | any NGI name | `all` | `?method=get_site&roc=NGI_DE` | -| `country` | Limit results to sites belonging to given country | any country | `all` | `?method=get_site&country=Poland` | +| `hostname` | Limit results to services hosted on node with given hostname | any host name | `all` | `?method=get_service_endpoint&hostname=bdii.ipb.ac.rs` | +| `sitename` | Only return info for site with specified site name | any site name | `all` |`?method=get_site&sitename=Izola MRF` | +| `roc` | Limit results to sites belonging to given NGI | any NGI name | `all` | `?method=get_site&roc=NGI_SI` | +| `country` | Limit results to sites belonging to given country | any country | `all` | `?method=get_site&country=Slovenia` | | `service_type` | Limit results to services of given type | any valid ServiceType | `all` | `?method=get_service_endpoint&service_type=CE` | | `monitored` | Limit results to services hosted on nodes that have monitoring turned on | `Y` or `N` | `all` | `?method=get_service_endpoint&monitored=Y` | -| `scope` | Show only sites with the requested scope tags | A comma separated list of scope-tag values or an empty value to return all scopes, i.e. `&scope=` | instance dependant | `?method=get_site&scope=Local` | +| `scope` | Show only sites with the requested scope tags | A comma separated list of scope-tag values or an empty value to return all scopes, i.e. `&scope=` | instance dependant | `?method=get_site&scope=EGI` | | `scope_match` | Match `all` or `any` of the specified scope-tags | `all` or `any` | `all` | `?method=get_site&scope=Local,EGI&scope_match=any` | | `extensions` | Limit results by one or many key value pairs | [See Extensions Mechanism](https://docs.egi.eu/internal/configuration-database/extension-properties/) | none | `?method=get_site&extensions=(KeyName=KeyValue)` | @@ -39,38 +39,38 @@ This method does not support paging. ```xml - - 4180G0 - gocdb.example.com - /portal/index.php?Page_Type=Service&id=4180 - /DC=org/DC=terena/DC=tcs/C=NL/L=Amsterdam/O=Stichting EGI/gocdb.example.com + + 3303G0 + bdii.ipb.ac.rs + /portal/index.php?Page_Type=Service&id=3303 + /DC=org/DC=terena/DC=tcs/C=NL/L=Amsterdam/O=Stichting EGI/bdii.ipb.ac.rs x86_64 N - egi.GOCDB + Top-BDII Y Y Y - GRIDOPS-GOCDB - United Kingdom - GB - EGI.eu - https://gocdb.example.com:443 + Izola MRF + Slovenia + SI + NGI_SI + http://www.izolamrf.co.si - 6313 - ProductionPortalInstance + 9980 + bdii4.izolamrf.si - https://gocdb.example.com/portal - egi.GOCDB.Portal - N + https://testing.host.com/portal/index.php?Page_Type=View_Object&object_id=9980&grid_id=0 + bdii4.izolamrf.si + Y - 6314 - Production PI base url + 9933 + ce01.izolamrf.si - https://gocdb.example.com/gocdbpi - egi.GOCDB.PI + https://testing.host.com/portal/index.php?Page_Type=View_Object&object_id=9933&grid_id=0 + ce01.izolamrf.si N diff --git a/api/read/get_service_group/index.md b/api/read/get_service_group/index.md index 79b44b5..fb126a7 100644 --- a/api/read/get_service_group/index.md +++ b/api/read/get_service_group/index.md @@ -14,8 +14,8 @@ | Parameters | Effect | Format/Value(s) | Default | Example | | - | - | - | - | - | -| `service_group_name` | Only return info for the service group with specified site name | any service group name | `all` | `?method=get_service_group&service_group_name=OPSTOOLS` | -| `scope` | Show only sites with the requested scope tags | A comma separated list of scope-tag values or an empty value to return all scopes, i.e. `&scope=` | instance dependant | `?method=get_site&scope=Local` | +| `service_group_name` | Only return info for the service group with specified site name | any service group name | `all` | `?method=get_service_group&service_group_name=Top-BDII` | +| `scope` | Show only sites with the requested scope tags | A comma separated list of scope-tag values or an empty value to return all scopes, i.e. `&scope=` | instance dependant | `?method=get_site&scope=EGI` | | `scope_match` | Match `all` or `any` of the specified scope-tags | `all` or `any` | `all` | `?method=get_site&scope=Local,EGI&scope_match=any` | | `extensions` | Limit results by one or many key value pairs | [See Extensions Mechanism](https://docs.egi.eu/internal/configuration-database/extension-properties/) | none | `?method=get_site&extensions=(KeyName=KeyValue)` | @@ -29,30 +29,30 @@ This method optionally supports paging, to iterate over all results, ```xml - - A_SERVICE_GROUP - A ServiceGroup - N - example.user@stfc.ac.uk - /portal/index.php?Page_Type=Service_Group&id=690 - - gocdb.example.com - /portal/index.php?Page_Type=Service&id=4180 - egi.GOCDB + + NGI_SI_SERVICES + NGI_SI Core Services + Y + ops@sling.si + >https://testing.host.com/portal/index.php?Page_Type=View_Object&object_id=119941&grid_id=0 + + bdii.ipb.ac.rs + https://testing.host.com/portal/index.php?Page_Type=View_Object&object_id=3303&grid_id=0 + Top-BDII - DC=org/DC=terena/DC=tcs/C=NL/L=Amsterdam/O=Stichting EGI/gocdb.example.com + DC=org/DC=terena/DC=tcs/C=NL/L=Amsterdam/O=Stichting EGI/bdii.ipb.ac.rs Y Y - 6313 - ProductionPortalInstance + 9980 + bdii4.izolamrf.si - /portal - egi.GOCDB.Portal - N - example.user@stfc.ac.uk + https://testing.host.com/portal/index.php?Page_Type=View_Object&object_id=9980&grid_id=0 + bdii4.izolamrf.si + Y + contact@izolamrf.co.si @@ -62,7 +62,7 @@ This method optionally supports paging, to iterate over all results, - Local + EGI diff --git a/api/read/get_service_group_role/index.md b/api/read/get_service_group_role/index.md index dc51aab..8d9cb13 100644 --- a/api/read/get_service_group_role/index.md +++ b/api/read/get_service_group_role/index.md @@ -14,8 +14,8 @@ | Parameters | Effect | Format/Value(s) | Default | Example | | - | - | - | - | - | -| `service_group_name` | Only return info for the service group with specified site name | any ServiceGroup name | `all` | `?method=get_service_group_role&service_group_name=OPSTOOLS` | -| `scope` | Show only sites with the requested scope tags | A comma separated list of scope-tag values or an empty value to return all scopes, i.e. `&scope=` | instance dependant | `?method=get_site&scope=Local` | +| `service_group_name` | Only return info for the service group with specified site name | any ServiceGroup name | `all` | `?method=get_service_group_role&service_group_name=Top-BDII` | +| `scope` | Show only sites with the requested scope tags | A comma separated list of scope-tag values or an empty value to return all scopes, i.e. `&scope=` | instance dependant | `?method=get_site&scope=EGI` | | `scope_match` | Match `all` or `any` of the specified scope-tags | `all` or `any` | `all` | `?method=get_site&scope=Local,EGI&scope_match=any` | ### Paging @@ -28,19 +28,19 @@ This method optionally supports paging, to iterate over all results, ```xml - - A_SERVICE_GROUP - A ServiceGroup - N - example.user@stfc.ac.uk - /portal/index.php?Page_Type=Service_Group&id=690 + + NGI_SI_SERVICES + NGI_SI Core Servicea + Y + ops@sling.si + https://testing.host.com/portal/index.php?Page_Type=View_Object&object_id=119941&grid_id=0 - Example - User - /C=UK/O=eScience/OU=CLRC/L=RAL/CN=example user + Dejan + Lesjak + /C=SI/O=SiGNET/O=IJS/OU=F9/CN=Dejan Lesjak - /index.php?Page_Type=User&id=1484 + https://testing.host.com/portal/index.php?Page_Type=View_Object&object_id=7729&grid_id=0 Service Group Administrator diff --git a/api/read/get_site/index.md b/api/read/get_site/index.md index ff3c0ba..877de9b 100644 --- a/api/read/get_site/index.md +++ b/api/read/get_site/index.md @@ -14,13 +14,13 @@ | Parameters | Effect | Format/Value(s) | Default | Example | | - | - | - | - | - | -| `sitename` | Only return info for site with specified site name | any site name | `all` | `?method=get_site&sitename=RAL-LCG2` | -| `roc` | Limit results to sites belonging to given NGI | any NGI name | `all` | `?method=get_site&roc=NGI_DE` | -| `country` | Limit results to sites belonging to given country | any country | `all` | `?method=get_site&country=Poland` | +| `sitename` | Only return info for site with specified site name | any site name | `all` | `?method=get_site&sitename=Izola MRF` | +| `roc` | Limit results to sites belonging to given NGI | any NGI name | `all` | `?method=get_site&roc=NGI_SI` | +| `country` | Limit results to sites belonging to given country | any country | `all` | `?method=get_site&country=Slovenia` | | `certification_status` | Limit results to sites with given certification status | one of `Candidate`, `Uncertified`, `Certified`, `Closed`, `Suspended` | `all` | `?method=get_site&certification_status=Certified` | | `exclude_certification_status` | Exclude from results sites with given certification status | one of `Candidate`, `Uncertified`, `Certified`, `Closed`, `Suspended` | none | `?method=get_site&exclude_certification_status=Closed` | | `production_status` | Limit results to sites within given production infrastructure | one of `Production` or `Test` | `all` | `?method=get_site&production_status=Production` | -| `scope` | Show only sites with the requested scope tags | A comma separated list of scope-tag values or an empty value to return all scopes, i.e. `&scope=` | instance dependant | `?method=get_site&scope=Local` | +| `scope` | Show only sites with the requested scope tags | A comma separated list of scope-tag values or an empty value to return all scopes, i.e. `&scope=` | instance dependant | `?method=get_site&scope=EGI` | | `scope_match` | Match `all` or `any` of the specified scope-tags | `all` or `any` | `all` | `?method=get_site&scope=Local,EGI&scope_match=any` | | `extensions` | Limit results by one or many key value pairs | [See Extensions Mechanism](https://docs.egi.eu/internal/configuration-database/extension-properties/) | none | `?method=get_site&extensions=(KeyName=KeyValue)` | @@ -34,34 +34,34 @@ This method optionally supports paging, to iterate over all results, ```xml - - 123G0 - GRIDOPS-GOCDB - Grid Operations Center Database Portal and Web Services - The GOCDB stores Grid topology and resource information for EGI including sites, services, downtimes and contact information. - /portal/index.php?Page_Type=Site&id=335 - https://example.stfc.ac.uk - example@mailman.egi.eu - +00 (0) 0000 000000 - GB - United Kingdom - EGI.eu - Production + + 119G0 + Izola MRF + Izola Marine Research Facility + Situated right on Slovenia's small coastline of the Adriatic Sea, the Izola Marine Research Facility is Slovenia's hub for all things ocean research. + https://testing.host.com/portal/index.php?Page_Type=View_Object&amp;object_id=119&amp;grid_id=0 + http://www.izolamrf.co.si + contact@izolamrf.si + +386 45 310 1393 + 3 + ldap://grid.izolamrf.si:0000/ds-vo-name=IzolaMRF,o=grid + Slovenia + Slovenia + NGI_SI + Test Certified - Europe/London - example@mailman.egi.eu - TRUE + Europe/Ljubljana + 45.541431 + 13.662742 + csirt@izolamrf.si + 0.0.0.0/255.255.255.255 + Izola, Slovenia + +386 41 000 2994 + help@izolamrf.si + EGI - example.stfc.ac.uk + izolamrf.si - 0.0.0.0/255.255.255.254 - - EGI - EOSC-hub - iris.ac.uk - EGICore - - ``` diff --git a/api/read/get_site_contacts/index.md b/api/read/get_site_contacts/index.md index 0aa4a66..2cc0c2b 100644 --- a/api/read/get_site_contacts/index.md +++ b/api/read/get_site_contacts/index.md @@ -14,11 +14,11 @@ | Parameters | Effect | Format/Value(s) | Default | Example | | - | - | - | - | - | -| `sitename` | Only return info for site with specified site name | any site name | `all` | `?method=get_site_contacts&sitename=RAL-LCG2` | -| `roc` | Limit results to sites belonging to given NGI | any NGI name | `all` | `?method=get_site_contacts&roc=NGI_DE` | -| `country` | Limit results to sites belonging to given country | any country | `all` | `?method=get_site_contacts&country=Poland` | +| `sitename` | Only return info for site with specified site name | any site name | `all` | `?method=get_site_contacts&sitename=Izola MRF` | +| `roc` | Limit results to sites belonging to given NGI | any NGI name | `all` | `?method=get_site_contacts&roc=NGI_SI` | +| `country` | Limit results to sites belonging to given country | any country | `all` | `?method=get_site_contacts&country=Slovenia` | | `roletype` | Only include CONTACTS with the given role | any valid role type | `all` | `?method=get_site_contacts&roletype=Site Security Officer` | -| `scope` | Show only sites with the requested scope tags | A comma separated list of scope-tag values or an empty value to return all scopes, i.e. `&scope=` | instance dependant |  `?method=get_site&scope=Local` | +| `scope` | Show only sites with the requested scope tags | A comma separated list of scope-tag values or an empty value to return all scopes, i.e. `&scope=` | instance dependant |  `?method=get_site&scope=EGI` | | `scope_match` | Match `all` or `any` of the specified scope-tags | `all` or `any` | `all` | `?method=get_site_contacts&scope=Local,EGI&scope_match=any` | ### Paging @@ -31,30 +31,30 @@ This method optionally supports paging, to iterate over all results, ```xml - - 123G0 - GRIDOPS-GOCDB - - Example - User - Mr - example.user@stfc.ac.uk - - /C=UK/O=eScience/OU=CLRC/L=RAL/CN=example user + + 119G0 + Izola MRF + + Gwei + Jai + + Gwei.Jai@izolamrf.si + +44 040 3636 3600 + /C=UK/O=eScience/OU=CLRC/L=RAL/CN=Gwei Jai alphanumeric@egi.eu - Site Administrator + Site Operations Manager - - Example - User - Mr - example.user@stfc.ac.uk - - /C=UK/O=eScience/OU=CLRC/L=RAL/CN=example user - alphanumeric@egi.eu + + Yuki + Tsunoda + + Yuki.Tsunoda@izolamrf.si + +49 432 0030 8324 + /C=UK/O=eScience/OU=CLRC/L=RAL/CN=Yuki Tsunoda + - Site Operations Manager + Chief Operations Officer diff --git a/api/read/get_site_count_per_country/index.md b/api/read/get_site_count_per_country/index.md index e8a39d8..2f24684 100644 --- a/api/read/get_site_count_per_country/index.md +++ b/api/read/get_site_count_per_country/index.md @@ -16,7 +16,7 @@ | - | - | - | - | - | | `certification_status` | one of `Candidate`, `Uncertified`, `Certified`, `Closed`, `Suspended` | none | `?method=get_site&exclude_certification_status=Closed` | | `production_status` | Limit results to sites within given production infrastructure | one of `Production` or `Test` | `all` | `?method=get_site&production_status=Production` | -| `scope` | Show only sites with the requested scope tags | A comma separated list of scope-tag values or an empty value to return all scopes, i.e. `&scope=` | instance dependant | `?method=get_site&scope=Local` | +| `scope` | Show only sites with the requested scope tags | A comma separated list of scope-tag values or an empty value to return all scopes, i.e. `&scope=` | instance dependant | `?method=get_site&scope=EGI` | ### Paging @@ -28,16 +28,16 @@ This method does not support paging. - Afghanistan - 0 + Hungary + 6 - Albania - 0 + Slovenia + 4 - Algeria - 2 + Switzerland + 8 ``` diff --git a/api/read/get_site_list/index.md b/api/read/get_site_list/index.md index 3a71c0a..75815a9 100644 --- a/api/read/get_site_list/index.md +++ b/api/read/get_site_list/index.md @@ -14,13 +14,13 @@ | Parameters | Effect | Format/Value(s) | Default | Example | | - | - | - | - | - | -| `sitename` | Only return info for site with specified site name | any site name | `all` | `?method=get_site_list&sitename=RAL-LCG2` | -| `roc` | Limit results to sites belonging to given NGI | any NGI name | `all` | `?method=get_site_list&roc=NGI_DE` | -| `country` | Limit results to sites belonging to given country | any country | `all` | `?method=get_site_list&country=Poland` | +| `sitename` | Only return info for site with specified site name | any site name | `all` | `?method=get_site_list&sitename=Izola MRF` | +| `roc` | Limit results to sites belonging to given NGI | any NGI name | `all` | `?method=get_site_list&roc=NGI_SI` | +| `country` | Limit results to sites belonging to given country | any country | `all` | `?method=get_site_list&country=Slovenia` | | `certification_status` | Limit results to sites with given certification status | one of `Candidate`, `Uncertified`, `Certified`, `Closed`, `Suspended` | `all` |  `?method=get_site&certification_status=Certified` | | `exclude_certification_status` | Exclude from results sites with given certification status | one of `Candidate`, `Uncertified`, `Certified`, `Closed`, `Suspended` | none |  `?method=get_site&exclude_certification_status=Closed` | | `production_status` | Limit results to sites within given production infrastructure | one of `Production` or `Test` | `all` |  `?method=get_site&production_status=Production` | -| `scope` | Show only sites with the requested scope tags | A comma separated list of scope-tag values or an empty value to return all scopes, i.e. `&scope=` | instance dependant |  `?method=get_site&scope=Local` | +| `scope` | Show only sites with the requested scope tags | A comma separated list of scope-tag values or an empty value to return all scopes, i.e. `&scope=` | instance dependant |  `?method=get_site&scope=EGI` | | `scope_match` | Match `all` or `any` of the specified scope-tags | `all` or `any` | `all` |  `?method=get_site_list&scope=Local,EGI&scope_match=any` | | `extensions` | Limit results by one or many key value pairs | [See Extensions Mechanism](https://docs.egi.eu/internal/configuration-database/extension-properties/) | none |  `?method=get_site&extensions=(KeyName=KeyValue)` | @@ -33,6 +33,6 @@ This method does not support paging. ```xml - + ``` diff --git a/api/read/get_site_security_info/index.md b/api/read/get_site_security_info/index.md index 64bfada..3cca909 100644 --- a/api/read/get_site_security_info/index.md +++ b/api/read/get_site_security_info/index.md @@ -14,13 +14,13 @@ | Parameters | Effect | Format/Value(s) | Default | Example | | - | - | - | - | - | -| `sitename` | Only return info for site with specified site name | any site name | `all` | `?method=get_site_security_info&sitename=RAL-LCG2` | -| `roc` | Limit results to sites belonging to given NGI | any NGI name | `all` | `?method=get_site_security_info&roc=NGI_DE` | -| `country` | Limit results to sites belonging to given country | any country | `all` | `?method=get_site_security_info&country=Poland` | +| `sitename` | Only return info for site with specified site name | any site name | `all` | `?method=get_site_security_info&sitename=Izola MRF` | +| `roc` | Limit results to sites belonging to given NGI | any NGI name | `all` | `?method=get_site_security_info&roc=NGI_SI` | +| `country` | Limit results to sites belonging to given country | any country | `all` | `?method=get_site_security_info&country=Slovenia` | | `certification_status` | Limit results to sites with given certification status | one of `Candidate`, `Uncertified`, `Certified`, `Closed`, `Suspended` | `all` | `?method=get_site&certification_status=Certified` | | `exclude_certification_status` | Exclude from results sites with given certification status | one of `Candidate`, `Uncertified`, `Certified`, `Closed`, `Suspended` | none | `?method=get_site&exclude_certification_status=Closed` | | `production_status` | Limit results to sites within given production infrastructure | one of `Production` or `Test` | `all` | `?method=get_site&production_status=Production` | -| `scope` | Show only sites with the requested scope tags | A comma separated list of scope-tag values or an empty value to return all scopes, i.e. `&scope=` | instance dependant | `?method=get_site&scope=Local` | +| `scope` | Show only sites with the requested scope tags | A comma separated list of scope-tag values or an empty value to return all scopes, i.e. `&scope=` | instance dependant | `?method=get_site&scope=EGI` | | `scope_match` | Match 'all' or 'any' of the specified scope-tags | 'all' or 'any' | `all` | `?method=get_site_security_info&scope=Local,EGI&scope_match=any` | ### Paging @@ -32,11 +32,11 @@ This method does not support paging. ```xml - - 123G0 - GRIDOPS-GOCDB - example@mailman.egi.eu - +00 (0) 0000 000000 + + 119G0 + Izola MRF + csirt@izolamrf.si + +386 41 000 2994 ``` From fb0d9e1381a13f845a912bfe06991a7fa990b6a7 Mon Sep 17 00:00:00 2001 From: rowan04 Date: Tue, 3 Jan 2023 15:01:13 +0000 Subject: [PATCH 4/6] Add code to escape ampersands - add amp; after two ampersands to escape them --- api/read/get_roc_contacts/index.md | 2 +- api/read/get_service/index.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/api/read/get_roc_contacts/index.md b/api/read/get_roc_contacts/index.md index 53088f9..592d8cb 100644 --- a/api/read/get_roc_contacts/index.md +++ b/api/read/get_roc_contacts/index.md @@ -29,7 +29,7 @@ This method optionally supports paging, to iterate over all results, NGI_SI ngi-si-contact@swing-grid.si - /portal/index.php?Page_Type=NGI&id=11463 + /portal/index.php?Page_Type=NGI&id=11463 Gwei Jai diff --git a/api/read/get_service/index.md b/api/read/get_service/index.md index a413437..cb748b3 100644 --- a/api/read/get_service/index.md +++ b/api/read/get_service/index.md @@ -42,7 +42,7 @@ This method does not support paging. 3303G0 bdii.ipb.ac.rs - /portal/index.php?Page_Type=Service&id=3303 + /portal/index.php?Page_Type=Service&id=3303 /DC=org/DC=terena/DC=tcs/C=NL/L=Amsterdam/O=Stichting EGI/bdii.ipb.ac.rs x86_64 N From b80b83040348925e8effc49e3c9419bedb10b1ad Mon Sep 17 00:00:00 2001 From: rowan04 Date: Tue, 21 Feb 2023 10:44:30 +0000 Subject: [PATCH 5/6] Update example READ API output to ensure it reflects the newly updated sample data - each example api output is now a copy paste from the output of the relevant API endpoint on an instance loaded with the newly updated sample data - only one-two results included in the example output as that is all that is necessary to understand the output - some endpoints don't have data populated by the sample data, like get_downtime --- api/read/get_cert_status_date/index.md | 7 +-- api/read/get_ngi/index.md | 10 ++-- api/read/get_project_contacts/index.md | 21 +++++-- api/read/get_roc_contacts/index.md | 30 +++++----- api/read/get_roc_list/index.md | 4 +- api/read/get_service/index.md | 53 ++++++++--------- api/read/get_service_group/index.md | 38 ++---------- api/read/get_service_group_role/index.md | 21 ++----- api/read/get_service_types/index.md | 6 +- api/read/get_site/index.md | 52 ++++++++--------- api/read/get_site_contacts/index.md | 34 +++++------ api/read/get_site_list/index.md | 5 +- api/read/get_site_security_info/index.md | 2 +- api/read/get_user/index.md | 73 ++++++++++++++---------- 14 files changed, 167 insertions(+), 189 deletions(-) diff --git a/api/read/get_cert_status_date/index.md b/api/read/get_cert_status_date/index.md index cbf3ab9..8878444 100644 --- a/api/read/get_cert_status_date/index.md +++ b/api/read/get_cert_status_date/index.md @@ -27,10 +27,9 @@ This method optionally supports paging, to iterate over all results, ```xml - - Izola MRF - Closed - 14-Jun-22 15.51.32 PM + + Torch + Certified ``` diff --git a/api/read/get_ngi/index.md b/api/read/get_ngi/index.md index 5e87460..2b04a4d 100644 --- a/api/read/get_ngi/index.md +++ b/api/read/get_ngi/index.md @@ -28,10 +28,10 @@ This method optionally supports paging, to iterate over all results, ```xml - - 94735D8 + + 3 NGI_SI - 11463 + 3 An NGI based in Slovenia. ngi-si-contact@swing-grid.si @@ -39,7 +39,9 @@ This method optionally supports paging, to iterate over all results, ngi-si-helpdesk@swing-grid.si ngi-si-security@swing-grid.si 4 + + EGI + - ``` diff --git a/api/read/get_project_contacts/index.md b/api/read/get_project_contacts/index.md index c13bf3b..3c49486 100644 --- a/api/read/get_project_contacts/index.md +++ b/api/read/get_project_contacts/index.md @@ -27,18 +27,27 @@ This method optionally supports paging, to iterate over all results, - + Gwei Jai - + <EMAIL>Gwei.Jai@izolamrf.si</EMAIL> <TEL>+44 040 3636 3600</TEL> <WORKING_HOURS_START/> <WORKING_HOURS_END/> - <CERTDN>/C=UK/O=eScience/OU=CLRC/L=RAL/CN=Gwei Jai</CERTDN> - <EGICHECKIN/> - <IRISIAM/> - <ROLE_NAME>Site Operations Manager</ROLE_NAME> + <CERTDN>/C=00/O=00000/OU=000000/CN=Gwei Jai</CERTDN> + <ROLE_NAME>COD Staff</ROLE_NAME> + </CONTACT> + <CONTACT USER_ID="9G0" PRIMARY_KEY="9G0"> + <FORENAME>G</FORENAME> + <SURNAME>Wiz</SURNAME> + <TITLE/> + <EMAIL>G.Wiz@brunnengs.ch</EMAIL> + <TEL>+44 220 4244 4335</TEL> + <WORKING_HOURS_START/> + <WORKING_HOURS_END/> + <CERTDN>/C=00/O=00000/OU=000000/CN=G Wiz</CERTDN> + <ROLE_NAME>COD Staff</ROLE_NAME> </CONTACT> </Project> </results> diff --git a/api/read/get_roc_contacts/index.md b/api/read/get_roc_contacts/index.md index 592d8cb..c1c8a45 100644 --- a/api/read/get_roc_contacts/index.md +++ b/api/read/get_roc_contacts/index.md @@ -26,31 +26,27 @@ This method optionally supports paging, to iterate over all results, ```xml <?xml version="1.0" encoding="UTF-8"?> <results> - <ROC ID="11463" ROC_NAME="NGI_SI"> + <ROC ID="3" ROC_NAME="NGI_SI"> <ROCNAME>NGI_SI</ROCNAME> <MAIL_CONTACT>ngi-si-contact@swing-grid.si</MAIL_CONTACT> - <GOCDB_PORTAL_URL>/portal/index.php?Page_Type=NGI&id=11463</GOCDB_PORTAL_URL> - <CONTACT USER_ID="4322" PRIMARY_KEY="4523G0"> + <GOCDB_PORTAL_URL>https://localhost/portal/index.php?Page_Type=NGI&id=3</GOCDB_PORTAL_URL> + <CONTACT USER_ID="8G0" PRIMARY_KEY="8G0"> <FORENAME>Gwei</FORENAME> <SURNAME>Jai</SURNAME> <TITLE/> <EMAIL>Gwei.Jai@izolamrf.si</EMAIL> <TEL>+44 040 3636 3600</TEL> - <CERTDN>/C=UK/O=eScience/OU=CLRC/L=RAL/CN=Gwei Jai</CERTDN> - <EGICHECKIN>alphanumeric@egi.eu</EGICHECKIN> - <IRISIAM/> - <ROLE_NAME>Site Operations Manager</ROLE_NAME> + <CERTDN>/C=00/O=00000/OU=000000/CN=Gwei Jai</CERTDN> + <ROLE_NAME>Regional Staff (ROD)</ROLE_NAME> </CONTACT> - <CONTACT USER_ID="468344" PRIMARY_KEY="22434G0"> - <FORENAME>Yuki</FORENAME> - <SURNAME>Tsunoda</SURNAME> - <TITLE> - Yuki.Tsunoda@izolamrf.si - +49 432 0030 8324 - - - - Chief Operations Officer + + Dante + Meloni + + <EMAIL>Dante.Meloni@ssc.si</EMAIL> + <TEL>+01 040 0331 3231</TEL> + <CERTDN>/C=00/O=00000/OU=000000/CN=Dante Meloni</CERTDN> + <ROLE_NAME>Regional Staff (ROD)</ROLE_NAME> </CONTACT> </ROC> </results> diff --git a/api/read/get_roc_list/index.md b/api/read/get_roc_list/index.md index 424c912..2b7a082 100644 --- a/api/read/get_roc_list/index.md +++ b/api/read/get_roc_list/index.md @@ -25,6 +25,8 @@ This method does not support paging. ```xml <?xml version="1.0" encoding="UTF-8"?> <results> - <ROC PRIMARY_KEY="94735D8" ROC_NAME="NGI_SI"/> + <ROC PRIMARY_KEY="2G0" ROC_NAME="NGI_CH"/> + <ROC PRIMARY_KEY="3G0" ROC_NAME="NGI_SI"/> + <ROC PRIMARY_KEY="4G0" ROC_NAME="NGI_HU"/> </results> ``` diff --git a/api/read/get_service/index.md b/api/read/get_service/index.md index cb748b3..c063e5c 100644 --- a/api/read/get_service/index.md +++ b/api/read/get_service/index.md @@ -19,7 +19,7 @@ | `sitename` | Only return info for site with specified site name | any site name | `all` |`?method=get_site&sitename=Izola MRF` | | `roc` | Limit results to sites belonging to given NGI | any NGI name | `all` | `?method=get_site&roc=NGI_SI` | | `country` | Limit results to sites belonging to given country | any country | `all` | `?method=get_site&country=Slovenia` | -| `service_type` | Limit results to services of given type | any valid ServiceType | `all` | `?method=get_service_endpoint&service_type=CE` | +| `service_type` | Limit results to services of given type | any valid ServiceType | `all` | `?method=get_service_endpoint&service_type=ARC-CE` | | `monitored` | Limit results to services hosted on nodes that have monitoring turned on | `Y` or `N` | `all` | `?method=get_service_endpoint&monitored=Y` | | `scope` | Show only sites with the requested scope tags | A comma separated list of scope-tag values or an empty value to return all scopes, i.e. `&scope=` | instance dependant | `?method=get_site&scope=EGI` | | `scope_match` | Match `all` or `any` of the specified scope-tags | `all` or `any` | `all` | `?method=get_site&scope=Local,EGI&scope_match=any` | @@ -39,44 +39,37 @@ This method does not support paging. ```xml <?xml version="1.0" encoding="UTF-8"?> <results> - <SERVICE_ENDPOINT PRIMARY_KEY="3303G0"> - <PRIMARY_KEY>3303G0</PRIMARY_KEY> - <HOSTNAME>bdii.ipb.ac.rs</HOSTNAME> - <GOCDB_PORTAL_URL>/portal/index.php?Page_Type=Service&id=3303</GOCDB_PORTAL_URL> - <HOSTDN>/DC=org/DC=terena/DC=tcs/C=NL/L=Amsterdam/O=Stichting EGI/bdii.ipb.ac.rs</HOSTDN> - <HOST_ARCH>x86_64</HOST_ARCH> + <SERVICE_ENDPOINT PRIMARY_KEY="1G0"> + <PRIMARY_KEY>1G0</PRIMARY_KEY> + <HOSTNAME>lodur.torchit.ch</HOSTNAME> + <GOCDB_PORTAL_URL>https://localhost/portal/index.php?Page_Type=Service&id=1</GOCDB_PORTAL_URL> + <HOSTDN>/DC=com/DC=quovadisglobal/DC=grid/DC=Torch/DC=hosts/C=CH/ST=Zuerich/L=Zuerich/O=SWITCH/CN=lodur.torchit.ch</HOSTDN> + <HOST_OS>SL5</HOST_OS> + <HOST_ARCH>64 bit</HOST_ARCH> <BETA>N</BETA> - <SERVICE_TYPE>Top-BDII</SERVICE_TYPE> + <SERVICE_TYPE>Local-LFC</SERVICE_TYPE> + <HOST_IP>130.59.111.49</HOST_IP> <CORE/> - <IN_PRODUCTION>Y</IN_PRODUCTION> - <NODE_MONITORED>Y</NODE_MONITORED> - <NOTIFICATIONS>Y</NOTIFICATIONS> - <SITENAME>Izola MRF</SITENAME> - <COUNTRY_NAME>Slovenia</COUNTRY_NAME> - <COUNTRY_CODE>SI</COUNTRY_CODE> - <ROC_NAME>NGI_SI</ROC_NAME> - <URL>http://www.izolamrf.co.si</URL> + <IN_PRODUCTION>N</IN_PRODUCTION> + <NODE_MONITORED>N</NODE_MONITORED> + <NOTIFICATIONS>N</NOTIFICATIONS> + <SITENAME>Torch</SITENAME> + <COUNTRY_NAME>Switzerland</COUNTRY_NAME> + <COUNTRY_CODE>CH</COUNTRY_CODE> + <ROC_NAME>NGI_CH</ROC_NAME> + <URL/> <ENDPOINTS> <ENDPOINT> - <ID>9980</ID> - <NAME>bdii4.izolamrf.si</NAME> + <ID>1</ID> + <NAME>sampleEndpoint</NAME> <EXTENSIONS/> - <URL>https://testing.host.com/portal/index.php?Page_Type=View_Object&object_id=9980&grid_id=0</URL> - <INTERFACENAME>bdii4.izolamrf.si</INTERFACENAME> - <ENDPOINT_MONITORED>Y</ENDPOINT_MONITORED> - </ENDPOINT> - <ENDPOINT> - <ID>9933</ID> - <NAME>ce01.izolamrf.si</NAME> - <EXTENSIONS/> - <URL>https://testing.host.com/portal/index.php?Page_Type=View_Object&object_id=9933&grid_id=0</URL> - <INTERFACENAME>ce01.izolamrf.si</INTERFACENAME> + <URL/> + <INTERFACENAME>Local-LFC</INTERFACENAME> <ENDPOINT_MONITORED>N</ENDPOINT_MONITORED> </ENDPOINT> </ENDPOINTS> <SCOPES> - <SCOPE>EGI</SCOPE> - <SCOPE>EGICore</SCOPE> + <SCOPE>Local</SCOPE> </SCOPES> <EXTENSIONS/> </SERVICE_ENDPOINT> diff --git a/api/read/get_service_group/index.md b/api/read/get_service_group/index.md index fb126a7..3efc5a7 100644 --- a/api/read/get_service_group/index.md +++ b/api/read/get_service_group/index.md @@ -14,7 +14,7 @@ | Parameters | Effect | Format/Value(s) | Default | Example | | - | - | - | - | - | -| `service_group_name` | Only return info for the service group with specified site name | any service group name | `all` | `?method=get_service_group&service_group_name=Top-BDII` | +| `service_group_name` | Only return info for the service group with specified site name | any service group name | `all` | `?method=get_service_group&service_group_name=NGI_AEGIS_SERVICES` | | `scope` | Show only sites with the requested scope tags | A comma separated list of scope-tag values or an empty value to return all scopes, i.e. `&scope=` | instance dependant | `?method=get_site&scope=EGI` | | `scope_match` | Match `all` or `any` of the specified scope-tags | `all` or `any` | `all` | `?method=get_site&scope=Local,EGI&scope_match=any` | | `extensions` | Limit results by one or many key value pairs | [See Extensions Mechanism](https://docs.egi.eu/internal/configuration-database/extension-properties/) | none | `?method=get_site&extensions=(KeyName=KeyValue)` | @@ -29,38 +29,12 @@ This method optionally supports paging, to iterate over all results, ```xml <?xml version="1.0" encoding="UTF-8"?> <results> - <SERVICE_GROUP ID="75123" PRIMARY_KEY="75123G0"> - <NAME>NGI_SI_SERVICES</NAME> - <DESCRIPTION>NGI_SI Core Services</DESCRIPTION> + <SERVICE_GROUP ID="23" PRIMARY_KEY="23G0"> + <NAME>NGI_AEGIS_SERVICES</NAME> + <DESCRIPTION>NGI_AEGIS Core Services</DESCRIPTION> <MONITORED>Y</MONITORED> - <CONTACT_EMAIL>ops@sling.si</CONTACT_EMAIL> - <GOCDB_PORTAL_URL>>https://testing.host.com/portal/index.php?Page_Type=View_Object&object_id=119941&grid_id=0</GOCDB_PORTAL_URL> - <SERVICE_ENDPOINT PRIMARY_KEY="3303G0"> - <HOSTNAME>bdii.ipb.ac.rs</HOSTNAME> - <GOCDB_PORTAL_URL>https://testing.host.com/portal/index.php?Page_Type=View_Object&object_id=3303&grid_id=0</GOCDB_PORTAL_URL> - <SERVICE_TYPE>Top-BDII</SERVICE_TYPE> - <HOST_IP/> - <HOST_IPV6/> - <HOSTDN>DC=org/DC=terena/DC=tcs/C=NL/L=Amsterdam/O=Stichting EGI/bdii.ipb.ac.rs</HOSTDN> - <IN_PRODUCTION>Y</IN_PRODUCTION> - <NODE_MONITORED>Y</NODE_MONITORED> - <ENDPOINTS> - <ENDPOINT> - <ID>9980</ID> - <NAME>bdii4.izolamrf.si</NAME> - <EXTENSIONS/> - <URL>https://testing.host.com/portal/index.php?Page_Type=View_Object&object_id=9980&grid_id=0</URL> - <INTERFACENAME>bdii4.izolamrf.si</INTERFACENAME> - <ENDPOINT_MONITORED>Y</ENDPOINT_MONITORED> - <CONTACT_EMAIL>contact@izolamrf.co.si</CONTACT_EMAIL> - </ENDPOINT> - </ENDPOINTS> - <SCOPES> - <SCOPE>EGI</SCOPE> - <SCOPE>EGICore</SCOPE> - </SCOPES> - <EXTENSIONS/> - </SERVICE_ENDPOINT> + <CONTACT_EMAIL>grid-admin@ipb.ac.rs</CONTACT_EMAIL> + <GOCDB_PORTAL_URL>https://localhost/portal/index.php?Page_Type=Service_Group&id=23</GOCDB_PORTAL_URL> <SCOPES> <SCOPE>EGI</SCOPE> </SCOPES> diff --git a/api/read/get_service_group_role/index.md b/api/read/get_service_group_role/index.md index 8d9cb13..5ab80e4 100644 --- a/api/read/get_service_group_role/index.md +++ b/api/read/get_service_group_role/index.md @@ -14,7 +14,7 @@ | Parameters | Effect | Format/Value(s) | Default | Example | | - | - | - | - | - | -| `service_group_name` | Only return info for the service group with specified site name | any ServiceGroup name | `all` | `?method=get_service_group_role&service_group_name=Top-BDII` | +| `service_group_name` | Only return info for the service group with specified site name | any ServiceGroup name | `all` | `?method=get_service_group_role&service_group_name=NGI_AEGIS_SERVICES` | | `scope` | Show only sites with the requested scope tags | A comma separated list of scope-tag values or an empty value to return all scopes, i.e. `&scope=` | instance dependant | `?method=get_site&scope=EGI` | | `scope_match` | Match `all` or `any` of the specified scope-tags | `all` or `any` | `all` | `?method=get_site&scope=Local,EGI&scope_match=any` | @@ -28,21 +28,12 @@ This method optionally supports paging, to iterate over all results, ```xml <?xml version="1.0" encoding="UTF-8"?> <results> - <SERVICE_GROUP ID="75123" PRIMARY_KEY="75123G0"> - <NAME>NGI_SI_SERVICES</NAME> - <DESCRIPTION>NGI_SI Core Servicea</DESCRIPTION> + <SERVICE_GROUP ID="23" PRIMARY_KEY="23G0"> + <NAME>NGI_AEGIS_SERVICES</NAME> + <DESCRIPTION>NGI_AEGIS Core Services</DESCRIPTION> <MONITORED>Y</MONITORED> - <CONTACT_EMAIL>ops@sling.si</CONTACT_EMAIL> - <GOCDB_PORTAL_URL>https://testing.host.com/portal/index.php?Page_Type=View_Object&object_id=119941&grid_id=0</GOCDB_PORTAL_URL> - <USER> - <FORENAME>Dejan</FORENAME> - <SURNAME>Lesjak</SURNAME> - <CERTDN>/C=SI/O=SiGNET/O=IJS/OU=F9/CN=Dejan Lesjak</CERTDN> - <EGICHECKIN/> - <IRISIAM/> - <GOCDB_PORTAL_URL>https://testing.host.com/portal/index.php?Page_Type=View_Object&object_id=7729&grid_id=0</GOCDB_PORTAL_URL> - <ROLE>Service Group Administrator</ROLE> - </USER> + <CONTACT_EMAIL>grid-admin@ipb.ac.rs</CONTACT_EMAIL> + <GOCDB_PORTAL_URL>https://localhost/portal/index.php?Page_Type=Service_Group&id=23</GOCDB_PORTAL_URL> </SERVICE_GROUP> </results> ``` diff --git a/api/read/get_service_types/index.md b/api/read/get_service_types/index.md index 53239d7..03ee1bd 100644 --- a/api/read/get_service_types/index.md +++ b/api/read/get_service_types/index.md @@ -23,9 +23,9 @@ This method does not support paging. ```xml <?xml version="1.0" encoding="UTF-8"?> <results> - <SERVICE_TYPE TYPE_ID="44G0" PRIMARY_KEY="44G0"> - <SERVICE_TYPE_NAME>egi.GOCDB</SERVICE_TYPE_NAME> - <SERVICE_TYPE_DESC>[Central Service] The central GOCDB</SERVICE_TYPE_DESC> + <SERVICE_TYPE TYPE_ID="1G0" PRIMARY_KEY="1G0"> + <SERVICE_TYPE_NAME>CE</SERVICE_TYPE_NAME> + <SERVICE_TYPE_DESC>[Site service] The LCG Compute Element. Currently the standard CE within the gLite middleware stack. Soon to be replaced by the CREAM CE. </SERVICE_TYPE_DESC> </SERVICE_TYPE> </results> ``` diff --git a/api/read/get_site/index.md b/api/read/get_site/index.md index 877de9b..636b955 100644 --- a/api/read/get_site/index.md +++ b/api/read/get_site/index.md @@ -34,34 +34,34 @@ This method optionally supports paging, to iterate over all results, ```xml <?xml version="1.0" encoding="UTF-8"?> <results> - <SITE ID="119" PRIMARY_KEY="119G0" NAME="Izola Marine Research Facility"> + <SITE ID="14" PRIMARY_KEY="119G0" NAME="Izola MRF"> <PRIMARY_KEY>119G0</PRIMARY_KEY> - <SHORT_NAME>Izola MRF</SHORT_NAME> - <OFFICIAL_NAME>Izola Marine Research Facility</OFFICIAL_NAME> - <SITE_DESCRIPTION>Situated right on Slovenia's small coastline of the Adriatic Sea, the Izola Marine Research Facility is Slovenia's hub for all things ocean research.</SITE_DESCRIPTION> - <GOCDB_PORTAL_URL>https://testing.host.com/portal/index.php?Page_Type=View_Object&amp;object_id=119&amp;grid_id=0</GOCDB_PORTAL_URL> - <HOME_URL>http://www.izolamrf.co.si</HOME_URL> - <CONTACT_EMAIL>contact@izolamrf.si</CONTACT_EMAIL> - <CONTACT_TEL>+386 45 310 1393</CONTACT_TEL> - <TIER>3</TIER> - <GIIS_URL>ldap://grid.izolamrf.si:0000/ds-vo-name=IzolaMRF,o=grid</GIIS_URL> - <COUNTRY_CODE>Slovenia</COUNTRY_CODE> - <COUNTRY>Slovenia</COUNTRY> - <ROC>NGI_SI</ROC> - <PRODUCTION_INFRASTRUCTURE>Test</PRODUCTION_INFRASTRUCTURE> - <CERTIFICATION_STATUS>Certified</CERTIFICATION_STATUS> - <TIMEZONE>Europe/Ljubljana</TIMEZONE> - <LATITUDE>45.541431</LATITUDE> - <LONGITUDE>13.662742</LONGITUDE> - <CSIRT_EMAIL>csirt@izolamrf.si</CSIRT_EMAIL> - <IP_RANGE>0.0.0.0/255.255.255.255</IP_RANGE> - <LOCATION>Izola, Slovenia</LOCATION> - <CSIRTTEL>+386 41 000 2994</CSIRTTEL> - <HELPDESKEMAIL>help@izolamrf.si</HELPDESKEMAIL> + <SHORT_NAME>Izola MRF</SHORT_NAME> + <OFFICIAL_NAME>Izola Marine Research Facility</OFFICIAL_NAME> + <SITE_DESCRIPTION>Situated right on Slovenia's small coastline of the Adriatic Sea, the Izola Marine Research Facility is Slovenia's hub for all things ocean research.</SITE_DESCRIPTION> + <GOCDB_PORTAL_URL>https://localhost/portal/index.php?Page_Type=Site&id=14</GOCDB_PORTAL_URL> + <HOME_URL>http://www.izolamrf.co.si</HOME_URL> + <CONTACT_EMAIL>contact@izolamrf.si</CONTACT_EMAIL> + <CONTACT_TEL>+386 45 310 1393</CONTACT_TEL> + <GIIS_URL>ldap://grid.izolamrf.si:0000/ds-vo-name=IzolaMRF,o=grid</GIIS_URL> + <COUNTRY_CODE>SI</COUNTRY_CODE> + <COUNTRY>Slovenia</COUNTRY> + <ROC>NGI_SI</ROC> + <PRODUCTION_INFRASTRUCTURE>Test</PRODUCTION_INFRASTRUCTURE> + <CERTIFICATION_STATUS>Certified</CERTIFICATION_STATUS> + <TIMEZONE>UTC</TIMEZONE> + <LATITUDE>45.541431</LATITUDE> + <LONGITUDE>13.662742</LONGITUDE> + <CSIRT_EMAIL>csirt@izolamrf.si</CSIRT_EMAIL> + <NOTIFICATIONS>FALSE</NOTIFICATIONS> + <DOMAIN> + <DOMAIN_NAME>izolamrf.si</DOMAIN_NAME> + </DOMAIN> + <SITE_IP>0.0.0.0/255.255.255.255</SITE_IP> + <SCOPES> <SCOPE>EGI</SCOPE> - <DOMAIN> - <DOMAIN_NAME>izolamrf.si</DOMAIN_NAME> - </DOMAIN> + </SCOPES> + <EXTENSIONS/> </SITE> </results> ``` diff --git a/api/read/get_site_contacts/index.md b/api/read/get_site_contacts/index.md index 2cc0c2b..74e113b 100644 --- a/api/read/get_site_contacts/index.md +++ b/api/read/get_site_contacts/index.md @@ -17,7 +17,7 @@ | `sitename` | Only return info for site with specified site name | any site name | `all` | `?method=get_site_contacts&sitename=Izola MRF` | | `roc` | Limit results to sites belonging to given NGI | any NGI name | `all` | `?method=get_site_contacts&roc=NGI_SI` | | `country` | Limit results to sites belonging to given country | any country | `all` | `?method=get_site_contacts&country=Slovenia` | -| `roletype` | Only include CONTACTS with the given role | any valid role type | `all` | `?method=get_site_contacts&roletype=Site Security Officer` | +| `roletype` | Only include CONTACTS with the given role | any valid role type | `all` | `?method=get_site_contacts&roletype=Site Operations Manager` | | `scope` | Show only sites with the requested scope tags | A comma separated list of scope-tag values or an empty value to return all scopes, i.e. `&scope=` | instance dependant |  `?method=get_site&scope=EGI` | | `scope_match` | Match `all` or `any` of the specified scope-tags | `all` or `any` | `all` | `?method=get_site_contacts&scope=Local,EGI&scope_match=any` | @@ -31,30 +31,26 @@ This method optionally supports paging, to iterate over all results, ```xml <?xml version="1.0" encoding="UTF-8"?> <results> - <SITE ID="119G0" PRIMARY_KEY="119G0" NAME="Izola Marine Research Facility"> + <SITE ID="14G0" PRIMARY_KEY="119G0" NAME="Izola MRF"> <PRIMARY_KEY>119G0</PRIMARY_KEY> <SHORT_NAME>Izola MRF</SHORT_NAME> - <CONTACT USER_ID="4322G0" PRIMARY_KEY="4322G0"> - <FORENAME>Gwei</FORENAME> - <SURNAME>Jai</SURNAME> - <TITLE> - Gwei.Jai@izolamrf.si - +44 040 3636 3600 - /C=UK/O=eScience/OU=CLRC/L=RAL/CN=Gwei Jai - alphanumeric@egi.eu - - Site Operations Manager - - + Yuki Tsunoda - + <EMAIL>Yuki.Tsunoda@izolamrf.si</EMAIL> <TEL>+49 432 0030 8324</TEL> - <CERTDN>/C=UK/O=eScience/OU=CLRC/L=RAL/CN=Yuki Tsunoda</CERTDN> - <EGICHECKIN></EGICHECKIN> - <IRISIAM/> - <ROLE_NAME>Chief Operations Officer</ROLE_NAME> + <CERTDN>/C=00/O=00000/OU=000000/CN=Yuki Tsunoda</CERTDN> + <ROLE_NAME>Site Operations Manager</ROLE_NAME> + </CONTACT> + <CONTACT USER_ID="8G0" PRIMARY_KEY="8G0"> + <FORENAME>Gwei</FORENAME> + <SURNAME>Jai</SURNAME> + <TITLE/> + <EMAIL>Gwei.Jai@izolamrf.si</EMAIL> + <TEL>+44 040 3636 3600</TEL> + <CERTDN>/C=00/O=00000/OU=000000/CN=Gwei Jai</CERTDN> + <ROLE_NAME>Site Operations Deputy Manager</ROLE_NAME> </CONTACT> </SITE> </results> diff --git a/api/read/get_site_list/index.md b/api/read/get_site_list/index.md index 75815a9..8082b01 100644 --- a/api/read/get_site_list/index.md +++ b/api/read/get_site_list/index.md @@ -33,6 +33,9 @@ This method does not support paging. ```xml <?xml version="1.0" encoding="UTF-8"?> <results> - <SITE ID="367311" PRIMARY_KEY="119G0" NAME="Izola MRF" COUNTRY="Slovenia" COUNTRY_CODE="SI" ROC="NGI_SI" SUBGRID="" GIIS_URL="ldap://grid.izolamrf.si:0000/ds-vo-name=IzolaMRF,o=grid"/> + <SITE ID="11" PRIMARY_KEY="523G0" NAME="BERNUNI-GRID" COUNTRY="Switzerland" COUNTRY_CODE="CH" ROC="NGI_CH" SUBGRID="" GIIS_URL="ldap://bernuni-grid.ch:0000/ds-vo-name=BERNUNI-GRID,o=grid"/> + <SITE ID="12" PRIMARY_KEY="200G0" NAME="Basel Infrastructure" COUNTRY="Switzerland" COUNTRY_CODE="CH" ROC="NGI_CH" SUBGRID="" GIIS_URL=""/> + <SITE ID="13" PRIMARY_KEY="351G0" NAME="SSC" COUNTRY="Slovenia" COUNTRY_CODE="SI" ROC="NGI_SI" SUBGRID="" GIIS_URL="ldap://grid.ssc.si:0000/ds-vo-name=SSC,o=grid"/> + <SITE ID="14" PRIMARY_KEY="119G0" NAME="Izola MRF" COUNTRY="Slovenia" COUNTRY_CODE="SI" ROC="NGI_SI" SUBGRID="" GIIS_URL="ldap://grid.izolamrf.si:0000/ds-vo-name=IzolaMRF,o=grid"/> </results> ``` diff --git a/api/read/get_site_security_info/index.md b/api/read/get_site_security_info/index.md index 3cca909..e959817 100644 --- a/api/read/get_site_security_info/index.md +++ b/api/read/get_site_security_info/index.md @@ -32,7 +32,7 @@ This method does not support paging. ```xml <?xml version="1.0" encoding="UTF-8"?> <results> - <SITE ID="367311" PRIMARY_KEY="119G0" NAME="Izola MRF"> + <SITE ID="14G0" PRIMARY_KEY="119G0" NAME="Izola MRF"> <PRIMARY_KEY>119G0</PRIMARY_KEY> <SHORT_NAME>Izola MRF</SHORT_NAME> <CSIRT_EMAIL>csirt@izolamrf.si</CSIRT_EMAIL> diff --git a/api/read/get_user/index.md b/api/read/get_user/index.md index 8469667..da91c03 100644 --- a/api/read/get_user/index.md +++ b/api/read/get_user/index.md @@ -30,35 +30,48 @@ This method optionally supports paging, to iterate over all results, ```xml <?xml version="1.0" encoding="UTF-8"?> <results> - <EGEE_USER USER_ID="4322G0" PRIMARY_KEY="4523G0"> - <FORENAME>Gwei</FORENAME> - <SURNAME>Jai</SURNAME> - <TITLE> - - https://testing.host.com/portal/index.php?Page_Type=View_Object&object_id=6326&grid_id=0 - Gwei.Jai@izolamrf.si - +44 040 3636 3600 - - - /C=UK/O=eScience/OU=CLRC/L=RAL/CN=Gwei Jai - alphanumeric@egi.eu - - - - - - - - CIC Staff - NGI_SI - group - - Site Operations Manager - Site Operations Manager - NGI_SI - group - - + + Gwei + Jai + + <DESCRIPTION/> + <GOCDB_PORTAL_URL>https://localhost/portal/index.php?Page_Type=User&id=8</GOCDB_PORTAL_URL> + <EMAIL>Gwei.Jai@izolamrf.si</EMAIL> + <TEL>+44 040 3636 3600</TEL> + <WORKING_HOURS_START/> + <WORKING_HOURS_END/> + <CERTDN>/C=00/O=00000/OU=000000/CN=Gwei Jai</CERTDN> + <SSOUSERNAME/> + <APPROVED/> + <ACTIVE/> + <HOMESITE>Izola MRF</HOMESITE> + <USER_ROLE> + <USER_ROLE>Site Operations Deputy Manager</USER_ROLE> + <ON_ENTITY>Izola MRF</ON_ENTITY> + <ENTITY_TYPE>site</ENTITY_TYPE> + <PRIMARY_KEY>119G0</PRIMARY_KEY> + <RECOGNISED_IN_PROJECTS> + <PROJECT ID="1">EGI</PROJECT> + </RECOGNISED_IN_PROJECTS> + </USER_ROLE> + <USER_ROLE> + <USER_ROLE>Regional Staff (ROD)</USER_ROLE> + <ON_ENTITY>NGI_SI</ON_ENTITY> + <ENTITY_TYPE>ngi</ENTITY_TYPE> + <PRIMARY_KEY>3</PRIMARY_KEY> + <RECOGNISED_IN_PROJECTS> + <PROJECT ID="1">EGI</PROJECT> + </RECOGNISED_IN_PROJECTS> + </USER_ROLE> + <USER_ROLE> + <USER_ROLE>COD Staff</USER_ROLE> + <ON_ENTITY>EGI</ON_ENTITY> + <ENTITY_TYPE>project</ENTITY_TYPE> + <PRIMARY_KEY>1</PRIMARY_KEY> + <RECOGNISED_IN_PROJECTS> + <PROJECT ID="1">EGI</PROJECT> + </RECOGNISED_IN_PROJECTS> + </USER_ROLE> + </EGEE_USER> </results> - ``` From 3c7c1725bff756b57932a4401fa2fec3d3cf8898 Mon Sep 17 00:00:00 2001 From: rowan04 <rowanmoss04@gmail.com> Date: Tue, 21 Feb 2023 11:02:52 +0000 Subject: [PATCH 6/6] Adds code to escape more ampersands - adds amp; after ampersands to escape them --- api/read/get_downtime/index.md | 2 +- api/read/get_downtime_nested_services/index.md | 2 +- api/read/get_downtime_to_broadcast/index.md | 2 +- api/read/get_roc_contacts/index.md | 2 +- api/read/get_service/index.md | 2 +- api/read/get_service_group/index.md | 2 +- api/read/get_service_group_role/index.md | 2 +- api/read/get_site/index.md | 2 +- api/read/get_user/index.md | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/api/read/get_downtime/index.md b/api/read/get_downtime/index.md index 510f688..ad0e99f 100644 --- a/api/read/get_downtime/index.md +++ b/api/read/get_downtime/index.md @@ -40,7 +40,7 @@ This method optionally supports paging, to iterate over all results, <SERVICE_TYPE>Site-BDII</SERVICE_TYPE> <ENDPOINT>bdii4.izolamrf.si</ENDPOINT> <HOSTED_BY>Izola MRF</HOSTED_BY> - <GOCDB_PORTAL_URL>/portal/index.php?Page_Type=Downtime&id=32578</GOCDB_PORTAL_URL> + <GOCDB_PORTAL_URL>/portal/index.php?Page_Type=Downtime&id=32578</GOCDB_PORTAL_URL> <AFFECTED_ENDPOINTS/> <SEVERITY>WARNING</SEVERITY> <DESCRIPTION>The service will be at risk</DESCRIPTION> diff --git a/api/read/get_downtime_nested_services/index.md b/api/read/get_downtime_nested_services/index.md index c417aa6..3987761 100644 --- a/api/read/get_downtime_nested_services/index.md +++ b/api/read/get_downtime_nested_services/index.md @@ -42,7 +42,7 @@ This method optionally supports paging, to iterate over all results, <END_DATE>1688169600</END_DATE> <FORMATED_START_DATE>2022-06-27 00:00</FORMATED_START_DATE> <FORMATED_END_DATE>2023-07-01 00:00</FORMATED_END_DATE> - <GOCDB_PORTAL_URL>/index.php?Page_Type=Downtime&id=32578</GOCDB_PORTAL_URL> + <GOCDB_PORTAL_URL>/index.php?Page_Type=Downtime&id=32578</GOCDB_PORTAL_URL> <SERVICES> <SERVICE> <PRIMARY_KEY>119G0</PRIMARY_KEY> diff --git a/api/read/get_downtime_to_broadcast/index.md b/api/read/get_downtime_to_broadcast/index.md index 6654a80..fe2ea73 100644 --- a/api/read/get_downtime_to_broadcast/index.md +++ b/api/read/get_downtime_to_broadcast/index.md @@ -34,7 +34,7 @@ This method optionally supports paging, to iterate over all results, <HOSTNAME>izolamrf.co.si</HOSTNAME> <SERVICE_TYPE>bdii4.izolamrf.si</SERVICE_TYPE> <HOSTED_BY>Izola MRF</HOSTED_BY> - <GOCDB_PORTAL_URL>/portal/index.php?Page_Type=Downtime&id=32893</GOCDB_PORTAL_URL> + <GOCDB_PORTAL_URL>/portal/index.php?Page_Type=Downtime&id=32893</GOCDB_PORTAL_URL> <AFFECTED_ENDPOINTS/> <SEVERITY>WARNING</SEVERITY> <DESCRIPTION>The service will be at risk</DESCRIPTION> diff --git a/api/read/get_roc_contacts/index.md b/api/read/get_roc_contacts/index.md index c1c8a45..c81932a 100644 --- a/api/read/get_roc_contacts/index.md +++ b/api/read/get_roc_contacts/index.md @@ -29,7 +29,7 @@ This method optionally supports paging, to iterate over all results, <ROC ID="3" ROC_NAME="NGI_SI"> <ROCNAME>NGI_SI</ROCNAME> <MAIL_CONTACT>ngi-si-contact@swing-grid.si</MAIL_CONTACT> - <GOCDB_PORTAL_URL>https://localhost/portal/index.php?Page_Type=NGI&id=3</GOCDB_PORTAL_URL> + <GOCDB_PORTAL_URL>https://localhost/portal/index.php?Page_Type=NGI&id=3</GOCDB_PORTAL_URL> <CONTACT USER_ID="8G0" PRIMARY_KEY="8G0"> <FORENAME>Gwei</FORENAME> <SURNAME>Jai</SURNAME> diff --git a/api/read/get_service/index.md b/api/read/get_service/index.md index c063e5c..bf2ec1c 100644 --- a/api/read/get_service/index.md +++ b/api/read/get_service/index.md @@ -42,7 +42,7 @@ This method does not support paging. <SERVICE_ENDPOINT PRIMARY_KEY="1G0"> <PRIMARY_KEY>1G0</PRIMARY_KEY> <HOSTNAME>lodur.torchit.ch</HOSTNAME> - <GOCDB_PORTAL_URL>https://localhost/portal/index.php?Page_Type=Service&id=1</GOCDB_PORTAL_URL> + <GOCDB_PORTAL_URL>https://localhost/portal/index.php?Page_Type=Service&id=1</GOCDB_PORTAL_URL> <HOSTDN>/DC=com/DC=quovadisglobal/DC=grid/DC=Torch/DC=hosts/C=CH/ST=Zuerich/L=Zuerich/O=SWITCH/CN=lodur.torchit.ch</HOSTDN> <HOST_OS>SL5</HOST_OS> <HOST_ARCH>64 bit</HOST_ARCH> diff --git a/api/read/get_service_group/index.md b/api/read/get_service_group/index.md index 3efc5a7..48c15ec 100644 --- a/api/read/get_service_group/index.md +++ b/api/read/get_service_group/index.md @@ -34,7 +34,7 @@ This method optionally supports paging, to iterate over all results, <DESCRIPTION>NGI_AEGIS Core Services</DESCRIPTION> <MONITORED>Y</MONITORED> <CONTACT_EMAIL>grid-admin@ipb.ac.rs</CONTACT_EMAIL> - <GOCDB_PORTAL_URL>https://localhost/portal/index.php?Page_Type=Service_Group&id=23</GOCDB_PORTAL_URL> + <GOCDB_PORTAL_URL>https://localhost/portal/index.php?Page_Type=Service_Group&id=23</GOCDB_PORTAL_URL> <SCOPES> <SCOPE>EGI</SCOPE> </SCOPES> diff --git a/api/read/get_service_group_role/index.md b/api/read/get_service_group_role/index.md index 5ab80e4..10d1238 100644 --- a/api/read/get_service_group_role/index.md +++ b/api/read/get_service_group_role/index.md @@ -33,7 +33,7 @@ This method optionally supports paging, to iterate over all results, <DESCRIPTION>NGI_AEGIS Core Services</DESCRIPTION> <MONITORED>Y</MONITORED> <CONTACT_EMAIL>grid-admin@ipb.ac.rs</CONTACT_EMAIL> - <GOCDB_PORTAL_URL>https://localhost/portal/index.php?Page_Type=Service_Group&id=23</GOCDB_PORTAL_URL> + <GOCDB_PORTAL_URL>https://localhost/portal/index.php?Page_Type=Service_Group&id=23</GOCDB_PORTAL_URL> </SERVICE_GROUP> </results> ``` diff --git a/api/read/get_site/index.md b/api/read/get_site/index.md index 636b955..3dd83f4 100644 --- a/api/read/get_site/index.md +++ b/api/read/get_site/index.md @@ -39,7 +39,7 @@ This method optionally supports paging, to iterate over all results, <SHORT_NAME>Izola MRF</SHORT_NAME> <OFFICIAL_NAME>Izola Marine Research Facility</OFFICIAL_NAME> <SITE_DESCRIPTION>Situated right on Slovenia's small coastline of the Adriatic Sea, the Izola Marine Research Facility is Slovenia's hub for all things ocean research.</SITE_DESCRIPTION> - <GOCDB_PORTAL_URL>https://localhost/portal/index.php?Page_Type=Site&id=14</GOCDB_PORTAL_URL> + <GOCDB_PORTAL_URL>https://localhost/portal/index.php?Page_Type=Site&id=14</GOCDB_PORTAL_URL> <HOME_URL>http://www.izolamrf.co.si</HOME_URL> <CONTACT_EMAIL>contact@izolamrf.si</CONTACT_EMAIL> <CONTACT_TEL>+386 45 310 1393</CONTACT_TEL> diff --git a/api/read/get_user/index.md b/api/read/get_user/index.md index da91c03..916a536 100644 --- a/api/read/get_user/index.md +++ b/api/read/get_user/index.md @@ -35,7 +35,7 @@ This method optionally supports paging, to iterate over all results, <SURNAME>Jai</SURNAME> <TITLE/> <DESCRIPTION/> - <GOCDB_PORTAL_URL>https://localhost/portal/index.php?Page_Type=User&id=8</GOCDB_PORTAL_URL> + <GOCDB_PORTAL_URL>https://localhost/portal/index.php?Page_Type=User&id=8</GOCDB_PORTAL_URL> <EMAIL>Gwei.Jai@izolamrf.si</EMAIL> <TEL>+44 040 3636 3600</TEL> <WORKING_HOURS_START/>