[Nocrancid] autopop-onenet.net router config diffs

rancid at rancid.noc.onenet.net rancid at rancid.noc.onenet.net
Sun Dec 8 01:01:02 CST 2013


Index: core1.dc.onenet.net
===================================================================
--- core1.dc.onenet.net	(revision 92268)
+++ core1.dc.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at MX480_DC_01_RE0> show system commit 
+#   2013-12-08 00:37:59 CST by admin via cli commit synchronize
+#   2013-12-08 00:37:15 CST by admin via cli commit synchronize
+#   2013-12-08 00:05:23 CST by admin via cli commit synchronize
 #   2013-12-04 14:09:40 CST by josh via cli commit synchronize
 #   2013-11-27 12:03:06 CST by donnie via cli commit confirmed, rollback in 3mins synchronize
 #   2013-11-27 07:45:36 CST by josh via cli commit synchronize
-#   2013-11-24 02:59:22 CST by jeremyt via cli commit synchronize
-#   2013-11-24 02:33:22 CST by josh via cli commit synchronize
-#   2013-11-24 02:07:20 CST by root via cli commit synchronize
 # grnoc-mon at MX480_DC_01_RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -413,7 +413,7 @@
 # grnoc-mon at MX480_DC_01_RE0> show system uptime 
 # System booted: 2013-11-12 15:29 CST 
 # Protocols started: 2013-11-12 16:14 CST 
-# Last configured: 2013-12-04 14:09 CST  by josh
+# Last configured: 2013-12-08 00:37 CST  by admin
 # 
 # {master}
 # grnoc-mon at MX480_DC_01_RE0> show interface terse 
@@ -426,7 +426,6 @@
 #pfh-0/0/0.16383 up up
 #xe-0/0/0 up up
 #xe-0/0/0.0 up up
-#xe-0/0/0.1 up up
 #xe-0/0/0.32767 up up
 #xe-0/0/1 up down
 #xe-0/1/0 up up
@@ -449,8 +448,8 @@
 #lc-0/2/0.32769 up up
 #pfe-0/2/0 up up
 #pfe-0/2/0.16383 up up
-#ge-0/2/1 up up
-#ge-0/2/1.0 up up
+#ge-0/2/1 up down
+#ge-0/2/1.0 up down
 #ge-0/2/2 up up
 #ge-0/2/2.0 up up
 #ge-0/2/3 up up
@@ -504,7 +503,6 @@
 #xe-1/1/1.0 up up
 #xe-1/1/1.32767 up up
 #ge-1/2/0 up down
-#ge-1/2/0.0 up down
 #lc-1/2/0 up up
 #lc-1/2/0.32769 up up
 #pfe-1/2/0 up up
@@ -569,7 +567,6 @@
 #xe-2/3/0.32767 up up
 #xe-2/3/1 up up
 #xe-2/3/1.0 up up
-#xe-2/3/1.1 up up
 #xe-2/3/1.32767 up up
 #lc-3/0/0 up up
 #lc-3/0/0.32769 up up
@@ -581,8 +578,13 @@
 #xe-3/0/0.0 up up
 #xe-3/0/1 up up
 #xe-3/0/1.0 up up
-#xe-3/1/0 down down
+#xe-3/1/0 up up
+#xe-3/1/0.0 up up
+#xe-3/1/0.1 up up
+#xe-3/1/0.32767 up up
 #xe-3/1/1 up down
+#xe-3/1/1.0 up down
+#xe-3/1/1.32767 up down
 #lc-3/2/0 up up
 #lc-3/2/0.32769 up up
 #pfe-3/2/0 up up
@@ -593,7 +595,6 @@
 #xe-3/3/1 up down
 #ae0 up up
 #ae0.0 up up
-#ae0.1 up up
 #ae0.32767 up up
 #ae1 up up
 #ae1.0 up up
@@ -604,16 +605,31 @@
 #ae3 up up
 #ae3.0 up up
 #ae3.32767 up up
-#ae4 up down
-#ae5 up up
-#ae5.0 up up
-#ae5.32767 up up
+#ae4 up up
+#ae4.0 up up
+#ae4.32767 up up
+#ae5 up down
+#ae5.32767 up down
 #ae6 up down
-#ae7 up up
-#ae7.0 up up
+#ae6.0 up down
+#ae6.32767 up down
+#ae7 up down
+#ae7.0 up down
+#ae7.32767 up down
 #ae8 up up
 #ae8.0 up up
+#ae8.1 up up
+#ae8.32767 up up
 #ae9 up down
+#ae9.32767 up down
+#ae10 up down
+#ae10.32767 up down
+#ae11 up up
+#ae11.0 up up
+#ae12 up up
+#ae12.0 up up
+#ae13 up down
+#ae14 up down
 #cbp0 up up
 #demux0 up up
 #dsc up up
@@ -629,34 +645,6 @@
 #irb.12 up up
 #irb.35 up up
 #irb.69 up up
-#irb.101 up up
-#irb.102 up up
-#irb.103 up up
-#irb.104 up up
-#irb.105 up up
-#irb.106 up up
-#irb.107 up up
-#irb.108 up up
-#irb.109 up up
-#irb.110 up up
-#irb.111 up up
-#irb.112 up up
-#irb.113 up up
-#irb.114 up up
-#irb.115 up up
-#irb.116 up up
-#irb.117 up up
-#irb.118 up up
-#irb.119 up up
-#irb.120 up up
-#irb.121 up up
-#irb.122 up up
-#irb.123 up up
-#irb.124 up up
-#irb.125 up up
-#irb.126 up up
-#irb.127 up up
-#irb.128 up up
 #irb.199 up up
 #irb.245 up up
 #irb.248 up up
@@ -673,6 +661,7 @@
 #irb.604 up up
 #irb.612 up up
 #irb.621 up up
+#irb.700 up up
 #irb.705 up up
 #irb.710 up up
 #irb.711 up up
@@ -699,12 +688,13 @@
 #irb.880 up up
 #irb.882 up up
 #irb.885 up up
-#irb.890 up up
 #irb.891 up up
 #irb.894 up up
+#irb.951 up up
 #irb.952 up up
 #irb.953 up up
 #irb.955 up up
+#irb.956 up up
 #irb.957 up up
 #irb.969 up up
 #irb.1030 up up
@@ -723,6 +713,7 @@
 #irb.1404 up up
 #irb.1405 up up
 #irb.1406 up up
+#irb.1407 up up
 #irb.1408 up up
 #irb.1409 up up
 #irb.1411 up up
@@ -732,9 +723,11 @@
 #irb.1442 up up
 #irb.1443 up up
 #irb.1444 up up
+#irb.1445 up up
 #irb.1446 up up
 #irb.1447 up up
 #irb.1448 up up
+#irb.1449 up up
 #irb.1450 up up
 #irb.1451 up up
 #irb.1452 up up
@@ -763,6 +756,35 @@
 #irb.2711 up up
 #irb.2712 up up
 #irb.2713 up up
+#irb.4001 up up
+#irb.4002 up up
+#irb.4003 up up
+#irb.4004 up up
+#irb.4005 up up
+#irb.4006 up up
+#irb.4007 up up
+#irb.4008 up up
+#irb.4009 up up
+#irb.4010 up up
+#irb.4011 up up
+#irb.4012 up up
+#irb.4013 up up
+#irb.4014 up up
+#irb.4015 up up
+#irb.4016 up up
+#irb.4017 up up
+#irb.4018 up up
+#irb.4019 up up
+#irb.4020 up up
+#irb.4021 up up
+#irb.4022 up up
+#irb.4023 up up
+#irb.4024 up up
+#irb.4025 up up
+#irb.4026 up up
+#irb.4027 up up
+#irb.4028 up up
+#irb.4090 up up
 #lo0 up up
 #lo0.0 up up
 #lo0.16384 up up
@@ -776,7 +798,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at MX480_DC_01_RE0> show configuration 
-## Last commit: 2013-12-04 14:09:40 CST by josh
+## Last commit: 2013-12-08 00:37:59 CST by admin
 version 12.3R3.4;
 groups {
     re0 {
@@ -820,6 +842,34 @@
             }
         }
     }
+    OSPF-RI {
+        routing-instances {
+            <*> {
+                protocols {
+                    ospf {
+                        export REDISTRIBUTE-DIRECTS-OSPF;
+                        reference-bandwidth 100g;
+                        area 0.0.0.0 {
+                            interface <irb.*> {
+                                bfd-liveness-detection {
+                                    minimum-interval 300;
+                                    multiplier 4;
+                                    full-neighbors-only;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    MAC-SYNC {
+        bridge-domains {
+            <*> {
+                mcae-mac-synchronize;
+            }
+        }
+    }
 }
 apply-groups [ re0 re1 ];
 system {
@@ -946,7 +996,7 @@
     }
     aggregated-devices {
         ethernet {
-            device-count 10;
+            device-count 15;
         }
     }
     fpc 0 {
@@ -983,7 +1033,7 @@
     xe-0/1/0 {
         description "LAG to EX4200_DC_VC_02 ae4";
         gigether-options {
-            802.3ad ae5;
+            802.3ad ae4;
         }
     }
     xe-0/1/1 {
@@ -995,7 +1045,7 @@
     ge-0/2/0 {
         description "UCS_19 ae8";
         gigether-options {
-            802.3ad ae8;
+            802.3ad ae12;
         }
     }
     ge-0/2/1 {
@@ -1011,7 +1061,7 @@
     ge-0/2/2 {
         description "UCS_20 ae7";
         gigether-options {
-            802.3ad ae7;
+            802.3ad ae11;
         }
     }
     ge-0/2/3 {
@@ -1179,7 +1229,7 @@
     xe-1/1/0 {
         description "LAG to EX4200_DC_VC_02 ae4";
         gigether-options {
-            802.3ad ae5;
+            802.3ad ae4;
         }
     }
     xe-1/1/1 {
@@ -1188,19 +1238,16 @@
             802.3ad ae1;
         }
     }
-    ge-1/2/0 {
-        unit 0;
-    }
     ge-1/2/3 {
         description "UCS_19 ae8";
         gigether-options {
-            802.3ad ae8;
+            802.3ad ae12;
         }
     }
     ge-1/2/4 {
         description "UCS_20 ae7";
         gigether-options {
-            802.3ad ae7;
+            802.3ad ae11;
         }
     }
     ge-1/3/0 {
@@ -1361,19 +1408,24 @@
     }
     xe-3/1/0 {
         description "MC_LAG Connection MX480_DC_02_RE0 xe-3/1/0 | [NO-MONITOR]";
-        disable;
+        gigether-options {
+            802.3ad ae8;
+        }
     }
-    xe-5/0/0 {
-        description delete;
+    xe-3/1/1 {
+        gigether-options {
+            802.3ad ae6;
+        }
     }
     ae0 {
-        description "LAG to OneNet DC MX480";
+        description "ICL MC-LAG DC MX480";
         vlan-tagging;
         mtu 9192;
         aggregated-ether-options {
             link-speed 10g;
             lacp {
                 active;
+                periodic fast;
             }
         }
         unit 0 {
@@ -1382,35 +1434,27 @@
                 vlan-id-list 2-4000;
             }
         }
-        unit 1 {
-            vlan-id 1;
-            family inet {
-                mtu 9000;
-                address 10.199.199.193/29;
-            }
-            inactive: family iso;
-            family mpls;
-        }
     }
     ae1 {
-        description "LAG to EX4200_DC_VC_01";
+        description "MC-LAG to EX4200_DC_VC_01";
         flexible-vlan-tagging;
         mtu 9192;
-        inactive: multi-chassis-protection 164.58.199.196 {
+        multi-chassis-protection 164.58.199.196 {
             interface ae0;
         }
         aggregated-ether-options {
             link-speed 10g;
             lacp {
                 active;
-                system-id 00:00:00:00:00:01;
-                inactive: admin-key 1;
+                periodic fast;
+                system-id ca:fe:ba:be:00:01;
+                admin-key 1;
             }
-            inactive: mc-ae {
+            mc-ae {
                 mc-ae-id 1;
                 redundancy-group 1;
                 chassis-id 0;
-                mode active-standby;
+                mode active-active;
                 status-control active;
             }
         }
@@ -1430,13 +1474,14 @@
             link-speed 10g;
             lacp {
                 active;
+                periodic fast;
             }
         }
         unit 0 {
             description "OneNet DC-SRX Node-0 Reth-0 Untrust";
             family bridge {
                 interface-mode trunk;
-                vlan-id-list 2-4000;
+                vlan-id-list 4090;
             }
         }
     }
@@ -1449,25 +1494,78 @@
             link-speed 10g;
             lacp {
                 active;
+                periodic fast;
             }
         }
         unit 0 {
             description "OneNet DC-SRX Node-0 Reth-1 Trust";
             family bridge {
                 interface-mode trunk;
+                vlan-id-list [ 4001-4089 1000 2100 2102 2111 ];
+            }
+        }
+    }
+    ae4 {
+        description "MC-LAG to EX4200_DC_VC_02";
+        flexible-vlan-tagging;
+        native-vlan-id 248;
+        mtu 9192;
+        multi-chassis-protection 164.58.199.196 {
+            interface ae0;
+        }
+        aggregated-ether-options {
+            link-speed 10g;
+            lacp {
+                active;
+                periodic fast;
+                system-id ca:fe:ba:be:00:04;
+                admin-key 1;
+            }
+            mc-ae {
+                mc-ae-id 4;
+                redundancy-group 1;
+                chassis-id 0;
+                mode active-active;
+                status-control active;
+            }
+        }
+        unit 0 {
+            family bridge {
+                interface-mode trunk;
                 vlan-id-list 2-4000;
             }
         }
     }
     ae5 {
-        description "LAG to EX4200_DC_VC_02";
+        description "LAG to OKC1 FUTURE USE RESERVE [NO MONITOR]";
+        vlan-tagging;
+        mtu 9192;
+        aggregated-ether-options {
+            link-speed 10g;
+        }
+    }
+    ae6 {
+        description "MC-LAG to EX4550_DC_VC1";
         flexible-vlan-tagging;
         mtu 9192;
+        multi-chassis-protection 164.58.199.196 {
+            interface ae0;
+        }
         aggregated-ether-options {
             link-speed 10g;
             lacp {
                 active;
+                periodic fast;
+                system-id ca:fe:ba:be:00:06;
+                admin-key 1;
             }
+            mc-ae {
+                mc-ae-id 6;
+                redundancy-group 1;
+                chassis-id 0;
+                mode active-active;
+                status-control active;
+            }
         }
         unit 0 {
             family bridge {
@@ -1477,6 +1575,79 @@
         }
     }
     ae7 {
+        description "MC-LAG to EX4550_DC_VC2";
+        flexible-vlan-tagging;
+        mtu 9192;
+        multi-chassis-protection 164.58.199.196 {
+            interface ae0;
+        }
+        aggregated-ether-options {
+            link-speed 10g;
+            lacp {
+                active;
+                periodic fast;
+                system-id ca:fe:ba:be:00:07;
+                admin-key 1;
+            }
+            mc-ae {
+                mc-ae-id 7;
+                redundancy-group 1;
+                chassis-id 0;
+                mode active-active;
+                status-control active;
+            }
+        }
+        unit 0 {
+            family bridge {
+                interface-mode trunk;
+                vlan-id-list 2-4000;
+            }
+        }
+    }
+    ae8 {
+        description "LAG Layer 3 to OneNet DC MX480";
+        vlan-tagging;
+        mtu 9192;
+        aggregated-ether-options {
+            link-speed 10g;
+            lacp {
+                active;
+                periodic fast;
+            }
+        }
+        unit 0 {
+            family bridge {
+                interface-mode trunk;
+                vlan-id-list 4001-4093;
+            }
+        }
+        unit 1 {
+            vlan-id 4094;
+            family inet {
+                mtu 9000;
+                address 10.199.199.193/29;
+            }
+            family iso;
+            family mpls;
+        }
+    }
+    ae9 {
+        description "LAG to OKC1 FUTURE USE RESERVE [NO MONITOR]";
+        vlan-tagging;
+        mtu 9192;
+        aggregated-ether-options {
+            link-speed 10g;
+        }
+    }
+    ae10 {
+        description "FUTURE ONENET USE RESERVED [NO MONITOR]";
+        vlan-tagging;
+        mtu 9192;
+        aggregated-ether-options {
+            link-speed 10g;
+        }
+    }
+    ae11 {
         description UCS_20;
         aggregated-ether-options {
             lacp {
@@ -1490,7 +1661,7 @@
             }
         }
     }
-    ae8 {
+    ae12 {
         description UCS_19;
         aggregated-ether-options {
             lacp {
@@ -1531,179 +1702,6 @@
                 address 164.58.109.249/29;
             }
         }
-        inactive: unit 100 {
-            family inet {
-                address 10.199.199.49/29;
-            }
-            family iso;
-        }
-        unit 101 {
-            description "MX to SRX VLAN101";
-            family inet {
-                mtu 9000;
-                address 10.199.199.57/29;
-            }
-        }
-        unit 102 {
-            description "MX to SRX VLAN102";
-            family inet {
-                address 10.199.199.65/29;
-            }
-        }
-        unit 103 {
-            description "MX to SRX VLAN103";
-            family inet {
-                address 10.199.199.73/29;
-            }
-        }
-        unit 104 {
-            description "MX to SRX VLAN104";
-            family inet {
-                address 10.199.199.81/29;
-            }
-        }
-        unit 105 {
-            description "MX to SRX VLAN105";
-            family inet {
-                address 10.199.199.1/29;
-            }
-        }
-        unit 106 {
-            description "MX to SRX VLAN106";
-            family inet {
-                address 10.199.199.9/29;
-            }
-        }
-        unit 107 {
-            description "MX to SRX VLAN107";
-            family inet {
-                address 10.199.199.17/29;
-            }
-        }
-        unit 108 {
-            description "MX to SRX VLAN108";
-            family inet {
-                address 10.199.199.25/29;
-            }
-        }
-        unit 109 {
-            description "MX to SRX VLAN109";
-            family inet {
-                address 10.199.199.33/29;
-            }
-        }
-        unit 110 {
-            description "MX to SRX VLAN110";
-            family inet {
-                mtu 9000;
-                address 10.199.199.41/29;
-            }
-        }
-        unit 111 {
-            description "MX to SRX VLAN111";
-            family inet {
-                address 10.199.199.89/29;
-            }
-        }
-        unit 112 {
-            description "MX to SRX VLAN112";
-            family inet {
-                address 10.199.199.97/29;
-            }
-        }
-        unit 113 {
-            description "MX to SRX VLAN113";
-            family inet {
-                address 10.199.199.105/29;
-            }
-        }
-        unit 114 {
-            description "MX to SRX VLAN114";
-            family inet {
-                address 10.199.199.113/29;
-            }
-        }
-        unit 115 {
-            description "MX to SRX VLAN115";
-            family inet {
-                address 10.199.199.121/29;
-            }
-        }
-        unit 116 {
-            description "MX to SRX VLAN116";
-            family inet {
-                address 10.199.199.129/29;
-            }
-        }
-        unit 117 {
-            description "MX to SRX VLAN117";
-            family inet {
-                address 10.199.199.137/29;
-            }
-        }
-        unit 118 {
-            description "MX to SRX VLAN118";
-            family inet {
-                address 10.199.199.145/29;
-            }
-        }
-        unit 119 {
-            description "MX to SRX VLAN119";
-            family inet {
-                address 10.199.199.153/29;
-            }
-        }
-        unit 120 {
-            family inet {
-                mtu 1500;
-                address 10.199.199.161/29;
-            }
-        }
-        unit 121 {
-            description "MX to SRX VLAN121";
-            family inet {
-                address 10.199.199.169/29;
-            }
-        }
-        unit 122 {
-            description tr_ocap___-01-0122;
-            family inet {
-                address 10.199.199.177/29;
-            }
-        }
-        unit 123 {
-            family inet {
-                mtu 9000;
-                address 10.199.199.186/29;
-            }
-        }
-        unit 124 {
-            family inet {
-                address 10.199.199.193/29;
-            }
-        }
-        unit 125 {
-            description "Oklahoma Student Loan Assosation";
-            family inet {
-                address 10.199.199.201/29;
-            }
-        }
-        unit 126 {
-            description mgmtPoPvpn-01-0126;
-            family inet {
-                address 10.199.199.209/29;
-            }
-        }
-        unit 127 {
-            family inet {
-                address 10.199.199.217/29;
-            }
-        }
-        unit 128 {
-            family inet {
-                address 10.199.199.225/29;
-            }
-        }
         unit 199 {
             description dmz_tstdev-01-0199;
             family inet {
@@ -1817,6 +1815,13 @@
                 address 10.8.84.1/24;
             }
         }
+        unit 700 {
+            description un_advanci-01-0700;
+            family inet {
+                mtu 1500;
+                address 164.58.3.53/30;
+            }
+        }
         unit 705 {
             description un_nex_med-01-0705;
             family inet {
@@ -1949,15 +1954,7 @@
         }
         unit 840 {
             family inet {
-                address 164.58.208.2/28 {
-                    vrrp-group 3 {
-                        virtual-address 164.58.208.1;
-                        priority 200;
-                        accept-data;
-                        authentication-type simple;
-#                        authentication-key <removed>;
-                    }
-                }
+                address 164.58.208.1/28;
             }
         }
         unit 847 {
@@ -1997,13 +1994,6 @@
                 address 10.10.247.1/24;
             }
         }
-        unit 890 {
-            description untrust___-01-0890;
-            family inet {
-                address 164.58.69.121/29;
-            }
-            family iso;
-        }
         unit 891 {
             description wifi_wlc__-01-0891;
             family inet {
@@ -2016,6 +2006,12 @@
                 address 10.9.4.2/24;
             }
         }
+        unit 951 {
+            description "OMES TO SDE VIDEO";
+            family inet {
+                address 156.110.90.249/30;
+            }
+        }
         unit 952 {
             description un_iccm___-01-0952;
             family inet {
@@ -2035,6 +2031,12 @@
                 address 156.110.211.233/29;
             }
         }
+        unit 956 {
+            description "DOH Shepard Mall Video";
+            family inet {
+                address 156.110.47.217/29;
+            }
+        }
         unit 957 {
             description un_clatax_-01-0957;
             family inet {
@@ -2158,11 +2160,9 @@
                 address 156.110.26.157/30;
             }
         }
-        inactive: unit 1407 {
-            description un_thermet-01-1407;
+        unit 1407 {
             family inet {
                 mtu 1500;
-                address 156.110.26.181/30;
                 address 164.58.152.141/30;
             }
         }
@@ -2230,8 +2230,7 @@
                 address 156.110.27.145/30;
             }
         }
-        inactive: unit 1445 {
-            description un_protech-01-1445;
+        unit 1445 {
             family inet {
                 mtu 1500;
                 address 164.58.221.225/28;
@@ -2255,7 +2254,7 @@
                 address 156.110.27.205/30;
             }
         }
-        inactive: unit 1449 {
+        unit 1449 {
             description un_newspin-01-1449;
             family inet {
                 address 156.110.231.81/29;
@@ -2428,6 +2427,180 @@
                 address 164.58.177.153/29;
             }
         }
+        unit 4001 {
+            description "MX to SRX VLAN101";
+            family inet {
+                mtu 9000;
+                address 10.199.199.57/29;
+            }
+        }
+        unit 4002 {
+            description "MX to SRX VLAN102";
+            family inet {
+                address 10.199.199.65/29;
+            }
+        }
+        unit 4003 {
+            description "MX to SRX VLAN103";
+            family inet {
+                address 10.199.199.73/29;
+            }
+        }
+        unit 4004 {
+            description "MX to SRX VLAN104";
+            family inet {
+                address 10.199.199.81/29;
+            }
+        }
+        unit 4005 {
+            description "MX to SRX VLAN105";
+            family inet {
+                address 10.199.199.1/29;
+            }
+        }
+        unit 4006 {
+            description "MX to SRX VLAN106";
+            family inet {
+                address 10.199.199.9/29;
+            }
+        }
+        unit 4007 {
+            description "MX to SRX VLAN107";
+            family inet {
+                address 10.199.199.17/29;
+            }
+        }
+        unit 4008 {
+            description "MX to SRX VLAN108";
+            family inet {
+                address 10.199.199.25/29;
+            }
+        }
+        unit 4009 {
+            description "MX to SRX VLAN109";
+            family inet {
+                address 10.199.199.33/29;
+            }
+        }
+        unit 4010 {
+            description "MX to SRX VLAN110";
+            family inet {
+                mtu 9000;
+                address 10.199.199.41/29;
+            }
+        }
+        unit 4011 {
+            description "MX to SRX VLAN111";
+            family inet {
+                address 10.199.199.89/29;
+            }
+        }
+        unit 4012 {
+            description "MX to SRX VLAN112";
+            family inet {
+                address 10.199.199.97/29;
+            }
+        }
+        unit 4013 {
+            description "MX to SRX VLAN113";
+            family inet {
+                address 10.199.199.105/29;
+            }
+        }
+        unit 4014 {
+            description "MX to SRX VLAN114";
+            family inet {
+                address 10.199.199.113/29;
+            }
+        }
+        unit 4015 {
+            description "MX to SRX VLAN115";
+            family inet {
+                address 10.199.199.121/29;
+            }
+        }
+        unit 4016 {
+            description "MX to SRX VLAN116";
+            family inet {
+                address 10.199.199.129/29;
+            }
+        }
+        unit 4017 {
+            description "MX to SRX VLAN117";
+            family inet {
+                address 10.199.199.137/29;
+            }
+        }
+        unit 4018 {
+            description "MX to SRX VLAN118";
+            family inet {
+                address 10.199.199.145/29;
+            }
+        }
+        unit 4019 {
+            description "MX to SRX VLAN119";
+            family inet {
+                address 10.199.199.153/29;
+            }
+        }
+        unit 4020 {
+            family inet {
+                mtu 1500;
+                address 10.199.199.161/29;
+            }
+        }
+        unit 4021 {
+            description "MX to SRX VLAN121";
+            family inet {
+                address 10.199.199.169/29;
+            }
+        }
+        unit 4022 {
+            description tr_ocap___-01-0122;
+            family inet {
+                address 10.199.199.177/29;
+            }
+        }
+        unit 4023 {
+            family inet {
+                mtu 9000;
+                address 10.199.199.186/29;
+            }
+        }
+        unit 4024 {
+            family inet {
+                address 10.199.199.193/29;
+            }
+        }
+        unit 4025 {
+            description "Oklahoma Student Loan Assosation";
+            family inet {
+                address 10.199.199.201/29;
+            }
+        }
+        unit 4026 {
+            description mgmtPoPvpn-01-0126;
+            family inet {
+                address 10.199.199.209/29;
+            }
+        }
+        unit 4027 {
+            family inet {
+                address 10.199.199.217/29;
+            }
+        }
+        unit 4028 {
+            family inet {
+                address 10.199.199.225/29;
+            }
+        }
+        unit 4090 {
+            description untrust___-01-4090;
+            family inet {
+                address 164.58.69.121/29;
+            }
+            family iso;
+        }
     }
     lo0 {
         unit 0 {
@@ -2488,27 +2661,16 @@
 routing-options {
     nonstop-routing;
     static {
-        /* Advancia Park Customer */
         route 192.231.3.0/24 next-hop 164.58.3.54;
-        /* Advancia Park Customer */
         route 198.203.153.0/24 next-hop 164.58.3.54;
-        /* Hosted Exchange */
         route 164.58.251.0/26 next-hop 164.58.251.242;
-        /* Voice Data Gateway */
         route 164.58.233.13/32 next-hop 164.58.69.122;
-        /* CPannel Web Servers */
         route 156.110.96.160/28 next-hop 164.58.69.122;
-        /* unknown */
         route 164.58.198.146/32 next-hop 164.58.69.122;
-        /* unknown */
         route 156.110.43.8/29 next-hop 164.58.69.122;
-        /* unknown */
         route 156.110.24.0/30 next-hop 164.58.69.122;
-        /* unknown */
         route 156.110.96.144/28 next-hop 164.58.69.122;
-        /* unknown */
         route 156.110.96.176/28 next-hop 164.58.69.122;
-        /* unknown */
         route 156.110.96.128/28 next-hop 164.58.69.122;
         route 164.58.152.133/32 next-hop 164.58.69.122;
         route 164.58.253.191/32 next-hop 164.58.250.72;
@@ -2524,6 +2686,10 @@
         route 164.58.139.192/26 next-hop 164.58.71.10;
         route 164.58.151.64/26 next-hop 164.58.71.10;
         route 164.58.176.48/29 next-hop 156.110.26.114;
+        route 156.110.27.12/30 next-hop 164.58.3.54;
+        route 156.110.27.16/30 next-hop 164.58.3.54;
+        route 164.58.234.0/24 next-hop 156.110.90.250;
+        route 164.58.238.0/24 next-hop 156.110.90.250;
     }
     router-id 164.58.199.194;
     autonomous-system 5078;
@@ -2535,7 +2701,7 @@
     mpls {
         interface xe-2/2/0.0;
         interface lo0.0;
-        interface ae0.1;
+        interface ae8.1;
     }
     bgp {
         group CORE-RR {
@@ -2574,8 +2740,7 @@
     }
     isis {
         export [ ospf-isis ISIS-STATICS ];
-        inactive: interface irb.100;
-        interface irb.890;
+        interface irb.4090;
         interface lo0.0;
     }
     ospf {
@@ -2588,24 +2753,23 @@
                     md5 7 key "$9$r23lWLNdsY4ZdVZjHqzFhSyrMX-Vw2oGLxVYgoGU"; ## SECRET-DATA
                 }
             }
-            interface lo0.0;
+            interface lo0.0 {
+                passive;
+            }
             interface fxp0.0 {
                 disable;
             }
-            interface irb.100 {
-                passive;
+            interface ae8.1 {
+                authentication {
+                    md5 7 key "$9$r23lWLNdsY4ZdVZjHqzFhSyrMX-Vw2oGLxVYgoGU"; ## SECRET-DATA
+                }
+                bfd-liveness-detection {
+                    minimum-interval 300;
+                    multiplier 4;
+                    full-neighbors-only;
+                }
             }
-            interface ae0.1;
-            interface irb.890 {
-                passive;
-            }
-            interface ge-0/3/5.0 {
-                passive;
-            }
             interface ge-1/3/1.0;
-            interface ge-1/2/0.0 {
-                passive;
-            }
         }
     }
     ospf3 {
@@ -2626,10 +2790,10 @@
         track-igp-metric;
         interface xe-2/2/0.69;
         interface ae0.0;
-        interface ae0.1;
+        interface ae8.1;
         interface lo0.0;
     }
-    inactive: iccp {
+    iccp {
         local-ip-addr 164.58.199.194;
         peer 164.58.199.196 {
             redundancy-group-id-list 1;
@@ -2655,15 +2819,9 @@
         nonstop-bridging;
     }
     rstp {
-        interface ae0;
-        interface ae1;
         interface ae2;
         interface ae3;
-        interface ae4;
         interface ae5;
-        interface ae6;
-        interface ae7;
-        interface ae8;
     }
     vstp {
         interface ge-1/3/0;
@@ -2778,6 +2936,20 @@
             }
         }
     }
+    policy-statement REDISTRIBUTE-DIRECTS-OSPF {
+        term accept {
+            from protocol direct;
+            then {
+                external {
+                    type 1;
+                }
+                accept;
+            }
+        }
+        term reject {
+            then reject;
+        }
+    }
     policy-statement REDISTRIBUTE-STATICS {
         term 1 {
             from protocol static;
@@ -2787,6 +2959,17 @@
             }
         }
     }
+    policy-statement REDISTRIBUTE-STATICS-OSPF {
+        term accept {
+            from protocol [ static direct ];
+            then {
+                external {
+                    type 1;
+                }
+                accept;
+            }
+        }
+    }
     policy-statement isis-ospf {
         term 1 {
             from {
@@ -2844,6 +3027,13 @@
                 }
                 then accept;
             }
+            term BFD {
+                from {
+                    protocol udp;
+                    destination-port [ 3784 4784 ];
+                }
+                then accept;
+            }
             term EBGP-ALLOW {
                 from {
                     prefix-list {
@@ -3094,6 +3284,7 @@
 }
 routing-instances {
     ONENET-CONTENT-FILTER-L3VPN {
+        apply-groups OSPF-RI;
         description "Customer Content Filter";
         instance-type vrf;
         interface xe-3/0/0.0;
@@ -3116,9 +3307,10 @@
         }
     }
     ONENET-PoP-APPLIANCES-L3VPN {
+        apply-groups OSPF-RI;
         description ONENET-PoP-APPLIANCES-L3VPN;
         instance-type vrf;
-        interface irb.126;
+        interface irb.4026;
         route-distinguisher 164.58.199.194:2012;
         vrf-import ONENET-PoP-APPLIANCES-IMPORT;
         vrf-export ONENET-PoP-APPLIANCES-EXPORT;
@@ -3132,31 +3324,11 @@
             ospf {
                 export ONENET-PoP-APPLIANCES-IMPORT;
                 area 0.0.0.0 {
-                    interface irb.126;
+                    interface irb.4026;
                 }
             }
         }
     }
-    VPLS-ONENET-IPERF {
-        description ONENET-IPERF-MGMT;
-        instance-type vpls;
-        inactive: vlan-id 2011;
-        inactive: interface ge-1/2/0.2011;
-        route-distinguisher 164.58.199.194:2011;
-        vrf-target target:5078:2011;
-        protocols {
-            vpls {
-                mac-table-size {
-                    3000;
-                    packet-action drop;
-                }
-                no-tunnel-services;
-                site OKC-DC-IPERF {
-                    site-identifier 3;
-                }
-            }
-        }
-    }
     VPLS-OSU-2517 {
         description VPLS-OSU-STILLWATER;
         instance-type vpls;
@@ -3181,180 +3353,221 @@
         }
     }
     dmz_comanche {
-        interface irb.123;
+        apply-groups OSPF-RI;
+        interface irb.4023;
+        routing-options {
+            router-id 10.199.199.186;
+        }
         protocols {
             ospf {
                 area 0.0.0.0 {
-                    interface irb.123;
+                    interface irb.4023;
                 }
             }
         }
     }
     dmz_comanche_ps {
+        apply-groups OSPF-RI;
         instance-type virtual-router;
-        interface irb.128;
+        interface irb.4028;
+        routing-options {
+            router-id 10.199.199.225;
+        }
         protocols {
             ospf {
                 area 0.0.0.0 {
-                    interface irb.128;
+                    interface irb.4028;
                 }
             }
         }
     }
     dmz_connors {
+        apply-groups OSPF-RI;
         instance-type virtual-router;
-        interface irb.119;
+        interface irb.4019;
+        routing-options {
+            router-id 10.199.199.153;
+        }
         protocols {
             ospf {
                 area 0.0.0.0 {
-                    interface irb.119;
+                    interface irb.4019;
                 }
             }
         }
     }
     dmz_dhcp {
+        apply-groups OSPF-RI;
         instance-type virtual-router;
-        interface irb.120;
         interface irb.245;
+        interface irb.4020;
+        routing-options {
+            router-id 10.199.199.161;
+        }
         protocols {
             ospf {
                 area 0.0.0.0 {
-                    interface irb.120;
-                    interface irb.245;
+                    interface irb.4020;
                 }
             }
         }
     }
     dmz_eoktech {
+        apply-groups OSPF-RI;
         instance-type virtual-router;
-        interface irb.127;
         interface irb.2116;
+        interface irb.4027;
+        routing-options {
+            router-id 10.199.199.217;
+        }
         protocols {
             ospf {
                 area 0.0.0.0 {
-                    interface irb.127;
-                    interface irb.2116;
+                    interface irb.4027;
                 }
             }
         }
     }
     dmz_guestwifi {
+        apply-groups OSPF-RI;
         instance-type virtual-router;
-        interface irb.106;
         interface irb.331;
         interface irb.333;
+        interface irb.4006;
+        routing-options {
+            router-id 10.199.199.9;
+        }
         protocols {
             ospf {
                 area 0.0.0.0 {
-                    interface irb.106;
-                    interface irb.333;
-                    interface irb.331;
+                    interface irb.4006;
                 }
             }
         }
     }
     dmz_hptc {
+        apply-groups OSPF-RI;
         instance-type virtual-router;
-        interface irb.117;
         interface irb.2112;
+        interface irb.4017;
+        routing-options {
+            router-id 10.199.199.137;
+        }
         protocols {
             ospf {
                 area 0.0.0.0 {
-                    interface irb.117;
-                    interface irb.2112;
+                    interface irb.4017;
                 }
             }
         }
     }
     dmz_kelsov {
+        apply-groups OSPF-RI;
         instance-type virtual-router;
-        interface irb.114;
         interface irb.2114;
+        interface irb.4014;
+        routing-options {
+            router-id 10.199.199.113;
+        }
         protocols {
             ospf {
                 area 0.0.0.0 {
-                    interface irb.114;
-                    interface irb.2114;
+                    interface irb.4014;
                 }
             }
         }
     }
     dmz_langston {
+        apply-groups OSPF-RI;
         instance-type virtual-router;
-        interface irb.111;
         interface irb.2023;
+        interface irb.4011;
+        routing-options {
+            router-id 10.199.199.89;
+        }
         protocols {
             ospf {
                 area 0.0.0.0 {
-                    interface irb.111;
-                    interface irb.2023;
+                    interface irb.4011;
                 }
             }
         }
     }
     dmz_netgrp {
+        apply-groups OSPF-RI;
         instance-type virtual-router;
-        interface irb.109;
         interface irb.302;
         interface irb.840;
+        interface irb.4009;
+        routing-options {
+            router-id 10.199.199.33;
+        }
         protocols {
             ospf {
                 area 0.0.0.0 {
-                    interface irb.109;
-                    interface irb.302;
-                    interface irb.840;
+                    interface irb.4009;
                 }
             }
         }
     }
     dmz_ohcwc {
+        apply-groups OSPF-RI;
         instance-type virtual-router;
-        interface irb.116;
         interface irb.2018;
+        interface irb.4016;
+        routing-options {
+            router-id 10.199.199.129;
+        }
         protocols {
             ospf {
                 area 0.0.0.0 {
-                    interface irb.116;
-                    interface irb.2018;
+                    interface irb.4016;
                 }
             }
         }
     }
     dmz_okc_ps {
+        apply-groups OSPF-RI;
         instance-type virtual-router;
-        interface irb.115;
         interface irb.2113;
+        interface irb.4015;
+        routing-options {
+            router-id 10.199.199.121;
+        }
         protocols {
             ospf {
                 area 0.0.0.0 {
-                    interface irb.115;
-                    interface irb.2113;
+                    interface irb.4015;
                 }
             }
         }
     }
     dmz_okloan {
+        apply-groups OSPF-RI;
         instance-type virtual-router;
-        interface irb.125;
         interface irb.2115;
+        interface irb.4025;
+        routing-options {
+            router-id 10.199.199.201;
+        }
         protocols {
             ospf {
                 area 0.0.0.0 {
-                    interface irb.125;
-                    interface irb.2115;
+                    interface irb.4025;
                 }
             }
         }
     }
     dmz_onenet {
+        apply-groups OSPF-RI;
         instance-type virtual-router;
-        interface irb.102;
         interface irb.253;
         interface irb.750;
         interface irb.850;
         interface irb.2006;
         interface irb.2008;
         interface irb.2019;
+        interface irb.4002;
         routing-options {
             static {
                 route 164.58.198.206/32 next-hop 164.58.253.10;
@@ -3373,107 +3586,118 @@
                 route 156.110.96.176/28 next-hop 164.58.253.81;
                 route 156.110.96.128/28 next-hop 164.58.253.82;
             }
+            router-id 10.199.199.65;
         }
         protocols {
             ospf {
-                export REDISTRIBUTE-STATICS;
+                export REDISTRIBUTE-STATICS-OSPF;
                 area 0.0.0.0 {
-                    interface irb.102;
-                    interface irb.850;
-                    interface irb.750;
-                    interface irb.253;
-                    interface irb.2019;
-                    interface irb.2006;
-                    interface irb.2008;
+                    interface irb.4002;
                 }
             }
         }
     }
     dmz_pryor {
+        apply-groups OSPF-RI;
         instance-type virtual-router;
-        interface irb.108;
         interface irb.2024;
+        interface irb.4008;
+        routing-options {
+            router-id 10.199.199.25;
+        }
         protocols {
             ospf {
                 area 0.0.0.0 {
-                    interface irb.108;
-                    interface irb.2024;
+                    interface irb.4008;
                 }
             }
         }
     }
     dmz_ucponca {
+        apply-groups OSPF-RI;
         instance-type virtual-router;
-        interface irb.112;
         interface irb.2021;
+        interface irb.4012;
+        routing-options {
+            router-id 10.199.199.97;
+        }
         protocols {
             ospf {
                 area 0.0.0.0 {
-                    interface irb.112;
-                    interface irb.2021;
+                    interface irb.4012;
                 }
             }
         }
     }
     dmz_web {
+        apply-groups OSPF-RI;
         instance-type virtual-router;
-        interface irb.103;
+        interface irb.4003;
+        routing-options {
+            router-id 10.199.199.73;
+        }
         protocols {
             ospf {
                 area 0.0.0.0 {
-                    interface irb.103;
+                    interface irb.4003;
                 }
             }
         }
     }
     dmz_wosc {
+        apply-groups OSPF-RI;
         instance-type virtual-router;
-        interface irb.118;
+        interface irb.4018;
+        routing-options {
+            router-id 10.199.199.145;
+        }
         protocols {
             ospf {
                 area 0.0.0.0 {
-                    interface irb.118;
+                    interface irb.4018;
                 }
             }
         }
     }
     mgmt_onenet {
+        apply-groups OSPF-RI;
         instance-type virtual-router;
-        interface irb.124;
         interface irb.2011;
+        interface irb.4024;
+        routing-options {
+            router-id 10.199.199.193;
+        }
         protocols {
             ospf {
                 area 0.0.0.0 {
-                    interface irb.124;
-                    interface irb.2011;
+                    interface irb.4024;
                 }
             }
         }
     }
     trust_netgrp {
+        apply-groups OSPF-RI;
         instance-type virtual-router;
-        interface irb.104;
         interface irb.300;
         interface irb.301;
         interface irb.332;
+        interface irb.4004;
         routing-options {
             router-id 10.199.199.81;
         }
         protocols {
             ospf {
                 area 0.0.0.0 {
-                    interface irb.104;
-                    interface irb.300;
-                    interface irb.301;
-                    interface irb.332;
+                    interface irb.4004;
                 }
             }
         }
     }
     trust_ocap {
+        apply-groups OSPF-RI;
         instance-type virtual-router;
-        interface irb.121;
-        interface irb.122;
+        interface irb.4021;
+        interface irb.4022;
         routing-options {
             static {
                 route 172.18.0.0/22 next-hop 10.199.199.180;
@@ -3491,32 +3715,37 @@
                 }
                 route 167.104.240.128/25 next-hop 10.199.199.180;
             }
+            router-id 10.199.199.169;
         }
         protocols {
             ospf {
-                export REDISTRIBUTE-STATICS;
+                export REDISTRIBUTE-STATICS-OSPF;
                 area 0.0.0.0 {
-                    interface irb.121;
-                    interface irb.122;
+                    interface irb.4021;
+                    interface irb.4022;
                 }
             }
         }
     }
     trust_onenet {
+        apply-groups OSPF-RI;
         instance-type virtual-router;
-        interface irb.105;
+        interface irb.4005;
+        routing-options {
+            router-id 10.199.199.1;
+        }
         protocols {
             ospf {
                 area 0.0.0.0 {
-                    interface irb.105;
+                    interface irb.4005;
                 }
             }
         }
     }
     trust_regents {
+        apply-groups OSPF-RI;
         instance-type virtual-router;
         interface irb.35;
-        interface irb.101;
         interface irb.199;
         interface irb.248;
         interface irb.604;
@@ -3541,10 +3770,12 @@
         interface irb.891;
         interface irb.894;
         interface irb.2017;
+        interface irb.4001;
         routing-options {
             static {
                 route 10.10.241.0/24 next-hop 10.9.1.1;
             }
+            router-id 10.199.199.57;
         }
         protocols {
             ospf {
@@ -3552,77 +3783,56 @@
                     file OSPF_TR_REG size 1m;
                     flag all;
                 }
-                export REDISTRIBUTE-STATICS;
+                export REDISTRIBUTE-STATICS-OSPF;
                 area 0.0.0.0 {
-                    interface irb.101;
-                    interface irb.199;
-                    interface irb.248;
-                    interface irb.604;
-                    interface irb.612;
-                    interface irb.621;
-                    interface irb.786;
-                    interface irb.800;
-                    interface irb.801;
-                    interface irb.802;
-                    interface irb.803;
-                    interface irb.804;
-                    interface irb.806;
-                    interface irb.807;
-                    interface irb.808;
-                    interface irb.810;
-                    interface irb.811;
-                    interface irb.812;
-                    interface irb.847;
-                    interface irb.880;
-                    interface irb.882;
+                    interface irb.4001;
                     interface irb.885;
-                    interface irb.891;
-                    interface irb.894;
-                    interface irb.2017;
-                    interface irb.35;
                 }
             }
         }
     }
     voip {
+        apply-groups OSPF-RI;
         instance-type virtual-router;
-        interface irb.113;
         interface irb.1102;
         interface irb.1206;
         interface irb.2103;
         interface irb.2104;
+        interface irb.4013;
         routing-options {
             static {
                 route 10.80.10.0/24 next-hop 164.58.144.162;
                 route 10.80.12.0/24 next-hop 164.58.144.162;
             }
+            router-id 10.199.199.105;
         }
         protocols {
             ospf {
-                export REDISTRIBUTE-STATICS;
+                export REDISTRIBUTE-STATICS-OSPF;
                 area 0.0.0.0 {
-                    interface irb.113;
-                    interface irb.2103;
-                    interface irb.2104;
-                    interface irb.1102;
-                    interface irb.1206;
+                    interface irb.4013;
                 }
             }
         }
     }
     vpn {
+        apply-groups OSPF-RI;
         instance-type virtual-router;
-        interface irb.110;
+        interface irb.4010;
+        routing-options {
+            router-id 10.199.199.41;
+        }
         protocols {
             ospf {
                 area 0.0.0.0 {
-                    interface irb.110;
+                    interface irb.4010;
                 }
             }
         }
     }
 }
 bridge-domains {
+    apply-groups MAC-SYNC;
     allaccess {
         vlan-id 35;
         routing-interface irb.35;
@@ -3631,9 +3841,10 @@
         vlan-id 880;
         routing-interface irb.880;
     }
-    dmz-127srx-01-0127 {
-        vlan-id 127;
-        routing-interface irb.127;
+    dmz-127srx-01-4027 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4027;
+        routing-interface irb.4027;
     }
     dmz-oru___-01-0807 {
         vlan-id 807;
@@ -3652,9 +3863,10 @@
     dmz_com_ps-01-2100 {
         vlan-id 2100;
     }
-    dmz_consrx-01-0119 {
-        vlan-id 119;
-        routing-interface irb.119;
+    dmz_consrx-01-4019 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4019;
+        routing-interface irb.4019;
     }
     dmz_d2l_bk-01-2008 {
         vlan-id 2008;
@@ -3697,9 +3909,10 @@
         vlan-id 2114;
         routing-interface irb.2114;
     }
-    dmz_ks_srx-01-0114 {
-        vlan-id 114;
-        routing-interface irb.114;
+    dmz_ks_srx-01-4014 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4014;
+        routing-interface irb.4014;
     }
     dmz_lang__-01-2022 {
         vlan-id 2022;
@@ -3728,9 +3941,10 @@
     dmz_msgmta-01-2003 {
         vlan-id 2003;
     }
-    dmz_netgrp-01-0109 {
-        vlan-id 109;
-        routing-interface irb.109;
+    dmz_netgrp-01-4009 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4009;
+        routing-interface irb.4009;
     }
     dmz_nfs___-01-0820 {
         vlan-id 820;
@@ -3754,9 +3968,10 @@
         vlan-id 2115;
         routing-interface irb.2115;
     }
-    dmz_on_srx-01-0102 {
-        vlan-id 102;
-        routing-interface irb.102;
+    dmz_on_srx-01-4002 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4002;
+        routing-interface irb.4002;
     }
     dmz_onenet-01-0804 {
         vlan-id 804;
@@ -3779,9 +3994,10 @@
         vlan-id 2024;
         routing-interface irb.2024;
     }
-    dmz_prysrx-01-0108 {
-        vlan-id 108;
-        routing-interface irb.108;
+    dmz_prysrx-01-4008 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4008;
+        routing-interface irb.4008;
     }
     dmz_regent-01-0803 {
         vlan-id 803;
@@ -3849,70 +4065,87 @@
         vlan-id 710;
         routing-interface irb.710;
     }
-    dmzcomps__-01-0128 {
-        vlan-id 128;
-        routing-interface irb.128;
+    dmzcomps__-01-4028 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4028;
+        routing-interface irb.4028;
     }
     dmzdhcpsrv-01-0245 {
         vlan-id 245;
         routing-interface irb.245;
     }
-    dmzdhcpsrx-01-0120 {
-        vlan-id 120;
-        routing-interface irb.120;
+    dmzdhcpsrx-01-4020 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4020;
+        routing-interface irb.4020;
     }
-    dmzfilesrx-01-0107 {
-        vlan-id 107;
-        routing-interface irb.107;
+    dmzfilesrx-01-4007 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4007;
+        routing-interface irb.4007;
     }
-    dmzhcwcsrx-01-0116 {
-        vlan-id 116;
-        routing-interface irb.116;
+    dmzhcwcsrx-01-4016 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4016;
+        routing-interface irb.4016;
     }
-    dmzhptcsrx-01-0117 {
-        vlan-id 117;
-        routing-interface irb.117;
+    dmzhptcsrx-01-4017 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4017;
+        routing-interface irb.4017;
     }
-    dmzlangsrx-01-0111 {
-        vlan-id 111;
-        routing-interface irb.111;
+    dmzlangsrx-01-4011 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4011;
+        routing-interface irb.4011;
     }
-    dmzloansrx-01-0125 {
-        vlan-id 125;
-        routing-interface irb.125;
+    dmzloansrx-01-4025 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4025;
+        routing-interface irb.4025;
     }
-    dmzokc_srx-01-0115 {
-        vlan-id 115;
-        routing-interface irb.115;
+    dmzokc_srx-01-4015 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4015;
+        routing-interface irb.4015;
     }
-    dmzponcsrx-01-0112 {
-        vlan-id 112;
-        routing-interface irb.112;
+    dmzponcsrx-01-4012 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4012;
+        routing-interface irb.4012;
     }
-    dmzweb_srx-01-0103 {
-        vlan-id 103;
-        routing-interface irb.103;
+    dmzweb_srx-01-4003 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4003;
+        routing-interface irb.4003;
     }
-    dmzwifisrx-01-0106 {
-        vlan-id 106;
-        routing-interface irb.106;
+    dmzwifisrx-01-4006 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4006;
+        routing-interface irb.4006;
     }
-    dmzwoscsrx-01-0118 {
-        vlan-id 118;
-        routing-interface irb.118;
+    dmzwoscsrx-01-4018 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4018;
+        routing-interface irb.4018;
     }
+    doh_video_-01-0956 {
+        vlan-id 956;
+        routing-interface irb.956;
+    }
     higgsboson-01-0300 {
         vlan-id 300;
         routing-interface irb.300;
     }
-    mgmtPoPvpn-01-0126 {
-        vlan-id 126;
-        routing-interface irb.126;
-    }
     mgmtPoPvpn-01-2012 {
         vlan-id 2012;
         routing-interface irb.2012;
     }
+    mgmtPoPvpn-01-4026 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4026;
+        routing-interface irb.4026;
+    }
     mgmt_ipef_-01-2011 {
         vlan-id 2011;
         routing-interface irb.2011;
@@ -3925,9 +4158,10 @@
         vlan-id 301;
         routing-interface irb.301;
     }
-    new_srxche-01-0123 {
-        vlan-id 123;
-        routing-interface irb.123;
+    new_srxche-01-4023 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4023;
+        routing-interface irb.4023;
     }
     optical___-01-0810 {
         vlan-id 810;
@@ -3948,14 +4182,19 @@
         vlan-id 881;
         routing-interface irb.881;
     }
+    sde_omes__-01-0951 {
+        vlan-id 951;
+        routing-interface irb.951;
+    }
     socl_media-01-0786 {
         description 10.8.86.0/24;
         vlan-id 786;
         routing-interface irb.786;
     }
-    srvmgt_srx-01-0124 {
-        vlan-id 124;
-        routing-interface irb.124;
+    srvmgt_srx-01-4024 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4024;
+        routing-interface irb.4024;
     }
     sys_manage-01-0806 {
         vlan-id 806;
@@ -3965,25 +4204,30 @@
         vlan-id 811;
         routing-interface irb.811;
     }
-    tr_net_srx-01-0104 {
-        vlan-id 104;
-        routing-interface irb.104;
+    tr_net_srx-01-4004 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4004;
+        routing-interface irb.4004;
     }
-    tr_ocap___-01-0122 {
-        vlan-id 122;
-        routing-interface irb.122;
+    tr_ocap___-01-4022 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4022;
+        routing-interface irb.4022;
     }
-    tr_ocapsrx-01-0121 {
-        vlan-id 121;
-        routing-interface irb.121;
+    tr_ocapsrx-01-4021 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4021;
+        routing-interface irb.4021;
     }
-    tr_on_srx_-01-0105 {
-        vlan-id 105;
-        routing-interface irb.105;
+    tr_on_srx_-01-4005 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4005;
+        routing-interface irb.4005;
     }
-    tr_reg_srx-01-0101 {
-        vlan-id 101;
-        routing-interface irb.101;
+    tr_reg_srx-01-4001 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4001;
+        routing-interface irb.4001;
     }
     tr_systest-01-0621 {
         vlan-id 621;
@@ -4381,14 +4625,11 @@
     unknown___-01-2111 {
         vlan-id 2111;
     }
-    untr-srx__-01-0100 {
-        vlan-id 100;
-        routing-interface irb.100;
+    untrust___-01-4090 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4090;
+        routing-interface irb.4090;
     }
-    untrust___-01-0890 {
-        vlan-id 890;
-        routing-interface irb.890;
-    }
     voip_kans_-01-0612 {
         vlan-id 612;
         routing-interface irb.612;
@@ -4398,17 +4639,19 @@
         vlan-id 604;
         routing-interface irb.604;
     }
-    voip_srx__-01-0113 {
-        vlan-id 113;
-        routing-interface irb.113;
+    voip_srx__-01-4013 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4013;
+        routing-interface irb.4013;
     }
     vpn_concen-01-0847 {
         vlan-id 847;
         routing-interface irb.847;
     }
-    vpn_srx___-01-0110 {
-        vlan-id 110;
-        routing-interface irb.110;
+    vpn_srx___-01-4010 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4010;
+        routing-interface irb.4010;
     }
     wifi_guest-01-0708 {
         vlan-id 708;
@@ -4439,7 +4682,7 @@
 {master}
 # grnoc-mon at MX480_DC_01_RE0> show ospf neighbor 
 # Address          Interface              State     ID               Pri  Dead
-# 10.199.199.194   ae0.1                  Full      164.58.199.196
+# 10.199.199.194   ae8.1                  Full      164.58.199.196
 # 156.110.130.94   ge-1/3/1.0             Full      156.110.130.86
 # 164.58.246.137   xe-2/2/0.69            Full      164.58.199.211
 # 

Index: core5.okc.onenet.net
===================================================================
--- core5.okc.onenet.net	(revision 92866)
+++ core5.okc.onenet.net	(working copy)
@@ -516,8 +516,8 @@
 #ge-1/3/5.2510 down up
 #ge-1/3/5.2511 down up
 #ge-1/3/5.32767 up up
-#ge-1/3/6 up down
-#ge-1/3/6.0 up down
+#ge-1/3/6 up up
+#ge-1/3/6.0 up up
 #ge-1/3/7 up down
 #ge-1/3/8 up down
 #ge-1/3/9 up up
@@ -568,6 +568,7 @@
 #lsi up up
 #lsi.1383946 up up
 #lsi.1496838 up up
+#lsi.1694723 up up
 #mtun up up
 #pimd up up
 #pime up up

Index: core5.tul.onenet.net
===================================================================
--- core5.tul.onenet.net	(revision 92867)
+++ core5.tul.onenet.net	(working copy)
@@ -559,7 +559,7 @@
 #lo0.16385 up up
 #lsi up up
 #lsi.1120772 up up
-#lsi.1485316 up up
+#lsi.1625859 up up
 #mtun up up
 #pimd up up
 #pime up up

Index: core2.dc.onenet.net
===================================================================
--- core2.dc.onenet.net	(revision 92865)
+++ core2.dc.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at MX480_DC_02_RE0> show system commit 
-#   2013-12-03 10:41:42 CST by jeremyt via cli commit synchronize
-#   2013-11-24 01:35:40 CST by root via cli commit synchronize
-#   2013-11-24 01:14:19 CST by root via cli commit synchronize
-#   2013-11-24 00:38:35 CST by root via cli commit synchronize
-#   2013-11-24 00:37:30 CST by root via cli commit synchronize
-#   2013-11-24 00:27:05 CST by root via cli commit synchronize
+#   2013-12-08 01:00:05 CST by jeremyt via cli commit synchronize
+#   2013-12-08 00:56:23 CST by jeremyt via cli commit synchronize
+#   2013-12-08 00:55:43 CST by jeremyt via cli commit synchronize
+#   2013-12-08 00:51:48 CST by jeremyt via cli commit synchronize
+#   2013-12-08 00:39:42 CST by jeremyt via cli commit synchronize
+#   2013-12-08 00:05:24 CST by jeremyt via cli commit synchronize
 # grnoc-mon at MX480_DC_02_RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -411,7 +411,7 @@
 # grnoc-mon at MX480_DC_02_RE0> show system uptime 
 # System booted: 2013-11-12 16:54 CST 
 # Protocols started: 2013-11-12 16:55 CST 
-# Last configured: 2013-12-03 10:41 CST  by jeremyt
+# Last configured: 2013-12-08 01:00 CST  by jeremyt
 # 
 # {master}
 # grnoc-mon at MX480_DC_02_RE0> show interface terse 
@@ -424,14 +424,17 @@
 #pfh-0/0/0.16383 up up
 #xe-0/0/0 up up
 #xe-0/0/0.0 up up
-#xe-0/0/0.1 up up
 #xe-0/0/0.32767 up up
 #xe-0/0/1 up down
 #xe-0/0/1.0 up down
 #xe-0/0/1.1 up down
 #xe-0/0/1.32767 up down
-#xe-0/1/0 up down
-#xe-0/1/1 up down
+#xe-0/1/0 up up
+#xe-0/1/0.0 up up
+#xe-0/1/0.32767 up up
+#xe-0/1/1 up up
+#xe-0/1/1.0 up up
+#xe-0/1/1.32767 up up
 #ge-0/2/0 up down
 #lc-0/2/0 up up
 #lc-0/2/0.32769 up up
@@ -470,10 +473,13 @@
 #xe-1/0/1 up up
 #xe-1/0/1.0 up up
 #xe-1/0/1.32767 up up
-#xe-1/1/0 up down
-#xe-1/1/1 up down
+#xe-1/1/0 up up
+#xe-1/1/0.0 up up
+#xe-1/1/0.32767 up up
+#xe-1/1/1 up up
+#xe-1/1/1.0 up up
+#xe-1/1/1.32767 up up
 #ge-1/2/0 up up
-#ge-1/2/0.0 up up
 #lc-1/2/0 up up
 #lc-1/2/0.32769 up up
 #pfe-1/2/0 up up
@@ -514,8 +520,10 @@
 #xe-2/0/1.32767 up up
 #xe-2/1/0 up down
 #xe-2/1/0.0 up down
+#xe-2/1/0.32767 up down
 #xe-2/1/1 up up
 #xe-2/1/1.0 up up
+#xe-2/1/1.32767 up up
 #lc-2/2/0 up up
 #lc-2/2/0.32769 up up
 #pfe-2/2/0 up up
@@ -529,7 +537,6 @@
 #xe-2/3/0.0 up up
 #xe-2/3/1 up up
 #xe-2/3/1.0 up up
-#xe-2/3/1.1 up up
 #xe-2/3/1.32767 up up
 #lc-3/0/0 up up
 #lc-3/0/0.32769 up up
@@ -539,7 +546,10 @@
 #pfh-3/0/0.16383 up up
 #xe-3/0/0 down down
 #xe-3/0/1 down down
-#xe-3/1/0 down down
+#xe-3/1/0 up up
+#xe-3/1/0.0 up up
+#xe-3/1/0.1 up up
+#xe-3/1/0.32767 up up
 #xe-3/1/1 up down
 #lc-3/2/0 up up
 #lc-3/2/0.32769 up up
@@ -547,25 +557,41 @@
 #pfe-3/2/0.16383 up up
 #ae0 up up
 #ae0.0 up up
-#ae0.1 up up
 #ae0.32767 up up
-#ae1 up down
+#ae1 up up
+#ae1.0 up up
+#ae1.32767 up up
 #ae2 up up
 #ae2.0 up up
 #ae2.32767 up up
 #ae3 up up
 #ae3.0 up up
 #ae3.32767 up up
-#ae4 up down
+#ae4 up up
+#ae4.0 up up
+#ae4.32767 up up
 #ae5 up up
 #ae5.0 up up
 #ae5.1 up up
 #ae5.32767 up up
-#ae6 up down
-#ae6.0 up down
+#ae6 up up
+#ae6.0 up up
+#ae6.32767 up up
 #ae7 up down
-#ae8 up down
+#ae7.0 up down
+#ae7.32767 up down
+#ae8 up up
+#ae8.0 up up
+#ae8.1 up up
+#ae8.32767 up up
 #ae9 up down
+#ae9.32767 up down
+#ae10 up down
+#ae10.32767 up down
+#ae11 up down
+#ae12 up down
+#ae13 up down
+#ae14 up down
 #cbp0 up up
 #demux0 up up
 #dsc up up
@@ -578,15 +604,150 @@
 #gre up up
 #ipip up up
 #irb up up
-#irb.120 up up
+#irb.12 up up
+#irb.35 up up
+#irb.69 up up
+#irb.128 up down
+#irb.199 up up
+#irb.245 up up
+#irb.248 up up
+#irb.250 up up
+#irb.253 up up
+#irb.300 up up
+#irb.301 up up
+#irb.302 up up
+#irb.331 up up
+#irb.332 up up
+#irb.333 up up
+#irb.335 up up
+#irb.350 up up
+#irb.604 up up
+#irb.612 up up
+#irb.621 up up
 #irb.700 up up
+#irb.705 up up
+#irb.710 up up
+#irb.711 up up
+#irb.712 up up
+#irb.715 up up
+#irb.725 up up
+#irb.750 up up
+#irb.755 up up
+#irb.786 up up
+#irb.800 up up
+#irb.801 up up
+#irb.802 up up
+#irb.803 up up
+#irb.804 up up
+#irb.806 up up
+#irb.807 up up
+#irb.808 up up
+#irb.810 up up
+#irb.811 up up
+#irb.812 up up
+#irb.840 up up
+#irb.847 up up
+#irb.850 up up
+#irb.880 up up
+#irb.882 up up
+#irb.885 up up
+#irb.891 up up
+#irb.894 up up
 #irb.951 up up
+#irb.952 up up
+#irb.953 up up
+#irb.955 up up
 #irb.956 up up
+#irb.957 up up
+#irb.969 up up
+#irb.1030 up up
+#irb.1101 up up
+#irb.1102 up up
+#irb.1201 up up
+#irb.1202 up up
+#irb.1203 up up
+#irb.1204 up up
+#irb.1205 up up
+#irb.1206 up up
+#irb.1303 up up
+#irb.1401 up up
+#irb.1402 up up
+#irb.1403 up up
+#irb.1404 up up
+#irb.1405 up up
+#irb.1406 up up
 #irb.1407 up up
+#irb.1408 up up
+#irb.1409 up up
+#irb.1411 up up
+#irb.1415 up up
+#irb.1420 up up
+#irb.1441 up up
+#irb.1442 up up
+#irb.1443 up up
+#irb.1444 up up
 #irb.1445 up up
+#irb.1446 up up
+#irb.1447 up up
+#irb.1448 up up
 #irb.1449 up up
-#irb.1488 up down
+#irb.1450 up up
+#irb.1451 up up
+#irb.1452 up up
+#irb.1460 up up
+#irb.1461 up up
+#irb.1470 up up
+#irb.1488 up up
+#irb.2006 up up
+#irb.2008 up up
 #irb.2011 up up
+#irb.2017 up up
+#irb.2018 up up
+#irb.2019 up up
+#irb.2021 up up
+#irb.2023 up up
+#irb.2024 up up
+#irb.2103 up up
+#irb.2104 up up
+#irb.2112 up up
+#irb.2113 up up
+#irb.2114 up up
+#irb.2115 up up
+#irb.2116 up up
+#irb.2601 up up
+#irb.2710 up up
+#irb.2711 up up
+#irb.2712 up up
+#irb.2713 up up
+#irb.4001 up up
+#irb.4002 up up
+#irb.4003 up up
+#irb.4004 up up
+#irb.4005 up up
+#irb.4006 up up
+#irb.4007 up up
+#irb.4008 up up
+#irb.4009 up up
+#irb.4010 up up
+#irb.4011 up up
+#irb.4012 up up
+#irb.4013 up up
+#irb.4014 up up
+#irb.4015 up up
+#irb.4016 up up
+#irb.4017 up up
+#irb.4018 up up
+#irb.4019 up up
+#irb.4020 up up
+#irb.4021 up up
+#irb.4022 up up
+#irb.4023 up up
+#irb.4024 up up
+#irb.4025 up up
+#irb.4026 up up
+#irb.4027 up up
+#irb.4028 up up
+#irb.4090 up up
 #lo0 up up
 #lo0.0 up up
 #lo0.16384 up up
@@ -599,7 +760,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at MX480_DC_02_RE0> show configuration 
-## Last commit: 2013-12-03 10:41:42 CST by jeremyt
+## Last commit: 2013-12-08 01:00:05 CST by jeremyt
 version 12.3R3.4;
 groups {
     re0 {
@@ -643,6 +804,34 @@
             }
         }
     }
+    OSPF-RI {
+        routing-instances {
+            <*> {
+                protocols {
+                    ospf {
+                        export REDISTRIBUTE-DIRECTS-OSPF;
+                        reference-bandwidth 100g;
+                        area 0.0.0.0 {
+                            interface <irb.*> {
+                                bfd-liveness-detection {
+                                    minimum-interval 300;
+                                    multiplier 4;
+                                    full-neighbors-only;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
+    }
+    MAC-SYNC {
+        bridge-domains {
+            <*> {
+                mcae-mac-synchronize;
+            }
+        }
+    }
 }
 apply-groups [ re0 re1 ];
 system {
@@ -769,7 +958,7 @@
     }
     aggregated-devices {
         ethernet {
-            device-count 10;
+            device-count 15;
         }
     }
 }
@@ -859,13 +1048,6 @@
             802.3ad ae1;
         }
     }
-    ge-1/2/0 {
-        description "IPERF MGMT";
-        encapsulation ethernet-vpls;
-        unit 0 {
-            family vpls;
-        }
-    }
     ge-1/2/8 {
         description "rp4-f0-sw1&2-3750WS-C3750G";
         native-vlan-id 1201;
@@ -912,21 +1094,14 @@
     }
     xe-2/1/0 {
         description "LINK TO 4550 TOPRIGHT DC01 xe-1/1/0";
-        unit 0 {
-            family bridge {
-                interface-mode trunk;
-                vlan-id-list 2-4000;
-            }
+        gigether-options {
+            802.3ad ae6;
         }
     }
     xe-2/1/1 {
         description "Link to TOR-EX4550 Rack 3B [NO-MONITOR]";
-        mtu 9192;
-        unit 0 {
-            family bridge {
-                interface-mode trunk;
-                vlan-id-list 2-4000;
-            }
+        gigether-options {
+            802.3ad ae6;
         }
     }
     xe-2/2/0 {
@@ -965,17 +1140,19 @@
     }
     xe-3/1/0 {
         description "MC_LAG Connection MX480_DC_01_RE0 xe-3/1/0 | [NO-MONITOR]";
-        disable;
+        gigether-options {
+            802.3ad ae8;
+        }
     }
     ae0 {
-        description "LAG to OneNet DC MX480";
+        description "ICL MC-LAG DC MX480";
         vlan-tagging;
         mtu 9192;
-        encapsulation flexible-ethernet-services;
         aggregated-ether-options {
             link-speed 10g;
             lacp {
                 active;
+                periodic fast;
             }
         }
         unit 0 {
@@ -984,34 +1161,27 @@
                 vlan-id-list 2-4000;
             }
         }
-        unit 1 {
-            vlan-id 1;
-            family inet {
-                mtu 9000;
-                address 10.199.199.194/29;
-            }
-            family mpls;
-        }
     }
-    inactive: ae1 {
-        description "LAG to EX4200_DC_VC_01";
+    ae1 {
+        description "MC-LAG to EX4200_DC_VC_01";
         flexible-vlan-tagging;
         mtu 9192;
-        inactive: multi-chassis-protection 164.58.199.194 {
+        multi-chassis-protection 164.58.199.194 {
             interface ae0;
         }
         aggregated-ether-options {
             link-speed 10g;
             lacp {
                 active;
-                system-id 00:00:00:00:00:01;
+                periodic fast;
+                system-id ca:fe:ba:be:00:01;
                 admin-key 1;
             }
             mc-ae {
                 mc-ae-id 1;
                 redundancy-group 1;
                 chassis-id 1;
-                mode active-standby;
+                mode active-active;
                 status-control standby;
             }
         }
@@ -1031,12 +1201,13 @@
             link-speed 10g;
             lacp {
                 active;
+                periodic fast;
             }
         }
         unit 0 {
             family bridge {
                 interface-mode trunk;
-                vlan-id-list 2-4000;
+                vlan-id-list 4090;
             }
         }
     }
@@ -1049,34 +1220,37 @@
             link-speed 10g;
             lacp {
                 active;
+                periodic fast;
             }
         }
         unit 0 {
             family bridge {
                 interface-mode trunk;
-                vlan-id-list 2-4000;
+                vlan-id-list [ 4001-4089 1000 2100 2102 2111 ];
             }
         }
     }
-    inactive: ae4 {
-        description "LAG to EX4200_DC_VC_02";
+    ae4 {
+        description "MC-LAG to EX4200_DC_VC_02";
         flexible-vlan-tagging;
+        native-vlan-id 248;
         mtu 9192;
-        inactive: multi-chassis-protection 164.58.199.194 {
+        multi-chassis-protection 164.58.199.194 {
             interface ae0;
         }
         aggregated-ether-options {
             link-speed 10g;
             lacp {
                 active;
-                system-id 00:00:00:00:00:01;
+                periodic fast;
+                system-id ca:fe:ba:be:00:04;
                 admin-key 1;
             }
             mc-ae {
-                mc-ae-id 2;
+                mc-ae-id 4;
                 redundancy-group 1;
                 chassis-id 1;
-                mode active-standby;
+                mode active-active;
                 status-control standby;
             }
         }
@@ -1117,11 +1291,27 @@
         }
     }
     ae6 {
-        description "LAG EX4550_DC_01 [NO-MONITOR]";
+        description "MC-LAG to EX4550_DC_VC1";
+        flexible-vlan-tagging;
+        mtu 9192;
+        multi-chassis-protection 164.58.199.194 {
+            interface ae0;
+        }
         aggregated-ether-options {
+            link-speed 10g;
             lacp {
                 active;
+                periodic fast;
+                system-id ca:fe:ba:be:00:06;
+                admin-key 1;
             }
+            mc-ae {
+                mc-ae-id 6;
+                redundancy-group 1;
+                chassis-id 1;
+                mode active-active;
+                status-control standby;
+            }
         }
         unit 0 {
             family bridge {
@@ -1130,16 +1320,232 @@
             }
         }
     }
+    ae7 {
+        description "MC-LAG to EX4550_DC_VC2";
+        flexible-vlan-tagging;
+        mtu 9192;
+        multi-chassis-protection 164.58.199.194 {
+            interface ae0;
+        }
+        aggregated-ether-options {
+            link-speed 10g;
+            lacp {
+                active;
+                periodic fast;
+                system-id ca:fe:ba:be:00:07;
+                admin-key 1;
+            }
+            mc-ae {
+                mc-ae-id 7;
+                redundancy-group 1;
+                chassis-id 1;
+                mode active-active;
+                status-control standby;
+            }
+        }
+        unit 0 {
+            family bridge {
+                interface-mode trunk;
+                vlan-id-list 2-4000;
+            }
+        }
+    }
+    ae8 {
+        description "LAG Layer 3 to OneNet DC MX480";
+        vlan-tagging;
+        mtu 9192;
+        aggregated-ether-options {
+            link-speed 10g;
+            lacp {
+                active;
+                periodic fast;
+            }
+        }
+        unit 0 {
+            family bridge {
+                interface-mode trunk;
+                vlan-id-list 4001-4093;
+            }
+        }
+        unit 1 {
+            vlan-id 4094;
+            family inet {
+                mtu 9000;
+                address 10.199.199.194/29;
+            }
+            family iso;
+            family mpls;
+        }
+    }
+    ae9 {
+        description "FUTURE ONENET USE RESERVED [NO MONITOR]";
+        vlan-tagging;
+        mtu 9192;
+        aggregated-ether-options {
+            link-speed 10g;
+        }
+    }
+    ae10 {
+        description "FUTURE ONENET USE RESERVED [NO MONITOR]";
+        vlan-tagging;
+        mtu 9192;
+        aggregated-ether-options {
+            link-speed 10g;
+        }
+    }
     fxp0 {
         disable;
     }
     irb {
-        unit 120 {
+        apply-groups IP_MTU;
+        mtu 9192;
+        unit 12 {
+            description un_omesvid-01-0012;
             family inet {
+                address 192.168.100.3/24;
+                address 192.168.100.1/24;
+                address 164.58.19.1/25;
+                address 164.58.19.209/29;
+            }
+        }
+        unit 35 {
+            family inet {
+                address 10.135.0.1/24;
+            }
+        }
+        unit 69 {
+            description "OSU SAN Managment";
+            family inet {
                 mtu 1500;
-                address 10.199.199.162/29;
+                address 164.58.109.249/29;
             }
         }
+        unit 128 {
+            family inet {
+                address 10.199.199.226/29;
+            }
+        }
+        unit 199 {
+            description dmz_tstdev-01-0199;
+            family inet {
+                address 10.164.58.1/24;
+            }
+        }
+        unit 245 {
+            family inet {
+                address 10.10.116.1/28;
+            }
+        }
+        unit 248 {
+            description trust_user-01-0248;
+            family inet {
+                filter {
+                    input TRUE-DIGITAL;
+                    output TRUE-DIGITAL;
+                }
+                address 10.10.148.1/23;
+                address 10.10.248.1/24;
+            }
+        }
+        unit 250 {
+            description un_outside-01-0250;
+            family inet {
+                address 164.58.250.1/24;
+                address 164.58.250.4/24;
+            }
+        }
+        unit 253 {
+            description dmz_prod__-01-0253;
+            family inet {
+                filter {
+                    input TRUE-DIGITAL;
+                    output TRUE-DIGITAL;
+                }
+                address 164.58.253.1/24;
+            }
+        }
+        unit 300 {
+            family inet {
+                address 10.199.200.65/26;
+            }
+        }
+        unit 301 {
+            family inet {
+                address 10.199.200.1/26;
+            }
+        }
+        unit 302 {
+            family inet {
+                address 164.58.208.17/29;
+            }
+        }
+        unit 331 {
+            description un_wifitestap-0331;
+            family inet {
+                address 10.139.91.1/24;
+            }
+        }
+        unit 332 {
+            description un_wifimgmt01-0332;
+            family inet {
+                address 10.138.90.2/24 {
+                    vrrp-group 11 {
+                        virtual-address 10.138.90.1;
+                        priority 200;
+                        accept-data;
+                        authentication-type simple;
+#                        authentication-key <removed>;
+                    }
+                }
+                address 10.138.90.1/24;
+            }
+        }
+        unit 333 {
+            family inet {
+                address 164.58.109.2/29;
+                address 10.9.13.3/24;
+            }
+        }
+        inactive: unit 334 {
+            description un_wifi___-01-0334;
+            family inet {
+                mtu 1500;
+            }
+        }
+        unit 335 {
+            description un_wififdc-01-0335;
+            family inet {
+                address 10.9.15.1/24;
+            }
+        }
+        unit 350 {
+            family inet {
+                address 10.25.71.1/24;
+            }
+        }
+        unit 604 {
+            description voip_phone-01-0604;
+            family inet {
+                filter {
+                    input TRUE-DIGITAL;
+                    output TRUE-DIGITAL;
+                }
+                address 10.1.0.1/16;
+            }
+        }
+        unit 612 {
+            description voip_kans_-01-0612;
+            family inet {
+                address 172.16.76.2/30;
+            }
+        }
+        unit 621 {
+            description tr_systest-01-0621;
+            family inet {
+                address 10.8.84.10/24;
+                address 10.8.84.1/24;
+            }
+        }
         unit 700 {
             description un_advanci-01-0700;
             family inet {
@@ -1147,30 +1553,440 @@
                 address 164.58.3.53/30;
             }
         }
+        unit 705 {
+            description un_nex_med-01-0705;
+            family inet {
+                address 156.110.25.25/30;
+            }
+        }
+        unit 710 {
+            description dmzcolosrv-01-0710;
+            family inet {
+                address 164.58.71.1/24;
+                address 164.58.198.9/30;
+            }
+        }
+        unit 711 {
+            description un_scbl___-01-0711;
+            family inet {
+                address 164.58.28.205/30;
+            }
+        }
+        unit 712 {
+            description un_medcent-01-0712;
+            family inet {
+                address 164.58.207.145/28;
+                address 164.58.80.193/27;
+            }
+        }
+        unit 715 {
+            description un_eaglcam-01-0715;
+            family inet {
+                address 156.110.211.147/29;
+            }
+        }
+        unit 725 {
+            description un_phf_vid-01-0725;
+            family inet {
+                address 164.58.161.9/29;
+            }
+        }
+        unit 750 {
+            family inet {
+                address 156.110.31.1/27;
+                address 156.110.31.33/28;
+            }
+        }
+        unit 755 {
+            description un_nlrtelp-01-0755;
+            family inet {
+                address 164.58.84.33/28;
+            }
+        }
+        unit 786 {
+            description socl_media-01-0786;
+            family inet {
+                address 10.8.86.1/24;
+            }
+        }
+        unit 800 {
+            description trust_user-02-0800;
+            family inet {
+                address 10.255.255.1/24;
+                address 10.255.255.3/24;
+                address 10.255.255.26/24;
+            }
+        }
+        unit 801 {
+            description printers__-01-0801;
+            family inet {
+                address 10.10.250.1/24;
+            }
+        }
+        unit 802 {
+            description net_manage-02-0802;
+            family inet {
+                address 164.58.62.45/30;
+                address 10.10.249.1/24;
+                address 10.10.249.35/24;
+            }
+        }
+        unit 803 {
+            description dmz_regent-01-0803;
+            family inet {
+                filter {
+                    input TRUE-DIGITAL;
+                    output TRUE-DIGITAL;
+                }
+                address 10.10.253.1/24;
+            }
+        }
+        unit 804 {
+            description dmz_onenet-01-0804;
+            family inet {
+                address 10.10.252.1/24;
+            }
+        }
+        unit 806 {
+            description sys_manage-01-0806;
+            family inet {
+                address 10.10.251.1/24;
+            }
+        }
+        unit 807 {
+            description dmz-oru___-01-0807;
+            family inet {
+                address 10.8.80.17/28;
+            }
+        }
+        unit 808 {
+            description dmz_hans__-01_0808;
+            family inet {
+                address 10.8.80.33/28;
+            }
+        }
+        unit 810 {
+            description optical___-01-0810;
+            family inet {
+                address 10.10.10.1/24;
+            }
+        }
+        unit 811 {
+            description tl1_device-01-0811;
+            family inet {
+                address 10.10.30.150/24;
+            }
+        }
+        unit 812 {
+            description dmz_optic_-01_0812;
+            family inet {
+                address 10.10.1.1/24;
+            }
+        }
+        unit 840 {
+            family inet {
+                address 164.58.208.1/28;
+            }
+        }
+        unit 847 {
+            description vpn_concen-01-0847;
+            family inet {
+                address 10.10.200.1/22;
+            }
+        }
+        unit 850 {
+            description dmz_______-01-0850;
+            family inet {
+                address 10.255.254.1/24;
+                address 10.255.254.3/24;
+                address 10.8.85.1/24;
+            }
+        }
+        unit 880 {
+            description auto_ap___-01-0880;
+            family inet {
+                address 10.10.240.1/24;
+            }
+        }
+        inactive: unit 881 {
+            family inet {
+                address 10.10.241.3/24;
+            }
+        }
+        unit 882 {
+            description wifiphntst-01-0882;
+            family inet {
+                address 10.10.242.1/24;
+            }
+        }
+        unit 885 {
+            description wifi_users_01_0885;
+            family inet {
+                address 10.10.247.1/24;
+            }
+        }
+        unit 891 {
+            description wifi_wlc__-01-0891;
+            family inet {
+                address 10.9.1.10/24;
+            }
+        }
+        unit 894 {
+            description wifi_phone-01-0894;
+            family inet {
+                address 10.9.4.2/24;
+            }
+        }
         unit 951 {
             description "OMES TO SDE VIDEO";
             family inet {
                 address 156.110.90.249/30;
             }
         }
+        unit 952 {
+            description un_iccm___-01-0952;
+            family inet {
+                address 156.110.215.52/29;
+                address 156.110.215.51/29;
+            }
+        }
+        unit 953 {
+            description un_tour___-01-0953;
+            family inet {
+                address 164.58.19.218/29;
+            }
+        }
+        unit 955 {
+            description un_snctax_-01-0955;
+            family inet {
+                address 156.110.211.233/29;
+            }
+        }
         unit 956 {
             description "DOH Shepard Mall Video";
             family inet {
                 address 156.110.47.217/29;
             }
         }
+        unit 957 {
+            description un_clatax_-01-0957;
+            family inet {
+                address 164.58.19.241/29;
+            }
+        }
+        unit 969 {
+            description un_osfmon_-01-0969;
+            family inet {
+                address 164.58.109.17/29;
+            }
+        }
+        unit 1030 {
+            description un_voipsv_-01-1030;
+            family inet {
+                filter {
+                    output Lock-Down-Voice-Srvs;
+                }
+                address 164.58.73.8/26;
+            }
+        }
+        unit 1101 {
+            description un_phones_-01-1101;
+            family inet {
+                address 10.99.0.1/16;
+            }
+        }
+        unit 1102 {
+            description "VoIP Hosted Phones";
+            family inet {
+                address 10.97.0.1/16;
+            }
+        }
+        unit 1201 {
+            description un_rp_adm_-01-1201;
+            family inet {
+                address 10.98.0.1/16;
+            }
+        }
+        unit 1202 {
+            description un_rpvdgw_-01-1202;
+            family inet {
+                address 164.58.244.218/30;
+                address 164.58.244.217/30;
+            }
+        }
+        unit 1203 {
+            description un_rpvdgw_-01-1203;
+            family inet {
+                address 164.58.244.222/30;
+                address 164.58.244.221/30;
+            }
+        }
+        unit 1204 {
+            description un_voiptnl-01-1204;
+            family inet {
+                address 164.58.245.57/30;
+            }
+        }
+        unit 1205 {
+            description un_nuvoip_-01-1205;
+            family inet {
+                address 164.58.245.149/30;
+            }
+        }
+        unit 1206 {
+            description "VoIP Hosted Tunnel";
+            family inet {
+                address 164.58.245.169/30;
+            }
+        }
+        unit 1303 {
+            description un_churn__-01-1303;
+            family inet {
+                address 172.16.1.251/24;
+            }
+        }
+        inactive: unit 1342 {
+            family inet {
+                mtu 1500;
+            }
+        }
+        unit 1401 {
+            description un_ocast__-01-1401;
+            family inet {
+                mtu 1500;
+                address 164.58.26.85/30;
+            }
+        }
+        unit 1402 {
+            description un_phf_out-01-1402;
+            family inet {
+                mtu 1500;
+                address 156.110.26.61/30;
+                address 156.110.72.217/30;
+                address 164.58.75.145/29;
+            }
+        }
+        unit 1403 {
+            description un_churn__-01-1403;
+            family inet {
+                address 156.110.26.145/30;
+            }
+        }
+        unit 1404 {
+            description un_nomadic-01-1404;
+            family inet {
+                address 156.110.26.137/30;
+            }
+        }
+        unit 1405 {
+            description un_medcent-01-1405;
+            family inet {
+                mtu 1500;
+                address 164.58.74.181/30;
+            }
+        }
+        unit 1406 {
+            description un_rei____-01-1406;
+            family inet {
+                address 156.110.26.157/30;
+            }
+        }
         unit 1407 {
+            description un_thermet-01-1407;
             family inet {
                 mtu 1500;
+                address 156.110.26.181/30;
                 address 164.58.152.141/30;
             }
         }
+        unit 1408 {
+            description un_i2e____-01-1408;
+            family inet {
+                address 156.110.31.153/29;
+                address 164.58.228.33/28;
+            }
+        }
+        unit 1409 {
+            description un_cytovan-01-1409;
+            family inet {
+                address 156.110.26.185/30;
+                address 156.110.114.1/29;
+            }
+        }
+        unit 1411 {
+            description un_arl_out-01-1411;
+            family inet {
+                address 156.110.26.237/30;
+                address 164.58.75.177/29;
+            }
+        }
+        unit 1415 {
+            description un_innoval-01-1415;
+            family inet {
+                mtu 1500;
+                address 156.110.27.113/30;
+            }
+        }
+        unit 1420 {
+            description un_greatpl-01-1420;
+            family inet {
+                mtu 1500;
+                address 156.110.0.13/30;
+                address 164.58.16.101/30;
+            }
+        }
+        unit 1441 {
+            description un_rileygn-01-1441;
+            family inet {
+                mtu 1500;
+                address 156.110.27.45/30;
+            }
+        }
+        unit 1442 {
+            description un_selexys-01-1442;
+            family inet {
+                mtu 1500;
+                address 156.110.27.117/30;
+                address 156.110.47.209/29;
+            }
+        }
+        unit 1443 {
+            description un_altheus-01-1443;
+            family inet {
+                mtu 1500;
+                address 156.110.27.149/30;
+            }
+        }
+        unit 1444 {
+            description un_orthcar-01-1444;
+            family inet {
+                address 156.110.27.145/30;
+            }
+        }
         unit 1445 {
             family inet {
                 mtu 1500;
                 address 164.58.221.225/28;
             }
         }
+        unit 1446 {
+            description un_rondtbl-01-1446;
+            family inet {
+                address 156.110.27.197/30;
+            }
+        }
+        unit 1447 {
+            description un_nexstep-01-1447;
+            family inet {
+                address 156.110.27.201/30;
+            }
+        }
+        unit 1448 {
+            description un_orthcar-01-1448;
+            family inet {
+                address 156.110.27.205/30;
+            }
+        }
         unit 1449 {
             description un_newspin-01-1449;
             family inet {
@@ -1178,16 +1994,346 @@
                 address 156.110.27.193/30;
             }
         }
+        unit 1450 {
+            description un_ocasvid-01-1450;
+            family inet {
+                address 164.58.75.225/29;
+            }
+        }
+        unit 1451 {
+            description un_ocasosf-01-1451;
+            family inet {
+                mtu 1500;
+                address 156.110.27.61/30;
+                address 10.1.1.101/24;
+            }
+        }
+        unit 1452 {
+            description un_kiosk__-01-1452;
+            family inet {
+                address 156.110.92.45/30;
+            }
+        }
+        unit 1460 {
+            description un_okwf___-01-1460;
+            family inet {
+                address 164.58.157.121/29;
+                address 156.110.26.94/30;
+            }
+        }
+        unit 1461 {
+            description un_chrysal-01-1461;
+            family inet {
+                mtu 1500;
+                address 156.110.27.161/30;
+                address 164.58.186.97/29;
+            }
+        }
+        unit 1470 {
+            description un_molcura-01-1470;
+            family inet {
+                address 156.110.26.113/30;
+            }
+        }
         unit 1488 {
+            description un_odocvm_-01-1488;
             family inet {
-                address 164.58.16.21/29;
+                address 164.58.16.17/29;
             }
         }
+        unit 2006 {
+            description dmz_msg_ms-01-2006;
+            family inet {
+                address 164.58.240.97/28;
+            }
+        }
+        unit 2008 {
+            family inet {
+                address 10.8.82.1/24;
+            }
+        }
         unit 2011 {
+            description mgmt_ipef_-01-2011;
             family inet {
-                address 10.199.211.9/24;
+                address 10.199.211.1/24;
             }
         }
+        unit 2017 {
+            description "VoIP USC Service Console";
+            family inet {
+                address 10.8.88.1/24;
+            }
+        }
+        unit 2018 {
+            family inet {
+                address 10.4.0.1/24;
+            }
+        }
+        unit 2019 {
+            description dmz_vfiler-01-2019;
+            family inet {
+                address 10.8.89.10/24;
+            }
+        }
+        unit 2021 {
+            description dmz_ponca_-01-2021;
+            family inet {
+                address 10.205.0.2/24;
+            }
+        }
+        unit 2023 {
+            family inet {
+                address 10.187.1.1/24;
+            }
+        }
+        unit 2024 {
+            family inet {
+                address 192.168.202.1/27;
+            }
+        }
+        unit 2103 {
+            description "VoIP Hosted";
+            family inet {
+                address 164.58.152.1/26;
+            }
+        }
+        unit 2104 {
+            description "VoIP Hosted Non-Tunnelled";
+            family inet {
+                address 164.58.144.161/29;
+            }
+        }
+        unit 2112 {
+            family inet {
+                mtu 1500;
+                address 164.58.87.233/29;
+            }
+        }
+        unit 2113 {
+            family inet {
+                address 164.58.139.33/28;
+            }
+        }
+        unit 2114 {
+            family inet {
+                address 164.58.139.65/28;
+            }
+        }
+        unit 2115 {
+            description "Oklahoma Student Loan Association";
+            family inet {
+                address 156.110.130.129/28;
+            }
+        }
+        unit 2116 {
+            family inet {
+                address 156.110.134.161/28;
+            }
+        }
+        unit 2601 {
+            description un_osulib_-01-2601;
+            family inet {
+                address 164.58.209.209/29;
+            }
+        }
+        unit 2710 {
+            description un_vmwosc_-01-2710;
+            family inet {
+                address 164.58.177.129/29;
+            }
+        }
+        unit 2711 {
+            description un_usaovm_-01-2711;
+            family inet {
+                address 164.58.177.137/29;
+            }
+        }
+        unit 2712 {
+            description un_otc_vm_-01-2712;
+            family inet {
+                address 164.58.177.145/29;
+            }
+        }
+        unit 2713 {
+            description un_odocvm_-01-2713;
+            family inet {
+                address 164.58.177.153/29;
+            }
+        }
+        unit 4001 {
+            description "MX to SRX VLAN101";
+            family inet {
+                mtu 9000;
+                address 10.199.199.58/29;
+            }
+        }
+        unit 4002 {
+            description "MX to SRX VLAN102";
+            family inet {
+                address 10.199.199.66/29;
+            }
+        }
+        unit 4003 {
+            description "MX to SRX VLAN103";
+            family inet {
+                address 10.199.199.74/29;
+            }
+        }
+        unit 4004 {
+            description "MX to SRX VLAN104";
+            family inet {
+                address 10.199.199.82/29;
+            }
+        }
+        unit 4005 {
+            description "MX to SRX VLAN105";
+            family inet {
+                address 10.199.199.2/29;
+            }
+        }
+        unit 4006 {
+            description "MX to SRX VLAN106";
+            family inet {
+                address 10.199.199.10/29;
+            }
+        }
+        unit 4007 {
+            description "MX to SRX VLAN107";
+            family inet {
+                address 10.199.199.18/29;
+            }
+        }
+        unit 4008 {
+            description "MX to SRX VLAN108";
+            family inet {
+                address 10.199.199.26/29;
+            }
+        }
+        unit 4009 {
+            description "MX to SRX VLAN109";
+            family inet {
+                address 10.199.199.34/29;
+            }
+        }
+        unit 4010 {
+            description "MX to SRX VLAN110";
+            family inet {
+                mtu 9000;
+                address 10.199.199.42/29;
+            }
+        }
+        unit 4011 {
+            description "MX to SRX VLAN111";
+            family inet {
+                address 10.199.199.90/29;
+            }
+        }
+        unit 4012 {
+            description "MX to SRX VLAN112";
+            family inet {
+                address 10.199.199.98/29;
+            }
+        }
+        unit 4013 {
+            description "MX to SRX VLAN113";
+            family inet {
+                address 10.199.199.106/29;
+            }
+        }
+        unit 4014 {
+            description "MX to SRX VLAN114";
+            family inet {
+                address 10.199.199.114/29;
+            }
+        }
+        unit 4015 {
+            description "MX to SRX VLAN115";
+            family inet {
+                address 10.199.199.122/29;
+            }
+        }
+        unit 4016 {
+            description "MX to SRX VLAN116";
+            family inet {
+                address 10.199.199.130/29;
+            }
+        }
+        unit 4017 {
+            description "MX to SRX VLAN117";
+            family inet {
+                address 10.199.199.138/29;
+            }
+        }
+        unit 4018 {
+            description "MX to SRX VLAN118";
+            family inet {
+                address 10.199.199.146/29;
+            }
+        }
+        unit 4019 {
+            description "MX to SRX VLAN119";
+            family inet {
+                address 10.199.199.154/29;
+            }
+        }
+        unit 4020 {
+            family inet {
+                mtu 1500;
+                address 10.199.199.162/29;
+            }
+        }
+        unit 4021 {
+            description "MX to SRX VLAN121";
+            family inet {
+                address 10.199.199.170/29;
+            }
+        }
+        unit 4022 {
+            description tr_ocap___-01-0122;
+            family inet {
+                address 10.199.199.178/29;
+            }
+        }
+        unit 4023 {
+            family inet {
+                mtu 9000;
+                address 10.199.199.186/29;
+            }
+        }
+        unit 4024 {
+            family inet {
+                address 10.199.199.194/29;
+            }
+        }
+        unit 4025 {
+            description "Oklahoma Student Loan Assosation";
+            family inet {
+                address 10.199.199.202/29;
+            }
+        }
+        unit 4026 {
+            description mgmtPoPvpn-01-0126;
+            family inet {
+                address 10.199.199.210/29;
+            }
+        }
+        unit 4027 {
+            family inet {
+                address 10.199.199.218/29;
+            }
+        }
+        unit 4028 {
+            family inet {
+                address 10.199.199.226/29;
+            }
+        }
+        unit 4090 {
+            description untrust___-01-4090;
+            family inet {
+                address 164.58.69.123/29;
+            }
+            family iso;
+        }
     }
     lo0 {
         unit 0 {
@@ -1252,6 +2398,14 @@
         route 156.110.27.16/30 next-hop 164.58.3.54;
         route 164.58.234.0/24 next-hop 156.110.90.250;
         route 164.58.238.0/24 next-hop 156.110.90.250;
+        route 164.58.152.133/32 next-hop 164.58.69.122;
+        route 164.58.253.191/32 next-hop 164.58.250.72;
+        route 164.58.235.0/24 next-hop 164.58.5.118;
+        route 164.58.144.184/29 next-hop 164.58.69.122;
+        route 164.58.28.168/29 next-hop 164.58.69.122;
+        route 164.58.75.80/30 next-hop 164.58.69.122;
+        route 164.58.144.128/28 next-hop 156.110.27.62;
+        route 164.58.176.48/29 next-hop 156.110.26.114;
     }
     router-id 164.58.199.196;
     autonomous-system 5078;
@@ -1262,7 +2416,7 @@
 protocols {
     mpls {
         interface lo0.0;
-        interface ae0.1;
+        interface ae8.1;
         interface ae5.1;
     }
     bgp {
@@ -1301,30 +2455,31 @@
         }
     }
     isis {
-        export ospf-isis;
-        interface irb.100;
+        export [ ospf-isis ISIS-STATICS ];
+        interface irb.4090;
         interface lo0.0;
     }
     ospf {
         export isis-ospf;
         reference-bandwidth 100g;
         area 0.0.0.0 {
-            interface lo0.0;
+            interface lo0.0 {
+                passive;
+            }
             interface fxp0.0 {
                 disable;
             }
-            interface irb.840;
-            interface irb.100 {
-                passive;
-            }
             interface ae5.1;
-            interface ae0.1;
-            interface irb.890 {
-                passive;
+            interface ae8.1 {
+                authentication {
+                    md5 7 key "$9$r23lWLNdsY4ZdVZjHqzFhSyrMX-Vw2oGLxVYgoGU"; ## SECRET-DATA
+                }
+                bfd-liveness-detection {
+                    minimum-interval 300;
+                    multiplier 4;
+                    full-neighbors-only;
+                }
             }
-            interface irb.1407;
-            inactive: interface irb.1445;
-            interface irb.1449;
         }
     }
     ospf3 {
@@ -1342,11 +2497,11 @@
     ldp {
         preference 255;
         track-igp-metric;
-        interface ae0.1;
         interface ae5.1;
+        interface ae8.1;
         interface lo0.0;
     }
-    inactive: iccp {
+    iccp {
         local-ip-addr 164.58.199.196;
         peer 164.58.199.194 {
             redundancy-group-id-list 1;
@@ -1366,20 +2521,29 @@
         interface all;
         interface xe-0/0/1;
     }
+    layer2-control {
+        nonstop-bridging;
+    }
     rstp {
-        interface ae0;
-        interface ae1;
         interface ae2;
         interface ae3;
-        interface ae4;
         interface ae5;
-        interface ae6;
-        interface ae7;
-        interface ae8;
     }
 }
 policy-options {
     prefix-list EBGP-IPV4-NEIGHBORS;
+    policy-statement ISIS-STATICS {
+        term 1 {
+            from {
+                protocol static;
+                route-filter 192.231.3.0/24 exact;
+                route-filter 198.203.153.0/24 exact;
+                route-filter 164.58.253.191/32 exact;
+                route-filter 164.58.235.0/24 exact;
+            }
+            then accept;
+        }
+    }
     policy-statement LOAD-BALANCE {
         then {
             load-balance per-packet;
@@ -1401,6 +2565,21 @@
             }
         }
     }
+    policy-statement REDISTRIBUTE-DIRECTS-OSPF {
+        term accept {
+            from protocol direct;
+            then {
+                metric add 10000;
+                external {
+                    type 1;
+                }
+                accept;
+            }
+        }
+        term reject {
+            then reject;
+        }
+    }
     policy-statement REDISTRIBUTE-STATICS {
         term 1 {
             from protocol static;
@@ -1410,6 +2589,21 @@
             }
         }
     }
+    policy-statement REDISTRIBUTE-STATICS-OSPF {
+        term accept {
+            from protocol [ static direct ];
+            then {
+                metric add 10000;
+                external {
+                    type 1;
+                }
+                accept;
+            }
+        }
+        term reject {
+            then reject;
+        }
+    }
     policy-statement isis-ospf {
         term 1 {
             from {
@@ -1465,6 +2659,13 @@
                 }
                 then accept;
             }
+            term BFD {
+                from {
+                    protocol udp;
+                    destination-port [ 3784 4784 ];
+                }
+                then accept;
+            }
             term EBGP-ALLOW {
                 from {
                     prefix-list {
@@ -1668,166 +2869,247 @@
                 then accept;
             }
         }
+        filter TRUE-DIGITAL {
+            term ICMP-Turbo {
+                from {
+                    source-address {
+                        164.58.253.0/24;
+                    }
+                    protocol icmp;
+                }
+                then {
+                    accept;
+                    dscp ef;
+                }
+            }
+            term all {
+                then {
+                    port-mirror;
+                    accept;
+                }
+            }
+        }
     }
 }
 routing-instances {
-    VPLS-ONENET-IPERF {
-        description ONENET-IPERF-MGMT;
-        instance-type vpls;
-        vlan-id 2011;
-        interface ge-1/2/0.0;
-        routing-interface irb.2011;
-        route-distinguisher 164.58.199.196:2011;
-        vrf-target target:5078:2011;
+    dmz_comanche {
+        apply-groups OSPF-RI;
+        interface irb.4023;
+        routing-options {
+            router-id 10.199.199.187;
+        }
         protocols {
-            vpls {
-                mac-table-size {
-                    3000;
-                    packet-action drop;
+            ospf {
+                area 0.0.0.0 {
+                    interface irb.4023;
                 }
-                no-tunnel-services;
-                site DC2-IPERF {
-                    site-identifier 34;
-                    interface ge-1/2/0.0;
-                }
             }
         }
     }
-    dmz_comanche {
-        interface irb.123; ## 'irb.123' is not defined
+    dmz_comanche_ps {
+        apply-groups OSPF-RI;
+        instance-type virtual-router;
+        interface irb.4028;
+        routing-options {
+            router-id 10.199.199.226;
+        }
         protocols {
             ospf {
                 area 0.0.0.0 {
-                    interface irb.123;
+                    interface irb.4028;
                 }
             }
         }
     }
     dmz_connors {
+        apply-groups OSPF-RI;
         instance-type virtual-router;
-        interface irb.119; ## 'irb.119' is not defined
+        interface irb.4019;
+        routing-options {
+            router-id 10.199.199.154;
+        }
         protocols {
             ospf {
                 area 0.0.0.0 {
-                    interface irb.119;
+                    interface irb.4019;
                 }
             }
         }
     }
     dmz_dhcp {
+        apply-groups OSPF-RI;
         instance-type virtual-router;
-        interface irb.120;
+        interface irb.245;
+        interface irb.4020;
+        routing-options {
+            router-id 10.199.199.162;
+        }
         protocols {
             ospf {
                 area 0.0.0.0 {
-                    interface irb.120;
+                    interface irb.4020;
                 }
             }
         }
     }
-    dmz_files {
+    dmz_eoktech {
+        apply-groups OSPF-RI;
         instance-type virtual-router;
-        interface irb.107; ## 'irb.107' is not defined
+        interface irb.2116;
+        interface irb.4027;
+        routing-options {
+            router-id 10.199.199.218;
+        }
         protocols {
             ospf {
                 area 0.0.0.0 {
-                    interface irb.107;
+                    interface irb.4027;
                 }
             }
         }
     }
     dmz_guestwifi {
+        apply-groups OSPF-RI;
         instance-type virtual-router;
-        interface irb.106; ## 'irb.106' is not defined
+        interface irb.331;
+        interface irb.333;
+        interface irb.4006;
+        routing-options {
+            router-id 10.199.199.10;
+        }
         protocols {
             ospf {
                 area 0.0.0.0 {
-                    interface irb.106;
+                    interface irb.4006;
                 }
             }
         }
     }
     dmz_hptc {
+        apply-groups OSPF-RI;
         instance-type virtual-router;
-        interface irb.117; ## 'irb.117' is not defined
+        interface irb.2112;
+        interface irb.4017;
+        routing-options {
+            router-id 10.199.199.138;
+        }
         protocols {
             ospf {
                 area 0.0.0.0 {
-                    interface irb.117;
+                    interface irb.4017;
                 }
             }
         }
     }
     dmz_kelsov {
+        apply-groups OSPF-RI;
         instance-type virtual-router;
-        interface irb.114; ## 'irb.114' is not defined
+        interface irb.2114;
+        interface irb.4014;
+        routing-options {
+            router-id 10.199.199.114;
+        }
         protocols {
             ospf {
                 area 0.0.0.0 {
-                    interface irb.114;
+                    interface irb.4014;
                 }
             }
         }
     }
     dmz_langston {
+        apply-groups OSPF-RI;
         instance-type virtual-router;
-        interface irb.111; ## 'irb.111' is not defined
+        interface irb.2023;
+        interface irb.4011;
+        routing-options {
+            router-id 10.199.199.90;
+        }
         protocols {
             ospf {
                 area 0.0.0.0 {
-                    interface irb.111;
+                    interface irb.4011;
                 }
             }
         }
     }
     dmz_netgrp {
+        apply-groups OSPF-RI;
         instance-type virtual-router;
-        interface irb.109; ## 'irb.109' is not defined
-        interface irb.302; ## 'irb.302' is not defined
+        interface irb.302;
+        interface irb.840;
+        interface irb.4009;
+        routing-options {
+            router-id 10.199.199.34;
+        }
         protocols {
             ospf {
                 area 0.0.0.0 {
-                    interface irb.109;
-                    interface irb.302;
+                    interface irb.4009;
                 }
             }
         }
     }
     dmz_ohcwc {
+        apply-groups OSPF-RI;
         instance-type virtual-router;
-        interface irb.116; ## 'irb.116' is not defined
+        interface irb.2018;
+        interface irb.4016;
+        routing-options {
+            router-id 10.199.199.130;
+        }
         protocols {
             ospf {
                 area 0.0.0.0 {
-                    interface irb.116;
+                    interface irb.4016;
                 }
             }
         }
     }
     dmz_okc_ps {
+        apply-groups OSPF-RI;
         instance-type virtual-router;
-        interface irb.115; ## 'irb.115' is not defined
+        interface irb.2113;
+        interface irb.4015;
+        routing-options {
+            router-id 10.199.199.122;
+        }
         protocols {
             ospf {
                 area 0.0.0.0 {
-                    interface irb.115;
+                    interface irb.4015;
                 }
             }
         }
     }
+    dmz_okloan {
+        apply-groups OSPF-RI;
+        instance-type virtual-router;
+        interface irb.2115;
+        interface irb.4025;
+        routing-options {
+            router-id 10.199.199.202;
+        }
+        protocols {
+            ospf {
+                area 0.0.0.0 {
+                    interface irb.4025;
+                }
+            }
+        }
+    }
     dmz_onenet {
+        apply-groups OSPF-RI;
         instance-type virtual-router;
-        interface irb.102; ## 'irb.102' is not defined
-        interface irb.253; ## 'irb.253' is not defined
-        interface irb.750; ## 'irb.750' is not defined
-        interface irb.850; ## 'irb.850' is not defined
-        interface irb.2006; ## 'irb.2006' is not defined
-        interface irb.2008; ## 'irb.2008' is not defined
-        interface irb.2019; ## 'irb.2019' is not defined
-        interface irb.2021; ## 'irb.2021' is not defined
+        interface irb.253;
+        interface irb.750;
+        interface irb.850;
+        interface irb.2006;
+        interface irb.2008;
+        interface irb.2019;
+        interface irb.4002;
         routing-options {
             static {
-                route 0.0.0.0/0 next-hop 10.255.254.1;
                 route 164.58.198.206/32 next-hop 164.58.253.10;
                 route 164.58.198.250/32 next-hop 164.58.253.10;
                 route 156.110.96.160/28 next-hop 164.58.253.104;
@@ -1844,202 +3126,264 @@
                 route 156.110.96.176/28 next-hop 164.58.253.81;
                 route 156.110.96.128/28 next-hop 164.58.253.82;
             }
+            router-id 10.199.199.66;
         }
         protocols {
             ospf {
+                export [ REDISTRIBUTE-STATICS-OSPF REDISTRIBUTE-DIRECTS-OSPF ];
                 area 0.0.0.0 {
-                    interface irb.102;
-                    interface irb.850;
-                    interface irb.750;
-                    interface irb.253;
-                    interface irb.2021;
-                    interface irb.2019;
-                    interface irb.2006;
-                    interface irb.2008;
+                    interface irb.4002;
                 }
             }
         }
     }
     dmz_pryor {
+        apply-groups OSPF-RI;
         instance-type virtual-router;
-        interface irb.108; ## 'irb.108' is not defined
+        interface irb.2024;
+        interface irb.4008;
+        routing-options {
+            router-id 10.199.199.26;
+        }
         protocols {
             ospf {
                 area 0.0.0.0 {
-                    interface irb.108;
+                    interface irb.4008;
                 }
             }
         }
     }
     dmz_ucponca {
+        apply-groups OSPF-RI;
         instance-type virtual-router;
-        interface irb.112; ## 'irb.112' is not defined
+        interface irb.2021;
+        interface irb.4012;
+        routing-options {
+            router-id 10.199.199.98;
+        }
         protocols {
             ospf {
                 area 0.0.0.0 {
-                    interface irb.112;
+                    interface irb.4012;
                 }
             }
         }
     }
     dmz_web {
+        apply-groups OSPF-RI;
         instance-type virtual-router;
-        interface irb.103; ## 'irb.103' is not defined
+        interface irb.4003;
+        routing-options {
+            router-id 10.199.199.74;
+        }
         protocols {
             ospf {
                 area 0.0.0.0 {
-                    interface irb.103;
+                    interface irb.4003;
                 }
             }
         }
     }
     dmz_wosc {
+        apply-groups OSPF-RI;
         instance-type virtual-router;
-        interface irb.118; ## 'irb.118' is not defined
+        interface irb.4018;
+        routing-options {
+            router-id 10.199.199.146;
+        }
         protocols {
             ospf {
                 area 0.0.0.0 {
-                    interface irb.118;
+                    interface irb.4018;
                 }
             }
         }
     }
-    trust_netgrp {
+    mgmt_onenet {
+        apply-groups OSPF-RI;
         instance-type virtual-router;
-        interface irb.104; ## 'irb.104' is not defined
-        interface irb.300; ## 'irb.300' is not defined
-        interface irb.301; ## 'irb.301' is not defined
+        interface irb.2011;
+        interface irb.4024;
         routing-options {
-            static {
-                route 0.0.0.0/0 next-hop 10.199.200.1;
+            router-id 10.199.199.194;
+        }
+        protocols {
+            ospf {
+                area 0.0.0.0 {
+                    interface irb.4024;
+                }
             }
         }
+    }
+    trust_netgrp {
+        apply-groups OSPF-RI;
+        instance-type virtual-router;
+        interface irb.300;
+        interface irb.301;
+        interface irb.332;
+        interface irb.4004;
+        routing-options {
+            router-id 10.199.199.82;
+        }
         protocols {
             ospf {
                 area 0.0.0.0 {
-                    interface irb.104;
-                    interface irb.300;
-                    interface irb.301;
+                    interface irb.4004;
                 }
             }
         }
     }
     trust_ocap {
+        apply-groups OSPF-RI;
         instance-type virtual-router;
-        interface irb.121; ## 'irb.121' is not defined
-        interface irb.122; ## 'irb.122' is not defined
+        interface irb.4021;
+        interface irb.4022;
+        routing-options {
+            static {
+                route 172.18.0.0/22 next-hop 10.199.199.180;
+                route 172.18.4.0/23 next-hop 10.199.199.180;
+                route 10.20.240.0/22 next-hop 10.199.199.180;
+                route 172.18.10.0/23 next-hop 10.199.199.180;
+                route 172.18.16.20/32 next-hop 10.199.199.180;
+                route 172.18.16.10/32 next-hop 10.199.199.180;
+                route 172.18.200.0/24 next-hop 10.199.199.180;
+                route 172.18.12.0/24 next-hop 10.199.199.180;
+                route 172.18.16.0/23 next-hop 10.199.199.180;
+                route 164.58.235.70/32 {
+                    next-hop 10.199.199.180;
+                    no-readvertise;
+                }
+                route 167.104.240.128/25 next-hop 10.199.199.180;
+            }
+            router-id 10.199.199.170;
+        }
         protocols {
             ospf {
+                export REDISTRIBUTE-STATICS-OSPF;
                 area 0.0.0.0 {
-                    interface irb.121;
-                    interface irb.122;
+                    interface irb.4021;
+                    interface irb.4022;
                 }
             }
         }
     }
     trust_onenet {
+        apply-groups OSPF-RI;
         instance-type virtual-router;
-        interface irb.105; ## 'irb.105' is not defined
+        interface irb.4005;
+        routing-options {
+            router-id 10.199.199.2;
+        }
         protocols {
             ospf {
                 area 0.0.0.0 {
-                    interface irb.105;
+                    interface irb.4005;
                 }
             }
         }
     }
     trust_regents {
+        apply-groups OSPF-RI;
         instance-type virtual-router;
-        interface irb.101; ## 'irb.101' is not defined
-        interface irb.199; ## 'irb.199' is not defined
-        interface irb.248; ## 'irb.248' is not defined
-        interface irb.604; ## 'irb.604' is not defined
-        interface irb.612; ## 'irb.612' is not defined
-        interface irb.621; ## 'irb.621' is not defined
-        interface irb.786; ## 'irb.786' is not defined
-        interface irb.800; ## 'irb.800' is not defined
-        interface irb.801; ## 'irb.801' is not defined
-        interface irb.802; ## 'irb.802' is not defined
-        interface irb.803; ## 'irb.803' is not defined
-        interface irb.804; ## 'irb.804' is not defined
-        interface irb.806; ## 'irb.806' is not defined
-        interface irb.807; ## 'irb.807' is not defined
-        interface irb.808; ## 'irb.808' is not defined
-        interface irb.810; ## 'irb.810' is not defined
-        interface irb.811; ## 'irb.811' is not defined
-        interface irb.812; ## 'irb.812' is not defined
-        interface irb.847; ## 'irb.847' is not defined
-        interface irb.880; ## 'irb.880' is not defined
-        interface irb.881; ## 'irb.881' is not defined
-        interface irb.882; ## 'irb.882' is not defined
-        interface irb.885; ## 'irb.885' is not defined
-        interface irb.891; ## 'irb.891' is not defined
-        interface irb.894; ## 'irb.894' is not defined
+        interface irb.35;
+        interface irb.199;
+        interface irb.248;
+        interface irb.604;
+        interface irb.612;
+        interface irb.621;
+        interface irb.786;
+        interface irb.800;
+        interface irb.801;
+        interface irb.802;
+        interface irb.803;
+        interface irb.804;
+        interface irb.806;
+        interface irb.807;
+        interface irb.808;
+        interface irb.810;
+        interface irb.811;
+        interface irb.812;
+        interface irb.847;
+        interface irb.880;
+        interface irb.882;
+        interface irb.885;
+        interface irb.891;
+        interface irb.894;
+        interface irb.2017;
+        interface irb.4001;
+        routing-options {
+            static {
+                route 10.10.241.0/24 next-hop 10.9.1.1;
+            }
+            router-id 10.199.199.58;
+        }
         protocols {
             ospf {
+                inactive: traceoptions {
+                    file OSPF_TR_REG size 1m;
+                    flag all;
+                }
+                export REDISTRIBUTE-STATICS-OSPF;
                 area 0.0.0.0 {
-                    interface irb.101;
-                    interface irb.199;
-                    interface irb.248;
-                    interface irb.604;
-                    interface irb.612;
-                    interface irb.621;
-                    interface irb.786;
-                    interface irb.800;
-                    interface irb.801;
-                    interface irb.802;
-                    interface irb.803;
-                    interface irb.804;
-                    interface irb.806;
-                    interface irb.807;
-                    interface irb.808;
-                    interface irb.810;
-                    interface irb.811;
-                    interface irb.812;
-                    interface irb.847;
-                    interface irb.880;
-                    interface irb.881;
-                    interface irb.882;
-                    interface irb.885;
-                    interface irb.891;
-                    interface irb.894;
+                    interface irb.4001;
                 }
             }
         }
     }
     voip {
+        apply-groups OSPF-RI;
         instance-type virtual-router;
-        interface irb.113; ## 'irb.113' is not defined
+        interface irb.1102;
+        interface irb.1206;
+        interface irb.2103;
+        interface irb.2104;
+        interface irb.4013;
+        routing-options {
+            static {
+                route 10.80.10.0/24 next-hop 164.58.144.162;
+                route 10.80.12.0/24 next-hop 164.58.144.162;
+            }
+            router-id 10.199.199.106;
+        }
         protocols {
             ospf {
+                export REDISTRIBUTE-STATICS-OSPF;
                 area 0.0.0.0 {
-                    interface irb.113;
+                    interface irb.4013;
                 }
             }
         }
     }
     vpn {
+        apply-groups OSPF-RI;
         instance-type virtual-router;
-        interface irb.110; ## 'irb.110' is not defined
+        interface irb.4010;
+        routing-options {
+            router-id 10.199.199.42;
+        }
         protocols {
             ospf {
                 area 0.0.0.0 {
-                    interface irb.110;
+                    interface irb.4010;
                 }
             }
         }
     }
 }
 bridge-domains {
+    apply-groups MAC-SYNC;
     allaccess {
         vlan-id 35;
+        routing-interface irb.35;
     }
     auto_ap___-01-0880 {
         vlan-id 880;
         routing-interface irb.880;
     }
-    dmz-127srx-01-0127 {
-        vlan-id 127;
+    dmz-127srx-01-4027 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4027;
+        routing-interface irb.4027;
     }
     dmz-oru___-01-0807 {
         vlan-id 807;
@@ -2058,9 +3402,10 @@
     dmz_com_ps-01-2100 {
         vlan-id 2100;
     }
-    dmz_consrx-01-0119 {
-        vlan-id 119;
-        routing-interface irb.119;
+    dmz_consrx-01-4019 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4019;
+        routing-interface irb.4019;
     }
     dmz_d2l_bk-01-2008 {
         vlan-id 2008;
@@ -2080,6 +3425,7 @@
     }
     dmz_eoktek-01-2116 {
         vlan-id 2116;
+        routing-interface irb.2116;
     }
     dmz_exch__-01-0920 {
         vlan-id 920;
@@ -2090,6 +3436,7 @@
     }
     dmz_htpc__-01-2112 {
         vlan-id 2112;
+        routing-interface irb.2112;
     }
     dmz_ipv6__-01-0196 {
         vlan-id 196;
@@ -2099,16 +3446,19 @@
     }
     dmz_kelsov-01-2114 {
         vlan-id 2114;
+        routing-interface irb.2114;
     }
-    dmz_ks_srx-01-0114 {
-        vlan-id 114;
-        routing-interface irb.114;
+    dmz_ks_srx-01-4014 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4014;
+        routing-interface irb.4014;
     }
     dmz_lang__-01-2022 {
         vlan-id 2022;
     }
     dmz_lang__-02-2023 {
         vlan-id 2023;
+        routing-interface irb.2023;
     }
     dmz_mag___-01-0840 {
         vlan-id 840;
@@ -2130,9 +3480,10 @@
     dmz_msgmta-01-2003 {
         vlan-id 2003;
     }
-    dmz_netgrp-01-0109 {
-        vlan-id 109;
-        routing-interface irb.109;
+    dmz_netgrp-01-4009 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4009;
+        routing-interface irb.4009;
     }
     dmz_nfs___-01-0820 {
         vlan-id 820;
@@ -2146,19 +3497,24 @@
     }
     dmz_ohcwc_-02-2018 {
         vlan-id 2018;
+        routing-interface irb.2018;
     }
     dmz_okc_ps-01-2113 {
         vlan-id 2113;
+        routing-interface irb.2113;
     }
     dmz_okloan-01-2115 {
         vlan-id 2115;
+        routing-interface irb.2115;
     }
-    dmz_on_srx-01-0102 {
-        vlan-id 102;
-        routing-interface irb.102;
+    dmz_on_srx-01-4002 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4002;
+        routing-interface irb.4002;
     }
     dmz_onenet-01-0804 {
         vlan-id 804;
+        interface lt-0/1/10.1; ## 'lt-0/1/10.1' is not defined
         routing-interface irb.804;
     }
     dmz_optic_-01_0812 {
@@ -2175,10 +3531,12 @@
     }
     dmz_pryor_-01-2024 {
         vlan-id 2024;
+        routing-interface irb.2024;
     }
-    dmz_prysrx-01-0108 {
-        vlan-id 108;
-        routing-interface irb.108;
+    dmz_prysrx-01-4008 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4008;
+        routing-interface irb.4008;
     }
     dmz_regent-01-0803 {
         vlan-id 803;
@@ -2209,9 +3567,11 @@
     }
     dmz_uchost-01-2103 {
         vlan-id 2103;
+        routing-interface irb.2103;
     }
     dmz_ucsesx-01-2017 {
         vlan-id 2017;
+        routing-interface irb.2017;
     }
     dmz_ucskvm-01-0215 {
         vlan-id 2015;
@@ -2231,62 +3591,82 @@
     }
     dmz_voip__-01-1206 {
         vlan-id 1206;
+        routing-interface irb.1206;
     }
     dmz_voip__-02-2104 {
         vlan-id 2104;
+        routing-interface irb.2104;
     }
     dmz_wosc__-01-2105 {
         vlan-id 2105;
     }
-    dmzcolosrv-01-0710 {
+    dmzcolosrv-01-01710 {
         vlan-id 710;
         routing-interface irb.710;
     }
+    dmzcomps__-01-4028 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4028;
+        routing-interface irb.4028;
+    }
     dmzdhcpsrv-01-0245 {
         vlan-id 245;
+        routing-interface irb.245;
     }
-    dmzdhcpsrx-01-0120 {
-        vlan-id 120;
-        routing-interface irb.120;
+    dmzdhcpsrx-01-4020 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4020;
+        routing-interface irb.4020;
     }
-    dmzfilesrx-01-0107 {
-        vlan-id 107;
-        routing-interface irb.107;
+    dmzfilesrx-01-4007 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4007;
+        routing-interface irb.4007;
     }
-    dmzhcwcsrx-01-0116 {
-        vlan-id 116;
-        routing-interface irb.116;
+    dmzhcwcsrx-01-4016 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4016;
+        routing-interface irb.4016;
     }
-    dmzhptcsrx-01-0117 {
-        vlan-id 117;
-        routing-interface irb.117;
+    dmzhptcsrx-01-4017 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4017;
+        routing-interface irb.4017;
     }
-    dmzlangsrx-01-0111 {
-        vlan-id 111;
-        routing-interface irb.111;
+    dmzlangsrx-01-4011 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4011;
+        routing-interface irb.4011;
     }
-    dmzloansrx-01-0125 {
-        vlan-id 125;
+    dmzloansrx-01-4025 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4025;
+        routing-interface irb.4025;
     }
-    dmzokc_srx-01-0115 {
-        vlan-id 115;
-        routing-interface irb.115;
+    dmzokc_srx-01-4015 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4015;
+        routing-interface irb.4015;
     }
-    dmzponcsrx-01-0112 {
-        vlan-id 112;
-        routing-interface irb.112;
+    dmzponcsrx-01-4012 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4012;
+        routing-interface irb.4012;
     }
-    dmzweb_srx-01-0103 {
-        vlan-id 103;
-        routing-interface irb.103;
+    dmzweb_srx-01-4003 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4003;
+        routing-interface irb.4003;
     }
-    dmzwifisrx-01-0106 {
-        vlan-id 106;
-        routing-interface irb.106;
+    dmzwifisrx-01-4006 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4006;
+        routing-interface irb.4006;
     }
-    dmzwoscsrx-01-0118 {
-        vlan-id 118;
-        routing-interface irb.118;
+    dmzwoscsrx-01-4018 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4018;
+        routing-interface irb.4018;
     }
     doh_video_-01-0956 {
         vlan-id 956;
@@ -2296,14 +3676,18 @@
         vlan-id 300;
         routing-interface irb.300;
     }
-    mgmtPoPvpn-01-0126 {
-        vlan-id 126;
-    }
     mgmtPoPvpn-01-2012 {
         vlan-id 2012;
+        routing-interface irb.2012;
     }
+    mgmtPoPvpn-01-4026 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4026;
+        routing-interface irb.4026;
+    }
     mgmt_ipef_-01-2011 {
         vlan-id 2011;
+        routing-interface irb.2011;
     }
     net_manage-02-0802 {
         vlan-id 802;
@@ -2313,9 +3697,10 @@
         vlan-id 301;
         routing-interface irb.301;
     }
-    new_srxche-01-0123 {
-        vlan-id 123;
-        routing-interface irb.123;
+    new_srxche-01-4023 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4023;
+        routing-interface irb.4023;
     }
     optical___-01-0810 {
         vlan-id 810;
@@ -2345,8 +3730,10 @@
         vlan-id 786;
         routing-interface irb.786;
     }
-    srvmgt_srx-01-0124 {
-        vlan-id 124;
+    srvmgt_srx-01-4024 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4024;
+        routing-interface irb.4024;
     }
     sys_manage-01-0806 {
         vlan-id 806;
@@ -2356,25 +3743,30 @@
         vlan-id 811;
         routing-interface irb.811;
     }
-    tr_net_srx-01-0104 {
-        vlan-id 104;
-        routing-interface irb.104;
+    tr_net_srx-01-4004 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4004;
+        routing-interface irb.4004;
     }
-    tr_ocap___-01-0122 {
-        vlan-id 122;
-        routing-interface irb.122;
+    tr_ocap___-01-4022 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4022;
+        routing-interface irb.4022;
     }
-    tr_ocapsrx-01-0121 {
-        vlan-id 121;
-        routing-interface irb.121;
+    tr_ocapsrx-01-4021 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4021;
+        routing-interface irb.4021;
     }
-    tr_on_srx_-01-0105 {
-        vlan-id 105;
-        routing-interface irb.105;
+    tr_on_srx_-01-4005 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4005;
+        routing-interface irb.4005;
     }
-    tr_reg_srx-01-0101 {
-        vlan-id 101;
-        routing-interface irb.101;
+    tr_reg_srx-01-4001 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4001;
+        routing-interface irb.4001;
     }
     tr_systest-01-0621 {
         vlan-id 621;
@@ -2448,6 +3840,7 @@
     }
     un_greatpl-01-1420 {
         vlan-id 1420;
+        routing-interface irb.1420;
     }
     un_gwiwifi-01-0791 {
         vlan-id 791;
@@ -2545,6 +3938,7 @@
     }
     un_odTEST_-01-1488 {
         vlan-id 1488;
+        routing-interface irb.1488;
     }
     un_odocvm_-01-2713 {
         vlan-id 2713;
@@ -2701,6 +4095,7 @@
     }
     un_ucphone-01-1102 {
         vlan-id 1102;
+        routing-interface irb.1102;
     }
     un_unknown-01-1006 {
         vlan-id 1006;
@@ -2737,9 +4132,11 @@
     }
     un_wifimgmt01-0332 {
         vlan-id 332;
+        routing-interface irb.332;
     }
     un_wifitestap-0331 {
         vlan-id 331;
+        routing-interface irb.331;
     }
     un_wifiwlc-01-0333 {
         vlan-id 333;
@@ -2747,6 +4144,7 @@
     }
     un_wifiwlc_01-350 {
         vlan-id 350;
+        routing-interface irb.350;
     }
     unknown___-01-0650 {
         vlan-id 650;
@@ -2766,14 +4164,11 @@
     unknown___-01-2111 {
         vlan-id 2111;
     }
-    untr-srx__-01-0100 {
-        vlan-id 100;
-        routing-interface irb.100;
+    untrust___-01-4090 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4090;
+        routing-interface irb.4090;
     }
-    untrust___-01-0890 {
-        vlan-id 890;
-        routing-interface irb.890;
-    }
     voip_kans_-01-0612 {
         vlan-id 612;
         routing-interface irb.612;
@@ -2783,17 +4178,19 @@
         vlan-id 604;
         routing-interface irb.604;
     }
-    voip_srx__-01-0113 {
-        vlan-id 113;
-        routing-interface irb.113;
+    voip_srx__-01-4013 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4013;
+        routing-interface irb.4013;
     }
     vpn_concen-01-0847 {
         vlan-id 847;
         routing-interface irb.847;
     }
-    vpn_srx___-01-0110 {
-        vlan-id 110;
-        routing-interface irb.110;
+    vpn_srx___-01-4010 {
+        apply-groups-except MAC-SYNC;
+        vlan-id 4010;
+        routing-interface irb.4010;
     }
     wifi_guest-01-0708 {
         vlan-id 708;
@@ -2824,7 +4221,7 @@
 {master}
 # grnoc-mon at MX480_DC_02_RE0> show ospf neighbor 
 # Address          Interface              State     ID               Pri  Dead
-# 10.199.199.193   ae0.1                  Full      164.58.199.194
 # 164.58.15.25     ae5.1                  Full      164.58.199.212
+# 10.199.199.193   ae8.1                  Full      164.58.199.194
 # 
 # {master}

Index: hub.chi.onenet.net
===================================================================
--- hub.chi.onenet.net	(revision 92861)
+++ hub.chi.onenet.net	(working copy)
@@ -281,7 +281,7 @@
 #t3-2/0/1.0 up up
 #ct3-2/0/2 up up
 #t1-2/0/2:1 up down
-#t1-2/0/2:2 down down
+#t1-2/0/2:2 down up
 #t1-2/0/2:3 up down
 #t1-2/0/2:4 up up
 #t1-2/0/2:4.0 up up
@@ -309,7 +309,7 @@
 #t1-2/0/2:21 down down
 #t1-2/0/2:22 down down
 #t1-2/0/2:23 down down
-#t1-2/0/2:24 down down
+#t1-2/0/2:24 down up
 #t1-2/0/2:25 down up
 #t1-2/0/2:26 down down
 #t1-2/0/2:27 down down

Index: hub.sem.onenet.net
===================================================================
--- hub.sem.onenet.net	(revision 92871)
+++ hub.sem.onenet.net	(working copy)
@@ -351,8 +351,8 @@
 #t1-2/0/2:27 up down
 #t1-2/0/2:28 up down
 #ct3-2/0/3 up up
-#t1-2/0/3:1 up down
-#t1-2/0/3:1.0 up down
+#t1-2/0/3:1 up up
+#t1-2/0/3:1.0 up up
 #t1-2/0/3:2 up down
 #t1-2/0/3:3 up up
 #t1-2/0/3:3.0 up up

Index: core3.okc-m120.onenet.net
===================================================================
--- core3.okc-m120.onenet.net	(revision 92870)
+++ core3.okc-m120.onenet.net	(working copy)
@@ -1031,7 +1031,7 @@
 #t1-3/3/0:2:6 up down
 #t1-3/3/0:2:7 up up
 #t1-3/3/0:2:7.0 up up
-#t1-3/3/0:2:8 down up
+#t1-3/3/0:2:8 down down
 #t1-3/3/0:2:8.0 up down
 #t1-3/3/0:2:9 up down
 #t1-3/3/0:2:10 up down



More information about the Nocrancid mailing list