[Nocrancid] autopop-onenet.net router config diffs

rancid at rancid.noc.onenet.net rancid at rancid.noc.onenet.net
Tue Dec 27 20:04:20 CST 2016


Index: configs/hub.tis.onenet.net
===================================================================
--- configs/hub.tis.onenet.net	(revision 149311)
+++ configs/hub.tis.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at TISHOMINGO-M120-RE0> show system commit 
+#   2016-12-27 19:12:18 CST by andrew via cli commit synchronize
 #   2016-12-27 18:47:00 CST by andrew via cli commit synchronize
 #   2016-12-20 14:15:01 CST by andrew via cli commit synchronize
 #   2016-11-21 11:35:46 CST by andrew via cli commit synchronize
 #   2016-11-14 14:01:45 CST by andrew via cli commit synchronize
 #   2016-09-21 11:21:30 CDT by sky via cli commit synchronize
-#   2016-07-26 19:30:51 CDT by andrew via cli commit synchronize
 # grnoc-mon at TISHOMINGO-M120-RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -272,7 +272,7 @@
 # grnoc-mon at TISHOMINGO-M120-RE0> show system uptime 
 # System booted: 2016-06-21 23:51 CDT 
 # Protocols started: 2016-06-21 23:54 CDT 
-# Last configured: 2016-12-27 18:47 CST  by andrew
+# Last configured: 2016-12-27 19:12 CST  by andrew
 # 
 # {master}
 # grnoc-mon at TISHOMINGO-M120-RE0> show interface terse 
@@ -430,7 +430,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at TISHOMINGO-M120-RE0> show configuration 
-## Last commit: 2016-12-27 18:47:00 CST by andrew
+## Last commit: 2016-12-27 19:12:18 CST by andrew
 version 13.3R8.7;
 groups {
     re0 {
@@ -2107,11 +2107,6 @@
         vrf-export ODOT-VRF-EXPORT;
         vrf-target target:5078:2538;
         vrf-table-label;
-        routing-options {
-            static {
-                route 172.25.141.0/24 next-hop 10.119.8.158;
-            }
-        }
     }
     OMES-AGENCY-DATA-L3VPN {
         description OMES-AGENCY-DATA-L3VPN;
@@ -2122,6 +2117,11 @@
         vrf-export OMES-AGENCY-DATA-VRF-EXPORT;
         vrf-target target:5078:2548;
         vrf-table-label;
+        routing-options {
+            static {
+                route 172.25.141.0/24 next-hop 10.119.88.125;
+            }
+        }
         protocols {
             bgp {
                 group EBGP-OMES-AGENCY-DATA {
Index: configs/odot-talihina-regmaint.client.onenet.net
===================================================================
--- configs/odot-talihina-regmaint.client.onenet.net	(revision 149182)
+++ configs/odot-talihina-regmaint.client.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at ODOT-TALIHINA-REGMAINT-SRX220> show system commit 
+#   2016-12-27 19:15:15 CST by andrew via cli
 #   2016-04-29 10:14:39 CDT by admin via cli
 #   2016-04-28 19:49:52 CDT by admin via cli commit confirmed, rollback in 10mins
 #   2014-10-30 14:49:54 CDT by onenet via cli
 #   2014-10-28 15:08:46 CDT by onenet via cli
 #   2014-10-28 13:06:12 CDT by onenet via cli
-#   2014-08-15 17:19:51 CDT by onenet via cli commit confirmed, rollback in 3mins
 # grnoc-mon at ODOT-TALIHINA-REGMAINT-SRX220> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  Routing Engine                 OK        
@@ -104,7 +104,7 @@
 # grnoc-mon at ODOT-TALIHINA-REGMAINT-SRX220> show system uptime 
 # System booted: 2016-12-09 14:23 CST 
 # Protocols started: 2016-12-09 14:25 CST 
-# Last configured: 2016-04-29 10:14 CDT  by admin
+# Last configured: 2016-12-27 19:15 CST  by andrew
 # 
 # grnoc-mon at ODOT-TALIHINA-REGMAINT-SRX220> show interface terse 
 #Interface Admin Link
@@ -160,7 +160,7 @@
 #vlan.500 up down
 #vlan.501 up down
 # grnoc-mon at ODOT-TALIHINA-REGMAINT-SRX220> show configuration 
-## Last commit: 2016-04-29 10:14:39 CDT by admin
+## Last commit: 2016-12-27 19:15:15 CST by andrew
 version 12.1X46-D20.5;
 system {
     host-name ODOT-TALIHINA-REGMAINT-SRX220;
@@ -593,6 +593,15 @@
                         }
                     }
                 }
+                vlan.3 {
+                    host-inbound-traffic {
+                        system-services {
+                            ping;
+                            traceroute;
+                            dhcp;
+                        }
+                    }
+                }
             }
         }
         security-zone DATACOMM-MGMT {
@@ -636,16 +645,6 @@
                         }
                     }
                 }
-                vlan.3 {
-                    host-inbound-traffic {
-                        system-services {
-                            ping;
-                            traceroute;
-                            snmp;
-                            dhcp;
-                        }
-                    }
-                }
             }
         }
     }
@@ -701,33 +700,6 @@
 routing-instances {
     AGENCY-DATA {
         instance-type virtual-router;
-        interface t1-1/0/0.17;
-        interface vlan.501;
-        protocols {
-            bgp {
-                group EBGP-AGENCY-DATA-ONENET {
-                    type external;
-                    family inet {
-                        unicast;
-                    }
-                    neighbor 10.119.88.120 {
-                        import IMPORT-DEFAULT;
-#                        authentication-#key <removed>;
-                        export EXPORT-ROUTES;
-                        peer-as 5078;
-                    }
-                }
-            }
-            ospf {
-                export EXPORT-DEFAULT;
-                area 10.119.24.214 {
-                    interface vlan.501;
-                }
-            }
-        }
-    }
-    ODOT {
-        instance-type virtual-router;
         system {
             services {
                 dhcp-local-server {
@@ -760,8 +732,35 @@
                 }
             }
         }
-        interface t1-1/0/0.30;
+        interface t1-1/0/0.17;
         interface vlan.3;
+        interface vlan.501;
+        protocols {
+            bgp {
+                group EBGP-AGENCY-DATA-ONENET {
+                    type external;
+                    family inet {
+                        unicast;
+                    }
+                    neighbor 10.119.88.120 {
+                        import IMPORT-DEFAULT;
+#                        authentication-#key <removed>;
+                        export EXPORT-ROUTES;
+                        peer-as 5078;
+                    }
+                }
+            }
+            ospf {
+                export EXPORT-DEFAULT;
+                area 10.119.24.214 {
+                    interface vlan.501;
+                }
+            }
+        }
+    }
+    ODOT {
+        instance-type virtual-router;
+        interface t1-1/0/0.30;
         routing-options {
             static {
                 route 0.0.0.0/0 next-hop 10.119.8.137;
Index: configs/hub.chi.onenet.net
===================================================================
--- configs/hub.chi.onenet.net	(revision 149311)
+++ configs/hub.chi.onenet.net	(working copy)
@@ -282,7 +282,7 @@
 #t1-2/0/2:1 up up
 #t1-2/0/2:1.16 up up
 #t1-2/0/2:1.17 up up
-#t1-2/0/2:2 down up
+#t1-2/0/2:2 down down
 #t1-2/0/2:3 down down
 #t1-2/0/2:4 down down
 #t1-2/0/2:5 down down
Index: configs/hub.bar.onenet.net
===================================================================
--- configs/hub.bar.onenet.net	(revision 149311)
+++ configs/hub.bar.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at BARTLESVILLE-M120-RE0> show system commit 
+#   2016-12-27 19:26:28 CST by andrew via cli commit synchronize
 #   2016-12-27 18:52:23 CST by andrew via cli commit synchronize
 #   2016-12-02 09:20:26 CST by andrew via cli commit synchronize
 #   2016-12-02 09:14:05 CST by andrew via cli commit synchronize
 #   2016-07-21 11:57:20 CDT by sean via cli commit synchronize
 #   2016-07-21 10:08:21 CDT by sean via cli commit synchronize
-#   2016-07-20 14:02:18 CDT by andrew via cli commit synchronize
 # grnoc-mon at BARTLESVILLE-M120-RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -266,7 +266,7 @@
 # grnoc-mon at BARTLESVILLE-M120-RE0> show system uptime 
 # System booted: 2016-03-14 01:19 CDT 
 # Protocols started: 2016-03-14 01:26 CDT 
-# Last configured: 2016-12-27 18:52 CST  by andrew
+# Last configured: 2016-12-27 19:26 CST  by andrew
 # 
 # {master}
 # grnoc-mon at BARTLESVILLE-M120-RE0> show interface terse 
@@ -429,7 +429,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at BARTLESVILLE-M120-RE0> show configuration 
-## Last commit: 2016-12-27 18:52:23 CST by andrew
+## Last commit: 2016-12-27 19:26:28 CST by andrew
 version 13.3R8.7;
 groups {
     re0 {
@@ -2183,11 +2183,6 @@
         vrf-export ODOT-VRF-EXPORT;
         vrf-target target:5078:2538;
         vrf-table-label;
-        routing-options {
-            static {
-                route 172.25.153.0/24 next-hop 10.119.8.206;
-            }
-        }
     }
     OMES-AGENCY-DATA-L3VPN {
         description OMES-AGENCY-DATA-L3VPN;
@@ -2199,6 +2194,11 @@
         vrf-export OMES-AGENCY-DATA-VRF-EXPORT;
         vrf-target target:5078:2548;
         vrf-table-label;
+        routing-options {
+            static {
+                route 172.25.153.0/24 next-hop 10.119.88.9;
+            }
+        }
         protocols {
             bgp {
                 group EBGP-OMES-AGENCY-DATA {
@@ -2207,14 +2207,14 @@
                         unicast;
                     }
                     neighbor 10.119.88.83 {
-                        description EBGP-ODOT-NOWATA-REGMAINT-T1-CIR0006174;
+                        description "EBGP-ODOT-NOWATA-REGMAINT-T1-CIR0006174 [DECOM]";
                         import EBGP-OMES-AGENCY-DATA-SITE-IMPORT;
 #                        authentication-#key <removed>;
                         export EBGP-OMES-AGENCY-DATA-SITE-EXPORT;
                         peer-as 64591;
                     }
                     neighbor 10.119.88.9 {
-                        description EBGP-ODOT-BARTLESVILLE-REGMAINT-T1-CIR0004498;
+                        description "EBGP-ODOT-BARTLESVILLE-REGMAINT-T1-CIR0004498 [DECOM]";
                         import EBGP-OMES-AGENCY-DATA-SITE-IMPORT;
 #                        authentication-#key <removed>;
                         export EBGP-OMES-AGENCY-DATA-SITE-EXPORT;
Index: configs/odot-bristow-regmaint.client.onenet.net
===================================================================
--- configs/odot-bristow-regmaint.client.onenet.net	(revision 148033)
+++ configs/odot-bristow-regmaint.client.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at ODOT-BRISTOW-REGMAINT-SRX220> show system commit 
+#   2016-12-27 19:22:00 CST by andrew via cli
 #   2016-04-29 11:02:44 CDT by admin via cli
 #   2016-04-28 20:17:24 CDT by admin via cli commit confirmed, rollback in 10mins
 #   2014-10-30 14:54:08 CDT by onenet via cli
 #   2014-10-28 15:12:34 CDT by onenet via cli
 #   2014-10-28 13:13:25 CDT by onenet via cli
-#   2014-08-12 08:32:14 CDT by onenet via cli commit confirmed, rollback in 3mins
 # grnoc-mon at ODOT-BRISTOW-REGMAINT-SRX220> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  Routing Engine                 OK        
@@ -104,7 +104,7 @@
 # grnoc-mon at ODOT-BRISTOW-REGMAINT-SRX220> show system uptime 
 # System booted: 2016-11-10 13:27 CST 
 # Protocols started: 2016-11-10 13:30 CST 
-# Last configured: 2016-04-29 11:02 CDT  by admin
+# Last configured: 2016-12-27 19:22 CST  by andrew
 # 
 # grnoc-mon at ODOT-BRISTOW-REGMAINT-SRX220> show interface terse 
 #Interface Admin Link
@@ -160,7 +160,7 @@
 #vlan.500 up down
 #vlan.501 up down
 # grnoc-mon at ODOT-BRISTOW-REGMAINT-SRX220> show configuration 
-## Last commit: 2016-04-29 11:02:44 CDT by admin
+## Last commit: 2016-12-27 19:22:00 CST by andrew
 version 12.1X46-D20.5;
 system {
     host-name ODOT-BRISTOW-REGMAINT-SRX220;
@@ -593,6 +593,15 @@
                         }
                     }
                 }
+                vlan.3 {
+                    host-inbound-traffic {
+                        system-services {
+                            ping;
+                            traceroute;
+                            dhcp;
+                        }
+                    }
+                }
             }
         }
         security-zone DATACOMM-MGMT {
@@ -636,16 +645,6 @@
                         }
                     }
                 }
-                vlan.3 {
-                    host-inbound-traffic {
-                        system-services {
-                            ping;
-                            traceroute;
-                            snmp;
-                            dhcp;
-                        }
-                    }
-                }
             }
         }
     }
@@ -701,33 +700,6 @@
 routing-instances {
     AGENCY-DATA {
         instance-type virtual-router;
-        interface t1-1/0/0.17;
-        interface vlan.501;
-        protocols {
-            bgp {
-                group EBGP-AGENCY-DATA-ONENET {
-                    type external;
-                    family inet {
-                        unicast;
-                    }
-                    neighbor 10.119.88.14 {
-                        import IMPORT-DEFAULT;
-#                        authentication-#key <removed>;
-                        export EXPORT-ROUTES;
-                        peer-as 5078;
-                    }
-                }
-            }
-            ospf {
-                export EXPORT-DEFAULT;
-                area 10.119.24.222 {
-                    interface vlan.501;
-                }
-            }
-        }
-    }
-    ODOT {
-        instance-type virtual-router;
         system {
             services {
                 dhcp-local-server {
@@ -760,8 +732,35 @@
                 }
             }
         }
-        interface t1-1/0/0.30;
+        interface t1-1/0/0.17;
         interface vlan.3;
+        interface vlan.501;
+        protocols {
+            bgp {
+                group EBGP-AGENCY-DATA-ONENET {
+                    type external;
+                    family inet {
+                        unicast;
+                    }
+                    neighbor 10.119.88.14 {
+                        import IMPORT-DEFAULT;
+#                        authentication-#key <removed>;
+                        export EXPORT-ROUTES;
+                        peer-as 5078;
+                    }
+                }
+            }
+            ospf {
+                export EXPORT-DEFAULT;
+                area 10.119.24.222 {
+                    interface vlan.501;
+                }
+            }
+        }
+    }
+    ODOT {
+        instance-type virtual-router;
+        interface t1-1/0/0.30;
         routing-options {
             static {
                 route 0.0.0.0/0 next-hop 10.119.8.209;
Index: configs/odot-sand-springs-residence.client.onenet.net
===================================================================
--- configs/odot-sand-springs-residence.client.onenet.net	(revision 147165)
+++ configs/odot-sand-springs-residence.client.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at ODOT-SAND-SPRINGS-RESIDENCY-SRX220> show system commit 
+#   2016-12-27 19:36:18 CST by andrew via cli
 #   2016-09-04 23:49:46 CDT by andrew via cli commit confirmed, rollback in 5mins
 #   2016-09-04 19:11:50 CDT by andrew via cli commit confirmed, rollback in 3mins
 #   2016-08-31 11:08:10 CDT by aberrios via cli
 #   2016-08-31 11:02:41 CDT by aberrios via cli
 #   2016-07-27 18:48:48 CDT by andrew via cli
-#   2016-04-27 12:02:23 CDT by andrew via cli
 # grnoc-mon at ODOT-SAND-SPRINGS-RESIDENCY-SRX220> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  Routing Engine                 OK        
@@ -110,7 +110,7 @@
 # grnoc-mon at ODOT-SAND-SPRINGS-RESIDENCY-SRX220> show system uptime 
 # System booted: 2016-08-10 09:47 CDT 
 # Protocols started: 2016-08-10 09:49 CDT 
-# Last configured: 2016-09-04 23:49 CDT  by andrew
+# Last configured: 2016-12-27 19:36 CST  by andrew
 # 
 # grnoc-mon at ODOT-SAND-SPRINGS-RESIDENCY-SRX220> show interface terse 
 #Interface Admin Link
@@ -161,7 +161,7 @@
 #tap up up
 #vlan up up
 # grnoc-mon at ODOT-SAND-SPRINGS-RESIDENCY-SRX220> show configuration 
-## Last commit: 2016-09-04 23:49:46 CDT by andrew
+## Last commit: 2016-12-27 19:36:18 CST by andrew
 version 12.1X46-D20.5;
 system {
     host-name ODOT-SAND-SPRINGS-RESIDENCY-SRX220;
@@ -538,6 +538,14 @@
                         }
                     }
                 }
+                ge-0/0/7.3 {
+                    host-inbound-traffic {
+                        system-services {
+                            ping;
+                            traceroute;
+                        }
+                    }
+                }
             }
         }
         security-zone DATACOMM-MGMT {
@@ -581,16 +589,6 @@
                         }
                     }
                 }
-                ge-0/0/7.3 {
-                    host-inbound-traffic {
-                        system-services {
-                            ping;
-                            traceroute;
-                            snmp;
-                            dhcp;
-                        }
-                    }
-                }
             }
         }
     }
@@ -647,6 +645,7 @@
     AGENCY-DATA {
         instance-type virtual-router;
         interface ge-0/0/0.501;
+        interface ge-0/0/7.3;
         interface ge-0/0/7.501;
         protocols {
             bgp {
@@ -674,7 +673,6 @@
     ODOT {
         instance-type virtual-router;
         interface ge-0/0/0.502;
-        interface ge-0/0/7.3;
         routing-options {
             static {
                 route 0.0.0.0/0 next-hop 10.119.9.13;
Index: configs/hub.ida.onenet.net
===================================================================
--- configs/hub.ida.onenet.net	(revision 149311)
+++ configs/hub.ida.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at IDABEL-M120-RE0> show system commit 
+#   2016-12-27 19:18:26 CST by andrew via cli commit synchronize
 #   2016-12-27 18:49:48 CST by andrew via cli commit synchronize
 #   2016-12-04 16:53:42 CST by andrew via cli commit synchronize
 #   2016-12-04 16:46:46 CST by andrew via cli commit synchronize
 #   2016-08-12 10:37:20 CDT by andrew via cli commit synchronize
 #   2016-08-12 09:42:23 CDT by andrew via cli commit synchronize
-#   2016-07-20 19:19:46 CDT by andrew via cli commit synchronize
 # grnoc-mon at IDABEL-M120-RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -263,7 +263,7 @@
 # grnoc-mon at IDABEL-M120-RE0> show system uptime 
 # System booted: 2016-03-16 00:52 CDT 
 # Protocols started: 2016-03-16 01:01 CDT 
-# Last configured: 2016-12-27 18:49 CST  by andrew
+# Last configured: 2016-12-27 19:18 CST  by andrew
 # 
 # {master}
 # grnoc-mon at IDABEL-M120-RE0> show interface terse 
@@ -396,7 +396,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at IDABEL-M120-RE0> show configuration 
-## Last commit: 2016-12-27 18:49:48 CST by andrew
+## Last commit: 2016-12-27 19:18:26 CST by andrew
 version 13.3R8.7;
 groups {
     re0 {
@@ -2147,11 +2147,6 @@
         vrf-export ODOT-VRF-EXPORT;
         vrf-target target:5078:2538;
         vrf-table-label;
-        routing-options {
-            static {
-                route 172.25.134.0/24 next-hop 10.119.8.130;
-            }
-        }
     }
     OMES-AGENCY-DATA-L3VPN {
         description OMES-AGENCY-DATA-L3VPN;
@@ -2163,6 +2158,11 @@
         vrf-export OMES-AGENCY-DATA-VRF-EXPORT;
         vrf-target target:5078:2548;
         vrf-table-label;
+        routing-options {
+            static {
+                route 172.25.134.0/24 next-hop 10.119.88.67;
+            }
+        }
         protocols {
             bgp {
                 group EBGP-OMES-AGENCY-DATA {
Index: configs/core.sem.onenet.net
===================================================================
--- configs/core.sem.onenet.net	(revision 148895)
+++ configs/core.sem.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at SEMINOLE-MX480-RE0> show system commit 
+#   2016-12-27 19:40:54 CST by andrew via cli commit synchronize
 #   2016-12-09 21:45:18 CST by andrew via cli commit synchronize
 #   2016-11-28 12:55:42 CST by andrew via cli commit synchronize
 #   2016-10-03 14:20:14 CDT by rnordmark via cli commit synchronize
 #   2016-09-06 11:24:07 CDT by andrew via cli commit synchronize
 #   2016-09-06 11:22:47 CDT by andrew via cli commit synchronize
-#   2016-07-20 10:19:34 CDT by andrew via cli commit synchronize
 # grnoc-mon at SEMINOLE-MX480-RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -255,7 +255,7 @@
 # grnoc-mon at SEMINOLE-MX480-RE0> show system uptime 
 # System booted: 2016-03-21 00:55 CDT 
 # Protocols started: 2016-03-21 01:06 CDT 
-# Last configured: 2016-12-09 21:45 CST  by andrew
+# Last configured: 2016-12-27 19:40 CST  by andrew
 # 
 # {master}
 # grnoc-mon at SEMINOLE-MX480-RE0> show interface terse 
@@ -340,7 +340,7 @@
 #lsi up up
 #lsi.0 up up
 #lsi.1 up up
-#lsi.2 up up
+#lsi.3 up up
 #lsi.1048885 up up
 #lsi.1049045 up up
 #lsi.1049046 up up
@@ -370,7 +370,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at SEMINOLE-MX480-RE0> show configuration 
-## Last commit: 2016-12-09 21:45:18 CST by andrew
+## Last commit: 2016-12-27 19:40:54 CST by andrew
 version 13.3R8.7;
 groups {
     re0 {
@@ -1214,38 +1214,45 @@
             load-balance per-packet;
         }
     }
-    policy-statement ODOT-VRF-EXPORT {
+    policy-statement OMES-AGENCY-DATA-VRF-EXPORT {
         term 1 {
             from protocol static;
             then {
-                community add ODOT-VPN;
+                community add OMES-AGENCY-DATA-VPN;
                 accept;
             }
         }
         term 2 {
             from protocol direct;
             then {
-                community add ODOT-VPN;
+                community add OMES-AGENCY-DATA-VPN;
                 accept;
             }
         }
         term 3 {
             from protocol ospf;
             then {
-                community add ODOT-VPN;
+                community add OMES-AGENCY-DATA-VPN;
                 accept;
             }
         }
+        term 4 {
+            from protocol bgp;
+            then {
+                community add OMES-AGENCY-DATA-VPN;
+                accept;
+            }
+        }
     }
-    policy-statement ODOT-VRF-IMPORT {
+    policy-statement OMES-AGENCY-DATA-VRF-IMPORT {
         term 1 {
             from {
                 protocol bgp;
-                community ODOT-VPN;
+                community OMES-AGENCY-DATA-VPN;
             }
             then accept;
         }
-        term reject {
+        term 2 {
             then reject;
         }
     }
@@ -1399,7 +1406,7 @@
     community Miami members 5078:138;
     community Midwest-City members 5078:2;
     community Muskogee members 5078:94;
-    community ODOT-VPN members target:5078:2538;
+    community OMES-AGENCY-DATA-VPN members target:5078:2548;
     community ONENET-MGMT-VPN members target:5078:2543;
     community ONENET-PoP-APPLIANCES members target:5078:2012;
     community OSUOKC members 5078:50;
@@ -1679,14 +1686,14 @@
     }
 }
 routing-instances {
-    ODOT-L3VPN {
-        description ODOT-L3VPN;
+    OMES-AGENCY-DATA-L3VPN {
+        description OMES-AGENCY-DATA-L3VPN;
         instance-type vrf;
         interface ge-0/2/2.3900;
-        route-distinguisher 164.58.199.47:2538;
-        vrf-import ODOT-VRF-IMPORT;
-        vrf-export ODOT-VRF-EXPORT;
-        vrf-target target:5078:2538;
+        route-distinguisher 164.58.199.47:2548;
+        vrf-import OMES-AGENCY-DATA-VRF-IMPORT;
+        vrf-export OMES-AGENCY-DATA-VRF-EXPORT;
+        vrf-target target:5078:2548;
         vrf-table-label;
         routing-options {
             static {
Index: configs/odot-claremore-residence.client.onenet.net
===================================================================
--- configs/odot-claremore-residence.client.onenet.net	(revision 148125)
+++ configs/odot-claremore-residence.client.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at ODOT-CLAREMORE-RESIDENCY-SRX220> show system commit 
+#   2016-12-27 19:36:16 CST by andrew via cli
 #   2016-08-30 13:11:07 CDT by sky via cli commit confirmed, rollback in 5mins
 #   2016-08-30 11:46:58 CDT by aberrios via cli
 #   2016-08-30 11:45:21 CDT by aberrios via cli
 #   2016-08-30 11:42:35 CDT by aberrios via cli
 #   2016-04-27 14:37:49 CDT by admin via cli
-#   2016-04-27 13:52:09 CDT by admin via cli
 # grnoc-mon at ODOT-CLAREMORE-RESIDENCY-SRX220> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  Routing Engine                 OK        
@@ -110,7 +110,7 @@
 # grnoc-mon at ODOT-CLAREMORE-RESIDENCY-SRX220> show system uptime 
 # System booted: 2016-11-14 10:43 CST 
 # Protocols started: 2016-11-14 10:45 CST 
-# Last configured: 2016-08-30 13:11 CDT  by sky
+# Last configured: 2016-12-27 19:36 CST  by andrew
 # 
 # grnoc-mon at ODOT-CLAREMORE-RESIDENCY-SRX220> show interface terse 
 #Interface Admin Link
@@ -168,7 +168,7 @@
 #vlan.500 up down
 #vlan.501 up down
 # grnoc-mon at ODOT-CLAREMORE-RESIDENCY-SRX220> show configuration 
-## Last commit: 2016-08-30 13:11:07 CDT by sky
+## Last commit: 2016-12-27 19:36:16 CST by andrew
 version 12.1X46-D20.5;
 system {
     host-name ODOT-CLAREMORE-RESIDENCY-SRX220;
@@ -594,6 +594,14 @@
                         }
                     }
                 }
+                vlan.3 {
+                    host-inbound-traffic {
+                        system-services {
+                            ping;
+                            traceroute;
+                        }
+                    }
+                }
             }
         }
         security-zone DATACOMM-MGMT {
@@ -637,16 +645,6 @@
                         }
                     }
                 }
-                vlan.3 {
-                    host-inbound-traffic {
-                        system-services {
-                            ping;
-                            traceroute;
-                            snmp;
-                            dhcp;
-                        }
-                    }
-                }
             }
         }
     }
@@ -703,6 +701,7 @@
     AGENCY-DATA {
         instance-type virtual-router;
         interface ge-0/0/0.501;
+        interface vlan.3;
         interface vlan.501;
         protocols {
             bgp {
@@ -729,40 +728,7 @@
     }
     ODOT {
         instance-type virtual-router;
-        system {
-            services {
-                dhcp-local-server {
-                    inactive: group ODOT {
-                        interface vlan.3;
-                    }
-                }
-            }
-        }
-        access {
-            address-assignment {
-                inactive: pool ODOT-POOL {
-                    family inet {
-                        network 172.25.168.0/24;
-                        range ODOT-RANGE {
-                            low 172.25.168.51;
-                            high 172.25.168.200;
-                        }
-                        dhcp-attributes {
-                            domain-name agency.ok.local;
-                            name-server {
-                                10.36.36.46;
-                                10.36.36.47;
-                            }
-                            router {
-                                172.25.168.1;
-                            }
-                        }
-                    }
-                }
-            }
-        }
         interface ge-0/0/0.502;
-        interface vlan.3;
         routing-options {
             static {
                 route 0.0.0.0/0 next-hop 10.119.9.9;
Index: configs/hub.okm.onenet.net
===================================================================
--- configs/hub.okm.onenet.net	(revision 149311)
+++ configs/hub.okm.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at OKMULGEE-M120-RE0> show system commit 
+#   2016-12-27 19:22:00 CST by andrew via cli commit synchronize
 #   2016-12-27 18:50:59 CST by andrew via cli commit synchronize
 #   2016-11-20 14:52:00 CST by andrew via cli commit synchronize
 #   2016-10-28 18:11:13 CDT by andrew via cli commit synchronize
 #   2016-07-27 20:03:58 CDT by andrew via cli commit synchronize
 #   2016-07-20 19:10:16 CDT by andrew via cli commit synchronize
-#   2016-07-20 14:04:28 CDT by andrew via cli commit synchronize
 # grnoc-mon at OKMULGEE-M120-RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -266,7 +266,7 @@
 # grnoc-mon at OKMULGEE-M120-RE0> show system uptime 
 # System booted: 2016-03-18 02:05 CDT 
 # Protocols started: 2016-03-18 02:11 CDT 
-# Last configured: 2016-12-27 18:50 CST  by andrew
+# Last configured: 2016-12-27 19:22 CST  by andrew
 # 
 # {master}
 # grnoc-mon at OKMULGEE-M120-RE0> show interface terse 
@@ -431,7 +431,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at OKMULGEE-M120-RE0> show configuration 
-## Last commit: 2016-12-27 18:50:59 CST by andrew
+## Last commit: 2016-12-27 19:22:00 CST by andrew
 version 13.3R8.7;
 groups {
     re0 {
@@ -2532,11 +2532,6 @@
         vrf-export ODOT-VRF-EXPORT;
         vrf-target target:5078:2538;
         vrf-table-label;
-        routing-options {
-            static {
-                route 172.25.154.0/24 next-hop 10.119.8.210;
-            }
-        }
     }
     OMES-AGENCY-DATA-L3VPN {
         description OMES-AGENCY-DATA-L3VPN;
@@ -2547,6 +2542,11 @@
         vrf-export OMES-AGENCY-DATA-VRF-EXPORT;
         vrf-target target:5078:2548;
         vrf-table-label;
+        routing-options {
+            static {
+                route 172.25.154.0/24 next-hop 10.119.88.15;
+            }
+        }
         protocols {
             bgp {
                 group EBGP-OMES-AGENCY-DATA {
Index: configs/core5.tul.onenet.net
===================================================================
--- configs/core5.tul.onenet.net	(revision 149202)
+++ configs/core5.tul.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at TULSA-CORE5-MX480-RE0> show system commit 
+#   2016-12-27 19:36:23 CST by andrew via cli commit synchronize
 #   2016-12-21 17:10:47 CST by sky via cli commit synchronize
 #   2016-12-21 16:15:21 CST by andrew via cli commit synchronize
 #   2016-12-21 08:56:03 CST by andrew via cli commit synchronize
 #   2016-12-20 19:40:55 CST by andrew via cli commit synchronize
 #   2016-12-20 17:21:12 CST by andrew via cli commit synchronize
-#   2016-12-20 15:15:05 CST by sean via cli commit confirmed, rollback in 3mins synchronize
 # grnoc-mon at TULSA-CORE5-MX480-RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -392,7 +392,7 @@
 # grnoc-mon at TULSA-CORE5-MX480-RE0> show system uptime 
 # System booted: 2016-08-15 04:47 CDT 
 # Protocols started: 2016-08-15 04:53 CDT 
-# Last configured: 2016-12-21 17:10 CST  by sky
+# Last configured: 2016-12-27 19:36 CST  by andrew
 # 
 # {master}
 # grnoc-mon at TULSA-CORE5-MX480-RE0> show interface terse 
@@ -814,7 +814,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at TULSA-CORE5-MX480-RE0> show configuration 
-## Last commit: 2016-12-21 17:10:47 CST by sky
+## Last commit: 2016-12-27 19:36:23 CST by andrew
 version 13.3R9.13;
 groups {
     re0 {
@@ -3000,7 +3000,7 @@
             }
         }
         unit 2254 {
-            description ODOT-CLAREMORE-RESIDENCE-3M-CIR0019389;
+            description "ODOT-CLAREMORE-RESIDENCE-3M-CIR0019389 [DECOM]";
             vlan-tags outer 254 inner 502;
             family inet {
                 policer {
@@ -3014,7 +3014,7 @@
             }
         }
         unit 2255 {
-            description ODOT-SAND-SPRINGS-RESIDENCE-3M-CIR0019370;
+            description "ODOT-SAND-SPRINGS-RESIDENCE-3M-CIR0019370 [DECOM]";
             vlan-tags outer 255 inner 502;
             family inet {
                 mtu 1500;
@@ -8617,12 +8617,6 @@
         vrf-export ODOT-VRF-EXPORT;
         vrf-target target:5078:2538;
         vrf-table-label;
-        routing-options {
-            static {
-                route 172.25.168.0/24 next-hop 10.119.9.10;
-                route 172.25.169.0/24 next-hop 10.119.9.14;
-            }
-        }
     }
     OIDS-L3VPN {
         description OIDS-L3VPN;
@@ -8650,6 +8644,12 @@
         vrf-export OMES-AGENCY-DATA-VRF-EXPORT;
         vrf-target target:5078:2548;
         vrf-table-label;
+        routing-options {
+            static {
+                route 172.25.169.0/24 next-hop 10.119.88.105;
+                route 172.25.168.0/24 next-hop 10.119.88.29;
+            }
+        }
         protocols {
             bgp {
                 group EBGP-OMES-AGENCY-DATA {
Index: configs/lavern-public-schools.client.onenet.net
===================================================================
--- configs/lavern-public-schools.client.onenet.net	(revision 149311)
+++ configs/lavern-public-schools.client.onenet.net	(working copy)
@@ -102,7 +102,7 @@
 # 
 # grnoc-mon at LAVERN-PUBLIC-SCHOOLS-TAG-004351> show interface terse 
 #Interface Admin Link
-#ge-0/0/0 down up
+#ge-0/0/0 down down
 #gr-0/0/0 up up
 #ip-0/0/0 up up
 #lsq-0/0/0 up up
Index: configs/odot-stillwater-residence.client.onenet.net
===================================================================
--- configs/odot-stillwater-residence.client.onenet.net	(revision 149007)
+++ configs/odot-stillwater-residence.client.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at ODOT-STILLWATER-RESIDENCY-SRX220> show system commit 
+#   2016-12-27 19:29:52 CST by andrew via cli
 #   2016-09-12 18:15:34 CDT by admin via cli commit confirmed, rollback in 3mins
 #   2016-09-12 18:13:56 CDT by root via other
 #   2016-09-12 18:10:24 CDT by admin via cli commit confirmed, rollback in 3mins
 #   2016-09-12 10:59:06 CDT by admin via cli commit confirmed, rollback in 5mins
 #   2016-09-12 10:52:48 CDT by admin via cli commit confirmed, rollback in 5mins
-#   2016-09-12 10:49:15 CDT by root via other
 # grnoc-mon at ODOT-STILLWATER-RESIDENCY-SRX220> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  Routing Engine                 OK        
@@ -104,7 +104,7 @@
 # grnoc-mon at ODOT-STILLWATER-RESIDENCY-SRX220> show system uptime 
 # System booted: 2016-09-27 22:36 CDT 
 # Protocols started: 2016-09-27 22:39 CDT 
-# Last configured: 2016-09-12 18:15 CDT  by admin
+# Last configured: 2016-12-27 19:29 CST  by andrew
 # 
 # grnoc-mon at ODOT-STILLWATER-RESIDENCY-SRX220> show interface terse 
 #Interface Admin Link
@@ -160,7 +160,7 @@
 #vlan.500 up up
 #vlan.501 up up
 # grnoc-mon at ODOT-STILLWATER-RESIDENCY-SRX220> show configuration 
-## Last commit: 2016-09-12 18:15:34 CDT by admin
+## Last commit: 2016-12-27 19:29:52 CST by andrew
 version 12.1X46-D20.5;
 system {
     host-name ODOT-STILLWATER-RESIDENCY-SRX220;
@@ -305,7 +305,7 @@
             }
         }
         unit 502 {
-            description "ODOT-DATA to OneNet";
+            description "ODOT-DATA to OneNet [DECOM]";
             vlan-id 502;
             family inet {
                 address 10.119.8.174/30;
@@ -575,6 +575,14 @@
                         }
                     }
                 }
+                vlan.3 {
+                    host-inbound-traffic {
+                        system-services {
+                            ping;
+                            traceroute;
+                        }
+                    }
+                }
             }
         }
         security-zone DATACOMM-MGMT {
@@ -605,16 +613,6 @@
         }
         security-zone ODOT {
             interfaces {
-                vlan.3 {
-                    host-inbound-traffic {
-                        system-services {
-                            ping;
-                            traceroute;
-                            snmp;
-                            dhcp;
-                        }
-                    }
-                }
                 ge-0/0/0.502 {
                     host-inbound-traffic {
                         system-services {
@@ -681,6 +679,7 @@
     AGENCY-DATA {
         instance-type virtual-router;
         interface ge-0/0/0.501;
+        interface vlan.3;
         interface vlan.501;
         routing-options {
             static {
@@ -699,7 +698,6 @@
     ODOT {
         instance-type virtual-router;
         interface ge-0/0/0.502;
-        interface vlan.3;
         routing-options {
             static {
                 route 0.0.0.0/0 next-hop 10.119.8.173;
Index: configs/core5.okc.onenet.net
===================================================================
--- configs/core5.okc.onenet.net	(revision 149301)
+++ configs/core5.okc.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at OKC-CORE5-MX480-RE0> show system commit 
+#   2016-12-27 19:29:56 CST by andrew via cli commit synchronize
 #   2016-12-27 10:39:07 CST by andrew via cli commit synchronize
 #   2016-12-27 10:23:04 CST by andrew via cli commit synchronize
 #   2016-12-23 10:28:24 CST by andrew via cli commit synchronize
 #   2016-12-22 16:28:59 CST by andrew via cli commit synchronize
 #   2016-12-22 16:17:20 CST by andrew via cli commit synchronize
-#   2016-12-22 15:35:22 CST by andrew via cli commit synchronize
 # grnoc-mon at OKC-CORE5-MX480-RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -447,7 +447,7 @@
 # grnoc-mon at OKC-CORE5-MX480-RE0> show system uptime 
 # System booted: 2016-10-12 08:16 CDT 
 # Protocols started: 2016-10-12 08:18 CDT 
-# Last configured: 2016-12-27 10:39 CST  by andrew
+# Last configured: 2016-12-27 19:29 CST  by andrew
 # 
 # {master}
 # grnoc-mon at OKC-CORE5-MX480-RE0> show interface terse 
@@ -999,7 +999,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at OKC-CORE5-MX480-RE0> show configuration 
-## Last commit: 2016-12-27 10:39:07 CST by andrew
+## Last commit: 2016-12-27 19:29:56 CST by andrew
 version 13.3R9.13;
 groups {
     re0 {
@@ -5121,7 +5121,7 @@
             }
         }
         unit 2512 {
-            description ODOT-STILLWATER-ODOT-DATA-10M-CIR0019196;
+            description "ODOT-STILLWATER-ODOT-DATA-10M-CIR0019196 [DECOM]";
             vlan-tags outer 512 inner 502;
             family inet {
                 mtu 1500;
@@ -15029,9 +15029,6 @@
         vrf-target target:5078:2538;
         vrf-table-label;
         routing-options {
-            static {
-                route 172.25.145.0/24 next-hop 10.119.8.174;
-            }
             router-id 172.25.255.252;
             autonomous-system 64569 loops 3;
         }
@@ -15118,6 +15115,7 @@
         routing-options {
             static {
                 route 10.119.24.236/31 next-hop 10.119.88.113;
+                route 172.25.145.0/24 next-hop 10.119.88.113;
             }
             autonomous-system 64569 loops 3;
         }
Index: configs/hub.wil.onenet.net
===================================================================
--- configs/hub.wil.onenet.net	(revision 149311)
+++ configs/hub.wil.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at WILBURTON-M120-RE0> show system commit 
+#   2016-12-27 19:15:13 CST by andrew via cli commit synchronize
 #   2016-12-27 18:48:06 CST by andrew via cli commit synchronize
 #   2016-09-13 11:40:35 CDT by andrew via cli commit synchronize
 #   2016-09-13 11:32:07 CDT by andrew via cli commit synchronize
 #   2016-09-13 11:27:54 CDT by andrew via cli commit synchronize
 #   2016-09-13 11:26:19 CDT by andrew via cli commit synchronize
-#   2016-08-31 09:45:29 CDT by sky via cli commit synchronize
 # grnoc-mon at WILBURTON-M120-RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -263,7 +263,7 @@
 # grnoc-mon at WILBURTON-M120-RE0> show system uptime 
 # System booted: 2016-03-13 01:23 CST 
 # Protocols started: 2016-03-13 01:28 CST 
-# Last configured: 2016-12-27 18:48 CST  by andrew
+# Last configured: 2016-12-27 19:15 CST  by andrew
 # 
 # {master}
 # grnoc-mon at WILBURTON-M120-RE0> show interface terse 
@@ -415,7 +415,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at WILBURTON-M120-RE0> show configuration 
-## Last commit: 2016-12-27 18:48:06 CST by andrew
+## Last commit: 2016-12-27 19:15:13 CST by andrew
 version 13.3R8.7;
 groups {
     re0 {
@@ -2195,11 +2195,6 @@
         vrf-export ODOT-VRF-EXPORT;
         vrf-target target:5078:2538;
         vrf-table-label;
-        routing-options {
-            static {
-                route 172.25.136.0/24 next-hop 10.119.8.138;
-            }
-        }
     }
     OMES-AGENCY-DATA-L3VPN {
         description OMES-AGENCY-DATA-L3VPN;
@@ -2210,6 +2205,11 @@
         vrf-export OMES-AGENCY-DATA-VRF-EXPORT;
         vrf-target target:5078:2548;
         vrf-table-label;
+        routing-options {
+            static {
+                route 172.25.136.0/24 next-hop 10.119.88.121;
+            }
+        }
         protocols {
             bgp {
                 group EBGP-OMES-AGENCY-DATA {
Index: configs/odot-tishomingo-regmaint.client.onenet.net
===================================================================
--- configs/odot-tishomingo-regmaint.client.onenet.net	(revision 147213)
+++ configs/odot-tishomingo-regmaint.client.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at ODOT-TISHOMINGO-REGMAINT-SRX220> show system commit 
+#   2016-12-27 19:11:28 CST by andrew via cli
 #   2016-04-29 10:39:52 CDT by admin via cli
 #   2016-04-28 20:03:05 CDT by admin via cli commit confirmed, rollback in 10mins
 #   2014-10-30 14:51:12 CDT by onenet via cli
 #   2014-10-28 15:09:50 CDT by onenet via cli
 #   2014-10-28 13:08:32 CDT by onenet via cli
-#   2014-08-20 10:11:24 CDT by onenet via cli commit confirmed, rollback in 3mins
 # grnoc-mon at ODOT-TISHOMINGO-REGMAINT-SRX220> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  Routing Engine                 OK        
@@ -104,7 +104,7 @@
 # grnoc-mon at ODOT-TISHOMINGO-REGMAINT-SRX220> show system uptime 
 # System booted: 2016-10-12 08:14 CDT 
 # Protocols started: 2016-10-12 08:17 CDT 
-# Last configured: 2016-04-29 10:39 CDT  by admin
+# Last configured: 2016-12-27 19:11 CST  by andrew
 # 
 # grnoc-mon at ODOT-TISHOMINGO-REGMAINT-SRX220> show interface terse 
 #Interface Admin Link
@@ -160,7 +160,7 @@
 #vlan.500 up down
 #vlan.501 up down
 # grnoc-mon at ODOT-TISHOMINGO-REGMAINT-SRX220> show configuration 
-## Last commit: 2016-04-29 10:39:52 CDT by admin
+## Last commit: 2016-12-27 19:11:28 CST by andrew
 version 12.1X46-D20.5;
 system {
     host-name ODOT-TISHOMINGO-REGMAINT-SRX220;
@@ -384,7 +384,7 @@
             }
         }
         unit 30 {
-            description ODOT-T1;
+            description "ODOT-T1 [DECOM]";
             dlci 30;
             family inet {
                 address 10.119.8.158/30;
@@ -593,6 +593,15 @@
                         }
                     }
                 }
+                vlan.3 {
+                    host-inbound-traffic {
+                        system-services {
+                            ping;
+                            traceroute;
+                            dhcp;
+                        }
+                    }
+                }
             }
         }
         security-zone DATACOMM-MGMT {
@@ -636,16 +645,6 @@
                         }
                     }
                 }
-                vlan.3 {
-                    host-inbound-traffic {
-                        system-services {
-                            ping;
-                            traceroute;
-                            snmp;
-                            dhcp;
-                        }
-                    }
-                }
             }
         }
     }
@@ -701,33 +700,6 @@
 routing-instances {
     AGENCY-DATA {
         instance-type virtual-router;
-        interface t1-1/0/0.17;
-        interface vlan.501;
-        protocols {
-            bgp {
-                group EBGP-AGENCY-DATA-ONENET {
-                    type external;
-                    family inet {
-                        unicast;
-                    }
-                    neighbor 10.119.88.124 {
-                        import IMPORT-DEFAULT;
-#                        authentication-#key <removed>;
-                        export EXPORT-ROUTES;
-                        peer-as 5078;
-                    }
-                }
-            }
-            ospf {
-                export EXPORT-DEFAULT;
-                area 10.119.25.16 {
-                    interface vlan.501;
-                }
-            }
-        }
-    }
-    ODOT {
-        instance-type virtual-router;
         system {
             services {
                 dhcp-local-server {
@@ -760,8 +732,35 @@
                 }
             }
         }
-        interface t1-1/0/0.30;
+        interface t1-1/0/0.17;
         interface vlan.3;
+        interface vlan.501;
+        protocols {
+            bgp {
+                group EBGP-AGENCY-DATA-ONENET {
+                    type external;
+                    family inet {
+                        unicast;
+                    }
+                    neighbor 10.119.88.124 {
+                        import IMPORT-DEFAULT;
+#                        authentication-#key <removed>;
+                        export EXPORT-ROUTES;
+                        peer-as 5078;
+                    }
+                }
+            }
+            ospf {
+                export EXPORT-DEFAULT;
+                area 10.119.25.16 {
+                    interface vlan.501;
+                }
+            }
+        }
+    }
+    ODOT {
+        instance-type virtual-router;
+        interface t1-1/0/0.30;
         routing-options {
             static {
                 route 0.0.0.0/0 next-hop 10.119.8.157;
Index: configs/odot-idabel-regmaint.client.onenet.net
===================================================================
--- configs/odot-idabel-regmaint.client.onenet.net	(revision 148695)
+++ configs/odot-idabel-regmaint.client.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at ODOT-IDABEL-REGMAINT-SRX220> show system commit 
+#   2016-12-27 19:17:43 CST by andrew via cli
 #   2016-04-29 12:56:55 CDT by admin via cli
 #   2016-04-28 19:15:10 CDT by admin via cli commit confirmed, rollback in 10mins
 #   2014-10-30 14:49:15 CDT by onenet via cli
 #   2014-10-28 15:08:29 CDT by onenet via cli
 #   2014-10-28 13:05:39 CDT by onenet via cli
-#   2014-08-15 09:05:30 CDT by onenet via cli commit confirmed, rollback in 4mins
 # grnoc-mon at ODOT-IDABEL-REGMAINT-SRX220> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  Routing Engine                 OK        
@@ -102,7 +102,7 @@
 # grnoc-mon at ODOT-IDABEL-REGMAINT-SRX220> show system uptime 
 # System booted: 2016-04-28 19:18 CDT 
 # Protocols started: 2016-04-28 19:20 CDT 
-# Last configured: 2016-04-29 12:56 CDT  by admin
+# Last configured: 2016-12-27 19:17 CST  by andrew
 # 
 # grnoc-mon at ODOT-IDABEL-REGMAINT-SRX220> show interface terse 
 #Interface Admin Link
@@ -158,7 +158,7 @@
 #vlan.500 up down
 #vlan.501 up down
 # grnoc-mon at ODOT-IDABEL-REGMAINT-SRX220> show configuration 
-## Last commit: 2016-04-29 12:56:55 CDT by admin
+## Last commit: 2016-12-27 19:17:43 CST by andrew
 version 12.1X46-D20.5;
 system {
     host-name ODOT-IDABEL-REGMAINT-SRX220;
@@ -591,6 +591,15 @@
                         }
                     }
                 }
+                vlan.3 {
+                    host-inbound-traffic {
+                        system-services {
+                            ping;
+                            traceroute;
+                            dhcp;
+                        }
+                    }
+                }
             }
         }
         security-zone DATACOMM-MGMT {
@@ -634,16 +643,6 @@
                         }
                     }
                 }
-                vlan.3 {
-                    host-inbound-traffic {
-                        system-services {
-                            ping;
-                            traceroute;
-                            snmp;
-                            dhcp;
-                        }
-                    }
-                }
             }
         }
     }
@@ -699,33 +698,6 @@
 routing-instances {
     AGENCY-DATA {
         instance-type virtual-router;
-        interface t1-1/0/0.17;
-        interface vlan.501;
-        protocols {
-            bgp {
-                group EBGP-AGENCY-DATA-ONENET {
-                    type external;
-                    family inet {
-                        unicast;
-                    }
-                    neighbor 10.119.88.66 {
-                        import IMPORT-DEFAULT;
-#                        authentication-#key <removed>;
-                        export EXPORT-ROUTES;
-                        peer-as 5078;
-                    }
-                }
-            }
-            ospf {
-                export EXPORT-DEFAULT;
-                area 10.119.24.202 {
-                    interface vlan.501;
-                }
-            }
-        }
-    }
-    ODOT {
-        instance-type virtual-router;
         system {
             services {
                 dhcp-local-server {
@@ -758,8 +730,35 @@
                 }
             }
         }
-        interface t1-1/0/0.30;
+        interface t1-1/0/0.17;
         interface vlan.3;
+        interface vlan.501;
+        protocols {
+            bgp {
+                group EBGP-AGENCY-DATA-ONENET {
+                    type external;
+                    family inet {
+                        unicast;
+                    }
+                    neighbor 10.119.88.66 {
+                        import IMPORT-DEFAULT;
+#                        authentication-#key <removed>;
+                        export EXPORT-ROUTES;
+                        peer-as 5078;
+                    }
+                }
+            }
+            ospf {
+                export EXPORT-DEFAULT;
+                area 10.119.24.202 {
+                    interface vlan.501;
+                }
+            }
+        }
+    }
+    ODOT {
+        instance-type virtual-router;
+        interface t1-1/0/0.30;
         routing-options {
             static {
                 route 0.0.0.0/0 next-hop 10.119.8.129;
Index: configs/odot-bartlesville-regmaint.client.onenet.net
===================================================================
--- configs/odot-bartlesville-regmaint.client.onenet.net	(revision 149150)
+++ configs/odot-bartlesville-regmaint.client.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at ODOT-BARTLESVILLE-REGMAINT-SRX220> show system commit 
+#   2016-12-27 19:26:22 CST by andrew via cli
 #   2016-04-29 13:05:35 CDT by admin via cli
 #   2016-04-28 19:27:15 CDT by admin via cli commit confirmed, rollback in 10mins
 #   2014-10-30 14:53:55 CDT by onenet via cli
 #   2014-10-28 15:12:16 CDT by onenet via cli
 #   2014-10-28 13:12:49 CDT by onenet via cli
-#   2014-08-13 11:38:39 CDT by onenet via cli
 # grnoc-mon at ODOT-BARTLESVILLE-REGMAINT-SRX220> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  Routing Engine                 OK        
@@ -104,7 +104,7 @@
 # grnoc-mon at ODOT-BARTLESVILLE-REGMAINT-SRX220> show system uptime 
 # System booted: 2015-12-02 08:00 CST 
 # Protocols started: 2015-12-02 08:03 CST 
-# Last configured: 2016-04-29 13:05 CDT  by admin
+# Last configured: 2016-12-27 19:26 CST  by andrew
 # 
 # grnoc-mon at ODOT-BARTLESVILLE-REGMAINT-SRX220> show interface terse 
 #Interface Admin Link
@@ -160,7 +160,7 @@
 #vlan.500 up up
 #vlan.501 up up
 # grnoc-mon at ODOT-BARTLESVILLE-REGMAINT-SRX220> show configuration 
-## Last commit: 2016-04-29 13:05:35 CDT by admin
+## Last commit: 2016-12-27 19:26:22 CST by andrew
 version 12.1X46-D20.5;
 system {
     host-name ODOT-BARTLESVILLE-REGMAINT-SRX220;
@@ -593,6 +593,15 @@
                         }
                     }
                 }
+                vlan.3 {
+                    host-inbound-traffic {
+                        system-services {
+                            ping;
+                            traceroute;
+                            dhcp;
+                        }
+                    }
+                }
             }
         }
         security-zone DATACOMM-MGMT {
@@ -636,16 +645,6 @@
                         }
                     }
                 }
-                vlan.3 {
-                    host-inbound-traffic {
-                        system-services {
-                            ping;
-                            traceroute;
-                            snmp;
-                            dhcp;
-                        }
-                    }
-                }
             }
         }
     }
@@ -701,33 +700,6 @@
 routing-instances {
     AGENCY-DATA {
         instance-type virtual-router;
-        interface t1-1/0/0.17;
-        interface vlan.501;
-        protocols {
-            bgp {
-                group EBGP-AGENCY-DATA-ONENET {
-                    type external;
-                    family inet {
-                        unicast;
-                    }
-                    neighbor 10.119.88.8 {
-                        import IMPORT-DEFAULT;
-#                        authentication-#key <removed>;
-                        export EXPORT-ROUTES;
-                        peer-as 5078;
-                    }
-                }
-            }
-            ospf {
-                export EXPORT-DEFAULT;
-                area 10.119.25.0 {
-                    interface vlan.501;
-                }
-            }
-        }
-    }
-    ODOT {
-        instance-type virtual-router;
         system {
             services {
                 dhcp-local-server {
@@ -760,8 +732,35 @@
                 }
             }
         }
-        interface t1-1/0/0.30;
+        interface t1-1/0/0.17;
         interface vlan.3;
+        interface vlan.501;
+        protocols {
+            bgp {
+                group EBGP-AGENCY-DATA-ONENET {
+                    type external;
+                    family inet {
+                        unicast;
+                    }
+                    neighbor 10.119.88.8 {
+                        import IMPORT-DEFAULT;
+#                        authentication-#key <removed>;
+                        export EXPORT-ROUTES;
+                        peer-as 5078;
+                    }
+                }
+            }
+            ospf {
+                export EXPORT-DEFAULT;
+                area 10.119.25.0 {
+                    interface vlan.501;
+                }
+            }
+        }
+    }
+    ODOT {
+        instance-type virtual-router;
+        interface t1-1/0/0.30;
         routing-options {
             static {
                 route 0.0.0.0/0 next-hop 10.119.8.205;



More information about the Nocrancid mailing list