Fix hardcoded URNs

XSEDE · Mar 26, 2021 · 860931d · 860931d
1 parent 6b99bae
commit 860931d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+tag-1.1-20210326b JP
+ - Replaced hardcoded RSP URNs with corresponding RDR URNs
+
 tag-1.1-20210326 JP
  - Stop loading RSP HPC Providers and HPC Resources into Resource V3
  - Replace references to RSP HPC Providers and HPC Resources with RDR Organization and Resources

diff --git a/bin/route_resource_v3.py b/bin/route_resource_v3.py
@@ -871,10 +871,10 @@ def Write_RSP_Vendor_Software(self, content, contype, config):
  supportURN = 'urn:ogf:glue2:info.xsede.org:resource:rsp:support.organizations:drupalnodeid:1565'
  elif item.get('Vendor') == 'XSEDE':
  supportURN = 'urn:ogf:glue2:info.xsede.org:resource:rsp:support.organizations:drupalnodeid:1553'
- providerURN = 'urn:ogf:glue2:info.xsede.org:resource:rsp:hpc.providers:drupalnodeid:2943'
+ providerURN = 'urn:ogf:glue2:info.xsede.org:resource:rdr:resource.organizations:2438'
  elif item.get('Vendor') == 'NCSA':
  supportURN = 'urn:ogf:glue2:info.xsede.org:resource:rsp:support.organizations:drupalnodeid:1553'
- providerURN = 'urn:ogf:glue2:info.xsede.org:resource:rsp:hpc.providers:drupalnodeid:3671'
+ providerURN = 'urn:ogf:glue2:info.xsede.org:resource:rdr:resource.organizations:844'
  if supportURN:
  myNEWRELATIONS[supportURN] = 'Supported By'
  if providerURN:
@@ -1430,7 +1430,7 @@ def Write_RSP_Packaged_Software(self, content, contype, config):
  myNEWRELATIONS = {}
  mySupportOrgID = item.get('SupportOrganizationGlobalID','')
  if mySupportOrgID == 'helpdesk.xsede.org':
- providerURN = 'urn:ogf:glue2:info.xsede.org:resource:rsp:hpc.providers:drupalnodeid:2943'
+ providerURN = 'urn:ogf:glue2:info.xsede.org:resource:rdr:resource.organizations:2438'
  myNEWRELATIONS[providerURN] = 'Provided By'
  else: # TODO: Handle other Support Orgs
  providerURN = None