From 77a79680b5b959275130648c00a70e672e00c7de Mon Sep 17 00:00:00 2001
From: kurtjstrosahl-jlab
 <63591612+kurtjstrosahl-jlab@users.noreply.github.com>
Date: Thu, 1 Aug 2024 12:00:24 -0400
Subject: [PATCH 1/3] Update JLab-Farm.yaml

adding osdf pelican origin to topology file
---
 .../JLAB/JLab-Farm.yaml                       | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/topology/Thomas Jefferson National Accelerator Facility/JLAB/JLab-Farm.yaml b/topology/Thomas Jefferson National Accelerator Facility/JLAB/JLab-Farm.yaml
index fdcefd5d7..30810e140 100644
--- a/topology/Thomas Jefferson National Accelerator Facility/JLAB/JLab-Farm.yaml	
+++ b/topology/Thomas Jefferson National Accelerator Facility/JLAB/JLab-Farm.yaml	
@@ -215,6 +215,30 @@ Resources:
     VOOwnership:
       JLab: 100
 
+  dtn2304:
+    Active: true
+    ContactLists:
+      Administrative Contact:
+        Primary:
+          ID: 818acb7ebcd1865a17551799f0cfeb5256e0db20
+          Name: Kurt Strosahl
+        Secondary:
+          ID: ea9db644eb6f8632cf87fd2cbac8a6e393c21f71
+          Name: Wesley Moore
+      Security Contact:
+        Primary:
+          ID: 818acb7ebcd1865a17551799f0cfeb5256e0db20
+          Name: Kurt Strosahl
+    FQDN: dtn2304.jlab.org
+    FQDNAliases:
+      - dtn2304.jlab.org
+    ID: 
+    Services:
+      Pelican origin:
+        Description: JLab Pelican origin
+    VOOwnership:
+      JLab: 100
+
   JLab-FARM-CE:
     Active: true
     ContactLists:

From 1eaabeaa81cc2245c12c520a9978aa154cc45af4 Mon Sep 17 00:00:00 2001
From: kurtjstrosahl-jlab
 <63591612+kurtjstrosahl-jlab@users.noreply.github.com>
Date: Mon, 5 Aug 2024 14:30:08 -0400
Subject: [PATCH 2/3] Update JLab-Farm.yaml

updated JLAB-dtn2304 entry as per osg support
---
 .../JLAB/JLab-Farm.yaml                                     | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/topology/Thomas Jefferson National Accelerator Facility/JLAB/JLab-Farm.yaml b/topology/Thomas Jefferson National Accelerator Facility/JLAB/JLab-Farm.yaml
index 30810e140..0dbbc88af 100644
--- a/topology/Thomas Jefferson National Accelerator Facility/JLAB/JLab-Farm.yaml	
+++ b/topology/Thomas Jefferson National Accelerator Facility/JLAB/JLab-Farm.yaml	
@@ -215,24 +215,20 @@ Resources:
     VOOwnership:
       JLab: 100
 
-  dtn2304:
+  JLAB-dtn2304:
     Active: true
     ContactLists:
       Administrative Contact:
         Primary:
-          ID: 818acb7ebcd1865a17551799f0cfeb5256e0db20
           Name: Kurt Strosahl
         Secondary:
-          ID: ea9db644eb6f8632cf87fd2cbac8a6e393c21f71
           Name: Wesley Moore
       Security Contact:
         Primary:
-          ID: 818acb7ebcd1865a17551799f0cfeb5256e0db20
           Name: Kurt Strosahl
     FQDN: dtn2304.jlab.org
     FQDNAliases:
       - dtn2304.jlab.org
-    ID: 
     Services:
       Pelican origin:
         Description: JLab Pelican origin

From bd9afa3c7493d4aa7d5d18df1300fddd078839b5 Mon Sep 17 00:00:00 2001
From: Matyas Selmeci <matyas@cs.wisc.edu>
Date: Mon, 5 Aug 2024 13:34:29 -0500
Subject: [PATCH 3/3] Add contact IDs back

---
 .../JLAB/JLab-Farm.yaml                                        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/topology/Thomas Jefferson National Accelerator Facility/JLAB/JLab-Farm.yaml b/topology/Thomas Jefferson National Accelerator Facility/JLAB/JLab-Farm.yaml
index 0dbbc88af..76ed37370 100644
--- a/topology/Thomas Jefferson National Accelerator Facility/JLAB/JLab-Farm.yaml	
+++ b/topology/Thomas Jefferson National Accelerator Facility/JLAB/JLab-Farm.yaml	
@@ -220,11 +220,14 @@ Resources:
     ContactLists:
       Administrative Contact:
         Primary:
+          ID: 818acb7ebcd1865a17551799f0cfeb5256e0db20
           Name: Kurt Strosahl
         Secondary:
+          ID: ea9db644eb6f8632cf87fd2cbac8a6e393c21f71
           Name: Wesley Moore
       Security Contact:
         Primary:
+          ID: 818acb7ebcd1865a17551799f0cfeb5256e0db20
           Name: Kurt Strosahl
     FQDN: dtn2304.jlab.org
     FQDNAliases: