Monitoring switch suppression

diff --git a/master/etc/dhcp/dhcpd.conf.cl0 b/master/etc/dhcp/dhcpd.conf.cl0
index 35ee1e2c1a8ff17842cba9f914912184efa1bdf9..44703096758d8f20dd18104d78557749f5418297 100644 (file)
--- a/master/etc/dhcp/dhcpd.conf.cl0
+++ b/master/etc/dhcp/dhcpd.conf.cl0
@@ -54,87 +54,77 @@ subnet 10.133.26.0 netmask 255.255.255.0
 # liste des lames a completer dans l'ordre de la baie
 
 #lame fusion, pistage, LSU
-host trc01-rf { hardware ethernet 00:25:90:8A:B2:08; fixed-address 10.133.26.161;}
+host trc01 { hardware ethernet 00:25:90:8A:B2:08; fixed-address 10.133.26.161;}
 
 #lames gonio
-host trc02-rf { hardware ethernet 00:25:90:4F:1E:8C; fixed-address 10.133.26.162;}
-host trc03-rf { hardware ethernet 00:25:90:4F:23:9E; fixed-address 10.133.26.163;}
-host trc04-rf { hardware ethernet 00:25:90:4F:23:A4; fixed-address 10.133.26.164;}
-host trc05-rf { hardware ethernet 00:25:90:4F:18:62; fixed-address 10.133.26.165;}
-host trc06-rf { hardware ethernet 00:25:90:4F:18:58; fixed-address 10.133.26.166;}
-host trc07-rf { hardware ethernet 00:25:90:4F:1A:28; fixed-address 10.133.26.167;}
-host trc08-rf { hardware ethernet 00:25:90:4F:BB:72; fixed-address 10.133.26.168;}
-host trc09-rf { hardware ethernet 00:25:90:4F:BB:22; fixed-address 10.133.26.169;}
-host trc10-rf { hardware ethernet 00:25:90:4F:BA:F2; fixed-address 10.133.26.170;}
-host trc11-rf { hardware ethernet 00:25:90:4F:BA:F0; fixed-address 10.133.26.171;}
-host trc12-rf { hardware ethernet 00:25:90:4f:bb:1e; fixed-address 10.133.26.172;}
-host trc13-rf { hardware ethernet 00:25:90:4F:23:D4; fixed-address 10.133.26.173;}
-host trc14-rf { hardware ethernet 00:25:90:4F:23:Dc; fixed-address 10.133.26.174;}
-host trc15-rf { hardware ethernet 00:25:90:4F:BB:20; fixed-address 10.133.26.175;}
-host trc16-rf { hardware ethernet 00:25:90:4F:E1:66; fixed-address 10.133.26.176;}
-host trc17-rf { hardware ethernet 00:25:90:4F:EA:20; fixed-address 10.133.26.177;}
-host trc18-rf { hardware ethernet 00:25:90:4F:E2:D2; fixed-address 10.133.26.178;}
-host trc19-rf { hardware ethernet 00:25:90:4F:EF:00; fixed-address 10.133.26.179;}
-host trc20-rf { hardware ethernet 00:25:90:4F:E8:0A; fixed-address 10.133.26.180;}
-host trc21-rf { hardware ethernet 00:25:90:4F:C3:3C; fixed-address 10.133.26.181;}
-host trc22-rf { hardware ethernet 00:25:90:4F:BB:68; fixed-address 10.133.26.182;}
-host trc23-rf { hardware ethernet 00:25:90:4F:E1:62; fixed-address 10.133.26.183;}
-host trc24-rf { hardware ethernet 00:25:90:4F:e4:86; fixed-address 10.133.26.184;}
-host trc25-rf { hardware ethernet 00:25:90:4F:bb:74; fixed-address 10.133.26.185;}
+host trc02 { hardware ethernet 00:25:90:4F:1E:8C; fixed-address 10.133.26.162;}
+host trc03 { hardware ethernet 00:25:90:4F:23:9E; fixed-address 10.133.26.163;}
+host trc04 { hardware ethernet 00:25:90:4F:23:A4; fixed-address 10.133.26.164;}
+host trc05 { hardware ethernet 00:25:90:4F:18:62; fixed-address 10.133.26.165;}
+host trc06 { hardware ethernet 00:25:90:4F:18:58; fixed-address 10.133.26.166;}
+host trc07 { hardware ethernet 00:25:90:4F:1A:28; fixed-address 10.133.26.167;}
+host trc08 { hardware ethernet 00:25:90:4F:BB:72; fixed-address 10.133.26.168;}
+host trc09 { hardware ethernet 00:25:90:4F:BB:22; fixed-address 10.133.26.169;}
+host trc10 { hardware ethernet 00:25:90:4F:BA:F2; fixed-address 10.133.26.170;}
+host trc11 { hardware ethernet 00:25:90:4F:BA:F0; fixed-address 10.133.26.171;}
+host trc12 { hardware ethernet 00:25:90:4f:bb:1e; fixed-address 10.133.26.172;}
+host trc13 { hardware ethernet 00:25:90:4F:23:D4; fixed-address 10.133.26.173;}
+host trc14 { hardware ethernet 00:25:90:4F:23:Dc; fixed-address 10.133.26.174;}
+host trc15 { hardware ethernet 00:25:90:4F:BB:20; fixed-address 10.133.26.175;}
+host trc16 { hardware ethernet 00:25:90:4F:E1:66; fixed-address 10.133.26.176;}
+host trc17 { hardware ethernet 00:25:90:4F:EA:20; fixed-address 10.133.26.177;}
+host trc18 { hardware ethernet 00:25:90:4F:E2:D2; fixed-address 10.133.26.178;}
+host trc19 { hardware ethernet 00:25:90:4F:EF:00; fixed-address 10.133.26.179;}
+host trc20 { hardware ethernet 00:25:90:4F:E8:0A; fixed-address 10.133.26.180;}
+host trc21 { hardware ethernet 00:25:90:4F:C3:3C; fixed-address 10.133.26.181;}
+host trc22 { hardware ethernet 00:25:90:4F:BB:68; fixed-address 10.133.26.182;}
+host trc23 { hardware ethernet 00:25:90:4F:E1:62; fixed-address 10.133.26.183;}
+host trc24 { hardware ethernet 00:25:90:4F:e4:86; fixed-address 10.133.26.184;}
+host trc25 { hardware ethernet 00:25:90:4F:bb:74; fixed-address 10.133.26.185;}
 
 #lames monitoring
-host trc26-rf { hardware ethernet 00:25:90:4F:BB:6E; fixed-address 10.133.26.186;}
-host trc27-rf { hardware ethernet 00:25:90:4F:BB:66; fixed-address 10.133.26.187;}
+host trc26 { hardware ethernet 00:25:90:4F:BB:6E; fixed-address 10.133.26.186;}
+host trc27 { hardware ethernet 00:25:90:4F:BB:66; fixed-address 10.133.26.187;}
 
-host trc28-rf { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.188;}
-host trc29-rf { hardware ethernet 00:00:00:00:00:02; fixed-address 10.133.26.189;}
-host trc30-rf { hardware ethernet 00:00:00:00:00:03; fixed-address 10.133.26.190;}
-host trc31-rf { hardware ethernet 00:25:90:88:E3:C2; fixed-address 10.133.26.191;}
-
-subnet 10.133.28.0 netmask 255.255.255.0
-{
-  next-server 10.133.28.160;
-  filename "pxelinux.0";
-  option routers 10.133.28.231;
-  option domain-name-servers 10.133.28.160;
-  use-host-decl-names on;
-  authoritative;
-}
+host trc28 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.188;}
+host trc29 { hardware ethernet 00:00:00:00:00:02; fixed-address 10.133.26.189;}
+host trc30 { hardware ethernet 00:00:00:00:00:03; fixed-address 10.133.26.190;}
+host trc31 { hardware ethernet 00:25:90:88:E3:C2; fixed-address 10.133.26.191;}
 
 #lame fusion, pistage, LSU
-host trc01 { hardware ethernet 00:25:90:8A:B2:09; fixed-address 10.133.28.161;}
+#host trc01 { hardware ethernet 00:25:90:8A:B2:09; fixed-address 10.133.28.161;}
 
 #lames gonio
-host trc02 { hardware ethernet 00:25:90:4F:1E:8D; fixed-address 10.133.28.162;}
-host trc03 { hardware ethernet 00:25:90:4F:23:9F; fixed-address 10.133.28.163;}
-host trc04 { hardware ethernet 00:25:90:4F:23:A5; fixed-address 10.133.28.164;}
-host trc05 { hardware ethernet 00:25:90:4F:18:63; fixed-address 10.133.28.165;}
-host trc06 { hardware ethernet 00:25:90:4F:18:59; fixed-address 10.133.28.166;}
-host trc07 { hardware ethernet 00:25:90:4F:1A:29; fixed-address 10.133.28.167;}
-host trc08 { hardware ethernet 00:25:90:4F:BB:73; fixed-address 10.133.28.168;}
-host trc09 { hardware ethernet 00:25:90:4F:BB:23; fixed-address 10.133.28.169;}
-host trc10 { hardware ethernet 00:25:90:4F:BA:F3; fixed-address 10.133.28.170;}
-host trc11 { hardware ethernet 00:25:90:4F:BA:F1; fixed-address 10.133.28.171;}
-host trc12 { hardware ethernet 00:25:90:4f:bb:1f; fixed-address 10.133.28.172;}
-host trc13 { hardware ethernet 00:25:90:4F:23:D5; fixed-address 10.133.28.173;}
-host trc14 { hardware ethernet 00:25:90:4F:23:DD; fixed-address 10.133.28.174;}
-host trc15 { hardware ethernet 00:25:90:4F:BB:21; fixed-address 10.133.28.175;}
-host trc16 { hardware ethernet 00:25:90:4F:E1:67; fixed-address 10.133.28.176;}
-host trc17 { hardware ethernet 00:25:90:4F:EA:21; fixed-address 10.133.28.177;}
-host trc18 { hardware ethernet 00:25:90:4F:E2:D3; fixed-address 10.133.28.178;}
-host trc19 { hardware ethernet 00:25:90:4F:EF:01; fixed-address 10.133.28.179;}
-host trc20 { hardware ethernet 00:25:90:4F:E8:0B; fixed-address 10.133.28.180;}
-host trc21 { hardware ethernet 00:25:90:4F:C3:3D; fixed-address 10.133.28.181;}
-host trc22 { hardware ethernet 00:25:90:4F:BB:69; fixed-address 10.133.28.182;}
-host trc23 { hardware ethernet 00:25:90:4F:E1:63; fixed-address 10.133.28.183;}
-host trc24 { hardware ethernet 00:25:90:4F:e4:87; fixed-address 10.133.28.184;}
-host trc25 { hardware ethernet 00:25:90:4F:bb:75; fixed-address 10.133.28.185;}
+#host trc02 { hardware ethernet 00:25:90:4F:1E:8D; fixed-address 10.133.28.162;}
+#host trc03 { hardware ethernet 00:25:90:4F:23:9F; fixed-address 10.133.28.163;}
+#host trc04 { hardware ethernet 00:25:90:4F:23:A5; fixed-address 10.133.28.164;}
+#host trc05 { hardware ethernet 00:25:90:4F:18:63; fixed-address 10.133.28.165;}
+#host trc06 { hardware ethernet 00:25:90:4F:18:59; fixed-address 10.133.28.166;}
+#host trc07 { hardware ethernet 00:25:90:4F:1A:29; fixed-address 10.133.28.167;}
+#host trc08 { hardware ethernet 00:25:90:4F:BB:73; fixed-address 10.133.28.168;}
+#host trc09 { hardware ethernet 00:25:90:4F:BB:23; fixed-address 10.133.28.169;}
+#host trc10 { hardware ethernet 00:25:90:4F:BA:F3; fixed-address 10.133.28.170;}
+#host trc11 { hardware ethernet 00:25:90:4F:BA:F1; fixed-address 10.133.28.171;}
+#host trc12 { hardware ethernet 00:25:90:4f:bb:1f; fixed-address 10.133.28.172;}
+#host trc13 { hardware ethernet 00:25:90:4F:23:D5; fixed-address 10.133.28.173;}
+#host trc14 { hardware ethernet 00:25:90:4F:23:DD; fixed-address 10.133.28.174;}
+#host trc15 { hardware ethernet 00:25:90:4F:BB:21; fixed-address 10.133.28.175;}
+#host trc16 { hardware ethernet 00:25:90:4F:E1:67; fixed-address 10.133.28.176;}
+#host trc17 { hardware ethernet 00:25:90:4F:EA:21; fixed-address 10.133.28.177;}
+#host trc18 { hardware ethernet 00:25:90:4F:E2:D3; fixed-address 10.133.28.178;}
+#host trc19 { hardware ethernet 00:25:90:4F:EF:01; fixed-address 10.133.28.179;}
+#host trc20 { hardware ethernet 00:25:90:4F:E8:0B; fixed-address 10.133.28.180;}
+#host trc21 { hardware ethernet 00:25:90:4F:C3:3D; fixed-address 10.133.28.181;}
+#host trc22 { hardware ethernet 00:25:90:4F:BB:69; fixed-address 10.133.28.182;}
+#host trc23 { hardware ethernet 00:25:90:4F:E1:63; fixed-address 10.133.28.183;}
+#host trc24 { hardware ethernet 00:25:90:4F:e4:87; fixed-address 10.133.28.184;}
+#host trc25 { hardware ethernet 00:25:90:4F:bb:75; fixed-address 10.133.28.185;}
 
 #lames monitoring
-host trc26 { hardware ethernet 00:25:90:4F:BB:6F; fixed-address 10.133.28.186;}
-host trc27 { hardware ethernet 00:25:90:4F:BB:67; fixed-address 10.133.28.187;}
+#host trc26 { hardware ethernet 00:25:90:4F:BB:6F; fixed-address 10.133.28.186;}
+#host trc27 { hardware ethernet 00:25:90:4F:BB:67; fixed-address 10.133.28.187;}
 
-host trc28 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.188;}
-host trc29 { hardware ethernet 00:00:00:00:00:02; fixed-address 10.133.26.189;}
-host trc30 { hardware ethernet 00:00:00:00:00:03; fixed-address 10.133.26.190;}
-host trc31 { hardware ethernet 00:25:90:88:E3:C3; fixed-address 10.133.28.191;}
+#host trc28 { hardware ethernet 00:00:00:00:00:01; fixed-address 10.133.26.188;}
+#host trc29 { hardware ethernet 00:00:00:00:00:02; fixed-address 10.133.26.189;}
+#host trc30 { hardware ethernet 00:00:00:00:00:03; fixed-address 10.133.26.190;}
+#host trc31 { hardware ethernet 00:25:90:88:E3:C3; fixed-address 10.133.28.191;}

diff --git a/master/etc/hosts.30MHzMDF b/master/etc/hosts.30MHzMDF
index e6efa49203f450f3e3f6a32a7cea4d66ff186cef..638e5a6825dd805686606c37cd10f29c09fe61af 100644 (file)
--- a/master/etc/hosts.30MHzMDF
+++ b/master/etc/hosts.30MHzMDF
@@ -12,34 +12,34 @@ ff02::3 ip6-allhosts
 # Reseau 10.133.26.0
 # ===============================
 
-10.133.26.160  trc00-rf maitre-rf sup-rf fusion-rf
-10.133.26.161  trc01-rf lsu-rf
-10.133.26.162  trc02-rf gon00-rf
-10.133.26.163  trc03-rf gon01-rf
-10.133.26.164  trc04-rf gon02-rf
-10.133.26.165  trc05-rf gon03-rf
-10.133.26.166  trc06-rf gon04-rf
-10.133.26.167  trc07-rf gon05-rf
-10.133.26.168  trc08-rf gon06-rf
-10.133.26.169  trc09-rf gon07-rf
-10.133.26.170  trc10-rf gon08-rf
-10.133.26.171  trc11-rf gon09-rf
-10.133.26.172  trc12-rf gon10-rf
-10.133.26.173  trc13-rf gon11-rf
-10.133.26.174  trc14-rf gon12-rf
-10.133.26.175  trc15-rf gon13-rf
-10.133.26.176  trc16-rf gon14-rf
-10.133.26.177  trc17-rf gon15-rf
-10.133.26.178  trc18-rf gon16-rf
-10.133.26.179  trc19-rf gon17-rf
-10.133.26.180  trc20-rf gon18-rf
-10.133.26.181  trc21-rf gon19-rf
-10.133.26.182  trc22-rf gon20-rf
-10.133.26.183  trc23-rf gon21-rf
-10.133.26.184  trc24-rf gon22-rf
-10.133.26.185  trc25-rf gon23-rf
-10.133.26.186  trc26-rf mon00-rf
-10.133.26.187  trc27-rf mon01-rf
+10.133.26.160  trc00 maitre sup fusion nfsserver
+10.133.26.161  trc01 lsu
+10.133.26.162  trc02 gon00
+10.133.26.163  trc03 gon01
+10.133.26.164  trc04 gon02
+10.133.26.165  trc05 gon03
+10.133.26.166  trc06 gon04
+10.133.26.167  trc07 gon05
+10.133.26.168  trc08 gon06
+10.133.26.169  trc09 gon07
+10.133.26.170  trc10 gon08
+10.133.26.171  trc11 gon09
+10.133.26.172  trc12 gon10
+10.133.26.173  trc13 gon11
+10.133.26.174  trc14 gon12
+10.133.26.175  trc15 gon13
+10.133.26.176  trc16 gon14
+10.133.26.177  trc17 gon15
+10.133.26.178  trc18 gon16
+10.133.26.179  trc19 gon17
+10.133.26.180  trc20 gon18
+10.133.26.181  trc21 gon19
+10.133.26.182  trc22 gon20
+10.133.26.183  trc23 gon21
+10.133.26.184  trc24 gon22
+10.133.26.185  trc25 gon23
+10.133.26.186  trc26 mon00
+10.133.26.187  trc27 mon01
 
 10.133.26.231   swg swg1
 10.133.26.232   swg2
@@ -49,50 +49,19 @@ ff02::3 ip6-allhosts
 # ===============================
 
 # prod fe306 1 110->118
-10.133.28.110  fe306-1
+10.133.26.110  fe306-1
 # prod fe306 2 120->128
-10.133.28.120  fe306-2
+10.133.26.120  fe306-2
 # prod fe306 3 130->138
-10.133.28.130  fe306-3
+10.133.26.130  fe306-3
 # prod fe306 4 140->148
-10.133.28.140  fe306-4
+10.133.26.140  fe306-4
 # prod fe306 5 150->158
-10.133.28.150  fe306-5
+10.133.26.150  fe306-5
 
 10.133.28.159  amm00
 10.133.28.158  amm01
 
-10.133.28.160  trc00 maitre sup fusion nfsserver
-10.133.28.161  trc01 lsu
-10.133.28.162  trc02 gon00
-10.133.28.163  trc03 gon01
-10.133.28.164  trc04 gon02
-10.133.28.165  trc05 gon03
-10.133.28.166  trc06 gon04
-10.133.28.167  trc07 gon05
-10.133.28.168  trc08 gon06
-10.133.28.169  trc09 gon07
-10.133.28.170  trc10 gon08
-10.133.28.171  trc11 gon09
-10.133.28.172  trc12 gon10
-10.133.28.173  trc13 gon11
-10.133.28.174  trc14 gon12
-10.133.28.175  trc15 gon13
-10.133.28.176  trc16 gon14
-10.133.28.177  trc17 gon15
-10.133.28.178  trc18 gon16
-10.133.28.179  trc19 gon17
-10.133.28.180  trc20 gon18
-10.133.28.181  trc21 gon19
-10.133.28.182  trc22 gon20
-10.133.28.183  trc23 gon21
-10.133.28.184  trc24 gon22
-10.133.28.185  trc25 gon23
-10.133.28.186  trc26 mon00
-10.133.28.187  trc27 mon01
-
-10.133.28.231   swm
-
 10.133.28.253   matrix
 10.133.28.254   gps
 

diff --git a/master/etc/network/interfaces b/master/etc/network/interfaces
index d10f3b09381cd2a8c6501e49c1ad39fdf95d77c8..a8c838a5419ed6c76de4ec1f46862c88d9a33ae6 100644 (file)
--- a/master/etc/network/interfaces
+++ b/master/etc/network/interfaces
@@ -13,6 +13,9 @@ iface eth0 inet static
        network 10.133.26.0
        broadcast 10.133.26.255
        pre-up ip addr flush dev eth0
+       post-up ip addr add 10.133.28.160/24 dev eth0
+       # Sensor prod
+       post-up ip route add 225.0.0.0/8 dev eth0
        # FE306 authentification
        post-up ip route add 238.0.0.0/24 dev eth0
        # FE306 pano
@@ -29,15 +32,3 @@ iface eth0 inet static
        post-up ip route add 238.192.0.0/11 dev eth0
        # Delay line
        post-up ip route add 239.0.0.0/8 dev eth0
-
-# The secondary network interface
-auto eth1
-iface eth1 inet static
-       address 10.133.28.160
-       netmask 255.255.255.0
-       network 10.133.28.0
-       broadcast 10.133.28.255
-       gateway 10.133.28.231
-       pre-up ip addr flush dev eth1
-       # Sensor prod
-       post-up ip route add 225.0.0.0/8 dev eth1

diff --git a/master/opt/cluster/slave/etc/network/interfaces b/master/opt/cluster/slave/etc/network/interfaces
index a5d335dfe1bf50094c737be8cad0fe43b3030691..c65d7466e3a4963761c84a6758794def43cc1e5f 100644 (file)
--- a/master/opt/cluster/slave/etc/network/interfaces
+++ b/master/opt/cluster/slave/etc/network/interfaces
@@ -23,12 +23,7 @@ iface eth0 inet dhcp
        post-up ip route add 238.192.0.0/11 dev eth0
        # Delay line
        post-up ip route add 239.0.0.0/8 dev eth0
-
-# The secondary network interface
-auto eth1
-iface eth1 inet dhcp
-       pre-up ip addr flush dev eth1
        # FE306 authentification
-       post-up ip route add 238.0.0.0/24 dev eth1
+       post-up ip route add 238.0.0.0/24 dev eth0
        # Sensor prod
-       post-up ip route add 225.0.0.0/8 dev eth1
+       post-up ip route add 225.0.0.0/8 dev eth0

diff --git a/master/opt/tftp/pxelinux.cfg/default b/master/opt/tftp/pxelinux.cfg/default
index a801909b73c89e1ebbd91609252264c1c385aa1d..c0b767a001d4a28bd958d10337fbb67c0fc691ec 100644 (file)
--- a/master/opt/tftp/pxelinux.cfg/default
+++ b/master/opt/tftp/pxelinux.cfg/default
@@ -12,7 +12,7 @@ LABEL debian
        MENU LABEL ^Debian 7 (TRC6500)
        KERNEL /vmlinuz
        INITRD /initrd.img
-       APPEND noinitrd ramdisk_size=8192 boot=tftp fastboot tftpserver=10.133.28.160 tarballs=root.tgz,slave.tgz
+       APPEND noinitrd ramdisk_size=8192 boot=tftp fastboot tftpserver=10.133.26.160 tarballs=root.tgz,slave.tgz
 
 LABEL freedos
        MENU LABEL ^FreeDos 1.0

diff --git a/master/opt/tftp/swg1.txt b/master/opt/tftp/swg1.txt
index cec8626c0142d85dde65eb056c0a6f9da8313b0d..2f63163f350733080a38e1a5eef215c859f7c827 100644 (file)
--- a/master/opt/tftp/swg1.txt
+++ b/master/opt/tftp/swg1.txt
@@ -1,6 +1,6 @@
-
-!
-! Last configuration change at 14:10:07 UTC Thu Feb 12 2015
+macro name VERSION
+macro description 2.3 full-duplex
+@
 !
 version 12.2
 no service pad
@@ -10,7 +10,7 @@ service password-encryption
 service compress-config
 service sequence-numbers
 !
-hostname SWG
+hostname SWG1
 !
 boot-start-marker
 boot system flash bootflash:cat4500-ipbase-mz.122-54.SG1.bin
@@ -20,10 +20,6 @@ boot-end-marker
 enable secret 5 $1$OMTZ$xM5SrEPag4m7MGrV1u86/0
 !
 !
-macro name VERSION
-macro description 2.3 full-duplex
-@
-!
 no aaa new-model
 ip subnet-zero
 no ip domain-lookup
@@ -31,6 +27,7 @@ no ip domain-lookup
 !
 ip vrf mgmtVrf
 !
+ip routing
 ip multicast-routing 
 ip igmp snooping vlan 1 immediate-leave
 vtp mode transparent
@@ -45,8 +42,14 @@ spanning-tree extend system-id
 !
 vlan internal allocation policy ascending
 !
+vlan 10
+ name IFORMATION-SYSTEM
+!
 !
 !
+interface Port-channel1
+ switchport
+!
 interface FastEthernet1
  ip vrf forwarding mgmtVrf
  no ip address
@@ -54,262 +57,286 @@ interface FastEthernet1
  duplex auto
 !
 interface GigabitEthernet1/1
- load-interval 30
+ speed auto
  duplex full
  spanning-tree portfast
 !
 interface GigabitEthernet1/2
- load-interval 30
+ speed auto
  duplex full
  spanning-tree portfast
 !
 interface GigabitEthernet1/3
- load-interval 30
+ speed auto
  duplex full
  spanning-tree portfast
 !
 interface GigabitEthernet1/4
- load-interval 30
+ speed auto
  duplex full
  spanning-tree portfast
 !
 interface GigabitEthernet1/5
- load-interval 30
+ speed auto
  duplex full
  spanning-tree portfast
 !
 interface GigabitEthernet1/6
- load-interval 30
+ speed auto
  duplex full
  spanning-tree portfast
 !
 interface GigabitEthernet1/7
- load-interval 30
+ speed auto
  duplex full
  spanning-tree portfast
 !
 interface GigabitEthernet1/8
- load-interval 30
+ speed auto
  duplex full
  spanning-tree portfast
 !
 interface GigabitEthernet1/9
- load-interval 30
+ speed auto
  duplex full
  spanning-tree portfast
 !
 interface GigabitEthernet1/10
- load-interval 30
+ speed auto
  duplex full
  spanning-tree portfast
 !
 interface GigabitEthernet1/11
- load-interval 30
+ speed auto
  duplex full
  spanning-tree portfast
 !
 interface GigabitEthernet1/12
- load-interval 30
+ speed auto
  duplex full
  spanning-tree portfast
 !
 interface GigabitEthernet1/13
- load-interval 30
+ speed auto
  duplex full
  spanning-tree portfast
 !
 interface GigabitEthernet1/14
- load-interval 30
+ speed auto
  duplex full
  spanning-tree portfast
 !
 interface GigabitEthernet1/15
- load-interval 30
+ speed auto
  duplex full
  spanning-tree portfast
 !
 interface GigabitEthernet1/16
- load-interval 30
+ speed auto
  duplex full
  spanning-tree portfast
 !
 interface GigabitEthernet1/17
- load-interval 30
+ speed auto
  duplex full
  spanning-tree portfast
 !
 interface GigabitEthernet1/18
- load-interval 30
+ speed auto
  duplex full
  spanning-tree portfast
 !
 interface GigabitEthernet1/19
- load-interval 30
+ speed auto
  duplex full
  spanning-tree portfast
 !
 interface GigabitEthernet1/20
- load-interval 30
+ speed auto
  duplex full
  spanning-tree portfast
 !
 interface GigabitEthernet1/21
- load-interval 30
+ speed auto
  duplex full
  spanning-tree portfast
 !
 interface GigabitEthernet1/22
- load-interval 30
+ speed auto
  duplex full
  spanning-tree portfast
 !
 interface GigabitEthernet1/23
- load-interval 30
+ speed auto
  duplex full
  spanning-tree portfast
 !
 interface GigabitEthernet1/24
- load-interval 30
+ speed auto
  duplex full
  spanning-tree portfast
 !
 interface GigabitEthernet1/25
- load-interval 30
+ speed auto
  duplex full
  spanning-tree portfast
 !
 interface GigabitEthernet1/26
- load-interval 30
+ speed auto
  duplex full
  spanning-tree portfast
 !
 interface GigabitEthernet1/27
- load-interval 30
+ speed auto
  duplex full
  spanning-tree portfast
 !
 interface GigabitEthernet1/28
- load-interval 30
+ speed auto
  duplex full
  spanning-tree portfast
 !
 interface GigabitEthernet1/29
- load-interval 30
+ speed auto
  duplex full
  spanning-tree portfast
 !
 interface GigabitEthernet1/30
- load-interval 30
+ speed auto
  duplex full
  spanning-tree portfast
 !
 interface GigabitEthernet1/31
- load-interval 30
+ speed auto
  duplex full
  spanning-tree portfast
 !
 interface GigabitEthernet1/32
- load-interval 30
+ speed auto
  duplex full
  spanning-tree portfast
 !
 interface GigabitEthernet1/33
- load-interval 30
+ speed auto
  duplex full
  spanning-tree portfast
 !
 interface GigabitEthernet1/34
- load-interval 30
+ speed auto
  duplex full
  spanning-tree portfast
 !
 interface GigabitEthernet1/35
- load-interval 30
+ speed auto
  duplex full
  spanning-tree portfast
 !
 interface GigabitEthernet1/36
- load-interval 30
+ speed auto
  duplex full
  spanning-tree portfast
 !
 interface GigabitEthernet1/37
- load-interval 30
+ speed auto
  duplex full
  spanning-tree portfast
 !
 interface GigabitEthernet1/38
- load-interval 30
+ speed auto
  duplex full
  spanning-tree portfast
 !
 interface GigabitEthernet1/39
- load-interval 30
+ speed 100
  duplex full
  spanning-tree portfast
 !
 interface GigabitEthernet1/40
- load-interval 30
  speed 100
  duplex full
  spanning-tree portfast
 !
 interface GigabitEthernet1/41
- load-interval 30
  speed 100
  duplex full
  spanning-tree portfast
 !
 interface GigabitEthernet1/42
- load-interval 30
  speed 100
  duplex full
  spanning-tree portfast
 !
 interface GigabitEthernet1/43
- load-interval 30
  speed 100
  duplex full
  spanning-tree portfast
 !
 interface GigabitEthernet1/44
- load-interval 30
  speed 100
  duplex full
  spanning-tree portfast
 !
 interface GigabitEthernet1/45
- load-interval 30
  media-type rj45
- duplex full
+ speed auto
+ duplex auto
  spanning-tree portfast
 !
 interface GigabitEthernet1/46
- load-interval 30
  media-type rj45
+ speed auto
+ duplex auto
  spanning-tree portfast
 !
 interface GigabitEthernet1/47
- load-interval 30
  media-type rj45
+ speed auto
+ duplex auto
  spanning-tree portfast
 !
 interface GigabitEthernet1/48
- load-interval 30
+ switchport access vlan 10
+ switchport mode access
  media-type rj45
+ speed auto
+ duplex auto
  spanning-tree portfast
 !
+interface TenGigabitEthernet1/49
+ channel-protocol pagp
+ channel-group 1 mode desirable
+!
+interface TenGigabitEthernet1/50
+ channel-protocol pagp
+ channel-group 1 mode desirable
+!
+interface TenGigabitEthernet1/51
+ channel-protocol pagp
+ channel-group 1 mode desirable
+!
+interface TenGigabitEthernet1/52
+ channel-protocol pagp
+ channel-group 1 mode desirable
+!
 interface Vlan1
  ip address 10.133.26.231 255.255.255.0
  ip pim dense-mode
 !
+interface Vlan10
+ ip address 100.100.100.100 255.255.255.0
+ ip pim sparse-mode
+!
+ip forward-protocol udp echo
+ip route 0.0.0.0 0.0.0.0 100.100.100.101
 ip http server
 ip pim rp-address 10.133.26.231
 !
+access-list 101 permit udp host 10.133.26.160 any eq echo
 !
+control-plane
 !
 !
-control-plane
+snmp-server community public RO
 !
 !
 line con 0
@@ -325,7 +352,6 @@ line vty 5 15
  login
 !
 ntp clock-period 17179594
-ntp server 10.133.28.254
+ntp server 10.133.26.254
 ntp server 10.133.26.160
-ntp server 10.133.28.160
 end

diff --git a/master/opt/tftp/swg2.txt b/master/opt/tftp/swg2.txt
index 7dc952d41b3e3919ec4c9ddd5a90ef83406ac2e3..1f0d9e06a54026ff24cb6f23f2336333deca1fe4 100644 (file)
--- a/master/opt/tftp/swg2.txt
+++ b/master/opt/tftp/swg2.txt
@@ -1,7 +1,6 @@
-
-!
-! Last configuration change at 08:13:53 UTC Wed Jun 12 2013
-! NVRAM config last updated at 08:21:36 UTC Wed Jun 12 2013
+macro name VERSION
+macro description 2.3 full-duplex
+@
 !
 version 12.2
 no service pad
@@ -21,10 +20,6 @@ boot-end-marker
 enable secret 5 $1$OMTZ$xM5SrEPag4m7MGrV1u86/0
 !
 !
-macro name VERSION
-macro description 2.3
-@
-!
 no aaa new-model
 ip subnet-zero
 no ip domain-lookup
@@ -49,6 +44,9 @@ vlan internal allocation policy ascending
 !
 !
 !
+!
+!
+!
 interface Port-channel1
  switchport
 !
@@ -297,6 +295,8 @@ interface GigabitEthernet1/47
  spanning-tree portfast
 !
 interface GigabitEthernet1/48
+!
+!
  media-type rj45
  speed auto
  duplex auto
@@ -315,18 +315,30 @@ interface TenGigabitEthernet1/51
  channel-group 1 mode desirable
 !
 interface TenGigabitEthernet1/52
+ channel-protocol pagp
+ channel-group 1 mode desirable
 !
 interface Vlan1
  ip address 10.133.26.232 255.255.255.0
  ip pim dense-mode
 !
+!
+!
+!
+!
+!
+!
 ip http server
 ip pim rp-address 10.133.26.232
 !
 !
+!
 control-plane
 !
 !
+snmp-server community public RO
+!
+!
 line con 0
  password 7 01070E05570E15
  logging synchronous
@@ -339,8 +351,7 @@ line vty 5 15
  password 7 120D0D161E0E1F
  login
 !
-ntp clock-period 17179537
+ntp clock-period 17179594
+ntp server 10.133.26.254
 ntp server 10.133.26.160
-ntp server 10.133.28.160
-ntp server 10.133.28.254
 end

diff --git a/master/root/bin/conf_swm_integration.tcl b/master/root/bin/conf_swm_integration.tcl
index 0afda89da12db44cd489b906d04ca81b227ca431..8230cf9ce3cf146e6f1aed7c6d2d7d54a347a91a 100755 (executable)
--- a/master/root/bin/conf_swm_integration.tcl
+++ b/master/root/bin/conf_swm_integration.tcl
@@ -2,13 +2,13 @@
 
 set sub [lrange $argv 0 0]
 if { $sub == "" } { set sub "1" }
-spawn telnet swm
+spawn telnet swg
 
 expect {
-       "Password:" { send "thales\r" }
-       incorrect { send_user "invalid password or account\n"; exit }
-               timeout { send_user "connection to $sub timed out\n"; exit }
-               eof { send_user "connection to host failed\n"; exit }
+        "Password:" { send "thales\r" }
+        incorrect { send_user "invalid password or account\n"; exit }
+        timeout { send_user "connection to $sub timed out\n"; exit }
+        eof { send_user "connection to host failed\n"; exit }
 }
 expect -exact ">" { send "enable\r" }
 expect "Password:" { send "thales\r" }
@@ -19,7 +19,7 @@ expect -exact "#" { send "vlan 192\r" }
 expect -exact "#" { send "name Integration\r" }
 expect -exact "#" { send "exit\r" }
 
-expect -exact "#" { send "interface gigabitEthernet 1/45\r" }
+expect -exact "#" { send "interface gigabitEthernet 1/47\r" }
 expect -exact "#" { send "switchport mode access\r" }
 expect -exact "#" { send "switchport access vlan 192\r" }
 expect -exact "#" { send "exit\r" }