From c8862466d9f5e28435b1867484baa0bbb9124018 Mon Sep 17 00:00:00 2001 From: Hussamuddin Nasir Date: Fri, 14 Jul 2017 14:27:49 -0400 Subject: [PATCH 1/2] Add ULLAFAYETTE-IG to GENI portal #576 Add UTDallas-IG to GENI portal #575 Add UVM-IG to the GENI portal #574 --- data/Makefile.am | 3 +++ data/sr/aggdata.csv | 3 +++ geni-chapi.spec | 3 +++ 3 files changed, 9 insertions(+) diff --git a/data/Makefile.am b/data/Makefile.am index f31da14..3c9be72 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -75,6 +75,7 @@ AM_SQL = \ sr/sql/add-uky-pg.sql \ sr/sql/add-ukypks2-ig.sql \ sr/sql/add-ukypks2-vts.sql \ + sr/sql/add-ullafayette-ig.sql \ sr/sql/add-umich-ig.sql \ sr/sql/add-umkc-ig.sql \ sr/sql/add-utah-clab.sql \ @@ -83,6 +84,8 @@ AM_SQL = \ sr/sql/add-utah-stitch.sql \ sr/sql/add-utahddc-ig.sql \ sr/sql/add-utc-ig.sql \ + sr/sql/add-utdallas-ig.sql \ + sr/sql/add-uvm-ig.sql \ sr/sql/add-uwashington-ig.sql \ sr/sql/add-vt-ig.sql \ sr/sql/add-wall2.sql \ diff --git a/data/sr/aggdata.csv b/data/sr/aggdata.csv index 98b0614..0b4dd07 100644 --- a/data/sr/aggdata.csv +++ b/data/sr/aggdata.csv @@ -77,3 +77,6 @@ ukypks2-vts,https://ukypks2.vts.bsswks.net:3626/foam/gapi/2,,UKYPKS2 VTS,UKYPKS2 nps-vts,https://nps.vts.bsswks.net:3626/foam/gapi/2,,NPS VTS,NPS VTS,urn:publicid:IDN+nps.vts.bsswks.net+authority+cm,,ui_vts_am,ui_network_cat ui_experimental_cat,N illinois-vts,https://uiuc.vts.bsswks.net:3626/foam/gapi/2,,Illinois VTS,Illinois VTS,urn:publicid:IDN+uiuc.vts.bsswks.net+authority+cm,,ui_vts_am,ui_network_cat ui_experimental_cat,N hawaii-ig,https://instageni.hawaii.edu:12369/protogeni/xmlrpc/am,,University of Hawaii InstaGENI,University of Hawaii InstaGENI Rack,urn:publicid:IDN+instageni.hawaii.edu+authority+cm,,ui_instageni_am,ui_prod_cat ui_compute_cat,Y +uvm-ig,https://instageni.uvm.edu:12369/protogeni/xmlrpc/am,,University of Vermont InstaGENI,University of Vermont InstaGENI Rack,urn:publicid:IDN+instageni.uvm.edu+authority+cm,,ui_instageni_am,ui_prod_cat ui_compute_cat ui_stitchable_cat ui_federated_cat,Y +ullafayette-ig,https://instageni.louisiana.edu:12369/protogeni/xmlrpc/am,,University of Louisiana InstaGENI,University of Louisiana at Lafayette InstaGENI Rack,urn:publicid:IDN+instageni.louisiana.edu+authority+cm,,ui_instageni_am,ui_prod_cat ui_compute_cat ui_stitchable_cat ui_federated_cat,Y +utdallas-ig,https://instageni.utdallas.edu:12369/protogeni/xmlrpc/am,,University of Texas InstaGENI,University of Texas at Dallas at InstaGENI Rack,urn:publicid:IDN+instageni.utdallas.edu+authority+cm,,ui_instageni_am,ui_prod_cat ui_compute_cat ui_stitchable_cat ui_federated_cat,Y \ No newline at end of file diff --git a/geni-chapi.spec b/geni-chapi.spec index fbeb963..0fc0f56 100644 --- a/geni-chapi.spec +++ b/geni-chapi.spec @@ -536,6 +536,7 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/%{name}/sr/sql/add-ukymcv-ig.sql %{_datadir}/%{name}/sr/sql/add-ukypks2-ig.sql %{_datadir}/%{name}/sr/sql/add-ukypks2-vts.sql +%{_datadir}/%{name}/sr/sql/add-ullafayette-ig.sql %{_datadir}/%{name}/sr/sql/add-umich-ig.sql %{_datadir}/%{name}/sr/sql/add-umkc-ig.sql %{_datadir}/%{name}/sr/sql/add-utah-clab.sql @@ -544,6 +545,8 @@ rm -rf $RPM_BUILD_ROOT %{_datadir}/%{name}/sr/sql/add-utah-stitch.sql %{_datadir}/%{name}/sr/sql/add-utahddc-ig.sql %{_datadir}/%{name}/sr/sql/add-utc-ig.sql +%{_datadir}/%{name}/sr/sql/add-utdallas-ig.sql +%{_datadir}/%{name}/sr/sql/add-uvm-ig.sql %{_datadir}/%{name}/sr/sql/add-wall2.sql %{_datadir}/%{name}/sr/sql/add-uwashington-ig.sql %{_datadir}/%{name}/sr/sql/add-vt-ig.sql From ede019efdfd481652fe3bd2cd61e4373180c0515 Mon Sep 17 00:00:00 2001 From: Tom Mitchell Date: Mon, 17 Jul 2017 09:37:02 -0400 Subject: [PATCH 2/2] Note new racks in CHANGES file --- CHANGES.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGES.md b/CHANGES.md index ce21a7d..945eafd 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,6 +4,12 @@ ## Changes +* Add UVM US Ignite rack + ([#574](https://github.com/GENI-NSF/geni-ch/issues/574)) +* Add UT Dallas US Ignite rack + ([#575](https://github.com/GENI-NSF/geni-ch/issues/575)) +* Add University of Louisiana Lafayette US Ignite rack + ([#576](https://github.com/GENI-NSF/geni-ch/issues/576)) * Fix import error in geni-sign-tool-csr ([#577](https://github.com/GENI-NSF/geni-ch/issues/577))