Skip to content

Commit

Permalink
Merge pull request #469 from tcmitchell/aggs
Browse files Browse the repository at this point in the history 
Add aggregate configurations
  • Loading branch information
@tcmitchell
tcmitchell committed Mar 15, 2016
2 parents 2254c98 + fa93bd3 commit 4060ca1
Show file tree
Hide file tree
Showing 12 changed files with 28 additions and 240 deletions.
23 changes: 14 additions & 9 deletions data/Makefile.am
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ AM_SQL = \
sr/sql/add-clemson-ig-of.sql \
sr/sql/add-clemson-ig.sql \
sr/sql/add-clemson-og.sql \
sr/sql/add-colorado-ig-of.sql \
sr/sql/add-colorado-ig.sql \
sr/sql/add-cornell-ig-of.sql \
sr/sql/add-cornell-ig.sql \
sr/sql/add-cwru-ig.sql \
Expand All @@ -29,6 +31,8 @@ AM_SQL = \
sr/sql/add-gpo-ig-of.sql \
sr/sql/add-gpo-ig.sql \
sr/sql/add-gpo-og.sql \
sr/sql/add-hawaii-ig-of.sql \
sr/sql/add-hawaii-ig.sql \
sr/sql/add-illinois-ig-of.sql \
sr/sql/add-illinois-ig.sql \
sr/sql/add-illinois-vts.sql \
Expand Down Expand Up @@ -61,6 +65,8 @@ AM_SQL = \
sr/sql/add-ohmetrodc-ig.sql \
sr/sql/add-osf-eg-of.sql \
sr/sql/add-osf-eg.sql \
sr/sql/add-princeton-ig.sql \
sr/sql/add-princeton-ig-of.sql \
sr/sql/add-renci-eg-of.sql \
sr/sql/add-renci-eg.sql \
sr/sql/add-rutgers-ig-of.sql \
Expand Down Expand Up @@ -88,10 +94,14 @@ AM_SQL = \
sr/sql/add-ukl-og.sql \
sr/sql/add-uky-ig-of.sql \
sr/sql/add-uky-ig.sql \
sr/sql/add-ukymcv-ig-of.sql \
sr/sql/add-ukymcv-ig.sql \
sr/sql/add-uky-pg.sql \
sr/sql/add-ukypks2-ig-of.sql \
sr/sql/add-ukypks2-ig.sql \
sr/sql/add-ukypks2-vts.sql \
sr/sql/add-umich-ig-of.sql \
sr/sql/add-umich-ig.sql \
sr/sql/add-umkc-ig-of.sql \
sr/sql/add-umkc-ig.sql \
sr/sql/add-utah-clab.sql \
Expand All @@ -103,6 +113,10 @@ AM_SQL = \
sr/sql/add-utahddc-ig.sql \
sr/sql/add-utc-ig-of.sql \
sr/sql/add-utc-ig.sql \
sr/sql/add-uwashington-ig-of.sql \
sr/sql/add-uwashington-ig.sql \
sr/sql/add-vt-ig-of.sql \
sr/sql/add-vt-ig.sql \
sr/sql/add-wall2.sql \
sr/sql/add-wisconsin-ig-of.sql \
sr/sql/add-wisconsin-ig.sql \
Expand Down Expand Up @@ -167,9 +181,6 @@ dist_srcerts_DATA = \
sr/certs/clemson-ig-cm.pem \
sr/certs/clemson-ig-of.pem \
sr/certs/clemson-og.pem \
sr/certs/colorado-ig-boss.pem \
sr/certs/colorado-ig-cm.pem \
sr/certs/colorado-ig-of.pem \
sr/certs/cornell-ig-boss.pem \
sr/certs/cornell-ig-cm.pem \
sr/certs/cornell-ig-of.pem \
Expand Down Expand Up @@ -232,9 +243,6 @@ dist_srcerts_DATA = \
sr/certs/ohmetrodc-ig-of.pem \
sr/certs/osf-eg-of.pem \
sr/certs/osf-eg.pem \
sr/certs/princeton-ig-boss.pem \
sr/certs/princeton-ig-cm.pem \
sr/certs/princeton-ig-of.pem \
sr/certs/renci-eg-of.pem \
sr/certs/renci-eg.pem \
sr/certs/rutgers-ig-boss.pem \
Expand Down Expand Up @@ -288,9 +296,6 @@ dist_srcerts_DATA = \
sr/certs/utc-ig-boss.pem \
sr/certs/utc-ig-cm.pem \
sr/certs/utc-ig-of.pem \
sr/certs/uwashington-ig-boss.pem \
sr/certs/uwashington-ig-cm.pem \
sr/certs/uwashington-ig-of.pem \
sr/certs/wall2-ca.pem \
sr/certs/wall2-cm.pem \
sr/certs/wisconsin-ig-boss.pem \
Expand Down
20 changes: 14 additions & 6 deletions data/sr/aggdata.csv
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ cenic-ig-of,https://foam.instageni.cenic.net:3626/foam/gapi/2,cenic-ig-of.pem,CE
clemson-ig,https://instageni.clemson.edu:12369/protogeni/xmlrpc/am/2.0,clemson-ig-cm.pem,Clemson InstaGENI,Clemson InstaGENI Rack,urn:publicid:IDN+instageni.clemson.edu+authority+cm,clemson-ig-boss.pem,ui_instageni_am,ui_prod_cat ui_compute_cat ui_stitchable_cat,Y
clemson-ig-of,https://foam.instageni.clemson.edu:3626/foam/gapi/2,clemson-ig-of.pem,Clemson InstaGENI OpenFlow,Clemson InstaGENI Rack OpenFlow,urn:publicid:IDN+openflow:foam:foam.instageni.clemson.edu+authority+am,clemson-ig-of.pem,ui_foam_am,ui_prod_cat ui_network_cat,N
clemson-og,https://clemson-clemson-control-1.clemson.edu:5002,clemson-og.pem,Clemson OpenGENI,Clemson OpenGENI Rack,urn:publicid:IDN+clemson-clemson-control-1.clemson.edu+authority+am,clemson-og.pem,ui_other_am,ui_prod_cat ui_compute_cat,Y
colorado-ig,https://instageni.colorado.edu:12369/protogeni/xmlrpc/am/2.0,colorado-ig-cm.pem,Colorado InstaGENI,Colorado InstaGENI Rack,urn:publicid:IDN+instageni.colorado.edu+authority+cm,colorado-ig-boss.pem,ui_instageni_am,ui_experimental_cat ui_compute_cat,Y
colorado-ig-of,https://foam.instageni.colorado.edu:3626/foam/gapi/2,colorado-ig-of.pem,Colorado InstaGENI OpenFlow,Colorado InstaGENI Rack OpenFlow,urn:publicid:IDN+openflow:foam:foam.instageni.colorado.edu+authority+am,colorado-ig-of.pem,ui_foam_am,ui_experimental_cat ui_network_cat,N
colorado-ig,https://instageni.colorado.edu:12369/protogeni/xmlrpc/am/2.0,,Colorado InstaGENI,Colorado InstaGENI Rack,urn:publicid:IDN+instageni.colorado.edu+authority+cm,,ui_instageni_am,ui_experimental_cat ui_compute_cat,Y
colorado-ig-of,https://foam.instageni.colorado.edu:3626/foam/gapi/2,,Colorado InstaGENI OpenFlow,Colorado InstaGENI Rack OpenFlow,urn:publicid:IDN+openflow:foam:foam.instageni.colorado.edu+authority+am,,ui_foam_am,ui_experimental_cat ui_network_cat,N
cwru-ig,https://geni.case.edu:12369/protogeni/xmlrpc/am/2.0,cwru-ig-cm.pem,Case Western InstaGENI,Case Western InstaGENI Rack,urn:publicid:IDN+geni.case.edu+authority+cm,cwru-ig-boss.pem,ui_instageni_am,ui_prod_cat ui_compute_cat ui_stitchable_cat,Y
exosm,https://geni.renci.org:11443/orca/xmlrpc,exosm.pem,ExoSM,ExoSM,urn:publicid:IDN+exogeni.net+authority+am,exosm.pem,ui_exogeni_am,ui_dev_cat ui_compute_cat,Y
gatech-ig,https://instageni.rnoc.gatech.edu:12369/protogeni/xmlrpc/am/2.0,gatech-ig-cm.pem,Georgia Tech InstaGENI,InstaGENI Georgia Tech Rack,urn:publicid:IDN+instageni.rnoc.gatech.edu+authority+cm,gatech-ig-boss.pem,ui_instageni_am,ui_prod_cat ui_compute_cat ui_stitchable_cat,Y
Expand All @@ -28,8 +28,8 @@ ohmetrodc-ig,https://instageni.metrodatacenter.com:12369/protogeni/xmlrpc/am/2.0
ohmetrodc-ig-of,https://foam.instageni.metrodatacenter.com:3626/foam/gapi/2,ohmetrodc-ig-of.pem,Ohio Metro Data Center InstaGENI OpenFlow,Ohio Metro Data Center InstaGENI Rack OpenFlow,urn:publicid:IDN+openflow:foam:foam.instageni.metrodatacenter.com+authority+am,ohmetrodc-ig-of.pem,ui_foam_am,ui_experimental_cat ui_network_cat,N
osf-eg,https://osf-hn.exogeni.net:11443/orca/xmlrpc,osf-eg.pem,OSF ExoGENI,OSF ExoGENI Rack,urn:publicid:IDN+exogeni.net:osfvmsite+authority+am,osf-eg.pem,ui_exogeni_am,ui_prod_cat ui_compute_cat,Y
osf-eg-of,https://osf-hn.exogeni.net:3626/foam/gapi/2,osf-eg-of.pem,OSF ExoGENI OpenFlow,OSF ExoGENI Rack OpenFlow,urn:publicid:IDN+openflow:foam:osf-hn.exogeni.net+authority+am,osf-eg-of.pem,ui_foam_am,ui_experimental_cat ui_network_cat,N
princeton-ig,https://instageni.cs.princeton.edu:12369/protogeni/xmlrpc/am/2.0,princeton-ig-cm.pem,Princeton InstaGENI,Princeton InstaGENI Rack,urn:publicid:IDN+instageni.cs.princeton.edu+authority+cm,princeton-ig-boss.pem,ui_instageni_am,ui_dev_cat ui_compute_cat,Y
princeton-ig-of,https://foam.instageni.cs.princeton.edu:3626/foam/gapi/2,princeton-ig-of.pem,Princeton InstaGENI OpenFlow,Princeton InstaGENI Rack OpenFlow,urn:publicid:IDN+openflow:foam:foam.instageni.cs.princeton.edu+authority+am,princeton-ig-of.pem,ui_foam_am,ui_dev_cat ui_network_cat,N
princeton-ig,https://instageni.cs.princeton.edu:12369/protogeni/xmlrpc/am/2.0,,Princeton InstaGENI,Princeton InstaGENI Rack,urn:publicid:IDN+instageni.cs.princeton.edu+authority+cm,,ui_instageni_am,ui_dev_cat ui_compute_cat,Y
princeton-ig-of,https://foam.instageni.cs.princeton.edu:3626/foam/gapi/2,,Princeton InstaGENI OpenFlow,Princeton InstaGENI Rack OpenFlow,urn:publicid:IDN+openflow:foam:foam.instageni.cs.princeton.edu+authority+am,,ui_foam_am,ui_dev_cat ui_network_cat,N
renci-eg,https://rci-hn.exogeni.net:11443/orca/xmlrpc,renci-eg.pem,RENCI ExoGENI,RENCI ExoGENI Rack,urn:publicid:IDN+exogeni.net:rcivmsite+authority+am,renci-eg.pem,ui_exogeni_am,ui_dev_cat ui_compute_cat,Y
renci-eg-of,https://rci-hn.exogeni.net:3626/foam/gapi/2,renci-eg-of.pem,RENCI ExoGENI OpenFlow,RENCI ExoGENI Rack OpenFlow,urn:publicid:IDN+openflow:foam:rci-hn.exogeni.net+authority+am,renci-eg-of.pem,ui_foam_am,ui_dev_cat ui_network_cat,N
rutgers-ig,https://instageni.rutgers.edu:12369/protogeni/xmlrpc/am/2.0,rutgers-ig-cm.pem,Rutgers InstaGENI,Rutgers InstaGENI Rack,urn:publicid:IDN+instageni.rutgers.edu+authority+cm,rutgers-ig-boss.pem,ui_instageni_am,ui_prod_cat ui_compute_cat ui_stitchable_cat,Y
Expand All @@ -52,14 +52,18 @@ uky-ig,https://boss.lan.sdn.uky.edu:12369/protogeni/xmlrpc/am/2.0,uky-ig-cm.pem,
uky-ig-of,https://foam.lan.sdn.uky.edu:3626/foam/gapi/2,uky-ig-of.pem,Kentucky InstaGENI OpenFlow,University of Kentucky InstaGENI Rack OpenFlow,urn:publicid:IDN+openflow:foam:foam.lan.sdn.uky.edu+authority+am,uky-ig-of.pem,ui_foam_am,ui_prod_cat ui_network_cat,N
ukypks2-ig,https://pks2.sdn.uky.edu:12369/protogeni/xmlrpc/am/2.0,ukypks2-ig-cm.pem,Kentucky PKS2 InstaGENI,Kentucky PKS2 InstaGENI Rack,urn:publicid:IDN+pks2.sdn.uky.edu+authority+cm,ukypks2-ig-boss.pem,ui_instageni_am,ui_prod_cat ui_compute_cat ui_stitchable_cat,Y
ukypks2-ig-of,https://foam.pks2.sdn.uky.edu:3626/foam/gapi/2,ukypks2-ig-of.pem,Kentucky PKS2 InstaGENI OpenFlow,Kentucky PKS2 InstaGENI Rack OpenFlow,urn:publicid:IDN+openflow:foam:foam.pks2.sdn.uky.edu+authority+am,ukypks2-ig-of.pem,ui_foam_am,ui_prod_cat ui_network_cat,N
ukymcv-ig,https://mcv.sdn.uky.edu:12369/protogeni/xmlrpc/am,,Kentucky MCV InstaGENI,Kentucky MCV InstaGENI Rack,urn:publicid:IDN+mcv.sdn.uky.edu+authority+cm,,ui_instageni_am,ui_prod_cat ui_compute_cat ui_stitchable_cat,Y
ukymcv-ig-of, https://mcv.sdn.uky.edu:3626/foam/gapi/2,,Kentucky MCV InstaGENI OpenFlow,Kentucky MCV InstaGENI Rack OpenFlow,urn:publicid:IDN+openflow:foam:foam.mcv.sdn.uky.edu+authority+am,,ui_foam_am,ui_prod_cat ui_network_cat,N
umich-ig,https://instageni.research.umich.edu:12369/protogeni/xmlrpc/am,,University of Michigan InstaGENI,University of Michigan InstaGENI Rack,urn:publicid:IDN+instageni.research.umich.edu+authority+cm,,ui_instageni_am,ui_prod_cat ui_compute_cat,Y
umich-ig-of,https://foam.instageni.research.umich.edu:3626/foam/gapi/2,,University of Michigan InstaGENI OpenFlow,University of Michigan InstaGENI Rack OpenFlow,urn:publicid:IDN+openflow:foam:foam.instageni.research.umich.edu+authority+am,,ui_foam_am,ui_prod_cat ui_network_cat,N
umkc-ig,https://instageni.umkc.edu:12369/protogeni/xmlrpc/am,umkc-ig-cm.pem,UMKC InstaGENI,UMKC InstaGENI Rack,urn:publicid:IDN+instageni.umkc.edu+authority+cm,umkc-ig-boss.pem,ui_instageni_am,ui_prod_cat ui_compute_cat ui_stitchable_cat,Y
umkc-ig-of,https://foam.instageni.umkc.edu:3626/foam/gapi/2,umkc-ig-of.pem,UMKC InstaGENI OpenFlow,UMKC InstaGENI Rack OpenFlow,urn:publicid:IDN+openflow:foam:foam.instageni.umkc.edu+authority+am,umkc-ig-of.pem,ui_foam_am,ui_prod_cat ui_network_cat,N
utah-clab,https://boss.utah.cloudlab.us:12369/protogeni/xmlrpc/am/2.0,utah-clab-cm.pem,Utah CloudLab,Utah CloudLab,urn:publicid:IDN+utah.cloudlab.us+authority+cm,utah-clab-boss.pem,ui_other_am,ui_federated_cat ui_compute_cat,Y
utah-stitch,https://stitch.geniracks.net:12369/protogeni/xmlrpc/am/2.0,utah-stitch-cm.pem,University of Utah Stitching,University of Utah Stitching,urn:publicid:IDN+stitch.geniracks.net+authority+cm,utah-stitch-boss.pem,ui_other_am,ui_prod_cat ui_network_cat,Y
utc-ig,https://instageni.utc.edu:12369/protogeni/xmlrpc/am/2.0,utc-ig-cm.pem,University of Tennessee at Chattanooga InstaGENI,University of Tennessee at Chattanooga InstaGENI Rack,urn:publicid:IDN+instageni.utc.edu+authority+cm,utc-ig-boss.pem,ui_instageni_am,ui_prod_cat ui_compute_cat ui_stitchable_cat,Y
utc-ig-of,https://foam.instageni.utc.edu:3626/foam/gapi/2,utc-ig-of.pem,University of Tennessee at Chattanooga InstaGENI OpenFlow,University of Tennessee at Chattanooga InstaGENI Rack OpenFlow,urn:publicid:IDN+openflow:foam:foam.instageni.utc.edu+authority+am,utc-ig-of.pem,ui_foam_am,ui_prod_cat ui_network_cat,N
uwashington-ig,https://instageni.washington.edu:12369/protogeni/xmlrpc/am/2.0,uwashington-ig-cm.pem,University of Washington InstaGENI,University of Washington InstaGENI Rack,urn:publicid:IDN+instageni.washington.edu+authority+cm,uwashington-ig-boss.pem,ui_instageni_am,ui_experimental_cat ui_compute_cat,Y
uwashington-ig-of,https://foam.instageni.washington.edu:3626/foam/gapi/2,uwashington-ig-of.pem,University of Washington InstaGENI OpenFlow,University of Washington InstaGENI Rack OpenFlow,urn:publicid:IDN+openflow:foam:foam.instageni.washington.edu+authority+am,uwashington-ig-of.pem,ui_foam_am,ui_experimental_cat ui_network_cat,N
uwashington-ig,https://instageni.washington.edu:12369/protogeni/xmlrpc/am/2.0,,University of Washington InstaGENI,University of Washington InstaGENI Rack,urn:publicid:IDN+instageni.washington.edu+authority+cm,,ui_instageni_am,ui_experimental_cat ui_compute_cat ui_stitchable_cat,Y
uwashington-ig-of,https://foam.instageni.washington.edu:3626/foam/gapi/2,,University of Washington InstaGENI OpenFlow,University of Washington InstaGENI Rack OpenFlow,urn:publicid:IDN+openflow:foam:foam.instageni.washington.edu+authority+am,,ui_foam_am,ui_experimental_cat ui_network_cat,N
wall2,https://www.wall2.ilabt.iminds.be:12369/protogeni/xmlrpc/am/2.0,wall2-cm.pem,iMinds Virtual Wall 2,iMinds Virtual Wall 2,urn:publicid:IDN+wall2.ilabt.iminds.be+authority+cm,wall2-ca.pem,ui_instageni_am,ui_federated_cat ui_compute_cat,Y
wsu-eg,https://wsu-hn.exogeni.net:11443/orca/xmlrpc,wsu-eg.pem,Wayne State ExoGENI,Wayne State ExoGENI Rack,urn:publicid:IDN+exogeni.net:wsuvmsite+authority+am,wsu-eg.pem,ui_exogeni_am,ui_prod_cat ui_compute_cat,Y
wsu-eg-of,https://wsu-hn.exogeni.net:3626/foam/gapi/2,wsu-eg-of.pem,Wayne State ExoGENI OpenFlow,Wayne State ExoGENI Rack OpenFlow,urn:publicid:IDN+openflow:foam:wsu-hn.exogeni.net+authority+am,wsu-eg-of.pem,ui_foam_am,ui_experimental_cat ui_network_cat,N
Expand Down Expand Up @@ -102,7 +106,11 @@ utahddc-ig,https://boss.utahddc.geniracks.net:12369/protogeni/xmlrpc/am/2.0,utah
utahddc-ig-of,https://foam.utahddc.geniracks.net:3626/foam/gapi/2,utahddc-ig-of.pem,UtahDDC InstaGENI OpenFlow,InstaGENI Utah DDC Rack OpenFlow,urn:publicid:IDN+openflow:foam:foam.utahddc.geniracks.net+authority+am,utahddc-ig-of.pem,ui_foam_am,ui_prod_cat ui_network_cat,N
wisconsin-ig,https://instageni.wisc.edu:12369/protogeni/xmlrpc/am/2.0,wisconsin-ig-cm.pem,Wisconsin InstaGENI,Wisconsin InstaGENI Rack,urn:publicid:IDN+instageni.wisc.edu+authority+cm,wisconsin-ig-boss.pem,ui_instageni_am,ui_prod_cat ui_compute_cat ui_stitchable_cat,N
wisconsin-ig-of,https://foam.instageni.wisc.edu:3626/foam/gapi/2,wisconsin-ig-of.pem,Wisconsin InstaGENI OpenFlow,Wisconsin InstaGENI Rack OpenFlow,urn:publicid:IDN+openflow:foam:foam.instageni.wisc.edu+authority+am,wisconsin-ig-of.pem,ui_foam_am,ui_prod_cat ui_network_cat,N
vt-ig,https://instageni.arc.vt.edu:12369/protogeni/xmlrpc/am,,Virginia Tech InstaGENI,Virginia Tech InstaGENI Rack,urn:publicid:IDN+instageni.arc.vt.edu+authority+cm,,ui_instageni_am,ui_prod_cat ui_compute_cat,N
vt-ig-of,https://foam.instageni.arc.vt.edu:3626/foam/gapi/2,,Virginia Tech InstaGENI OpenFlow,Virginia Tech InstaGENI Rack OpenFlow,urn:publicid:IDN+openflow:foam:foam.instageni.arc.vt.edu+authority+am,,ui_foam_am,ui_prod_cat ui_network_cat,N
starlight-vts,https://starlight.vts.bsswks.net:3626/foam/gapi/2,,Starlight VTS,Starlight VTS,urn:publicid:IDN+starlight.vts.bsswks.net+authority+cm,,ui_vts_am,ui_network_cat ui_experimental_cat,N
ukypks2-vts,https://ukypks2.vts.bsswks.net:3626/foam/gapi/2,,UKYPKS2 VTS,UKYPKS2 VTS,urn:publicid:IDN+uky.vts.bsswks.net+authority+cm,,ui_vts_am,ui_network_cat ui_experimental_cat,N
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,N
hawaii-ig-of, https://foam.instageni.hawaii.edu:3626/foam/gapi/2,,University of Hawaii InstaGENI OpenFlow,University of Hawaii InstaGENI Rack OpenFlow,urn:publicid:IDN+openflow:foam:foam.instageni.hawaii.edu+authority+am,,ui_foam_am,ui_prod_cat ui_network_cat,N
30 changes: 0 additions & 30 deletions data/sr/certs/colorado-ig-boss.pem
View file

This file was deleted.

24 changes: 0 additions & 24 deletions data/sr/certs/colorado-ig-cm.pem
View file

This file was deleted.

17 changes: 0 additions & 17 deletions data/sr/certs/colorado-ig-of.pem
View file

This file was deleted.

Loading

0 comments on commit 4060ca1

Please sign in to comment.