[Nocrancid] autopop-onenet.net router config diffs

rancid at rancid.noc.onenet.net rancid at rancid.noc.onenet.net
Sat Apr 11 18:02:32 CDT 2015


Index: configs/core.woo.onenet.net
===================================================================
--- configs/core.woo.onenet.net	(revision 125838)
+++ configs/core.woo.onenet.net	(working copy)
@@ -335,7 +335,6 @@
 #lo0.16385 up up
 #lsi up up
 #lsi.1050133 up up
-#lsi.1050257 up up
 #lsi.1050601 up up
 #lsi.1051784 up up
 #lsi.1053227 up up
@@ -344,7 +343,6 @@
 #lsi.1054337 up up
 #lsi.1054530 up up
 #lsi.1054754 up up
-#lsi.1054893 up up
 #lsi.1055129 up up
 #lsi.1055328 up up
 #lsi.1055375 up up
@@ -355,7 +353,8 @@
 #lsi.1055753 up up
 #lsi.1055790 up up
 #lsi.1055799 up up
-#lsi.1055800 up up
+#lsi.1055807 up up
+#lsi.1055810 up up
 #mtun up up
 #pimd up up
 #pime up up
Index: configs/core.end.onenet.net
===================================================================
--- configs/core.end.onenet.net	(revision 125838)
+++ configs/core.end.onenet.net	(working copy)
@@ -362,7 +362,6 @@
 #lsi.517 up up
 #lsi.518 up up
 #lsi.1048890 up up
-#lsi.1048892 up up
 #lsi.1048893 up up
 #lsi.1048894 up up
 #lsi.1049002 up up
@@ -379,8 +378,6 @@
 #lsi.1052650 up up
 #lsi.1052712 up up
 #lsi.1052713 up up
-#lsi.1053222 up up
-#lsi.1053223 up up
 #lsi.1053439 up up
 #lsi.1053491 up up
 #lsi.1053637 up up
@@ -402,7 +399,9 @@
 #lsi.1054163 up up
 #lsi.1054172 up up
 #lsi.1054173 up up
-#lsi.1054174 up up
+#lsi.1054181 up up
+#lsi.1054182 up up
+#lsi.1054185 up up
 #mtun up up
 #pimd up up
 #pime up up
Index: configs/core1.okc-mx960.onenet.net
===================================================================
--- configs/core1.okc-mx960.onenet.net	(revision 125838)
+++ configs/core1.okc-mx960.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at OKC-CORE1-MX960-RE0> show system commit 
+#   2015-04-11 17:12:31 CDT by andrew via cli commit confirmed, rollback in 3mins synchronize
 #   2015-03-27 14:08:43 CDT by rnordmark via cli commit synchronize
 #   2015-03-26 15:34:03 CDT by jeremyt via cli commit synchronize
 #   2015-03-26 15:28:51 CDT by jeremyt via cli commit synchronize
 #   2015-03-26 09:04:04 CDT by andrew via cli commit synchronize
 #   2015-03-25 11:35:47 CDT by andrew via cli commit synchronize
-#   2015-03-25 08:19:39 CDT by andrew via cli commit confirmed, rollback in 3mins synchronize
 # grnoc-mon at OKC-CORE1-MX960-RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -479,7 +479,7 @@
 # grnoc-mon at OKC-CORE1-MX960-RE0> show system uptime 
 # System booted: 2014-09-14 04:23 CDT 
 # Protocols started: 2014-09-14 04:24 CDT 
-# Last configured: 2015-03-27 14:08 CDT  by rnordmark
+# Last configured: 2015-04-11 17:12 CDT  by andrew
 # 
 # {master}
 # grnoc-mon at OKC-CORE1-MX960-RE0> show interface terse 
@@ -559,22 +559,7 @@
 #xe-1/2/1 up up
 #xe-1/2/1.152 up up
 #xe-1/2/1.32767 up up
-#xe-1/3/0 up up
-#xe-1/3/0.1102 up up
-#xe-1/3/0.1105 up up
-#xe-1/3/0.1106 up up
-#xe-1/3/0.1108 up up
-#xe-1/3/0.1110 up up
-#xe-1/3/0.1112 up up
-#xe-1/3/0.1114 up up
-#xe-1/3/0.1120 up up
-#xe-1/3/0.5160 up up
-#xe-1/3/0.5161 up up
-#xe-1/3/0.5162 up up
-#xe-1/3/0.5163 up up
-#xe-1/3/0.5164 up up
-#xe-1/3/0.5165 up up
-#xe-1/3/0.32767 up up
+#xe-1/3/0 up down
 #xe-1/3/1 up down
 #lc-2/0/0 up up
 #lc-2/0/0.32769 up up
@@ -625,7 +610,6 @@
 #ge-2/3/6 up down
 #ge-2/3/7 up down
 #ge-2/3/8 up up
-#ge-2/3/8.2538 up up
 #ge-2/3/8.32767 up up
 #ge-2/3/9 up up
 #ge-2/3/9.0 up up
@@ -720,13 +704,6 @@
 #lo0.16385 up up
 #lsi up up
 #lsi.0 up up
-#lsi.1 up up
-#lsi.4 up up
-#lsi.5 up up
-#lsi.7 up up
-#lsi.8 up up
-#lsi.9 up up
-#lsi.10 up up
 #lsi.1059876 up up
 #lsi.1059891 up up
 #lsi.1059942 up up
@@ -742,7 +719,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at OKC-CORE1-MX960-RE0> show configuration 
-## Last commit: 2015-03-27 14:08:43 CDT by rnordmark
+## Last commit: 2015-04-11 17:12:31 CDT by andrew
 version 12.3R7.7;
 groups {
     re0 {
@@ -1283,135 +1260,6 @@
             family mpls;
         }
     }
-    xe-1/3/0 {
-        description "OMES EX8200 Layer 2 CIR0005038";
-        vlan-tagging;
-        mtu 9192;
-        encapsulation flexible-ethernet-services;
-        unit 1102 {
-            description "TAGNET to OMES CIR0005929";
-            vlan-id 1103;
-            family inet {
-                mtu 9000;
-                address 10.119.0.5/30;
-            }
-        }
-        unit 1105 {
-            description "ODOT-L3VPN-to-OMES | CIR0005930";
-            vlan-id 1105;
-            family inet {
-                mtu 9000;
-                sampling {
-                    input;
-                    output;
-                }
-                address 172.25.255.254/31;
-            }
-        }
-        unit 1106 {
-            description "DPS-L3VPN-to-OMES | CIR0005942";
-            vlan-id 1106;
-            family inet {
-                mtu 9000;
-                sampling {
-                    input;
-                }
-                address 10.119.16.1/30;
-            }
-        }
-        unit 1108 {
-            description AGENCY-DATA-L3VPN-TO-OMES-CIR00XXXX;
-            vlan-id 1108;
-            family inet {
-                mtu 9000;
-                sampling {
-                    input;
-                }
-                address 10.119.24.0/31;
-            }
-        }
-        unit 1110 {
-            description VOIP-L3VPN-TO-OMES-CIR00XXXX;
-            vlan-id 1110;
-            family inet {
-                mtu 9000;
-                sampling {
-                    input;
-                }
-                address 10.119.32.0/31;
-            }
-        }
-        unit 1112 {
-            description MGMT-L3VPN-TO-OMES-CIR00XXXX;
-            vlan-id 1112;
-            family inet {
-                mtu 9000;
-                sampling {
-                    input;
-                }
-                address 10.119.40.0/31;
-            }
-        }
-        unit 1114 {
-            description PUBNET-L3VPN-TO-OMES-CIR000XXXX;
-            vlan-id 1114;
-            family inet {
-                mtu 9000;
-                sampling {
-                    input;
-                }
-                address 204.62.17.29/31;
-            }
-        }
-        unit 1120 {
-            description CAREER-TECH-TO-OMES-CIR000XXXX;
-            vlan-id 1120;
-            family inet {
-                mtu 9000;
-                sampling {
-                    input;
-                }
-                address 164.58.79.65/26;
-                address 164.58.79.193/26;
-            }
-        }
-        unit 5160 {
-            description "VPLS-OMES-2516-CIR0005946 [NO-MONITOR]";
-            encapsulation vlan-vpls;
-            vlan-id-range 2-831;
-            family vpls;
-        }
-        unit 5161 {
-            description "VPLS-OMES-2516-CIR0005946 [NO-MONITOR]";
-            encapsulation vlan-vpls;
-            vlan-id-range 833-953;
-            family vpls;
-        }
-        unit 5162 {
-            description "VPLS-OMES-2516-CIR0005946 [NO-MONITOR]";
-            encapsulation vlan-vpls;
-            vlan-id-range 955-957;
-            family vpls;
-        }
-        unit 5163 {
-            description "VPLS-OMES-2516-CIR0005946 [NO-MONITOR]";
-            encapsulation vlan-vpls;
-            vlan-id-range 960-967;
-            family vpls;
-        }
-        unit 5164 {
-            description "VPLS-OMES-2516-CIR0005946 [NO-MONITOR]";
-            encapsulation vlan-vpls;
-            vlan-id-range 970-1099;
-            family vpls;
-        }
-        unit 5165 {
-            description "VPLS-OMES-2516-CIR0005946 [NO-MONITOR]";
-            encapsulation vlan-vpls;
-            vlan-id-range 1150-4000;
-            family vpls;
-        }
-    }
     xe-2/0/0 {
         description "CORE 10GE to core.okccc xe-1/1/1 | OneNet-OKC-OKCCC-XE-4994";
         vlan-tagging;
@@ -1536,12 +1384,6 @@
         flexible-vlan-tagging;
         mtu 9014;
         encapsulation flexible-ethernet-services;
-        unit 2538 {
-            vlan-id 2538;
-            family inet {
-                address 10.119.8.1/30;
-            }
-        }
     }
     ge-2/3/9 {
         description "OneNet State VPN Headend Untrust [NO-MONITOR] | CIR000XXXX";
@@ -1957,7 +1799,6 @@
             discard;
             no-readvertise;
         }
-        route 164.58.79.128/26 next-hop 164.58.79.68;
     }
     aggregate {
         route 164.58.0.0/16 {
@@ -2607,7 +2448,6 @@
         interface xe-1/0/1;
         interface xe-1/2/0;
         interface xe-1/2/1;
-        interface xe-1/3/0;
         interface xe-2/0/0;
         interface xe-2/0/1;
         interface xe-2/1/0;
@@ -13049,230 +12889,11 @@
             then reject;
         }
     }
-    policy-statement DPS-VRF-EXPORT {
-        term 1 {
-            from protocol static;
-            then {
-                community add DPS-VPN;
-                accept;
-            }
-        }
-        term 2 {
-            from protocol direct;
-            then {
-                community add DPS-VPN;
-                accept;
-            }
-        }
-        term 3 {
-            from protocol ospf;
-            then {
-                community add DPS-VPN;
-                accept;
-            }
-        }
-        term 4 {
-            from protocol bgp;
-            then {
-                community add DPS-VPN;
-                accept;
-            }
-        }
-    }
-    policy-statement DPS-VRF-IMPORT {
-        term 1 {
-            from {
-                protocol bgp;
-                community DPS-VPN;
-            }
-            then accept;
-        }
-        term 2 {
-            then reject;
-        }
-    }
     policy-statement EBGP-GOOGLE-IMPORT {
         term REJECT-ALL-ELSE {
             then reject;
         }
     }
-    policy-statement EBGP-OMES-AGENCY-DATA-EXPORT {
-        term reject-default {
-            from {
-                route-filter 0.0.0.0/0 exact;
-            }
-            then reject;
-        }
-        term accept-all {
-            then {
-                metric 100;
-                accept;
-            }
-        }
-        term reject-all {
-            then reject;
-        }
-    }
-    policy-statement EBGP-OMES-AGENCY-DATA-IMPORT {
-        term accept-default {
-            from {
-                route-filter 0.0.0.0/0 exact;
-            }
-            then {
-                metric 100;
-                accept;
-            }
-        }
-        term reject-all {
-            then reject;
-        }
-    }
-    policy-statement EBGP-OMES-DPS-EXPORT {
-        term reject-default {
-            from {
-                route-filter 0.0.0.0/0 exact;
-            }
-            then reject;
-        }
-        term accept-all {
-            then {
-                metric 100;
-                accept;
-            }
-        }
-        term reject-all {
-            then reject;
-        }
-    }
-    policy-statement EBGP-OMES-DPS-IMPORT {
-        term accept-default {
-            from {
-                route-filter 0.0.0.0/0 exact;
-            }
-            then {
-                metric 100;
-                accept;
-            }
-        }
-        term reject-all {
-            then reject;
-        }
-    }
-    policy-statement EBGP-OMES-MGMT-EXPORT {
-        term reject-default {
-            from {
-                route-filter 0.0.0.0/0 exact;
-            }
-            then reject;
-        }
-        term accept-all {
-            then {
-                metric 100;
-                accept;
-            }
-        }
-        term reject-all {
-            then reject;
-        }
-    }
-    policy-statement EBGP-OMES-MGMT-IMPORT {
-        term accept-default {
-            from {
-                route-filter 0.0.0.0/0 exact;
-            }
-            then {
-                metric 100;
-                accept;
-            }
-        }
-        term reject-all {
-            then reject;
-        }
-    }
-    policy-statement EBGP-OMES-ODOT-EXPORT {
-        term reject-default {
-            from {
-                route-filter 0.0.0.0/0 exact;
-            }
-            then reject;
-        }
-        term accept-all {
-            then accept;
-        }
-        term reject-all {
-            then reject;
-        }
-    }
-    policy-statement EBGP-OMES-ODOT-IMPORT {
-        term step-1 {
-            from {
-                route-filter 0.0.0.0/0 exact;
-            }
-            then accept;
-        }
-        term reject-all {
-            then reject;
-        }
-    }
-    policy-statement EBGP-OMES-PUBNET-EXPORT {
-        term reject-default {
-            from {
-                route-filter 0.0.0.0/0 exact;
-            }
-            then reject;
-        }
-        term accept-all {
-            then {
-                metric 100;
-                accept;
-            }
-        }
-        term reject-all {
-            then reject;
-        }
-    }
-    policy-statement EBGP-OMES-PUBNET-IMPORT {
-        term accept-default {
-            from {
-                route-filter 0.0.0.0/0 exact;
-            }
-            then accept;
-        }
-        term reject-all {
-            then reject;
-        }
-    }
-    policy-statement EBGP-OMES-VOIP-EXPORT {
-        term reject-default {
-            from {
-                route-filter 0.0.0.0/0 exact;
-            }
-            then reject;
-        }
-        term accept-all {
-            then {
-                metric 100;
-                accept;
-            }
-        }
-        term reject-all {
-            then reject;
-        }
-    }
-    policy-statement EBGP-OMES-VOIP-IMPORT {
-        term accept-default {
-            from {
-                route-filter 0.0.0.0/0 exact;
-            }
-            then {
-                metric 100;
-                accept;
-            }
-        }
-        term reject-all {
-            then reject;
-        }
-    }
     policy-statement EBGP-QWEST-EXPORT {
         term STEP-1 {
             from policy COMMODITY-PREFIXES-LIST;
@@ -13320,216 +12941,6 @@
             }
         }
     }
-    policy-statement ODOT-VRF-EXPORT {
-        term 1 {
-            from protocol static;
-            then {
-                community add ODOT-VPN;
-                accept;
-            }
-        }
-        term 2 {
-            from protocol direct;
-            then {
-                community add ODOT-VPN;
-                accept;
-            }
-        }
-        term 3 {
-            from protocol ospf;
-            then {
-                community add ODOT-VPN;
-                accept;
-            }
-        }
-        term 4 {
-            from protocol bgp;
-            then {
-                community add ODOT-VPN;
-                accept;
-            }
-        }
-    }
-    policy-statement ODOT-VRF-IMPORT {
-        term 1 {
-            from {
-                protocol bgp;
-                community ODOT-VPN;
-            }
-            then accept;
-        }
-        term reject {
-            then reject;
-        }
-    }
-    policy-statement OMES-AGENCY-DATA-VRF-EXPORT {
-        term 1 {
-            from protocol static;
-            then {
-                community add OMES-AGENCY-DATA-VPN;
-                accept;
-            }
-        }
-        term 2 {
-            from protocol direct;
-            then {
-                community add OMES-AGENCY-DATA-VPN;
-                accept;
-            }
-        }
-        term 3 {
-            from protocol ospf;
-            then {
-                community add OMES-AGENCY-DATA-VPN;
-                accept;
-            }
-        }
-        term 4 {
-            from protocol bgp;
-            then {
-                community add OMES-AGENCY-DATA-VPN;
-                accept;
-            }
-        }
-    }
-    policy-statement OMES-AGENCY-DATA-VRF-IMPORT {
-        term 1 {
-            from {
-                protocol bgp;
-                community OMES-AGENCY-DATA-VPN;
-            }
-            then accept;
-        }
-        term 2 {
-            then reject;
-        }
-    }
-    policy-statement OMES-MGMT-VRF-EXPORT {
-        term 1 {
-            from protocol static;
-            then {
-                community add OMES-MGMT-VPN;
-                accept;
-            }
-        }
-        term 2 {
-            from protocol direct;
-            then {
-                community add OMES-MGMT-VPN;
-                accept;
-            }
-        }
-        term 3 {
-            from protocol ospf;
-            then {
-                community add OMES-MGMT-VPN;
-                accept;
-            }
-        }
-        term 4 {
-            from protocol bgp;
-            then {
-                community add OMES-MGMT-VPN;
-                accept;
-            }
-        }
-    }
-    policy-statement OMES-MGMT-VRF-IMPORT {
-        term 1 {
-            from {
-                protocol bgp;
-                community OMES-MGMT-VPN;
-            }
-            then accept;
-        }
-        term 2 {
-            then reject;
-        }
-    }
-    policy-statement OMES-PUBNET-VRF-EXPORT {
-        term 1 {
-            from protocol static;
-            then {
-                community add OMES-PUBNET-VPN;
-                accept;
-            }
-        }
-        term 2 {
-            from protocol direct;
-            then {
-                community add OMES-PUBNET-VPN;
-                accept;
-            }
-        }
-        term 3 {
-            from protocol ospf;
-            then {
-                community add OMES-PUBNET-VPN;
-                accept;
-            }
-        }
-        term 4 {
-            from protocol bgp;
-            then {
-                community add OMES-PUBNET-VPN;
-                accept;
-            }
-        }
-    }
-    policy-statement OMES-PUBNET-VRF-IMPORT {
-        term 1 {
-            from {
-                protocol bgp;
-                community OMES-PUBNET-VPN;
-            }
-            then accept;
-        }
-        term 2 {
-            then reject;
-        }
-    }
-    policy-statement OMES-VOIP-VRF-EXPORT {
-        term 1 {
-            from protocol static;
-            then {
-                community add OMES-VOIP-VPN;
-                accept;
-            }
-        }
-        term 2 {
-            from protocol direct;
-            then {
-                community add OMES-VOIP-VPN;
-                accept;
-            }
-        }
-        term 3 {
-            from protocol ospf;
-            then {
-                community add OMES-VOIP-VPN;
-                accept;
-            }
-        }
-        term 4 {
-            from protocol bgp;
-            then {
-                community add OMES-VOIP-VPN;
-                accept;
-            }
-        }
-    }
-    policy-statement OMES-VOIP-VRF-IMPORT {
-        term 1 {
-            from {
-                protocol bgp;
-                community OMES-VOIP-VPN;
-            }
-            then accept;
-        }
-        term 2 {
-            then reject;
-        }
-    }
     policy-statement REDISTRIBUTE-DIRECTS {
         term 1 {
             from protocol direct;
@@ -13561,53 +12972,8 @@
             }
         }
     }
-    policy-statement TAGNET-VRF-EXPORT {
-        term 1 {
-            from protocol static;
-            then {
-                community add TAGNET-VPN;
-                accept;
-            }
-        }
-        term 2 {
-            from protocol direct;
-            then {
-                community add TAGNET-VPN;
-                accept;
-            }
-        }
-        term 3 {
-            from {
-                protocol ospf;
-                area 0.0.0.0;
-            }
-            then {
-                community add TAGNET-VPN;
-                accept;
-            }
-        }
-    }
-    policy-statement TAGNET-VRF-IMPORT {
-        term 1 {
-            from {
-                protocol bgp;
-                community TAGNET-VPN;
-            }
-            then accept;
-        }
-        term reject {
-            then reject;
-        }
-    }
-    community DPS-VPN members target:5078:2540;
-    community ODOT-VPN members target:5078:2538;
     community OKCCORE1 members 5078:211;
-    community OMES-AGENCY-DATA-VPN members target:5078:2548;
-    community OMES-MGMT-VPN members target:5078:2550;
-    community OMES-PUBNET-VPN members target:5078:2552;
-    community OMES-VOIP-VPN members target:5078:2549;
     community ONENET_AGGREGATE members 5078:9601;
-    community TAGNET-VPN members target:5078:2531;
 }
 class-of-service {
     classifiers {
@@ -14131,250 +13497,6 @@
     }
 }
 routing-instances {
-    DPS-L3VPN {
-        description DPS-L3VPN;
-        instance-type vrf;
-        interface xe-1/3/0.1106;
-        route-distinguisher 164.58.199.211:2540;
-        vrf-import DPS-VRF-IMPORT;
-        vrf-export DPS-VRF-EXPORT;
-        vrf-target target:5078:2540;
-        vrf-table-label;
-        routing-options {
-            autonomous-system 64569;
-        }
-        protocols {
-            bgp {
-                group EBGP-OMES-DPS {
-                    type external;
-                    family inet {
-                        unicast;
-                    }
-                    neighbor 10.119.16.2 {
-                        description "EBGP-OMES-DPS-CIR000XXXX [NO-MONITOR]";
-                        import EBGP-OMES-DPS-IMPORT;
-#                        authentication-key <removed>;
-                        export EBGP-OMES-DPS-EXPORT;
-                        peer-as 40628;
-                    }
-                }
-            }
-        }
-    }
-    ODOT-L3VPN {
-        description ODOT-L3VPN;
-        instance-type vrf;
-        interface xe-1/3/0.1105;
-        interface ge-2/3/8.2538;
-        route-distinguisher 164.58.199.211:2538;
-        vrf-import ODOT-VRF-IMPORT;
-        vrf-export ODOT-VRF-EXPORT;
-        vrf-target target:5078:2538;
-        vrf-table-label;
-        routing-options {
-            autonomous-system 64569;
-        }
-        protocols {
-            bgp {
-                group EBGP-OMES-ODOT {
-                    type external;
-                    family inet {
-                        unicast;
-                    }
-                    neighbor 172.25.255.255 {
-                        description "EBGP-OMES-ODOT-CIR000XXXX [NO-MONITOR]";
-                        import EBGP-OMES-ODOT-IMPORT;
-#                        authentication-key <removed>;
-                        export EBGP-OMES-ODOT-EXPORT;
-                        peer-as 40628;
-                    }
-                }
-                group EBGP-ODOT-VPN {
-                    type external;
-                    family inet {
-                        unicast;
-                    }
-                    neighbor 10.119.8.2 {
-                        import EBGP-OMES-ODOT-EXPORT;
-#                        authentication-key <removed>;
-                        export EBGP-OMES-ODOT-IMPORT;
-                        peer-as 64570;
-                    }
-                }
-            }
-        }
-    }
-    OMES-AGENCY-DATA-L3VPN {
-        description OMES-AGENCY-DATA-L3VPN;
-        instance-type vrf;
-        interface xe-1/3/0.1108;
-        route-distinguisher 164.58.199.211: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 {
-            autonomous-system 64569;
-        }
-        protocols {
-            bgp {
-                group EBGP-OMES-AGENCY-DATA {
-                    type external;
-                    family inet {
-                        unicast;
-                    }
-                    neighbor 10.119.24.1 {
-                        description "EBGP-OMES-AGENCY-DATA-CIR000XXXX [NO-MONITOR]";
-                        import EBGP-OMES-AGENCY-DATA-IMPORT;
-#                        authentication-key <removed>;
-                        export EBGP-OMES-AGENCY-DATA-EXPORT;
-                        peer-as 40628;
-                    }
-                }
-            }
-        }
-    }
-    OMES-MGMT-L3VPN {
-        description OMES-MGMT-L3VPN;
-        instance-type vrf;
-        interface xe-1/3/0.1112;
-        route-distinguisher 164.58.199.211:2550;
-        vrf-import OMES-MGMT-VRF-IMPORT;
-        vrf-export OMES-MGMT-VRF-EXPORT;
-        vrf-target target:5078:2550;
-        vrf-table-label;
-        routing-options {
-            autonomous-system 64569;
-        }
-        protocols {
-            bgp {
-                group EBGP-OMES-MGMT {
-                    type external;
-                    family inet {
-                        unicast;
-                    }
-                    neighbor 10.119.40.1 {
-                        description "EBGP-OMES-MGMT-CIR000XXXX [NO-MONITOR]";
-                        import EBGP-OMES-MGMT-IMPORT;
-#                        authentication-key <removed>;
-                        export EBGP-OMES-MGMT-EXPORT;
-                        peer-as 40628;
-                    }
-                }
-            }
-        }
-    }
-    OMES-PUBNET-L3VPN {
-        description OMES-PUBNET-L3VPN;
-        instance-type vrf;
-        interface xe-1/3/0.1114;
-        route-distinguisher 164.58.199.211:2552;
-        vrf-import OMES-PUBNET-VRF-IMPORT;
-        vrf-export OMES-PUBNET-VRF-EXPORT;
-        vrf-target target:5078:2552;
-        vrf-table-label;
-        protocols {
-            bgp {
-                group EBGP-OMES-PUBNET {
-                    type external;
-                    import EBGP-OMES-PUBNET-IMPORT;
-                    family inet {
-                        unicast {
-                            loops 2;
-                        }
-                    }
-                    export EBGP-OMES-PUBNET-EXPORT;
-                    peer-as 65001;
-                    local-as 64569 no-prepend-global-as;
-                    neighbor 204.62.17.28 {
-                        description "EBGP-OMES-PUBNET-CIR000XXXX [NO-MONITOR]";
-#                        authentication-key <removed>;
-                    }
-                }
-            }
-        }
-    }
-    OMES-VOIP-L3VPN {
-        description OMES-VOIP-L3VPN;
-        instance-type vrf;
-        interface xe-1/3/0.1110;
-        route-distinguisher 164.58.199.211:2549;
-        vrf-import OMES-VOIP-VRF-IMPORT;
-        vrf-export OMES-VOIP-VRF-EXPORT;
-        vrf-target target:5078:2549;
-        vrf-table-label;
-        routing-options {
-            autonomous-system 64569;
-        }
-        protocols {
-            bgp {
-                group EBGP-OMES-VOIP {
-                    type external;
-                    family inet {
-                        unicast;
-                    }
-                    neighbor 10.119.32.1 {
-                        description "EBGP-OMES-VOIP-CIR000XXXX [NO-MONITOR]";
-                        import EBGP-OMES-VOIP-IMPORT;
-#                        authentication-key <removed>;
-                        export EBGP-OMES-VOIP-EXPORT;
-                        peer-as 40628;
-                    }
-                }
-            }
-        }
-    }
-    TAGNET-L3VPN {
-        description TAGNET-L3VPN;
-        instance-type vrf;
-        interface xe-1/3/0.1102;
-        route-distinguisher 164.58.199.211:2531;
-        vrf-import TAGNET-VRF-IMPORT;
-        vrf-export TAGNET-VRF-EXPORT;
-        vrf-target target:5078:2531;
-        vrf-table-label;
-        routing-options {
-            static {
-                route 10.119.0.2/32 next-hop 10.119.0.2;
-            }
-        }
-    }
-    VPLS-OMES-2516 {
-        description VPLS-OMES;
-        instance-type vpls;
-        vlan-id all;
-        interface xe-1/3/0.5160;
-        interface xe-1/3/0.5161;
-        interface xe-1/3/0.5162;
-        interface xe-1/3/0.5163;
-        interface xe-1/3/0.5164;
-        interface xe-1/3/0.5165;
-        route-distinguisher 164.58.199.211:2516;
-        vrf-target target:5078:2516;
-        protocols {
-            vpls {
-                mac-table-size {
-                    10000;
-                    packet-action drop;
-                }
-                interface-mac-limit {
-                    3000;
-                }
-                no-tunnel-services;
-                site OKC1 {
-                    site-identifier 2;
-                    multi-homing;
-                    site-preference backup;
-                    interface xe-1/3/0.5160;
-                    interface xe-1/3/0.5161;
-                    interface xe-1/3/0.5162;
-                    interface xe-1/3/0.5163;
-                    interface xe-1/3/0.5164;
-                    interface xe-1/3/0.5165;
-                }
-            }
-        }
-    }
     VPLS-ONENET-DC {
         description ONENET-SANS-VPLS-OKC-TULSA-LAWTON;
         instance-type vpls;
Index: configs/swi1.odot.ton-intmaint.onenet.net
===================================================================
--- configs/swi1.odot.ton-intmaint.onenet.net	(revision 125838)
+++ configs/swi1.odot.ton-intmaint.onenet.net	(working copy)
@@ -10,7 +10,7 @@
 # grnoc-mon at SWI1-ODOT-TONKAWA-INTMAINT-EX4200> show chassis environment 
 # Class Item                           Status     Measurement
 # Power FPC 0 Power Supply 0           OK        
-#       FPC 0 Power Supply 1           Failed    
+#       FPC 0 Power Supply 1           OK        
 # Temp  FPC 0 CPU                      OK        
 #       FPC 0 EX-PFE1                  OK        
 #       FPC 0 EX-PFE2                  OK        
Index: configs/core.law.onenet.net
===================================================================
--- configs/core.law.onenet.net	(revision 125838)
+++ configs/core.law.onenet.net	(working copy)
@@ -489,14 +489,12 @@
 #lsi.1065376 up up
 #lsi.1065379 up up
 #lsi.1065394 up up
-#lsi.1065693 up up
 #lsi.1065700 up up
 #lsi.1066829 up up
 #lsi.1066864 up up
 #lsi.1067118 up up
 #lsi.1068040 up up
 #lsi.1068452 up up
-#lsi.1068723 up up
 #lsi.1068920 up up
 #lsi.1068992 up up
 #lsi.1069028 up up
@@ -510,7 +508,8 @@
 #lsi.1069414 up up
 #lsi.1069451 up up
 #lsi.1069460 up up
-#lsi.1069461 up up
+#lsi.1069468 up up
+#lsi.1069471 up up
 #mtun up up
 #pimd up up
 #pime up up
Index: configs/core5.okc.onenet.net
===================================================================
--- configs/core5.okc.onenet.net	(revision 125838)
+++ 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 
-#   2015-04-11 16:52:21 CDT by andrew via cli commit confirmed, rollback in 3mins synchronize
-#   2015-04-08 14:26:49 CDT by andrew via cli commit synchronize
-#   2015-04-01 17:18:27 CDT by joel via cli commit synchronize
-#   2015-03-31 15:31:11 CDT by joel via cli commit synchronize
-#   2015-03-31 15:24:58 CDT by sean via cli commit synchronize
-#   2015-03-30 20:49:28 CDT by andrew via cli commit synchronize
+#   2015-04-11 17:53:15 CDT by andrew via cli commit confirmed, rollback in 3mins synchronize
+#   2015-04-11 17:45:49 CDT by jeremyt via cli commit synchronize
+#   2015-04-11 17:41:16 CDT by andrew via cli commit confirmed, rollback in 3mins synchronize
+#   2015-04-11 17:38:58 CDT by andrew via cli commit synchronize
+#   2015-04-11 17:36:50 CDT by andrew via cli commit confirmed, rollback in 3mins synchronize
+#   2015-04-11 17:17:09 CDT by andrew via cli commit synchronize
 # grnoc-mon at OKC-CORE5-MX480-RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -212,6 +212,7 @@
 #   MIC 0          REV 29   750-028387   ABCG8381          3D 4x 10GE  XFP
 #     PIC 0                 BUILTIN      BUILTIN           2x 10GE  XFP
 #       Xcvr 0     "s       NON-JNPR     ECL11490345       XFP-10G-LR
+#       Xcvr 1     REV 01   740-031833   21T670101020      XFP-10G-LR
 #     PIC 1                 BUILTIN      BUILTIN           2x 10GE  XFP
 #   MIC 1          REV 27   750-028392   ABCH4581          3D 20x 1GE(LAN) SFP
 #     PIC 2                 BUILTIN      BUILTIN           10x 1GE(LAN) SFP
@@ -428,7 +429,7 @@
 # grnoc-mon at OKC-CORE5-MX480-RE0> show system uptime 
 # System booted: 2014-09-16 23:50 CDT 
 # Protocols started: 2014-09-16 23:51 CDT 
-# Last configured: 2015-04-11 16:52 CDT  by andrew
+# Last configured: 2015-04-11 17:53 CDT  by andrew
 # 
 # {master}
 # grnoc-mon at OKC-CORE5-MX480-RE0> show interface terse 
@@ -576,22 +577,27 @@
 #xe-2/0/0 up up
 #xe-2/0/0.969 up up
 #xe-2/0/0.32767 up up
-#xe-2/0/1 up down
-#xe-2/0/1.1102 up down
-#xe-2/0/1.1105 up down
-#xe-2/0/1.1106 up down
-#xe-2/0/1.1108 up down
-#xe-2/0/1.1110 up down
-#xe-2/0/1.1112 up down
-#xe-2/0/1.1114 up down
-#xe-2/0/1.1120 up down
-#xe-2/0/1.5160 up down
-#xe-2/0/1.5161 up down
-#xe-2/0/1.5162 up down
-#xe-2/0/1.5163 up down
-#xe-2/0/1.5164 up down
-#xe-2/0/1.5165 up down
-#xe-2/0/1.32767 up down
+#xe-2/0/1 up up
+#xe-2/0/1.1100 up up
+#xe-2/0/1.1101 up up
+#xe-2/0/1.1102 up up
+#xe-2/0/1.1103 up up
+#xe-2/0/1.1104 up up
+#xe-2/0/1.1105 up up
+#xe-2/0/1.1106 up up
+#xe-2/0/1.1107 up up
+#xe-2/0/1.1108 up up
+#xe-2/0/1.1109 up up
+#xe-2/0/1.1110 up up
+#xe-2/0/1.1111 up up
+#xe-2/0/1.1112 up up
+#xe-2/0/1.1113 up up
+#xe-2/0/1.1114 up up
+#xe-2/0/1.1115 up up
+#xe-2/0/1.1120 up up
+#xe-2/0/1.5160 up up
+#xe-2/0/1.5165 up up
+#xe-2/0/1.32767 up up
 #xe-2/1/0 up down
 #xe-2/1/1 up down
 #ge-2/2/0 up down
@@ -607,7 +613,14 @@
 #ge-2/2/6 up down
 #ge-2/2/7 up down
 #ge-2/2/8 up up
+#ge-2/2/8.954 up up
+#ge-2/2/8.958 up up
+#ge-2/2/8.959 up up
+#ge-2/2/8.1120 up up
+#ge-2/2/8.32767 up up
 #ge-2/2/9 up up
+#ge-2/2/9.0 up up
+#ge-2/2/9.32767 up up
 #ge-2/3/0 up down
 #ge-2/3/1 up down
 #ge-2/3/2 up down
@@ -642,9 +655,14 @@
 #lsi.1 up up
 #lsi.2 up up
 #lsi.3 up up
+#lsi.4 up up
+#lsi.5 up up
+#lsi.6 up up
+#lsi.7 up up
+#lsi.8 up up
+#lsi.9 up up
 #lsi.1494019 up up
 #lsi.1494467 up up
-#lsi.1496442 up up
 #lsi.1496443 up up
 #lsi.1496444 up up
 #lsi.1496549 up up
@@ -664,8 +682,6 @@
 #lsi.1500524 up up
 #lsi.1500534 up up
 #lsi.1500535 up up
-#lsi.1500897 up up
-#lsi.1500898 up up
 #lsi.1501115 up up
 #lsi.1501167 up up
 #lsi.1501314 up up
@@ -687,7 +703,13 @@
 #lsi.1501847 up up
 #lsi.1501856 up up
 #lsi.1501857 up up
-#lsi.1501858 up up
+#lsi.1501873 up up
+#lsi.1501874 up up
+#lsi.1501875 up up
+#lsi.1501876 up up
+#lsi.1501878 up up
+#lsi.1501879 up up
+#lsi.1501882 up up
 #mtun up up
 #pimd up up
 #pime up up
@@ -695,7 +717,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at OKC-CORE5-MX480-RE0> show configuration 
-## Last commit: 2015-04-11 16:52:21 CDT by andrew
+## Last commit: 2015-04-11 17:53:15 CDT by andrew
 version 12.3R7.7;
 groups {
     re0 {
@@ -1601,14 +1623,46 @@
         }
     }
     xe-2/0/1 {
-        description "OMES MX104_DC_2 Layer 2 CIR0005038 [NO-MONITOR]";
+        description "OMES EX8200 Layer 2 CIR0005943";
         flexible-vlan-tagging;
         mtu 9192;
         encapsulation flexible-ethernet-services;
+        unit 1100 {
+            description "PS_NET Public Safety Network | CIR0005948";
+            vlan-id 1100;
+            family inet {
+                address 172.26.0.0/31;
+            }
+        }
+        unit 1101 {
+            description "IPerf VPLS to OMES | CIR0005941";
+            encapsulation vlan-vpls;
+            vlan-id 1101;
+        }
         unit 1102 {
             description "TAGNET to OMES CIR0005929 [NO-MONITOR]";
             vlan-id 1103;
         }
+        unit 1103 {
+            description "TAGNET to OMES CIR0005938";
+            vlan-id 1102;
+            family inet {
+                mtu 9000;
+                address 10.119.0.1/30;
+            }
+        }
+        unit 1104 {
+            description "ODOT-L3VPN-to-OMES | CIR0005939";
+            vlan-id 1104;
+            family inet {
+                mtu 9000;
+                sampling {
+                    input;
+                    output;
+                }
+                address 172.25.255.252/31;
+            }
+        }
         unit 1105 {
             description "ODOT-L3VPN-to-OMES | CIR0005930 [NO-MONITOR]";
             vlan-id 1105;
@@ -1617,51 +1671,149 @@
             description "DPS-L3VPN-to-OMES | CIR0005942 [NO-MONITOR]";
             vlan-id 1106;
         }
+        unit 1107 {
+            description "DPS-L3VPN-to-OMES | CIR005940";
+            vlan-id 1107;
+            family inet {
+                mtu 9000;
+                sampling {
+                    input;
+                }
+                address 10.119.16.5/30;
+            }
+        }
         unit 1108 {
             description "AGENCY-DATA-L3VPN-TO-OMES-CIR00XXXX [NO-MONITOR]";
             vlan-id 1108;
         }
+        unit 1109 {
+            description AGENCY-DATA-L3VPN-TO-OMES-CIR00XXXX;
+            vlan-id 1109;
+            family inet {
+                mtu 9000;
+                sampling {
+                    input;
+                }
+                address 10.119.24.2/31;
+            }
+        }
         unit 1110 {
             description "VOIP-L3VPN-TO-OMES-CIR00XXXX [NO-MONITOR]";
             vlan-id 1110;
         }
+        unit 1111 {
+            description VOIP-L3VPN-TO-OMES-CIR00XXXX;
+            vlan-id 1111;
+            family inet {
+                mtu 9000;
+                sampling {
+                    input;
+                }
+                address 10.119.32.2/31;
+            }
+        }
         unit 1112 {
             description "MGMT-L3VPN-TO-OMES-CIR00XXXX [NO-MONITOR]";
             vlan-id 1112;
         }
+        unit 1113 {
+            description MGMT-L3VPN-TO-OMES-CIR00XXXX;
+            vlan-id 1113;
+            family inet {
+                mtu 9000;
+                sampling {
+                    input;
+                }
+                address 10.119.40.2/31;
+            }
+        }
         unit 1114 {
             description "PUBNET-L3VPN-TO-OMES-CIR000XXXX [NO-MONITOR]";
             vlan-id 1114;
         }
+        unit 1115 {
+            description PUBNET-L3VPN-TO-OMES-CIR000XXXX;
+            vlan-id 1115;
+            family inet {
+                mtu 9000;
+                sampling {
+                    input;
+                }
+                address 204.62.17.31/31;
+            }
+        }
         unit 1120 {
             description "CAREER-TECH-TO-OMES-CIR000XXXX [NO-MONITOR]";
             vlan-id 1120;
         }
         unit 5160 {
-            description "VPLS-OMES-2516-CIR0005946 [NO-MONITOR]";
-            vlan-id 2;
+            description VPLS-OMES-2516-CIR0005947;
+            encapsulation vlan-vpls;
+            vlan-id-range 2-1099;
+            family vpls;
         }
-        unit 5161 {
-            description "VPLS-OMES-2516-CIR0005946 [NO-MONITOR]";
-            vlan-id 833;
+        unit 5165 {
+            description VPLS-OMES-2516-CIR0005947;
+            encapsulation vlan-vpls;
+            vlan-id-range 1150-4000;
+            family vpls;
         }
-        unit 5162 {
-            description "VPLS-OMES-2516-CIR0005946 [NO-MONITOR]";
-            vlan-id 955;
+    }
+    ge-2/2/8 {
+        flexible-vlan-tagging;
+        mtu 9192;
+        encapsulation flexible-ethernet-services;
+        unit 954 {
+            description "DOH L3VPN to DOH-ISG2000 via OSF Layer 2 | CIR0005945";
+            vlan-id 954;
+            family inet {
+                filter {
+                    input DOH-COS;
+                }
+                sampling {
+                    input;
+                    output;
+                }
+                address 172.23.6.101/30;
+            }
         }
-        unit 5163 {
-            description "VPLS-OMES-2516-CIR0005946 [NO-MONITOR]";
-            vlan-id 960;
+        unit 958 {
+            description "ODOT ISD Public via OMES Layer 2 | CIR0002573";
+            vlan-id 958;
+            family inet {
+                address 164.58.11.45/30;
+            }
         }
-        unit 5164 {
-            description "VPLS-OMES-2516-CIR0005946 [NO-MONITOR]";
-            vlan-id 970;
+        unit 959 {
+            description "ODOT Field Offices via OMES Layer 2 | CIR0002574";
+            vlan-id 959;
+            family inet {
+                address 172.24.31.5/30;
+            }
         }
-        unit 5165 {
-            description "VPLS-OMES-2516-CIR0005946 [NO-MONITOR]";
-            vlan-id 1150;
+        unit 1120 {
+            description CAREER-TECH-TO-OMES-CIR000XXXX;
+            vlan-id 1120;
+            family inet {
+                mtu 9000;
+                sampling {
+                    input;
+                }
+                address 164.58.79.65/26;
+                address 164.58.79.193/26;
+            }
         }
     }
+    ge-2/2/9 {
+        description L2-SIDE-VPLS-CULTISACK;
+        flexible-vlan-tagging;
+        encapsulation flexible-ethernet-services;
+        unit 0 {
+            encapsulation vlan-vpls;
+            vlan-id-range 2-4000;
+            family vpls;
+        }
+    }
     ae0 {
         description "UPSTREAM L3 20G ^ AKAMAI Server CIR0004480";
         aggregated-ether-options {
@@ -1809,6 +1961,7 @@
             no-readvertise;
         }
         route 156.110.26.248/30 next-hop 164.58.28.214;
+        route 164.58.79.128/26 next-hop 164.58.79.68;
     }
     router-id 164.58.199.215;
     autonomous-system 5078;
@@ -2347,6 +2500,9 @@
         172.16.156.30/32;
         172.16.156.33/32;
     }
+    prefix-list PRE-BGP-RI-ALLOW {
+        apply-path "routing-instances <*> protocols bgp group <*> neighbor <*>";
+    }
     policy-statement COMMODITY-PREFIXES-LIST {
         term PREFIXES {
             from {
@@ -2479,6 +2635,79 @@
             then reject;
         }
     }
+    policy-statement DOH-VRF-EXPORT {
+        term 1 {
+            from protocol static;
+            then {
+                community add DOH-VPN;
+                accept;
+            }
+        }
+        term 2 {
+            from protocol direct;
+            then {
+                community add DOH-VPN;
+                accept;
+            }
+        }
+        term reject {
+            then reject;
+        }
+    }
+    policy-statement DOH-VRF-IMPORT {
+        term 1 {
+            from {
+                protocol bgp;
+                community DOH-VPN;
+            }
+            then accept;
+        }
+        term reject {
+            then reject;
+        }
+    }
+    policy-statement DPS-VRF-EXPORT {
+        term 1 {
+            from protocol static;
+            then {
+                community add DPS-VPN;
+                accept;
+            }
+        }
+        term 2 {
+            from protocol direct;
+            then {
+                community add DPS-VPN;
+                accept;
+            }
+        }
+        term 3 {
+            from protocol ospf;
+            then {
+                community add DPS-VPN;
+                accept;
+            }
+        }
+        term 4 {
+            from protocol bgp;
+            then {
+                community add DPS-VPN;
+                accept;
+            }
+        }
+    }
+    policy-statement DPS-VRF-IMPORT {
+        term 1 {
+            from {
+                protocol bgp;
+                community DPS-VPN;
+            }
+            then accept;
+        }
+        term 2 {
+            then reject;
+        }
+    }
     policy-statement EBGP-AKAMAI-IMPORT {
         term REJECT-ALL-ELSE {
             then reject;
@@ -2554,6 +2783,68 @@
             then reject;
         }
     }
+    policy-statement EBGP-OMES-AGENCY-DATA-EXPORT {
+        term reject-default {
+            from {
+                route-filter 0.0.0.0/0 exact;
+            }
+            then reject;
+        }
+        term accept-all {
+            then {
+                metric 200;
+                accept;
+            }
+        }
+        term reject-all {
+            then reject;
+        }
+    }
+    policy-statement EBGP-OMES-AGENCY-DATA-IMPORT {
+        term accept-default {
+            from {
+                route-filter 0.0.0.0/0 exact;
+            }
+            then {
+                metric 200;
+                accept;
+            }
+        }
+        term reject-all {
+            then reject;
+        }
+    }
+    policy-statement EBGP-OMES-DPS-EXPORT {
+        term reject-default {
+            from {
+                route-filter 0.0.0.0/0 exact;
+            }
+            then reject;
+        }
+        term accept-all {
+            then {
+                metric 200;
+                accept;
+            }
+        }
+        term reject-all {
+            then reject;
+        }
+    }
+    policy-statement EBGP-OMES-DPS-IMPORT {
+        term accept-default {
+            from {
+                route-filter 0.0.0.0/0 exact;
+            }
+            then {
+                metric 200;
+                accept;
+            }
+        }
+        term reject-all {
+            then reject;
+        }
+    }
     policy-statement EBGP-OMES-EXPORT {
         term EXPORT-DEFAULT {
             from {
@@ -2601,6 +2892,121 @@
             then reject;
         }
     }
+    policy-statement EBGP-OMES-MGMT-EXPORT {
+        term reject-default {
+            from {
+                route-filter 0.0.0.0/0 exact;
+            }
+            then reject;
+        }
+        term accept-all {
+            then {
+                metric 200;
+                accept;
+            }
+        }
+        term reject-all {
+            then reject;
+        }
+    }
+    policy-statement EBGP-OMES-MGMT-IMPORT {
+        term accept-default {
+            from {
+                route-filter 0.0.0.0/0 exact;
+            }
+            then {
+                metric 200;
+                accept;
+            }
+        }
+        term reject-all {
+            then reject;
+        }
+    }
+    policy-statement EBGP-OMES-ODOT-EXPORT {
+        term reject-default {
+            from {
+                route-filter 0.0.0.0/0 exact;
+            }
+            then reject;
+        }
+        term accept-all {
+            then accept;
+        }
+        term reject-all {
+            then reject;
+        }
+    }
+    policy-statement EBGP-OMES-ODOT-IMPORT {
+        term step-1 {
+            from {
+                route-filter 0.0.0.0/0 exact;
+            }
+            then accept;
+        }
+        term reject-all {
+            then reject;
+        }
+    }
+    policy-statement EBGP-OMES-PUBNET-EXPORT {
+        term reject-default {
+            from {
+                route-filter 0.0.0.0/0 exact;
+            }
+            then reject;
+        }
+        term accept-all {
+            then {
+                metric 200;
+                accept;
+            }
+        }
+        term reject-all {
+            then reject;
+        }
+    }
+    policy-statement EBGP-OMES-PUBNET-IMPORT {
+        term accept-default {
+            from {
+                route-filter 0.0.0.0/0 exact;
+            }
+            then accept;
+        }
+        term reject-all {
+            then reject;
+        }
+    }
+    policy-statement EBGP-OMES-VOIP-EXPORT {
+        term reject-default {
+            from {
+                route-filter 0.0.0.0/0 exact;
+            }
+            then reject;
+        }
+        term accept-all {
+            then {
+                metric 200;
+                accept;
+            }
+        }
+        term reject-all {
+            then reject;
+        }
+    }
+    policy-statement EBGP-OMES-VOIP-IMPORT {
+        term accept-default {
+            from {
+                route-filter 0.0.0.0/0 exact;
+            }
+            then {
+                metric 200;
+                accept;
+            }
+        }
+        term reject-all {
+            then reject;
+        }
+    }
     policy-statement EBGP-OSF-IMPORT {
         term prefixes {
             from {
@@ -2679,6 +3085,48 @@
             then accept;
         }
     }
+    policy-statement ODOT-VRF-EXPORT {
+        term 1 {
+            from protocol static;
+            then {
+                community add ODOT-VPN;
+                accept;
+            }
+        }
+        term 2 {
+            from protocol direct;
+            then {
+                community add ODOT-VPN;
+                accept;
+            }
+        }
+        term 3 {
+            from protocol ospf;
+            then {
+                community add ODOT-VPN;
+                accept;
+            }
+        }
+        term 4 {
+            from protocol bgp;
+            then {
+                community add ODOT-VPN;
+                accept;
+            }
+        }
+    }
+    policy-statement ODOT-VRF-IMPORT {
+        term 1 {
+            from {
+                protocol bgp;
+                community ODOT-VPN;
+            }
+            then accept;
+        }
+        term reject {
+            then reject;
+        }
+    }
     policy-statement OMES-AGENCY-DATA-VRF-EXPORT {
         term 1 {
             from protocol static;
@@ -2775,6 +3223,48 @@
             then reject;
         }
     }
+    policy-statement OMES-PUBNET-VRF-EXPORT {
+        term 1 {
+            from protocol static;
+            then {
+                community add OMES-PUBNET-VPN;
+                accept;
+            }
+        }
+        term 2 {
+            from protocol direct;
+            then {
+                community add OMES-PUBNET-VPN;
+                accept;
+            }
+        }
+        term 3 {
+            from protocol ospf;
+            then {
+                community add OMES-PUBNET-VPN;
+                accept;
+            }
+        }
+        term 4 {
+            from protocol bgp;
+            then {
+                community add OMES-PUBNET-VPN;
+                accept;
+            }
+        }
+    }
+    policy-statement OMES-PUBNET-VRF-IMPORT {
+        term 1 {
+            from {
+                protocol bgp;
+                community OMES-PUBNET-VPN;
+            }
+            then accept;
+        }
+        term 2 {
+            then reject;
+        }
+    }
     policy-statement OMES-VOIP-VRF-EXPORT {
         term 1 {
             from protocol static;
@@ -2852,6 +3342,41 @@
             then reject;
         }
     }
+    policy-statement PS-NET-VRF-EXPORT {
+        term 1 {
+            from protocol static;
+            then {
+                community add PS-NET-VPN;
+                accept;
+            }
+        }
+        term 2 {
+            from protocol direct;
+            then {
+                community add PS-NET-VPN;
+                accept;
+            }
+        }
+        term 3 {
+            from protocol ospf;
+            then {
+                community add PS-NET-VPN;
+                accept;
+            }
+        }
+    }
+    policy-statement PS-NET-VRF-IMPORT {
+        term 1 {
+            from {
+                protocol bgp;
+                community PS-NET-VPN;
+            }
+            then accept;
+        }
+        term reject {
+            then reject;
+        }
+    }
     policy-statement REDISTRIBUTE-DIRECTS {
         term 1 {
             from protocol direct;
@@ -2874,17 +3399,61 @@
             }
         }
     }
+    policy-statement TAGNET-VRF-EXPORT {
+        term 1 {
+            from protocol static;
+            then {
+                community add TAGNET-VPN;
+                accept;
+            }
+        }
+        term 2 {
+            from protocol direct;
+            then {
+                community add TAGNET-VPN;
+                accept;
+            }
+        }
+        term 3 {
+            from {
+                protocol ospf;
+                area 0.0.0.0;
+            }
+            then {
+                community add TAGNET-VPN;
+                accept;
+            }
+        }
+    }
+    policy-statement TAGNET-VRF-IMPORT {
+        term 1 {
+            from {
+                protocol bgp;
+                community TAGNET-VPN;
+            }
+            then accept;
+        }
+        term reject {
+            then reject;
+        }
+    }
     community 5078:174 members 5078:174;
     community 5078:3923 members 5078:3923;
     community 5078:40628 members 5078:40628;
+    community DOH-VPN members target:5078:3000;
+    community DPS-VPN members target:5078:2540;
+    community ODOT-VPN members target:5078:2538;
     community OKCCORE5 members 5078:215;
     community OMES-AGENCY-DATA-VPN members target:5078:2548;
     community OMES-MGMT-VPN members target:5078:2550;
+    community OMES-PUBNET-VPN members target:5078:2552;
     community OMES-VOIP-VPN members target:5078:2549;
     community ONENET-MGMT-VPN members target:5078:2543;
     community ONENET_BLACKHOLE members 5078:911;
     community ONENET_CUST_OMES members 5078:40628;
     community ONENET_INTERNAL members 5078:10000;
+    community PS-NET-VPN members target:5078:2530;
+    community TAGNET-VPN members target:5078:2531;
     as-path 21357 21357;
     as-path 40581 40581;
     as-path 11537 11537;
@@ -2984,6 +3553,13 @@
                 }
             }
         }
+        ge-2/2/8 {
+            unit 954 {
+                rewrite-rules {
+                    exp exp-inet-table;
+                }
+            }
+        }
         ae* {
             scheduler-map sch-map;
             unit * {
@@ -3216,6 +3792,7 @@
                 from {
                     prefix-list {
                         PRE-BGP-ALLOW;
+                        PRE-BGP-RI-ALLOW;
                     }
                     protocol tcp;
                     port 179;
@@ -7204,6 +7781,50 @@
             }
         }
     }
+    DOH-L3VPN {
+        description DOH-L3VPN;
+        instance-type vrf;
+        interface ge-2/2/8.954;
+        route-distinguisher 164.58.199.215:3000;
+        vrf-import DOH-VRF-IMPORT;
+        vrf-export DOH-VRF-EXPORT;
+        vrf-target target:5078:3000;
+        vrf-table-label;
+        routing-options {
+            static {
+                route 0.0.0.0/0 next-hop 172.23.6.102;
+            }
+        }
+    }
+    DPS-L3VPN {
+        description DPS-L3VPN;
+        instance-type vrf;
+        interface xe-2/0/1.1107;
+        route-distinguisher 164.58.199.215:2540;
+        vrf-import DPS-VRF-IMPORT;
+        vrf-export DPS-VRF-EXPORT;
+        vrf-target target:5078:2540;
+        vrf-table-label;
+        routing-options {
+            autonomous-system 64569;
+        }
+        protocols {
+            bgp {
+                group EBGP-OMES-DPS {
+                    type external;
+                    family inet {
+                        unicast;
+                    }
+                    neighbor 10.119.16.6 {
+                        import EBGP-OMES-DPS-IMPORT;
+#                        authentication-key <removed>;
+                        export EBGP-OMES-DPS-EXPORT;
+                        peer-as 40628;
+                    }
+                }
+            }
+        }
+    }
     OBU-VPLS-2510 {
         description VPLS-OBU-SHAWNEE;
         instance-type vpls;
@@ -7230,6 +7851,36 @@
             }
         }
     }
+    ODOT-L3VPN {
+        description ODOT-L3VPN;
+        instance-type vrf;
+        interface xe-2/0/1.1104;
+        route-distinguisher 164.58.199.215:2538;
+        vrf-import ODOT-VRF-IMPORT;
+        vrf-export ODOT-VRF-EXPORT;
+        vrf-target target:5078:2538;
+        vrf-table-label;
+        routing-options {
+            router-id 172.25.255.252;
+            autonomous-system 64569;
+        }
+        protocols {
+            bgp {
+                group EBGP-OMES-ODOT {
+                    type external;
+                    family inet {
+                        unicast;
+                    }
+                    neighbor 172.25.255.253 {
+                        import EBGP-OMES-ODOT-IMPORT;
+#                        authentication-key <removed>;
+                        export EBGP-OMES-ODOT-EXPORT;
+                        peer-as 40628;
+                    }
+                }
+            }
+        }
+    }
     ODOT-VPLS-2527 {
         description ODOT-VPLS;
         instance-type vpls;
@@ -7256,12 +7907,31 @@
         instance-type vrf;
         interface ge-1/3/8.501;
         interface ge-1/3/8.504;
+        interface xe-2/0/1.1109;
         route-distinguisher 164.58.199.215: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 {
+            autonomous-system 64569;
+        }
         protocols {
+            bgp {
+                group EBGP-OMES-AGENCY-DATA {
+                    type external;
+                    family inet {
+                        unicast;
+                    }
+                    neighbor 10.119.24.3 {
+                        description "OMES-AGENCY-DATA-EBGP [NO-MONITOR]";
+                        import EBGP-OMES-AGENCY-DATA-IMPORT;
+#                        authentication-key <removed>;
+                        export EBGP-OMES-AGENCY-DATA-EXPORT;
+                        peer-as 40628;
+                    }
+                }
+            }
             ospf {
                 export OMES-EXPORT-BGP-TO-OSPF;
                 area 10.119.24.190 {
@@ -7278,12 +7948,31 @@
         instance-type vrf;
         interface ge-1/3/8.500;
         interface ge-1/3/8.503;
+        interface xe-2/0/1.1113;
         route-distinguisher 164.58.199.215:2550;
         vrf-import OMES-MGMT-VRF-IMPORT;
         vrf-export OMES-MGMT-VRF-EXPORT;
         vrf-target target:5078:2550;
         vrf-table-label;
+        routing-options {
+            autonomous-system 64569;
+        }
         protocols {
+            bgp {
+                group EBGP-OMES-MGMT {
+                    type external;
+                    family inet {
+                        unicast;
+                    }
+                    neighbor 10.119.40.3 {
+                        description "OMES-MGMT-EBGP [NO-MONITOR]";
+                        import EBGP-OMES-MGMT-IMPORT;
+#                        authentication-key <removed>;
+                        export EBGP-OMES-MGMT-EXPORT;
+                        peer-as 40628;
+                    }
+                }
+            }
             ospf {
                 export OMES-EXPORT-BGP-TO-OSPF;
                 area 10.119.40.190 {
@@ -7295,16 +7984,65 @@
             }
         }
     }
+    OMES-PUBNET-L3VPN {
+        description OMES-PUBNET-L3VPN;
+        instance-type vrf;
+        interface xe-2/0/1.1115;
+        route-distinguisher 164.58.199.215:2552;
+        vrf-import OMES-PUBNET-VRF-IMPORT;
+        vrf-export OMES-PUBNET-VRF-EXPORT;
+        vrf-target target:5078:2552;
+        vrf-table-label;
+        protocols {
+            bgp {
+                group EBGP-OMES-PUBNET {
+                    type external;
+                    import EBGP-OMES-PUBNET-IMPORT;
+                    family inet {
+                        unicast {
+                            loops 2;
+                        }
+                    }
+                    export EBGP-OMES-PUBNET-EXPORT;
+                    peer-as 65001;
+                    local-as 64569 no-prepend-global-as;
+                    neighbor 204.62.17.30 {
+                        description EBGP-OMES-PUBNET-CIR000XXXX;
+#                        authentication-key <removed>;
+                    }
+                }
+            }
+        }
+    }
     OMES-VOIP-L3VPN {
         description OMES-VOIP-L3VPN;
         instance-type vrf;
         interface ge-1/3/8.505;
+        interface xe-2/0/1.1111;
         route-distinguisher 164.58.199.215:2549;
         vrf-import OMES-VOIP-VRF-IMPORT;
         vrf-export OMES-VOIP-VRF-EXPORT;
         vrf-target target:5078:2549;
         vrf-table-label;
+        routing-options {
+            autonomous-system 64569;
+        }
         protocols {
+            bgp {
+                group EBGP-OMES-VOIP {
+                    type external;
+                    family inet {
+                        unicast;
+                    }
+                    neighbor 10.119.32.3 {
+                        description "OMES-VOIP-EBGP [NO-MONITOR]";
+                        import EBGP-OMES-VOIP-IMPORT;
+#                        authentication-key <removed>;
+                        export EBGP-OMES-VOIP-EXPORT;
+                        peer-as 40628;
+                    }
+                }
+            }
             ospf {
                 export OMES-EXPORT-BGP-TO-OSPF;
                 area 10.119.32.190 {
@@ -7337,6 +8075,65 @@
             }
         }
     }
+    PS-NET-L3VPN {
+        description "PS_NET Public Safety Net";
+        instance-type vrf;
+        interface xe-2/0/1.1100;
+        route-distinguisher 164.58.199.215:2530;
+        vrf-import PS-NET-VRF-IMPORT;
+        vrf-export PS-NET-VRF-EXPORT;
+        vrf-target target:5078:2530;
+        vrf-table-label;
+        routing-options {
+            static {
+                route 0.0.0.0/0 next-hop 172.26.0.1;
+            }
+        }
+    }
+    TAGNET-L3VPN {
+        description TAGNET-L3VPN;
+        instance-type vrf;
+        interface xe-2/0/1.1103;
+        route-distinguisher 164.58.199.215:2531;
+        vrf-import TAGNET-VRF-IMPORT;
+        vrf-export TAGNET-VRF-EXPORT;
+        vrf-target target:5078:2531;
+        vrf-table-label;
+    }
+    VPLS-OMES-2516 {
+        description VPLS-OMES;
+        instance-type vpls;
+        vlan-id all;
+        interface xe-2/0/1.5160;
+        interface xe-2/0/1.5165;
+        interface ge-2/2/9.0;
+        route-distinguisher 164.58.199.215:2516;
+        vrf-target target:5078:2516;
+        protocols {
+            vpls {
+                mac-table-size {
+                    10000;
+                    packet-action drop;
+                }
+                interface-mac-limit {
+                    3000;
+                }
+                no-tunnel-services;
+                site OKC5 {
+                    site-identifier 5;
+                    multi-homing;
+                    interface ge-2/2/9.0;
+                }
+                site OKC1 {
+                    site-identifier 2;
+                    multi-homing;
+                    site-preference primary;
+                    interface xe-2/0/1.5160;
+                    interface xe-2/0/1.5165;
+                }
+            }
+        }
+    }
     VPLS-ONENET-IPERF {
         description ONENET-IPERF-MGMT;
         instance-type vpls;
Index: configs/core.hut.hen.onenet.net
===================================================================
--- configs/core.hut.hen.onenet.net	(revision 125838)
+++ configs/core.hut.hen.onenet.net	(working copy)
@@ -306,7 +306,6 @@
 #lsi.1048696 up up
 #lsi.1048712 up up
 #lsi.1048722 up up
-#lsi.1048740 up up
 #lsi.1048746 up up
 #lsi.1048747 up up
 #lsi.1048753 up up
@@ -318,6 +317,7 @@
 #lsi.1048777 up up
 #lsi.1048779 up up
 #lsi.1048780 up up
+#lsi.1048781 up up
 #me0 up up
 #me0.0 up up
 #mtun up up
Index: configs/core2-okc-mx960.onenet.net
===================================================================
--- configs/core2-okc-mx960.onenet.net	(revision 125838)
+++ configs/core2-okc-mx960.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at OKC-CORE2-MX960-RE0> show system commit 
+#   2015-04-11 17:37:01 CDT by jeremyt via cli commit confirmed, rollback in 5mins synchronize
 #   2015-03-29 20:15:18 CDT by andrew via cli commit synchronize
 #   2015-03-24 09:02:09 CDT by andrew via cli commit synchronize
 #   2015-03-15 16:46:47 CDT by andrew via cli commit confirmed, rollback in 5mins synchronize
 #   2015-03-15 16:44:31 CDT by andrew via cli commit confirmed, rollback in 5mins synchronize
 #   2015-03-15 14:55:58 CDT by andrew via cli commit confirmed, rollback in 5mins synchronize
-#   2015-03-05 10:58:17 CST by rnordmark via cli commit synchronize
 # grnoc-mon at OKC-CORE2-MX960-RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -213,7 +213,6 @@
 #   CPU            REV 06   711-030884   ZA0642            MPC PMB 2G 
 #   MIC 0          REV 26   750-028387   YT7088            3D 4x 10GE  XFP
 #     PIC 0                 BUILTIN      BUILTIN           2x 10GE  XFP
-#       Xcvr 0     REV 01   740-031833   21T670101020      XFP-10G-LR
 #       Xcvr 1     REV 03   740-014289   T10K73509         XFP-10G-SR
 #     PIC 1                 BUILTIN      BUILTIN           2x 10GE  XFP
 #       Xcvr 1     REV 02   740-014291   AJ203GR           XFP-10G-ZR
@@ -415,7 +414,7 @@
 # grnoc-mon at OKC-CORE2-MX960-RE0> show system uptime 
 # System booted: 2014-09-14 04:07 CDT 
 # Protocols started: 2014-09-14 04:09 CDT 
-# Last configured: 2015-03-29 20:15 CDT  by andrew
+# Last configured: 2015-04-11 17:37 CDT  by jeremyt
 # 
 # {master}
 # grnoc-mon at OKC-CORE2-MX960-RE0> show interface terse 
@@ -473,26 +472,7 @@
 #pfe-1/0/0.16383 up up
 #pfh-1/0/0 up up
 #pfh-1/0/0.16383 up up
-#xe-1/0/0 up up
-#xe-1/0/0.954 up up
-#xe-1/0/0.958 up up
-#xe-1/0/0.959 up up
-#xe-1/0/0.1100 up up
-#xe-1/0/0.1101 up up
-#xe-1/0/0.1103 up up
-#xe-1/0/0.1104 up up
-#xe-1/0/0.1107 up up
-#xe-1/0/0.1109 up up
-#xe-1/0/0.1111 up up
-#xe-1/0/0.1113 up up
-#xe-1/0/0.1115 up up
-#xe-1/0/0.5160 up up
-#xe-1/0/0.5161 up up
-#xe-1/0/0.5162 up up
-#xe-1/0/0.5163 up up
-#xe-1/0/0.5164 up up
-#xe-1/0/0.5165 up up
-#xe-1/0/0.32767 up up
+#xe-1/0/0 up down
 #xe-1/0/1 up up
 #xe-1/0/1.60 up up
 #xe-1/0/1.32767 up up
@@ -591,37 +571,10 @@
 #lsi.0 up up
 #lsi.1 up up
 #lsi.4 up up
-#lsi.5 up up
-#lsi.6 up up
-#lsi.7 up up
-#lsi.8 up up
-#lsi.9 up up
-#lsi.10 up up
-#lsi.11 up up
-#lsi.1063635 up up
-#lsi.1063643 up up
-#lsi.1064006 up up
-#lsi.1064150 up up
-#lsi.1065185 up up
-#lsi.1066028 up up
-#lsi.1066598 up up
-#lsi.1066631 up up
-#lsi.1066945 up up
-#lsi.1067590 up up
-#lsi.1067737 up up
-#lsi.1067797 up up
-#lsi.1068291 up up
-#lsi.1068725 up up
-#lsi.1068860 up up
-#lsi.1068949 up up
-#lsi.1069029 up up
-#lsi.1069097 up up
-#lsi.1069100 up up
-#lsi.1069113 up up
-#lsi.1069149 up up
-#lsi.1069186 up up
-#lsi.1069195 up up
-#lsi.1069196 up up
+#lsi.1069203 up up
+#lsi.1069204 up up
+#lsi.1069205 up up
+#lsi.1069207 up up
 #mtun up up
 #pimd up up
 #pime up up
@@ -629,7 +582,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at OKC-CORE2-MX960-RE0> show configuration 
-## Last commit: 2015-03-29 20:15:18 CDT by andrew
+## Last commit: 2015-04-11 17:37:01 CDT by jeremyt
 version 12.3R7.7;
 groups {
     re0 {
@@ -1062,163 +1015,6 @@
         description USER-DEFINE;
         disable;
     }
-    xe-1/0/0 {
-        description "OMES EX8200 Layer 2 CIR0005943";
-        vlan-tagging;
-        mtu 9192;
-        encapsulation flexible-ethernet-services;
-        unit 954 {
-            description "DOH L3VPN to DOH-ISG2000 via OSF Layer 2 | CIR0005945";
-            vlan-id 954;
-            family inet {
-                filter {
-                    input DOH-COS;
-                }
-                sampling {
-                    input;
-                    output;
-                }
-                address 172.23.6.101/30;
-            }
-        }
-        unit 958 {
-            description "ODOT ISD Public via OMES Layer 2 | CIR0002573";
-            vlan-id 958;
-            family inet {
-                address 164.58.11.45/30;
-            }
-        }
-        unit 959 {
-            description "ODOT Field Offices via OMES Layer 2 | CIR0002574";
-            vlan-id 959;
-            family inet {
-                address 172.24.31.5/30;
-            }
-        }
-        unit 1100 {
-            description "PS_NET Public Safety Network | CIR0005948";
-            vlan-id 1100;
-            family inet {
-                address 172.26.0.0/31;
-            }
-        }
-        unit 1101 {
-            description "IPerf VPLS to OMES | CIR0005941";
-            encapsulation vlan-vpls;
-            vlan-id 1101;
-        }
-        unit 1103 {
-            description "TAGNET to OMES CIR0005938";
-            vlan-id 1102;
-            family inet {
-                mtu 9000;
-                address 10.119.0.1/30;
-            }
-        }
-        unit 1104 {
-            description "ODOT-L3VPN-to-OMES | CIR0005939";
-            vlan-id 1104;
-            family inet {
-                mtu 9000;
-                sampling {
-                    input;
-                    output;
-                }
-                address 172.25.255.252/31;
-            }
-        }
-        unit 1107 {
-            description "DPS-L3VPN-to-OMES | CIR005940";
-            vlan-id 1107;
-            family inet {
-                mtu 9000;
-                sampling {
-                    input;
-                }
-                address 10.119.16.5/30;
-            }
-        }
-        unit 1109 {
-            description AGENCY-DATA-L3VPN-TO-OMES-CIR00XXXX;
-            vlan-id 1109;
-            family inet {
-                mtu 9000;
-                sampling {
-                    input;
-                }
-                address 10.119.24.2/31;
-            }
-        }
-        unit 1111 {
-            description VOIP-L3VPN-TO-OMES-CIR00XXXX;
-            vlan-id 1111;
-            family inet {
-                mtu 9000;
-                sampling {
-                    input;
-                }
-                address 10.119.32.2/31;
-            }
-        }
-        unit 1113 {
-            description MGMT-L3VPN-TO-OMES-CIR00XXXX;
-            vlan-id 1113;
-            family inet {
-                mtu 9000;
-                sampling {
-                    input;
-                }
-                address 10.119.40.2/31;
-            }
-        }
-        unit 1115 {
-            description PUBNET-L3VPN-TO-OMES-CIR000XXXX;
-            vlan-id 1115;
-            family inet {
-                mtu 9000;
-                sampling {
-                    input;
-                }
-                address 204.62.17.31/31;
-            }
-        }
-        unit 5160 {
-            description VPLS-OMES-2516-CIR0005947;
-            encapsulation vlan-vpls;
-            vlan-id-range 2-831;
-            family vpls;
-        }
-        unit 5161 {
-            description VPLS-OMES-2516-CIR0005947;
-            encapsulation vlan-vpls;
-            vlan-id-range 833-953;
-            family vpls;
-        }
-        unit 5162 {
-            description VPLS-OMES-2516-CIR0005947;
-            encapsulation vlan-vpls;
-            vlan-id-range 955-957;
-            family vpls;
-        }
-        unit 5163 {
-            description VPLS-OMES-2516-CIR0005947;
-            encapsulation vlan-vpls;
-            vlan-id-range 960-967;
-            family vpls;
-        }
-        unit 5164 {
-            description VPLS-OMES-2516-CIR0005947;
-            encapsulation vlan-vpls;
-            vlan-id-range 970-1099;
-            family vpls;
-        }
-        unit 5165 {
-            description VPLS-OMES-2516-CIR0005947;
-            encapsulation vlan-vpls;
-            vlan-id-range 1150-4000;
-            family vpls;
-        }
-    }
     xe-1/0/1 {
         description "CORE 10GE to core5.okc xe-1/0/0 | OneNet-OKC-OKC-XE-4470";
         vlan-tagging;
@@ -17286,7 +17082,7 @@
     DOH {
         description DOH-L3VPN;
         instance-type vrf;
-        interface xe-1/0/0.954;
+        interface xe-1/0/0.954; ## 'xe-1/0/0.954' is not defined
         route-distinguisher 164.58.199.212:3000;
         vrf-import DOH-IMPORT;
         vrf-export DOH-EXPORT;
@@ -17298,189 +17094,10 @@
             }
         }
     }
-    DPS-L3VPN {
-        description DPS-L3VPN;
-        instance-type vrf;
-        interface xe-1/0/0.1107;
-        route-distinguisher 164.58.199.212:2540;
-        vrf-import DPS-VRF-IMPORT;
-        vrf-export DPS-VRF-EXPORT;
-        vrf-target target:5078:2540;
-        vrf-table-label;
-        routing-options {
-            autonomous-system 64569;
-        }
-        protocols {
-            bgp {
-                group EBGP-OMES-DPS {
-                    type external;
-                    family inet {
-                        unicast;
-                    }
-                    neighbor 10.119.16.6 {
-                        import EBGP-OMES-DPS-IMPORT;
-#                        authentication-key <removed>;
-                        export EBGP-OMES-DPS-EXPORT;
-                        peer-as 40628;
-                    }
-                }
-            }
-        }
-    }
-    ODOT-L3VPN {
-        description ODOT-L3VPN;
-        instance-type vrf;
-        interface xe-1/0/0.1104;
-        route-distinguisher 164.58.199.212:2538;
-        vrf-import ODOT-VRF-IMPORT;
-        vrf-export ODOT-VRF-EXPORT;
-        vrf-target target:5078:2538;
-        vrf-table-label;
-        routing-options {
-            router-id 172.25.255.252;
-            autonomous-system 64569;
-        }
-        protocols {
-            bgp {
-                group EBGP-OMES-ODOT {
-                    type external;
-                    family inet {
-                        unicast;
-                    }
-                    neighbor 172.25.255.253 {
-                        import EBGP-OMES-ODOT-IMPORT;
-#                        authentication-key <removed>;
-                        export EBGP-OMES-ODOT-EXPORT;
-                        peer-as 40628;
-                    }
-                }
-            }
-        }
-    }
-    OMES-AGENCY-DATA-L3VPN {
-        description OMES-AGENCY-DATA-L3VPN;
-        instance-type vrf;
-        interface xe-1/0/0.1109;
-        route-distinguisher 164.58.199.212: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 {
-            autonomous-system 64569;
-        }
-        protocols {
-            bgp {
-                group EBGP-OMES-AGENCY-DATA {
-                    type external;
-                    family inet {
-                        unicast;
-                    }
-                    neighbor 10.119.24.3 {
-                        description "OMES-AGENCY-DATA-EBGP [NO-MONITOR]";
-                        import EBGP-OMES-AGENCY-DATA-IMPORT;
-#                        authentication-key <removed>;
-                        export EBGP-OMES-AGENCY-DATA-EXPORT;
-                        peer-as 40628;
-                    }
-                }
-            }
-        }
-    }
-    OMES-MGMT-L3VPN {
-        description OMES-MGMT-L3VPN;
-        instance-type vrf;
-        interface xe-1/0/0.1113;
-        route-distinguisher 164.58.199.212:2550;
-        vrf-import OMES-MGMT-VRF-IMPORT;
-        vrf-export OMES-MGMT-VRF-EXPORT;
-        vrf-target target:5078:2550;
-        vrf-table-label;
-        routing-options {
-            autonomous-system 64569;
-        }
-        protocols {
-            bgp {
-                group EBGP-OMES-MGMT {
-                    type external;
-                    family inet {
-                        unicast;
-                    }
-                    neighbor 10.119.40.3 {
-                        description "OMES-MGMT-EBGP [NO-MONITOR]";
-                        import EBGP-OMES-MGMT-IMPORT;
-#                        authentication-key <removed>;
-                        export EBGP-OMES-MGMT-EXPORT;
-                        peer-as 40628;
-                    }
-                }
-            }
-        }
-    }
-    OMES-PUBNET-L3VPN {
-        description OMES-PUBNET-L3VPN;
-        instance-type vrf;
-        interface xe-1/0/0.1115;
-        route-distinguisher 164.58.199.212:2552;
-        vrf-import OMES-PUBNET-VRF-IMPORT;
-        vrf-export OMES-PUBNET-VRF-EXPORT;
-        vrf-target target:5078:2552;
-        vrf-table-label;
-        protocols {
-            bgp {
-                group EBGP-OMES-PUBNET {
-                    type external;
-                    import EBGP-OMES-PUBNET-IMPORT;
-                    family inet {
-                        unicast {
-                            loops 2;
-                        }
-                    }
-                    export EBGP-OMES-PUBNET-EXPORT;
-                    peer-as 65001;
-                    local-as 64569 no-prepend-global-as;
-                    neighbor 204.62.17.30 {
-                        description EBGP-OMES-PUBNET-CIR000XXXX;
-#                        authentication-key <removed>;
-                    }
-                }
-            }
-        }
-    }
-    OMES-VOIP-L3VPN {
-        description OMES-VOIP-L3VPN;
-        instance-type vrf;
-        interface xe-1/0/0.1111;
-        route-distinguisher 164.58.199.212:2549;
-        vrf-import OMES-VOIP-VRF-IMPORT;
-        vrf-export OMES-VOIP-VRF-EXPORT;
-        vrf-target target:5078:2549;
-        vrf-table-label;
-        routing-options {
-            autonomous-system 64569;
-        }
-        protocols {
-            bgp {
-                group EBGP-OMES-VOIP {
-                    type external;
-                    family inet {
-                        unicast;
-                    }
-                    neighbor 10.119.32.3 {
-                        description "OMES-VOIP-EBGP [NO-MONITOR]";
-                        import EBGP-OMES-VOIP-IMPORT;
-#                        authentication-key <removed>;
-                        export EBGP-OMES-VOIP-EXPORT;
-                        peer-as 40628;
-                    }
-                }
-            }
-        }
-    }
     ONENET-PS_NET-L3VPN {
         description "PS_NET Public Safety Net";
         instance-type vrf;
-        interface xe-1/0/0.1100;
+        interface xe-1/0/0.1100; ## 'xe-1/0/0.1100' is not defined
         route-distinguisher 164.58.199.212:2530;
         vrf-import ONENET-PS_NET-VRF-IMPORT;
         vrf-export ONENET-PS_NET-VRF-EXPORT;
@@ -17492,26 +17109,10 @@
             }
         }
     }
-    TAGNET-L3VPN {
-        description TAGNET-L3VPN;
-        instance-type vrf;
-        interface xe-1/0/0.1103;
-        route-distinguisher 164.58.199.212:2531;
-        vrf-import TAGNET-VRF-IMPORT;
-        vrf-export TAGNET-VRF-EXPORT;
-        vrf-target target:5078:2531;
-        vrf-table-label;
-    }
     VPLS-OMES-2516 {
         description VPLS-OMES;
         instance-type vpls;
         vlan-id all;
-        interface xe-1/0/0.5160;
-        interface xe-1/0/0.5161;
-        interface xe-1/0/0.5162;
-        interface xe-1/0/0.5163;
-        interface xe-1/0/0.5164;
-        interface xe-1/0/0.5165;
         interface ae0.5160;
         interface ae0.5161;
         route-distinguisher 164.58.199.212:2516;
@@ -17531,17 +17132,6 @@
                     interface ae0.5160;
                     interface ae0.5161;
                 }
-                site OKC1 {
-                    site-identifier 2;
-                    multi-homing;
-                    site-preference primary;
-                    interface xe-1/0/0.5160;
-                    interface xe-1/0/0.5161;
-                    interface xe-1/0/0.5162;
-                    interface xe-1/0/0.5163;
-                    interface xe-1/0/0.5164;
-                    interface xe-1/0/0.5165;
-                }
             }
         }
     }
@@ -17549,7 +17139,7 @@
         description ONENET-IPERF-MGMT;
         instance-type vpls;
         vlan-id 2011;
-        interface xe-1/0/0.1101;
+        interface xe-1/0/0.1101; ## 'xe-1/0/0.1101' is not defined
         route-distinguisher 164.58.199.212:2011;
         vrf-target target:5078:2011;
         protocols {
Index: configs/core.hut.sei.onenet.net
===================================================================
--- configs/core.hut.sei.onenet.net	(revision 125838)
+++ configs/core.hut.sei.onenet.net	(working copy)
@@ -307,7 +307,6 @@
 #lsi.1049126 up up
 #lsi.1049153 up up
 #lsi.1049185 up up
-#lsi.1049201 up up
 #lsi.1049205 up up
 #lsi.1049211 up up
 #lsi.1049221 up up
@@ -317,6 +316,7 @@
 #lsi.1049232 up up
 #lsi.1049234 up up
 #lsi.1049235 up up
+#lsi.1049236 up up
 #me0 up up
 #me0.0 up up
 #mtun up up
Index: configs/core.dur.onenet.net
===================================================================
--- configs/core.dur.onenet.net	(revision 125838)
+++ configs/core.dur.onenet.net	(working copy)
@@ -344,7 +344,6 @@
 #lsi.512 up up
 #lsi.513 up up
 #lsi.514 up up
-#lsi.1050000 up up
 #lsi.1050001 up up
 #lsi.1050002 up up
 #lsi.1050018 up up
@@ -363,8 +362,6 @@
 #lsi.1053881 up up
 #lsi.1053882 up up
 #lsi.1054042 up up
-#lsi.1054589 up up
-#lsi.1054590 up up
 #lsi.1054618 up up
 #lsi.1054670 up up
 #lsi.1054817 up up
@@ -385,7 +382,9 @@
 #lsi.1055345 up up
 #lsi.1055354 up up
 #lsi.1055355 up up
-#lsi.1055356 up up
+#lsi.1055363 up up
+#lsi.1055364 up up
+#lsi.1055367 up up
 #mtun up up
 #pimd up up
 #pime up up
Index: configs/core.say.onenet.net
===================================================================
--- configs/core.say.onenet.net	(revision 125838)
+++ configs/core.say.onenet.net	(working copy)
@@ -340,9 +340,6 @@
 #lsi.1052852 up up
 #lsi.1052854 up up
 #lsi.1053461 up up
-#lsi.1053678 up up
-#lsi.1054193 up up
-#lsi.1054194 up up
 #lsi.1054295 up up
 #lsi.1054402 up up
 #lsi.1054410 up up
@@ -366,7 +363,9 @@
 #lsi.1055143 up up
 #lsi.1055152 up up
 #lsi.1055153 up up
-#lsi.1055154 up up
+#lsi.1055161 up up
+#lsi.1055162 up up
+#lsi.1055165 up up
 #mtun up up
 #pimd up up
 #pime up up
Index: configs/core4.okc.onenet.net
===================================================================
--- configs/core4.okc.onenet.net	(revision 125838)
+++ configs/core4.okc.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at OKC-CORE4-MX480-RE0> show system commit 
+#   2015-04-11 17:51:06 CDT by andrew via cli commit synchronize
+#   2015-04-11 17:48:08 CDT by andrew via cli commit synchronize
+#   2015-04-11 17:21:48 CDT by andrew via cli commit synchronize
+#   2015-04-11 17:20:11 CDT by andrew via cli commit synchronize
+#   2015-04-11 17:12:55 CDT by andrew via cli commit confirmed, rollback in 3mins synchronize
 #   2015-04-10 15:21:28 CDT by sky via cli commit synchronize
-#   2015-04-10 14:00:24 CDT by andrew via cli commit synchronize
-#   2015-04-10 13:56:42 CDT by sky via cli commit confirmed, rollback in 10mins synchronize
-#   2015-04-10 13:33:49 CDT by andrew via cli commit synchronize
-#   2015-04-10 09:21:06 CDT by andrew via cli commit synchronize
-#   2015-04-10 09:15:08 CDT by andrew via cli commit synchronize
 # grnoc-mon at OKC-CORE4-MX480-RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -424,7 +424,7 @@
 # grnoc-mon at OKC-CORE4-MX480-RE0> show system uptime 
 # System booted: 2014-09-16 23:49 CDT 
 # Protocols started: 2014-09-16 23:51 CDT 
-# Last configured: 2015-04-10 15:21 CDT  by sky
+# Last configured: 2015-04-11 17:51 CDT  by andrew
 # 
 # {master}
 # grnoc-mon at OKC-CORE4-MX480-RE0> show interface terse 
@@ -598,26 +598,27 @@
 #pfe-1/0/0.16383 up up
 #pfh-1/0/0 up up
 #pfh-1/0/0.16383 up up
-#xe-1/0/0 up down
-#xe-1/0/0.954 up down
-#xe-1/0/0.958 up down
-#xe-1/0/0.959 up down
-#xe-1/0/0.1100 up down
-#xe-1/0/0.1101 up down
-#xe-1/0/0.1103 up down
-#xe-1/0/0.1104 up down
-#xe-1/0/0.1107 up down
-#xe-1/0/0.1109 up down
-#xe-1/0/0.1111 up down
-#xe-1/0/0.1113 up down
-#xe-1/0/0.1115 up down
-#xe-1/0/0.5160 up down
-#xe-1/0/0.5161 up down
-#xe-1/0/0.5162 up down
-#xe-1/0/0.5163 up down
-#xe-1/0/0.5164 up down
-#xe-1/0/0.5165 up down
-#xe-1/0/0.32767 up down
+#xe-1/0/0 up up
+#xe-1/0/0.1100 up up
+#xe-1/0/0.1101 up up
+#xe-1/0/0.1102 up up
+#xe-1/0/0.1103 up up
+#xe-1/0/0.1104 up up
+#xe-1/0/0.1105 up up
+#xe-1/0/0.1106 up up
+#xe-1/0/0.1107 up up
+#xe-1/0/0.1108 up up
+#xe-1/0/0.1109 up up
+#xe-1/0/0.1110 up up
+#xe-1/0/0.1111 up up
+#xe-1/0/0.1112 up up
+#xe-1/0/0.1113 up up
+#xe-1/0/0.1114 up up
+#xe-1/0/0.1115 up up
+#xe-1/0/0.1120 up up
+#xe-1/0/0.5160 up up
+#xe-1/0/0.5165 up up
+#xe-1/0/0.32767 up up
 #xe-1/0/1 up up
 #xe-1/0/1.56 up up
 #xe-1/0/1.32767 up up
@@ -838,12 +839,17 @@
 #lsi.3 up up
 #lsi.4 up up
 #lsi.5 up up
+#lsi.6 up up
+#lsi.7 up up
+#lsi.8 up up
+#lsi.9 up up
+#lsi.10 up up
+#lsi.11 up up
 #lsi.1049327 up up
 #lsi.1049825 up up
 #lsi.1050018 up up
 #lsi.1050029 up up
 #lsi.1050064 up up
-#lsi.1050097 up up
 #lsi.1050107 up up
 #lsi.1050114 up up
 #lsi.1050119 up up
@@ -863,6 +869,11 @@
 #lsi.1050161 up up
 #lsi.1050163 up up
 #lsi.1050164 up up
+#lsi.1050176 up up
+#lsi.1050177 up up
+#lsi.1050178 up up
+#lsi.1050179 up up
+#lsi.1050180 up up
 #mtun up up
 #pimd up up
 #pime up up
@@ -870,7 +881,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at OKC-CORE4-MX480-RE0> show configuration 
-## Last commit: 2015-04-10 15:21:28 CDT by sky
+## Last commit: 2015-04-11 17:51:06 CDT by andrew
 version 12.3R7.7;
 groups {
     re0 {
@@ -2650,22 +2661,10 @@
         }
     }
     xe-1/0/0 {
-        description "OMES MX104_DC_1 Layer 2 CIR0005943 [NO-MONITOR]";
+        description "OMES EX8200 Layer 2 CIR0005038";
         flexible-vlan-tagging;
         mtu 9192;
         encapsulation flexible-ethernet-services;
-        unit 954 {
-            description "DOH L3VPN to DOH-ISG2000 via OSF Layer 2 | CIR0005945 [NO-MONITOR]";
-            vlan-id 954;
-        }
-        unit 958 {
-            description "ODOT ISD Public via OMES Layer 2 | CIR0002573 [NO-MONITOR]";
-            vlan-id 958;
-        }
-        unit 959 {
-            description "ODOT Field Offices via OMES Layer 2 | CIR0002574 [NO-MONITOR]";
-            vlan-id 959;
-        }
         unit 1100 {
             description "PS_NET Public Safety Network | CIR0005948 [NO-MONITOR]";
             vlan-id 1100;
@@ -2674,6 +2673,14 @@
             description "IPerf VPLS to OMES | CIR0005941 [NO-MONITOR]";
             vlan-id 1101;
         }
+        unit 1102 {
+            description "TAGNET to OMES CIR0005929";
+            vlan-id 1103;
+            family inet {
+                mtu 9000;
+                address 10.119.0.5/30;
+            }
+        }
         unit 1103 {
             description "TAGNET to OMES CIR0005938 [NO-MONITOR]";
             vlan-id 1102;
@@ -2682,49 +2689,110 @@
             description "ODOT-L3VPN-to-OMES | CIR0005939 [NO-MONITOR]";
             vlan-id 1104;
         }
+        unit 1105 {
+            description "ODOT-L3VPN-to-OMES | CIR0005930";
+            vlan-id 1105;
+            family inet {
+                mtu 9000;
+                sampling {
+                    input;
+                    output;
+                }
+                address 172.25.255.254/31;
+            }
+        }
+        unit 1106 {
+            description "DPS-L3VPN-to-OMES | CIR0005942";
+            vlan-id 1106;
+            family inet {
+                mtu 9000;
+                sampling {
+                    input;
+                }
+                address 10.119.16.1/30;
+            }
+        }
         unit 1107 {
             description "DPS-L3VPN-to-OMES | CIR005940 [NO-MONITOR]";
             vlan-id 1107;
         }
+        unit 1108 {
+            description AGENCY-DATA-L3VPN-TO-OMES-CIR00XXXX;
+            vlan-id 1108;
+            family inet {
+                mtu 9000;
+                sampling {
+                    input;
+                }
+                address 10.119.24.0/31;
+            }
+        }
         unit 1109 {
             description "AGENCY-DATA-L3VPN-TO-OMES-CIR00XXXX [NO-MONITOR]";
             vlan-id 1109;
         }
+        unit 1110 {
+            description VOIP-L3VPN-TO-OMES-CIR00XXXX;
+            vlan-id 1110;
+            family inet {
+                mtu 9000;
+                sampling {
+                    input;
+                }
+                address 10.119.32.0/31;
+            }
+        }
         unit 1111 {
             description "VOIP-L3VPN-TO-OMES-CIR00XXXX [NO-MONITOR]";
             vlan-id 1111;
         }
+        unit 1112 {
+            description MGMT-L3VPN-TO-OMES-CIR00XXXX;
+            vlan-id 1112;
+            family inet {
+                mtu 9000;
+                sampling {
+                    input;
+                }
+                address 10.119.40.0/31;
+            }
+        }
         unit 1113 {
             description "MGMT-L3VPN-TO-OMES-CIR00XXXX [NO-MONITOR]";
             vlan-id 1113;
         }
+        unit 1114 {
+            description PUBNET-L3VPN-TO-OMES-CIR000XXXX;
+            vlan-id 1114;
+            family inet {
+                mtu 9000;
+                sampling {
+                    input;
+                }
+                address 204.62.17.29/31;
+            }
+        }
         unit 1115 {
             description "PUBNET-L3VPN-TO-OMES-CIR000XXXX [NO-MONITOR]";
             vlan-id 1115;
         }
+        unit 1120 {
+            description "VPLS-OMES-2516-CIR0005946 [NO-MONITOR]";
+            encapsulation vlan-vpls;
+            vlan-id 1120;
+            family vpls;
+        }
         unit 5160 {
-            description "VPLS-OMES-2516-CIR0005947 [NO-MONITOR]";
-            vlan-id 2;
+            description "VPLS-OMES-2516-CIR0005946 [NO-MONITOR]";
+            encapsulation vlan-vpls;
+            vlan-id-range 2-1099;
+            family vpls;
         }
-        unit 5161 {
-            description "VPLS-OMES-2516-CIR0005947 [NO-MONITOR]";
-            vlan-id 833;
-        }
-        unit 5162 {
-            description "VPLS-OMES-2516-CIR0005947 [NO-MONITOR]";
-            vlan-id 955;
-        }
-        unit 5163 {
-            description "VPLS-OMES-2516-CIR0005947 [NO-MONITOR]";
-            vlan-id 960;
-        }
-        unit 5164 {
-            description "VPLS-OMES-2516-CIR0005947 [NO-MONITOR]";
-            vlan-id 970;
-        }
         unit 5165 {
-            description "VPLS-OMES-2516-CIR0005947 [NO-MONITOR]";
-            vlan-id 1150;
+            description "VPLS-OMES-2516-CIR0005946 [NO-MONITOR]";
+            encapsulation vlan-vpls;
+            vlan-id-range 1150-4000;
+            family vpls;
         }
     }
     xe-1/0/1 {
@@ -5552,6 +5620,48 @@
             then reject;
         }
     }
+    policy-statement DPS-VRF-EXPORT {
+        term 1 {
+            from protocol static;
+            then {
+                community add DPS-VPN;
+                accept;
+            }
+        }
+        term 2 {
+            from protocol direct;
+            then {
+                community add DPS-VPN;
+                accept;
+            }
+        }
+        term 3 {
+            from protocol ospf;
+            then {
+                community add DPS-VPN;
+                accept;
+            }
+        }
+        term 4 {
+            from protocol bgp;
+            then {
+                community add DPS-VPN;
+                accept;
+            }
+        }
+    }
+    policy-statement DPS-VRF-IMPORT {
+        term 1 {
+            from {
+                protocol bgp;
+                community DPS-VPN;
+            }
+            then accept;
+        }
+        term 2 {
+            then reject;
+        }
+    }
     policy-statement EBGP-CHICK-EXPORT {
         term STEP-1 {
             from policy COMMODITY-PREFIXES-LIST;
@@ -5802,6 +5912,68 @@
             then reject;
         }
     }
+    policy-statement EBGP-OMES-AGENCY-DATA-EXPORT {
+        term reject-default {
+            from {
+                route-filter 0.0.0.0/0 exact;
+            }
+            then reject;
+        }
+        term accept-all {
+            then {
+                metric 100;
+                accept;
+            }
+        }
+        term reject-all {
+            then reject;
+        }
+    }
+    policy-statement EBGP-OMES-AGENCY-DATA-IMPORT {
+        term accept-default {
+            from {
+                route-filter 0.0.0.0/0 exact;
+            }
+            then {
+                metric 100;
+                accept;
+            }
+        }
+        term reject-all {
+            then reject;
+        }
+    }
+    policy-statement EBGP-OMES-DPS-EXPORT {
+        term reject-default {
+            from {
+                route-filter 0.0.0.0/0 exact;
+            }
+            then reject;
+        }
+        term accept-all {
+            then {
+                metric 100;
+                accept;
+            }
+        }
+        term reject-all {
+            then reject;
+        }
+    }
+    policy-statement EBGP-OMES-DPS-IMPORT {
+        term accept-default {
+            from {
+                route-filter 0.0.0.0/0 exact;
+            }
+            then {
+                metric 100;
+                accept;
+            }
+        }
+        term reject-all {
+            then reject;
+        }
+    }
     policy-statement EBGP-OMES-EXPORT {
         term EXPORT-DEFAULT {
             from {
@@ -5849,6 +6021,121 @@
             then reject;
         }
     }
+    policy-statement EBGP-OMES-MGMT-EXPORT {
+        term reject-default {
+            from {
+                route-filter 0.0.0.0/0 exact;
+            }
+            then reject;
+        }
+        term accept-all {
+            then {
+                metric 100;
+                accept;
+            }
+        }
+        term reject-all {
+            then reject;
+        }
+    }
+    policy-statement EBGP-OMES-MGMT-IMPORT {
+        term accept-default {
+            from {
+                route-filter 0.0.0.0/0 exact;
+            }
+            then {
+                metric 100;
+                accept;
+            }
+        }
+        term reject-all {
+            then reject;
+        }
+    }
+    policy-statement EBGP-OMES-ODOT-EXPORT {
+        term reject-default {
+            from {
+                route-filter 0.0.0.0/0 exact;
+            }
+            then reject;
+        }
+        term accept-all {
+            then accept;
+        }
+        term reject-all {
+            then reject;
+        }
+    }
+    policy-statement EBGP-OMES-ODOT-IMPORT {
+        term step-1 {
+            from {
+                route-filter 0.0.0.0/0 exact;
+            }
+            then accept;
+        }
+        term reject-all {
+            then reject;
+        }
+    }
+    policy-statement EBGP-OMES-PUBNET-EXPORT {
+        term reject-default {
+            from {
+                route-filter 0.0.0.0/0 exact;
+            }
+            then reject;
+        }
+        term accept-all {
+            then {
+                metric 100;
+                accept;
+            }
+        }
+        term reject-all {
+            then reject;
+        }
+    }
+    policy-statement EBGP-OMES-PUBNET-IMPORT {
+        term accept-default {
+            from {
+                route-filter 0.0.0.0/0 exact;
+            }
+            then accept;
+        }
+        term reject-all {
+            then reject;
+        }
+    }
+    policy-statement EBGP-OMES-VOIP-EXPORT {
+        term reject-default {
+            from {
+                route-filter 0.0.0.0/0 exact;
+            }
+            then reject;
+        }
+        term accept-all {
+            then {
+                metric 100;
+                accept;
+            }
+        }
+        term reject-all {
+            then reject;
+        }
+    }
+    policy-statement EBGP-OMES-VOIP-IMPORT {
+        term accept-default {
+            from {
+                route-filter 0.0.0.0/0 exact;
+            }
+            then {
+                metric 100;
+                accept;
+            }
+        }
+        term reject-all {
+            then reject;
+        }
+    }
     policy-statement EBGP-OUHSC-IMPORT {
         term prefixes {
             from {
@@ -6083,6 +6370,48 @@
             then reject;
         }
     }
+    policy-statement ODOT-VRF-EXPORT {
+        term 1 {
+            from protocol static;
+            then {
+                community add ODOT-VPN;
+                accept;
+            }
+        }
+        term 2 {
+            from protocol direct;
+            then {
+                community add ODOT-VPN;
+                accept;
+            }
+        }
+        term 3 {
+            from protocol ospf;
+            then {
+                community add ODOT-VPN;
+                accept;
+            }
+        }
+        term 4 {
+            from protocol bgp;
+            then {
+                community add ODOT-VPN;
+                accept;
+            }
+        }
+    }
+    policy-statement ODOT-VRF-IMPORT {
+        term 1 {
+            from {
+                protocol bgp;
+                community ODOT-VPN;
+            }
+            then accept;
+        }
+        term reject {
+            then reject;
+        }
+    }
     policy-statement OIDS-VRF-EXPORT {
         term 1 {
             from protocol static;
@@ -6121,6 +6450,174 @@
             then reject;
         }
     }
+    policy-statement OMES-AGENCY-DATA-VRF-EXPORT {
+        term 1 {
+            from protocol static;
+            then {
+                community add OMES-AGENCY-DATA-VPN;
+                accept;
+            }
+        }
+        term 2 {
+            from protocol direct;
+            then {
+                community add OMES-AGENCY-DATA-VPN;
+                accept;
+            }
+        }
+        term 3 {
+            from protocol ospf;
+            then {
+                community add OMES-AGENCY-DATA-VPN;
+                accept;
+            }
+        }
+        term 4 {
+            from protocol bgp;
+            then {
+                community add OMES-AGENCY-DATA-VPN;
+                accept;
+            }
+        }
+    }
+    policy-statement OMES-AGENCY-DATA-VRF-IMPORT {
+        term 1 {
+            from {
+                protocol bgp;
+                community OMES-AGENCY-DATA-VPN;
+            }
+            then accept;
+        }
+        term 2 {
+            then reject;
+        }
+    }
+    policy-statement OMES-MGMT-VRF-EXPORT {
+        term 1 {
+            from protocol static;
+            then {
+                community add OMES-MGMT-VPN;
+                accept;
+            }
+        }
+        term 2 {
+            from protocol direct;
+            then {
+                community add OMES-MGMT-VPN;
+                accept;
+            }
+        }
+        term 3 {
+            from protocol ospf;
+            then {
+                community add OMES-MGMT-VPN;
+                accept;
+            }
+        }
+        term 4 {
+            from protocol bgp;
+            then {
+                community add OMES-MGMT-VPN;
+                accept;
+            }
+        }
+    }
+    policy-statement OMES-MGMT-VRF-IMPORT {
+        term 1 {
+            from {
+                protocol bgp;
+                community OMES-MGMT-VPN;
+            }
+            then accept;
+        }
+        term 2 {
+            then reject;
+        }
+    }
+    policy-statement OMES-PUBNET-VRF-EXPORT {
+        term 1 {
+            from protocol static;
+            then {
+                community add OMES-PUBNET-VPN;
+                accept;
+            }
+        }
+        term 2 {
+            from protocol direct;
+            then {
+                community add OMES-PUBNET-VPN;
+                accept;
+            }
+        }
+        term 3 {
+            from protocol ospf;
+            then {
+                community add OMES-PUBNET-VPN;
+                accept;
+            }
+        }
+        term 4 {
+            from protocol bgp;
+            then {
+                community add OMES-PUBNET-VPN;
+                accept;
+            }
+        }
+    }
+    policy-statement OMES-PUBNET-VRF-IMPORT {
+        term 1 {
+            from {
+                protocol bgp;
+                community OMES-PUBNET-VPN;
+            }
+            then accept;
+        }
+        term 2 {
+            then reject;
+        }
+    }
+    policy-statement OMES-VOIP-VRF-EXPORT {
+        term 1 {
+            from protocol static;
+            then {
+                community add OMES-VOIP-VPN;
+                accept;
+            }
+        }
+        term 2 {
+            from protocol direct;
+            then {
+                community add OMES-VOIP-VPN;
+                accept;
+            }
+        }
+        term 3 {
+            from protocol ospf;
+            then {
+                community add OMES-VOIP-VPN;
+                accept;
+            }
+        }
+        term 4 {
+            from protocol bgp;
+            then {
+                community add OMES-VOIP-VPN;
+                accept;
+            }
+        }
+    }
+    policy-statement OMES-VOIP-VRF-IMPORT {
+        term 1 {
+            from {
+                protocol bgp;
+                community OMES-VOIP-VPN;
+            }
+            then accept;
+        }
+        term 2 {
+            then reject;
+        }
+    }
     policy-statement ONENET-GRDA-VRF-EXPORT {
         term 1 {
             from protocol static;
@@ -6405,12 +6902,18 @@
     community 5078:40628 members 5078:40628;
     community 5078:64571 members 5078:64571;
     community 5078:8025 members 5078:8025;
+    community DPS-VPN members target:5078:2540;
     community Global-Prepend members 209:64603;
     community Level3-Prepend members 209:64563;
     community NTT-Prepend members 209:64583;
     community ODMHSAS-VPN members target:5078:2559;
+    community ODOT-VPN members target:5078:2538;
     community OIDS-VPN members target:5078:2532;
     community OKCCORE4 members 5078:214;
+    community OMES-AGENCY-DATA-VPN members target:5078:2548;
+    community OMES-MGMT-VPN members target:5078:2550;
+    community OMES-PUBNET-VPN members target:5078:2552;
+    community OMES-VOIP-VPN members target:5078:2549;
     community ONENET-MGMT-VPN members target:5078:2543;
     community ONENET-PoP-APPLIANCES members target:5078:2012;
     community ONENET_BLACKHOLE members 5078:911;
@@ -7520,6 +8023,36 @@
             }
         }
     }
+    DPS-L3VPN {
+        description DPS-L3VPN;
+        instance-type vrf;
+        interface xe-1/0/0.1106;
+        route-distinguisher 164.58.199.214:2540;
+        vrf-import DPS-VRF-IMPORT;
+        vrf-export DPS-VRF-EXPORT;
+        vrf-target target:5078:2540;
+        vrf-table-label;
+        routing-options {
+            autonomous-system 64569;
+        }
+        protocols {
+            bgp {
+                group EBGP-OMES-DPS {
+                    type external;
+                    family inet {
+                        unicast;
+                    }
+                    neighbor 10.119.16.2 {
+                        description "EBGP-OMES-DPS-CIR000XXXX [NO-MONITOR]";
+                        import EBGP-OMES-DPS-IMPORT;
+#                        authentication-key <removed>;
+                        export EBGP-OMES-DPS-EXPORT;
+                        peer-as 40628;
+                    }
+                }
+            }
+        }
+    }
     METRO-TECH-VPLS-2012 {
         description "Metro Tech VPLS";
         instance-type vpls;
@@ -7652,6 +8185,36 @@
             }
         }
     }
+    ODOT-L3VPN {
+        description ODOT-L3VPN;
+        instance-type vrf;
+        interface xe-1/0/0.1105;
+        route-distinguisher 164.58.199.214:2538;
+        vrf-import ODOT-VRF-IMPORT;
+        vrf-export ODOT-VRF-EXPORT;
+        vrf-target target:5078:2538;
+        vrf-table-label;
+        routing-options {
+            autonomous-system 64569;
+        }
+        protocols {
+            bgp {
+                group EBGP-OMES-ODOT {
+                    type external;
+                    family inet {
+                        unicast;
+                    }
+                    neighbor 172.25.255.255 {
+                        description "EBGP-OMES-ODOT-CIR000XXXX [NO-MONITOR]";
+                        import EBGP-OMES-ODOT-IMPORT;
+#                        authentication-key <removed>;
+                        export EBGP-OMES-ODOT-EXPORT;
+                        peer-as 40628;
+                    }
+                }
+            }
+        }
+    }
     OIDS-L3VPN {
         description OIDS-L3VPN;
         instance-type vrf;
@@ -7671,6 +8234,126 @@
             }
         }
     }
+    OMES-AGENCY-DATA-L3VPN {
+        description OMES-AGENCY-DATA-L3VPN;
+        instance-type vrf;
+        interface xe-1/0/0.1108;
+        route-distinguisher 164.58.199.214: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 {
+            autonomous-system 64569;
+        }
+        protocols {
+            bgp {
+                group EBGP-OMES-AGENCY-DATA {
+                    type external;
+                    family inet {
+                        unicast;
+                    }
+                    neighbor 10.119.24.1 {
+                        description "EBGP-OMES-AGENCY-DATA-CIR000XXXX [NO-MONITOR]";
+                        import EBGP-OMES-AGENCY-DATA-IMPORT;
+#                        authentication-key <removed>;
+                        export EBGP-OMES-AGENCY-DATA-EXPORT;
+                        peer-as 40628;
+                    }
+                }
+            }
+        }
+    }
+    OMES-MGMT-L3VPN {
+        description OMES-MGMT-L3VPN;
+        instance-type vrf;
+        interface xe-1/0/0.1112;
+        route-distinguisher 164.58.199.214:2550;
+        vrf-import OMES-MGMT-VRF-IMPORT;
+        vrf-export OMES-MGMT-VRF-EXPORT;
+        vrf-target target:5078:2550;
+        vrf-table-label;
+        routing-options {
+            autonomous-system 64569;
+        }
+        protocols {
+            bgp {
+                group EBGP-OMES-MGMT {
+                    type external;
+                    family inet {
+                        unicast;
+                    }
+                    neighbor 10.119.40.1 {
+                        description "EBGP-OMES-MGMT-CIR000XXXX [NO-MONITOR]";
+                        import EBGP-OMES-MGMT-IMPORT;
+#                        authentication-key <removed>;
+                        export EBGP-OMES-MGMT-EXPORT;
+                        peer-as 40628;
+                    }
+                }
+            }
+        }
+    }
+    OMES-PUBNET-L3VPN {
+        description OMES-PUBNET-L3VPN;
+        instance-type vrf;
+        interface xe-1/0/0.1114;
+        route-distinguisher 164.58.199.214:2552;
+        vrf-import OMES-PUBNET-VRF-IMPORT;
+        vrf-export OMES-PUBNET-VRF-EXPORT;
+        vrf-target target:5078:2552;
+        vrf-table-label;
+        protocols {
+            bgp {
+                group EBGP-OMES-PUBNET {
+                    type external;
+                    import EBGP-OMES-PUBNET-IMPORT;
+                    family inet {
+                        unicast {
+                            loops 2;
+                        }
+                    }
+                    export EBGP-OMES-PUBNET-EXPORT;
+                    peer-as 65001;
+                    local-as 64569 no-prepend-global-as;
+                    neighbor 204.62.17.28 {
+                        description "EBGP-OMES-PUBNET-CIR000XXXX [NO-MONITOR]";
+#                        authentication-key <removed>;
+                    }
+                }
+            }
+        }
+    }
+    OMES-VOIP-L3VPN {
+        description OMES-VOIP-L3VPN;
+        instance-type vrf;
+        interface xe-1/0/0.1110;
+        route-distinguisher 164.58.199.214:2549;
+        vrf-import OMES-VOIP-VRF-IMPORT;
+        vrf-export OMES-VOIP-VRF-EXPORT;
+        vrf-target target:5078:2549;
+        vrf-table-label;
+        routing-options {
+            autonomous-system 64569;
+        }
+        protocols {
+            bgp {
+                group EBGP-OMES-VOIP {
+                    type external;
+                    family inet {
+                        unicast;
+                    }
+                    neighbor 10.119.32.1 {
+                        description "EBGP-OMES-VOIP-CIR000XXXX [NO-MONITOR]";
+                        import EBGP-OMES-VOIP-IMPORT;
+#                        authentication-key <removed>;
+                        export EBGP-OMES-VOIP-EXPORT;
+                        peer-as 40628;
+                    }
+                }
+            }
+        }
+    }
     ONENET-GRDA-L3VPN {
         description "Grand River Dam Authority";
         instance-type vrf;
@@ -7803,6 +8486,7 @@
         interface xe-0/0/1.248;
         interface xe-0/0/1.250;
         interface xe-0/0/1.251;
+        interface xe-1/0/0.1102;
         interface xe-2/0/1.846;
         interface xe-2/0/1.847;
         interface xe-2/0/1.851;
@@ -7828,6 +8512,11 @@
         vrf-export TAGNET-VRF-EXPORT;
         vrf-target target:5078:2531;
         vrf-table-label;
+        routing-options {
+            static {
+                route 10.119.0.2/32 next-hop 10.119.0.2;
+            }
+        }
     }
     UCO {
         description UCO-L3VPN;
@@ -7905,6 +8594,39 @@
             }
         }
     }
+    VPLS-OMES-2516 {
+        description VPLS-OMES;
+        instance-type vpls;
+        vlan-id all;
+        interface xe-1/0/0.1120;
+        interface xe-1/0/0.5160;
+        interface xe-1/0/0.5165;
+        route-distinguisher 164.58.199.214:2516;
+        vrf-target target:5078:2516;
+        protocols {
+            vpls {
+                mac-table-size {
+                    10000;
+                    packet-action drop;
+                }
+                interface-mac-limit {
+                    3000;
+                }
+                no-tunnel-services;
+                site OKC1 {
+                    site-identifier 2;
+                    multi-homing;
+                    site-preference backup;
+                    interface xe-1/0/0.5160;
+                    interface xe-1/0/0.5165;
+                }
+                site OKC4 {
+                    site-identifier 10;
+                    interface xe-1/0/0.1120;
+                }
+            }
+        }
+    }
     VPLS-REDLANDS-2528 {
         description VPLS-REDLANDS-2528;
         instance-type vpls;
Index: configs/core.mus.onenet.net
===================================================================
--- configs/core.mus.onenet.net	(revision 125838)
+++ configs/core.mus.onenet.net	(working copy)
@@ -336,7 +336,6 @@
 #lsi.2 up up
 #lsi.1049855 up up
 #lsi.1049894 up up
-#lsi.1050169 up up
 #lsi.1050997 up up
 #lsi.1051898 up up
 #lsi.1052387 up up
@@ -375,7 +374,7 @@
 #lsi.1055083 up up
 #lsi.1055119 up up
 #lsi.1055120 up up
-#lsi.1055164 up up
+#lsi.1055173 up up
 #mtun up up
 #pimd up up
 #pime up up
Index: configs/core1.dc.onenet.net
===================================================================
--- configs/core1.dc.onenet.net	(revision 125838)
+++ configs/core1.dc.onenet.net	(working copy)
@@ -924,7 +924,6 @@
 #lsi.8 up up
 #lsi.10 up up
 #lsi.1048577 up up
-#lsi.1050025 up up
 #lsi.1050312 up up
 #lsi.1050624 up up
 #lsi.1051364 up up
@@ -934,7 +933,6 @@
 #lsi.1053898 up up
 #lsi.1054007 up up
 #lsi.1054214 up up
-#lsi.1054893 up up
 #lsi.1055194 up up
 #lsi.1055284 up up
 #lsi.1055374 up up
@@ -946,7 +944,8 @@
 #lsi.1055579 up up
 #lsi.1055616 up up
 #lsi.1055625 up up
-#lsi.1055626 up up
+#lsi.1055633 up up
+#lsi.1055636 up up
 #mtun up up
 #pimd up up
 #pime up up
Index: configs/core1.lan-mx80.onenet.net
===================================================================
--- configs/core1.lan-mx80.onenet.net	(revision 125838)
+++ configs/core1.lan-mx80.onenet.net	(working copy)
@@ -270,7 +270,6 @@
 #lsi.1065312 up up
 #lsi.1067458 up up
 #lsi.1067459 up up
-#lsi.1067460 up up
 #lsi.1067461 up up
 #lsi.1067462 up up
 #lsi.1067463 up up
@@ -289,7 +288,7 @@
 #lsi.1069509 up up
 #lsi.1069545 up up
 #lsi.1069581 up up
-#lsi.1069590 up up
+#lsi.1069599 up up
 #me0 up up
 #me0.0 up up
 #mtun up up
Index: configs/core.ada.onenet.net
===================================================================
--- configs/core.ada.onenet.net	(revision 125838)
+++ configs/core.ada.onenet.net	(working copy)
@@ -363,7 +363,6 @@
 #lsi.1050305 up up
 #lsi.1050449 up up
 #lsi.1050480 up up
-#lsi.1053127 up up
 #lsi.1054105 up up
 #lsi.1054464 up up
 #lsi.1054527 up up
@@ -378,8 +377,6 @@
 #lsi.1055419 up up
 #lsi.1055442 up up
 #lsi.1055511 up up
-#lsi.1055564 up up
-#lsi.1055565 up up
 #lsi.1055610 up up
 #lsi.1055659 up up
 #lsi.1055686 up up
@@ -400,7 +397,9 @@
 #lsi.1055876 up up
 #lsi.1055885 up up
 #lsi.1055886 up up
-#lsi.1055887 up up
+#lsi.1055894 up up
+#lsi.1055895 up up
+#lsi.1055898 up up
 #mtun up up
 #pimd up up
 #pime up up
Index: configs/core.ida.onenet.net
===================================================================
--- configs/core.ida.onenet.net	(revision 125838)
+++ configs/core.ida.onenet.net	(working copy)
@@ -342,8 +342,6 @@
 #lsi.1 up up
 #lsi.1057044 up up
 #lsi.1057045 up up
-#lsi.1057046 up up
-#lsi.1057047 up up
 #lsi.1057050 up up
 #lsi.1057055 up up
 #lsi.1057056 up up
@@ -361,7 +359,8 @@
 #lsi.1057459 up up
 #lsi.1057496 up up
 #lsi.1057505 up up
-#lsi.1057506 up up
+#lsi.1057513 up up
+#lsi.1057516 up up
 #mtun up up
 #pimd up up
 #pime up up
Index: configs/core.mca.onenet.net
===================================================================
--- configs/core.mca.onenet.net	(revision 125838)
+++ configs/core.mca.onenet.net	(working copy)
@@ -350,7 +350,6 @@
 #lsi.2 up up
 #lsi.3 up up
 #lsi.4 up up
-#lsi.1048582 up up
 #lsi.1048583 up up
 #lsi.1048584 up up
 #lsi.1048629 up up
@@ -391,7 +390,7 @@
 #lsi.1053464 up up
 #lsi.1053535 up up
 #lsi.1053536 up up
-#lsi.1053545 up up
+#lsi.1053554 up up
 #mtun up up
 #pimd up up
 #pime up up
Index: configs/swi1.towalt.onenet.net
===================================================================
--- configs/swi1.towalt.onenet.net	(revision 125828)
+++ configs/swi1.towalt.onenet.net	(working copy)
@@ -184,8 +184,8 @@
 #ge-0/0/18 down down
 #ge-0/0/19 up up
 #ge-0/0/19.0 up up
-#ge-0/0/20 up up
-#ge-0/0/20.0 up up
+#ge-0/0/20 up down
+#ge-0/0/20.0 up down
 #ge-0/0/21 up up
 #ge-0/0/21.0 up up
 #ge-0/0/22 up up
Index: configs/core.pot.onenet.net
===================================================================
--- configs/core.pot.onenet.net	(revision 125836)
+++ configs/core.pot.onenet.net	(working copy)
@@ -350,7 +350,6 @@
 #lsi.1050105 up up
 #lsi.1050106 up up
 #lsi.1050155 up up
-#lsi.1050266 up up
 #lsi.1051090 up up
 #lsi.1051091 up up
 #lsi.1051094 up up
@@ -386,9 +385,9 @@
 #lsi.1055057 up up
 #lsi.1055093 up up
 #lsi.1055094 up up
-#lsi.1055129 up up
 #lsi.1055130 up up
 #lsi.1055131 up up
+#lsi.1055149 up up
 #mtun up up
 #pimd up up
 #pime up up
Index: configs/core.hut.412.onenet.net
===================================================================
--- configs/core.hut.412.onenet.net	(revision 125838)
+++ configs/core.hut.412.onenet.net	(working copy)
@@ -319,7 +319,6 @@
 #lsi.1049177 up up
 #lsi.1049204 up up
 #lsi.1049236 up up
-#lsi.1049252 up up
 #lsi.1049254 up up
 #lsi.1049257 up up
 #lsi.1049263 up up
@@ -330,6 +329,7 @@
 #lsi.1049284 up up
 #lsi.1049286 up up
 #lsi.1049287 up up
+#lsi.1049288 up up
 #me0 up up
 #me0.0 up up
 #mtun up up
Index: configs/core.hut.ard.onenet.net
===================================================================
--- configs/core.hut.ard.onenet.net	(revision 125838)
+++ configs/core.hut.ard.onenet.net	(working copy)
@@ -319,7 +319,6 @@
 #lsi.1049693 up up
 #lsi.1049718 up up
 #lsi.1049735 up up
-#lsi.1049768 up up
 #lsi.1049770 up up
 #lsi.1049773 up up
 #lsi.1049779 up up
@@ -331,6 +330,7 @@
 #lsi.1049804 up up
 #lsi.1049806 up up
 #lsi.1049807 up up
+#lsi.1049808 up up
 #me0 up up
 #me0.0 up up
 #mtun up up
Index: configs/core.ard.onenet.net
===================================================================
--- configs/core.ard.onenet.net	(revision 125838)
+++ configs/core.ard.onenet.net	(working copy)
@@ -336,9 +336,7 @@
 #lsi up up
 #lsi.0 up up
 #lsi.1051630 up up
-#lsi.1052916 up up
 #lsi.1055521 up up
-#lsi.1056113 up up
 #lsi.1056134 up up
 #lsi.1056208 up up
 #lsi.1056439 up up
@@ -356,7 +354,8 @@
 #lsi.1056821 up up
 #lsi.1056830 up up
 #lsi.1056839 up up
-#lsi.1056840 up up
+#lsi.1056847 up up
+#lsi.1056850 up up
 #mtun up up
 #pimd up up
 #pime up up
Index: configs/hub.tsb.onenet.net
===================================================================
--- configs/hub.tsb.onenet.net	(revision 123720)
+++ configs/hub.tsb.onenet.net	(working copy)
@@ -284,7 +284,9 @@
 #lo0.16385 up up
 #lsi up up
 #lsi.1048832 up up
-#lsi.1048838 up up
+#lsi.1048843 up up
+#lsi.1048844 up up
+#lsi.1048845 up up
 #me0 up up
 #me0.0 up up
 #mtun up up
Index: configs/core.alt.onenet.net
===================================================================
--- configs/core.alt.onenet.net	(revision 125838)
+++ configs/core.alt.onenet.net	(working copy)
@@ -375,7 +375,6 @@
 #lsi.1087093 up up
 #lsi.1102498 up up
 #lsi.1120731 up up
-#lsi.1134961 up up
 #lsi.1135515 up up
 #lsi.1136576 up up
 #lsi.1142621 up up
@@ -388,28 +387,28 @@
 #lsi.1149264 up up
 #lsi.1150038 up up
 #lsi.1150216 up up
-#lsi.1150218 up up
-#lsi.1150219 up up
-#lsi.1150220 up up
-#lsi.1150221 up up
-#lsi.1150222 up up
-#lsi.1150223 up up
-#lsi.1150224 up up
-#lsi.1150225 up up
-#lsi.1150226 up up
-#lsi.1150227 up up
-#lsi.1150228 up up
-#lsi.1150229 up up
-#lsi.1150230 up up
-#lsi.1150231 up up
-#lsi.1150232 up up
-#lsi.1150233 up up
-#lsi.1150234 up up
-#lsi.1150235 up up
-#lsi.1150236 up up
-#lsi.1150237 up up
-#lsi.1150238 up up
-#lsi.1150239 up up
+#lsi.1150371 up up
+#lsi.1150414 up up
+#lsi.1150415 up up
+#lsi.1150416 up up
+#lsi.1150417 up up
+#lsi.1150418 up up
+#lsi.1150419 up up
+#lsi.1150420 up up
+#lsi.1150421 up up
+#lsi.1150422 up up
+#lsi.1150423 up up
+#lsi.1150424 up up
+#lsi.1150425 up up
+#lsi.1150426 up up
+#lsi.1150427 up up
+#lsi.1150428 up up
+#lsi.1150429 up up
+#lsi.1150430 up up
+#lsi.1150431 up up
+#lsi.1150432 up up
+#lsi.1150433 up up
+#lsi.1150434 up up
 #mtun up up
 #pimd up up
 #pime up up
Index: configs/core1.sti-mx960.onenet.net
===================================================================
--- configs/core1.sti-mx960.onenet.net	(revision 125838)
+++ configs/core1.sti-mx960.onenet.net	(working copy)
@@ -660,18 +660,15 @@
 #lsi.2 up up
 #lsi.3 up up
 #lsi.1055648 up up
-#lsi.1057692 up up
 #lsi.1062857 up up
 #lsi.1063938 up up
 #lsi.1063939 up up
 #lsi.1063941 up up
 #lsi.1063942 up up
-#lsi.1063943 up up
 #lsi.1063944 up up
 #lsi.1063945 up up
 #lsi.1063946 up up
 #lsi.1063948 up up
-#lsi.1063951 up up
 #lsi.1063952 up up
 #lsi.1063953 up up
 #lsi.1063954 up up
@@ -684,7 +681,11 @@
 #lsi.1064160 up up
 #lsi.1064197 up up
 #lsi.1064206 up up
-#lsi.1064207 up up
+#lsi.1064214 up up
+#lsi.1064215 up up
+#lsi.1064217 up up
+#lsi.1064219 up up
+#lsi.1064222 up up
 #mtun up up
 #pimd up up
 #pime up up
Index: configs/core.chi.onenet.net
===================================================================
--- configs/core.chi.onenet.net	(revision 125838)
+++ configs/core.chi.onenet.net	(working copy)
@@ -328,7 +328,6 @@
 #lsi.1053893 up up
 #lsi.1054081 up up
 #lsi.1054148 up up
-#lsi.1054248 up up
 #lsi.1054425 up up
 #lsi.1054431 up up
 #lsi.1054452 up up
@@ -338,14 +337,14 @@
 #lsi.1054495 up up
 #lsi.1054502 up up
 #lsi.1054507 up up
-#lsi.1054522 up up
 #lsi.1054542 up up
 #lsi.1054551 up up
 #lsi.1054554 up up
 #lsi.1054559 up up
 #lsi.1054596 up up
 #lsi.1054605 up up
-#lsi.1054606 up up
+#lsi.1054613 up up
+#lsi.1054616 up up
 #mtun up up
 #pimd up up
 #pime up up
Index: configs/core.hut.cli.onenet.net
===================================================================
--- configs/core.hut.cli.onenet.net	(revision 125838)
+++ configs/core.hut.cli.onenet.net	(working copy)
@@ -292,7 +292,6 @@
 #lsi.1048705 up up
 #lsi.1048732 up up
 #lsi.1048764 up up
-#lsi.1048780 up up
 #lsi.1048782 up up
 #lsi.1048785 up up
 #lsi.1048791 up up
@@ -303,6 +302,7 @@
 #lsi.1048812 up up
 #lsi.1048814 up up
 #lsi.1048815 up up
+#lsi.1048816 up up
 #me0 up up
 #me0.0 up up
 #mtun up up
Index: configs/core.hut.wea.onenet.net
===================================================================
--- configs/core.hut.wea.onenet.net	(revision 125838)
+++ configs/core.hut.wea.onenet.net	(working copy)
@@ -302,7 +302,6 @@
 #lsi.1048748 up up
 #lsi.1048780 up up
 #lsi.1048800 up up
-#lsi.1048838 up up
 #lsi.1048841 up up
 #lsi.1048844 up up
 #lsi.1048864 up up
@@ -315,6 +314,7 @@
 #lsi.1048885 up up
 #lsi.1048887 up up
 #lsi.1048888 up up
+#lsi.1048889 up up
 #me0 up up
 #me0.0 up up
 #mtun up up
Index: configs/core.wea.onenet.net
===================================================================
--- configs/core.wea.onenet.net	(revision 125838)
+++ configs/core.wea.onenet.net	(working copy)
@@ -329,9 +329,7 @@
 #lsi.1052687 up up
 #lsi.1054544 up up
 #lsi.1054868 up up
-#lsi.1054871 up up
 #lsi.1054972 up up
-#lsi.1055561 up up
 #lsi.1055617 up up
 #lsi.1055865 up up
 #lsi.1055930 up up
@@ -346,7 +344,8 @@
 #lsi.1056256 up up
 #lsi.1056293 up up
 #lsi.1056302 up up
-#lsi.1056303 up up
+#lsi.1056310 up up
+#lsi.1056313 up up
 #mtun up up
 #pimd up up
 #pime up up
Index: configs/core1.nor.onenet.net
===================================================================
--- configs/core1.nor.onenet.net	(revision 125838)
+++ configs/core1.nor.onenet.net	(working copy)
@@ -439,7 +439,6 @@
 #lsi up up
 #lsi.0 up up
 #lsi.1049547 up up
-#lsi.1049971 up up
 #lsi.1049972 up up
 #lsi.1049973 up up
 #lsi.1051408 up up
@@ -449,7 +448,6 @@
 #lsi.1052408 up up
 #lsi.1052557 up up
 #lsi.1052618 up up
-#lsi.1053117 up up
 #lsi.1053356 up up
 #lsi.1053602 up up
 #lsi.1053692 up up
@@ -462,7 +460,8 @@
 #lsi.1053988 up up
 #lsi.1054025 up up
 #lsi.1054034 up up
-#lsi.1054035 up up
+#lsi.1054042 up up
+#lsi.1054045 up up
 #mtun up up
 #pimd up up
 #pime up up
Index: configs/core.hut.ato.onenet.net
===================================================================
--- configs/core.hut.ato.onenet.net	(revision 125838)
+++ configs/core.hut.ato.onenet.net	(working copy)
@@ -303,7 +303,6 @@
 #lsi.1048580 up up
 #lsi.1048581 up up
 #lsi.1048586 up up
-#lsi.1048587 up up
 #lsi.1048588 up up
 #lsi.1048589 up up
 #lsi.1048590 up up
@@ -318,6 +317,7 @@
 #lsi.1048618 up up
 #lsi.1048620 up up
 #lsi.1048621 up up
+#lsi.1048622 up up
 #me0 up up
 #me0.0 up up
 #mtun up up
Index: configs/core.sem.onenet.net
===================================================================
--- configs/core.sem.onenet.net	(revision 125838)
+++ configs/core.sem.onenet.net	(working copy)
@@ -338,7 +338,6 @@
 #lsi.0 up up
 #lsi.1 up up
 #lsi.1048602 up up
-#lsi.1048604 up up
 #lsi.1048605 up up
 #lsi.1048606 up up
 #lsi.1048607 up up
@@ -347,7 +346,6 @@
 #lsi.1051225 up up
 #lsi.1051371 up up
 #lsi.1051381 up up
-#lsi.1051728 up up
 #lsi.1052210 up up
 #lsi.1052389 up up
 #lsi.1052473 up up
@@ -358,7 +356,8 @@
 #lsi.1052597 up up
 #lsi.1052634 up up
 #lsi.1052643 up up
-#lsi.1052644 up up
+#lsi.1052651 up up
+#lsi.1052654 up up
 #mtun up up
 #pimd up up
 #pime up up
Index: configs/core.dun.onenet.net
===================================================================
--- configs/core.dun.onenet.net	(revision 125838)
+++ configs/core.dun.onenet.net	(working copy)
@@ -364,7 +364,6 @@
 #lsi.1051050 up up
 #lsi.1051077 up up
 #lsi.1051101 up up
-#lsi.1051105 up up
 #lsi.1051106 up up
 #lsi.1051113 up up
 #lsi.1051129 up up
@@ -374,6 +373,7 @@
 #lsi.1051135 up up
 #lsi.1051137 up up
 #lsi.1051138 up up
+#lsi.1051139 up up
 #mtun up up
 #pimd up up
 #pime up up
Index: configs/core.wil.onenet.net
===================================================================
--- configs/core.wil.onenet.net	(revision 125838)
+++ configs/core.wil.onenet.net	(working copy)
@@ -345,7 +345,6 @@
 #lsi.2 up up
 #lsi.3 up up
 #lsi.4 up up
-#lsi.1049952 up up
 #lsi.1050053 up up
 #lsi.1050249 up up
 #lsi.1051371 up up
@@ -386,7 +385,7 @@
 #lsi.1055385 up up
 #lsi.1055421 up up
 #lsi.1055422 up up
-#lsi.1055431 up up
+#lsi.1055440 up up
 #mtun up up
 #pimd up up
 #pime up up



More information about the Nocrancid mailing list