diff --git a/MAC/Deployment/data/StaticMetaData/RSPConnections_Cobalt.dat b/MAC/Deployment/data/StaticMetaData/RSPConnections_Cobalt.dat index 38dbc036b2de2c5f6d4f460265722ebd9534dacb..af07cb061d32eb072d8f9c7117572d1b1704b171 100644 --- a/MAC/Deployment/data/StaticMetaData/RSPConnections_Cobalt.dat +++ b/MAC/Deployment/data/StaticMetaData/RSPConnections_Cobalt.dat @@ -9,213 +9,181 @@ # 1x48 HBA tiles, one for 2x24 HBA tiles. These have two separate # entries in this file. # +# International stations have one entry per VLAN. Each set of entries +# must be duplicated to obtain the settings for the 4 RSP boards that +# send data. +# # IMPORTANT !!!!!! BEWARE # # The items in the seperate lines of this file must be seperated by either a SINGLE whitespace or a single tab!!!! # Furthermore, this file is read by PVSS controllers to fill in the database, ANY change could possibly have an impact # on PVSS, so please double check. In case of doubt, contact the PVSS maintainer # -# Reroute to Cobalt, valid from 2013-10-29. -# The Cobalt machines are put behind the BG-x switches, replacing R01. -# # The network configuration is as follows: # -# BG0 -> cbt001 -# BG0 -> cbt002 -# BG1 -> cbt003 -# BG1 -> cbt004 -# BG2 -> cbt005 -# BG2 -> cbt006 -# BG3 -> cbt007 -# BG3 -> cbt008 -# BG2 -> cbt009 - -# CS001 -> BG3 +# RD1 -> cbt001 +# RD1 -> cbt002 +# RD0 -> cbt003 +# RD0 -> cbt004 +# RD0 -> cbt005 +# RD1 -> cbt006 +# RD1 -> cbt007 +# RD0 -> cbt008 +# RD0 -> cbt009 +# RD1 -> cbt010 + CS001 RSP_0 cbt007-10GB01 10.168.102.1 A0:36:9F:1F:79:04 CS001 RSP_1 cbt007-10GB01 10.168.102.1 A0:36:9F:1F:79:04 -# CS002 -> BG1 CS002 RSP_0 cbt003-10GB01 10.168.98.1 A0:36:9F:1F:78:0C CS002 RSP_1 cbt003-10GB01 10.168.98.1 A0:36:9F:1F:78:0C -# CS003 -> BG2 CS003 RSP_0 cbt005-10GB01 10.168.100.1 A0:36:9F:1F:7B:74 CS003 RSP_1 cbt005-10GB01 10.168.100.1 A0:36:9F:1F:7B:74 -# CS004 -> BG3 CS004 RSP_0 cbt008-10GB01 10.168.103.1 A0:36:9F:1F:79:00 CS004 RSP_1 cbt008-10GB01 10.168.103.1 A0:36:9F:1F:79:00 -# CS005 -> BG0 CS005 RSP_0 cbt001-10GB01 10.168.96.1 A0:36:9F:1F:78:A4 CS005 RSP_1 cbt001-10GB01 10.168.96.1 A0:36:9F:1F:78:A4 -# CS006 -> BG1 CS006 RSP_0 cbt004-10GB01 10.168.99.1 A0:36:9F:1F:79:94 CS006 RSP_1 cbt004-10GB01 10.168.99.1 A0:36:9F:1F:79:94 -# CS007 -> BG2 CS007 RSP_0 cbt006-10GB01 10.168.101.1 A0:36:9F:1F:79:A4 CS007 RSP_1 cbt006-10GB01 10.168.101.1 A0:36:9F:1F:79:A4 -# CS011 -> BG1 CS011 RSP_0 cbt003-10GB02 10.168.98.2 A0:36:9F:1F:78:0E CS011 RSP_1 cbt003-10GB02 10.168.98.2 A0:36:9F:1F:78:0E -# CS013 -> BG2 CS013 RSP_0 cbt005-10GB02 10.168.100.2 A0:36:9F:1F:7B:76 CS013 RSP_1 cbt005-10GB02 10.168.100.2 A0:36:9F:1F:7B:76 -# CS017 -> BG0 CS017 RSP_0 cbt002-10GB01 10.168.97.1 A0:36:9F:1F:73:40 CS017 RSP_1 cbt002-10GB01 10.168.97.1 A0:36:9F:1F:73:40 -# CS021 -> BG0 CS021 RSP_0 cbt001-10GB02 10.168.96.2 A0:36:9F:1F:78:A6 CS021 RSP_1 cbt001-10GB02 10.168.96.2 A0:36:9F:1F:78:A6 -# CS024 -> BG3 CS024 RSP_0 cbt007-10GB02 10.168.102.2 A0:36:9F:1F:79:06 CS024 RSP_1 cbt007-10GB02 10.168.102.2 A0:36:9F:1F:79:06 -# CS026 -> BG1 CS026 RSP_0 cbt004-10GB02 10.168.99.2 A0:36:9F:1F:79:96 CS026 RSP_1 cbt004-10GB02 10.168.99.2 A0:36:9F:1F:79:96 -# CS028 -> BG1 CS028 RSP_0 cbt003-10GB03 10.168.98.3 A0:36:9F:1F:7B:40 CS028 RSP_1 cbt003-10GB03 10.168.98.3 A0:36:9F:1F:7B:40 -# CS030 -> BG2 CS030 RSP_0 cbt006-10GB02 10.168.101.2 A0:36:9F:1F:79:A6 CS030 RSP_1 cbt006-10GB02 10.168.101.2 A0:36:9F:1F:79:A6 -# CS031 -> BG1 CS031 RSP_0 cbt004-10GB03 10.168.99.3 A0:36:9F:1F:7A:04 CS031 RSP_1 cbt004-10GB03 10.168.99.3 A0:36:9F:1F:7A:04 -# CS032 -> BG0 CS032 RSP_0 cbt002-10GB02 10.168.97.2 A0:36:9F:1F:73:42 CS032 RSP_1 cbt002-10GB02 10.168.97.2 A0:36:9F:1F:73:42 -# CS101 -> BG0 CS101 RSP_0 cbt001-10GB03 10.168.96.3 A0:36:9F:1F:7B:44 CS101 RSP_1 cbt001-10GB03 10.168.96.3 A0:36:9F:1F:7B:44 -# CS103 -> BG3 CS103 RSP_0 cbt008-10GB02 10.168.103.2 A0:36:9F:1F:79:02 CS103 RSP_1 cbt008-10GB02 10.168.103.2 A0:36:9F:1F:79:02 -# CS201 -> BG1 -CS201 RSP_0 cbt003-10GB02 10.168.98.2 A0:36:9F:1F:78:0E -CS201 RSP_1 cbt003-10GB04 10.168.98.4 A0:36:9F:1F:7B:42 +CS201 RSP_0 cbt003-10GB01 10.168.98.1 A0:36:9F:1F:78:0C +CS201 RSP_1 cbt003-10GB02 10.168.98.2 A0:36:9F:1F:78:0E -# CS301 -> BG2 CS301 RSP_0 cbt005-10GB03 10.168.100.3 A0:36:9F:1F:79:E0 CS301 RSP_1 cbt005-10GB03 10.168.100.3 A0:36:9F:1F:79:E0 -# CS302 -> BG1 CS302 RSP_0 cbt004-10GB01 10.168.99.1 A0:36:9F:1F:79:94 CS302 RSP_1 cbt004-10GB02 10.168.99.2 A0:36:9F:1F:79:96 -# CS401 -> BG3 CS401 RSP_0 cbt007-10GB03 10.168.102.3 A0:36:9F:1F:7B:3C CS401 RSP_1 cbt007-10GB03 10.168.102.3 A0:36:9F:1F:7B:3C -# CS501 -> BG2 CS501 RSP_0 cbt006-10GB03 10.168.101.3 A0:36:9F:1F:7A:34 CS501 RSP_1 cbt006-10GB03 10.168.101.3 A0:36:9F:1F:7A:34 -# RS104 -> BG0 RS104 RSP_0 cbt002-10GB03 10.168.97.3 A0:36:9F:1F:79:A0 -# RS106 -> BG3 RS106 RSP_0 cbt008-10GB03 10.168.103.3 A0:36:9F:1F:7B:68 -# RS205 -> BG3 RS205 RSP_0 cbt007-10GB04 10.168.102.4 A0:36:9F:1F:7B:3E -# RS208 -> BG0 RS208 RSP_0 cbt001-10GB04 10.168.96.4 A0:36:9F:1F:7B:46 -# RS210 -> BG2 RS210 RSP_0 cbt005-10GB03 10.168.100.3 A0:36:9F:1F:79:E0 -# RS305 -> BG2 RS305 RSP_0 cbt006-10GB04 10.168.101.4 A0:36:9F:1F:7A:36 -# RS306 -> BG2 RS306 RSP_0 cbt005-10GB01 10.168.100.1 A0:36:9F:1F:7B:74 -# RS307 -> BG3 RS307 RSP_0 cbt008-10GB01 10.168.103.1 A0:36:9F:1F:79:00 -# RS310 -> BG0 RS310 RSP_0 cbt002-10GB04 10.168.97.4 A0:36:9F:1F:79:A2 -# RS406 -> BG3 RS406 RSP_0 cbt007-10GB03 10.168.102.3 A0:36:9F:1F:7B:3C -# RS407 -> BG0 RS407 RSP_0 cbt001-10GB04 10.168.96.4 A0:36:9F:1F:7B:46 -# RS409 -> BG0 RS409 RSP_0 cbt002-10GB03 10.168.97.3 A0:36:9F:1F:79:A0 -# RS410 -> BG0 RS410 RSP_0 cbt002-10GB04 10.168.97.4 A0:36:9F:1F:79:A2 -# RS503 -> BG2 RS503 RSP_0 cbt006-10GB04 10.168.101.4 A0:36:9F:1F:7A:36 -# RS508 -> BG3 RS508 RSP_0 cbt008-10GB03 10.168.103.3 A0:36:9F:1F:7B:68 -# RS509 -> BG3 RS509 RSP_0 cbt007-10GB04 10.168.102.4 A0:36:9F:1F:7B:3E -# DE601 -> BG3 DE601 RSP_0 cbt008-10GB04 10.211.1.108 A0:36:9F:1F:7B:6A DE601 RSP_0 cbt008-10GB04 10.212.1.108 A0:36:9F:1F:7B:6A DE601 RSP_0 cbt008-10GB04 10.213.1.108 A0:36:9F:1F:7B:6A DE601 RSP_0 cbt008-10GB04 10.214.1.108 A0:36:9F:1F:7B:6A -# DE602 -> BG1 DE602 RSP_0 cbt003-10GB04 10.200.41.103 A0:36:9F:1F:7B:42 -# DE603 -> BG1 DE603 RSP_0 cbt004-10GB04 10.211.1.104 A0:36:9F:1F:7A:06 DE603 RSP_0 cbt004-10GB04 10.212.1.104 A0:36:9F:1F:7A:06 DE603 RSP_0 cbt004-10GB04 10.213.1.104 A0:36:9F:1F:7A:06 DE603 RSP_0 cbt004-10GB04 10.214.1.104 A0:36:9F:1F:7A:06 -# DE604 -> BG1 DE604 RSP_0 cbt003-10GB04 10.200.81.103 A0:36:9F:1F:7B:42 -# DE605 -> BG3 DE605 RSP_0 cbt008-10GB04 10.211.1.108 A0:36:9F:1F:7B:6A DE605 RSP_0 cbt008-10GB04 10.212.1.108 A0:36:9F:1F:7B:6A DE605 RSP_0 cbt008-10GB04 10.213.1.108 A0:36:9F:1F:7B:6A DE605 RSP_0 cbt008-10GB04 10.214.1.108 A0:36:9F:1F:7B:6A -# FR606 -> BG2 FR606 RSP_0 cbt005-10GB04 10.211.1.105 A0:36:9F:1F:79:E2 FR606 RSP_0 cbt005-10GB04 10.212.1.105 A0:36:9F:1F:79:E2 FR606 RSP_0 cbt005-10GB04 10.213.1.105 A0:36:9F:1F:79:E2 FR606 RSP_0 cbt005-10GB04 10.214.1.105 A0:36:9F:1F:79:E2 -# SE607 -> BG2 SE607 RSP_0 cbt004-10GB04 10.211.1.104 A0:36:9F:1F:7A:06 SE607 RSP_0 cbt004-10GB04 10.212.1.104 A0:36:9F:1F:7A:06 SE607 RSP_0 cbt004-10GB04 10.213.1.104 A0:36:9F:1F:7A:06 SE607 RSP_0 cbt004-10GB04 10.214.1.104 A0:36:9F:1F:7A:06 -# UK608 -> BG2 UK608 RSP_0 cbt005-10GB04 10.211.1.105 A0:36:9F:1F:79:E2 UK608 RSP_0 cbt005-10GB04 10.212.1.105 A0:36:9F:1F:79:E2 UK608 RSP_0 cbt005-10GB04 10.213.1.105 A0:36:9F:1F:79:E2 UK608 RSP_0 cbt005-10GB04 10.214.1.105 A0:36:9F:1F:79:E2 -# DE609 -> BG2 DE609 RSP_0 cbt008-10GB04 10.200.91.108 A0:36:9F:1F:7B:6A DE609 RSP_0 cbt008-10GB04 10.200.92.108 A0:36:9F:1F:7B:6A + +PL610 RSP_0 cbt003-10GB04 10.211.1.103 A0:36:9F:1F:7B:42 +PL610 RSP_0 cbt003-10GB04 10.212.1.103 A0:36:9F:1F:7B:42 +PL610 RSP_0 cbt003-10GB04 10.213.1.103 A0:36:9F:1F:7B:42 +PL610 RSP_0 cbt003-10GB04 10.214.1.103 A0:36:9F:1F:7B:42 + +PL611 RSP_0 cbt004-10GB04 10.211.1.104 A0:36:9F:1F:7A:06 +PL611 RSP_0 cbt004-10GB04 10.212.1.104 A0:36:9F:1F:7A:06 +PL611 RSP_0 cbt004-10GB04 10.213.1.104 A0:36:9F:1F:7A:06 +PL611 RSP_0 cbt004-10GB04 10.214.1.104 A0:36:9F:1F:7A:06 + +PL612 RSP_0 cbt005-10GB04 10.211.1.105 A0:36:9F:1F:79:E2 +PL612 RSP_0 cbt005-10GB04 10.212.1.105 A0:36:9F:1F:79:E2 +PL612 RSP_0 cbt005-10GB04 10.213.1.105 A0:36:9F:1F:79:E2 +PL612 RSP_0 cbt005-10GB04 10.214.1.105 A0:36:9F:1F:79:E2 diff --git a/RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/StationStreams.parset b/RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/StationStreams.parset index e1f86d069fc8cca339bb9df01f4a225534a28468..cdc1ca47a9514cc167bd071aa31ed415c6d130cd 100644 --- a/RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/StationStreams.parset +++ b/RTCP/Cobalt/GPUProc/etc/parset-additions.d/default/StationStreams.parset @@ -151,13 +151,13 @@ PIC.Core.CS103HBA1.RSP.ports = [udp:cbt008-10GB02:11036, udp:cbt008-10GB02:11 PIC.Core.CS103HBA1.RSP.receiver = cbt008_0 PIC.Core.CS103LBA.RSP.ports = [udp:cbt008-10GB02:11030, udp:cbt008-10GB02:11031, udp:cbt008-10GB02:11032, udp:cbt008-10GB02:11033] PIC.Core.CS103LBA.RSP.receiver = cbt008_0 -PIC.Core.CS201HBA.RSP.ports = [udp:cbt003-10GB02:12010, udp:cbt003-10GB02:12011, udp:cbt003-10GB02:12012, udp:cbt003-10GB02:12013] +PIC.Core.CS201HBA.RSP.ports = [udp:cbt003-10GB01:12010, udp:cbt003-10GB01:12011, udp:cbt003-10GB01:12012, udp:cbt003-10GB01:12013] PIC.Core.CS201HBA.RSP.receiver = cbt003_0 -PIC.Core.CS201HBA0.RSP.ports = [udp:cbt003-10GB02:12010, udp:cbt003-10GB02:12011, udp:cbt003-10GB02:12012, udp:cbt003-10GB02:12013] +PIC.Core.CS201HBA0.RSP.ports = [udp:cbt003-10GB01:12010, udp:cbt003-10GB01:12011, udp:cbt003-10GB01:12012, udp:cbt003-10GB01:12013] PIC.Core.CS201HBA0.RSP.receiver = cbt003_0 -PIC.Core.CS201HBA1.RSP.ports = [udp:cbt003-10GB04:12016, udp:cbt003-10GB04:12017, udp:cbt003-10GB04:12018, udp:cbt003-10GB04:12019] -PIC.Core.CS201HBA1.RSP.receiver = cbt003_1 -PIC.Core.CS201LBA.RSP.ports = [udp:cbt003-10GB02:12010, udp:cbt003-10GB02:12011, udp:cbt003-10GB02:12012, udp:cbt003-10GB02:12013] +PIC.Core.CS201HBA1.RSP.ports = [udp:cbt003-10GB02:12016, udp:cbt003-10GB02:12017, udp:cbt003-10GB02:12018, udp:cbt003-10GB02:12019] +PIC.Core.CS201HBA1.RSP.receiver = cbt003_0 +PIC.Core.CS201LBA.RSP.ports = [udp:cbt003-10GB01:12010, udp:cbt003-10GB01:12011, udp:cbt003-10GB01:12012, udp:cbt003-10GB01:12013] PIC.Core.CS201LBA.RSP.receiver = cbt003_0 PIC.Core.CS301HBA.RSP.ports = [udp:cbt005-10GB03:13010, udp:cbt005-10GB03:13011, udp:cbt005-10GB03:13012, udp:cbt005-10GB03:13013] PIC.Core.CS301HBA.RSP.receiver = cbt005_1 @@ -219,6 +219,18 @@ PIC.Core.FR606HBA.RSP.ports = [udp:10.211.1.105:16060, udp:10.212.1.105:1606 PIC.Core.FR606HBA.RSP.receiver = cbt005_1 PIC.Core.FR606LBA.RSP.ports = [udp:10.211.1.105:16060, udp:10.212.1.105:16061, udp:10.213.1.105:16062, udp:10.214.1.105:16063] PIC.Core.FR606LBA.RSP.receiver = cbt005_1 +PIC.Core.PL610HBA.RSP.ports = [udp:10.211.1.103:16100, udp:10.212.1.103:16101, udp:10.213.1.103:16102, udp:10.214.1.103:16103] +PIC.Core.PL610HBA.RSP.receiver = cbt003_1 +PIC.Core.PL610LBA.RSP.ports = [udp:10.211.1.103:16100, udp:10.212.1.103:16101, udp:10.213.1.103:16102, udp:10.214.1.103:16103] +PIC.Core.PL610LBA.RSP.receiver = cbt003_1 +PIC.Core.PL611HBA.RSP.ports = [udp:10.211.1.104:16110, udp:10.212.1.104:16111, udp:10.213.1.104:16112, udp:10.214.1.104:16113] +PIC.Core.PL611HBA.RSP.receiver = cbt004_1 +PIC.Core.PL611LBA.RSP.ports = [udp:10.211.1.104:16110, udp:10.212.1.104:16111, udp:10.213.1.104:16112, udp:10.214.1.104:16113] +PIC.Core.PL611LBA.RSP.receiver = cbt004_1 +PIC.Core.PL612HBA.RSP.ports = [udp:10.211.1.105:16120, udp:10.212.1.105:16121, udp:10.213.1.105:16122, udp:10.214.1.105:16123] +PIC.Core.PL612HBA.RSP.receiver = cbt005_1 +PIC.Core.PL612LBA.RSP.ports = [udp:10.211.1.105:16120, udp:10.212.1.105:16121, udp:10.213.1.105:16122, udp:10.214.1.105:16123] +PIC.Core.PL612LBA.RSP.receiver = cbt005_1 PIC.Core.RS104HBA.RSP.ports = [udp:cbt002-10GB03:11040, udp:cbt002-10GB03:11041, udp:cbt002-10GB03:11042, udp:cbt002-10GB03:11043] PIC.Core.RS104HBA.RSP.receiver = cbt002_1 PIC.Core.RS104LBA.RSP.ports = [udp:cbt002-10GB03:11040, udp:cbt002-10GB03:11041, udp:cbt002-10GB03:11042, udp:cbt002-10GB03:11043]