[Nocrancid] autopop-onenet.net router config diffs

rancid at rancid.noc.onenet.net rancid at rancid.noc.onenet.net
Wed Oct 31 14:02:56 CDT 2012


Index: hub.alt.onenet.net
===================================================================
--- hub.alt.onenet.net	(revision 42758)
+++ hub.alt.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at ALTUS-M120-RE0> show system commit 
+#   2012-10-31 13:37:32 CDT by jeremyt via cli commit synchronize
 #   2012-08-25 12:19:18 CDT by admin via cli commit synchronize
 #   2012-08-21 08:50:30 CDT by joel via cli commit synchronize
 #   2012-08-20 16:03:01 CDT by admin via cli commit synchronize
 #   2012-08-17 15:48:22 CDT by jeremyt via cli commit synchronize
 #   2012-08-03 13:57:43 CDT by joe via cli commit synchronize
-#   2012-08-01 07:45:59 CDT by joe via cli commit synchronize
 # grnoc-mon at ALTUS-M120-RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -294,7 +294,7 @@
 # grnoc-mon at ALTUS-M120-RE0> show system uptime 
 # System booted: 2011-06-08 13:06 CDT 
 # Protocols started: 2011-06-08 13:08 CDT 
-# Last configured: 2012-08-25 12:19 CDT  by admin
+# Last configured: 2012-10-31 13:37 CDT  by jeremyt
 # 
 # {master}
 # grnoc-mon at ALTUS-M120-RE0> show interface terse 
@@ -417,7 +417,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at ALTUS-M120-RE0> show configuration 
-## Last commit: 2012-08-25 12:19:18 CDT by admin
+## Last commit: 2012-10-31 13:37:32 CDT by jeremyt
 version 10.4R2.6;
 groups {
     re0 {
@@ -678,10 +678,6 @@
         encapsulation cisco-hdlc;
         unit 0 {
             family inet {
-                filter {
-                    input Quartz-MTN;
-                    output Quartz-MTN;
-                }
                 address 156.110.38.5/30;
             }
         }
@@ -1171,30 +1167,46 @@
 }
 class-of-service {
     classifiers {
-        dscp dscp-default {
+        dscp dscp-onenet {
             import default;
+            forwarding-class scavenger-service {
+                loss-priority high code-points cs1;
+            }
+            forwarding-class expedited-forwarding {
+                loss-priority low code-points [ cs3 cs4 ];
+                loss-priority high code-points cs5;
+            }
         }
     }
+    drop-profiles {
+        T1-interpolated {
+            interpolate {
+                fill-level [ 50 75 ];
+                drop-probability [ 25 50 ];
+            }
+        }
+    }
     forwarding-classes {
-        class data queue-num 0;
-        class voice queue-num 1;
-        class video queue-num 2;
+        class best-effort queue-num 0;
+        class expedited-forwarding queue-num 2;
+        class assured-forwarding queue-num 1;
         class network-control queue-num 3;
+        class scavenger-service queue-num 4;
     }
     interfaces {
-        t1-2/0/2:6 {
-            scheduler-map video-priority-on-t1;
+        lsq-* {
             unit * {
+                scheduler-map t1-sch-map;
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
-        t1-2/0/2:8 {
-            scheduler-map video-priority-on-t1;
-            unit 0 {
+        t1-* {
+            scheduler-map t1-sch-map;
+            unit * {
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
@@ -1202,58 +1214,63 @@
             scheduler-map sch-map;
             unit * {
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
     }
     scheduler-maps {
         sch-map {
-            forwarding-class data scheduler data-sch;
-            forwarding-class voice scheduler voice-sch;
-            forwarding-class video scheduler video-sch;
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler expedited-forwarding-sch;
             forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
         }
-        video-priority-on-t1 {
-            forwarding-class data scheduler data-t1-sch;
-            forwarding-class voice scheduler voice-t1-sch;
-            forwarding-class video scheduler video-t1-sch;
+        t1-sch-map {
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler t1-expedited-forwarding-sch;
+            forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler t1-assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
         }
     }
     schedulers {
-        data-sch {
+        best-effort-sch {
             transmit-rate remainder;
             buffer-size remainder;
             priority low;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
         }
-        voice-sch {
-            transmit-rate percent 50;
-            buffer-size percent 10;
-            priority high;
-        }
-        video-sch {
+        assured-forwarding-sch {
             transmit-rate percent 5;
             buffer-size percent 5;
             priority high;
         }
+        expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
+            priority high;
+        }
         network-control-sch {
             transmit-rate percent 5;
             buffer-size percent 5;
             priority high;
         }
-        data-t1-sch {
-            transmit-rate remainder;
-            buffer-size remainder;
+        scavenger-service-sch {
+            transmit-rate percent 0;
+            buffer-size percent 0;
             priority low;
         }
-        voice-t1-sch {
-            transmit-rate percent 60;
-            buffer-size percent 50;
-            priority high;
+        t1-assured-forwarding-sch {
+            transmit-rate percent 35;
+            buffer-size percent 25;
+            priority medium-high;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
         }
-        video-t1-sch {
-            transmit-rate percent 10;
-            buffer-size percent 5;
+        t1-expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
             priority high;
         }
     }
@@ -1437,33 +1454,6 @@
             }
         }
     }
-    filter Quartz-MTN {
-        term 1 {
-            from {
-                source-address {
-                    164.58.245.58/32;
-                }
-            }
-            then {
-                forwarding-class voice;
-                accept;
-            }
-        }
-        term 2 {
-            from {
-                destination-address {
-                    164.58.245.58/32;
-                }
-            }
-            then {
-                forwarding-class voice;
-                accept;
-            }
-        }
-        term accept-all {
-            then accept;
-        }
-    }
 }
 {master}
 # grnoc-mon at ALTUS-M120-RE0> show ospf neighbor 

Index: core3.tul-m120.onenet.net
===================================================================
--- core3.tul-m120.onenet.net	(revision 43015)
+++ core3.tul-m120.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at TULSA-CORE-3-M120-RE0> show system commit 
+#   2012-10-31 14:00:14 CDT by jeremyt via cli commit synchronize
+#   2012-10-31 13:20:01 CDT by jeremyt via cli commit synchronize
+#   2012-10-31 13:18:28 CDT by jeremyt via cli commit confirmed, rollback in 5mins synchronize
 #   2012-10-25 16:04:05 CDT by bobby via cli commit synchronize
 #   2012-08-29 16:37:35 CDT by joe via cli commit synchronize
 #   2012-08-29 09:47:33 CDT by joe via cli commit synchronize
-#   2012-08-28 09:21:20 CDT by joe via cli commit synchronize
-#   2012-08-28 09:11:58 CDT by joe via cli commit synchronize
-#   2012-08-16 23:08:06 CDT by rnordmark via cli commit synchronize
 # grnoc-mon at TULSA-CORE-3-M120-RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -342,7 +342,7 @@
 # grnoc-mon at TULSA-CORE-3-M120-RE0> show system uptime 
 # System booted: 2011-04-16 20:58 CDT 
 # Protocols started: 2011-04-16 20:59 CDT 
-# Last configured: 2012-10-25 16:04 CDT  by bobby
+# Last configured: 2012-10-31 14:00 CDT  by jeremyt
 # 
 # {master}
 # grnoc-mon at TULSA-CORE-3-M120-RE0> show interface terse 
@@ -688,7 +688,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at TULSA-CORE-3-M120-RE0> show configuration 
-## Last commit: 2012-10-25 16:04:05 CDT by bobby
+## Last commit: 2012-10-31 14:00:14 CDT by jeremyt
 version 10.4R2.6;
 groups {
     re0 {
@@ -952,24 +952,6 @@
         clocking external;
         no-partition interface-type t3;
     }
-    inactive: t3-2/0/2 {
-        description OneNetHub-Bartlesville-CIR0002353;
-        clocking external;
-        encapsulation cisco-hdlc;
-        t3-options {
-            no-cbit-parity;
-        }
-        unit 0 {
-            family inet {
-                filter {
-                    input VIDEO;
-                    output VIDEO-FLOW;
-                }
-                address 164.58.244.17/30;
-            }
-            family mpls;
-        }
-    }
     ct3-2/0/3 {
         clocking external;
         no-partition interface-type t3;
@@ -2272,96 +2254,6 @@
     }
 }
 policy-options {
-    prefix-list VIDEO {
-        156.110.28.218/32;
-        156.110.28.219/32;
-        156.110.31.218/32;
-        156.110.31.219/32;
-        156.110.31.226/32;
-        156.110.34.134/32;
-        156.110.34.182/32;
-        156.110.35.74/32;
-        156.110.35.75/32;
-        156.110.38.30/32;
-        156.110.38.106/32;
-        156.110.38.110/32;
-        156.110.39.10/32;
-        156.110.43.18/32;
-        156.110.47.2/32;
-        156.110.47.3/32;
-        156.110.47.154/32;
-        156.110.47.170/32;
-        156.110.50.26/32;
-        156.110.50.30/32;
-        156.110.55.10/32;
-        156.110.58.126/32;
-        156.110.58.150/32;
-        156.110.59.58/32;
-        156.110.63.2/32;
-        156.110.66.110/32;
-        156.110.66.114/32;
-        156.110.67.26/32;
-        156.110.70.106/32;
-        156.110.71.10/32;
-        156.110.78.114/32;
-        156.110.79.2/32;
-        156.110.82.106/32;
-        156.110.83.2/32;
-        156.110.87.10/32;
-        156.110.90.110/32;
-        156.110.91.10/32;
-        156.110.91.11/32;
-        156.110.99.106/32;
-        156.110.107.34/32;
-        156.110.111.10/32;
-        156.110.114.58/32;
-        156.110.114.110/32;
-        156.110.115.74/32;
-        156.110.118.22/32;
-        156.110.119.2/32;
-        156.110.122.106/32;
-        156.110.122.110/32;
-        156.110.127.50/32;
-        156.110.134.102/32;
-        156.110.134.106/32;
-        156.110.142.110/32;
-        156.110.143.2/32;
-        156.110.200.98/32;
-        156.110.202.118/32;
-        156.110.204.42/32;
-        156.110.204.43/32;
-        156.110.204.44/32;
-        156.110.204.45/32;
-        156.110.204.130/32;
-        156.110.204.226/32;
-        156.110.204.230/32;
-        156.110.211.42/32;
-        156.110.214.34/32;
-        156.110.214.110/32;
-        156.110.218.6/32;
-        156.110.218.114/32;
-        156.110.219.10/32;
-        156.110.222.106/32;
-        156.110.223.50/32;
-        156.110.227.50/32;
-        156.110.230.106/32;
-        156.110.235.26/32;
-        156.110.235.106/32;
-        164.58.23.11/32;
-        164.58.28.130/32;
-        164.58.77.211/32;
-        164.58.82.4/32;
-        164.58.82.135/32;
-        164.58.82.136/32;
-        164.58.102.216/32;
-        164.58.176.8/32;
-        164.58.177.77/32;
-        164.58.226.21/32;
-        164.58.253.189/32;
-        204.87.86.34/32;
-        204.87.86.35/32;
-        204.87.86.36/32;
-    }
     prefix-list EBGP-IPV4-NEIGHBORS;
     policy-statement LOAD-BALANCE {
         then {
@@ -2444,66 +2336,89 @@
 }
 class-of-service {
     classifiers {
-        dscp dscp-default {
+        dscp dscp-onenet {
             import default;
+            forwarding-class scavenger-service {
+                loss-priority high code-points cs1;
+            }
+            forwarding-class expedited-forwarding {
+                loss-priority low code-points [ cs3 cs4 ];
+                loss-priority high code-points cs5;
+            }
         }
     }
+    drop-profiles {
+        T1-interpolated {
+            interpolate {
+                fill-level [ 50 75 ];
+                drop-probability [ 25 50 ];
+            }
+        }
+    }
     forwarding-classes {
-        class data queue-num 0;
-        class voice queue-num 1;
-        class video queue-num 2;
+        class best-effort queue-num 0;
+        class expedited-forwarding queue-num 2;
+        class assured-forwarding queue-num 1;
         class network-control queue-num 3;
-        class scavenger queue-num 4;
+        class scavenger-service queue-num 4;
     }
     interfaces {
-        t3-2/0/2 {
-            scheduler-map sch-map;
-            unit 0 {
+        lsq-* {
+            unit * {
+                scheduler-map t1-sch-map;
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
+        t1-* {
+            scheduler-map t1-sch-map;
+            unit * {
+                classifiers {
+                    dscp dscp-onenet;
+                }
+            }
+        }
         all {
             scheduler-map sch-map;
             unit * {
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
     }
-    rewrite-rules {
-        dscp VIDEO {
-            import default;
-            forwarding-class video {
-                loss-priority high code-point af12;
-            }
-        }
-    }
     scheduler-maps {
         sch-map {
-            forwarding-class data scheduler data-sch;
-            forwarding-class voice scheduler voice-sch;
-            forwarding-class video scheduler video-sch;
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler expedited-forwarding-sch;
             forwarding-class network-control scheduler network-control-sch;
-            forwarding-class scavenger scheduler scav-sch;
+            forwarding-class assured-forwarding scheduler assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
         }
+        t1-sch-map {
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler t1-expedited-forwarding-sch;
+            forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler t1-assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
+        }
     }
     schedulers {
-        data-sch {
+        best-effort-sch {
             transmit-rate remainder;
             buffer-size remainder;
             priority low;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
         }
-        voice-sch {
+        assured-forwarding-sch {
             transmit-rate percent 5;
             buffer-size percent 5;
             priority high;
         }
-        video-sch {
-            transmit-rate percent 15;
-            buffer-size percent 15;
+        expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
             priority high;
         }
         network-control-sch {
@@ -2511,11 +2426,22 @@
             buffer-size percent 5;
             priority high;
         }
-        scav-sch {
-            transmit-rate percent 2;
-            buffer-size percent 1;
+        scavenger-service-sch {
+            transmit-rate percent 0;
+            buffer-size percent 0;
             priority low;
         }
+        t1-assured-forwarding-sch {
+            transmit-rate percent 35;
+            buffer-size percent 25;
+            priority medium-high;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
+        }
+        t1-expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
+            priority high;
+        }
     }
 }
 firewall {
@@ -2538,92 +2464,6 @@
                 }
             }
         }
-        filter VIDEO {
-            term 1 {
-                from {
-                    source-address {
-                        156.110.211.42/32;
-                    }
-                    destination-address {
-                        0.0.0.0/0;
-                    }
-                }
-                then {
-                    forwarding-class video;
-                    accept;
-                }
-            }
-            term 2 {
-                from {
-                    source-address {
-                        0.0.0.0/0;
-                    }
-                    destination-address {
-                        156.110.211.42/32;
-                    }
-                }
-                then {
-                    forwarding-class video;
-                    accept;
-                }
-            }
-            term ALL_FLOW {
-                from {
-                    source-address {
-                        0.0.0.0/0;
-                    }
-                    destination-address {
-                        0.0.0.0/0;
-                    }
-                }
-                then sample;
-            }
-            term 3 {
-                then accept;
-            }
-        }
-        filter VIDEO-FLOW {
-            interface-specific;
-            term ALL_FLOW {
-                from {
-                    source-address {
-                        0.0.0.0/0;
-                    }
-                    destination-address {
-                        0.0.0.0/0;
-                    }
-                }
-                then {
-                    sample;
-                    next term;
-                }
-            }
-            term 1 {
-                from {
-                    source-prefix-list {
-                        VIDEO;
-                    }
-                }
-                then {
-                    forwarding-class video;
-                    accept;
-                }
-            }
-            term 2 {
-                from {
-                    destination-prefix-list {
-                        VIDEO;
-                    }
-                }
-                then {
-                    forwarding-class video;
-                    accept;
-                }
-            }
-            term ACCEPT-ALL {
-                then accept;
-            }
-        }
         filter PROTECT-RE {
             term SERVICES {
                 from {
@@ -2788,7 +2628,7 @@
             bandwidth-limit 45m;
             burst-size-limit 150k;
         }
-        then forwarding-class scavenger;
+        then forwarding-class scavenger-service;
     }
     filter CARL-ALBERT {
         interface-specific;

Index: hub.bar.onenet.net
===================================================================
--- hub.bar.onenet.net	(revision 43091)
+++ hub.bar.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at BARTLESVILLE-M120-RE0> show system commit 
+#   2012-10-31 13:42:52 CDT by rnordmark via cli commit synchronize
 #   2012-10-30 13:41:49 CDT by joel via cli commit synchronize
 #   2012-10-30 13:36:23 CDT by joel via cli commit synchronize
 #   2012-10-04 14:57:34 CDT by joe via cli commit synchronize
 #   2012-09-21 15:47:40 CDT by joel via cli commit synchronize
 #   2012-09-21 11:44:46 CDT by joel via cli commit synchronize
-#   2012-09-12 08:13:41 CDT by joe via cli commit synchronize
 # grnoc-mon at BARTLESVILLE-M120-RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -294,7 +294,7 @@
 # grnoc-mon at BARTLESVILLE-M120-RE0> show system uptime 
 # System booted: 2011-02-25 14:01 CST 
 # Protocols started: 2011-02-25 14:02 CST 
-# Last configured: 2012-10-30 13:41 CDT  by joel
+# Last configured: 2012-10-31 13:42 CDT  by rnordmark
 # 
 # {master}
 # grnoc-mon at BARTLESVILLE-M120-RE0> show interface terse 
@@ -414,7 +414,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at BARTLESVILLE-M120-RE0> show configuration 
-## Last commit: 2012-10-30 13:41:49 CDT by joel
+## Last commit: 2012-10-31 13:42:52 CDT by rnordmark
 version 10.4R2.6;
 groups {
     re0 {
@@ -737,10 +737,6 @@
         encapsulation cisco-hdlc;
         unit 0 {
             family inet {
-                filter {
-                    input VIDEO;
-                    output VIDEO;
-                }
                 address 172.23.2.193/30;
             }
         }
@@ -1167,30 +1163,46 @@
 }
 class-of-service {
     classifiers {
-        dscp dscp-default {
+        dscp dscp-onenet {
             import default;
+            forwarding-class scavenger-service {
+                loss-priority high code-points cs1;
+            }
+            forwarding-class expedited-forwarding {
+                loss-priority low code-points [ cs3 cs4 ];
+                loss-priority high code-points cs5;
+            }
         }
     }
+    drop-profiles {
+        T1-interpolated {
+            interpolate {
+                fill-level [ 50 75 ];
+                drop-probability [ 25 50 ];
+            }
+        }
+    }
     forwarding-classes {
-        class data queue-num 0;
-        class voice queue-num 1;
-        class video queue-num 2;
+        class best-effort queue-num 0;
+        class expedited-forwarding queue-num 2;
+        class assured-forwarding queue-num 1;
         class network-control queue-num 3;
+        class scavenger-service queue-num 4;
     }
     interfaces {
-        t1-2/0/0:7 {
-            scheduler-map video-priority-on-t1;
+        lsq-* {
             unit * {
+                scheduler-map t1-sch-map;
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
-        t1-2/0/2:13 {
-            scheduler-map video-priority-on-t1;
+        t1-* {
+            scheduler-map t1-sch-map;
             unit * {
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
@@ -1198,38 +1210,42 @@
             scheduler-map sch-map;
             unit * {
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
     }
     scheduler-maps {
         sch-map {
-            forwarding-class data scheduler data-sch;
-            forwarding-class voice scheduler voice-sch;
-            forwarding-class video scheduler video-sch;
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler expedited-forwarding-sch;
             forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
         }
-        video-priority-on-t1 {
-            forwarding-class data scheduler data-t1-sch;
-            forwarding-class voice scheduler voice-t1-sch;
-            forwarding-class video scheduler video-t1-sch;
+        t1-sch-map {
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler t1-expedited-forwarding-sch;
+            forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler t1-assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
         }
     }
     schedulers {
-        data-sch {
+        best-effort-sch {
             transmit-rate remainder;
             buffer-size remainder;
             priority low;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
         }
-        voice-sch {
+        assured-forwarding-sch {
             transmit-rate percent 5;
             buffer-size percent 5;
             priority high;
         }
-        video-sch {
-            transmit-rate percent 15;
-            buffer-size percent 15;
+        expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
             priority high;
         }
         network-control-sch {
@@ -1237,19 +1253,20 @@
             buffer-size percent 5;
             priority high;
         }
-        data-t1-sch {
-            transmit-rate remainder;
-            buffer-size remainder;
+        scavenger-service-sch {
+            transmit-rate percent 0;
+            buffer-size percent 0;
             priority low;
         }
-        voice-t1-sch {
-            transmit-rate percent 60;
-            buffer-size percent 50;
-            priority high;
+        t1-assured-forwarding-sch {
+            transmit-rate percent 35;
+            buffer-size percent 25;
+            priority medium-high;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
         }
-        video-t1-sch {
-            transmit-rate percent 10;
-            buffer-size percent 5;
+        t1-expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
             priority high;
         }
     }
@@ -1274,39 +1291,6 @@
                 }
             }
         }
-        filter VIDEO {
-            term 1 {
-                from {
-                    source-address {
-                        156.110.211.42/32;
-                    }
-                    destination-address {
-                        0.0.0.0/0;
-                    }
-                }
-                then {
-                    forwarding-class video;
-                    accept;
-                }
-            }
-            term 2 {
-                from {
-                    source-address {
-                        0.0.0.0/0;
-                    }
-                    destination-address {
-                        156.110.211.42/32;
-                    }
-                }
-                then {
-                    forwarding-class video;
-                    accept;
-                }
-            }
-            term 3 {
-                then accept;
-            }
-        }
         filter PROTECT-RE {
             term SERVICES {
                 from {

Index: hub.ada.onenet.net
===================================================================
--- hub.ada.onenet.net	(revision 43098)
+++ hub.ada.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at ADA-M120-RE0> show system commit 
+#   2012-10-31 13:34:45 CDT by jeremyt via cli commit synchronize
+#   2012-10-31 13:34:16 CDT by jeremyt via cli commit synchronize
 #   2012-10-30 14:20:08 CDT by joel via cli commit synchronize
 #   2012-10-30 11:08:29 CDT by bobby via cli commit synchronize
 #   2012-10-04 17:49:38 CDT by joel via cli commit synchronize
 #   2012-10-04 17:49:16 CDT by joel via cli commit synchronize
-#   2012-10-04 17:43:20 CDT by joel via cli commit synchronize
-#   2012-10-04 17:42:53 CDT by joel via cli commit synchronize
 # grnoc-mon at ADA-M120-RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -300,7 +300,7 @@
 # grnoc-mon at ADA-M120-RE0> show system uptime 
 # System booted: 2011-06-29 18:00 CDT 
 # Protocols started: 2011-06-29 18:02 CDT 
-# Last configured: 2012-10-30 14:20 CDT  by joel
+# Last configured: 2012-10-31 13:34 CDT  by jeremyt
 # 
 # {master}
 # grnoc-mon at ADA-M120-RE0> show interface terse 
@@ -492,7 +492,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at ADA-M120-RE0> show configuration 
-## Last commit: 2012-10-30 14:20:08 CDT by joel
+## Last commit: 2012-10-31 13:34:45 CDT by jeremyt
 version 10.4R2.6;
 groups {
     re0 {
@@ -1627,77 +1627,89 @@
 }
 class-of-service {
     classifiers {
-        dscp dscp-default {
+        dscp dscp-onenet {
             import default;
+            forwarding-class scavenger-service {
+                loss-priority high code-points cs1;
+            }
+            forwarding-class expedited-forwarding {
+                loss-priority low code-points [ cs3 cs4 ];
+                loss-priority high code-points cs5;
+            }
         }
     }
+    drop-profiles {
+        T1-interpolated {
+            interpolate {
+                fill-level [ 50 75 ];
+                drop-probability [ 25 50 ];
+            }
+        }
+    }
     forwarding-classes {
-        class data queue-num 0;
-        class voice queue-num 1;
-        class video queue-num 2;
+        class best-effort queue-num 0;
+        class expedited-forwarding queue-num 2;
+        class assured-forwarding queue-num 1;
         class network-control queue-num 3;
+        class scavenger-service queue-num 4;
     }
     interfaces {
-        t1-2/0/2:10 {
-            scheduler-map video-priority-on-t1;
+        lsq-* {
             unit * {
+                scheduler-map t1-sch-map;
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
-        t1-2/0/2:12 {
-            scheduler-map video-priority-on-t1;
+        t1-* {
+            scheduler-map t1-sch-map;
             unit * {
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
-        t1-2/0/2:21 {
-            scheduler-map video-priority-on-t1;
-            unit * {
-                classifiers {
-                    dscp dscp-default;
-                }
-            }
-        }
         all {
             scheduler-map sch-map;
             unit * {
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
     }
     scheduler-maps {
         sch-map {
-            forwarding-class data scheduler data-sch;
-            forwarding-class voice scheduler voice-sch;
-            forwarding-class video scheduler video-sch;
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler expedited-forwarding-sch;
             forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
         }
-        video-priority-on-t1 {
-            forwarding-class data scheduler data-t1-sch;
-            forwarding-class voice scheduler voice-t1-sch;
-            forwarding-class video scheduler video-t1-sch;
+        t1-sch-map {
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler t1-expedited-forwarding-sch;
+            forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler t1-assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
         }
     }
     schedulers {
-        data-sch {
+        best-effort-sch {
             transmit-rate remainder;
             buffer-size remainder;
             priority low;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
         }
-        voice-sch {
-            transmit-rate percent 50;
-            buffer-size percent 10;
+        assured-forwarding-sch {
+            transmit-rate percent 5;
+            buffer-size percent 5;
             priority high;
         }
-        video-sch {
-            transmit-rate percent 20;
-            buffer-size percent 20;
+        expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
             priority high;
         }
         network-control-sch {
@@ -1705,19 +1717,20 @@
             buffer-size percent 5;
             priority high;
         }
-        data-t1-sch {
-            transmit-rate remainder;
-            buffer-size remainder;
+        scavenger-service-sch {
+            transmit-rate percent 0;
+            buffer-size percent 0;
             priority low;
         }
-        voice-t1-sch {
-            transmit-rate percent 60;
-            buffer-size percent 50;
-            priority high;
+        t1-assured-forwarding-sch {
+            transmit-rate percent 35;
+            buffer-size percent 25;
+            priority medium-high;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
         }
-        video-t1-sch {
-            transmit-rate percent 10;
-            buffer-size percent 5;
+        t1-expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
             priority high;
         }
     }
@@ -1742,39 +1755,6 @@
                 }
             }
         }
-        filter DOH-VIDEO {
-            term 1 {
-                from {
-                    source-address {
-                        156.110.34.134/32;
-                    }
-                    destination-address {
-                        0.0.0.0/0;
-                    }
-                }
-                then {
-                    forwarding-class video;
-                    accept;
-                }
-            }
-            term 2 {
-                from {
-                    source-address {
-                        0.0.0.0/0;
-                    }
-                    destination-address {
-                        156.110.34.134/32;
-                    }
-                }
-                then {
-                    forwarding-class video;
-                    accept;
-                }
-            }
-            term 3 {
-                then accept;
-            }
-        }
         filter PROTECT-RE {
             term SERVICES {
                 from {

Index: hub.dur.mx480.onenet.net
===================================================================
--- hub.dur.mx480.onenet.net	(revision 43151)
+++ hub.dur.mx480.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at DURANT-MX480-RE0> show system commit 
-#   2012-10-31 13:01:41 CDT by admin via netconf commit synchronize
-#   2012-10-31 13:01:37 CDT by admin via netconf commit synchronize
-#   2012-10-31 13:00:45 CDT by admin via netconf commit synchronize
-#   2012-10-31 13:00:41 CDT by admin via netconf commit synchronize
-#   2012-10-31 12:59:45 CDT by admin via netconf commit synchronize
-#   2012-10-31 12:59:41 CDT by admin via netconf commit synchronize
+#   2012-10-31 14:01:48 CDT by admin via netconf commit synchronize
+#   2012-10-31 14:01:44 CDT by admin via netconf commit synchronize
+#   2012-10-31 14:00:49 CDT by admin via netconf commit synchronize
+#   2012-10-31 14:00:46 CDT by admin via netconf commit synchronize
+#   2012-10-31 13:59:48 CDT by admin via netconf commit synchronize
+#   2012-10-31 13:59:44 CDT by admin via netconf commit synchronize
 # grnoc-mon at DURANT-MX480-RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -270,7 +270,7 @@
 # grnoc-mon at DURANT-MX480-RE0> show system uptime 
 # System booted: 2012-08-08 12:40 CDT 
 # Protocols started: 2012-08-08 12:42 CDT 
-# Last configured: 2012-10-31 13:01 CDT  by admin
+# Last configured: 2012-10-31 14:01 CDT  by admin
 # 
 # {master}
 # grnoc-mon at DURANT-MX480-RE0> show interface terse 
@@ -337,7 +337,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at DURANT-MX480-RE0> show configuration 
-## Last commit: 2012-10-31 13:01:41 CDT by admin
+## Last commit: 2012-10-31 14:01:48 CDT by admin
 version 11.4R4.4;
 groups {
     re0 {

Index: hub.goo.onenet.net
===================================================================
--- hub.goo.onenet.net	(revision 43107)
+++ hub.goo.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at GOODWELL-M120-RE0> show system commit 
+#   2012-10-31 13:47:30 CDT by jeremyt via cli commit synchronize
 #   2012-10-30 16:04:33 CDT by joel via cli commit synchronize
 #   2012-09-05 13:59:50 CDT by joel via cli commit synchronize
 #   2012-08-17 15:51:19 CDT by jeremyt via cli commit synchronize
 #   2012-06-14 11:35:17 CDT by joe via cli commit synchronize
 #   2012-06-14 11:33:24 CDT by joe via cli commit synchronize
-#   2012-05-24 15:52:06 CDT by joel via cli commit synchronize
 # grnoc-mon at GOODWELL-M120-RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -296,7 +296,7 @@
 # grnoc-mon at GOODWELL-M120-RE0> show system uptime 
 # System booted: 2011-04-15 11:59 CDT 
 # Protocols started: 2011-04-15 12:00 CDT 
-# Last configured: 2012-10-30 16:04 CDT  by joel
+# Last configured: 2012-10-31 13:47 CDT  by jeremyt
 # 
 # {master}
 # grnoc-mon at GOODWELL-M120-RE0> show interface terse 
@@ -444,7 +444,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at GOODWELL-M120-RE0> show configuration 
-## Last commit: 2012-10-30 16:04:33 CDT by joel
+## Last commit: 2012-10-31 13:47:30 CDT by jeremyt
 version 10.4R2.6;
 groups {
     re0 {
@@ -1153,12 +1153,19 @@
 }
 class-of-service {
     classifiers {
-        dscp dscp-default {
+        dscp dscp-onenet {
             import default;
+            forwarding-class scavenger-service {
+                loss-priority high code-points cs1;
+            }
+            forwarding-class expedited-forwarding {
+                loss-priority low code-points [ cs3 cs4 ];
+                loss-priority high code-points cs5;
+            }
         }
     }
     drop-profiles {
-        INTERPOLATED-PROFILE {
+        T1-interpolated {
             interpolate {
                 fill-level [ 50 75 ];
                 drop-probability [ 25 50 ];
@@ -1166,53 +1173,92 @@
         }
     }
     forwarding-classes {
-        class data queue-num 0;
-        class voice queue-num 1;
-        class video queue-num 2;
+        class best-effort queue-num 0;
+        class expedited-forwarding queue-num 2;
+        class assured-forwarding queue-num 1;
         class network-control queue-num 3;
+        class scavenger-service queue-num 4;
     }
     interfaces {
+        lsq-* {
+            unit * {
+                scheduler-map t1-sch-map;
+                classifiers {
+                    dscp dscp-onenet;
+                }
+            }
+        }
+        t1-* {
+            scheduler-map t1-sch-map;
+            unit * {
+                classifiers {
+                    dscp dscp-onenet;
+                }
+            }
+        }
         all {
             scheduler-map sch-map;
             unit * {
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
     }
     scheduler-maps {
         sch-map {
-            forwarding-class data scheduler data-sch;
-            forwarding-class voice scheduler voice-sch;
-            forwarding-class video scheduler video-sch;
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler expedited-forwarding-sch;
             forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
         }
+        t1-sch-map {
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler t1-expedited-forwarding-sch;
+            forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler t1-assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
+        }
     }
     schedulers {
-        data-sch {
+        best-effort-sch {
             transmit-rate remainder;
             buffer-size remainder;
             priority low;
-            drop-profile-map loss-priority any protocol any drop-profile INTERPOLATED-PROFILE;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
         }
-        voice-sch {
+        assured-forwarding-sch {
             transmit-rate percent 5;
             buffer-size percent 5;
             priority high;
-            drop-profile-map loss-priority any protocol any drop-profile INTERPOLATED-PROFILE;
         }
-        video-sch {
-            transmit-rate percent 5;
-            buffer-size percent 5;
+        expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
             priority high;
-            drop-profile-map loss-priority any protocol any drop-profile INTERPOLATED-PROFILE;
         }
         network-control-sch {
             transmit-rate percent 5;
             buffer-size percent 5;
             priority high;
         }
+        scavenger-service-sch {
+            transmit-rate percent 0;
+            buffer-size percent 0;
+            priority low;
+        }
+        t1-assured-forwarding-sch {
+            transmit-rate percent 35;
+            buffer-size percent 25;
+            priority medium-high;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
+        }
+        t1-expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
+            priority high;
+        }
     }
 }
 firewall {
@@ -1235,105 +1281,6 @@
                 }
             }
         }
-        inactive: filter OKC-TAX {
-            term 1 {
-                from {
-                    source-address {
-                        164.58.0.176/30;
-                        164.58.0.228/30;
-                    }
-                    destination-address {
-                        0.0.0.0/0;
-                    }
-                }
-                then {
-                    count OK-TAX-COUNTER;
-                    log;
-                    forwarding-class video;
-                    next term;
-                }
-            }
-            term ALL_FLOW {
-                from {
-                    source-address {
-                        0.0.0.0/0;
-                    }
-                    destination-address {
-                        0.0.0.0/0;
-                    }
-                }
-                then sample;
-            }
-            term 2 {
-                then accept;
-            }
-        }
-        filter TAX-VIDEO {
-            term 1 {
-                from {
-                    source-address {
-                        164.58.0.230/32;
-                    }
-                    destination-address {
-                        0.0.0.0/0;
-                    }
-                }
-                then {
-                    forwarding-class video;
-                    accept;
-                }
-            }
-            term 2 {
-                from {
-                    source-address {
-                        0.0.0.0/0;
-                    }
-                    destination-address {
-                        164.58.0.230/32;
-                    }
-                }
-                then {
-                    forwarding-class video;
-                    accept;
-                }
-            }
-            term 3 {
-                then accept;
-            }
-        }
-        filter TAX2-VIDEO {
-            term 1 {
-                from {
-                    source-address {
-                        164.58.0.178/32;
-                    }
-                    destination-address {
-                        0.0.0.0/0;
-                    }
-                }
-                then {
-                    forwarding-class video;
-                    accept;
-                }
-            }
-            term 2 {
-                from {
-                    source-address {
-                        0.0.0.0/0;
-                    }
-                    destination-address {
-                        164.58.0.178/32;
-                    }
-                }
-                then {
-                    forwarding-class video;
-                    accept;
-                }
-            }
-            term 3 {
-                then accept;
-            }
-        }
         filter PROTECT-RE {
             term SERVICES {
                 from {

Index: hub.ard.onenet.net
===================================================================
--- hub.ard.onenet.net	(revision 42741)
+++ hub.ard.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at ARDMORE-M120-RE0> show system commit 
+#   2012-10-31 13:39:17 CDT by jeremyt via cli commit synchronize
+#   2012-10-31 13:37:00 CDT by jeremyt via cli commit synchronize
 #   2012-08-17 15:48:57 CDT by jeremyt via cli commit synchronize
 #   2012-08-16 07:52:11 CDT by joe via cli commit synchronize
 #   2012-08-10 11:37:10 CDT by admin via cli commit synchronize
 #   2012-08-10 09:34:08 CDT by joe via cli commit synchronize
-#   2012-08-09 11:45:11 CDT by bobby via cli commit synchronize
-#   2012-08-09 11:33:07 CDT by bobby via cli commit synchronize
 # grnoc-mon at ARDMORE-M120-RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -298,7 +298,7 @@
 # grnoc-mon at ARDMORE-M120-RE0> show system uptime 
 # System booted: 2011-12-22 11:55 CST 
 # Protocols started: 2011-12-22 12:59 CST 
-# Last configured: 2012-08-17 15:48 CDT  by jeremyt
+# Last configured: 2012-10-31 13:39 CDT  by jeremyt
 # 
 # {master}
 # grnoc-mon at ARDMORE-M120-RE0> show interface terse 
@@ -469,7 +469,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at ARDMORE-M120-RE0> show configuration 
-## Last commit: 2012-08-17 15:48:57 CDT by jeremyt
+## Last commit: 2012-10-31 13:39:17 CDT by jeremyt
 version 10.4R2.6;
 groups {
     re0 {
@@ -1453,77 +1453,89 @@
 }
 class-of-service {
     classifiers {
-        dscp dscp-default {
+        dscp dscp-onenet {
             import default;
+            forwarding-class scavenger-service {
+                loss-priority high code-points cs1;
+            }
+            forwarding-class expedited-forwarding {
+                loss-priority low code-points [ cs3 cs4 ];
+                loss-priority high code-points cs5;
+            }
         }
     }
+    drop-profiles {
+        T1-interpolated {
+            interpolate {
+                fill-level [ 50 75 ];
+                drop-probability [ 25 50 ];
+            }
+        }
+    }
     forwarding-classes {
-        class data queue-num 0;
-        class voice queue-num 1;
-        class video queue-num 2;
+        class best-effort queue-num 0;
+        class expedited-forwarding queue-num 2;
+        class assured-forwarding queue-num 1;
         class network-control queue-num 3;
+        class scavenger-service queue-num 4;
     }
     interfaces {
-        t1-2/0/2:5 {
-            scheduler-map video-priority-on-t1;
+        lsq-* {
             unit * {
+                scheduler-map t1-sch-map;
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
-        t1-2/0/3:13 {
-            scheduler-map video-priority-on-t1;
+        t1-* {
+            scheduler-map t1-sch-map;
             unit * {
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
-        t1-2/0/3:18 {
-            scheduler-map video-priority-on-t1;
-            unit * {
-                classifiers {
-                    dscp dscp-default;
-                }
-            }
-        }
         all {
             scheduler-map sch-map;
             unit * {
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
     }
     scheduler-maps {
         sch-map {
-            forwarding-class data scheduler data-sch;
-            forwarding-class voice scheduler voice-sch;
-            forwarding-class video scheduler video-sch;
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler expedited-forwarding-sch;
             forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
         }
-        video-priority-on-t1 {
-            forwarding-class data scheduler data-t1-sch;
-            forwarding-class voice scheduler voice-t1-sch;
-            forwarding-class video scheduler video-t1-sch;
+        t1-sch-map {
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler t1-expedited-forwarding-sch;
+            forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler t1-assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
         }
     }
     schedulers {
-        data-sch {
+        best-effort-sch {
             transmit-rate remainder;
             buffer-size remainder;
             priority low;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
         }
-        voice-sch {
+        assured-forwarding-sch {
             transmit-rate percent 5;
             buffer-size percent 5;
             priority high;
         }
-        video-sch {
-            transmit-rate percent 5;
-            buffer-size percent 5;
+        expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
             priority high;
         }
         network-control-sch {
@@ -1531,19 +1543,20 @@
             buffer-size percent 5;
             priority high;
         }
-        data-t1-sch {
-            transmit-rate remainder;
-            buffer-size remainder;
+        scavenger-service-sch {
+            transmit-rate percent 0;
+            buffer-size percent 0;
             priority low;
         }
-        voice-t1-sch {
-            transmit-rate percent 60;
-            buffer-size percent 50;
-            priority high;
+        t1-assured-forwarding-sch {
+            transmit-rate percent 35;
+            buffer-size percent 25;
+            priority medium-high;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
         }
-        video-t1-sch {
-            transmit-rate percent 10;
-            buffer-size percent 5;
+        t1-expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
             priority high;
         }
     }

Index: hub.ida.onenet.net
===================================================================
--- hub.ida.onenet.net	(revision 43080)
+++ hub.ida.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at IDABEL-M120-RE0> show system commit 
+#   2012-10-31 13:45:34 CDT by rnordmark via cli commit synchronize
 #   2012-10-12 15:30:16 CDT by bobby via cli commit synchronize
 #   2012-10-12 15:27:45 CDT by bobby via cli commit synchronize
 #   2012-10-11 15:51:44 CDT by bobby via cli commit synchronize
 #   2012-10-11 15:50:34 CDT by bobby via cli commit synchronize
 #   2012-10-11 15:44:12 CDT by bobby via cli commit synchronize
-#   2012-10-11 15:40:28 CDT by bobby via cli commit synchronize
 # grnoc-mon at IDABEL-M120-RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -294,7 +294,7 @@
 # grnoc-mon at IDABEL-M120-RE0> show system uptime 
 # System booted: 2012-08-01 18:05 CDT 
 # Protocols started: 2012-08-01 18:07 CDT 
-# Last configured: 2012-10-12 15:30 CDT  by bobby
+# Last configured: 2012-10-31 13:45 CDT  by rnordmark
 # 
 # {master}
 # grnoc-mon at IDABEL-M120-RE0> show interface terse 
@@ -456,7 +456,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at IDABEL-M120-RE0> show configuration 
-## Last commit: 2012-10-12 15:30:16 CDT by bobby
+## Last commit: 2012-10-31 13:45:34 CDT by rnordmark
 version 10.4R2.6;
 groups {
     re0 {
@@ -1363,61 +1363,89 @@
 }
 class-of-service {
     classifiers {
-        dscp dscp-default {
+        dscp dscp-onenet {
             import default;
+            forwarding-class scavenger-service {
+                loss-priority high code-points cs1;
+            }
+            forwarding-class expedited-forwarding {
+                loss-priority low code-points [ cs3 cs4 ];
+                loss-priority high code-points cs5;
+            }
         }
     }
+    drop-profiles {
+        T1-interpolated {
+            interpolate {
+                fill-level [ 50 75 ];
+                drop-probability [ 25 50 ];
+            }
+        }
+    }
     forwarding-classes {
-        class data queue-num 0;
-        class voice queue-num 1;
-        class video queue-num 2;
+        class best-effort queue-num 0;
+        class expedited-forwarding queue-num 2;
+        class assured-forwarding queue-num 1;
         class network-control queue-num 3;
+        class scavenger-service queue-num 4;
     }
     interfaces {
-        t1-2/0/3:1 {
-            scheduler-map video-priority-on-t1;
+        lsq-* {
             unit * {
+                scheduler-map t1-sch-map;
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
+        t1-* {
+            scheduler-map t1-sch-map;
+            unit * {
+                classifiers {
+                    dscp dscp-onenet;
+                }
+            }
+        }
         all {
             scheduler-map sch-map;
             unit * {
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
     }
     scheduler-maps {
         sch-map {
-            forwarding-class data scheduler data-sch;
-            forwarding-class voice scheduler voice-sch;
-            forwarding-class video scheduler video-sch;
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler expedited-forwarding-sch;
             forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
         }
-        video-priority-on-t1 {
-            forwarding-class data scheduler data-t1-sch;
-            forwarding-class voice scheduler voice-t1-sch;
-            forwarding-class video scheduler video-t1-sch;
+        t1-sch-map {
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler t1-expedited-forwarding-sch;
+            forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler t1-assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
         }
     }
     schedulers {
-        data-sch {
+        best-effort-sch {
             transmit-rate remainder;
             buffer-size remainder;
             priority low;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
         }
-        voice-sch {
+        assured-forwarding-sch {
             transmit-rate percent 5;
             buffer-size percent 5;
             priority high;
         }
-        video-sch {
-            transmit-rate percent 5;
-            buffer-size percent 5;
+        expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
             priority high;
         }
         network-control-sch {
@@ -1425,19 +1453,20 @@
             buffer-size percent 5;
             priority high;
         }
-        data-t1-sch {
-            transmit-rate remainder;
-            buffer-size remainder;
+        scavenger-service-sch {
+            transmit-rate percent 0;
+            buffer-size percent 0;
             priority low;
         }
-        voice-t1-sch {
-            transmit-rate percent 60;
-            buffer-size percent 50;
-            priority high;
+        t1-assured-forwarding-sch {
+            transmit-rate percent 35;
+            buffer-size percent 25;
+            priority medium-high;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
         }
-        video-t1-sch {
-            transmit-rate percent 10;
-            buffer-size percent 5;
+        t1-expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
             priority high;
         }
     }

Index: hub.cla.onenet.net
===================================================================
--- hub.cla.onenet.net	(revision 43101)
+++ hub.cla.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at CLAREMORE-M120-RE0> show system commit 
+#   2012-10-31 13:44:53 CDT by rnordmark via cli commit synchronize
 #   2012-10-30 14:38:34 CDT by joel via cli commit synchronize
 #   2012-08-17 15:49:41 CDT by jeremyt via cli commit synchronize
 #   2012-08-10 08:52:53 CDT by joe via cli commit synchronize
 #   2012-06-26 07:58:17 CDT by bobby via cli commit synchronize
 #   2012-06-26 07:56:43 CDT by bobby via cli commit synchronize
-#   2012-06-19 10:47:31 CDT by bobby via cli commit synchronize
 # grnoc-mon at CLAREMORE-M120-RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -294,7 +294,7 @@
 # grnoc-mon at CLAREMORE-M120-RE0> show system uptime 
 # System booted: 2012-03-16 12:32 CDT 
 # Protocols started: 2012-03-16 12:34 CDT 
-# Last configured: 2012-10-30 14:38 CDT  by joel
+# Last configured: 2012-10-31 13:44 CDT  by rnordmark
 # 
 # {master}
 # grnoc-mon at CLAREMORE-M120-RE0> show interface terse 
@@ -434,7 +434,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at CLAREMORE-M120-RE0> show configuration 
-## Last commit: 2012-10-30 14:38:34 CDT by joel
+## Last commit: 2012-10-31 13:44:53 CDT by rnordmark
 version 10.4R2.6;
 groups {
     re0 {
@@ -1128,85 +1128,89 @@
 }
 class-of-service {
     classifiers {
-        dscp dscp-default {
+        dscp dscp-onenet {
             import default;
+            forwarding-class scavenger-service {
+                loss-priority high code-points cs1;
+            }
+            forwarding-class expedited-forwarding {
+                loss-priority low code-points [ cs3 cs4 ];
+                loss-priority high code-points cs5;
+            }
         }
     }
+    drop-profiles {
+        T1-interpolated {
+            interpolate {
+                fill-level [ 50 75 ];
+                drop-probability [ 25 50 ];
+            }
+        }
+    }
     forwarding-classes {
-        class data queue-num 0;
-        class voice queue-num 1;
-        class video queue-num 2;
+        class best-effort queue-num 0;
+        class expedited-forwarding queue-num 2;
+        class assured-forwarding queue-num 1;
         class network-control queue-num 3;
+        class scavenger-service queue-num 4;
     }
     interfaces {
-        t1-2/0/0:8 {
-            scheduler-map video-priority-on-t1;
+        lsq-* {
             unit * {
+                scheduler-map t1-sch-map;
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
-        t1-2/0/0:9 {
-            scheduler-map video-priority-on-t1;
+        t1-* {
+            scheduler-map t1-sch-map;
             unit * {
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
-        t1-2/0/2:8 {
-            scheduler-map video-priority-on-t1;
-            unit * {
-                classifiers {
-                    dscp dscp-default;
-                }
-            }
-        }
-        t1-2/0/2:9 {
-            scheduler-map video-priority-on-t1;
-            unit * {
-                classifiers {
-                    dscp dscp-default;
-                }
-            }
-        }
         all {
             scheduler-map sch-map;
             unit * {
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
     }
     scheduler-maps {
         sch-map {
-            forwarding-class data scheduler data-sch;
-            forwarding-class voice scheduler voice-sch;
-            forwarding-class video scheduler video-sch;
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler expedited-forwarding-sch;
             forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
         }
-        video-priority-on-t1 {
-            forwarding-class data scheduler data-t1-sch;
-            forwarding-class voice scheduler voice-t1-sch;
-            forwarding-class video scheduler video-t1-sch;
+        t1-sch-map {
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler t1-expedited-forwarding-sch;
+            forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler t1-assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
         }
     }
     schedulers {
-        data-sch {
+        best-effort-sch {
             transmit-rate remainder;
             buffer-size remainder;
             priority low;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
         }
-        voice-sch {
+        assured-forwarding-sch {
             transmit-rate percent 5;
             buffer-size percent 5;
             priority high;
         }
-        video-sch {
-            transmit-rate percent 5;
-            buffer-size percent 5;
+        expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
             priority high;
         }
         network-control-sch {
@@ -1214,19 +1218,20 @@
             buffer-size percent 5;
             priority high;
         }
-        data-t1-sch {
-            transmit-rate remainder;
-            buffer-size remainder;
+        scavenger-service-sch {
+            transmit-rate percent 0;
+            buffer-size percent 0;
             priority low;
         }
-        voice-t1-sch {
-            transmit-rate percent 60;
-            buffer-size percent 50;
-            priority high;
+        t1-assured-forwarding-sch {
+            transmit-rate percent 35;
+            buffer-size percent 25;
+            priority medium-high;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
         }
-        video-t1-sch {
-            transmit-rate percent 10;
-            buffer-size percent 5;
+        t1-expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
             priority high;
         }
     }

Index: hub.mca.onenet.net
===================================================================
--- hub.mca.onenet.net	(revision 42757)
+++ hub.mca.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at MCALESTER-M120-RE0> show system commit 
+#   2012-10-31 13:48:24 CDT by rnordmark via cli commit synchronize
 #   2012-08-17 15:52:19 CDT by jeremyt via cli commit synchronize
 #   2012-07-18 13:58:35 CDT by joe via cli commit synchronize
 #   2012-07-17 15:07:18 CDT by joe via cli commit synchronize
 #   2012-05-24 15:56:19 CDT by joel via cli commit synchronize
 #   2012-05-17 14:31:12 CDT by bobby via cli commit synchronize
-#   2012-04-27 13:37:59 CDT by jeremyt via cli commit synchronize
 # grnoc-mon at MCALESTER-M120-RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -295,7 +295,7 @@
 # grnoc-mon at MCALESTER-M120-RE0> show system uptime 
 # System booted: 2011-02-15 18:51 CST 
 # Protocols started: 2011-02-15 18:53 CST 
-# Last configured: 2012-08-17 15:52 CDT  by jeremyt
+# Last configured: 2012-10-31 13:48 CDT  by rnordmark
 # 
 # {master}
 # grnoc-mon at MCALESTER-M120-RE0> show interface terse 
@@ -449,7 +449,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at MCALESTER-M120-RE0> show configuration 
-## Last commit: 2012-08-17 15:52:19 CDT by jeremyt
+## Last commit: 2012-10-31 13:48:24 CDT by rnordmark
 version 10.4R2.6;
 groups {
     re0 {
@@ -1264,48 +1264,89 @@
 }
 class-of-service {
     classifiers {
-        dscp dscp-default {
+        dscp dscp-onenet {
             import default;
+            forwarding-class scavenger-service {
+                loss-priority high code-points cs1;
+            }
+            forwarding-class expedited-forwarding {
+                loss-priority low code-points [ cs3 cs4 ];
+                loss-priority high code-points cs5;
+            }
         }
     }
+    drop-profiles {
+        T1-interpolated {
+            interpolate {
+                fill-level [ 50 75 ];
+                drop-probability [ 25 50 ];
+            }
+        }
+    }
     forwarding-classes {
-        class data queue-num 0;
-        class voice queue-num 1;
-        class video queue-num 2;
+        class best-effort queue-num 0;
+        class expedited-forwarding queue-num 2;
+        class assured-forwarding queue-num 1;
         class network-control queue-num 3;
+        class scavenger-service queue-num 4;
     }
     interfaces {
+        lsq-* {
+            unit * {
+                scheduler-map t1-sch-map;
+                classifiers {
+                    dscp dscp-onenet;
+                }
+            }
+        }
+        t1-* {
+            scheduler-map t1-sch-map;
+            unit * {
+                classifiers {
+                    dscp dscp-onenet;
+                }
+            }
+        }
         all {
             scheduler-map sch-map;
             unit * {
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
     }
     scheduler-maps {
         sch-map {
-            forwarding-class data scheduler data-sch;
-            forwarding-class voice scheduler voice-sch;
-            forwarding-class video scheduler video-sch;
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler expedited-forwarding-sch;
             forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
         }
+        t1-sch-map {
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler t1-expedited-forwarding-sch;
+            forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler t1-assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
+        }
     }
     schedulers {
-        data-sch {
+        best-effort-sch {
             transmit-rate remainder;
             buffer-size remainder;
             priority low;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
         }
-        voice-sch {
+        assured-forwarding-sch {
             transmit-rate percent 5;
             buffer-size percent 5;
             priority high;
         }
-        video-sch {
-            transmit-rate percent 5;
-            buffer-size percent 5;
+        expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
             priority high;
         }
         network-control-sch {
@@ -1313,6 +1354,22 @@
             buffer-size percent 5;
             priority high;
         }
+        scavenger-service-sch {
+            transmit-rate percent 0;
+            buffer-size percent 0;
+            priority low;
+        }
+        t1-assured-forwarding-sch {
+            transmit-rate percent 35;
+            buffer-size percent 25;
+            priority medium-high;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
+        }
+        t1-expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
+            priority high;
+        }
     }
 }
 firewall {

Index: core3.okc-m120.onenet.net
===================================================================
--- core3.okc-m120.onenet.net	(revision 43153)
+++ core3.okc-m120.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at OKC-CORE3-M120-RE0> show system commit 
+#   2012-10-31 13:25:15 CDT by jeremyt via cli commit synchronize
 #   2012-10-31 12:42:38 CDT by bobby via cli commit synchronize
 #   2012-10-31 10:39:06 CDT by bobby via cli commit synchronize
 #   2012-10-31 10:35:24 CDT by bobby via cli commit synchronize
 #   2012-10-31 10:18:38 CDT by joe via cli commit synchronize
 #   2012-10-30 16:53:46 CDT by joe via cli commit synchronize
-#   2012-10-30 13:10:01 CDT by bobby via cli commit synchronize
 # grnoc-mon at OKC-CORE3-M120-RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -393,7 +393,7 @@
 # grnoc-mon at OKC-CORE3-M120-RE0> show system uptime 
 # System booted: 2012-09-16 01:05 CDT 
 # Protocols started: 2012-09-16 01:07 CDT 
-# Last configured: 2012-10-31 12:42 CDT  by bobby
+# Last configured: 2012-10-31 13:25 CDT  by jeremyt
 # 
 # {master}
 # grnoc-mon at OKC-CORE3-M120-RE0> show interface terse 
@@ -1047,8 +1047,8 @@
 #t1-3/3/0:1:1.0 up up
 #t1-3/3/0:1:2 up down
 #t1-3/3/0:1:3 up down
-#t1-3/3/0:1:4 up down
-#t1-3/3/0:1:4.0 up down
+#t1-3/3/0:1:4 up up
+#t1-3/3/0:1:4.0 up up
 #t1-3/3/0:1:5 up up
 #t1-3/3/0:1:5.0 up up
 #t1-3/3/0:1:6 up up
@@ -2138,7 +2138,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at OKC-CORE3-M120-RE0> show configuration 
-## Last commit: 2012-10-31 12:42:38 CDT by bobby
+## Last commit: 2012-10-31 13:25:15 CDT by jeremyt
 version 11.4R5.5;
 groups {
     re0 {

Index: hub.pot.onenet.net
===================================================================
--- hub.pot.onenet.net	(revision 42767)
+++ hub.pot.onenet.net	(working copy)
@@ -1,13 +1,13 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at POTEAU-M120-RE0> show system commit 
+#   2012-10-31 13:54:40 CDT by jeremyt via cli commit synchronize
 #   2012-09-05 14:51:08 CDT by joel via cli commit synchronize
 #   2012-08-17 15:49:20 CDT by jeremyt via cli commit synchronize
 #   2012-08-08 17:31:45 CDT by root via other
 #     Synchronization with remote Routing Engine
 #   2012-08-01 15:05:09 CDT by joe via cli commit synchronize
 #   2012-08-01 14:58:23 CDT by admin via cli commit synchronize
-#   2012-05-24 16:19:02 CDT by joel via cli commit synchronize
 # grnoc-mon at POTEAU-M120-RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -302,7 +302,7 @@
 # grnoc-mon at POTEAU-M120-RE0> show system uptime 
 # System booted: 2012-08-08 17:29 CDT 
 # Protocols started: 2012-08-08 17:31 CDT 
-# Last configured: 2012-09-05 14:51 CDT  by joel
+# Last configured: 2012-10-31 13:54 CDT  by jeremyt
 # 
 # {master}
 # grnoc-mon at POTEAU-M120-RE0> show interface terse 
@@ -447,7 +447,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at POTEAU-M120-RE0> show configuration 
-## Last commit: 2012-09-05 14:51:08 CDT by joel
+## Last commit: 2012-10-31 13:54:40 CDT by jeremyt
 version 10.4R2.6;
 groups {
     re0 {
@@ -1208,48 +1208,89 @@
 }
 class-of-service {
     classifiers {
-        dscp dscp-default {
+        dscp dscp-onenet {
             import default;
+            forwarding-class scavenger-service {
+                loss-priority high code-points cs1;
+            }
+            forwarding-class expedited-forwarding {
+                loss-priority low code-points [ cs3 cs4 ];
+                loss-priority high code-points cs5;
+            }
         }
     }
+    drop-profiles {
+        T1-interpolated {
+            interpolate {
+                fill-level [ 50 75 ];
+                drop-probability [ 25 50 ];
+            }
+        }
+    }
     forwarding-classes {
-        class data queue-num 0;
-        class voice queue-num 1;
-        class video queue-num 2;
+        class best-effort queue-num 0;
+        class expedited-forwarding queue-num 2;
+        class assured-forwarding queue-num 1;
         class network-control queue-num 3;
+        class scavenger-service queue-num 4;
     }
     interfaces {
+        lsq-* {
+            unit * {
+                scheduler-map t1-sch-map;
+                classifiers {
+                    dscp dscp-onenet;
+                }
+            }
+        }
+        t1-* {
+            scheduler-map t1-sch-map;
+            unit * {
+                classifiers {
+                    dscp dscp-onenet;
+                }
+            }
+        }
         all {
             scheduler-map sch-map;
             unit * {
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
     }
     scheduler-maps {
         sch-map {
-            forwarding-class data scheduler data-sch;
-            forwarding-class voice scheduler voice-sch;
-            forwarding-class video scheduler video-sch;
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler expedited-forwarding-sch;
             forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
         }
+        t1-sch-map {
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler t1-expedited-forwarding-sch;
+            forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler t1-assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
+        }
     }
     schedulers {
-        data-sch {
+        best-effort-sch {
             transmit-rate remainder;
             buffer-size remainder;
             priority low;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
         }
-        voice-sch {
+        assured-forwarding-sch {
             transmit-rate percent 5;
             buffer-size percent 5;
             priority high;
         }
-        video-sch {
-            transmit-rate percent 5;
-            buffer-size percent 5;
+        expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
             priority high;
         }
         network-control-sch {
@@ -1257,6 +1298,22 @@
             buffer-size percent 5;
             priority high;
         }
+        scavenger-service-sch {
+            transmit-rate percent 0;
+            buffer-size percent 0;
+            priority low;
+        }
+        t1-assured-forwarding-sch {
+            transmit-rate percent 35;
+            buffer-size percent 25;
+            priority medium-high;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
+        }
+        t1-expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
+            priority high;
+        }
     }
 }
 firewall {

Index: hub.mus.onenet.net
===================================================================
--- hub.mus.onenet.net	(revision 43017)
+++ hub.mus.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at MUSKOGEE-M120-RE0> show system commit 
+#   2012-10-31 13:51:06 CDT by rnordmark via cli commit synchronize
 #   2012-10-25 15:07:52 CDT by joe via cli commit synchronize
 #   2012-10-18 09:35:21 CDT by joe via cli commit synchronize
 #   2012-10-18 09:33:22 CDT by joe via cli commit synchronize
 #   2012-10-18 09:32:41 CDT by joe via cli commit synchronize
 #   2012-10-12 11:09:28 CDT by joe via cli commit synchronize
-#   2012-10-12 11:08:02 CDT by joe via cli commit synchronize
 # grnoc-mon at MUSKOGEE-M120-RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -321,7 +321,7 @@
 # grnoc-mon at MUSKOGEE-M120-RE0> show system uptime 
 # System booted: 2011-08-12 19:41 CDT 
 # Protocols started: 2011-08-12 19:42 CDT 
-# Last configured: 2012-10-25 15:07 CDT  by joe
+# Last configured: 2012-10-31 13:51 CDT  by rnordmark
 # 
 # {master}
 # grnoc-mon at MUSKOGEE-M120-RE0> show interface terse 
@@ -505,7 +505,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at MUSKOGEE-M120-RE0> show configuration 
-## Last commit: 2012-10-25 15:07:52 CDT by joe
+## Last commit: 2012-10-31 13:51:06 CDT by rnordmark
 version 10.4R2.6;
 groups {
     re0 {
@@ -1551,48 +1551,89 @@
 }
 class-of-service {
     classifiers {
-        dscp dscp-default {
+        dscp dscp-onenet {
             import default;
+            forwarding-class scavenger-service {
+                loss-priority high code-points cs1;
+            }
+            forwarding-class expedited-forwarding {
+                loss-priority low code-points [ cs3 cs4 ];
+                loss-priority high code-points cs5;
+            }
         }
     }
+    drop-profiles {
+        T1-interpolated {
+            interpolate {
+                fill-level [ 50 75 ];
+                drop-probability [ 25 50 ];
+            }
+        }
+    }
     forwarding-classes {
-        class data queue-num 0;
-        class voice queue-num 1;
-        class video queue-num 2;
+        class best-effort queue-num 0;
+        class expedited-forwarding queue-num 2;
+        class assured-forwarding queue-num 1;
         class network-control queue-num 3;
+        class scavenger-service queue-num 4;
     }
     interfaces {
+        lsq-* {
+            unit * {
+                scheduler-map t1-sch-map;
+                classifiers {
+                    dscp dscp-onenet;
+                }
+            }
+        }
+        t1-* {
+            scheduler-map t1-sch-map;
+            unit * {
+                classifiers {
+                    dscp dscp-onenet;
+                }
+            }
+        }
         all {
             scheduler-map sch-map;
             unit * {
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
     }
     scheduler-maps {
         sch-map {
-            forwarding-class data scheduler data-sch;
-            forwarding-class voice scheduler voice-sch;
-            forwarding-class video scheduler video-sch;
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler expedited-forwarding-sch;
             forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
         }
+        t1-sch-map {
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler t1-expedited-forwarding-sch;
+            forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler t1-assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
+        }
     }
     schedulers {
-        data-sch {
+        best-effort-sch {
             transmit-rate remainder;
             buffer-size remainder;
             priority low;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
         }
-        voice-sch {
+        assured-forwarding-sch {
             transmit-rate percent 5;
             buffer-size percent 5;
             priority high;
         }
-        video-sch {
-            transmit-rate percent 5;
-            buffer-size percent 5;
+        expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
             priority high;
         }
         network-control-sch {
@@ -1600,6 +1641,22 @@
             buffer-size percent 5;
             priority high;
         }
+        scavenger-service-sch {
+            transmit-rate percent 0;
+            buffer-size percent 0;
+            priority low;
+        }
+        t1-assured-forwarding-sch {
+            transmit-rate percent 35;
+            buffer-size percent 25;
+            priority medium-high;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
+        }
+        t1-expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
+            priority high;
+        }
     }
 }
 firewall {

Index: hub.ida-mx480.onenet.net
===================================================================
--- hub.ida-mx480.onenet.net	(revision 43155)
+++ hub.ida-mx480.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at IDABEL-MX480-RE0> show system commit 
-#   2012-10-31 13:01:45 CDT by admin via netconf commit synchronize
-#   2012-10-31 13:01:41 CDT by admin via netconf commit synchronize
-#   2012-10-31 13:00:45 CDT by admin via netconf commit synchronize
-#   2012-10-31 13:00:42 CDT by admin via netconf commit synchronize
-#   2012-10-31 12:58:45 CDT by admin via netconf commit synchronize
-#   2012-10-31 12:58:42 CDT by admin via netconf commit synchronize
+#   2012-10-31 14:01:49 CDT by admin via netconf commit synchronize
+#   2012-10-31 14:01:45 CDT by admin via netconf commit synchronize
+#   2012-10-31 14:00:47 CDT by admin via netconf commit synchronize
+#   2012-10-31 14:00:44 CDT by admin via netconf commit synchronize
+#   2012-10-31 13:59:49 CDT by admin via netconf commit synchronize
+#   2012-10-31 13:59:45 CDT by admin via netconf commit synchronize
 # grnoc-mon at IDABEL-MX480-RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -271,7 +271,7 @@
 # grnoc-mon at IDABEL-MX480-RE0> show system uptime 
 # System booted: 2012-08-01 18:05 CDT 
 # Protocols started: 2012-08-01 18:07 CDT 
-# Last configured: 2012-10-31 13:01 CDT  by admin
+# Last configured: 2012-10-31 14:01 CDT  by admin
 # 
 # {master}
 # grnoc-mon at IDABEL-MX480-RE0> show interface terse 
@@ -339,7 +339,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at IDABEL-MX480-RE0> show configuration 
-## Last commit: 2012-10-31 13:01:45 CDT by admin
+## Last commit: 2012-10-31 14:01:49 CDT by admin
 version 11.4R4.4;
 groups {
     re0 {

Index: hub.say-mx480.onenet.net
===================================================================
--- hub.say-mx480.onenet.net	(revision 43154)
+++ hub.say-mx480.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at SAYRE-MX480-RE0> show system commit 
-#   2012-10-31 13:01:45 CDT by admin via netconf commit synchronize
-#   2012-10-31 13:01:41 CDT by admin via netconf commit synchronize
-#   2012-10-31 13:00:45 CDT by admin via netconf commit synchronize
-#   2012-10-31 13:00:42 CDT by admin via netconf commit synchronize
-#   2012-10-31 12:59:45 CDT by admin via netconf commit synchronize
-#   2012-10-31 12:59:41 CDT by admin via netconf commit synchronize
+#   2012-10-31 14:00:47 CDT by admin via netconf commit synchronize
+#   2012-10-31 14:00:43 CDT by admin via netconf commit synchronize
+#   2012-10-31 13:59:48 CDT by admin via netconf commit synchronize
+#   2012-10-31 13:59:45 CDT by admin via netconf commit synchronize
+#   2012-10-31 13:58:47 CDT by admin via netconf commit synchronize
+#   2012-10-31 13:58:44 CDT by admin via netconf commit synchronize
 # grnoc-mon at SAYRE-MX480-RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -265,7 +265,7 @@
 # grnoc-mon at SAYRE-MX480-RE0> show system uptime 
 # System booted: 2012-08-01 12:29 CDT 
 # Protocols started: 2012-08-01 12:30 CDT 
-# Last configured: 2012-10-31 13:01 CDT  by admin
+# Last configured: 2012-10-31 14:00 CDT  by admin
 # 
 # {master}
 # grnoc-mon at SAYRE-MX480-RE0> show interface terse 
@@ -331,7 +331,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at SAYRE-MX480-RE0> show configuration 
-## Last commit: 2012-10-31 13:01:45 CDT by admin
+## Last commit: 2012-10-31 14:00:47 CDT by admin
 version 11.4R4.4;
 groups {
     re0 {

Index: hub.say.onenet.net
===================================================================
--- hub.say.onenet.net	(revision 42770)
+++ hub.say.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at SAYRE-M120-RE0> show system commit 
+#   2012-10-31 13:56:40 CDT by jeremyt via cli commit synchronize
 #   2012-09-06 16:15:12 CDT by joel via cli commit synchronize
 #   2012-09-06 16:14:32 CDT by joel via cli commit synchronize
 #   2012-08-30 08:20:43 CDT by joe via cli commit synchronize
 #   2012-08-30 08:05:19 CDT by joe via cli commit synchronize
 #   2012-08-17 15:49:49 CDT by jeremyt via cli commit synchronize
-#   2012-08-01 22:05:01 CDT by joel via cli commit synchronize
 # grnoc-mon at SAYRE-M120-RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -292,7 +292,7 @@
 # grnoc-mon at SAYRE-M120-RE0> show system uptime 
 # System booted: 2011-03-01 11:39 CST 
 # Protocols started: 2011-03-01 11:40 CST 
-# Last configured: 2012-09-06 16:15 CDT  by joel
+# Last configured: 2012-10-31 13:56 CDT  by jeremyt
 # 
 # {master}
 # grnoc-mon at SAYRE-M120-RE0> show interface terse 
@@ -486,7 +486,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at SAYRE-M120-RE0> show configuration 
-## Last commit: 2012-09-06 16:15:12 CDT by joel
+## Last commit: 2012-10-31 13:56:40 CDT by jeremyt
 version 10.4R2.6;
 groups {
     re0 {
@@ -1528,48 +1528,89 @@
 }
 class-of-service {
     classifiers {
-        dscp dscp-default {
+        dscp dscp-onenet {
             import default;
+            forwarding-class scavenger-service {
+                loss-priority high code-points cs1;
+            }
+            forwarding-class expedited-forwarding {
+                loss-priority low code-points [ cs3 cs4 ];
+                loss-priority high code-points cs5;
+            }
         }
     }
+    drop-profiles {
+        T1-interpolated {
+            interpolate {
+                fill-level [ 50 75 ];
+                drop-probability [ 25 50 ];
+            }
+        }
+    }
     forwarding-classes {
-        class data queue-num 0;
-        class voice queue-num 1;
-        class video queue-num 2;
+        class best-effort queue-num 0;
+        class expedited-forwarding queue-num 2;
+        class assured-forwarding queue-num 1;
         class network-control queue-num 3;
+        class scavenger-service queue-num 4;
     }
     interfaces {
+        lsq-* {
+            unit * {
+                scheduler-map t1-sch-map;
+                classifiers {
+                    dscp dscp-onenet;
+                }
+            }
+        }
+        t1-* {
+            scheduler-map t1-sch-map;
+            unit * {
+                classifiers {
+                    dscp dscp-onenet;
+                }
+            }
+        }
         all {
             scheduler-map sch-map;
             unit * {
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
     }
     scheduler-maps {
         sch-map {
-            forwarding-class data scheduler data-sch;
-            forwarding-class voice scheduler voice-sch;
-            forwarding-class video scheduler video-sch;
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler expedited-forwarding-sch;
             forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
         }
+        t1-sch-map {
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler t1-expedited-forwarding-sch;
+            forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler t1-assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
+        }
     }
     schedulers {
-        data-sch {
+        best-effort-sch {
             transmit-rate remainder;
             buffer-size remainder;
             priority low;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
         }
-        voice-sch {
+        assured-forwarding-sch {
             transmit-rate percent 5;
             buffer-size percent 5;
             priority high;
         }
-        video-sch {
-            transmit-rate percent 5;
-            buffer-size percent 5;
+        expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
             priority high;
         }
         network-control-sch {
@@ -1577,6 +1618,22 @@
             buffer-size percent 5;
             priority high;
         }
+        scavenger-service-sch {
+            transmit-rate percent 0;
+            buffer-size percent 0;
+            priority low;
+        }
+        t1-assured-forwarding-sch {
+            transmit-rate percent 35;
+            buffer-size percent 25;
+            priority medium-high;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
+        }
+        t1-expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
+            priority high;
+        }
     }
 }
 firewall {

Index: hub.tah.onenet.net
===================================================================
--- hub.tah.onenet.net	(revision 42773)
+++ hub.tah.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at TAHLEQUAH-M120-RE0> show system commit 
+#   2012-10-31 13:54:57 CDT by rnordmark via cli commit synchronize
 #   2012-08-17 15:50:23 CDT by jeremyt via cli commit synchronize
 #   2012-08-17 14:40:56 CDT by joe via cli commit synchronize
 #   2012-08-17 12:33:31 CDT by joe via cli commit synchronize
 #   2012-08-17 12:32:14 CDT by joe via cli commit synchronize
 #   2012-08-17 12:31:50 CDT by joe via cli commit synchronize
-#   2012-08-17 11:59:20 CDT by joe via cli commit synchronize
 # grnoc-mon at TAHLEQUAH-M120-RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -313,7 +313,7 @@
 # grnoc-mon at TAHLEQUAH-M120-RE0> show system uptime 
 # System booted: 2011-03-09 19:59 CST 
 # Protocols started: 2011-03-09 20:00 CST 
-# Last configured: 2012-08-17 15:50 CDT  by jeremyt
+# Last configured: 2012-10-31 13:54 CDT  by rnordmark
 # 
 # {master}
 # grnoc-mon at TAHLEQUAH-M120-RE0> show interface terse 
@@ -515,7 +515,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at TAHLEQUAH-M120-RE0> show configuration 
-## Last commit: 2012-08-17 15:50:23 CDT by jeremyt
+## Last commit: 2012-10-31 13:54:57 CDT by rnordmark
 version 10.4R2.6;
 groups {
     re0 {
@@ -1597,48 +1597,89 @@
 }
 class-of-service {
     classifiers {
-        dscp dscp-default {
+        dscp dscp-onenet {
             import default;
+            forwarding-class scavenger-service {
+                loss-priority high code-points cs1;
+            }
+            forwarding-class expedited-forwarding {
+                loss-priority low code-points [ cs3 cs4 ];
+                loss-priority high code-points cs5;
+            }
         }
     }
+    drop-profiles {
+        T1-interpolated {
+            interpolate {
+                fill-level [ 50 75 ];
+                drop-probability [ 25 50 ];
+            }
+        }
+    }
     forwarding-classes {
-        class data queue-num 0;
-        class voice queue-num 1;
-        class video queue-num 2;
+        class best-effort queue-num 0;
+        class expedited-forwarding queue-num 2;
+        class assured-forwarding queue-num 1;
         class network-control queue-num 3;
+        class scavenger-service queue-num 4;
     }
     interfaces {
+        lsq-* {
+            unit * {
+                scheduler-map t1-sch-map;
+                classifiers {
+                    dscp dscp-onenet;
+                }
+            }
+        }
+        t1-* {
+            scheduler-map t1-sch-map;
+            unit * {
+                classifiers {
+                    dscp dscp-onenet;
+                }
+            }
+        }
         all {
             scheduler-map sch-map;
             unit * {
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
     }
     scheduler-maps {
         sch-map {
-            forwarding-class data scheduler data-sch;
-            forwarding-class voice scheduler voice-sch;
-            forwarding-class video scheduler video-sch;
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler expedited-forwarding-sch;
             forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
         }
+        t1-sch-map {
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler t1-expedited-forwarding-sch;
+            forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler t1-assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
+        }
     }
     schedulers {
-        data-sch {
+        best-effort-sch {
             transmit-rate remainder;
             buffer-size remainder;
             priority low;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
         }
-        voice-sch {
+        assured-forwarding-sch {
             transmit-rate percent 5;
             buffer-size percent 5;
             priority high;
         }
-        video-sch {
-            transmit-rate percent 5;
-            buffer-size percent 5;
+        expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
             priority high;
         }
         network-control-sch {
@@ -1646,6 +1687,22 @@
             buffer-size percent 5;
             priority high;
         }
+        scavenger-service-sch {
+            transmit-rate percent 0;
+            buffer-size percent 0;
+            priority low;
+        }
+        t1-assured-forwarding-sch {
+            transmit-rate percent 35;
+            buffer-size percent 25;
+            priority medium-high;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
+        }
+        t1-expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
+            priority high;
+        }
     }
 }
 firewall {

Index: hub.war.onenet.net
===================================================================
--- hub.war.onenet.net	(revision 43031)
+++ hub.war.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at WARNER-M120-RE0> show system commit 
+#   2012-10-31 14:01:15 CDT by rnordmark via cli commit synchronize
 #   2012-08-17 15:51:11 CDT by jeremyt via cli commit synchronize
 #   2012-05-24 16:25:33 CDT by joel via cli commit synchronize
 #   2012-04-27 13:37:00 CDT by jeremyt via cli commit synchronize
 #   2012-03-28 17:30:18 CDT by admin via netconf commit synchronize
 #   2012-03-19 14:56:06 CDT by joel via cli commit synchronize
-#   2012-01-20 15:34:57 CST by admin via netconf commit synchronize
 # grnoc-mon at WARNER-M120-RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -294,7 +294,7 @@
 # grnoc-mon at WARNER-M120-RE0> show system uptime 
 # System booted: 2011-11-03 01:57 CDT 
 # Protocols started: 2011-11-03 01:59 CDT 
-# Last configured: 2012-08-17 15:51 CDT  by jeremyt
+# Last configured: 2012-10-31 14:01 CDT  by rnordmark
 # 
 # {master}
 # grnoc-mon at WARNER-M120-RE0> show interface terse 
@@ -436,7 +436,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at WARNER-M120-RE0> show configuration 
-## Last commit: 2012-08-17 15:51:11 CDT by jeremyt
+## Last commit: 2012-10-31 14:01:15 CDT by rnordmark
 version 10.4R2.6;
 groups {
     re0 {
@@ -1460,48 +1460,89 @@
 }
 class-of-service {
     classifiers {
-        dscp dscp-default {
+        dscp dscp-onenet {
             import default;
+            forwarding-class scavenger-service {
+                loss-priority high code-points cs1;
+            }
+            forwarding-class expedited-forwarding {
+                loss-priority low code-points [ cs3 cs4 ];
+                loss-priority high code-points cs5;
+            }
         }
     }
+    drop-profiles {
+        T1-interpolated {
+            interpolate {
+                fill-level [ 50 75 ];
+                drop-probability [ 25 50 ];
+            }
+        }
+    }
     forwarding-classes {
-        class data queue-num 0;
-        class voice queue-num 1;
-        class video queue-num 2;
+        class best-effort queue-num 0;
+        class expedited-forwarding queue-num 2;
+        class assured-forwarding queue-num 1;
         class network-control queue-num 3;
+        class scavenger-service queue-num 4;
     }
     interfaces {
+        lsq-* {
+            unit * {
+                scheduler-map t1-sch-map;
+                classifiers {
+                    dscp dscp-onenet;
+                }
+            }
+        }
+        t1-* {
+            scheduler-map t1-sch-map;
+            unit * {
+                classifiers {
+                    dscp dscp-onenet;
+                }
+            }
+        }
         all {
             scheduler-map sch-map;
             unit * {
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
     }
     scheduler-maps {
         sch-map {
-            forwarding-class data scheduler data-sch;
-            forwarding-class voice scheduler voice-sch;
-            forwarding-class video scheduler video-sch;
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler expedited-forwarding-sch;
             forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
         }
+        t1-sch-map {
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler t1-expedited-forwarding-sch;
+            forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler t1-assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
+        }
     }
     schedulers {
-        data-sch {
+        best-effort-sch {
             transmit-rate remainder;
             buffer-size remainder;
             priority low;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
         }
-        voice-sch {
+        assured-forwarding-sch {
             transmit-rate percent 5;
             buffer-size percent 5;
             priority high;
         }
-        video-sch {
-            transmit-rate percent 5;
-            buffer-size percent 5;
+        expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
             priority high;
         }
         network-control-sch {
@@ -1509,6 +1550,22 @@
             buffer-size percent 5;
             priority high;
         }
+        scavenger-service-sch {
+            transmit-rate percent 0;
+            buffer-size percent 0;
+            priority low;
+        }
+        t1-assured-forwarding-sch {
+            transmit-rate percent 35;
+            buffer-size percent 25;
+            priority medium-high;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
+        }
+        t1-expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
+            priority high;
+        }
     }
 }
 firewall {

Index: hub.ton.onenet.net
===================================================================
--- hub.ton.onenet.net	(revision 42910)
+++ hub.ton.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at TONKAWA-M120-RE0> show system commit 
+#   2012-10-31 13:56:09 CDT by rnordmark via cli commit synchronize
 #   2012-10-26 16:05:46 CDT by smclean via cli commit synchronize
 #   2012-10-26 16:04:02 CDT by smclean via cli commit synchronize
 #   2012-08-17 15:50:56 CDT by jeremyt via cli commit synchronize
 #   2012-05-24 16:22:35 CDT by joel via cli commit synchronize
 #   2012-04-27 13:36:44 CDT by jeremyt via cli commit synchronize
-#   2012-03-28 17:30:13 CDT by admin via netconf commit synchronize
 # grnoc-mon at TONKAWA-M120-RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -318,7 +318,7 @@
 # grnoc-mon at TONKAWA-M120-RE0> show system uptime 
 # System booted: 2011-08-08 20:30 CDT 
 # Protocols started: 2011-08-08 20:32 CDT 
-# Last configured: 2012-10-26 16:05 CDT  by smclean
+# Last configured: 2012-10-31 13:56 CDT  by rnordmark
 # 
 # {master}
 # grnoc-mon at TONKAWA-M120-RE0> show interface terse 
@@ -528,7 +528,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at TONKAWA-M120-RE0> show configuration 
-## Last commit: 2012-10-26 16:05:46 CDT by smclean
+## Last commit: 2012-10-31 13:56:09 CDT by rnordmark
 version 10.4R2.6;
 groups {
     re0 {
@@ -1738,61 +1738,89 @@
 }
 class-of-service {
     classifiers {
-        dscp dscp-default {
+        dscp dscp-onenet {
             import default;
+            forwarding-class scavenger-service {
+                loss-priority high code-points cs1;
+            }
+            forwarding-class expedited-forwarding {
+                loss-priority low code-points [ cs3 cs4 ];
+                loss-priority high code-points cs5;
+            }
         }
     }
+    drop-profiles {
+        T1-interpolated {
+            interpolate {
+                fill-level [ 50 75 ];
+                drop-probability [ 25 50 ];
+            }
+        }
+    }
     forwarding-classes {
-        class data queue-num 0;
-        class voice queue-num 1;
-        class video queue-num 2;
+        class best-effort queue-num 0;
+        class expedited-forwarding queue-num 2;
+        class assured-forwarding queue-num 1;
         class network-control queue-num 3;
+        class scavenger-service queue-num 4;
     }
     interfaces {
-        t1-2/0/3:18 {
-            scheduler-map video-priority-on-t1;
+        lsq-* {
             unit * {
+                scheduler-map t1-sch-map;
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
+        t1-* {
+            scheduler-map t1-sch-map;
+            unit * {
+                classifiers {
+                    dscp dscp-onenet;
+                }
+            }
+        }
         all {
             scheduler-map sch-map;
             unit * {
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
     }
     scheduler-maps {
         sch-map {
-            forwarding-class data scheduler data-sch;
-            forwarding-class voice scheduler voice-sch;
-            forwarding-class video scheduler video-sch;
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler expedited-forwarding-sch;
             forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
         }
-        video-priority-on-t1 {
-            forwarding-class data scheduler data-t1-sch;
-            forwarding-class voice scheduler voice-t1-sch;
-            forwarding-class video scheduler video-t1-sch;
+        t1-sch-map {
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler t1-expedited-forwarding-sch;
+            forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler t1-assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
         }
     }
     schedulers {
-        data-sch {
+        best-effort-sch {
             transmit-rate remainder;
             buffer-size remainder;
             priority low;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
         }
-        voice-sch {
+        assured-forwarding-sch {
             transmit-rate percent 5;
             buffer-size percent 5;
             priority high;
         }
-        video-sch {
-            transmit-rate percent 5;
-            buffer-size percent 5;
+        expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
             priority high;
         }
         network-control-sch {
@@ -1800,19 +1828,20 @@
             buffer-size percent 5;
             priority high;
         }
-        data-t1-sch {
-            transmit-rate remainder;
-            buffer-size remainder;
+        scavenger-service-sch {
+            transmit-rate percent 0;
+            buffer-size percent 0;
             priority low;
         }
-        voice-t1-sch {
-            transmit-rate percent 60;
-            buffer-size percent 50;
-            priority high;
+        t1-assured-forwarding-sch {
+            transmit-rate percent 35;
+            buffer-size percent 25;
+            priority medium-high;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
         }
-        video-t1-sch {
-            transmit-rate percent 10;
-            buffer-size percent 5;
+        t1-expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
             priority high;
         }
     }

Index: hub.wil.onenet.net
===================================================================
--- hub.wil.onenet.net	(revision 43037)
+++ hub.wil.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at WILBURTON-M120-RE0> show system commit 
+#   2012-10-31 13:59:46 CDT by rnordmark via cli commit synchronize
 #   2012-10-29 16:00:06 CDT by admin via netconf commit synchronize
 #   2012-10-29 15:59:59 CDT by admin via netconf commit synchronize
 #   2012-10-29 15:59:27 CDT by admin via netconf commit synchronize
 #   2012-10-29 15:59:19 CDT by admin via netconf commit synchronize
 #   2012-10-29 15:58:47 CDT by admin via netconf commit synchronize
-#   2012-10-29 15:58:39 CDT by admin via netconf commit synchronize
 # grnoc-mon at WILBURTON-M120-RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -295,7 +295,7 @@
 # grnoc-mon at WILBURTON-M120-RE0> show system uptime 
 # System booted: 2012-10-29 15:46 CDT 
 # Protocols started: 2012-10-29 15:48 CDT 
-# Last configured: 2012-10-29 16:00 CDT  by admin
+# Last configured: 2012-10-31 13:59 CDT  by rnordmark
 # 
 # {master}
 # grnoc-mon at WILBURTON-M120-RE0> show interface terse 
@@ -466,7 +466,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at WILBURTON-M120-RE0> show configuration 
-## Last commit: 2012-10-29 16:00:06 CDT by admin
+## Last commit: 2012-10-31 13:59:46 CDT by rnordmark
 version 10.4R2.6;
 groups {
     re0 {
@@ -1436,61 +1436,89 @@
 }
 class-of-service {
     classifiers {
-        dscp dscp-default {
+        dscp dscp-onenet {
             import default;
+            forwarding-class scavenger-service {
+                loss-priority high code-points cs1;
+            }
+            forwarding-class expedited-forwarding {
+                loss-priority low code-points [ cs3 cs4 ];
+                loss-priority high code-points cs5;
+            }
         }
     }
+    drop-profiles {
+        T1-interpolated {
+            interpolate {
+                fill-level [ 50 75 ];
+                drop-probability [ 25 50 ];
+            }
+        }
+    }
     forwarding-classes {
-        class data queue-num 0;
-        class voice queue-num 1;
-        class video queue-num 2;
+        class best-effort queue-num 0;
+        class expedited-forwarding queue-num 2;
+        class assured-forwarding queue-num 1;
         class network-control queue-num 3;
+        class scavenger-service queue-num 4;
     }
     interfaces {
-        lsq-2/3/0 {
-            unit 6 {
-                scheduler-map video-priority-on-t1;
+        lsq-* {
+            unit * {
+                scheduler-map t1-sch-map;
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
+        t1-* {
+            scheduler-map t1-sch-map;
+            unit * {
+                classifiers {
+                    dscp dscp-onenet;
+                }
+            }
+        }
         all {
             scheduler-map sch-map;
             unit * {
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
     }
     scheduler-maps {
         sch-map {
-            forwarding-class data scheduler data-sch;
-            forwarding-class voice scheduler voice-sch;
-            forwarding-class video scheduler video-sch;
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler expedited-forwarding-sch;
             forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
         }
-        video-priority-on-t1 {
-            forwarding-class data scheduler data-t1-sch;
-            forwarding-class voice scheduler voice-t1-sch;
-            forwarding-class video scheduler video-t1-sch;
+        t1-sch-map {
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler t1-expedited-forwarding-sch;
+            forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler t1-assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
         }
     }
     schedulers {
-        data-sch {
+        best-effort-sch {
             transmit-rate remainder;
             buffer-size remainder;
             priority low;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
         }
-        voice-sch {
+        assured-forwarding-sch {
             transmit-rate percent 5;
             buffer-size percent 5;
             priority high;
         }
-        video-sch {
-            transmit-rate percent 5;
-            buffer-size percent 5;
+        expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
             priority high;
         }
         network-control-sch {
@@ -1498,19 +1526,20 @@
             buffer-size percent 5;
             priority high;
         }
-        data-t1-sch {
-            transmit-rate remainder;
-            buffer-size remainder;
+        scavenger-service-sch {
+            transmit-rate percent 0;
+            buffer-size percent 0;
             priority low;
         }
-        voice-t1-sch {
-            transmit-rate percent 60;
-            buffer-size percent 50;
-            priority high;
+        t1-assured-forwarding-sch {
+            transmit-rate percent 35;
+            buffer-size percent 25;
+            priority medium-high;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
         }
-        video-t1-sch {
-            transmit-rate percent 10;
-            buffer-size percent 5;
+        t1-expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
             priority high;
         }
     }

Index: hub.chi.onenet.net
===================================================================
--- hub.chi.onenet.net	(revision 43152)
+++ hub.chi.onenet.net	(working copy)
@@ -1,13 +1,13 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at CHICKASHA-M120-RE0> show system commit 
+#   2012-10-31 13:43:22 CDT by jeremyt via cli commit synchronize
 #   2012-08-18 12:32:55 CDT by root via other
 #     Synchronization with remote Routing Engine
 #   2012-08-17 15:49:27 CDT by jeremyt via cli commit synchronize
 #   2012-08-07 15:50:20 CDT by bobby via cli commit synchronize
 #   2012-08-07 15:49:14 CDT by bobby via cli commit synchronize
 #   2012-08-07 13:48:25 CDT by admin via cli commit synchronize
-#   2012-06-28 15:22:13 CDT by joe via cli commit synchronize
 # grnoc-mon at CHICKASHA-M120-RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -293,7 +293,7 @@
 # grnoc-mon at CHICKASHA-M120-RE0> show system uptime 
 # System booted: 2012-08-18 12:30 CDT 
 # Protocols started: 2012-08-18 12:32 CDT 
-# Last configured: 2012-08-18 12:32 CDT  by root
+# Last configured: 2012-10-31 13:43 CDT  by jeremyt
 # 
 # {master}
 # grnoc-mon at CHICKASHA-M120-RE0> show interface terse 
@@ -337,7 +337,7 @@
 #t1-2/0/2:21 up down
 #t1-2/0/2:22 up down
 #t1-2/0/2:23 up down
-#t1-2/0/2:24 down up
+#t1-2/0/2:24 down down
 #t1-2/0/2:24.0 up down
 #t1-2/0/2:25 up up
 #t1-2/0/2:26 up down
@@ -448,7 +448,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at CHICKASHA-M120-RE0> show configuration 
-## Last commit: 2012-08-18 12:32:55 CDT by root
+## Last commit: 2012-10-31 13:43:22 CDT by jeremyt
 version 10.4R2.6;
 groups {
     re0 {
@@ -751,10 +751,6 @@
         encapsulation cisco-hdlc;
         unit 0 {
             family inet {
-                filter {
-                    input DOH-VIDEO;
-                    output DOH-VIDEO;
-                }
                 address 172.23.5.69/30;
             }
         }
@@ -1214,61 +1210,89 @@
 }
 class-of-service {
     classifiers {
-        dscp dscp-default {
+        dscp dscp-onenet {
             import default;
+            forwarding-class scavenger-service {
+                loss-priority high code-points cs1;
+            }
+            forwarding-class expedited-forwarding {
+                loss-priority low code-points [ cs3 cs4 ];
+                loss-priority high code-points cs5;
+            }
         }
     }
+    drop-profiles {
+        T1-interpolated {
+            interpolate {
+                fill-level [ 50 75 ];
+                drop-probability [ 25 50 ];
+            }
+        }
+    }
     forwarding-classes {
-        class data queue-num 0;
-        class voice queue-num 1;
-        class video queue-num 2;
+        class best-effort queue-num 0;
+        class expedited-forwarding queue-num 2;
+        class assured-forwarding queue-num 1;
         class network-control queue-num 3;
+        class scavenger-service queue-num 4;
     }
     interfaces {
-        t1-2/0/2:11 {
-            scheduler-map video-priority-on-t1;
+        lsq-* {
             unit * {
+                scheduler-map t1-sch-map;
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
+        t1-* {
+            scheduler-map t1-sch-map;
+            unit * {
+                classifiers {
+                    dscp dscp-onenet;
+                }
+            }
+        }
         all {
             scheduler-map sch-map;
             unit * {
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
     }
     scheduler-maps {
         sch-map {
-            forwarding-class data scheduler data-sch;
-            forwarding-class voice scheduler voice-sch;
-            forwarding-class video scheduler video-sch;
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler expedited-forwarding-sch;
             forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
         }
-        video-priority-on-t1 {
-            forwarding-class data scheduler data-t1-sch;
-            forwarding-class voice scheduler voice-t1-sch;
-            forwarding-class video scheduler video-t1-sch;
+        t1-sch-map {
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler t1-expedited-forwarding-sch;
+            forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler t1-assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
         }
     }
     schedulers {
-        data-sch {
+        best-effort-sch {
             transmit-rate remainder;
             buffer-size remainder;
             priority low;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
         }
-        voice-sch {
+        assured-forwarding-sch {
             transmit-rate percent 5;
             buffer-size percent 5;
             priority high;
         }
-        video-sch {
-            transmit-rate percent 20;
-            buffer-size percent 20;
+        expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
             priority high;
         }
         network-control-sch {
@@ -1276,19 +1300,20 @@
             buffer-size percent 5;
             priority high;
         }
-        data-t1-sch {
-            transmit-rate remainder;
-            buffer-size remainder;
+        scavenger-service-sch {
+            transmit-rate percent 0;
+            buffer-size percent 0;
             priority low;
         }
-        voice-t1-sch {
-            transmit-rate percent 60;
-            buffer-size percent 50;
-            priority high;
+        t1-assured-forwarding-sch {
+            transmit-rate percent 35;
+            buffer-size percent 25;
+            priority medium-high;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
         }
-        video-t1-sch {
-            transmit-rate percent 10;
-            buffer-size percent 5;
+        t1-expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
             priority high;
         }
     }
@@ -1313,72 +1338,6 @@
                 }
             }
         }
-        filter DOH-VIDEO {
-            term 1 {
-                from {
-                    source-address {
-                        156.110.50.30/32;
-                    }
-                    destination-address {
-                        0.0.0.0/0;
-                    }
-                }
-                then {
-                    forwarding-class video;
-                    accept;
-                }
-            }
-            term 2 {
-                from {
-                    source-address {
-                        0.0.0.0/0;
-                    }
-                    destination-address {
-                        156.110.50.30/32;
-                    }
-                }
-                then {
-                    forwarding-class video;
-                    accept;
-                }
-            }
-            term 3 {
-                then accept;
-            }
-        }
-        filter USAO-VIDEO {
-            term 1 {
-                from {
-                    source-address {
-                        192.146.206.100/32;
-                    }
-                    destination-address {
-                        0.0.0.0/0;
-                    }
-                }
-                then {
-                    forwarding-class video;
-                    accept;
-                }
-            }
-            term 2 {
-                from {
-                    source-address {
-                        0.0.0.0/0;
-                    }
-                    destination-address {
-                        192.146.206.100/32;
-                    }
-                }
-                then {
-                    forwarding-class video;
-                    accept;
-                }
-            }
-            term 3 {
-                then accept;
-            }
-        }
         filter PROTECT-RE {
             term SERVICES {
                 from {

Index: hub.wea.onenet.net
===================================================================
--- hub.wea.onenet.net	(revision 43156)
+++ hub.wea.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at WEATHERFORD-M120-RE0> show system commit 
+#   2012-10-31 13:58:20 CDT by rnordmark via cli commit synchronize
 #   2012-10-09 06:39:59 CDT by joel via cli commit synchronize
 #   2012-10-09 06:33:25 CDT by joel via cli commit synchronize
 #   2012-10-09 06:20:13 CDT by joel via cli commit synchronize
 #   2012-09-07 13:59:17 CDT by joel via cli commit synchronize
 #   2012-09-06 16:07:24 CDT by joel via cli commit synchronize
-#   2012-08-25 08:04:10 CDT by rnordmark via cli commit synchronize
 # grnoc-mon at WEATHERFORD-M120-RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -295,7 +295,7 @@
 # grnoc-mon at WEATHERFORD-M120-RE0> show system uptime 
 # System booted: 2011-03-01 15:12 CST 
 # Protocols started: 2011-03-01 15:14 CST 
-# Last configured: 2012-10-09 06:39 CDT  by joel
+# Last configured: 2012-10-31 13:58 CDT  by rnordmark
 # 
 # {master}
 # grnoc-mon at WEATHERFORD-M120-RE0> show interface terse 
@@ -493,7 +493,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at WEATHERFORD-M120-RE0> show configuration 
-## Last commit: 2012-10-09 06:39:59 CDT by joel
+## Last commit: 2012-10-31 13:58:20 CDT by rnordmark
 version 10.4R2.6;
 groups {
     re0 {
@@ -1597,48 +1597,89 @@
 }
 class-of-service {
     classifiers {
-        dscp dscp-default {
+        dscp dscp-onenet {
             import default;
+            forwarding-class scavenger-service {
+                loss-priority high code-points cs1;
+            }
+            forwarding-class expedited-forwarding {
+                loss-priority low code-points [ cs3 cs4 ];
+                loss-priority high code-points cs5;
+            }
         }
     }
+    drop-profiles {
+        T1-interpolated {
+            interpolate {
+                fill-level [ 50 75 ];
+                drop-probability [ 25 50 ];
+            }
+        }
+    }
     forwarding-classes {
-        class data queue-num 0;
-        class voice queue-num 1;
-        class video queue-num 2;
+        class best-effort queue-num 0;
+        class expedited-forwarding queue-num 2;
+        class assured-forwarding queue-num 1;
         class network-control queue-num 3;
+        class scavenger-service queue-num 4;
     }
     interfaces {
+        lsq-* {
+            unit * {
+                scheduler-map t1-sch-map;
+                classifiers {
+                    dscp dscp-onenet;
+                }
+            }
+        }
+        t1-* {
+            scheduler-map t1-sch-map;
+            unit * {
+                classifiers {
+                    dscp dscp-onenet;
+                }
+            }
+        }
         all {
             scheduler-map sch-map;
             unit * {
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
     }
     scheduler-maps {
         sch-map {
-            forwarding-class data scheduler data-sch;
-            forwarding-class voice scheduler voice-sch;
-            forwarding-class video scheduler video-sch;
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler expedited-forwarding-sch;
             forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
         }
+        t1-sch-map {
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler t1-expedited-forwarding-sch;
+            forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler t1-assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
+        }
     }
     schedulers {
-        data-sch {
+        best-effort-sch {
             transmit-rate remainder;
             buffer-size remainder;
             priority low;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
         }
-        voice-sch {
+        assured-forwarding-sch {
             transmit-rate percent 5;
             buffer-size percent 5;
             priority high;
         }
-        video-sch {
-            transmit-rate percent 5;
-            buffer-size percent 5;
+        expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
             priority high;
         }
         network-control-sch {
@@ -1646,6 +1687,22 @@
             buffer-size percent 5;
             priority high;
         }
+        scavenger-service-sch {
+            transmit-rate percent 0;
+            buffer-size percent 0;
+            priority low;
+        }
+        t1-assured-forwarding-sch {
+            transmit-rate percent 35;
+            buffer-size percent 25;
+            priority medium-high;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
+        }
+        t1-expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
+            priority high;
+        }
     }
 }
 firewall {

Index: hub.lawm120.onenet.net
===================================================================
--- hub.lawm120.onenet.net	(revision 43087)
+++ hub.lawm120.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at LAWTON-M120-RE0> show system commit 
+#   2012-10-31 13:46:17 CDT by rnordmark via cli commit synchronize
 #   2012-09-24 09:40:42 CDT by joe via cli commit synchronize
 #   2012-09-07 13:06:11 CDT by joe via cli commit synchronize
 #   2012-09-07 12:19:47 CDT by joe via cli commit synchronize
 #   2012-09-07 11:34:54 CDT by joe via cli commit synchronize
 #   2012-09-05 14:37:06 CDT by joel via cli commit synchronize
-#   2012-08-31 11:10:16 CDT by bobby via cli commit synchronize
 # grnoc-mon at LAWTON-M120-RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -292,7 +292,7 @@
 # grnoc-mon at LAWTON-M120-RE0> show system uptime 
 # System booted: 2011-02-23 20:35 CST 
 # Protocols started: 2011-02-23 20:37 CST 
-# Last configured: 2012-09-24 09:40 CDT  by joe
+# Last configured: 2012-10-31 13:46 CDT  by rnordmark
 # 
 # {master}
 # grnoc-mon at LAWTON-M120-RE0> show interface terse 
@@ -432,7 +432,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at LAWTON-M120-RE0> show configuration 
-## Last commit: 2012-09-24 09:40:42 CDT by joe
+## Last commit: 2012-10-31 13:46:17 CDT by rnordmark
 version 10.4R2.6;
 groups {
     re0 {
@@ -1135,30 +1135,46 @@
 }
 class-of-service {
     classifiers {
-        dscp dscp-default {
+        dscp dscp-onenet {
             import default;
+            forwarding-class scavenger-service {
+                loss-priority high code-points cs1;
+            }
+            forwarding-class expedited-forwarding {
+                loss-priority low code-points [ cs3 cs4 ];
+                loss-priority high code-points cs5;
+            }
         }
     }
+    drop-profiles {
+        T1-interpolated {
+            interpolate {
+                fill-level [ 50 75 ];
+                drop-probability [ 25 50 ];
+            }
+        }
+    }
     forwarding-classes {
-        class data queue-num 0;
-        class voice queue-num 1;
-        class video queue-num 2;
+        class best-effort queue-num 0;
+        class expedited-forwarding queue-num 2;
+        class assured-forwarding queue-num 1;
         class network-control queue-num 3;
+        class scavenger-service queue-num 4;
     }
     interfaces {
-        t1-2/0/2:13 {
-            scheduler-map video-priority-on-t1;
+        lsq-* {
             unit * {
+                scheduler-map t1-sch-map;
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
-        t1-2/0/2:14 {
-            scheduler-map video-priority-on-t1;
+        t1-* {
+            scheduler-map t1-sch-map;
             unit * {
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
@@ -1166,38 +1182,42 @@
             scheduler-map sch-map;
             unit * {
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
     }
     scheduler-maps {
         sch-map {
-            forwarding-class data scheduler data-sch;
-            forwarding-class voice scheduler voice-sch;
-            forwarding-class video scheduler video-sch;
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler expedited-forwarding-sch;
             forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
         }
-        video-priority-on-t1 {
-            forwarding-class data scheduler data-t1-sch;
-            forwarding-class voice scheduler voice-t1-sch;
-            forwarding-class video scheduler video-t1-sch;
+        t1-sch-map {
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler t1-expedited-forwarding-sch;
+            forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler t1-assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
         }
     }
     schedulers {
-        data-sch {
+        best-effort-sch {
             transmit-rate remainder;
             buffer-size remainder;
             priority low;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
         }
-        voice-sch {
+        assured-forwarding-sch {
             transmit-rate percent 5;
             buffer-size percent 5;
             priority high;
         }
-        video-sch {
-            transmit-rate percent 5;
-            buffer-size percent 5;
+        expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
             priority high;
         }
         network-control-sch {
@@ -1205,19 +1225,20 @@
             buffer-size percent 5;
             priority high;
         }
-        data-t1-sch {
-            transmit-rate remainder;
-            buffer-size remainder;
+        scavenger-service-sch {
+            transmit-rate percent 0;
+            buffer-size percent 0;
             priority low;
         }
-        voice-t1-sch {
-            transmit-rate percent 60;
-            buffer-size percent 50;
-            priority high;
+        t1-assured-forwarding-sch {
+            transmit-rate percent 35;
+            buffer-size percent 25;
+            priority medium-high;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
         }
-        video-t1-sch {
-            transmit-rate percent 10;
-            buffer-size percent 5;
+        t1-expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
             priority high;
         }
     }

Index: hub.tis.onenet.net
===================================================================
--- hub.tis.onenet.net	(revision 43146)
+++ hub.tis.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at TISHOMINGO-M120-RE0> show system commit 
+#   2012-10-31 13:59:07 CDT by jeremyt via cli commit synchronize
 #   2012-10-31 10:43:18 CDT by admin via netconf commit synchronize
 #   2012-10-31 10:43:12 CDT by admin via netconf commit synchronize
 #   2012-10-30 15:17:09 CDT by bobby via cli commit synchronize
 #   2012-10-30 15:16:49 CDT by bobby via cli commit synchronize
 #   2012-08-17 15:50:38 CDT by jeremyt via cli commit synchronize
-#   2012-06-29 08:04:07 CDT by joe via cli commit synchronize
 # grnoc-mon at TISHOMINGO-M120-RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -293,7 +293,7 @@
 # grnoc-mon at TISHOMINGO-M120-RE0> show system uptime 
 # System booted: 2012-04-18 22:16 CDT 
 # Protocols started: 2012-04-18 22:18 CDT 
-# Last configured: 2012-10-31 10:43 CDT  by admin
+# Last configured: 2012-10-31 13:59 CDT  by jeremyt
 # 
 # {master}
 # grnoc-mon at TISHOMINGO-M120-RE0> show interface terse 
@@ -433,7 +433,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at TISHOMINGO-M120-RE0> show configuration 
-## Last commit: 2012-10-31 10:43:18 CDT by admin
+## Last commit: 2012-10-31 13:59:07 CDT by jeremyt
 version 10.4R2.6;
 groups {
     re0 {
@@ -1167,61 +1167,89 @@
 }
 class-of-service {
     classifiers {
-        dscp dscp-default {
+        dscp dscp-onenet {
             import default;
+            forwarding-class scavenger-service {
+                loss-priority high code-points cs1;
+            }
+            forwarding-class expedited-forwarding {
+                loss-priority low code-points [ cs3 cs4 ];
+                loss-priority high code-points cs5;
+            }
         }
     }
+    drop-profiles {
+        T1-interpolated {
+            interpolate {
+                fill-level [ 50 75 ];
+                drop-probability [ 25 50 ];
+            }
+        }
+    }
     forwarding-classes {
-        class data queue-num 0;
-        class voice queue-num 1;
-        class video queue-num 2;
+        class best-effort queue-num 0;
+        class expedited-forwarding queue-num 2;
+        class assured-forwarding queue-num 1;
         class network-control queue-num 3;
+        class scavenger-service queue-num 4;
     }
     interfaces {
-        t1-2/0/2:14 {
-            scheduler-map video-priority-on-t1;
+        lsq-* {
             unit * {
+                scheduler-map t1-sch-map;
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
+        t1-* {
+            scheduler-map t1-sch-map;
+            unit * {
+                classifiers {
+                    dscp dscp-onenet;
+                }
+            }
+        }
         all {
             scheduler-map sch-map;
             unit * {
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
     }
     scheduler-maps {
         sch-map {
-            forwarding-class data scheduler data-sch;
-            forwarding-class voice scheduler voice-sch;
-            forwarding-class video scheduler video-sch;
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler expedited-forwarding-sch;
             forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
         }
-        video-priority-on-t1 {
-            forwarding-class data scheduler data-t1-sch;
-            forwarding-class voice scheduler voice-t1-sch;
-            forwarding-class video scheduler video-t1-sch;
+        t1-sch-map {
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler t1-expedited-forwarding-sch;
+            forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler t1-assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
         }
     }
     schedulers {
-        data-sch {
+        best-effort-sch {
             transmit-rate remainder;
             buffer-size remainder;
             priority low;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
         }
-        voice-sch {
+        assured-forwarding-sch {
             transmit-rate percent 5;
             buffer-size percent 5;
             priority high;
         }
-        video-sch {
-            transmit-rate percent 5;
-            buffer-size percent 5;
+        expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
             priority high;
         }
         network-control-sch {
@@ -1229,19 +1257,20 @@
             buffer-size percent 5;
             priority high;
         }
-        data-t1-sch {
-            transmit-rate remainder;
-            buffer-size remainder;
+        scavenger-service-sch {
+            transmit-rate percent 0;
+            buffer-size percent 0;
             priority low;
         }
-        voice-t1-sch {
-            transmit-rate percent 60;
-            buffer-size percent 50;
-            priority high;
+        t1-assured-forwarding-sch {
+            transmit-rate percent 35;
+            buffer-size percent 25;
+            priority medium-high;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
         }
-        video-t1-sch {
-            transmit-rate percent 10;
-            buffer-size percent 5;
+        t1-expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
             priority high;
         }
     }

Index: hub.mia.onenet.net
===================================================================
--- hub.mia.onenet.net	(revision 43025)
+++ hub.mia.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at MIAMI-M120-RE0> show system commit 
+#   2012-10-31 13:50:15 CDT by rnordmark via cli commit synchronize
 #   2012-10-25 12:11:48 CDT by joel via cli commit synchronize
 #   2012-10-11 13:53:54 CDT by joe via cli commit synchronize
 #   2012-10-09 11:39:13 CDT by joel via cli commit synchronize
 #   2012-10-09 11:27:35 CDT by joel via cli commit synchronize
 #   2012-10-03 14:51:06 CDT by joe via cli commit synchronize
-#   2012-10-03 14:39:36 CDT by joe via cli commit synchronize
 # grnoc-mon at MIAMI-M120-RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -294,7 +294,7 @@
 # grnoc-mon at MIAMI-M120-RE0> show system uptime 
 # System booted: 2011-02-28 14:08 CST 
 # Protocols started: 2011-02-28 14:09 CST 
-# Last configured: 2012-10-25 12:11 CDT  by joel
+# Last configured: 2012-10-31 13:50 CDT  by rnordmark
 # 
 # {master}
 # grnoc-mon at MIAMI-M120-RE0> show interface terse 
@@ -438,7 +438,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at MIAMI-M120-RE0> show configuration 
-## Last commit: 2012-10-25 12:11:48 CDT by joel
+## Last commit: 2012-10-31 13:50:15 CDT by rnordmark
 version 10.4R2.6;
 groups {
     re0 {
@@ -867,7 +867,6 @@
             family inet {
                 filter {
                     input FLOW-INFO;
-                    output VIDEO-FLOW;
                 }
                 address 164.58.12.9/30;
             }
@@ -1130,30 +1129,46 @@
 }
 class-of-service {
     classifiers {
-        dscp dscp-default {
+        dscp dscp-onenet {
             import default;
+            forwarding-class scavenger-service {
+                loss-priority high code-points cs1;
+            }
+            forwarding-class expedited-forwarding {
+                loss-priority low code-points [ cs3 cs4 ];
+                loss-priority high code-points cs5;
+            }
         }
     }
+    drop-profiles {
+        T1-interpolated {
+            interpolate {
+                fill-level [ 50 75 ];
+                drop-probability [ 25 50 ];
+            }
+        }
+    }
     forwarding-classes {
-        class data queue-num 0;
-        class voice queue-num 1;
-        class video queue-num 2;
+        class best-effort queue-num 0;
+        class expedited-forwarding queue-num 2;
+        class assured-forwarding queue-num 1;
         class network-control queue-num 3;
+        class scavenger-service queue-num 4;
     }
     interfaces {
-        t1-2/0/2:9 {
-            scheduler-map video-priority-on-t1;
+        lsq-* {
             unit * {
+                scheduler-map t1-sch-map;
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
-        lsq-2/3/0 {
+        t1-* {
+            scheduler-map t1-sch-map;
             unit * {
-                scheduler-map video-priority-on-t1;
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
@@ -1161,38 +1176,42 @@
             scheduler-map sch-map;
             unit * {
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
     }
     scheduler-maps {
         sch-map {
-            forwarding-class data scheduler data-sch;
-            forwarding-class voice scheduler voice-sch;
-            forwarding-class video scheduler video-sch;
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler expedited-forwarding-sch;
             forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
         }
-        video-priority-on-t1 {
-            forwarding-class data scheduler data-t1-sch;
-            forwarding-class voice scheduler voice-t1-sch;
-            forwarding-class video scheduler video-t1-sch;
+        t1-sch-map {
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler t1-expedited-forwarding-sch;
+            forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler t1-assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
         }
     }
     schedulers {
-        data-sch {
+        best-effort-sch {
             transmit-rate remainder;
             buffer-size remainder;
             priority low;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
         }
-        voice-sch {
+        assured-forwarding-sch {
             transmit-rate percent 5;
             buffer-size percent 5;
             priority high;
         }
-        video-sch {
-            transmit-rate percent 25;
-            buffer-size percent 10;
+        expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
             priority high;
         }
         network-control-sch {
@@ -1200,19 +1219,20 @@
             buffer-size percent 5;
             priority high;
         }
-        data-t1-sch {
-            transmit-rate remainder;
-            buffer-size remainder;
+        scavenger-service-sch {
+            transmit-rate percent 0;
+            buffer-size percent 0;
             priority low;
         }
-        voice-t1-sch {
-            transmit-rate percent 60;
-            buffer-size percent 50;
-            priority high;
+        t1-assured-forwarding-sch {
+            transmit-rate percent 35;
+            buffer-size percent 25;
+            priority medium-high;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
         }
-        video-t1-sch {
-            transmit-rate percent 10;
-            buffer-size percent 5;
+        t1-expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
             priority high;
         }
     }
@@ -1396,41 +1416,6 @@
             }
         }
     }
-    filter VIDEO-FLOW {
-        interface-specific;
-        term 1 {
-            from {
-                source-prefix-list {
-                    VIDEO;
-                }
-            }
-            then {
-                sample;
-                loss-priority high;
-                forwarding-class voice;
-                accept;
-            }
-        }
-        term 2 {
-            from {
-                destination-prefix-list {
-                    VIDEO;
-                }
-            }
-            then {
-                sample;
-                loss-priority high;
-                forwarding-class voice;
-                accept;
-            }
-        }
-        term ALL_FLOW {
-            then {
-                sample;
-                accept;
-            }
-        }
-    }
 }
 {master}
 # grnoc-mon at MIAMI-M120-RE0> show ospf neighbor 

Index: hub.dunc.onenet.net
===================================================================
--- hub.dunc.onenet.net	(revision 42788)
+++ hub.dunc.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at DUNCAN-M120-RE0> show system commit 
+#   2012-10-31 13:44:45 CDT by jeremyt via cli commit synchronize
 #   2012-10-16 16:07:08 CDT by smclean via cli commit synchronize
 #   2012-10-11 16:28:40 CDT by joe via cli commit synchronize
 #   2012-08-17 15:49:58 CDT by jeremyt via cli commit synchronize
 #   2012-08-07 11:39:53 CDT by admin via cli commit synchronize
 #   2012-05-29 09:43:02 CDT by joe via cli commit synchronize
-#   2012-05-24 15:49:16 CDT by joel via cli commit synchronize
 # grnoc-mon at DUNCAN-M120-RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -296,7 +296,7 @@
 # grnoc-mon at DUNCAN-M120-RE0> show system uptime 
 # System booted: 2011-03-10 11:46 CST 
 # Protocols started: 2011-03-10 11:48 CST 
-# Last configured: 2012-10-16 16:07 CDT  by smclean
+# Last configured: 2012-10-31 13:44 CDT  by jeremyt
 # 
 # {master}
 # grnoc-mon at DUNCAN-M120-RE0> show interface terse 
@@ -457,7 +457,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at DUNCAN-M120-RE0> show configuration 
-## Last commit: 2012-10-16 16:07:08 CDT by smclean
+## Last commit: 2012-10-31 13:44:45 CDT by jeremyt
 version 10.4R2.6;
 groups {
     re0 {
@@ -1288,61 +1288,89 @@
 }
 class-of-service {
     classifiers {
-        dscp dscp-default {
+        dscp dscp-onenet {
             import default;
+            forwarding-class scavenger-service {
+                loss-priority high code-points cs1;
+            }
+            forwarding-class expedited-forwarding {
+                loss-priority low code-points [ cs3 cs4 ];
+                loss-priority high code-points cs5;
+            }
         }
     }
+    drop-profiles {
+        T1-interpolated {
+            interpolate {
+                fill-level [ 50 75 ];
+                drop-probability [ 25 50 ];
+            }
+        }
+    }
     forwarding-classes {
-        class data queue-num 0;
-        class voice queue-num 1;
-        class video queue-num 2;
+        class best-effort queue-num 0;
+        class expedited-forwarding queue-num 2;
+        class assured-forwarding queue-num 1;
         class network-control queue-num 3;
+        class scavenger-service queue-num 4;
     }
     interfaces {
-        t1-2/0/2:11 {
-            scheduler-map video-priority-on-t1;
+        lsq-* {
             unit * {
+                scheduler-map t1-sch-map;
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
+        t1-* {
+            scheduler-map t1-sch-map;
+            unit * {
+                classifiers {
+                    dscp dscp-onenet;
+                }
+            }
+        }
         all {
             scheduler-map sch-map;
             unit * {
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
     }
     scheduler-maps {
         sch-map {
-            forwarding-class data scheduler data-sch;
-            forwarding-class voice scheduler voice-sch;
-            forwarding-class video scheduler video-sch;
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler expedited-forwarding-sch;
             forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
         }
-        video-priority-on-t1 {
-            forwarding-class data scheduler data-t1-sch;
-            forwarding-class voice scheduler voice-t1-sch;
-            forwarding-class video scheduler video-t1-sch;
+        t1-sch-map {
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler t1-expedited-forwarding-sch;
+            forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler t1-assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
         }
     }
     schedulers {
-        data-sch {
+        best-effort-sch {
             transmit-rate remainder;
             buffer-size remainder;
             priority low;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
         }
-        voice-sch {
+        assured-forwarding-sch {
             transmit-rate percent 5;
             buffer-size percent 5;
             priority high;
         }
-        video-sch {
-            transmit-rate percent 5;
-            buffer-size percent 5;
+        expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
             priority high;
         }
         network-control-sch {
@@ -1350,19 +1378,20 @@
             buffer-size percent 5;
             priority high;
         }
-        data-t1-sch {
-            transmit-rate remainder;
-            buffer-size remainder;
+        scavenger-service-sch {
+            transmit-rate percent 0;
+            buffer-size percent 0;
             priority low;
         }
-        voice-t1-sch {
-            transmit-rate percent 60;
-            buffer-size percent 50;
-            priority high;
+        t1-assured-forwarding-sch {
+            transmit-rate percent 35;
+            buffer-size percent 25;
+            priority medium-high;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
         }
-        video-t1-sch {
-            transmit-rate percent 10;
-            buffer-size percent 5;
+        t1-expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
             priority high;
         }
     }

Index: hub.sem.onenet.net
===================================================================
--- hub.sem.onenet.net	(revision 42776)
+++ hub.sem.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at SEMINOLE-M120-RE0> show system commit 
+#   2012-10-31 13:57:59 CDT by jeremyt via cli commit synchronize
 #   2012-09-06 16:21:33 CDT by joel via cli commit synchronize
 #   2012-08-29 15:50:19 CDT by bobby via cli commit synchronize
 #   2012-08-17 15:50:07 CDT by jeremyt via cli commit synchronize
 #   2012-08-01 09:00:29 CDT by rnordmark via cli commit synchronize
 #   2012-07-30 11:55:59 CDT by admin via cli commit synchronize
-#   2012-07-30 11:50:01 CDT by admin via cli commit synchronize
 # grnoc-mon at SEMINOLE-M120-RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -290,7 +290,7 @@
 # grnoc-mon at SEMINOLE-M120-RE0> show system uptime 
 # System booted: 2011-02-10 18:03 CST 
 # Protocols started: 2011-02-10 18:04 CST 
-# Last configured: 2012-09-06 16:21 CDT  by joel
+# Last configured: 2012-10-31 13:57 CDT  by jeremyt
 # 
 # {master}
 # grnoc-mon at SEMINOLE-M120-RE0> show interface terse 
@@ -489,7 +489,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at SEMINOLE-M120-RE0> show configuration 
-## Last commit: 2012-09-06 16:21:33 CDT by joel
+## Last commit: 2012-10-31 13:57:59 CDT by jeremyt
 version 10.4R1.9;
 groups {
     re0 {
@@ -1516,61 +1516,89 @@
 }
 class-of-service {
     classifiers {
-        dscp dscp-default {
+        dscp dscp-onenet {
             import default;
+            forwarding-class scavenger-service {
+                loss-priority high code-points cs1;
+            }
+            forwarding-class expedited-forwarding {
+                loss-priority low code-points [ cs3 cs4 ];
+                loss-priority high code-points cs5;
+            }
         }
     }
+    drop-profiles {
+        T1-interpolated {
+            interpolate {
+                fill-level [ 50 75 ];
+                drop-probability [ 25 50 ];
+            }
+        }
+    }
     forwarding-classes {
-        class data queue-num 0;
-        class voice queue-num 1;
-        class video queue-num 2;
+        class best-effort queue-num 0;
+        class expedited-forwarding queue-num 2;
+        class assured-forwarding queue-num 1;
         class network-control queue-num 3;
+        class scavenger-service queue-num 4;
     }
     interfaces {
-        t1-2/0/2:22 {
-            scheduler-map video-priority-on-t1;
+        lsq-* {
             unit * {
+                scheduler-map t1-sch-map;
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
+        t1-* {
+            scheduler-map t1-sch-map;
+            unit * {
+                classifiers {
+                    dscp dscp-onenet;
+                }
+            }
+        }
         all {
             scheduler-map sch-map;
             unit * {
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
     }
     scheduler-maps {
         sch-map {
-            forwarding-class data scheduler data-sch;
-            forwarding-class voice scheduler voice-sch;
-            forwarding-class video scheduler video-sch;
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler expedited-forwarding-sch;
             forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
         }
-        video-priority-on-t1 {
-            forwarding-class data scheduler data-t1-sch;
-            forwarding-class voice scheduler voice-t1-sch;
-            forwarding-class video scheduler video-t1-sch;
+        t1-sch-map {
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler t1-expedited-forwarding-sch;
+            forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler t1-assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
         }
     }
     schedulers {
-        data-sch {
+        best-effort-sch {
             transmit-rate remainder;
             buffer-size remainder;
             priority low;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
         }
-        voice-sch {
+        assured-forwarding-sch {
             transmit-rate percent 5;
             buffer-size percent 5;
             priority high;
         }
-        video-sch {
-            transmit-rate percent 5;
-            buffer-size percent 5;
+        expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
             priority high;
         }
         network-control-sch {
@@ -1578,19 +1606,20 @@
             buffer-size percent 5;
             priority high;
         }
-        data-t1-sch {
-            transmit-rate remainder;
-            buffer-size remainder;
+        scavenger-service-sch {
+            transmit-rate percent 0;
+            buffer-size percent 0;
             priority low;
         }
-        voice-t1-sch {
-            transmit-rate percent 60;
-            buffer-size percent 50;
-            priority high;
+        t1-assured-forwarding-sch {
+            transmit-rate percent 35;
+            buffer-size percent 25;
+            priority medium-high;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
         }
-        video-t1-sch {
-            transmit-rate percent 10;
-            buffer-size percent 5;
+        t1-expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
             priority high;
         }
     }

Index: hub.sal.onenet.net
===================================================================
--- hub.sal.onenet.net	(revision 43140)
+++ hub.sal.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at SALLISAW-M120-RE0> show system commit 
+#   2012-10-31 13:55:41 CDT by jeremyt via cli commit synchronize
 #   2012-10-01 11:55:18 CDT by joel via cli commit synchronize
 #   2012-09-19 10:36:59 CDT by joe via cli commit synchronize
 #   2012-09-19 10:35:57 CDT by joe via cli commit synchronize
 #   2012-09-06 16:08:51 CDT by joel via cli commit synchronize
 #   2012-08-31 08:34:26 CDT by smclean via cli commit synchronize
-#   2012-08-31 08:33:48 CDT by smclean via cli commit synchronize
 # grnoc-mon at SALLISAW-M120-RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -296,7 +296,7 @@
 # grnoc-mon at SALLISAW-M120-RE0> show system uptime 
 # System booted: 2011-06-16 08:25 CDT 
 # Protocols started: 2011-06-16 08:27 CDT 
-# Last configured: 2012-10-01 11:55 CDT  by joel
+# Last configured: 2012-10-31 13:55 CDT  by jeremyt
 # 
 # {master}
 # grnoc-mon at SALLISAW-M120-RE0> show interface terse 
@@ -460,7 +460,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at SALLISAW-M120-RE0> show configuration 
-## Last commit: 2012-10-01 11:55:18 CDT by joel
+## Last commit: 2012-10-31 13:55:41 CDT by jeremyt
 version 10.4R2.6;
 groups {
     re0 {
@@ -1337,61 +1337,89 @@
 }
 class-of-service {
     classifiers {
-        dscp dscp-default {
+        dscp dscp-onenet {
             import default;
+            forwarding-class scavenger-service {
+                loss-priority high code-points cs1;
+            }
+            forwarding-class expedited-forwarding {
+                loss-priority low code-points [ cs3 cs4 ];
+                loss-priority high code-points cs5;
+            }
         }
     }
+    drop-profiles {
+        T1-interpolated {
+            interpolate {
+                fill-level [ 50 75 ];
+                drop-probability [ 25 50 ];
+            }
+        }
+    }
     forwarding-classes {
-        class data queue-num 0;
-        class voice queue-num 1;
-        class video queue-num 2;
+        class best-effort queue-num 0;
+        class expedited-forwarding queue-num 2;
+        class assured-forwarding queue-num 1;
         class network-control queue-num 3;
+        class scavenger-service queue-num 4;
     }
     interfaces {
-        lsq-2/3/0 {
-            unit 8 {
-                scheduler-map video-priority-on-t1;
+        lsq-* {
+            unit * {
+                scheduler-map t1-sch-map;
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
+        t1-* {
+            scheduler-map t1-sch-map;
+            unit * {
+                classifiers {
+                    dscp dscp-onenet;
+                }
+            }
+        }
         all {
             scheduler-map sch-map;
             unit * {
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
     }
     scheduler-maps {
         sch-map {
-            forwarding-class data scheduler data-sch;
-            forwarding-class voice scheduler voice-sch;
-            forwarding-class video scheduler video-sch;
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler expedited-forwarding-sch;
             forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
         }
-        video-priority-on-t1 {
-            forwarding-class data scheduler data-t1-sch;
-            forwarding-class voice scheduler voice-t1-sch;
-            forwarding-class video scheduler video-t1-sch;
+        t1-sch-map {
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler t1-expedited-forwarding-sch;
+            forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler t1-assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
         }
     }
     schedulers {
-        data-sch {
+        best-effort-sch {
             transmit-rate remainder;
             buffer-size remainder;
             priority low;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
         }
-        voice-sch {
+        assured-forwarding-sch {
             transmit-rate percent 5;
             buffer-size percent 5;
             priority high;
         }
-        video-sch {
-            transmit-rate percent 5;
-            buffer-size percent 5;
+        expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
             priority high;
         }
         network-control-sch {
@@ -1399,19 +1427,20 @@
             buffer-size percent 5;
             priority high;
         }
-        data-t1-sch {
-            transmit-rate remainder;
-            buffer-size remainder;
+        scavenger-service-sch {
+            transmit-rate percent 0;
+            buffer-size percent 0;
             priority low;
         }
-        voice-t1-sch {
-            transmit-rate percent 60;
-            buffer-size percent 50;
-            priority high;
+        t1-assured-forwarding-sch {
+            transmit-rate percent 35;
+            buffer-size percent 25;
+            priority medium-high;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
         }
-        video-t1-sch {
-            transmit-rate percent 10;
-            buffer-size percent 5;
+        t1-expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
             priority high;
         }
     }

Index: hub.okm.onenet.net
===================================================================
--- hub.okm.onenet.net	(revision 43093)
+++ hub.okm.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at OKMULGEE-M120-RE0> show system commit 
+#   2012-10-31 13:51:19 CDT by jeremyt via cli commit synchronize
 #   2012-10-30 13:14:58 CDT by bobby via cli commit synchronize
 #   2012-10-30 13:12:06 CDT by bobby via cli commit synchronize
 #   2012-10-30 13:10:06 CDT by bobby via cli commit synchronize
 #   2012-09-07 10:05:23 CDT by bobby via cli commit synchronize
 #   2012-09-07 09:59:24 CDT by bobby via cli commit synchronize
-#   2012-09-07 08:23:40 CDT by smclean via cli commit synchronize
 # grnoc-mon at OKMULGEE-M120-RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -295,7 +295,7 @@
 # grnoc-mon at OKMULGEE-M120-RE0> show system uptime 
 # System booted: 2011-03-22 10:41 CDT 
 # Protocols started: 2011-03-22 10:43 CDT 
-# Last configured: 2012-10-30 13:14 CDT  by bobby
+# Last configured: 2012-10-31 13:51 CDT  by jeremyt
 # 
 # {master}
 # grnoc-mon at OKMULGEE-M120-RE0> show interface terse 
@@ -485,7 +485,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at OKMULGEE-M120-RE0> show configuration 
-## Last commit: 2012-10-30 13:14:58 CDT by bobby
+## Last commit: 2012-10-31 13:51:19 CDT by jeremyt
 version 10.4R2.6;
 groups {
     re0 {
@@ -1562,48 +1562,89 @@
 }
 class-of-service {
     classifiers {
-        dscp dscp-default {
+        dscp dscp-onenet {
             import default;
+            forwarding-class scavenger-service {
+                loss-priority high code-points cs1;
+            }
+            forwarding-class expedited-forwarding {
+                loss-priority low code-points [ cs3 cs4 ];
+                loss-priority high code-points cs5;
+            }
         }
     }
+    drop-profiles {
+        T1-interpolated {
+            interpolate {
+                fill-level [ 50 75 ];
+                drop-probability [ 25 50 ];
+            }
+        }
+    }
     forwarding-classes {
-        class data queue-num 0;
-        class voice queue-num 1;
-        class video queue-num 2;
+        class best-effort queue-num 0;
+        class expedited-forwarding queue-num 2;
+        class assured-forwarding queue-num 1;
         class network-control queue-num 3;
+        class scavenger-service queue-num 4;
     }
     interfaces {
+        lsq-* {
+            unit * {
+                scheduler-map t1-sch-map;
+                classifiers {
+                    dscp dscp-onenet;
+                }
+            }
+        }
+        t1-* {
+            scheduler-map t1-sch-map;
+            unit * {
+                classifiers {
+                    dscp dscp-onenet;
+                }
+            }
+        }
         all {
             scheduler-map sch-map;
             unit * {
                 classifiers {
-                    dscp dscp-default;
+                    dscp dscp-onenet;
                 }
             }
         }
     }
     scheduler-maps {
         sch-map {
-            forwarding-class data scheduler data-sch;
-            forwarding-class voice scheduler voice-sch;
-            forwarding-class video scheduler video-sch;
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler expedited-forwarding-sch;
             forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
         }
+        t1-sch-map {
+            forwarding-class best-effort scheduler best-effort-sch;
+            forwarding-class expedited-forwarding scheduler t1-expedited-forwarding-sch;
+            forwarding-class network-control scheduler network-control-sch;
+            forwarding-class assured-forwarding scheduler t1-assured-forwarding-sch;
+            forwarding-class scavenger-service scheduler scavenger-service-sch;
+        }
     }
     schedulers {
-        data-sch {
+        best-effort-sch {
             transmit-rate remainder;
             buffer-size remainder;
             priority low;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
         }
-        voice-sch {
+        assured-forwarding-sch {
             transmit-rate percent 5;
             buffer-size percent 5;
             priority high;
         }
-        video-sch {
-            transmit-rate percent 5;
-            buffer-size percent 5;
+        expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
             priority high;
         }
         network-control-sch {
@@ -1611,6 +1652,22 @@
             buffer-size percent 5;
             priority high;
         }
+        scavenger-service-sch {
+            transmit-rate percent 0;
+            buffer-size percent 0;
+            priority low;
+        }
+        t1-assured-forwarding-sch {
+            transmit-rate percent 35;
+            buffer-size percent 25;
+            priority medium-high;
+            drop-profile-map loss-priority any protocol any drop-profile T1-interpolated;
+        }
+        t1-expedited-forwarding-sch {
+            transmit-rate percent 50;
+            buffer-size percent 25;
+            priority high;
+        }
     }
 }
 firewall {


More information about the Nocrancid mailing list