From 2623b98cef7db2643f84f2e368311fc1f31b034d Mon Sep 17 00:00:00 2001
From: Shawn McKee <smckee@umich.edu>
Date: Wed, 27 Jan 2021 11:38:55 -0500
Subject: [PATCH 1/4] Adding perfSONAR information for UERJ

Adding perfSONAR bandwidth and latency hosts for UERJ
---
 .../T2_BR_UERJ/UERJ.yaml                      | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)

diff --git a/topology/Universidade do Estado do Rio de Janeiro/T2_BR_UERJ/UERJ.yaml b/topology/Universidade do Estado do Rio de Janeiro/T2_BR_UERJ/UERJ.yaml
index f402e7261..865a409e0 100644
--- a/topology/Universidade do Estado do Rio de Janeiro/T2_BR_UERJ/UERJ.yaml	
+++ b/topology/Universidade do Estado do Rio de Janeiro/T2_BR_UERJ/UERJ.yaml	
@@ -136,3 +136,43 @@ Resources:
       Squid:
         Description: Hepgrid Squid service
 SupportCenter: USCMS_Tier2
+UERJ_perfSONAR_BW:
+    Active: true
+    ContactLists:
+      Administrative Contact:
+        Primary:
+          Name: Renan Bernardo
+          ID: e75df2a03ec0732015786fc667058f59deb7daee
+      Security Contact:
+        Primary:
+          Name: Eduardo Azevedo Revoredo
+          ID: 1e4a3afee4bf953f7c7cde3711044a032cb55fa0
+    Description: This is the UERJ CMS T2 perfSONAR bandwidth instance
+    FQDN: perfsonar-bw.hepgrid.uerj.br
+    Services:
+      net.perfSONAR.Bandwidth:
+        Description: perfSONAR Bandwidth monitoring node for UERJ
+        Details:
+          endpoint:perfsonar-bw.hepgrid.uerj.br
+    VOOwnership:
+      CMS: 100
+UERJ_perfSONAR_LT:
+    Active: true
+    ContactLists:
+      Administrative Contact:
+        Primary:
+          Name: Renan Bernardo
+          ID: e75df2a03ec0732015786fc667058f59deb7daee
+      Security Contact:
+        Primary:
+          Name: Eduardo Azevedo Revoredo
+          ID: 1e4a3afee4bf953f7c7cde3711044a032cb55fa0
+    Description: This is the UERJ CMS T2 perfSONAR latency instance
+    FQDN: perfsonar-lt.hepgrid.uerj.br
+    Services:
+      net.perfSONAR.Bandwidth:
+        Description: perfSONAR Latency monitoring node for UERJ
+        Details:
+          endpoint:perfsonar-lt.hepgrid.uerj.br
+    VOOwnership:
+      CMS: 100

From b8672a3408c5a9c0361e9b8cf0cf04c1bc3f6fed Mon Sep 17 00:00:00 2001
From: Brian Lin <brianhlin@gmail.com>
Date: Wed, 27 Jan 2021 11:15:19 -0600
Subject: [PATCH 2/4] Make support center more visible with other RG attrs

---
 .../T2_BR_UERJ/UERJ.yaml                                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/topology/Universidade do Estado do Rio de Janeiro/T2_BR_UERJ/UERJ.yaml b/topology/Universidade do Estado do Rio de Janeiro/T2_BR_UERJ/UERJ.yaml
index 865a409e0..971fc5d4e 100644
--- a/topology/Universidade do Estado do Rio de Janeiro/T2_BR_UERJ/UERJ.yaml	
+++ b/topology/Universidade do Estado do Rio de Janeiro/T2_BR_UERJ/UERJ.yaml	
@@ -1,4 +1,5 @@
 GroupDescription: UERJ Resource Group.
+SupportCenter: USCMS_Tier2
 GroupID: 42
 Production: true
 Resources:
@@ -135,7 +136,6 @@ Resources:
     Services:
       Squid:
         Description: Hepgrid Squid service
-SupportCenter: USCMS_Tier2
 UERJ_perfSONAR_BW:
     Active: true
     ContactLists:

From f893cce9d325270d129604bc77eb9391277d8aee Mon Sep 17 00:00:00 2001
From: Brian Lin <brianhlin@gmail.com>
Date: Wed, 27 Jan 2021 11:15:32 -0600
Subject: [PATCH 3/4] Add resource IDs

---
 .../T2_BR_UERJ/UERJ.yaml                                        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/topology/Universidade do Estado do Rio de Janeiro/T2_BR_UERJ/UERJ.yaml b/topology/Universidade do Estado do Rio de Janeiro/T2_BR_UERJ/UERJ.yaml
index 971fc5d4e..4806eab39 100644
--- a/topology/Universidade do Estado do Rio de Janeiro/T2_BR_UERJ/UERJ.yaml	
+++ b/topology/Universidade do Estado do Rio de Janeiro/T2_BR_UERJ/UERJ.yaml	
@@ -138,6 +138,7 @@ Resources:
         Description: Hepgrid Squid service
 UERJ_perfSONAR_BW:
     Active: true
+    ID: 1120
     ContactLists:
       Administrative Contact:
         Primary:
@@ -158,6 +159,7 @@ UERJ_perfSONAR_BW:
       CMS: 100
 UERJ_perfSONAR_LT:
     Active: true
+    ID: 1121
     ContactLists:
       Administrative Contact:
         Primary:

From fc06b381cc1ef342c9dfe454f97becc9f3e7042d Mon Sep 17 00:00:00 2001
From: Brian Lin <brianhlin@gmail.com>
Date: Wed, 27 Jan 2021 11:15:44 -0600
Subject: [PATCH 4/4] Fix indentation

---
 .../T2_BR_UERJ/UERJ.yaml                                      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/topology/Universidade do Estado do Rio de Janeiro/T2_BR_UERJ/UERJ.yaml b/topology/Universidade do Estado do Rio de Janeiro/T2_BR_UERJ/UERJ.yaml
index 4806eab39..797ebaf1d 100644
--- a/topology/Universidade do Estado do Rio de Janeiro/T2_BR_UERJ/UERJ.yaml	
+++ b/topology/Universidade do Estado do Rio de Janeiro/T2_BR_UERJ/UERJ.yaml	
@@ -136,7 +136,7 @@ Resources:
     Services:
       Squid:
         Description: Hepgrid Squid service
-UERJ_perfSONAR_BW:
+  UERJ_perfSONAR_BW:
     Active: true
     ID: 1120
     ContactLists:
@@ -157,7 +157,7 @@ UERJ_perfSONAR_BW:
           endpoint:perfsonar-bw.hepgrid.uerj.br
     VOOwnership:
       CMS: 100
-UERJ_perfSONAR_LT:
+  UERJ_perfSONAR_LT:
     Active: true
     ID: 1121
     ContactLists: