[Nocrancid] autopop-onenet.net router config diffs

rancid at rancid.noc.onenet.net rancid at rancid.noc.onenet.net
Fri Aug 10 15:02:31 CDT 2012


Index: core2-okc-mx960.onenet.net
===================================================================
--- core2-okc-mx960.onenet.net	(revision 36502)
+++ core2-okc-mx960.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at OKC-CORE2-MX960-RE0> show system commit 
+#   2012-08-10 14:03:58 CDT by jeremyt via cli commit synchronize
 #   2012-08-07 16:23:42 CDT by jeremyt via cli commit synchronize
 #   2012-08-07 16:15:14 CDT by jeremyt via cli commit synchronize
 #   2012-08-07 16:12:44 CDT by jeremyt via cli commit synchronize
 #   2012-08-07 15:15:01 CDT by jeremyt via cli commit synchronize
 #   2012-08-07 13:34:03 CDT by jeremyt via cli commit synchronize
-#   2012-07-18 15:26:37 CDT by jeremyt via cli commit synchronize
 # grnoc-mon at OKC-CORE2-MX960-RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -356,7 +356,7 @@
 # grnoc-mon at OKC-CORE2-MX960-RE0> show system uptime 
 # System booted: 2011-11-18 00:10 CST 
 # Protocols started: 2011-11-18 00:12 CST 
-# Last configured: 2012-08-07 16:23 CDT  by jeremyt
+# Last configured: 2012-08-10 14:03 CDT  by jeremyt
 # 
 # {master}
 # grnoc-mon at OKC-CORE2-MX960-RE0> show interface terse 
@@ -496,7 +496,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at OKC-CORE2-MX960-RE0> show configuration 
-## Last commit: 2012-08-07 16:23:42 CDT by jeremyt
+## Last commit: 2012-08-10 14:03:58 CDT by jeremyt
 version 10.4R6.5;
 groups {
     re0 {
@@ -1442,6 +1442,7 @@
         /* Ursula */
         172.23.49.72/32;
     }
+    prefix-list DOH-SCAVENGER;
     policy-statement DOH-EXPORT {
         term 1 {
             from protocol static;
@@ -1914,6 +1915,18 @@
                 dscp af31;
             }
         }
+        term SCAVENGER {
+            from {
+                source-prefix-list {
+                    DOH-SCAVENGER;
+                }
+            }
+            then {
+                forwarding-class best-effort;
+                accept;
+                dscp cs1;
+            }
+        }
         term ACCEPT-ALL {
             then {
                 forwarding-class best-effort;

Index: core5.okc-mx480.onenet.net
===================================================================
--- core5.okc-mx480.onenet.net	(revision 36845)
+++ core5.okc-mx480.onenet.net	(working copy)
@@ -324,17 +324,17 @@
 # grnoc-mon at OKC-CORE5-MX480-RE0> file list /var/tmp detail 
 # 
 # /var/tmp:
-# total 6000684
-# -rw-r--r--  1 root  field    5183588 Aug 10 14:01 JFLOWX
-# -rw-r--r--  1 root  field     747500 Aug 10 14:01 JFLOWX.0.gz
-# -rw-r--r--  1 root  field     770120 Aug 10 14:00 JFLOWX.1.gz
-# -rw-r--r--  1 root  field     715332 Aug 10 13:59 JFLOWX.2.gz
-# -rw-r--r--  1 root  field     758880 Aug 10 13:58 JFLOWX.3.gz
-# -rw-r--r--  1 root  field     766172 Aug 10 13:57 JFLOWX.4.gz
-# -rw-r--r--  1 root  field     760419 Aug 10 13:57 JFLOWX.5.gz
-# -rw-r--r--  1 root  field     787129 Aug 10 13:56 JFLOWX.6.gz
-# -rw-r--r--  1 root  field     774641 Aug 10 13:55 JFLOWX.7.gz
-# -rw-r--r--  1 root  field     777965 Aug 10 13:54 JFLOWX.8.gz
+# total 5996620
+# -rw-r--r--  1 root  field    2973002 Aug 10 15:01 JFLOWX
+# -rw-r--r--  1 root  field     770546 Aug 10 15:01 JFLOWX.0.gz
+# -rw-r--r--  1 root  field     784545 Aug 10 15:00 JFLOWX.1.gz
+# -rw-r--r--  1 root  field     774059 Aug 10 14:59 JFLOWX.2.gz
+# -rw-r--r--  1 root  field     763671 Aug 10 14:58 JFLOWX.3.gz
+# -rw-r--r--  1 root  field     774417 Aug 10 14:58 JFLOWX.4.gz
+# -rw-r--r--  1 root  field     769788 Aug 10 14:57 JFLOWX.5.gz
+# -rw-r--r--  1 root  field     773842 Aug 10 14:56 JFLOWX.6.gz
+# -rw-r--r--  1 root  field     790487 Aug 10 14:55 JFLOWX.7.gz
+# -rw-r--r--  1 root  field     792428 Aug 10 14:54 JFLOWX.8.gz
 # -rw-r--r--  1 eng   field     513412 Jul 21 23:49 UPGRADE-RSI
 # -rw-r--r--  1 root  field         30 Dec 3   2010 ex.txt
 # drwxr-xr-x  2 root  field        512 Dec 3   2010 gres-tp/

Index: hub.elr.onenet.net
===================================================================
--- hub.elr.onenet.net	(revision 36844)
+++ hub.elr.onenet.net	(working copy)
@@ -1,12 +1,12 @@
 # RANCID-CONTENT-TYPE: juniper
 #
 # grnoc-mon at EL-RENO-M120-RE0> show system commit 
+#   2012-08-10 14:27:40 CDT by jeremyt via cli commit synchronize
 #   2012-08-10 13:51:52 CDT by jeremyt via cli commit synchronize
 #   2012-08-10 13:49:17 CDT by jeremyt via cli commit synchronize
 #   2012-08-10 13:46:38 CDT by jeremyt via cli commit synchronize
 #   2012-08-10 13:17:26 CDT by jeremyt via cli commit synchronize
 #   2012-08-08 12:14:42 CDT by admin via cli commit synchronize
-#   2012-08-07 16:19:45 CDT by jeremyt via cli commit synchronize
 # grnoc-mon at EL-RENO-M120-RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -294,7 +294,7 @@
 # grnoc-mon at EL-RENO-M120-RE0> show system uptime 
 # System booted: 2011-02-22 16:32 CST 
 # Protocols started: 2011-02-22 16:34 CST 
-# Last configured: 2012-08-10 13:51 CDT  by jeremyt
+# Last configured: 2012-08-10 14:27 CDT  by jeremyt
 # 
 # {master}
 # grnoc-mon at EL-RENO-M120-RE0> show interface terse 
@@ -437,7 +437,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at EL-RENO-M120-RE0> show configuration 
-## Last commit: 2012-08-10 13:51:52 CDT by jeremyt
+## Last commit: 2012-08-10 14:27:40 CDT by jeremyt
 version 10.4R2.6;
 groups {
     re0 {
@@ -1606,21 +1606,9 @@
                 accept;
             }
         }
-        term PRIORITY {
-            from {
-                dscp [ af11 af12 ];
-            }
-            then {
-                forwarding-class assured-forwarding;
-                accept;
-            }
+        term ACCEPT-ALL {
+            then accept;
         }
-        term BEST-EFFORT {
-            then {
-                forwarding-class best-effort;
-                accept;
-            }
-        }
     }
 }
 services {

Index: core3.okc-m120.onenet.net
===================================================================
--- core3.okc-m120.onenet.net	(revision 36839)
+++ 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-08-10 14:36:39 CDT by jeremyt via cli commit synchronize
+#   2012-08-10 14:25:04 CDT by jeremyt via cli commit synchronize
 #   2012-08-10 09:00:26 CDT by joe via cli commit synchronize
 #   2012-08-08 13:21:19 CDT by bobby via cli commit synchronize
 #   2012-08-08 13:13:50 CDT by bobby via cli commit synchronize
 #   2012-08-08 13:08:25 CDT by bobby via cli commit synchronize
-#   2012-08-06 14:41:23 CDT by joel via cli commit synchronize
-#   2012-08-06 13:55:22 CDT by joel via cli commit synchronize
 # grnoc-mon at OKC-CORE3-M120-RE0> show chassis environment 
 # Class Item                           Status     Measurement
 # Temp  PEM 0                          OK        
@@ -392,7 +392,7 @@
 # grnoc-mon at OKC-CORE3-M120-RE0> show system uptime 
 # System booted: 2012-07-22 01:43 CDT 
 # Protocols started: 2012-07-22 01:51 CDT 
-# Last configured: 2012-08-10 09:00 CDT  by joe
+# Last configured: 2012-08-10 14:36 CDT  by jeremyt
 # 
 # {master}
 # grnoc-mon at OKC-CORE3-M120-RE0> show interface terse 
@@ -2132,7 +2132,7 @@
 #pp0 up up
 #tap up up
 # grnoc-mon at OKC-CORE3-M120-RE0> show configuration 
-## Last commit: 2012-08-10 09:00:26 CDT by joe
+## Last commit: 2012-08-10 14:36:39 CDT by jeremyt
 version 11.4R4.4;
 groups {
     re0 {
@@ -6486,6 +6486,9 @@
         unit 0 {
             family inet {
                 mtu 1512;
+                filter {
+                    output DOH-COS;
+                }
                 sampling {
                     input;
                     output;
@@ -7336,6 +7339,9 @@
         unit 0 {
             family inet {
                 mtu 1512;
+                filter {
+                    output DOH-COS;
+                }
                 sampling {
                     input;
                     output;
@@ -7570,6 +7576,9 @@
         unit 0 {
             family inet {
                 mtu 1512;
+                filter {
+                    output DOH-COS;
+                }
                 address 172.23.3.37/30;
             }
             family mpls {
@@ -7605,6 +7614,9 @@
         unit 0 {
             family inet {
                 mtu 1512;
+                filter {
+                    output DOH-COS;
+                }
                 sampling {
                     input;
                     output;
@@ -7906,6 +7918,9 @@
         unit 0 {
             family inet {
                 mtu 1512;
+                filter {
+                    output DOH-COS;
+                }
                 sampling {
                     input;
                     output;
@@ -8458,6 +8473,9 @@
             encapsulation multilink-ppp;
             family inet {
                 mtu 1512;
+                filter {
+                    output DOH-COS;
+                }
                 sampling {
                     input;
                     output;
@@ -8769,6 +8787,9 @@
             encapsulation multilink-ppp;
             family inet {
                 mtu 1512;
+                filter {
+                    output DOH-COS;
+                }
                 sampling {
                     input;
                     output;
@@ -9996,37 +10017,40 @@
     classifiers {
         dscp dscp-default {
             import default;
+            forwarding-class scavenger-service {
+                loss-priority high code-points ss;
+            }
         }
     }
-    drop-profiles {
-        INTERPOLATED-PROFILE {
-            interpolate {
-                fill-level [ 50 75 ];
-                drop-probability [ 25 50 ];
-            }
+    code-point-aliases {
+        dscp {
+            ss 001000;
         }
+        exp {
+            ss 001;
+        }
     }
     forwarding-classes {
-        class data queue-num 0;
-        class voice queue-num 1;
-        class video queue-num 2;
+        class best-effort queue-num 0;
+        class assured-forwarding queue-num 1;
+        class expedited-forwarding queue-num 2;
         class network-control queue-num 3;
-        class scavenger queue-num 4;
+        class scavenger-service queue-num 4;
     }
     interfaces {
-        t3-2/2/3 {
-            scheduler-map sch-map;
-            unit 0 {
-                rewrite-rules {
-                    dscp VIDEO;
+        lsq-* {
+            scheduler-map t1-sch-map;
+            unit * {
+                classifiers {
+                    dscp dscp-default;
                 }
             }
         }
-        t1-3/3/0:12:7 {
-            scheduler-map sch-map;
-            unit 0 {
-                rewrite-rules {
-                    dscp VIDEO;
+        t1-* {
+            scheduler-map t1-sch-map;
+            unit * {
+                classifiers {
+                    dscp dscp-default;
                 }
             }
         }
@@ -10039,25 +10063,24 @@
             }
         }
     }
-    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;
             }
@@ -10065,30 +10088,37 @@
                 remainder;
             }
             priority low;
-            drop-profile-map loss-priority any protocol any drop-profile INTERPOLATED-PROFILE;
         }
-        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 15;
-            buffer-size percent 15;
+        expedited-forwarding-sch {
+            transmit-rate percent 5;
+            buffer-size percent 5;
             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;
         }
-        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 45;
+            buffer-size percent 5;
+            priority high;
+        }
+        t1-expedited-forwarding-sch {
+            transmit-rate percent 35;
+            buffer-size percent 5;
+            priority high;
+        }
     }
 }
 firewall {
@@ -10288,14 +10318,14 @@
             bandwidth-percent 5;
             burst-size-limit 150k;
         }
-        then forwarding-class scavenger;
+        then forwarding-class scavenger-service;
     }
     policer WEATHRFORD-POL {
         if-exceeding {
             bandwidth-percent 50;
             burst-size-limit 1500;
         }
-        then forwarding-class scavenger;
+        then forwarding-class scavenger-service;
     }
     policer WEATHRFORD-RH-POL {
         if-exceeding {
@@ -10314,7 +10344,7 @@
             }
             then {
                 loss-priority high;
-                forwarding-class video;
+                forwarding-class expedited-forwarding;
                 accept;
             }
         }
@@ -10326,7 +10356,7 @@
             }
             then {
                 loss-priority high;
-                forwarding-class video;
+                forwarding-class expedited-forwarding;
                 accept;
             }
         }
@@ -10357,7 +10387,7 @@
                 }
             }
             then {
-                forwarding-class data;
+                forwarding-class best-effort;
                 accept;
             }
         }
@@ -10376,7 +10406,7 @@
                 }
             }
             then {
-                forwarding-class video;
+                forwarding-class expedited-forwarding;
                 accept;
             }
         }
@@ -10387,7 +10417,7 @@
                 }
             }
             then {
-                forwarding-class video;
+                forwarding-class expedited-forwarding;
                 accept;
             }
         }
@@ -10405,7 +10435,7 @@
                 }
             }
             then {
-                forwarding-class video;
+                forwarding-class expedited-forwarding;
                 accept;
             }
         }
@@ -10436,6 +10466,23 @@
             then accept;
         }
     }
+    filter DOH-COS {
+        term VIDEO {
+            from {
+                destination-address {
+                    156.110.0.0/16;
+                    164.58.0.0/16;
+                }
+            }
+            then {
+                forwarding-class expedited-forwarding;
+                accept;
+            }
+        }
+        term ACCEPT-ALL {
+            then accept;
+        }
+    }
 }
 services {
     flow-monitoring {

Index: hub.sal.onenet.net
===================================================================
--- hub.sal.onenet.net	(revision 36803)
+++ hub.sal.onenet.net	(working copy)
@@ -344,7 +344,7 @@
 #t1-2/0/2:22 up up
 #t1-2/0/2:22.0 up up
 #t1-2/0/2:23 up up
-#t1-2/0/2:23.0 up up
+#t1-2/0/2:23.0 up down
 #t1-2/0/2:24 up up
 #t1-2/0/2:24.0 up up
 #t1-2/0/2:25 up up


More information about the Nocrancid mailing list