diff --git a/test/data/mx1.ams.nl.geant.net-netconf.xml b/test/data/mx1.ams.nl.geant.net-netconf.xml
index fa5fb741c7adebd9542fe0b2c0261fb997646c48..7ad8dcd8036deb3dd68417cf215be96133891763 100644
--- a/test/data/mx1.ams.nl.geant.net-netconf.xml
+++ b/test/data/mx1.ams.nl.geant.net-netconf.xml
@@ -1,4 +1,4 @@
-<configuration changed-seconds="1545216949" changed-localtime="2018-12-19 10:55:49 UTC">
+<configuration changed-seconds="1549111463" changed-localtime="2019-02-02 12:44:23 UTC">
<version>15.1F6-S10.9</version>
<groups>
<name>re0</name>
@@ -271,6 +271,38 @@
<allow-commands>show .*</allow-commands>
<deny-commands>(ssh .*|telnet .*)</deny-commands>
</class>
+ <class>
+ <name>opennsa</name>
+ <idle-timeout>5</idle-timeout>
+ <permissions>configure</permissions>
+ <deny-commands>(file.*)|(load.*)|(op.*)|(request.*)|(save.*)|(start.*)|(test.*)|(set cli.*)|(set date.*)|(clear.*)|(help.*)|(telnet.*)|(ssh.*)|(traceroute.*)|(mtrace.*)|(monitor.*)|(ping.*)|(show.*)|(set.*)</deny-commands>
+ <allow-configuration-regexps>interfaces .*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections remote-interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols mpls label-switched-path.*</allow-configuration-regexps>
+ <deny-configuration-regexps>vmhost .*</deny-configuration-regexps>
+ <deny-configuration-regexps>session-limit-group .*</deny-configuration-regexps>
+ <deny-configuration-regexps>multi-chassis .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc-partition .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc .*</deny-configuration-regexps>
+ <deny-configuration-regexps>groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>dynamic-profiles .*</deny-configuration-regexps>
+ <deny-configuration-regexps>diameter .*</deny-configuration-regexps>
+ <deny-configuration-regexps>apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>access-profile .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces traceoptions .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-set .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-range .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups-except .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lt-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces ms-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces si-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces gr-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lo.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces dsc.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces irb.*</deny-configuration-regexps>
+ </class>
<class>
<name>readonly-permissions</name>
<permissions>view</permissions>
@@ -553,6 +585,22 @@
<encrypted-password>/* SECRET-DATA */</encrypted-password>
</authentication>
</user>
+ <user>
+ <name>opennsa</name>
+ <uid>2052</uid>
+ <class>opennsa</class>
+ <authentication>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ </authentication>
+ </user>
<user>
<name>opnet</name>
<full-name>OPNET NEOP Planning system @ 62.40.105.114</full-name>
@@ -1643,6 +1691,28 @@
<pic-mode>100G</pic-mode>
</pic>
</fpc>
+ <fpc>
+ <name>7</name>
+ <pic>
+ <name>0</name>
+ <pic-mode>100G</pic-mode>
+ </pic>
+ <pic>
+ <name>1</name>
+ <pic-mode>100G</pic-mode>
+ </pic>
+ </fpc>
+ <fpc>
+ <name>8</name>
+ <pic>
+ <name>0</name>
+ <pic-mode>100G</pic-mode>
+ </pic>
+ <pic>
+ <name>1</name>
+ <pic-mode>100G</pic-mode>
+ </pic>
+ </fpc>
<fpc>
<name>10</name>
<pic>
@@ -3429,6 +3499,66 @@
</inet6>
</family>
</unit>
+ <unit>
+ <name>201</name>
+ <description>SRV_GLOBAL INFRASTRUCTURE | AMS Groove 2</description>
+ <vlan-id>201</vlan-id>
+ <family>
+ <inet>
+ <address>
+ <name>10.0.3.5/30</name>
+ </address>
+ </inet>
+ </family>
+ </unit>
+ <unit>
+ <name>202</name>
+ <description>SRV_GLOBAL INFRASTRUCTURE | AMS Groove 2 Direct Management</description>
+ <vlan-id>202</vlan-id>
+ <family>
+ <inet>
+ <filter>
+ <input-list>INTERNAL_HEAD_IN</input-list>
+ <input-list>INTERNAL_TAIL_IN</input-list>
+ <output-list>INTERNAL_HEAD_OUT</output-list>
+ <output-list>INTERNAL_TAIL_OUT</output-list>
+ </filter>
+ <address>
+ <name>62.40.108.120/31</name>
+ </address>
+ </inet>
+ </family>
+ </unit>
+ <unit>
+ <name>203</name>
+ <description>SRV_GLOBAL INFRASTRUCTURE | AMS Groove 3</description>
+ <vlan-id>203</vlan-id>
+ <family>
+ <inet>
+ <address>
+ <name>10.0.3.9/30</name>
+ </address>
+ </inet>
+ </family>
+ </unit>
+ <unit>
+ <name>204</name>
+ <description>SRV_GLOBAL INFRASTRUCTURE | AMS Groove 3 Direct Management</description>
+ <vlan-id>204</vlan-id>
+ <family>
+ <inet>
+ <filter>
+ <input-list>INTERNAL_HEAD_IN</input-list>
+ <input-list>INTERNAL_TAIL_IN</input-list>
+ <output-list>INTERNAL_HEAD_OUT</output-list>
+ <output-list>INTERNAL_TAIL_OUT</output-list>
+ </filter>
+ <address>
+ <name>62.40.108.122/31</name>
+ </address>
+ </inet>
+ </family>
+ </unit>
<unit>
<name>240</name>
<description>SRV_GLOBAL INFRASTRUCTURE VLAN240|SRV_GLOBAL INFRASTRUCTURE VLAN240|SINET edge-device-iDRAC CONTACT: anura.hettiarachchi@geant.org IMPLEMENTED: 20171212</description>
@@ -3692,6 +3822,21 @@
<flexible-vlan-tagging/>
<mtu>9192</mtu>
<encapsulation>flexible-ethernet-services</encapsulation>
+ <unit>
+ <name>2019</name>
+ <description>lon_ams_BoD_AutoBAHNTest1</description>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-tags>
+ <outer>2019</outer>
+ </vlan-tags>
+ <family>
+ <ccc>
+ <filter>
+ <input>filter_in_ge-0/3/7_2019</input>
+ </filter>
+ </ccc>
+ </family>
+ </unit>
</interface>
<interface>
<name>ge-0/3/8</name>
@@ -4114,7 +4259,7 @@
<apply-groups>NO_TRAPS</apply-groups>
<description>PHY INFRASTRUCTURE GTS SRF0000001 | GTS link to CORSA P7</description>
<flexible-vlan-tagging/>
- <mtu>9000</mtu>
+ <mtu>9192</mtu>
<encapsulation>flexible-ethernet-services</encapsulation>
</interface>
<interface>
@@ -4376,17 +4521,6 @@
<encapsulation>vlan-ccc</encapsulation>
<vlan-id>2905</vlan-id>
</unit>
- <unit>
- <name>3116</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>3116</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
<unit>
<name>3222</name>
<description>SRV_GLOBAL RE_INTERCONNECT INTERNET2 SRF9929275 | ASN11537 |</description>
@@ -4539,6 +4673,25 @@
</ccc>
</family>
</unit>
+ <unit>
+ <name>3755</name>
+ <description>mar_ams_BoD_urn_uuid_b97aa49a_fec5_482_371705323</description>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-tags>
+ <outer>3755</outer>
+ </vlan-tags>
+ <input-vlan-map>
+ <swap/>
+ <vlan-id>403</vlan-id>
+ </input-vlan-map>
+ <family>
+ <ccc>
+ <filter>
+ <input>filter_in_et-3/1/2_3755</input>
+ </filter>
+ </ccc>
+ </family>
+ </unit>
<unit>
<name>3756</name>
<description>mil2_ams_BoD_urn_uuid_f39da162_8cb4_4d_229232439</description>
@@ -4759,8 +4912,11 @@
</interface>
<interface>
<name>et-4/1/5</name>
- <description>PHY SPARE |Reserved for AMS-LON GRV AW</description>
+ <description>PHY INFRASTRUCTURE BACKBONE P_AE8 SRF0000001 | Coriant G30 link </description>
<gigether-options>
+ <ieee-802.3ad>
+ <bundle>ae8</bundle>
+ </ieee-802.3ad>
<undocumented><fec>fec91</fec></undocumented>
</gigether-options>
</interface>
@@ -4809,8 +4965,8 @@
</interface>
<interface>
<name>xe-5/2/0</name>
- <description>PHY SPARE | Reserved for Kaust 10Gb Upgrade</description>
- <disable/>
+ <description>PHY RESERVED | Reserved for Kaust 10Gb Upgrade</description>
+ <undocumented><enable/></undocumented>
</interface>
<interface>
<name>xe-5/2/1</name>
@@ -4829,8 +4985,12 @@
</interface>
<interface>
<name>et-5/3/0</name>
- <description>PHY SPARE | Reserved for NII 100Gb</description>
- <disable/>
+ <description>PHY RE_INTERCONNECT SINET P_AE10 SRF9906004 | NII Circuit ID: NL116823-4</description>
+ <gigether-options>
+ <ieee-802.3ad>
+ <bundle>ae20</bundle>
+ </ieee-802.3ad>
+ </gigether-options>
</interface>
<interface>
<name>xe-9/0/0</name>
@@ -4851,12 +5011,45 @@
<apply-groups>NO_TRAPS</apply-groups>
<description>PHY INFRASTRUCTURE GTS SRF0000001 | GTS link to Server 0</description>
<flexible-vlan-tagging/>
- <mtu>9000</mtu>
+ <mtu>9192</mtu>
<encapsulation>flexible-ethernet-services</encapsulation>
<unit>
- <name>11</name>
+ <name>17</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>11</vlan-id>
+ <vlan-id>17</vlan-id>
+ <input-vlan-map>
+ <pop/>
+ </input-vlan-map>
+ <output-vlan-map>
+ <push/>
+ </output-vlan-map>
+ </unit>
+ <unit>
+ <name>18</name>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>18</vlan-id>
+ <input-vlan-map>
+ <pop/>
+ </input-vlan-map>
+ <output-vlan-map>
+ <push/>
+ </output-vlan-map>
+ </unit>
+ <unit>
+ <name>19</name>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>19</vlan-id>
+ <input-vlan-map>
+ <pop/>
+ </input-vlan-map>
+ <output-vlan-map>
+ <push/>
+ </output-vlan-map>
+ </unit>
+ <unit>
+ <name>20</name>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>20</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -4864,6 +5057,80 @@
<push/>
</output-vlan-map>
</unit>
+ <unit>
+ <name>21</name>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>21</vlan-id>
+ <input-vlan-map>
+ <pop/>
+ </input-vlan-map>
+ <output-vlan-map>
+ <push/>
+ </output-vlan-map>
+ </unit>
+ <unit>
+ <name>22</name>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>22</vlan-id>
+ <input-vlan-map>
+ <pop/>
+ </input-vlan-map>
+ <output-vlan-map>
+ <push/>
+ </output-vlan-map>
+ </unit>
+ <unit>
+ <name>23</name>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>23</vlan-id>
+ <input-vlan-map>
+ <pop/>
+ </input-vlan-map>
+ <output-vlan-map>
+ <push/>
+ </output-vlan-map>
+ </unit>
+ <unit>
+ <name>24</name>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>24</vlan-id>
+ <input-vlan-map>
+ <pop/>
+ </input-vlan-map>
+ <output-vlan-map>
+ <push/>
+ </output-vlan-map>
+ </unit>
+ <unit>
+ <name>25</name>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>25</vlan-id>
+ <input-vlan-map>
+ <pop/>
+ </input-vlan-map>
+ <output-vlan-map>
+ <push/>
+ </output-vlan-map>
+ </unit>
+ <unit>
+ <name>26</name>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>26</vlan-id>
+ <input-vlan-map>
+ <pop/>
+ </input-vlan-map>
+ <output-vlan-map>
+ <push/>
+ </output-vlan-map>
+ </unit>
+ </interface>
+ <interface>
+ <name>xe-9/0/3</name>
+ <apply-groups>NO_TRAPS</apply-groups>
+ <description>PHY INFRASTRUCTURE GTS SRF0000001 | GTS link to Server 1</description>
+ <flexible-vlan-tagging/>
+ <mtu>9192</mtu>
+ <encapsulation>flexible-ethernet-services</encapsulation>
<unit>
<name>12</name>
<encapsulation>vlan-ccc</encapsulation>
@@ -4875,6 +5142,58 @@
<push/>
</output-vlan-map>
</unit>
+ <unit>
+ <name>14</name>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>14</vlan-id>
+ <input-vlan-map>
+ <pop/>
+ </input-vlan-map>
+ <output-vlan-map>
+ <push/>
+ </output-vlan-map>
+ </unit>
+ </interface>
+ <interface>
+ <name>xe-9/0/4</name>
+ <description>PHY INFRASTRUCTURE ACCESS PERFSONAR SRF9927005 | PSMP2 DATA</description>
+ <mtu>9192</mtu>
+ <unit>
+ <name>0</name>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS PERFSONAR SRF0000001 | </description>
+ <family>
+ <inet>
+ <filter>
+ <input>
+ <filter-name>HADES-IN</filter-name>
+ </input>
+ <output>
+ <filter-name>HADES-OUT</filter-name>
+ </output>
+ </filter>
+ <address>
+ <name>62.40.106.14/31</name>
+ </address>
+ </inet>
+ </family>
+ </unit>
+ </interface>
+ <interface>
+ <name>xe-9/0/5</name>
+ <description>PHY CUSTOMER RESTENA P_AE10 SRF9921683 |</description>
+ <gigether-options>
+ <ieee-802.3ad>
+ <bundle>ae10</bundle>
+ </ieee-802.3ad>
+ </gigether-options>
+ </interface>
+ <interface>
+ <name>xe-9/0/6</name>
+ <apply-groups>NO_TRAPS</apply-groups>
+ <description>PHY INFRASTRUCTURE GTS SRF0000001 | GTS link to Server 2</description>
+ <flexible-vlan-tagging/>
+ <mtu>9000</mtu>
+ <encapsulation>flexible-ethernet-services</encapsulation>
<unit>
<name>13</name>
<encapsulation>vlan-ccc</encapsulation>
@@ -4897,213 +5216,18 @@
<push/>
</output-vlan-map>
</unit>
- <unit>
- <name>15</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>15</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>16</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>16</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>17</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>17</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>18</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>18</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>19</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>19</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>20</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>20</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>21</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>21</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>22</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>22</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>23</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>23</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>24</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>24</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>25</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>25</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>26</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>26</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
</interface>
<interface>
- <name>xe-9/0/3</name>
- <apply-groups>NO_TRAPS</apply-groups>
- <description>PHY INFRASTRUCTURE GTS SRF0000001 | GTS link to Server 1</description>
- <flexible-vlan-tagging/>
- <mtu>9192</mtu>
- <encapsulation>flexible-ethernet-services</encapsulation>
- <unit>
- <name>13</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>13</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>14</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>14</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- </interface>
- <interface>
- <name>xe-9/0/4</name>
- <description>PHY INFRASTRUCTURE ACCESS PERFSONAR SRF9927005 | PSMP2 DATA</description>
- <mtu>9192</mtu>
- <unit>
- <name>0</name>
- <description>SRV_GLOBAL INFRASTRUCTURE ACCESS PERFSONAR SRF0000001 | </description>
- <family>
- <inet>
- <filter>
- <input>
- <filter-name>HADES-IN</filter-name>
- </input>
- <output>
- <filter-name>HADES-OUT</filter-name>
- </output>
- </filter>
- <address>
- <name>62.40.106.14/31</name>
- </address>
- </inet>
- </family>
- </unit>
- </interface>
- <interface>
- <name>xe-9/0/5</name>
- <description>PHY CUSTOMER RESTENA P_AE10 SRF9921683 |</description>
- <gigether-options>
- <ieee-802.3ad>
- <bundle>ae10</bundle>
- </ieee-802.3ad>
- </gigether-options>
- </interface>
- <interface>
- <name>xe-9/0/6</name>
+ <name>xe-9/0/7</name>
<apply-groups>NO_TRAPS</apply-groups>
- <description>PHY INFRASTRUCTURE GTS SRF0000001 | GTS link to Server 2</description>
+ <description>PHY INFRASTRUCTURE GTS SRF0000001 | GTS link to Server 3</description>
<flexible-vlan-tagging/>
<mtu>9000</mtu>
<encapsulation>flexible-ethernet-services</encapsulation>
<unit>
- <name>14</name>
+ <name>11</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>14</vlan-id>
+ <vlan-id>11</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -5112,9 +5236,9 @@
</output-vlan-map>
</unit>
<unit>
- <name>23</name>
+ <name>12</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>23</vlan-id>
+ <vlan-id>12</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -5122,18 +5246,10 @@
<push/>
</output-vlan-map>
</unit>
- </interface>
- <interface>
- <name>xe-9/0/7</name>
- <apply-groups>NO_TRAPS</apply-groups>
- <description>PHY INFRASTRUCTURE GTS SRF0000001 | GTS link to Server 3</description>
- <flexible-vlan-tagging/>
- <mtu>9000</mtu>
- <encapsulation>flexible-ethernet-services</encapsulation>
<unit>
- <name>12</name>
+ <name>13</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>12</vlan-id>
+ <vlan-id>13</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -5142,9 +5258,9 @@
</output-vlan-map>
</unit>
<unit>
- <name>13</name>
+ <name>14</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>13</vlan-id>
+ <vlan-id>14</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -5271,39 +5387,6 @@
<flexible-vlan-tagging/>
<mtu>9000</mtu>
<encapsulation>flexible-ethernet-services</encapsulation>
- <unit>
- <name>1304</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>1304</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>1305</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>1305</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>1306</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>1306</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
</interface>
<interface>
<name>ge-9/2/2</name>
@@ -5620,7 +5703,7 @@
<name>xe-11/2/0</name>
<apply-groups>NO_TRAPS</apply-groups>
<description>PHY INFRASTRUCTURE GTS SERVER 4 | GTS link to Server 4</description>
- <mtu>9192</mtu>
+ <mtu>9000</mtu>
<encapsulation>ethernet-ccc</encapsulation>
<unit>
<name>0</name>
@@ -5649,6 +5732,50 @@
<flexible-vlan-tagging/>
<mtu>9000</mtu>
<encapsulation>flexible-ethernet-services</encapsulation>
+ <unit>
+ <name>11</name>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>11</vlan-id>
+ <input-vlan-map>
+ <pop/>
+ </input-vlan-map>
+ <output-vlan-map>
+ <push/>
+ </output-vlan-map>
+ </unit>
+ <unit>
+ <name>12</name>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>12</vlan-id>
+ <input-vlan-map>
+ <pop/>
+ </input-vlan-map>
+ <output-vlan-map>
+ <push/>
+ </output-vlan-map>
+ </unit>
+ <unit>
+ <name>13</name>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>13</vlan-id>
+ <input-vlan-map>
+ <pop/>
+ </input-vlan-map>
+ <output-vlan-map>
+ <push/>
+ </output-vlan-map>
+ </unit>
+ <unit>
+ <name>14</name>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>14</vlan-id>
+ <input-vlan-map>
+ <pop/>
+ </input-vlan-map>
+ <output-vlan-map>
+ <push/>
+ </output-vlan-map>
+ </unit>
<unit>
<name>21</name>
<encapsulation>vlan-ccc</encapsulation>
@@ -5953,6 +6080,65 @@
<mtu>9192</mtu>
<encapsulation>flexible-ethernet-services</encapsulation>
</interface>
+ <interface>
+ <name>ae8</name>
+ <description>LAG INFRASTRUCTURE BACKBONE LON SRF0000001 | ams-lon | Coriant G30 100G</description>
+ <mtu>9192</mtu>
+ <aggregated-ether-options>
+ <load-balance>
+ <adaptive>
+ </adaptive>
+ </load-balance>
+ <minimum-links>1</minimum-links>
+ <lacp>
+ <active/>
+ <periodic>fast</periodic>
+ </lacp>
+ </aggregated-ether-options>
+ <unit>
+ <name>0</name>
+ <description>SRV_GLOBAL INFRASTRUCTURE BACKBONE LON2 SRF0000001 | ams-lon | Coriant G30 100G</description>
+ <family>
+ <inet>
+ <accounting>
+ <source-class-usage>
+ <input/>
+ </source-class-usage>
+ </accounting>
+ <mtu>9100</mtu>
+ <filter>
+ <input>
+ <filter-name>bone-in</filter-name>
+ </input>
+ <output>
+ <filter-name>bone-out</filter-name>
+ </output>
+ </filter>
+ <address>
+ <name>62.40.98.164/31</name>
+ </address>
+ </inet>
+ <iso>
+ </iso>
+ <inet6>
+ <mtu>9100</mtu>
+ <filter>
+ <input>
+ <filter-name>bone6-in</filter-name>
+ </input>
+ <output>
+ <filter-name>bone6-out</filter-name>
+ </output>
+ </filter>
+ <address>
+ <name>2001:798:cc::5/126</name>
+ </address>
+ </inet6>
+ <mpls>
+ </mpls>
+ </family>
+ </unit>
+ </interface>
<interface>
<name>ae10</name>
<description>LAG CUSTOMER RESTENA SRF9922291 |</description>
@@ -6691,6 +6877,84 @@
</family>
</unit>
</interface>
+ <interface>
+ <name>ae20</name>
+ <description>LAG RE_INTERCONNECT SINET SRF9946517 |</description>
+ <flexible-vlan-tagging/>
+ <mtu>9192</mtu>
+ <encapsulation>flexible-ethernet-services</encapsulation>
+ <aggregated-ether-options>
+ <minimum-links>1</minimum-links>
+ </aggregated-ether-options>
+ <unit>
+ <name>100</name>
+ <description>SRV_GLOBAL RE_INTERCONNECT SINET SRF9946519| ASN2907 | IETR & IP|</description>
+ <vlan-id>100</vlan-id>
+ <family>
+ <inet>
+ <mtu>9000</mtu>
+ <filter>
+ <input>
+ <filter-name>SINET-in</filter-name>
+ </input>
+ <output>
+ <filter-name>SINET-out</filter-name>
+ </output>
+ </filter>
+ <address>
+ <name>62.40.125.182/31</name>
+ </address>
+ </inet>
+ <inet6>
+ <filter>
+ <input>
+ <filter-name>SINET6-in</filter-name>
+ </input>
+ <output>
+ <filter-name>SINET6-out</filter-name>
+ </output>
+ </filter>
+ <address>
+ <name>2001:798:99:1::b9/126</name>
+ </address>
+ </inet6>
+ <mpls>
+ </mpls>
+ </family>
+ </unit>
+ <unit>
+ <name>200</name>
+ <description>SRV_L3VPN LHCONE RE_INTERCONNECT SINET SRF9946521 | ASN2907|</description>
+ <vlan-id>200</vlan-id>
+ <family>
+ <inet>
+ <mtu>9000</mtu>
+ <filter>
+ <input>
+ <filter-name>LHCONE-in</filter-name>
+ </input>
+ </filter>
+ <address>
+ <name>62.40.126.22/31</name>
+ </address>
+ </inet>
+ <inet6>
+ <mtu>9000</mtu>
+ <filter>
+ <input>
+ <filter-name>LHCONE6-in</filter-name>
+ </input>
+ <output>
+ <filter-name>LHCONE6-out</filter-name>
+ </output>
+ </filter>
+ <address>
+ <name>2001:798:111:1::b1/126</name>
+ </address>
+ </inet6>
+ </family>
+ </unit>
+ </interface>
<interface>
<name>dsc</name>
<unit>
@@ -6987,6 +7251,9 @@
<clients>
<name>83.97.93.196/32</name>
</clients>
+ <clients>
+ <name>83.97.93.238/32</name>
+ </clients>
</community>
<community>
<name>As4n0gN!</name>
@@ -7545,13 +7812,13 @@
<import-rib>IAS.inet6.0</import-rib>
<import-policy>rtbh-policy</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias</name>
<import-rib>IAS.inet.0</import-rib>
<import-rib>CLEAN_IAS.inet.0</import-rib>
<import-policy>ps-into-clean-ias-import</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias-v6</name>
<import-rib>IAS.inet6.0</import-rib>
<import-rib>CLEAN_IAS.inet6.0</import-rib>
@@ -7643,141 +7910,128 @@
</primary>
</label-switched-path>
<label-switched-path>
- <name>T-mad.cc-F-ams.cc-mpls1</name>
- <no-install-to-address/>
- <to>62.40.97.16</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-prg.cc-F-ams.cc-mpls1</name>
- <no-install-to-address/>
- <to>62.40.97.2</to>
+ <name>T-ham.cc-F-ams.cc-mpls3</name>
+ <to>62.40.96.26</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-prg.cc-F-ams.cc-mpls2</name>
- <no-install-to-address/>
- <to>62.40.97.2</to>
+ <name>T-lon.cc-F-ams.cc-mpls5</name>
+ <to>62.40.96.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-prg.cc-F-ams.cc-mpls3</name>
- <no-install-to-address/>
- <to>62.40.97.2</to>
+ <name>T-mil.cc-F-ams.cc-mpls17</name>
+ <to>62.40.97.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
<name>T-prg.cc-F-ams.cc-mpls6</name>
- <no-install-to-address/>
<to>62.40.97.2</to>
<no-cspf/>
</label-switched-path>
- <label-switched-path>
- <name>T-mil.cc-F-ams.cc-mpls17</name>
- <no-install-to-address/>
- <to>62.40.97.15</to>
- <no-cspf/>
- </label-switched-path>
<label-switched-path>
<name>T-bra.cc-F-ams.cc-mpls4</name>
- <no-install-to-address/>
<to>62.40.97.4</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-lon.cc-F-ams.cc-mpls5</name>
- <no-install-to-address/>
- <to>62.40.96.15</to>
+ <name>T-mad.cc-F-ams.cc-mpls5</name>
+ <to>62.40.97.16</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-ham.cc-F-ams.cc-mpls3</name>
- <no-install-to-address/>
- <to>62.40.96.26</to>
+ <name>T-par.cc-F-ams.cc-mpls1</name>
+ <to>62.40.97.13</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-mad.cc-F-ams.cc-mpls2</name>
- <no-install-to-address/>
- <to>62.40.97.16</to>
+ <name>T-ham.cc-F-ams.cc-mpls2</name>
+ <to>62.40.96.26</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-prg.cc-F-ams.cc-mpls4</name>
- <no-install-to-address/>
+ <name>T-prg.cc-F-ams.cc-mpls8</name>
<to>62.40.97.2</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-lon.cc-F-ams.cc-mpls2</name>
- <no-install-to-address/>
+ <name>T-lon.cc-F-ams.cc-mpls3</name>
<to>62.40.96.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
<name>T-mil.cc-F-ams.cc-mpls15</name>
- <no-install-to-address/>
<to>62.40.97.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-prg.cc-F-ams.cc-mpls8</name>
- <no-install-to-address/>
- <to>62.40.97.2</to>
+ <name>T-bra.cc-F-ams.cc-mpls1</name>
+ <to>62.40.97.4</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-mad.cc-F-ams.cc-mpls5</name>
- <no-install-to-address/>
- <to>62.40.97.16</to>
+ <name>T-mil.cc-F-ams.cc-mpls16</name>
+ <to>62.40.97.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-lon.cc-F-ams.cc-mpls3</name>
- <no-install-to-address/>
+ <name>T-ham.cc-F-ams.cc-mpls4</name>
+ <to>62.40.96.26</to>
+ <no-cspf/>
+ </label-switched-path>
+ <label-switched-path>
+ <name>T-lon.cc-F-ams.cc-mpls4</name>
<to>62.40.96.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-ham.cc-F-ams.cc-mpls2</name>
- <no-install-to-address/>
+ <name>T-lon.cc-F-ams.cc-mpls2</name>
+ <to>62.40.96.15</to>
+ <no-cspf/>
+ </label-switched-path>
+ <label-switched-path>
+ <name>T-mil.cc-F-ams.cc-mpls1</name>
+ <to>62.40.97.15</to>
+ <no-cspf/>
+ </label-switched-path>
+ <label-switched-path>
+ <name>T-ham.cc-F-ams.cc-mpls6</name>
<to>62.40.96.26</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-par.cc-F-ams.cc-mpls1</name>
- <no-install-to-address/>
- <to>62.40.97.13</to>
+ <name>T-ham.cc-F-ams.cc-mpls7</name>
+ <to>62.40.96.26</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-bra.cc-F-ams.cc-mpls1</name>
- <no-install-to-address/>
- <to>62.40.97.4</to>
+ <name>T-lon.cc-F-ams.cc-mpls1</name>
+ <to>62.40.96.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-ham.cc-F-ams.cc-mpls4</name>
- <no-install-to-address/>
+ <name>T-ham.cc-F-ams.cc-mpls5</name>
<to>62.40.96.26</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-mil.cc-F-ams.cc-mpls16</name>
- <no-install-to-address/>
- <to>62.40.97.15</to>
+ <name>T-ham.cc-F-ams.cc-mpls1</name>
+ <to>62.40.96.26</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-lon.cc-F-ams.cc-mpls4</name>
- <no-install-to-address/>
+ <name>T-prg.cc-F-ams.cc-mpls4</name>
+ <to>62.40.97.2</to>
+ <no-cspf/>
+ </label-switched-path>
+ <label-switched-path>
+ <name>T-lon.cc-F-ams.cc-mpls6</name>
<to>62.40.96.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-mil.cc-F-ams.cc-mpls1</name>
- <no-install-to-address/>
- <to>62.40.97.15</to>
+ <name>T-par.cc-F-ams.cc-mpls2</name>
+ <to>62.40.97.13</to>
<no-cspf/>
</label-switched-path>
<path>
@@ -8338,9 +8592,9 @@
<inet>
<unicast>
<prefix-limit>
- <maximum>17947</maximum>
+ <maximum>19000</maximum>
<teardown>
- <limit-threshold>89</limit-threshold>
+ <limit-threshold>80</limit-threshold>
</teardown>
</prefix-limit>
</unicast>
@@ -8430,11 +8684,17 @@
<unicast>
<prefix-limit>
<maximum>500</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
<maximum>500</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
</prefix-limit>
</multicast>
</inet>
@@ -8454,11 +8714,17 @@
<unicast>
<prefix-limit>
<maximum>500</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
<maximum>500</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
</prefix-limit>
</multicast>
</inet>
@@ -8480,7 +8746,7 @@
<prefix-limit>
<maximum>800</maximum>
<teardown>
- <limit-threshold>75</limit-threshold>
+ <limit-threshold>80</limit-threshold>
</teardown>
</prefix-limit>
</unicast>
@@ -8510,11 +8776,17 @@
<unicast>
<prefix-limit>
<maximum>500</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
<maximum>500</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
</prefix-limit>
</multicast>
</inet>
@@ -8523,6 +8795,42 @@
<export>ps-to-iranet</export>
<peer-as>6736</peer-as>
</neighbor>
+ <neighbor>
+ <name>62.40.125.183</name>
+ <description>-- Peering with SINET --</description>
+ <metric-out>
+ <igp>
+ </igp>
+ </metric-out>
+ <local-preference>150</local-preference>
+ <out-delay>10</out-delay>
+ <import>ps-BOGONS</import>
+ <import>ps-from-SInet</import>
+ <family>
+ <inet>
+ <unicast>
+ <prefix-limit>
+ <maximum>1417</maximum>
+ <teardown>
+ <limit-threshold>89</limit-threshold>
+ </teardown>
+ </prefix-limit>
+ </unicast>
+ <multicast>
+ <prefix-limit>
+ <maximum>500</maximum>
+ <teardown>
+ <limit-threshold>89</limit-threshold>
+ </teardown>
+ </prefix-limit>
+ </multicast>
+ </inet>
+ </family>
+ <authentication-key>/* SECRET-DATA */</authentication-key>
+ <export>ps-BOGONS</export>
+ <export>ps-to-SInet</export>
+ <peer-as>2907</peer-as>
+ </neighbor>
</group>
<group>
<name>GEANT-REv6</name>
@@ -8538,11 +8846,17 @@
<unicast>
<prefix-limit>
<maximum>500</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
<maximum>500</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
</prefix-limit>
</multicast>
</inet6>
@@ -8571,6 +8885,9 @@
<multicast>
<prefix-limit>
<maximum>500</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
</prefix-limit>
</multicast>
</inet6>
@@ -8591,11 +8908,17 @@
<unicast>
<prefix-limit>
<maximum>500</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
<maximum>500</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
</prefix-limit>
</multicast>
</inet6>
@@ -8615,11 +8938,17 @@
<unicast>
<prefix-limit>
<maximum>500</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
<maximum>500</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
</prefix-limit>
</multicast>
</inet6>
@@ -8639,11 +8968,17 @@
<unicast>
<prefix-limit>
<maximum>500</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
<maximum>500</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
</prefix-limit>
</multicast>
</inet6>
@@ -8695,11 +9030,17 @@
<unicast>
<prefix-limit>
<maximum>500</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
<maximum>500</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
</prefix-limit>
</multicast>
</inet6>
@@ -8719,11 +9060,17 @@
<unicast>
<prefix-limit>
<maximum>500</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
<maximum>500</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
</prefix-limit>
</multicast>
</inet6>
@@ -8732,6 +9079,37 @@
<export>ps-to-asgc-V6</export>
<peer-as>24167</peer-as>
</neighbor>
+ <neighbor>
+ <name>2001:798:99:1::ba</name>
+ <description>-- Peering with SINET--</description>
+ <out-delay>10</out-delay>
+ <import>ps-from-SInet-V6-nren</import>
+ <import>ps-BOGONS-V6</import>
+ <family>
+ <inet6>
+ <unicast>
+ <prefix-limit>
+ <maximum>500</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
+ </prefix-limit>
+ </unicast>
+ <multicast>
+ <prefix-limit>
+ <maximum>500</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
+ </prefix-limit>
+ </multicast>
+ </inet6>
+ </family>
+ <authentication-key>/* SECRET-DATA */</authentication-key>
+ <export>ps-to-SInet-V6-nren</export>
+ <export>ps-BOGONS-V6</export>
+ <peer-as>2907</peer-as>
+ </neighbor>
</group>
<group>
<name>TOOLS</name>
@@ -9036,6 +9414,17 @@
<metric>500</metric>
</level>
</interface>
+ <interface>
+ <name>ae8.0</name>
+ <point-to-point/>
+ <bfd-liveness-detection>
+ <minimum-interval>100</minimum-interval>
+ </bfd-liveness-detection>
+ <level>
+ <name>2</name>
+ <metric>500</metric>
+ </level>
+ </interface>
<interface>
<name>all</name>
<passive>
@@ -9190,6 +9579,14 @@
<name>62.40.125.22</name>
<local-address>62.40.125.21</local-address>
</peer>
+ <peer>
+ <name>150.99.32.28</name>
+ <local-address>62.40.125.182</local-address>
+ </peer>
+ <peer>
+ <name>150.99.32.15</name>
+ <local-address>62.40.125.182</local-address>
+ </peer>
</group>
</msdp>
<ldp>
@@ -9213,6 +9610,9 @@
<interface>
<name>ae5.0</name>
</interface>
+ <interface>
+ <name>ae8.0</name>
+ </interface>
<interface>
<name>lo0.0</name>
</interface>
@@ -9283,34 +9683,7 @@
</pim>
<connections>
<interface-switch>
- <name>GTS-local-AM-3a362af3b7</name>
- <interface>
- <name>xe-9/0/2.14</name>
- </interface>
- <interface>
- <name>xe-9/0/2.11</name>
- </interface>
- </interface-switch>
- <interface-switch>
- <name>GTS-local-AM-1efffd1a34</name>
- <interface>
- <name>xe-9/0/2.15</name>
- </interface>
- <interface>
- <name>xe-9/0/2.12</name>
- </interface>
- </interface-switch>
- <interface-switch>
- <name>GTS-local-AM-aa04664fd0</name>
- <interface>
- <name>xe-9/0/2.16</name>
- </interface>
- <interface>
- <name>xe-9/0/2.13</name>
- </interface>
- </interface-switch>
- <interface-switch>
- <name>GTS-local-AM-bc81c8dd14</name>
+ <name>NSI-AM-bc81c8dd14</name>
<interface>
<name>xe-11/2/0.0</name>
</interface>
@@ -9319,12 +9692,12 @@
</interface>
</interface-switch>
<interface-switch>
- <name>GTS-local-AM-16bd5c8219</name>
+ <name>NSI-AM-b66b7e29c8</name>
<interface>
- <name>xe-9/0/7.15</name>
+ <name>xe-9/0/7.11</name>
</interface>
<interface>
- <name>xe-9/0/3.13</name>
+ <name>xe-11/2/3.11</name>
</interface>
</interface-switch>
<remote-interface-switch>
@@ -9334,143 +9707,155 @@
<receive-lsp>sc17-ham-ams</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-AM-706129aca6</name>
- <interface>xe-9/0/6.23</interface>
- <transmit-lsp>T-mad.cc-F-ams.cc-mpls1</transmit-lsp>
- <receive-lsp>T-ams.cc-F-mad.cc-mpls1</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-AM-76f0e18315</name>
- <interface>ge-9/2/1.1304</interface>
- <transmit-lsp>T-prg.cc-F-ams.cc-mpls1</transmit-lsp>
- <receive-lsp>T-ams.cc-F-prg.cc-mpls1</receive-lsp>
+ <name>AM-8276aeda6e</name>
+ <interface>xe-11/2/3.22</interface>
+ <transmit-lsp>T-ham.cc-F-ams.cc-mpls3</transmit-lsp>
+ <receive-lsp>T-ams.cc-F-ham.cc-mpls3</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-AM-83b4c7fae4</name>
- <interface>ge-9/2/1.1305</interface>
- <transmit-lsp>T-prg.cc-F-ams.cc-mpls2</transmit-lsp>
- <receive-lsp>T-ams.cc-F-prg.cc-mpls2</receive-lsp>
+ <name>AM-1982728ff1</name>
+ <interface>xe-11/2/3.21</interface>
+ <transmit-lsp>T-lon.cc-F-ams.cc-mpls5</transmit-lsp>
+ <receive-lsp>T-ams.cc-F-lon.cc-mpls5</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-AM-e171f72bb7</name>
- <interface>ge-9/2/1.1306</interface>
- <transmit-lsp>T-prg.cc-F-ams.cc-mpls3</transmit-lsp>
- <receive-lsp>T-ams.cc-F-prg.cc-mpls3</receive-lsp>
+ <name>AM-fd88ef8c95</name>
+ <interface>xe-11/2/3.25</interface>
+ <transmit-lsp>T-mil.cc-F-ams.cc-mpls17</transmit-lsp>
+ <receive-lsp>T-ams.cc-F-mil.cc-mpls17</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-AM-fc66c10656</name>
+ <name>AM-fc66c10656</name>
<interface>xe-11/2/3.24</interface>
<transmit-lsp>T-prg.cc-F-ams.cc-mpls6</transmit-lsp>
<receive-lsp>T-ams.cc-F-prg.cc-mpls6</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-AM-fd88ef8c95</name>
- <interface>xe-11/2/3.25</interface>
- <transmit-lsp>T-mil.cc-F-ams.cc-mpls17</transmit-lsp>
- <receive-lsp>T-ams.cc-F-mil.cc-mpls17</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-AM-1fb949c208</name>
+ <name>AM-1fb949c208</name>
<interface>xe-11/2/3.23</interface>
<transmit-lsp>T-bra.cc-F-ams.cc-mpls4</transmit-lsp>
<receive-lsp>T-ams.cc-F-bra.cc-mpls4</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-AM-1982728ff1</name>
- <interface>xe-11/2/3.21</interface>
- <transmit-lsp>T-lon.cc-F-ams.cc-mpls5</transmit-lsp>
- <receive-lsp>T-ams.cc-F-lon.cc-mpls5</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-AM-8276aeda6e</name>
- <interface>xe-11/2/3.22</interface>
- <transmit-lsp>T-ham.cc-F-ams.cc-mpls3</transmit-lsp>
- <receive-lsp>T-ams.cc-F-ham.cc-mpls3</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-AM-c1349e4ee0</name>
- <interface>xe-9/0/7.12</interface>
- <transmit-lsp>T-mad.cc-F-ams.cc-mpls2</transmit-lsp>
- <receive-lsp>T-ams.cc-F-mad.cc-mpls2</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-AM-e3509295dd</name>
- <interface>et-3/1/2.3116</interface>
- <transmit-lsp>T-prg.cc-F-ams.cc-mpls4</transmit-lsp>
- <receive-lsp>T-ams.cc-F-prg.cc-mpls4</receive-lsp>
+ <name>AM-0d7a1caaf1</name>
+ <interface>xe-9/0/2.19</interface>
+ <transmit-lsp>T-mad.cc-F-ams.cc-mpls5</transmit-lsp>
+ <receive-lsp>T-ams.cc-F-mad.cc-mpls5</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-AM-f609b31525</name>
- <interface>xe-9/0/7.13</interface>
- <transmit-lsp>T-lon.cc-F-ams.cc-mpls2</transmit-lsp>
- <receive-lsp>T-ams.cc-F-lon.cc-mpls2</receive-lsp>
+ <name>AM-aa0af49465</name>
+ <interface>xe-9/0/2.21</interface>
+ <transmit-lsp>T-par.cc-F-ams.cc-mpls1</transmit-lsp>
+ <receive-lsp>T-ams.cc-F-par.cc-mpls1</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-AM-54832ee65d</name>
- <interface>xe-9/0/2.20</interface>
- <transmit-lsp>T-mil.cc-F-ams.cc-mpls15</transmit-lsp>
- <receive-lsp>T-ams.cc-F-mil.cc-mpls15</receive-lsp>
+ <name>AM-71f92a34b0</name>
+ <interface>xe-9/0/2.17</interface>
+ <transmit-lsp>T-ham.cc-F-ams.cc-mpls2</transmit-lsp>
+ <receive-lsp>T-ams.cc-F-ham.cc-mpls2</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-AM-dd22751071</name>
+ <name>AM-dd22751071</name>
<interface>xe-9/0/2.22</interface>
<transmit-lsp>T-prg.cc-F-ams.cc-mpls8</transmit-lsp>
<receive-lsp>T-ams.cc-F-prg.cc-mpls8</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-AM-0d7a1caaf1</name>
- <interface>xe-9/0/2.19</interface>
- <transmit-lsp>T-mad.cc-F-ams.cc-mpls5</transmit-lsp>
- <receive-lsp>T-ams.cc-F-mad.cc-mpls5</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-AM-dc2d967b5f</name>
+ <name>AM-dc2d967b5f</name>
<interface>xe-9/0/2.18</interface>
<transmit-lsp>T-lon.cc-F-ams.cc-mpls3</transmit-lsp>
<receive-lsp>T-ams.cc-F-lon.cc-mpls3</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-AM-71f92a34b0</name>
- <interface>xe-9/0/2.17</interface>
- <transmit-lsp>T-ham.cc-F-ams.cc-mpls2</transmit-lsp>
- <receive-lsp>T-ams.cc-F-ham.cc-mpls2</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-AM-aa0af49465</name>
- <interface>xe-9/0/2.21</interface>
- <transmit-lsp>T-par.cc-F-ams.cc-mpls1</transmit-lsp>
- <receive-lsp>T-ams.cc-F-par.cc-mpls1</receive-lsp>
+ <name>AM-54832ee65d</name>
+ <interface>xe-9/0/2.20</interface>
+ <transmit-lsp>T-mil.cc-F-ams.cc-mpls15</transmit-lsp>
+ <receive-lsp>T-ams.cc-F-mil.cc-mpls15</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-AM-31864f4217</name>
+ <name>AM-31864f4217</name>
<interface>xe-9/0/2.23</interface>
<transmit-lsp>T-bra.cc-F-ams.cc-mpls1</transmit-lsp>
<receive-lsp>T-ams.cc-F-bra.cc-mpls1</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-AM-728f83e12a</name>
- <interface>xe-9/0/2.25</interface>
- <transmit-lsp>T-ham.cc-F-ams.cc-mpls4</transmit-lsp>
- <receive-lsp>T-ams.cc-F-ham.cc-mpls4</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-AM-490c4ce241</name>
+ <name>AM-490c4ce241</name>
<interface>xe-9/0/2.26</interface>
<transmit-lsp>T-mil.cc-F-ams.cc-mpls16</transmit-lsp>
<receive-lsp>T-ams.cc-F-mil.cc-mpls16</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-AM-7c6bb06ea5</name>
+ <name>AM-728f83e12a</name>
+ <interface>xe-9/0/2.25</interface>
+ <transmit-lsp>T-ham.cc-F-ams.cc-mpls4</transmit-lsp>
+ <receive-lsp>T-ams.cc-F-ham.cc-mpls4</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>AM-7c6bb06ea5</name>
<interface>xe-9/0/2.24</interface>
<transmit-lsp>T-lon.cc-F-ams.cc-mpls4</transmit-lsp>
<receive-lsp>T-ams.cc-F-lon.cc-mpls4</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-AM-5bdca8e7f6</name>
+ <name>AM-f609b31525</name>
+ <interface>xe-9/0/7.13</interface>
+ <transmit-lsp>T-lon.cc-F-ams.cc-mpls2</transmit-lsp>
+ <receive-lsp>T-ams.cc-F-lon.cc-mpls2</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>AM-5bdca8e7f6</name>
<interface>xe-9/0/3.14</interface>
<transmit-lsp>T-mil.cc-F-ams.cc-mpls1</transmit-lsp>
<receive-lsp>T-ams.cc-F-mil.cc-mpls1</receive-lsp>
</remote-interface-switch>
+ <remote-interface-switch>
+ <name>AM-c67eee5312</name>
+ <interface>xe-9/0/6.13</interface>
+ <transmit-lsp>T-ham.cc-F-ams.cc-mpls6</transmit-lsp>
+ <receive-lsp>T-ams.cc-F-ham.cc-mpls6</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>AM-a5d18eb5fe</name>
+ <interface>xe-9/0/3.12</interface>
+ <transmit-lsp>T-ham.cc-F-ams.cc-mpls7</transmit-lsp>
+ <receive-lsp>T-ams.cc-F-ham.cc-mpls7</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>AM-710c0f1913</name>
+ <interface>xe-11/2/3.12</interface>
+ <transmit-lsp>T-lon.cc-F-ams.cc-mpls1</transmit-lsp>
+ <receive-lsp>T-ams.cc-F-lon.cc-mpls1</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>AM-a8a7ad39ca</name>
+ <interface>xe-9/0/7.14</interface>
+ <transmit-lsp>T-ham.cc-F-ams.cc-mpls5</transmit-lsp>
+ <receive-lsp>T-ams.cc-F-ham.cc-mpls5</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>AM-e703cf36d2</name>
+ <interface>xe-11/2/3.13</interface>
+ <transmit-lsp>T-ham.cc-F-ams.cc-mpls1</transmit-lsp>
+ <receive-lsp>T-ams.cc-F-ham.cc-mpls1</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>AM-5169707daf</name>
+ <interface>xe-11/2/3.14</interface>
+ <transmit-lsp>T-prg.cc-F-ams.cc-mpls4</transmit-lsp>
+ <receive-lsp>T-ams.cc-F-prg.cc-mpls4</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>AM-3e310b1a26</name>
+ <interface>xe-9/0/7.12</interface>
+ <transmit-lsp>T-lon.cc-F-ams.cc-mpls6</transmit-lsp>
+ <receive-lsp>T-ams.cc-F-lon.cc-mpls6</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>AM-d123fc37ab</name>
+ <interface>xe-9/0/7.15</interface>
+ <transmit-lsp>T-par.cc-F-ams.cc-mpls2</transmit-lsp>
+ <receive-lsp>T-ams.cc-F-par.cc-mpls2</receive-lsp>
+ </remote-interface-switch>
</connections>
<l2circuit>
<traceoptions>
@@ -9541,6 +9926,12 @@
<virtual-circuit-id>18009</virtual-circuit-id>
<ignore-mtu-mismatch/>
</interface>
+ <interface>
+ <name>ge-0/3/7.2019</name>
+ <virtual-circuit-id>1572885</virtual-circuit-id>
+ <no-control-word/>
+ <mtu>9192</mtu>
+ </interface>
</neighbor>
<neighbor>
<name>62.40.97.9</name>
@@ -9729,6 +10120,12 @@
<no-control-word/>
<mtu>9192</mtu>
</interface>
+ <interface>
+ <name>et-3/1/2.3755</name>
+ <virtual-circuit-id>1572882</virtual-circuit-id>
+ <no-control-word/>
+ <mtu>9192</mtu>
+ </interface>
</neighbor>
<neighbor>
<name>62.40.96.15</name>
@@ -10183,6 +10580,9 @@
<interface>
<name>xe-2/0/1</name>
</interface>
+ <interface>
+ <name>et-4/1/5</name>
+ </interface>
</lldp>
</protocols>
<policy-options>
@@ -10261,16 +10661,13 @@
</prefix-list>
<prefix-list>
<name>geantncc-address-space</name>
- <comment>/* NCC DR VPN LAN */</comment>
+ <comment>/* NCC DR VPN */</comment>
<prefix-list-item>
- <name>62.40.108.192/26</name>
+ <name>62.40.108.192/27</name>
</prefix-list-item>
<prefix-list-item>
<name>62.40.119.0/24</name>
</prefix-list-item>
- <prefix-list-item>
- <name>62.40.119.134/32</name>
- </prefix-list-item>
<prefix-list-item>
<name>62.40.125.250/32</name>
</prefix-list-item>
@@ -13838,6 +14235,9 @@
<prefix-list-item>
<name>185.153.60.0/22</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>185.206.140.0/22</name>
+ </prefix-list-item>
<prefix-list-item>
<name>185.215.40.0/22</name>
</prefix-list-item>
@@ -18241,6 +18641,9 @@
<prefix-list-item>
<name>144.206.192.0/18</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>144.206.221.0/24</name>
+ </prefix-list-item>
<prefix-list-item>
<name>144.206.222.0/24</name>
</prefix-list-item>
@@ -18517,6 +18920,14 @@
</prefix-list>
<prefix-list>
<name>corporate-address-space</name>
+ <comment>/* LON2 CORP VPN (MAC) */</comment>
+ <prefix-list-item>
+ <name>62.40.99.194/32</name>
+ </prefix-list-item>
+ <comment>/* LON2 CORP VPN */</comment>
+ <prefix-list-item>
+ <name>62.40.99.201/32</name>
+ </prefix-list-item>
<prefix-list-item>
<name>62.40.119.128/25</name>
</prefix-list-item>
@@ -18590,6 +19001,18 @@
<name>2001:798::/32</name>
</prefix-list-item>
</prefix-list>
+ <prefix-list>
+ <name>opennsa-servers</name>
+ <prefix-list-item>
+ <name>83.97.93.92/32</name>
+ </prefix-list-item>
+ </prefix-list>
+ <prefix-list>
+ <name>opennsa-servers-v6</name>
+ <prefix-list-item>
+ <name>2001:798:3::15f/128</name>
+ </prefix-list-item>
+ </prefix-list>
<policy-statement>
<name>ASM-Allow</name>
<term>
@@ -19588,6 +20011,15 @@
</then>
</term>
</policy-statement>
+ <policy-statement>
+ <name>IAS_PS-FROM-PUBLIC-PEER_AS32934_Facebook</name>
+ <term>
+ <name>NEXT_POLICY</name>
+ <then>
+ <next>policy</next>
+ </then>
+ </term>
+ </policy-statement>
<policy-statement>
<name>IAS_PS-FROM-PUBLIC-PEER_AS33438_Highwinds_Network_Group,_Inc</name>
<term>
@@ -24291,14 +24723,14 @@
</term>
</policy-statement>
<policy-statement>
- <name>IAS_PS-TO-PUBLIC-PEER_AS33438_Highwinds_Network_Group,_Inc</name>
+ <name>IAS_PS-TO-PUBLIC-PEER_AS32934_Facebook</name>
<term>
<name>BLOCK_THIS_PEER</name>
<from>
- <community>TE_BLOCK_AS33438</community>
- <community>TE_BLOCK_AS33438_2</community>
- <community>TE_BLOCK_AS33438_AMS-IX</community>
- <community>TE_BLOCK_AS33438_AMS-IX_2</community>
+ <community>TE_BLOCK_AS32934</community>
+ <community>TE_BLOCK_AS32934_2</community>
+ <community>TE_BLOCK_AS32934_AMS-IX</community>
+ <community>TE_BLOCK_AS32934_AMS-IX_2</community>
</from>
<then>
<reject/>
@@ -24307,8 +24739,8 @@
<term>
<name>PREPEND_THIS_PEER_x1</name>
<from>
- <community>TE_PREPEND_AS33438_x1_4byte</community>
- <community>TE_PREPEND_AS33438_x1_2byte</community>
+ <community>TE_PREPEND_AS32934_x1_4byte</community>
+ <community>TE_PREPEND_AS32934_x1_2byte</community>
</from>
<then>
<as-path-expand>
@@ -24319,8 +24751,8 @@
<term>
<name>PREPEND_THIS_PEER_x2</name>
<from>
- <community>TE_PREPEND_AS33438_x2_4byte</community>
- <community>TE_PREPEND_AS33438_x2_2byte</community>
+ <community>TE_PREPEND_AS32934_x2_4byte</community>
+ <community>TE_PREPEND_AS32934_x2_2byte</community>
</from>
<then>
<as-path-expand>
@@ -24331,8 +24763,8 @@
<term>
<name>PREPEND_THIS_PEER_x3</name>
<from>
- <community>TE_PREPEND_AS33438_x3_4byte</community>
- <community>TE_PREPEND_AS33438_x3_2byte</community>
+ <community>TE_PREPEND_AS32934_x3_4byte</community>
+ <community>TE_PREPEND_AS32934_x3_2byte</community>
</from>
<then>
<as-path-expand>
@@ -24343,8 +24775,8 @@
<term>
<name>PREPEND_THIS_PEER_x6</name>
<from>
- <community>TE_PREPEND_AS33438_x6_4byte</community>
- <community>TE_PREPEND_AS33438_x6_2byte</community>
+ <community>TE_PREPEND_AS32934_x6_4byte</community>
+ <community>TE_PREPEND_AS32934_x6_2byte</community>
</from>
<then>
<as-path-expand>
@@ -24355,15 +24787,109 @@
<term>
<name>ANNOUNCE</name>
<from>
- <community>TE_ANNOUNCE_AS33438</community>
- <community>TE_ANNOUNCE_AS33438_2</community>
- <community>TE_ANNOUNCE_AS33438_3</community>
- <community>TE_ANNOUNCE_AS33438_4</community>
+ <community>TE_ANNOUNCE_AS32934</community>
+ <community>TE_ANNOUNCE_AS32934_2</community>
+ <community>TE_ANNOUNCE_AS32934_3</community>
+ <community>TE_ANNOUNCE_AS32934_4</community>
<community>TE_ANNOUNCE_ALL_PUBLIC_PEERS</community>
<community>TE_ANNOUNCE_ALL_PUBLIC_PEERS_2</community>
<community>TE_ANNOUNCE_ALL_PUBLIC_PEERS_3</community>
- <community>TE_ANNOUNCE_AS33438_AMS-IX</community>
- <community>TE_ANNOUNCE_AS33438_AMS-IX_2</community>
+ <community>TE_ANNOUNCE_AS32934_AMS-IX</community>
+ <community>TE_ANNOUNCE_AS32934_AMS-IX_2</community>
+ </from>
+ <then>
+ <metric>
+ <igp>
+ </igp>
+ </metric>
+ <community>
+ <delete/>
+ <community-name>TE_PRIVATE_COMMUNITIES</community-name>
+ </community>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>NEXT_POLICY</name>
+ <then>
+ <next>policy</next>
+ </then>
+ </term>
+ </policy-statement>
+ <policy-statement>
+ <name>IAS_PS-TO-PUBLIC-PEER_AS33438_Highwinds_Network_Group,_Inc</name>
+ <term>
+ <name>BLOCK_THIS_PEER</name>
+ <from>
+ <community>TE_BLOCK_AS33438</community>
+ <community>TE_BLOCK_AS33438_2</community>
+ <community>TE_BLOCK_AS33438_AMS-IX</community>
+ <community>TE_BLOCK_AS33438_AMS-IX_2</community>
+ </from>
+ <then>
+ <reject/>
+ </then>
+ </term>
+ <term>
+ <name>PREPEND_THIS_PEER_x1</name>
+ <from>
+ <community>TE_PREPEND_AS33438_x1_4byte</community>
+ <community>TE_PREPEND_AS33438_x1_2byte</community>
+ </from>
+ <then>
+ <as-path-expand>
+ <aspath>21320</aspath>
+ </as-path-expand>
+ </then>
+ </term>
+ <term>
+ <name>PREPEND_THIS_PEER_x2</name>
+ <from>
+ <community>TE_PREPEND_AS33438_x2_4byte</community>
+ <community>TE_PREPEND_AS33438_x2_2byte</community>
+ </from>
+ <then>
+ <as-path-expand>
+ <aspath>21320 21320</aspath>
+ </as-path-expand>
+ </then>
+ </term>
+ <term>
+ <name>PREPEND_THIS_PEER_x3</name>
+ <from>
+ <community>TE_PREPEND_AS33438_x3_4byte</community>
+ <community>TE_PREPEND_AS33438_x3_2byte</community>
+ </from>
+ <then>
+ <as-path-expand>
+ <aspath>21320 21320 21320</aspath>
+ </as-path-expand>
+ </then>
+ </term>
+ <term>
+ <name>PREPEND_THIS_PEER_x6</name>
+ <from>
+ <community>TE_PREPEND_AS33438_x6_4byte</community>
+ <community>TE_PREPEND_AS33438_x6_2byte</community>
+ </from>
+ <then>
+ <as-path-expand>
+ <aspath>21320 21320 21320 21320 21320 21320</aspath>
+ </as-path-expand>
+ </then>
+ </term>
+ <term>
+ <name>ANNOUNCE</name>
+ <from>
+ <community>TE_ANNOUNCE_AS33438</community>
+ <community>TE_ANNOUNCE_AS33438_2</community>
+ <community>TE_ANNOUNCE_AS33438_3</community>
+ <community>TE_ANNOUNCE_AS33438_4</community>
+ <community>TE_ANNOUNCE_ALL_PUBLIC_PEERS</community>
+ <community>TE_ANNOUNCE_ALL_PUBLIC_PEERS_2</community>
+ <community>TE_ANNOUNCE_ALL_PUBLIC_PEERS_3</community>
+ <community>TE_ANNOUNCE_AS33438_AMS-IX</community>
+ <community>TE_ANNOUNCE_AS33438_AMS-IX_2</community>
</from>
<then>
<metric>
@@ -27955,6 +28481,8 @@
<interface>ae10.2603</interface>
<interface>ae16.100</interface>
<interface>ae17.100</interface>
+ <interface>ae20.200</interface>
+ <interface>ae20.100</interface>
</from>
<then>
<reject/>
@@ -27972,6 +28500,8 @@
<interface>ae10.2603</interface>
<interface>ae16.100</interface>
<interface>ae17.100</interface>
+ <interface>ae20.200</interface>
+ <interface>ae20.100</interface>
</from>
<then>
<reject/>
@@ -28175,6 +28705,10 @@
<address>185.1.68.0/24</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>193.188.137.0/24</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -28296,213 +28830,18 @@
<address>2001:7f8:a0::/64</address>
<orlonger/>
</route-filter>
- </from>
- <then>
- <reject/>
- </then>
- </term>
- </policy-statement>
- <policy-statement>
- <name>ps-CLS-from-SURFNET-V6-nren</name>
- <term>
- <name>RTBH</name>
- <from>
- <community>geant-RTBH</community>
<route-filter>
- <address>::/0</address>
- <prefix-length-range>/128-/128</prefix-length-range>
- </route-filter>
- <prefix-list-filter>
- <list_name>route-from-SURFNET-v6</list_name>
+ <address>2001:7f8:35::/64</address>
<orlonger/>
- </prefix-list-filter>
- </from>
- <then>
- <local-preference>
- <local-preference>200</local-preference>
- </local-preference>
- <community>
- <add/>
- <community-name>TE_BLOCK_ALL_PUBLIC_PEERS</community-name>
- </community>
- <community>
- <add/>
- <community-name>TE_BLOCK_PEERS_2</community-name>
- </community>
- <community>
- <add/>
- <community-name>geant-IAS-dws-block</community-name>
- </community>
- <community>
- <add/>
- <community-name>geant-dummy</community-name>
- </community>
- <next-hop>
- <address>100::</address>
- </next-hop>
- <accept/>
- </then>
- </term>
- <term>
- <name>from-SURFNET-V6-nren</name>
- <from>
- <prefix-list>
- <name>route-from-SURFNET-v6</name>
- </prefix-list>
- </from>
- <then>
- <local-preference>
- <local-preference>150</local-preference>
- </local-preference>
- <accept/>
- </then>
- </term>
- <term>
- <name>from-SURFNET-V6-nren-drop</name>
- <then>
- <reject/>
- </then>
- </term>
- </policy-statement>
- <policy-statement>
- <name>ps-CLS-from-SURFNET-nren</name>
- <term>
- <name>RTBH</name>
- <from>
- <community>geant-RTBH</community>
- <route-filter>
- <address>0.0.0.0/0</address>
- <prefix-length-range>/32-/32</prefix-length-range>
</route-filter>
- <prefix-list-filter>
- <list_name>route-from-SURFNET</list_name>
- <orlonger/>
- </prefix-list-filter>
- </from>
- <then>
- <local-preference>
- <local-preference>200</local-preference>
- </local-preference>
- <community>
- <add/>
- <community-name>TE_BLOCK_ALL_PUBLIC_PEERS</community-name>
- </community>
- <community>
- <add/>
- <community-name>TE_BLOCK_PEERS_2</community-name>
- </community>
- <community>
- <add/>
- <community-name>geant-IAS-dws-block</community-name>
- </community>
- <community>
- <add/>
- <community-name>geant-dummy</community-name>
- </community>
- <next-hop>
- <address>192.0.2.101</address>
- </next-hop>
- <accept/>
- </then>
- </term>
- <term>
- <name>from-SURFNET-nren</name>
- <from>
- <prefix-list>
- <name>route-from-SURFNET</name>
- </prefix-list>
- </from>
- <then>
- <local-preference>
- <local-preference>150</local-preference>
- </local-preference>
- <accept/>
- </then>
- </term>
- <term>
- <name>from-SURFNET-nren-drop</name>
- <then>
- <reject/>
- </then>
- </term>
- </policy-statement>
- <policy-statement>
- <name>ps-CLS-to-SURFNET-V6-nren</name>
- <term>
- <name>exception-block</name>
- <from>
- <community>geant-dummy</community>
- </from>
- <then>
- <reject/>
- </then>
- </term>
- <term>
- <name>to-nren-block</name>
- <from>
- <community>geant-surfnet-block</community>
- </from>
- <then>
- <reject/>
- </then>
- </term>
- <term>
- <name>to-SURFNET-V6-nren-general</name>
- <from>
- <family>inet6</family>
- <community>CLS_PROVIDER_ROUTES</community>
- <community>CLS_AGGREGATE_ROUTES</community>
- </from>
- <then>
- <accept/>
- </then>
- </term>
- <term>
- <name>to-SURFNET-V6-nren-drop</name>
- <then>
- <reject/>
- </then>
- </term>
- </policy-statement>
- <policy-statement>
- <name>ps-CLS-to-SURFNET-nren</name>
- <term>
- <name>exception-block</name>
- <from>
- <community>geant-dummy</community>
</from>
<then>
<reject/>
</then>
</term>
- <term>
- <name>to-nren-block</name>
- <from>
- <community>geant-surfnet-block</community>
- </from>
- <then>
- <reject/>
- </then>
- </term>
- <term>
- <name>to-SURFNET-nren-general</name>
- <from>
- <community>CLS_PROVIDER_ROUTES</community>
- <community>CLS_AGGREGATE_ROUTES</community>
- </from>
- <then>
- <accept/>
- </then>
- </term>
- <term>
- <name>to-SURFNET-nren-drop</name>
- <then>
- <reject/>
- </then>
- </term>
</policy-statement>
<policy-statement>
- <name>ps-IAS-from-ENSTINET-V6-nren</name>
+ <name>ps-CLS-from-SURFNET-V6-nren</name>
<term>
<name>RTBH</name>
<from>
@@ -28512,7 +28851,206 @@
<prefix-length-range>/128-/128</prefix-length-range>
</route-filter>
<prefix-list-filter>
- <list_name>route-from-ENSTINET-v6</list_name>
+ <list_name>route-from-SURFNET-v6</list_name>
+ <orlonger/>
+ </prefix-list-filter>
+ </from>
+ <then>
+ <local-preference>
+ <local-preference>200</local-preference>
+ </local-preference>
+ <community>
+ <add/>
+ <community-name>TE_BLOCK_ALL_PUBLIC_PEERS</community-name>
+ </community>
+ <community>
+ <add/>
+ <community-name>TE_BLOCK_PEERS_2</community-name>
+ </community>
+ <community>
+ <add/>
+ <community-name>geant-IAS-dws-block</community-name>
+ </community>
+ <community>
+ <add/>
+ <community-name>geant-dummy</community-name>
+ </community>
+ <next-hop>
+ <address>100::</address>
+ </next-hop>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>from-SURFNET-V6-nren</name>
+ <from>
+ <prefix-list>
+ <name>route-from-SURFNET-v6</name>
+ </prefix-list>
+ </from>
+ <then>
+ <local-preference>
+ <local-preference>150</local-preference>
+ </local-preference>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>from-SURFNET-V6-nren-drop</name>
+ <then>
+ <reject/>
+ </then>
+ </term>
+ </policy-statement>
+ <policy-statement>
+ <name>ps-CLS-from-SURFNET-nren</name>
+ <term>
+ <name>RTBH</name>
+ <from>
+ <community>geant-RTBH</community>
+ <route-filter>
+ <address>0.0.0.0/0</address>
+ <prefix-length-range>/32-/32</prefix-length-range>
+ </route-filter>
+ <prefix-list-filter>
+ <list_name>route-from-SURFNET</list_name>
+ <orlonger/>
+ </prefix-list-filter>
+ </from>
+ <then>
+ <local-preference>
+ <local-preference>200</local-preference>
+ </local-preference>
+ <community>
+ <add/>
+ <community-name>TE_BLOCK_ALL_PUBLIC_PEERS</community-name>
+ </community>
+ <community>
+ <add/>
+ <community-name>TE_BLOCK_PEERS_2</community-name>
+ </community>
+ <community>
+ <add/>
+ <community-name>geant-IAS-dws-block</community-name>
+ </community>
+ <community>
+ <add/>
+ <community-name>geant-dummy</community-name>
+ </community>
+ <next-hop>
+ <address>192.0.2.101</address>
+ </next-hop>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>from-SURFNET-nren</name>
+ <from>
+ <prefix-list>
+ <name>route-from-SURFNET</name>
+ </prefix-list>
+ </from>
+ <then>
+ <local-preference>
+ <local-preference>150</local-preference>
+ </local-preference>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>from-SURFNET-nren-drop</name>
+ <then>
+ <reject/>
+ </then>
+ </term>
+ </policy-statement>
+ <policy-statement>
+ <name>ps-CLS-to-SURFNET-V6-nren</name>
+ <term>
+ <name>exception-block</name>
+ <from>
+ <community>geant-dummy</community>
+ </from>
+ <then>
+ <reject/>
+ </then>
+ </term>
+ <term>
+ <name>to-nren-block</name>
+ <from>
+ <community>geant-surfnet-block</community>
+ </from>
+ <then>
+ <reject/>
+ </then>
+ </term>
+ <term>
+ <name>to-SURFNET-V6-nren-general</name>
+ <from>
+ <family>inet6</family>
+ <community>CLS_PROVIDER_ROUTES</community>
+ <community>CLS_AGGREGATE_ROUTES</community>
+ </from>
+ <then>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>to-SURFNET-V6-nren-drop</name>
+ <then>
+ <reject/>
+ </then>
+ </term>
+ </policy-statement>
+ <policy-statement>
+ <name>ps-CLS-to-SURFNET-nren</name>
+ <term>
+ <name>exception-block</name>
+ <from>
+ <community>geant-dummy</community>
+ </from>
+ <then>
+ <reject/>
+ </then>
+ </term>
+ <term>
+ <name>to-nren-block</name>
+ <from>
+ <community>geant-surfnet-block</community>
+ </from>
+ <then>
+ <reject/>
+ </then>
+ </term>
+ <term>
+ <name>to-SURFNET-nren-general</name>
+ <from>
+ <community>CLS_PROVIDER_ROUTES</community>
+ <community>CLS_AGGREGATE_ROUTES</community>
+ </from>
+ <then>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>to-SURFNET-nren-drop</name>
+ <then>
+ <reject/>
+ </then>
+ </term>
+ </policy-statement>
+ <policy-statement>
+ <name>ps-IAS-from-ENSTINET-V6-nren</name>
+ <term>
+ <name>RTBH</name>
+ <from>
+ <community>geant-RTBH</community>
+ <route-filter>
+ <address>::/0</address>
+ <prefix-length-range>/128-/128</prefix-length-range>
+ </route-filter>
+ <prefix-list-filter>
+ <list_name>route-from-ENSTINET-v6</list_name>
<orlonger/>
</prefix-list-filter>
</from>
@@ -29418,6 +29956,46 @@
<reject/>
</then>
</term>
+ <term>
+ <name>GOOGLE-test-prepend-1</name>
+ <from>
+ <community>GOOGLE-test-prepend-1</community>
+ </from>
+ <then>
+ <as-path-prepend>21320</as-path-prepend>
+ <next>term</next>
+ </then>
+ </term>
+ <term>
+ <name>GOOGLE-test-prepend-2</name>
+ <from>
+ <community>GOOGLE-test-prepend-2</community>
+ </from>
+ <then>
+ <as-path-prepend>21320 21320</as-path-prepend>
+ <next>term</next>
+ </then>
+ </term>
+ <term>
+ <name>GOOGLE-test-prepend-3</name>
+ <from>
+ <community>GOOGLE-test-prepend-3</community>
+ </from>
+ <then>
+ <as-path-prepend>21320 21320 21320</as-path-prepend>
+ <next>term</next>
+ </then>
+ </term>
+ <term>
+ <name>GOOGLE-test-prepend-6</name>
+ <from>
+ <community>GOOGLE-test-prepend-6</community>
+ </from>
+ <then>
+ <as-path-prepend>21320 21320 21320 21320 21320 21320</as-path-prepend>
+ <next>term</next>
+ </then>
+ </term>
<term>
<name>to-private-peers-prepend-1</name>
<from>
@@ -31784,37 +32362,10 @@
<term>
<name>from-SINet-V6-accept</name>
<from>
+ <family>inet6</family>
<route-filter>
- <address>2001:0c00::/23</address>
- <prefix-length-range>/23-/48</prefix-length-range>
- </route-filter>
- <route-filter>
- <address>2001:0e00::/23</address>
- <prefix-length-range>/23-/48</prefix-length-range>
- </route-filter>
- <route-filter>
- <address>2400:0000::/12</address>
- <prefix-length-range>/12-/48</prefix-length-range>
- </route-filter>
- <route-filter>
- <address>2001:8000::/19</address>
- <prefix-length-range>/19-/48</prefix-length-range>
- </route-filter>
- <route-filter>
- <address>2001:a000::/20</address>
- <prefix-length-range>/20-/48</prefix-length-range>
- </route-filter>
- <route-filter>
- <address>2001:b000::/20</address>
- <prefix-length-range>/20-/48</prefix-length-range>
- </route-filter>
- <route-filter>
- <address>2001:4400::/23</address>
- <prefix-length-range>/23-/48</prefix-length-range>
- </route-filter>
- <route-filter>
- <address>2001:0200::/23</address>
- <prefix-length-range>/23-/48</prefix-length-range>
+ <address>::/0</address>
+ <upto>/64</upto>
</route-filter>
</from>
<then>
@@ -34985,6 +35536,45 @@
</then>
</term>
</policy-statement>
+ <policy-statement>
+ <name>ps-to-SINET-LHCONE-TE</name>
+ <term>
+ <name>BLOCK</name>
+ <from>
+ <community>LHCONE-BLOCK-SINET-2907</community>
+ </from>
+ <then>
+ <reject/>
+ </then>
+ </term>
+ <term>
+ <name>PREPEND_x1</name>
+ <from>
+ <community>LHCONE-PREPEND-SINET-2907-x1</community>
+ </from>
+ <then>
+ <as-path-prepend>20965</as-path-prepend>
+ </then>
+ </term>
+ <term>
+ <name>PREPEND_x2</name>
+ <from>
+ <community>LHCONE-PREPEND-SINET-2907-x2</community>
+ </from>
+ <then>
+ <as-path-prepend>20965 20965</as-path-prepend>
+ </then>
+ </term>
+ <term>
+ <name>PREPEND_x3</name>
+ <from>
+ <community>LHCONE-PREPEND-SINET-2907-x3</community>
+ </from>
+ <then>
+ <as-path-prepend>20965 20965 20965</as-path-prepend>
+ </then>
+ </term>
+ </policy-statement>
<policy-statement>
<name>ps-to-SInet</name>
<term>
@@ -35064,6 +35654,7 @@
<community>geant-ubuntunet</community>
<community>geant-silk</community>
<community>geant-caren</community>
+ <community>geant-asren</community>
</from>
<then>
<metric>
@@ -35194,6 +35785,7 @@
<community>geant-ubuntunet</community>
<community>geant-silk</community>
<community>geant-caren</community>
+ <community>geant-asren</community>
</from>
<then>
<accept/>
@@ -36827,6 +37419,26 @@
<name>GEANT-ITER</name>
<members>20965:65124</members>
</community>
+ <community>
+ <name>GOOGLE-test-prepend-1</name>
+ <members>64801:15169</members>
+ <members>64812:15169</members>
+ </community>
+ <community>
+ <name>GOOGLE-test-prepend-2</name>
+ <members>64802:15169</members>
+ <members>64812:15169</members>
+ </community>
+ <community>
+ <name>GOOGLE-test-prepend-3</name>
+ <members>64803:15169</members>
+ <members>64812:15169</members>
+ </community>
+ <community>
+ <name>GOOGLE-test-prepend-6</name>
+ <members>64806:15169</members>
+ <members>64812:15169</members>
+ </community>
<community>
<name>I2_FEDNET</name>
<members>11537:3000</members>
@@ -36871,6 +37483,10 @@
<name>LHCONE-BLOCK-NORDUNET-2603</name>
<members>65010:2603</members>
</community>
+ <community>
+ <name>LHCONE-BLOCK-SINET-2907</name>
+ <members>65010:2907</members>
+ </community>
<community>
<name>LHCONE-BLOCK-SURFSARA-1162</name>
<members>65010:1162</members>
@@ -36943,6 +37559,18 @@
<name>LHCONE-PREPEND-NORDUNET-2603-x3</name>
<members>65003:2603</members>
</community>
+ <community>
+ <name>LHCONE-PREPEND-SINET-2907-x1</name>
+ <members>65001:2907</members>
+ </community>
+ <community>
+ <name>LHCONE-PREPEND-SINET-2907-x2</name>
+ <members>65002:2907</members>
+ </community>
+ <community>
+ <name>LHCONE-PREPEND-SINET-2907-x3</name>
+ <members>65003:2907</members>
+ </community>
<community>
<name>LHCONE-PREPEND-SURFSARA-1162-x1</name>
<members>65001:1162</members>
@@ -47751,13 +48379,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -47773,14 +48394,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp>
<name>backbone-classifier</name>
@@ -47792,18 +48405,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -47811,13 +48412,7 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -47828,325 +48423,6 @@
</loss-priority>
</forwarding-class>
</dscp>
- <dscp>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>iperf-classifier</name>
- <import>default</import>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>af12</code-points>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp-ipv6>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
<dscp-ipv6>
<name>backbone-classifier</name>
<import>default</import>
@@ -48157,18 +48433,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -48176,13 +48440,7 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -48205,13 +48463,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -48227,41 +48478,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>iperf-classifier</name>
- <import>default</import>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>af12</code-points>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-access-classifier</name>
@@ -48270,16 +48486,16 @@
<name>be</name>
<loss-priority>
<name>low</name>
- <code-points>000</code-points>
- <code-points>001</code-points>
- <code-points>010</code-points>
- <code-points>011</code-points>
- <code-points>110</code-points>
- <code-points>111</code-points>
+ <code-points>100</code-points>
+ <code-points>101</code-points>
</loss-priority>
</forwarding-class>
+ </exp>
+ <exp>
+ <name>mpls-backbone-classifier</name>
+ <import>default</import>
<forwarding-class>
- <name>less-than-best-effort</name>
+ <name>be</name>
<loss-priority>
<name>low</name>
<code-points>100</code-points>
@@ -48287,40 +48503,7 @@
</loss-priority>
</forwarding-class>
</exp>
- <exp>
- <name>mpls-backbone-classifier</name>
- <import>default</import>
- </exp>
</classifiers>
- <code-point-aliases>
- <dscp>
- <name>ix</name>
- <bits>101001</bits>
- </dscp>
- <dscp>
- <name>dws</name>
- <bits>100000</bits>
- </dscp>
- <dscp-ipv6>
- <name>dws</name>
- <bits>100000</bits>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix</name>
- <bits>101001</bits>
- </dscp-ipv6>
- </code-point-aliases>
- <drop-profiles>
- <name>dws-drop-profile</name>
- <fill-level>
- <name>35</name>
- <drop-probability>10</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<drop-profiles>
<name>be-drop-profile</name>
<fill-level>
@@ -48340,74 +48523,40 @@
<drop-probability>100</drop-probability>
</fill-level>
</drop-profiles>
- <drop-profiles>
- <name>less-than-be-drop-profile</name>
- <fill-level>
- <name>25</name>
- <drop-probability>30</drop-probability>
- </fill-level>
- <fill-level>
- <name>30</name>
- <drop-probability>50</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>70</drop-probability>
- </fill-level>
- <fill-level>
- <name>50</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<forwarding-classes>
<class>
<name>be</name>
<queue-num>0</queue-num>
</class>
- <class>
- <name>be-ix</name>
- <queue-num>0</queue-num>
- </class>
<class>
<name>expedited-forwarding</name>
<queue-num>1</queue-num>
</class>
- <class>
- <name>less-than-best-effort</name>
- <queue-num>2</queue-num>
- </class>
<class>
<name>network-control</name>
<queue-num>3</queue-num>
</class>
- <class>
- <name>be-dws</name>
- <queue-num>0</queue-num>
- </class>
- <class>
- <name>be-bleach</name>
- <queue-num>0</queue-num>
- </class>
</forwarding-classes>
<interfaces>
- <interface inactive="inactive">
- <name>xe-0/0/0</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
- <unit>
- <name>0</name>
- <classifiers>
- <dscp>
- <name>ix-access-classifier</name>
- </dscp>
- <dscp-ipv6>
- <name>ix-access-classifier</name>
- </dscp-ipv6>
- </classifiers>
- </unit>
+ <interface>
+ <name>et-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>ge-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>so-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>xe-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
</interface>
<interface>
<name>ge-0/2/7</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -48427,7 +48576,7 @@
</interface>
<interface>
<name>ge-0/2/8</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>3610</name>
<classifiers>
@@ -48447,7 +48596,7 @@
</interface>
<interface>
<name>ge-0/3/3</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -48544,22 +48693,6 @@
</dscp>
</rewrite-rules>
</unit>
- <unit>
- <name>71</name>
- <classifiers>
- <dscp>
- <name>iperf-classifier</name>
- </dscp>
- <dscp-ipv6>
- <name>iperf-classifier</name>
- </dscp-ipv6>
- </classifiers>
- <rewrite-rules>
- <dscp>
- <name>basic-rewrite-rules</name>
- </dscp>
- </rewrite-rules>
- </unit>
<unit>
<name>90</name>
<classifiers>
@@ -48579,7 +48712,7 @@
</interface>
<interface>
<name>so-1/2/0</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>100</name>
<classifiers>
@@ -48615,7 +48748,7 @@
</interface>
<interface>
<name>xe-2/1/1</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>105</name>
<classifiers>
@@ -48633,23 +48766,9 @@
</rewrite-rules>
</unit>
</interface>
- <interface>
- <name>et-3/1/2</name>
- <unit>
- <name>820</name>
- <classifiers>
- <dscp>
- <name>access-classifier</name>
- </dscp>
- <dscp-ipv6>
- <name>access-classifier</name>
- </dscp-ipv6>
- </classifiers>
- </unit>
- </interface>
<interface>
<name>et-3/1/5</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>104</name>
<classifiers>
@@ -48685,7 +48804,7 @@
</interface>
<interface>
<name>xe-9/0/8</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>105</name>
<classifiers>
@@ -48703,9 +48822,13 @@
</rewrite-rules>
</unit>
</interface>
+ <interface>
+ <name>ae*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
<interface>
<name>ae0</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -48723,17 +48846,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -48743,7 +48858,7 @@
</interface>
<interface>
<name>ae1</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -48761,17 +48876,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -48781,7 +48888,7 @@
</interface>
<interface>
<name>ae3</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -48799,17 +48906,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -48819,7 +48918,7 @@
</interface>
<interface>
<name>ae5</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -48837,16 +48936,38 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
+ <exp>
+ <name>mpls-rewrite-rules</name>
+ <protocol>mpls-any</protocol>
+ </exp>
+ </rewrite-rules>
+ </unit>
+ </interface>
+ <interface>
+ <name>ae8</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ <unit>
+ <name>0</name>
+ <classifiers>
+ <dscp>
+ <name>backbone-classifier</name>
+ </dscp>
+ <dscp-ipv6>
+ <name>backbone-classifier</name>
+ </dscp-ipv6>
+ <exp>
+ <classifier-name>mpls-backbone-classifier</classifier-name>
+ </exp>
+ </classifiers>
+ <rewrite-rules>
+ <dscp>
+ <name>basic-rewrite-rules</name>
+ </dscp>
+ <dscp-ipv6>
+ <name>basic-rewrite-rules</name>
</dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
@@ -48857,7 +48978,7 @@
</interface>
<interface>
<name>ae10</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>333</name>
<classifiers>
@@ -48888,7 +49009,7 @@
</interface>
<interface inactive="inactive">
<name>ae12</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -48911,7 +49032,7 @@
</interface>
<interface>
<name>ae15</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>333</name>
<classifiers>
@@ -48964,6 +49085,7 @@
</interface>
<interface>
<name>ae16</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>100</name>
<classifiers>
@@ -48978,12 +49100,34 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
+ <dscp-ipv6>
+ <name>basic-rewrite-rules</name>
+ </dscp-ipv6>
+ </rewrite-rules>
+ </unit>
+ <unit>
+ <name>111</name>
+ <classifiers>
+ <dscp>
+ <name>access-classifier</name>
+ </dscp>
+ <dscp-ipv6>
+ <name>access-classifier</name>
+ </dscp-ipv6>
+ </classifiers>
+ <rewrite-rules>
+ <dscp>
+ <name>basic-rewrite-rules</name>
+ </dscp>
+ <dscp-ipv6>
+ <name>basic-rewrite-rules</name>
+ </dscp-ipv6>
</rewrite-rules>
</unit>
</interface>
<interface>
<name>ae17</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>100</name>
<classifiers>
@@ -49000,73 +49144,6 @@
<rewrite-rules>
<dscp>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -49081,17 +49158,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -49103,37 +49169,9 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -49148,17 +49186,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -49170,73 +49197,6 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
@@ -49244,66 +49204,19 @@
</exp>
</rewrite-rules>
<scheduler-maps>
- <name>MAP-BASIC</name>
- <forwarding-class>
- <name>be</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <scheduler>sch-expedited-forwarding</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <scheduler>sch-less-than-best-effort</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <scheduler>sch-network-ctrl</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- </scheduler-maps>
- <scheduler-maps>
- <name>MAP-BASIC-IQ2</name>
+ <name>GEANT-BASIC</name>
<forwarding-class>
<name>expedited-forwarding</name>
<scheduler>sch-expedited-forwarding</scheduler>
</forwarding-class>
<forwarding-class>
<name>network-control</name>
- <scheduler>sch-network-ctrl-iq2</scheduler>
+ <scheduler>sch-network-ctrl-geant</scheduler>
</forwarding-class>
<forwarding-class>
<name>be</name>
<scheduler>sch-be</scheduler>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <scheduler>sch-less-than-best-effort</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
</scheduler-maps>
<schedulers>
<name>sch-be</name>
@@ -49323,27 +49236,7 @@
<priority>strict-high</priority>
</schedulers>
<schedulers>
- <name>sch-less-than-best-effort</name>
- <transmit-rate>
- <percent>10</percent>
- </transmit-rate>
- <buffer-size>
- <percent>10</percent>
- </buffer-size>
- <priority>low</priority>
- <drop-profile-map>
- <loss-priority>low</loss-priority>
- <protocol>any</protocol>
- <drop-profile>less-than-be-drop-profile</drop-profile>
- </drop-profile-map>
- <drop-profile-map>
- <loss-priority>high</loss-priority>
- <protocol>any</protocol>
- <drop-profile>be-drop-profile</drop-profile>
- </drop-profile-map>
- </schedulers>
- <schedulers>
- <name>sch-network-ctrl</name>
+ <name>sch-network-ctrl-geant</name>
<transmit-rate>
<percent>5</percent>
</transmit-rate>
@@ -49352,15 +49245,6 @@
</buffer-size>
<priority>high</priority>
</schedulers>
- <schedulers>
- <name>sch-network-ctrl-iq2</name>
- <transmit-rate>
- <percent>5</percent>
- </transmit-rate>
- <buffer-size>
- <percent>5</percent>
- </buffer-size>
- </schedulers>
</class-of-service>
<firewall>
<family>
@@ -49661,9 +49545,6 @@
<source-address>
<name>80.249.208.236/32</name>
</source-address>
- <source-address>
- <name>80.249.208.52/32</name>
- </source-address>
<source-address>
<name>80.249.209.34/32</name>
</source-address>
@@ -49928,6 +49809,12 @@
<source-address>
<name>80.249.208.39/32</name>
</source-address>
+ <source-address>
+ <name>80.249.212.174/32</name>
+ </source-address>
+ <source-address>
+ <name>80.249.212.175/32</name>
+ </source-address>
<destination-address>
<name>80.249.210.137/32</name>
</destination-address>
@@ -56355,7 +56242,7 @@
</term>
</filter>
<filter>
- <name>SINET-in</name>
+ <name>TWAREN-in</name>
<interface-specific/>
<term>
<name>sample</name>
@@ -56364,30 +56251,6 @@
<next>term</next>
</then>
</term>
- <term>
- <name>traffic-from-ITER</name>
- <from>
- <source-prefix-list>
- <name>ITER-prefixes-Japan</name>
- </source-prefix-list>
- </from>
- <then>
- <count>traffic-from-ITER</count>
- <next>term</next>
- </then>
- </term>
- <term>
- <name>traffic-to-ITER-EU</name>
- <from>
- <destination-prefix-list>
- <name>ITER-sites-Europe</name>
- </destination-prefix-list>
- </from>
- <then>
- <count>traffic-to-ITER-EU</count>
- <next>term</next>
- </then>
- </term>
<term>
<name>IPERF-Test</name>
<from>
@@ -56397,6 +56260,12 @@
<source-address>
<name>203.181.195.69/32</name>
</source-address>
+ <source-address>
+ <name>203.181.248.70/32</name>
+ </source-address>
+ <source-address>
+ <name>203.181.249.74/32</name>
+ </source-address>
<destination-address>
<name>62.40.120.90/32</name>
</destination-address>
@@ -56420,25 +56289,27 @@
</then>
</term>
<term>
- <name>dos-source-counting</name>
+ <name>dos-destination-counting</name>
<from>
- <source-prefix-list>
- <name>dos-attack-source-count</name>
- </source-prefix-list>
+ <destination-prefix-list>
+ <name>dos-attack-destination-count</name>
+ </destination-prefix-list>
</from>
<then>
<count>dos-attack-traffic-count</count>
+ <next>term</next>
</then>
</term>
<term>
- <name>dos-destination-counting</name>
+ <name>dos-source-counting</name>
<from>
- <destination-prefix-list>
- <name>dos-attack-destination-count</name>
- </destination-prefix-list>
+ <source-prefix-list>
+ <name>dos-attack-source-count</name>
+ </source-prefix-list>
</from>
<then>
<count>dos-attack-traffic-count</count>
+ <next>term</next>
</then>
</term>
<term>
@@ -56467,20 +56338,41 @@
</discard>
</then>
</term>
+ <term>
+ <name>transit-network-control-traffic</name>
+ <from>
+ <destination-prefix-list>
+ <name>geant-address-space</name>
+ </destination-prefix-list>
+ <dscp>48</dscp>
+ <dscp>56</dscp>
+ </from>
+ <then>
+ <loss-priority>low</loss-priority>
+ <forwarding-class>network-control</forwarding-class>
+ <next>term</next>
+ </then>
+ </term>
<term>
<name>BGP-protect</name>
<from>
- <source-address inactive="inactive">
- <name>62.40.124.234/32</name>
+ <source-address>
+ <name>198.32.11.61/32</name>
</source-address>
- <source-address inactive="inactive">
- <name>150.99.188.201/32</name>
+ <source-address>
+ <name>198.71.45.236/32</name>
</source-address>
- <destination-address inactive="inactive">
- <name>62.40.124.233/32</name>
+ <source-address>
+ <name>211.79.48.145/32</name>
+ </source-address>
+ <destination-address>
+ <name>198.32.11.62/32</name>
+ </destination-address>
+ <destination-address>
+ <name>198.71.45.237/32</name>
</destination-address>
<destination-address>
- <name>150.99.188.202/32</name>
+ <name>211.79.48.146/32</name>
</destination-address>
<protocol>tcp</protocol>
<port>bgp</port>
@@ -56506,6 +56398,44 @@
</discard>
</then>
</term>
+ <term>
+ <name>MSDP-protect</name>
+ <from>
+ <source-address>
+ <name>198.32.11.61/32</name>
+ </source-address>
+ <source-address>
+ <name>198.32.8.202/32</name>
+ </source-address>
+ <source-address>
+ <name>198.71.45.236/32</name>
+ </source-address>
+ <source-address>
+ <name>198.32.8.199/32</name>
+ </source-address>
+ <source-address>
+ <name>211.79.48.145/32</name>
+ </source-address>
+ <destination-address>
+ <name>62.40.102.11/32</name>
+ </destination-address>
+ <destination-address>
+ <name>62.40.114.43/32</name>
+ </destination-address>
+ <destination-address>
+ <name>198.71.45.237/32</name>
+ </destination-address>
+ <destination-address>
+ <name>211.79.48.146/32</name>
+ </destination-address>
+ <protocol>tcp</protocol>
+ <port>msdp</port>
+ </from>
+ <then>
+ <count>msdp-accept</count>
+ <accept/>
+ </then>
+ </term>
<term>
<name>MSDP-filter</name>
<from>
@@ -56525,17 +56455,35 @@
<term>
<name>PIM-protect</name>
<from>
- <source-address inactive="inactive">
- <name>62.40.103.234/32</name>
+ <source-address>
+ <name>198.32.11.61/32</name>
</source-address>
<source-address>
- <name>150.99.188.201/32</name>
+ <name>198.32.8.202/32</name>
</source-address>
- <destination-address inactive="inactive">
- <name>62.40.124.233/32</name>
+ <source-address>
+ <name>198.71.45.236/32</name>
+ </source-address>
+ <source-address>
+ <name>198.32.8.199/32</name>
+ </source-address>
+ <source-address>
+ <name>211.79.48.145/32</name>
+ </source-address>
+ <destination-address>
+ <name>198.32.11.62/32</name>
+ </destination-address>
+ <destination-address>
+ <name>62.40.102.11/32</name>
+ </destination-address>
+ <destination-address>
+ <name>198.71.45.237/32</name>
+ </destination-address>
+ <destination-address>
+ <name>62.40.114.43/32</name>
</destination-address>
<destination-address>
- <name>150.99.188.202/32</name>
+ <name>211.79.48.146/32</name>
</destination-address>
<protocol>pim</protocol>
<protocol>igmp</protocol>
@@ -56611,6 +56559,20 @@
<accept/>
</then>
</term>
+ <term>
+ <name>NTP-server-accept</name>
+ <from>
+ <source-address>
+ <name>132.236.56.250/32</name>
+ </source-address>
+ <protocol>udp</protocol>
+ <port>123</port>
+ <port>ntp</port>
+ </from>
+ <then>
+ <accept/>
+ </then>
+ </term>
<term>
<name>NOC-accept</name>
<from>
@@ -56622,6 +56584,20 @@
<accept/>
</then>
</term>
+ <term>
+ <name>iperf-allow</name>
+ <from>
+ <source-prefix-list>
+ <name>ext-iperf-servers</name>
+ </source-prefix-list>
+ <destination-prefix-list>
+ <name>int-iperf-servers</name>
+ </destination-prefix-list>
+ </from>
+ <then>
+ <accept/>
+ </then>
+ </term>
<term>
<name>DNS-server-accept</name>
<from>
@@ -56680,22 +56656,69 @@
</then>
</term>
<term>
- <name>External-Equipment</name>
+ <name>ICMP-TWAREN-accept</name>
<from>
<destination-address>
- <name>62.40.108.0/24</name>
+ <name>198.32.11.62/32</name>
+ </destination-address>
+ <destination-address>
+ <name>198.71.45.237/32</name>
+ </destination-address>
+ <destination-address>
+ <name>211.79.48.145/32</name>
+ </destination-address>
+ <protocol>icmp</protocol>
+ </from>
+ <then>
+ <policer>ICMP-flood</policer>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>porografos-ripewhoislookup-ioannis</name>
+ <from>
+ <destination-address>
+ <name>62.40.98.180/32</name>
</destination-address>
+ <protocol>tcp</protocol>
+ <tcp-flags>(syn & ack) | ack | rst | fin</tcp-flags>
</from>
<then>
<accept/>
</then>
</term>
+ <term>
+ <name>External-project-interfaces</name>
+ <from>
+ <destination-prefix-list>
+ <name>external-project-interfaces</name>
+ </destination-prefix-list>
+ </from>
+ <then>
+ <discard>
+ </discard>
+ </then>
+ </term>
<term>
<name>External-Projects</name>
<from>
<destination-prefix-list>
<name>external-project</name>
</destination-prefix-list>
+ <destination-prefix-list>
+ <name>temp-ext-projects</name>
+ </destination-prefix-list>
+ </from>
+ <then>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>External-Equipment</name>
+ <from>
+ <destination-address>
+ <name>62.40.108.0/24</name>
+ </destination-address>
</from>
<then>
<accept/>
@@ -56716,17 +56739,18 @@
</then>
</term>
<term>
- <name>iperf-Naka-Garching-test</name>
+ <name>Internet2-allocated-prefixes</name>
<from>
- <source-address>
- <name>157.111.134.6/32</name>
- </source-address>
- <source-address>
- <name>157.111.133.100/32</name>
- </source-address>
+ <destination-address>
+ <name>198.32.11.62/32</name>
+ </destination-address>
+ <destination-address>
+ <name>198.71.45.237/32</name>
+ </destination-address>
</from>
<then>
- <accept/>
+ <discard>
+ </discard>
</then>
</term>
<term>
@@ -56782,646 +56806,16 @@
</term>
</filter>
<filter>
- <name>SINET-out</name>
- <interface-specific/>
+ <name>TWAREN-out</name>
<term>
- <name>traffic-to-ITER</name>
+ <name>NASA-out</name>
<from>
<destination-prefix-list>
- <name>ITER-prefixes-Japan</name>
+ <name>NASA-prefixes</name>
</destination-prefix-list>
</from>
<then>
- <count>traffic-to-ITER</count>
- <next>term</next>
- </then>
- </term>
- <term>
- <name>traffic-from-ITER-EU</name>
- <from>
- <source-prefix-list>
- <name>ITER-sites-Europe</name>
- </source-prefix-list>
- </from>
- <then>
- <count>traffic-from-ITER-EU</count>
- <next>term</next>
- </then>
- </term>
- <term>
- <name>DWS-out</name>
- <from>
- <dscp>32</dscp>
- </from>
- <then>
- <count>DWS-out</count>
- <accept/>
- </then>
- </term>
- <term>
- <name>LBE-out</name>
- <from>
- <dscp>8</dscp>
- </from>
- <then>
- <count>LBE-out</count>
- <accept/>
- </then>
- </term>
- <term>
- <name>mcast-out</name>
- <from>
- <destination-address>
- <name>224.0.0.0/4</name>
- </destination-address>
- </from>
- <then>
- <count>mcast-out</count>
- <accept/>
- </then>
- </term>
- <term>
- <name>default</name>
- <then>
- <accept/>
- </then>
- </term>
- </filter>
- <filter>
- <name>TWAREN-in</name>
- <interface-specific/>
- <term>
- <name>sample</name>
- <then>
- <sample/>
- <next>term</next>
- </then>
- </term>
- <term>
- <name>IPERF-Test</name>
- <from>
- <source-address>
- <name>193.52.217.131/32</name>
- </source-address>
- <source-address>
- <name>203.181.195.69/32</name>
- </source-address>
- <source-address>
- <name>203.181.248.70/32</name>
- </source-address>
- <source-address>
- <name>203.181.249.74/32</name>
- </source-address>
- <destination-address>
- <name>62.40.120.90/32</name>
- </destination-address>
- </from>
- <then>
- <count>IPERF</count>
- <accept/>
- </then>
- </term>
- <term>
- <name>BOGON-filter</name>
- <from>
- <source-prefix-list>
- <name>bogons-list</name>
- </source-prefix-list>
- </from>
- <then>
- <count>bogons-source</count>
- <discard>
- </discard>
- </then>
- </term>
- <term>
- <name>dos-destination-counting</name>
- <from>
- <destination-prefix-list>
- <name>dos-attack-destination-count</name>
- </destination-prefix-list>
- </from>
- <then>
- <count>dos-attack-traffic-count</count>
- <next>term</next>
- </then>
- </term>
- <term>
- <name>dos-source-counting</name>
- <from>
- <source-prefix-list>
- <name>dos-attack-source-count</name>
- </source-prefix-list>
- </from>
- <then>
- <count>dos-attack-traffic-count</count>
- <next>term</next>
- </then>
- </term>
- <term>
- <name>dos-source-filtering</name>
- <from>
- <source-prefix-list>
- <name>dos-attack-source</name>
- </source-prefix-list>
- </from>
- <then>
- <count>dos-attack-traffic</count>
- <discard>
- </discard>
- </then>
- </term>
- <term>
- <name>dos-destination-filtering</name>
- <from>
- <destination-prefix-list>
- <name>dos-attack-destination</name>
- </destination-prefix-list>
- </from>
- <then>
- <count>dos-attack-traffic</count>
- <discard>
- </discard>
- </then>
- </term>
- <term>
- <name>transit-network-control-traffic</name>
- <from>
- <destination-prefix-list>
- <name>geant-address-space</name>
- </destination-prefix-list>
- <dscp>48</dscp>
- <dscp>56</dscp>
- </from>
- <then>
- <loss-priority>low</loss-priority>
- <forwarding-class>network-control</forwarding-class>
- <next>term</next>
- </then>
- </term>
- <term>
- <name>BGP-protect</name>
- <from>
- <source-address>
- <name>198.32.11.61/32</name>
- </source-address>
- <source-address>
- <name>198.71.45.236/32</name>
- </source-address>
- <source-address>
- <name>211.79.48.145/32</name>
- </source-address>
- <destination-address>
- <name>198.32.11.62/32</name>
- </destination-address>
- <destination-address>
- <name>198.71.45.237/32</name>
- </destination-address>
- <destination-address>
- <name>211.79.48.146/32</name>
- </destination-address>
- <protocol>tcp</protocol>
- <port>bgp</port>
- </from>
- <then>
- <count>bgp-accept</count>
- <accept/>
- </then>
- </term>
- <term>
- <name>BGP-filter</name>
- <from>
- <destination-prefix-list>
- <name>geant-address-space</name>
- </destination-prefix-list>
- <protocol>tcp</protocol>
- <port>bgp</port>
- </from>
- <then>
- <count>bgp-attack</count>
- <syslog/>
- <discard>
- </discard>
- </then>
- </term>
- <term>
- <name>MSDP-protect</name>
- <from>
- <source-address>
- <name>198.32.11.61/32</name>
- </source-address>
- <source-address>
- <name>198.32.8.202/32</name>
- </source-address>
- <source-address>
- <name>198.71.45.236/32</name>
- </source-address>
- <source-address>
- <name>198.32.8.199/32</name>
- </source-address>
- <source-address>
- <name>211.79.48.145/32</name>
- </source-address>
- <destination-address>
- <name>62.40.102.11/32</name>
- </destination-address>
- <destination-address>
- <name>62.40.114.43/32</name>
- </destination-address>
- <destination-address>
- <name>198.71.45.237/32</name>
- </destination-address>
- <destination-address>
- <name>211.79.48.146/32</name>
- </destination-address>
- <protocol>tcp</protocol>
- <port>msdp</port>
- </from>
- <then>
- <count>msdp-accept</count>
- <accept/>
- </then>
- </term>
- <term>
- <name>MSDP-filter</name>
- <from>
- <destination-prefix-list>
- <name>geant-address-space</name>
- </destination-prefix-list>
- <protocol>tcp</protocol>
- <port>msdp</port>
- </from>
- <then>
- <count>msdp-attack</count>
- <syslog/>
- <discard>
- </discard>
- </then>
- </term>
- <term>
- <name>PIM-protect</name>
- <from>
- <source-address>
- <name>198.32.11.61/32</name>
- </source-address>
- <source-address>
- <name>198.32.8.202/32</name>
- </source-address>
- <source-address>
- <name>198.71.45.236/32</name>
- </source-address>
- <source-address>
- <name>198.32.8.199/32</name>
- </source-address>
- <source-address>
- <name>211.79.48.145/32</name>
- </source-address>
- <destination-address>
- <name>198.32.11.62/32</name>
- </destination-address>
- <destination-address>
- <name>62.40.102.11/32</name>
- </destination-address>
- <destination-address>
- <name>198.71.45.237/32</name>
- </destination-address>
- <destination-address>
- <name>62.40.114.43/32</name>
- </destination-address>
- <destination-address>
- <name>211.79.48.146/32</name>
- </destination-address>
- <protocol>pim</protocol>
- <protocol>igmp</protocol>
- </from>
- <then>
- <accept/>
- </then>
- </term>
- <term>
- <name>PIM-filter</name>
- <from>
- <destination-prefix-list>
- <name>geant-address-space</name>
- </destination-prefix-list>
- <protocol>pim</protocol>
- <protocol>igmp</protocol>
- </from>
- <then>
- <count>pim-attack</count>
- <syslog/>
- <discard>
- </discard>
- </then>
- </term>
- <term>
- <name>TUNNEL-accept</name>
- <from>
- <prefix-list>
- <name>geant-address-space</name>
- </prefix-list>
- <protocol>gre</protocol>
- <protocol>ipip</protocol>
- </from>
- <then>
- <accept/>
- </then>
- </term>
- <term>
- <name>SPOOF-filter</name>
- <from>
- <source-prefix-list>
- <name>corporate-address-space</name>
- </source-prefix-list>
- <source-prefix-list>
- <name>geantncc-address-space</name>
- </source-prefix-list>
- </from>
- <then>
- <count>spoofed-attack-traffic</count>
- <discard>
- </discard>
- </then>
- </term>
- <term>
- <name>WEB-server-accept</name>
- <from>
- <destination-address>
- <name>62.40.98.20/32</name>
- </destination-address>
- <destination-address>
- <name>62.40.98.84/32</name>
- </destination-address>
- <destination-address>
- <name>62.40.98.116/32</name>
- </destination-address>
- <destination-address>
- <name>62.40.101.34/32</name>
- </destination-address>
- <protocol>tcp</protocol>
- <port>http</port>
- </from>
- <then>
- <accept/>
- </then>
- </term>
- <term>
- <name>NTP-server-accept</name>
- <from>
- <source-address>
- <name>132.236.56.250/32</name>
- </source-address>
- <protocol>udp</protocol>
- <port>123</port>
- <port>ntp</port>
- </from>
- <then>
- <accept/>
- </then>
- </term>
- <term>
- <name>NOC-accept</name>
- <from>
- <destination-prefix-list>
- <name>geantncc-address-space</name>
- </destination-prefix-list>
- </from>
- <then>
- <accept/>
- </then>
- </term>
- <term>
- <name>iperf-allow</name>
- <from>
- <source-prefix-list>
- <name>ext-iperf-servers</name>
- </source-prefix-list>
- <destination-prefix-list>
- <name>int-iperf-servers</name>
- </destination-prefix-list>
- </from>
- <then>
- <accept/>
- </then>
- </term>
- <term>
- <name>DNS-server-accept</name>
- <from>
- <destination-address>
- <name>62.40.101.34/32</name>
- </destination-address>
- <protocol>udp</protocol>
- <protocol>tcp</protocol>
- <port>domain</port>
- </from>
- <then>
- <accept/>
- </then>
- </term>
- <term>
- <name>MAIL-server-accept</name>
- <from>
- <destination-address>
- <name>62.40.99.130/32</name>
- </destination-address>
- <protocol>tcp</protocol>
- <port>smtp</port>
- </from>
- <then>
- <accept/>
- </then>
- </term>
- <term>
- <name>BEACON-accept</name>
- <from>
- <destination-address>
- <name>62.40.98.212/32</name>
- </destination-address>
- <source-prefix-list>
- <name>geant-external-beacon</name>
- </source-prefix-list>
- <protocol>udp</protocol>
- <destination-port>19997</destination-port>
- </from>
- <then>
- <count>beacon-server-access</count>
- <accept/>
- </then>
- </term>
- <term>
- <name>ICMP-accept</name>
- <from>
- <destination-prefix-list>
- <name>geant-address-space</name>
- </destination-prefix-list>
- <protocol>icmp</protocol>
- </from>
- <then>
- <policer>ICMP-flood</policer>
- <accept/>
- </then>
- </term>
- <term>
- <name>ICMP-TWAREN-accept</name>
- <from>
- <destination-address>
- <name>198.32.11.62/32</name>
- </destination-address>
- <destination-address>
- <name>198.71.45.237/32</name>
- </destination-address>
- <destination-address>
- <name>211.79.48.145/32</name>
- </destination-address>
- <protocol>icmp</protocol>
- </from>
- <then>
- <policer>ICMP-flood</policer>
- <accept/>
- </then>
- </term>
- <term>
- <name>porografos-ripewhoislookup-ioannis</name>
- <from>
- <destination-address>
- <name>62.40.98.180/32</name>
- </destination-address>
- <protocol>tcp</protocol>
- <tcp-flags>(syn & ack) | ack | rst | fin</tcp-flags>
- </from>
- <then>
- <accept/>
- </then>
- </term>
- <term>
- <name>External-project-interfaces</name>
- <from>
- <destination-prefix-list>
- <name>external-project-interfaces</name>
- </destination-prefix-list>
- </from>
- <then>
- <discard>
- </discard>
- </then>
- </term>
- <term>
- <name>External-Projects</name>
- <from>
- <destination-prefix-list>
- <name>external-project</name>
- </destination-prefix-list>
- <destination-prefix-list>
- <name>temp-ext-projects</name>
- </destination-prefix-list>
- </from>
- <then>
- <accept/>
- </then>
- </term>
- <term>
- <name>External-Equipment</name>
- <from>
- <destination-address>
- <name>62.40.108.0/24</name>
- </destination-address>
- </from>
- <then>
- <accept/>
- </then>
- </term>
- <term>
- <name>UDP-traceroute</name>
- <from>
- <destination-prefix-list>
- <name>geant-address-space</name>
- </destination-prefix-list>
- <protocol>udp</protocol>
- <destination-port>33434-33690</destination-port>
- </from>
- <then>
- <policer>ICMP-flood</policer>
- <accept/>
- </then>
- </term>
- <term>
- <name>Internet2-allocated-prefixes</name>
- <from>
- <destination-address>
- <name>198.32.11.62/32</name>
- </destination-address>
- <destination-address>
- <name>198.71.45.237/32</name>
- </destination-address>
- </from>
- <then>
- <discard>
- </discard>
- </then>
- </term>
- <term>
- <name>CORE-filter</name>
- <from>
- <destination-prefix-list>
- <name>geant-address-space</name>
- </destination-prefix-list>
- </from>
- <then>
- <count>core-attack</count>
- <discard>
- </discard>
- </then>
- </term>
- <term>
- <name>DWS-in</name>
- <from>
- <dscp>32</dscp>
- </from>
- <then>
- <count>dws-in</count>
- <accept/>
- </then>
- </term>
- <term>
- <name>LBE-in</name>
- <from>
- <dscp>8</dscp>
- </from>
- <then>
- <count>lbe-in</count>
- <accept/>
- </then>
- </term>
- <term>
- <name>mcast-in</name>
- <from>
- <destination-address>
- <name>224.0.0.0/4</name>
- </destination-address>
- </from>
- <then>
- <count>mcast-in</count>
- <accept/>
- </then>
- </term>
- <term>
- <name>default</name>
- <then>
- <accept/>
- </then>
- </term>
- </filter>
- <filter>
- <name>TWAREN-out</name>
- <term>
- <name>NASA-out</name>
- <from>
- <destination-prefix-list>
- <name>NASA-prefixes</name>
- </destination-prefix-list>
- </from>
- <then>
- <count>nasa-out</count>
+ <count>nasa-out</count>
<next>term</next>
</then>
</term>
@@ -64840,6 +64234,9 @@
<source-prefix-list>
<name>dashboard-servers</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers</name>
+ </source-prefix-list>
<protocol>tcp</protocol>
<destination-port>ssh</destination-port>
</from>
@@ -67698,7 +67095,201 @@
</term>
</filter>
<filter>
- <name>CLS_DD_OUT</name>
+ <name>CLS_DD_OUT</name>
+ <term>
+ <name>default</name>
+ <then>
+ <accept/>
+ </then>
+ </term>
+ </filter>
+ <filter>
+ <name>CLS_DD2_IN</name>
+ <interface-specific/>
+ <term>
+ <name>sample</name>
+ <then>
+ <sample/>
+ <next>term</next>
+ </then>
+ </term>
+ <term>
+ <name>BOGON_filter</name>
+ <from>
+ <source-prefix-list>
+ <name>bogons-list</name>
+ </source-prefix-list>
+ </from>
+ <then>
+ <count>bogons-source</count>
+ <discard>
+ </discard>
+ </then>
+ </term>
+ <term>
+ <name>DOS_source_filtering</name>
+ <from>
+ <source-prefix-list>
+ <name>dos-attack-source</name>
+ </source-prefix-list>
+ </from>
+ <then>
+ <count>dos-attack-traffic-src</count>
+ <discard>
+ </discard>
+ </then>
+ </term>
+ <term>
+ <name>DOS_destination_filtering</name>
+ <from>
+ <destination-prefix-list>
+ <name>dos-attack-destination</name>
+ </destination-prefix-list>
+ </from>
+ <then>
+ <count>dos-attack-traffic-dst</count>
+ <discard>
+ </discard>
+ </then>
+ </term>
+ <term>
+ <name>BGP_protect</name>
+ <from>
+ <source-address>
+ <name>62.40.100.47/32</name>
+ </source-address>
+ <destination-address>
+ <name>62.40.100.46/32</name>
+ </destination-address>
+ <protocol>tcp</protocol>
+ <port>bgp</port>
+ </from>
+ <then>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>BGP_filter</name>
+ <from>
+ <destination-prefix-list>
+ <name>geant-address-space</name>
+ </destination-prefix-list>
+ <destination-prefix-list>
+ <name>geant-ias-address-space</name>
+ </destination-prefix-list>
+ <protocol>tcp</protocol>
+ <port>bgp</port>
+ </from>
+ <then>
+ <syslog/>
+ <discard>
+ </discard>
+ </then>
+ </term>
+ <term>
+ <name>SPOOF_filter</name>
+ <from>
+ <source-address>
+ <name>62.40.100.47/32</name>
+ <except/>
+ </source-address>
+ <source-prefix-list>
+ <name>corporate-address-space</name>
+ </source-prefix-list>
+ <source-prefix-list>
+ <name>geant-address-space</name>
+ </source-prefix-list>
+ <source-prefix-list>
+ <name>geant-ias-address-space</name>
+ </source-prefix-list>
+ </from>
+ <then>
+ <count>spoofed-attack-traffic</count>
+ <discard>
+ </discard>
+ </then>
+ </term>
+ <term>
+ <name>External_project_interfaces</name>
+ <from>
+ <destination-prefix-list>
+ <name>external-project-interfaces</name>
+ </destination-prefix-list>
+ </from>
+ <then>
+ <discard>
+ </discard>
+ </then>
+ </term>
+ <term>
+ <name>External_Projects</name>
+ <from>
+ <destination-prefix-list>
+ <name>external-project</name>
+ </destination-prefix-list>
+ </from>
+ <then>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>ICMP_accept</name>
+ <from>
+ <destination-prefix-list>
+ <name>geant-address-space</name>
+ </destination-prefix-list>
+ <destination-prefix-list>
+ <name>geant-ias-address-space</name>
+ </destination-prefix-list>
+ <protocol>icmp</protocol>
+ </from>
+ <then>
+ <policer>ICMP-flood</policer>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>UDP_traceroute</name>
+ <from>
+ <destination-prefix-list>
+ <name>geant-address-space</name>
+ </destination-prefix-list>
+ <destination-prefix-list>
+ <name>geant-ias-address-space</name>
+ </destination-prefix-list>
+ <protocol>udp</protocol>
+ <destination-port>33434-33690</destination-port>
+ </from>
+ <then>
+ <policer>ICMP-flood</policer>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>CORE_filter</name>
+ <from>
+ <destination-prefix-list>
+ <name>geant-address-space</name>
+ </destination-prefix-list>
+ <destination-prefix-list>
+ <name>geant-ias-address-space</name>
+ </destination-prefix-list>
+ </from>
+ <then>
+ <count>core-attack</count>
+ <discard>
+ </discard>
+ </then>
+ </term>
+ <term>
+ <name>default</name>
+ <then>
+ <accept/>
+ </then>
+ </term>
+ </filter>
+ <filter>
+ <name>CLS_DD2_OUT</name>
<term>
<name>default</name>
<then>
@@ -67707,103 +67298,167 @@
</term>
</filter>
<filter>
- <name>CLS_DD2_IN</name>
- <interface-specific/>
+ <name>bone-out</name>
<term>
- <name>sample</name>
+ <name>default</name>
<then>
- <sample/>
- <next>term</next>
+ <accept/>
</then>
</term>
+ </filter>
+ <filter>
+ <name>bone-in</name>
<term>
- <name>BOGON_filter</name>
+ <name>default</name>
+ <then>
+ <accept/>
+ </then>
+ </term>
+ </filter>
+ <filter>
+ <name>SINET-in</name>
+ <term>
+ <name>GEANT_NTP_APPLIANCES_ACCEPT</name>
<from>
<source-prefix-list>
- <name>bogons-list</name>
+ <name>GEANT_NTP_APPLIANCES_USERS</name>
</source-prefix-list>
+ <destination-prefix-list>
+ <name>GEANT_NTP_APPLIANCES</name>
+ </destination-prefix-list>
+ <protocol>udp</protocol>
+ <port>123</port>
</from>
<then>
- <count>bogons-source</count>
- <discard>
- </discard>
+ <count>NTP_PACKETS</count>
+ <accept/>
</then>
</term>
<term>
- <name>DOS_source_filtering</name>
+ <name>BGP-protect</name>
<from>
- <source-prefix-list>
- <name>dos-attack-source</name>
- </source-prefix-list>
+ <destination-address>
+ <name>62.40.125.182/32</name>
+ </destination-address>
+ <protocol>tcp</protocol>
+ <port>bgp</port>
</from>
<then>
- <count>dos-attack-traffic-src</count>
- <discard>
- </discard>
+ <count>bgp-accept</count>
+ <accept/>
</then>
</term>
<term>
- <name>DOS_destination_filtering</name>
+ <name>BGP-filter</name>
<from>
<destination-prefix-list>
- <name>dos-attack-destination</name>
+ <name>geant-address-space</name>
</destination-prefix-list>
+ <protocol>tcp</protocol>
+ <port>bgp</port>
</from>
<then>
- <count>dos-attack-traffic-dst</count>
+ <count>bgp-attack</count>
+ <syslog/>
<discard>
</discard>
</then>
</term>
<term>
- <name>BGP_protect</name>
+ <name>MSDP-protect</name>
<from>
<source-address>
- <name>62.40.100.47/32</name>
+ <name>150.99.32.28/32</name>
+ </source-address>
+ <source-address>
+ <name>150.99.32.15/32</name>
</source-address>
<destination-address>
- <name>62.40.100.46/32</name>
+ <name>62.40.125.182/32</name>
</destination-address>
<protocol>tcp</protocol>
- <port>bgp</port>
+ <port>msdp</port>
</from>
<then>
+ <count>msdp-accept</count>
<accept/>
</then>
</term>
<term>
- <name>BGP_filter</name>
+ <name>MSDP-filter</name>
<from>
<destination-prefix-list>
<name>geant-address-space</name>
</destination-prefix-list>
- <destination-prefix-list>
- <name>geant-ias-address-space</name>
- </destination-prefix-list>
<protocol>tcp</protocol>
- <port>bgp</port>
+ <port>msdp</port>
</from>
<then>
+ <count>msdp-attack</count>
<syslog/>
<discard>
</discard>
</then>
</term>
<term>
- <name>SPOOF_filter</name>
+ <name>PIM-protect</name>
<from>
<source-address>
- <name>62.40.100.47/32</name>
- <except/>
+ <name>62.40.125.183/32</name>
</source-address>
- <source-prefix-list>
- <name>corporate-address-space</name>
- </source-prefix-list>
- <source-prefix-list>
+ <source-address>
+ <name>150.99.32.28/32</name>
+ </source-address>
+ <source-address>
+ <name>150.99.32.15/32</name>
+ </source-address>
+ <destination-address>
+ <name>62.40.125.182/32</name>
+ </destination-address>
+ <protocol>pim</protocol>
+ <protocol>igmp</protocol>
+ </from>
+ <then>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>PIM-filter</name>
+ <from>
+ <destination-prefix-list>
<name>geant-address-space</name>
+ </destination-prefix-list>
+ <protocol>pim</protocol>
+ <protocol>igmp</protocol>
+ </from>
+ <then>
+ <count>pim-attack</count>
+ <syslog/>
+ <discard>
+ </discard>
+ </then>
+ </term>
+ <term>
+ <name>TUNNEL-accept</name>
+ <from>
+ <prefix-list>
+ <name>geant-address-space</name>
+ </prefix-list>
+ <protocol>gre</protocol>
+ <protocol>ipip</protocol>
+ </from>
+ <then>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>SPOOF-filter</name>
+ <from>
+ <source-prefix-list>
+ <name>DANTE-address-space</name>
</source-prefix-list>
<source-prefix-list>
- <name>geant-ias-address-space</name>
+ <name>geantncc-address-space</name>
</source-prefix-list>
</from>
<then>
@@ -67813,22 +67468,32 @@
</then>
</term>
<term>
- <name>External_project_interfaces</name>
+ <name>WEB-server-accept</name>
<from>
- <destination-prefix-list>
- <name>external-project-interfaces</name>
- </destination-prefix-list>
+ <destination-address>
+ <name>62.40.98.20/32</name>
+ </destination-address>
+ <destination-address>
+ <name>62.40.98.84/32</name>
+ </destination-address>
+ <destination-address>
+ <name>62.40.98.116/32</name>
+ </destination-address>
+ <destination-address>
+ <name>62.40.101.34/32</name>
+ </destination-address>
+ <protocol>tcp</protocol>
+ <port>http</port>
</from>
<then>
- <discard>
- </discard>
+ <accept/>
</then>
</term>
<term>
- <name>External_Projects</name>
+ <name>NOC-accept</name>
<from>
<destination-prefix-list>
- <name>external-project</name>
+ <name>geantncc-address-space</name>
</destination-prefix-list>
</from>
<then>
@@ -67836,14 +67501,54 @@
</then>
</term>
<term>
- <name>ICMP_accept</name>
+ <name>DNS-server-accept</name>
+ <from>
+ <destination-address>
+ <name>62.40.101.34/32</name>
+ </destination-address>
+ <protocol>udp</protocol>
+ <protocol>tcp</protocol>
+ <port>domain</port>
+ </from>
+ <then>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>MAIL-server-accept</name>
+ <from>
+ <destination-address>
+ <name>62.40.99.130/32</name>
+ </destination-address>
+ <protocol>tcp</protocol>
+ <port>smtp</port>
+ </from>
+ <then>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>BEACON-accept</name>
+ <from>
+ <destination-address>
+ <name>62.40.98.212/32</name>
+ </destination-address>
+ <source-prefix-list>
+ <name>geant-external-beacon</name>
+ </source-prefix-list>
+ <protocol>udp</protocol>
+ <destination-port>19997</destination-port>
+ </from>
+ <then>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>ICMP-accept</name>
<from>
<destination-prefix-list>
<name>geant-address-space</name>
</destination-prefix-list>
- <destination-prefix-list>
- <name>geant-ias-address-space</name>
- </destination-prefix-list>
<protocol>icmp</protocol>
</from>
<then>
@@ -67852,13 +67557,32 @@
</then>
</term>
<term>
- <name>UDP_traceroute</name>
+ <name>External-Equipment</name>
+ <from>
+ <destination-address>
+ <name>62.40.108.0/24</name>
+ </destination-address>
+ </from>
+ <then>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>External-Projects</name>
<from>
<destination-prefix-list>
- <name>geant-address-space</name>
+ <name>external-project</name>
</destination-prefix-list>
+ </from>
+ <then>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>UDP-traceroute</name>
+ <from>
<destination-prefix-list>
- <name>geant-ias-address-space</name>
+ <name>geant-address-space</name>
</destination-prefix-list>
<protocol>udp</protocol>
<destination-port>33434-33690</destination-port>
@@ -67869,14 +67593,11 @@
</then>
</term>
<term>
- <name>CORE_filter</name>
+ <name>CORE-filter</name>
<from>
<destination-prefix-list>
<name>geant-address-space</name>
</destination-prefix-list>
- <destination-prefix-list>
- <name>geant-ias-address-space</name>
- </destination-prefix-list>
</from>
<then>
<count>core-attack</count>
@@ -67885,23 +67606,37 @@
</then>
</term>
<term>
- <name>default</name>
+ <name>DWS-in</name>
+ <from>
+ <dscp>32</dscp>
+ </from>
<then>
+ <count>dws-in</count>
<accept/>
</then>
</term>
- </filter>
- <filter>
- <name>CLS_DD2_OUT</name>
<term>
- <name>default</name>
+ <name>LBE-in</name>
+ <from>
+ <dscp>8</dscp>
+ </from>
<then>
+ <count>lbe-in</count>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>mcast-in</name>
+ <from>
+ <destination-address>
+ <name>224.0.0.0/4</name>
+ </destination-address>
+ </from>
+ <then>
+ <count>mcast-in</count>
<accept/>
</then>
</term>
- </filter>
- <filter>
- <name>bone-out</name>
<term>
<name>default</name>
<then>
@@ -67910,7 +67645,68 @@
</term>
</filter>
<filter>
- <name>bone-in</name>
+ <name>SINET-out</name>
+ <term>
+ <name>GEANT_NTP_APPLIANCES_ACCEPT</name>
+ <from>
+ <source-prefix-list>
+ <name>GEANT_NTP_APPLIANCES</name>
+ </source-prefix-list>
+ <destination-prefix-list>
+ <name>GEANT_NTP_APPLIANCES_USERS</name>
+ </destination-prefix-list>
+ <protocol>udp</protocol>
+ <port>123</port>
+ </from>
+ <then>
+ <count>NTP_PACKETS</count>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>traffic-to-ITER</name>
+ <from>
+ <destination-prefix-list>
+ <name>ITER-prefixes-Japan</name>
+ </destination-prefix-list>
+ </from>
+ <then>
+ <count>traffic-to-ITER</count>
+ <next>term</next>
+ </then>
+ </term>
+ <term>
+ <name>DWS-out</name>
+ <from>
+ <dscp>32</dscp>
+ </from>
+ <then>
+ <count>DWS-out</count>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>LBE-out</name>
+ <from>
+ <dscp>8</dscp>
+ </from>
+ <then>
+ <count>LBE-out</count>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>mcast-out</name>
+ <from>
+ <destination-address>
+ <name>224.0.0.0/4</name>
+ </destination-address>
+ </from>
+ <then>
+ <count>mcast-out</count>
+ <accept/>
+ </then>
+ </term>
<term>
<name>default</name>
<then>
@@ -68192,9 +67988,6 @@
<source-address>
<name>2001:7f8:1::a500:8220:1/128</name>
</source-address>
- <source-address>
- <name>2001:7f8:1::a500:8220:2/128</name>
- </source-address>
<source-address>
<name>2001:7f8:1::a501:3285:1/128</name>
</source-address>
@@ -68444,6 +68237,12 @@
<source-address>
<name>2001:7f8:1::a500:112:1/128</name>
</source-address>
+ <source-address>
+ <name>2001:7f8:1::a503:2934:3/128</name>
+ </source-address>
+ <source-address>
+ <name>2001:7f8:1::a503:2934:4/128</name>
+ </source-address>
<destination-address>
<name>2001:798:14:20ff::1/128</name>
</destination-address>
@@ -69690,285 +69489,6 @@
</then>
</term>
</filter>
- <filter>
- <name>SINET6-in</name>
- <term>
- <name>sample</name>
- <then>
- <sample/>
- <next>term</next>
- </then>
- </term>
- <term>
- <name>BOGON-filter6</name>
- <from>
- <source-prefix-list>
- <name>bogons-list6</name>
- </source-prefix-list>
- </from>
- <then>
- <count>bogons-source6</count>
- <discard/>
- </then>
- </term>
- <term>
- <name>dos-source-counting6</name>
- <from>
- <source-prefix-list>
- <name>dos-attack-source-count6</name>
- </source-prefix-list>
- </from>
- <then>
- <count>dos-attack-traffic-count6</count>
- <next>term</next>
- </then>
- </term>
- <term>
- <name>dos-destination-counting6</name>
- <from>
- <destination-prefix-list>
- <name>dos-attack-destination-count6</name>
- </destination-prefix-list>
- </from>
- <then>
- <count>dos-attack-traffic-count6</count>
- <next>term</next>
- </then>
- </term>
- <term>
- <name>dos-source-filtering6</name>
- <from>
- <source-prefix-list>
- <name>dos-attack-source6</name>
- </source-prefix-list>
- </from>
- <then>
- <count>dos-attack-traffic6</count>
- <discard/>
- </then>
- </term>
- <term>
- <name>dos-destination-filtering6</name>
- <from>
- <destination-prefix-list>
- <name>dos-attack-destination6</name>
- </destination-prefix-list>
- </from>
- <then>
- <count>dos-attack-traffic6</count>
- <discard/>
- </then>
- </term>
- <term>
- <name>SPOOF-filter6</name>
- <from>
- <source-prefix-list>
- <name>corporate-address-space6</name>
- </source-prefix-list>
- <source-prefix-list>
- <name>geantnoc-address-space6</name>
- </source-prefix-list>
- </from>
- <then>
- <count>spoofed-attack-traffic6</count>
- <discard/>
- </then>
- </term>
- <term>
- <name>NOC6-accept</name>
- <from>
- <destination-prefix-list>
- <name>geantnoc-address-space6</name>
- </destination-prefix-list>
- </from>
- <then>
- <accept/>
- </then>
- </term>
- <term>
- <name>TTM-allow-tcp</name>
- <from>
- <destination-address>
- <name>2001:798:2012:0047::2/128</name>
- </destination-address>
- <payload-protocol>tcp</payload-protocol>
- <port>9142</port>
- <port>10259</port>
- </from>
- <then>
- <accept/>
- </then>
- </term>
- <term>
- <name>TTM-allow-udp</name>
- <from>
- <destination-address>
- <name>2001:798:2012:0047::2/128</name>
- </destination-address>
- <payload-protocol>udp</payload-protocol>
- </from>
- <then>
- <accept/>
- </then>
- </term>
- <term>
- <name>BGP6-protect</name>
- <from>
- <source-address>
- <name>2001:0798:0029:10dd::2/128</name>
- </source-address>
- <destination-address>
- <name>2001:2f8:1:ff::12/128</name>
- </destination-address>
- <port>bgp</port>
- </from>
- <then>
- <count>bgpv6-accept</count>
- <accept/>
- </then>
- </term>
- <term>
- <name>BGP6-filter</name>
- <from>
- <destination-prefix-list>
- <name>geant-address-space-V6</name>
- </destination-prefix-list>
- <port>bgp</port>
- </from>
- <then>
- <count>bgpv6-attack</count>
- <syslog/>
- <discard/>
- </then>
- </term>
- <term>
- <name>NREN-router-accept</name>
- <from>
- <destination-address>
- <name>2001:798:22:20ff::2/128</name>
- </destination-address>
- <port>ssh</port>
- </from>
- <then>
- <accept/>
- </then>
- </term>
- <term>
- <name>ICMP-accept</name>
- <from>
- <destination-prefix-list>
- <name>geant-address-space-V6</name>
- </destination-prefix-list>
- <payload-protocol>icmp6</payload-protocol>
- </from>
- <then>
- <policer>ICMPv6-flood</policer>
- <accept/>
- </then>
- </term>
- <term>
- <name>WEB6-accept</name>
- <from>
- <destination-address>
- <name>2001:798:2:284d::60/128</name>
- </destination-address>
- <payload-protocol>tcp</payload-protocol>
- <port>http</port>
- </from>
- <then>
- <accept/>
- </then>
- </term>
- <term>
- <name>DNSv6-server-accept</name>
- <from>
- <destination-address>
- <name>2001:798:2:284d::30/128</name>
- </destination-address>
- <payload-protocol>udp</payload-protocol>
- <payload-protocol>tcp</payload-protocol>
- <port>domain</port>
- </from>
- <then>
- <accept/>
- </then>
- </term>
- <term>
- <name>workstations-SSHv6-accept</name>
- <from>
- <source-address>
- <name>2001:0798:5e00::/48</name>
- </source-address>
- <source-address>
- <name>2001:0798:5e01::/48</name>
- </source-address>
- <destination-address>
- <name>2001:798:2028:006e::10/64</name>
- </destination-address>
- <payload-protocol>tcp</payload-protocol>
- <port>ssh</port>
- </from>
- <then>
- <accept/>
- </then>
- </term>
- <term>
- <name>UDP-traceroute6</name>
- <from>
- <destination-prefix-list>
- <name>geant-address-space-V6</name>
- </destination-prefix-list>
- <payload-protocol>udp</payload-protocol>
- <destination-port>33434-33690</destination-port>
- </from>
- <then>
- <policer>ICMPv6-flood</policer>
- <accept/>
- </then>
- </term>
- <term>
- <name>External-Projects-interfaces6</name>
- <from>
- <destination-prefix-list>
- <name>external-project-interfaces6</name>
- </destination-prefix-list>
- </from>
- <then>
- <count>extv6-attack</count>
- <discard/>
- </then>
- </term>
- <term>
- <name>External-Projects6</name>
- <from>
- <destination-prefix-list>
- <name>external-project6</name>
- </destination-prefix-list>
- </from>
- <then>
- <accept/>
- </then>
- </term>
- <term>
- <name>CORE-filter</name>
- <from>
- <destination-prefix-list>
- <name>geant-address-space-V6</name>
- </destination-prefix-list>
- </from>
- <then>
- <count>corev6-attack</count>
- <discard/>
- </then>
- </term>
- <term>
- <name>count-ipv6</name>
- <then>
- <count>ipv6-counter</count>
- <accept/>
- </then>
- </term>
- </filter>
<filter>
<name>SINET6-out</name>
<term>
@@ -71677,6 +71197,9 @@
<source-prefix-list>
<name>dashboard-servers-v6</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers-v6</name>
+ </source-prefix-list>
<next-header>tcp</next-header>
<port>ssh</port>
</from>
@@ -75345,6 +74868,265 @@
</then>
</term>
</filter>
+ <filter>
+ <name>SINET6-in</name>
+ <term>
+ <name>sample</name>
+ <then>
+ <sample/>
+ <next>term</next>
+ </then>
+ </term>
+ <term>
+ <name>BOGON-filter6</name>
+ <from>
+ <source-prefix-list>
+ <name>bogons-list6</name>
+ </source-prefix-list>
+ </from>
+ <then>
+ <count>bogons-source6</count>
+ <discard/>
+ </then>
+ </term>
+ <term>
+ <name>dos-source-counting6</name>
+ <from>
+ <source-prefix-list>
+ <name>dos-attack-source-count6</name>
+ </source-prefix-list>
+ </from>
+ <then>
+ <count>dos-attack-traffic-count6</count>
+ <next>term</next>
+ </then>
+ </term>
+ <term>
+ <name>dos-destination-counting6</name>
+ <from>
+ <destination-prefix-list>
+ <name>dos-attack-destination-count6</name>
+ </destination-prefix-list>
+ </from>
+ <then>
+ <count>dos-attack-traffic-count6</count>
+ <next>term</next>
+ </then>
+ </term>
+ <term>
+ <name>dos-source-filtering6</name>
+ <from>
+ <source-prefix-list>
+ <name>dos-attack-source6</name>
+ </source-prefix-list>
+ </from>
+ <then>
+ <count>dos-attack-traffic6</count>
+ <discard/>
+ </then>
+ </term>
+ <term>
+ <name>dos-destination-filtering6</name>
+ <from>
+ <destination-prefix-list>
+ <name>dos-attack-destination6</name>
+ </destination-prefix-list>
+ </from>
+ <then>
+ <count>dos-attack-traffic6</count>
+ <discard/>
+ </then>
+ </term>
+ <term>
+ <name>SPOOF-filter6</name>
+ <from>
+ <source-prefix-list>
+ <name>dante-address-space6</name>
+ </source-prefix-list>
+ <source-prefix-list>
+ <name>geantnoc-address-space6</name>
+ </source-prefix-list>
+ </from>
+ <then>
+ <count>spoofed-attack-traffic6</count>
+ <discard/>
+ </then>
+ </term>
+ <term>
+ <name>NOC6-accept</name>
+ <from>
+ <destination-prefix-list>
+ <name>geantnoc-address-space6</name>
+ </destination-prefix-list>
+ </from>
+ <then>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>BGP6-protect</name>
+ <from>
+ <source-address>
+ <name>2001:798:99:1::ba/128</name>
+ </source-address>
+ <destination-address>
+ <name>2001:798:99:1::b9/128</name>
+ </destination-address>
+ <port>bgp</port>
+ </from>
+ <then>
+ <count>bgpv6-accept</count>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>BGP6-filter</name>
+ <from>
+ <destination-prefix-list>
+ <name>geant-address-space-V6</name>
+ </destination-prefix-list>
+ <port>bgp</port>
+ </from>
+ <then>
+ <count>bgpv6-attack</count>
+ <syslog/>
+ <discard/>
+ </then>
+ </term>
+ <term>
+ <name>NREN-router-accept</name>
+ <from>
+ <destination-address>
+ <name>2001:798:99:1::b9/128</name>
+ </destination-address>
+ <destination-address>
+ <name>2001:798:99:1::ba/128</name>
+ </destination-address>
+ <port>ssh</port>
+ </from>
+ <then>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>ICMP-accept</name>
+ <from>
+ <destination-prefix-list>
+ <name>geant-address-space-V6</name>
+ </destination-prefix-list>
+ <payload-protocol>icmp6</payload-protocol>
+ </from>
+ <then>
+ <policer>ICMPv6-flood</policer>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>WEB6-accept</name>
+ <from>
+ <destination-address>
+ <name>2001:798:2:284d::60/128</name>
+ </destination-address>
+ <payload-protocol>tcp</payload-protocol>
+ <port>http</port>
+ </from>
+ <then>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>DNSv6-server-accept</name>
+ <from>
+ <destination-address>
+ <name>2001:798:2:284d::30/128</name>
+ </destination-address>
+ <destination-address>
+ <name>2001:798:ff23:28::2/128</name>
+ </destination-address>
+ <payload-protocol>udp</payload-protocol>
+ <payload-protocol>tcp</payload-protocol>
+ <port>domain</port>
+ </from>
+ <then>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>workstations-SSHv6-accept</name>
+ <from>
+ <source-address>
+ <name>2001:0798:5e00::/48</name>
+ </source-address>
+ <source-address>
+ <name>2001:0798:5e01::/48</name>
+ </source-address>
+ <destination-address>
+ <name>2001:798:2028:006e::10/64</name>
+ </destination-address>
+ <payload-protocol>tcp</payload-protocol>
+ <port>ssh</port>
+ </from>
+ <then>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>UDP-traceroute6</name>
+ <from>
+ <destination-prefix-list>
+ <name>geant-address-space-V6</name>
+ </destination-prefix-list>
+ <payload-protocol>udp</payload-protocol>
+ <destination-port>33434-33690</destination-port>
+ </from>
+ <then>
+ <policer>ICMPv6-flood</policer>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>External-Projects-interfaces6</name>
+ <from>
+ <destination-prefix-list>
+ <name>external-project-interfaces6</name>
+ </destination-prefix-list>
+ </from>
+ <then>
+ <count>extv6-attack</count>
+ <discard/>
+ </then>
+ </term>
+ <term>
+ <name>External-Projects6</name>
+ <from>
+ <destination-prefix-list>
+ <name>external-project6</name>
+ </destination-prefix-list>
+ </from>
+ <then>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>CORE-filter</name>
+ <from>
+ <destination-prefix-list>
+ <name>geant-address-space-V6</name>
+ </destination-prefix-list>
+ </from>
+ <then>
+ <count>corev6-attack</count>
+ <discard/>
+ </then>
+ </term>
+ <term>
+ <name>count-ipv6</name>
+ <then>
+ <count>ipv6-counter</count>
+ <accept/>
+ </then>
+ </term>
+ </filter>
</inet6>
<mpls>
<filter>
@@ -75542,6 +75324,28 @@
</then>
</term>
</filter>
+ <filter>
+ <name>filter_in_et-3/1/2_3755</name>
+ <interface-specific/>
+ <term>
+ <name>1</name>
+ <then>
+ <policer>policer_in_et-3/1/2_3755</policer>
+ <accept/>
+ </then>
+ </term>
+ </filter>
+ <filter>
+ <name>filter_in_ge-0/3/7_2019</name>
+ <interface-specific/>
+ <term>
+ <name>1</name>
+ <then>
+ <policer>policer_in_ge-0/3/7_2019</policer>
+ <accept/>
+ </then>
+ </term>
+ </filter>
</ccc>
</family>
<policer>
@@ -75807,9 +75611,29 @@
<discard/>
</then>
</policer>
+ <policer>
+ <name>policer_in_et-3/1/2_3755</name>
+ <if-exceeding>
+ <bandwidth-limit>1g</bandwidth-limit>
+ <burst-size-limit>625k</burst-size-limit>
+ </if-exceeding>
+ <then>
+ <discard/>
+ </then>
+ </policer>
+ <policer>
+ <name>policer_in_ge-0/3/7_2019</name>
+ <if-exceeding>
+ <bandwidth-limit>100m</bandwidth-limit>
+ <burst-size-limit>15220</burst-size-limit>
+ </if-exceeding>
+ <then>
+ <discard/>
+ </then>
+ </policer>
</firewall>
<routing-instances>
- <instance>
+ <instance inactive="inactive">
<name>CLEAN_IAS</name>
<description>Clean IAS VRF traffic returned from scrubber</description>
<instance-type>vrf</instance-type>
@@ -76523,7 +76347,7 @@
<prefix-limit>
<maximum>150000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -76550,7 +76374,7 @@
<prefix-limit>
<maximum>900</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -76586,7 +76410,7 @@
<prefix-limit>
<maximum>2250</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -76622,7 +76446,7 @@
<prefix-limit>
<maximum>2250</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -76658,7 +76482,7 @@
<prefix-limit>
<maximum>375</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -76694,7 +76518,7 @@
<prefix-limit>
<maximum>300</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -76730,7 +76554,7 @@
<prefix-limit>
<maximum>300</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -76766,7 +76590,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -76802,7 +76626,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -76838,7 +76662,7 @@
<prefix-limit>
<maximum>375</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -76874,7 +76698,7 @@
<prefix-limit>
<maximum>247500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -76933,20 +76757,23 @@
</neighbor>
<neighbor>
<name>80.249.209.115</name>
- <description>Facebook</description>
+ <description>Facebook AS32934</description>
+ <passive/>
<import>ps-AS-SELF-REJECT</import>
<import>ps-BOGONS</import>
<import>ps-PRIVATE-AS-BLOCK</import>
<import>IAS_PS-FROM-PUBLIC-PEERS_AMS-IX_HEAD</import>
<import>IAS_PS-FROM-PUBLIC-PEER_AS32934_FACEBOOK_-_Facebook,_Inc.,US_</import>
<import>IAS_PS-FROM-PUBLIC-PEERS_AMS-IX_TAIL</import>
+ <import>ps-deny-all</import>
+ <import>IAS_PS-FROM-PUBLIC-PEER_AS32934_Facebook</import>
<family>
<inet>
<any>
<prefix-limit>
<maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -76960,6 +76787,8 @@
<export>IAS_PS-TO-PUBLIC-PEERS_AMS-IX_HEAD</export>
<export>IAS_PS-TO-PUBLIC-PEER_AS32934_FACEBOOK_-_Facebook,_Inc.,US_</export>
<export>IAS_PS-TO-PUBLIC-PEERS_AMS-IX_TAIL</export>
+ <export>ps-deny-all</export>
+ <export>IAS_PS-TO-PUBLIC-PEER_AS32934_Facebook</export>
<peer-as>32934</peer-as>
<local-as>
<as-number>21320</as-number>
@@ -76969,20 +76798,23 @@
</neighbor>
<neighbor>
<name>80.249.209.164</name>
- <description>Facebook (2)</description>
+ <description>Facebook AS32934</description>
+ <passive/>
<import>ps-AS-SELF-REJECT</import>
<import>ps-BOGONS</import>
<import>ps-PRIVATE-AS-BLOCK</import>
<import>IAS_PS-FROM-PUBLIC-PEERS_AMS-IX_HEAD</import>
<import>IAS_PS-FROM-PUBLIC-PEER_AS32934_FACEBOOK_-_Facebook,_Inc.,US_</import>
<import>IAS_PS-FROM-PUBLIC-PEERS_AMS-IX_TAIL</import>
+ <import>ps-deny-all</import>
+ <import>IAS_PS-FROM-PUBLIC-PEER_AS32934_Facebook</import>
<family>
<inet>
<any>
<prefix-limit>
<maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -76996,6 +76828,8 @@
<export>IAS_PS-TO-PUBLIC-PEERS_AMS-IX_HEAD</export>
<export>IAS_PS-TO-PUBLIC-PEER_AS32934_FACEBOOK_-_Facebook,_Inc.,US_</export>
<export>IAS_PS-TO-PUBLIC-PEERS_AMS-IX_TAIL</export>
+ <export>ps-deny-all</export>
+ <export>IAS_PS-TO-PUBLIC-PEER_AS32934_Facebook</export>
<peer-as>32934</peer-as>
<local-as>
<as-number>21320</as-number>
@@ -77018,7 +76852,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -77055,7 +76889,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -77091,7 +76925,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -77127,7 +76961,7 @@
<prefix-limit>
<maximum>7350</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -77162,45 +76996,9 @@
<inet>
<any>
<prefix-limit>
- <maximum>3750</maximum>
- <teardown>
- <limit-threshold>90</limit-threshold>
- <idle-timeout>
- <timeout>30</timeout>
- </idle-timeout>
- </teardown>
- </prefix-limit>
- </any>
- </inet>
- </family>
- <export>ps-BOGONS</export>
- <export>ps-PRIVATE-AS-BLOCK</export>
- <export>IAS_PS-TO-PUBLIC-PEERS_AMS-IX_HEAD</export>
- <export>IAS_PS-TO-PUBLIC-PEER_AS8220_COLT_COLT_Technology_Services_Group</export>
- <export>IAS_PS-TO-PUBLIC-PEERS_AMS-IX_TAIL</export>
- <peer-as>8220</peer-as>
- <local-as>
- <as-number>21320</as-number>
- <private/>
- <no-prepend-global-as/>
- </local-as>
- </neighbor>
- <neighbor>
- <name>80.249.208.52</name>
- <description>COLT (2)</description>
- <import>ps-AS-SELF-REJECT</import>
- <import>ps-BOGONS</import>
- <import>ps-PRIVATE-AS-BLOCK</import>
- <import>IAS_PS-FROM-PUBLIC-PEERS_AMS-IX_HEAD</import>
- <import>IAS_PS-FROM-PUBLIC-PEER_AS8220_COLT_COLT_Technology_Services_Group</import>
- <import>IAS_PS-FROM-PUBLIC-PEERS_AMS-IX_TAIL</import>
- <family>
- <inet>
- <any>
- <prefix-limit>
- <maximum>3750</maximum>
+ <maximum>4500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -77236,7 +77034,7 @@
<prefix-limit>
<maximum>300</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -77272,7 +77070,7 @@
<prefix-limit>
<maximum>90</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -77308,7 +77106,7 @@
<prefix-limit>
<maximum>7500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -77345,7 +77143,7 @@
<prefix-limit>
<maximum>7500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -77418,7 +77216,7 @@
<prefix-limit>
<maximum>3750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -77454,7 +77252,7 @@
<prefix-limit>
<maximum>1350</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -77490,7 +77288,7 @@
<prefix-limit>
<maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -77526,7 +77324,7 @@
<prefix-limit>
<maximum>13500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -77562,7 +77360,7 @@
<prefix-limit>
<maximum>30</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -77598,7 +77396,7 @@
<prefix-limit>
<maximum>40</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -77634,7 +77432,7 @@
<prefix-limit>
<maximum>100</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -77670,7 +77468,7 @@
<prefix-limit>
<maximum>90</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -77704,9 +77502,9 @@
<inet>
<any>
<prefix-limit>
- <maximum>105</maximum>
+ <maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -77742,7 +77540,7 @@
<prefix-limit>
<maximum>6000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -77778,7 +77576,7 @@
<prefix-limit>
<maximum>6000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -77814,7 +77612,7 @@
<prefix-limit>
<maximum>50</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -77851,7 +77649,7 @@
<prefix-limit>
<maximum>50</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -77888,7 +77686,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -77924,7 +77722,7 @@
<prefix-limit>
<maximum>30</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -77960,7 +77758,7 @@
<prefix-limit>
<maximum>30</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -77996,7 +77794,7 @@
<prefix-limit>
<maximum>15</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -78032,7 +77830,7 @@
<prefix-limit>
<maximum>3000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -78068,7 +77866,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -78104,7 +77902,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -78140,7 +77938,7 @@
<prefix-limit>
<maximum>600</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -78176,7 +77974,7 @@
<prefix-limit>
<maximum>7500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -78212,7 +78010,7 @@
<prefix-limit>
<maximum>13</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -78249,7 +78047,7 @@
<prefix-limit>
<maximum>15000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -78285,7 +78083,7 @@
<prefix-limit>
<maximum>15000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -78321,7 +78119,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -78357,7 +78155,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -78393,7 +78191,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -78440,7 +78238,7 @@
<prefix-limit>
<maximum>4500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
</teardown>
</prefix-limit>
</any>
@@ -78473,7 +78271,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -78509,7 +78307,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -78545,7 +78343,7 @@
<prefix-limit>
<maximum>2250</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -78581,7 +78379,7 @@
<prefix-limit>
<maximum>15000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -78617,7 +78415,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -78653,7 +78451,7 @@
<prefix-limit>
<maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -78687,9 +78485,9 @@
<inet>
<any>
<prefix-limit>
- <maximum>5000</maximum>
+ <maximum>7500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -78725,7 +78523,7 @@
<prefix-limit>
<maximum>15</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -78762,7 +78560,7 @@
<prefix-limit>
<maximum>15</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -78799,7 +78597,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -78835,7 +78633,7 @@
<prefix-limit>
<maximum>22</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -78871,7 +78669,7 @@
<prefix-limit>
<maximum>7500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -78907,7 +78705,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -78943,7 +78741,7 @@
<prefix-limit>
<maximum>15000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -78980,7 +78778,7 @@
<prefix-limit>
<maximum>15000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79016,7 +78814,7 @@
<prefix-limit>
<maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79052,7 +78850,7 @@
<prefix-limit>
<maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79088,7 +78886,7 @@
<prefix-limit>
<maximum>900</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79122,9 +78920,9 @@
<inet>
<any>
<prefix-limit>
- <maximum>33000</maximum>
+ <maximum>37500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79160,7 +78958,7 @@
<prefix-limit>
<maximum>30000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79197,7 +78995,7 @@
<prefix-limit>
<maximum>3750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79233,7 +79031,7 @@
<prefix-limit>
<maximum>375</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79269,7 +79067,7 @@
<prefix-limit>
<maximum>450</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79306,7 +79104,7 @@
<prefix-limit>
<maximum>300</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79342,7 +79140,7 @@
<prefix-limit>
<maximum>300</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79378,7 +79176,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79414,7 +79212,7 @@
<prefix-limit>
<maximum>4500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79450,7 +79248,7 @@
<prefix-limit>
<maximum>22</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79486,7 +79284,7 @@
<prefix-limit>
<maximum>7500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79522,7 +79320,7 @@
<prefix-limit>
<maximum>225</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79558,7 +79356,7 @@
<prefix-limit>
<maximum>375</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79594,7 +79392,7 @@
<prefix-limit>
<maximum>375</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79630,7 +79428,7 @@
<prefix-limit>
<maximum>900</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79666,7 +79464,7 @@
<prefix-limit>
<maximum>900</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79702,7 +79500,7 @@
<prefix-limit>
<maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79738,7 +79536,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79774,7 +79572,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79810,7 +79608,7 @@
<prefix-limit>
<maximum>37</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79846,7 +79644,7 @@
<prefix-limit>
<maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79882,7 +79680,7 @@
<prefix-limit>
<maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79918,7 +79716,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79954,7 +79752,7 @@
<prefix-limit>
<maximum>300</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79990,7 +79788,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80026,7 +79824,7 @@
<prefix-limit>
<maximum>15</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80062,7 +79860,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80098,7 +79896,7 @@
<prefix-limit>
<maximum>7500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80122,8 +79920,6 @@
<neighbor>
<name>80.249.208.82</name>
<description>Claranet AS8426</description>
- <passive/>
- <import>ps-deny-all</import>
<import>ps-AS-SELF-REJECT</import>
<import>ps-BOGONS</import>
<import>ps-PRIVATE-AS-BLOCK</import>
@@ -80136,7 +79932,7 @@
<prefix-limit>
<maximum>1200</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80145,7 +79941,6 @@
</any>
</inet>
</family>
- <export>ps-deny-all</export>
<export>ps-BOGONS</export>
<export>ps-PRIVATE-AS-BLOCK</export>
<export>IAS_PS-TO-PUBLIC-PEERS_AMS-IX_HEAD</export>
@@ -80173,7 +79968,7 @@
<prefix-limit>
<maximum>1200</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80209,7 +80004,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80245,7 +80040,7 @@
<prefix-limit>
<maximum>172500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80281,7 +80076,7 @@
<prefix-limit>
<maximum>37500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80317,7 +80112,7 @@
<prefix-limit>
<maximum>15</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80338,6 +80133,84 @@
<no-prepend-global-as/>
</local-as>
</neighbor>
+ <neighbor>
+ <name>80.249.212.174</name>
+ <description>Facebook AS32934</description>
+ <passive/>
+ <import>ps-deny-all</import>
+ <import>ps-AS-SELF-REJECT</import>
+ <import>ps-BOGONS</import>
+ <import>ps-PRIVATE-AS-BLOCK</import>
+ <import>IAS_PS-FROM-PUBLIC-PEERS_AMS-IX_HEAD</import>
+ <import>IAS_PS-FROM-PUBLIC-PEER_AS32934_Facebook</import>
+ <import>IAS_PS-FROM-PUBLIC-PEERS_AMS-IX_TAIL</import>
+ <family>
+ <inet>
+ <any>
+ <prefix-limit>
+ <maximum>150</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
+ </prefix-limit>
+ </any>
+ </inet>
+ </family>
+ <export>ps-deny-all</export>
+ <export>ps-BOGONS</export>
+ <export>ps-PRIVATE-AS-BLOCK</export>
+ <export>IAS_PS-TO-PUBLIC-PEERS_AMS-IX_HEAD</export>
+ <export>IAS_PS-TO-PUBLIC-PEER_AS32934_Facebook</export>
+ <export>IAS_PS-TO-PUBLIC-PEERS_AMS-IX_TAIL</export>
+ <peer-as>32934</peer-as>
+ <local-as>
+ <as-number>21320</as-number>
+ <private/>
+ <no-prepend-global-as/>
+ </local-as>
+ </neighbor>
+ <neighbor>
+ <name>80.249.212.175</name>
+ <description>Facebook AS32934</description>
+ <passive/>
+ <import>ps-deny-all</import>
+ <import>ps-AS-SELF-REJECT</import>
+ <import>ps-BOGONS</import>
+ <import>ps-PRIVATE-AS-BLOCK</import>
+ <import>IAS_PS-FROM-PUBLIC-PEERS_AMS-IX_HEAD</import>
+ <import>IAS_PS-FROM-PUBLIC-PEER_AS32934_Facebook</import>
+ <import>IAS_PS-FROM-PUBLIC-PEERS_AMS-IX_TAIL</import>
+ <family>
+ <inet>
+ <any>
+ <prefix-limit>
+ <maximum>150</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
+ </prefix-limit>
+ </any>
+ </inet>
+ </family>
+ <export>ps-deny-all</export>
+ <export>ps-BOGONS</export>
+ <export>ps-PRIVATE-AS-BLOCK</export>
+ <export>IAS_PS-TO-PUBLIC-PEERS_AMS-IX_HEAD</export>
+ <export>IAS_PS-TO-PUBLIC-PEER_AS32934_Facebook</export>
+ <export>IAS_PS-TO-PUBLIC-PEERS_AMS-IX_TAIL</export>
+ <peer-as>32934</peer-as>
+ <local-as>
+ <as-number>21320</as-number>
+ <private/>
+ <no-prepend-global-as/>
+ </local-as>
+ </neighbor>
</group>
<group>
<name>GEANT-IXv6-AMS-IX</name>
@@ -80350,7 +80223,7 @@
<prefix-limit>
<maximum>150000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80375,7 +80248,7 @@
<prefix-limit>
<maximum>375</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80411,7 +80284,7 @@
<prefix-limit>
<maximum>300</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80447,7 +80320,7 @@
<prefix-limit>
<maximum>300</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80483,7 +80356,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80519,7 +80392,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80555,7 +80428,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80591,7 +80464,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80627,7 +80500,7 @@
<prefix-limit>
<maximum>900</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80663,7 +80536,7 @@
<prefix-limit>
<maximum>375</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80699,7 +80572,7 @@
<prefix-limit>
<maximum>247500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80735,7 +80608,7 @@
<prefix-limit>
<maximum>4500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80771,7 +80644,7 @@
<prefix-limit>
<maximum>3750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80794,20 +80667,23 @@
</neighbor>
<neighbor>
<name>2001:7f8:1::a503:2934:1</name>
- <description>Facebook</description>
+ <description>Facebook AS32934</description>
+ <passive/>
<import>ps-AS-SELF-REJECT</import>
<import>ps-BOGONS-V6</import>
<import>ps-PRIVATE-AS-BLOCK</import>
<import>IAS_PS-FROM-PUBLIC-PEERS_AMS-IX_HEAD</import>
<import>IAS_PS-FROM-PUBLIC-PEER_AS32934_FACEBOOK_-_Facebook,_Inc.,US_</import>
<import>IAS_PS-FROM-PUBLIC-PEERS_AMS-IX_TAIL</import>
+ <import>ps-deny-all</import>
+ <import>IAS_PS-FROM-PUBLIC-PEER_AS32934_Facebook</import>
<family>
<inet6>
<any>
<prefix-limit>
<maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80821,6 +80697,8 @@
<export>IAS_PS-TO-PUBLIC-PEERS_AMS-IX_HEAD</export>
<export>IAS_PS-TO-PUBLIC-PEER_AS32934_FACEBOOK_-_Facebook,_Inc.,US_</export>
<export>IAS_PS-TO-PUBLIC-PEERS_AMS-IX_TAIL</export>
+ <export>ps-deny-all</export>
+ <export>IAS_PS-TO-PUBLIC-PEER_AS32934_Facebook</export>
<peer-as>32934</peer-as>
<local-as>
<as-number>21320</as-number>
@@ -80830,20 +80708,23 @@
</neighbor>
<neighbor>
<name>2001:7f8:1::a503:2934:2</name>
- <description>Facebook (2)</description>
+ <description>Facebook AS32934</description>
+ <passive/>
<import>ps-AS-SELF-REJECT</import>
<import>ps-BOGONS-V6</import>
<import>ps-PRIVATE-AS-BLOCK</import>
<import>IAS_PS-FROM-PUBLIC-PEERS_AMS-IX_HEAD</import>
<import>IAS_PS-FROM-PUBLIC-PEER_AS32934_FACEBOOK_-_Facebook,_Inc.,US_</import>
<import>IAS_PS-FROM-PUBLIC-PEERS_AMS-IX_TAIL</import>
+ <import>ps-deny-all</import>
+ <import>IAS_PS-FROM-PUBLIC-PEER_AS32934_Facebook</import>
<family>
<inet6>
<any>
<prefix-limit>
<maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80857,6 +80738,8 @@
<export>IAS_PS-TO-PUBLIC-PEERS_AMS-IX_HEAD</export>
<export>IAS_PS-TO-PUBLIC-PEER_AS32934_FACEBOOK_-_Facebook,_Inc.,US_</export>
<export>IAS_PS-TO-PUBLIC-PEERS_AMS-IX_TAIL</export>
+ <export>ps-deny-all</export>
+ <export>IAS_PS-TO-PUBLIC-PEER_AS32934_Facebook</export>
<peer-as>32934</peer-as>
<local-as>
<as-number>21320</as-number>
@@ -80879,43 +80762,7 @@
<prefix-limit>
<maximum>3750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
- <idle-timeout>
- <timeout>30</timeout>
- </idle-timeout>
- </teardown>
- </prefix-limit>
- </any>
- </inet6>
- </family>
- <export>ps-BOGONS-V6</export>
- <export>ps-PRIVATE-AS-BLOCK</export>
- <export>IAS_PS-TO-PUBLIC-PEERS_AMS-IX_HEAD</export>
- <export>IAS_PS-TO-PUBLIC-PEER_AS8220_COLT_COLT_Technology_Services_Group</export>
- <export>IAS_PS-TO-PUBLIC-PEERS_AMS-IX_TAIL</export>
- <peer-as>8220</peer-as>
- <local-as>
- <as-number>21320</as-number>
- <private/>
- <no-prepend-global-as/>
- </local-as>
- </neighbor>
- <neighbor>
- <name>2001:7f8:1::a500:8220:2</name>
- <description>COLT (2)</description>
- <import>ps-AS-SELF-REJECT</import>
- <import>ps-BOGONS-V6</import>
- <import>ps-PRIVATE-AS-BLOCK</import>
- <import>IAS_PS-FROM-PUBLIC-PEERS_AMS-IX_HEAD</import>
- <import>IAS_PS-FROM-PUBLIC-PEER_AS8220_COLT_COLT_Technology_Services_Group</import>
- <import>IAS_PS-FROM-PUBLIC-PEERS_AMS-IX_TAIL</import>
- <family>
- <inet6>
- <any>
- <prefix-limit>
- <maximum>3750</maximum>
- <teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80951,7 +80798,7 @@
<prefix-limit>
<maximum>300</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80987,7 +80834,7 @@
<prefix-limit>
<maximum>90</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -81023,7 +80870,7 @@
<prefix-limit>
<maximum>7500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -81060,7 +80907,7 @@
<prefix-limit>
<maximum>7500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -81097,7 +80944,7 @@
<prefix-limit>
<maximum>3750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
</teardown>
</prefix-limit>
</any>
@@ -81130,7 +80977,7 @@
<prefix-limit>
<maximum>1350</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
</teardown>
</prefix-limit>
</any>
@@ -81163,7 +81010,7 @@
<prefix-limit>
<maximum>105</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
</teardown>
</prefix-limit>
</any>
@@ -81196,7 +81043,7 @@
<prefix-limit>
<maximum>13500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
</teardown>
</prefix-limit>
</any>
@@ -81229,7 +81076,7 @@
<prefix-limit>
<maximum>30</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
</teardown>
</prefix-limit>
</any>
@@ -81262,7 +81109,7 @@
<prefix-limit>
<maximum>30</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
</teardown>
</prefix-limit>
</any>
@@ -81294,6 +81141,9 @@
<any>
<prefix-limit>
<maximum>100</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
</prefix-limit>
</any>
</inet6>
@@ -81325,7 +81175,7 @@
<prefix-limit>
<maximum>90</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
</teardown>
</prefix-limit>
</any>
@@ -81358,7 +81208,7 @@
<prefix-limit>
<maximum>6000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
</teardown>
</prefix-limit>
</any>
@@ -81391,7 +81241,7 @@
<prefix-limit>
<maximum>6000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
</teardown>
</prefix-limit>
</any>
@@ -81424,7 +81274,7 @@
<prefix-limit>
<maximum>50</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
</teardown>
</prefix-limit>
</any>
@@ -81458,7 +81308,7 @@
<prefix-limit>
<maximum>50</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
</teardown>
</prefix-limit>
</any>
@@ -81492,7 +81342,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -81528,7 +81378,7 @@
<prefix-limit>
<maximum>15</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -81564,7 +81414,7 @@
<prefix-limit>
<maximum>300</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -81600,7 +81450,7 @@
<prefix-limit>
<maximum>300</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -81636,7 +81486,7 @@
<prefix-limit>
<maximum>300</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -81672,7 +81522,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -81708,7 +81558,7 @@
<prefix-limit>
<maximum>13</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -81745,7 +81595,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -81781,7 +81631,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -81817,7 +81667,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -81853,7 +81703,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -81885,17 +81735,17 @@
<import>IAS_PS-FROM-PUBLIC-PEERS_AMS-IX_TAIL</import>
<family>
<inet6>
- <unicast>
+ <any>
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
</teardown>
</prefix-limit>
- </unicast>
+ </any>
</inet6>
</family>
<export>ps-BOGONS-V6</export>
@@ -81925,7 +81775,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -81961,7 +81811,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -81997,7 +81847,7 @@
<prefix-limit>
<maximum>2250</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82033,7 +81883,7 @@
<prefix-limit>
<maximum>15000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82069,7 +81919,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82105,7 +81955,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82141,7 +81991,7 @@
<prefix-limit>
<maximum>15</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82178,7 +82028,7 @@
<prefix-limit>
<maximum>105</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82214,7 +82064,7 @@
<prefix-limit>
<maximum>7350</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82251,7 +82101,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82289,7 +82139,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82325,7 +82175,7 @@
<prefix-limit>
<maximum>22</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82361,7 +82211,7 @@
<prefix-limit>
<maximum>7500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82397,7 +82247,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82433,7 +82283,7 @@
<prefix-limit>
<maximum>15000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82469,7 +82319,7 @@
<prefix-limit>
<maximum>15000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82505,7 +82355,7 @@
<prefix-limit>
<maximum>900</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82539,9 +82389,9 @@
<inet6>
<any>
<prefix-limit>
- <maximum>1950</maximum>
+ <maximum>3000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82577,7 +82427,7 @@
<prefix-limit>
<maximum>10000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82614,7 +82464,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82650,7 +82500,7 @@
<prefix-limit>
<maximum>375</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82686,7 +82536,7 @@
<prefix-limit>
<maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82722,7 +82572,7 @@
<prefix-limit>
<maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82758,7 +82608,7 @@
<prefix-limit>
<maximum>450</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82795,7 +82645,7 @@
<prefix-limit>
<maximum>300</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82831,7 +82681,7 @@
<prefix-limit>
<maximum>300</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82867,7 +82717,7 @@
<prefix-limit>
<maximum>1250</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82903,7 +82753,7 @@
<prefix-limit>
<maximum>4500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82939,7 +82789,7 @@
<prefix-limit>
<maximum>7500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82975,7 +82825,7 @@
<prefix-limit>
<maximum>225</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -83011,7 +82861,7 @@
<prefix-limit>
<maximum>375</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -83047,7 +82897,7 @@
<prefix-limit>
<maximum>375</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -83083,7 +82933,7 @@
<prefix-limit>
<maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -83119,7 +82969,7 @@
<prefix-limit>
<maximum>900</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -83155,7 +83005,7 @@
<prefix-limit>
<maximum>900</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -83191,7 +83041,7 @@
<prefix-limit>
<maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -83227,7 +83077,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -83263,7 +83113,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -83299,7 +83149,7 @@
<prefix-limit>
<maximum>37</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -83335,7 +83185,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -83371,7 +83221,7 @@
<prefix-limit>
<maximum>300</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -83407,7 +83257,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -83443,7 +83293,7 @@
<prefix-limit>
<maximum>15</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -83479,7 +83329,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -83515,7 +83365,7 @@
<prefix-limit>
<maximum>7500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -83551,7 +83401,7 @@
<prefix-limit>
<maximum>1200</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -83575,8 +83425,6 @@
<neighbor>
<name>2001:7f8:1::a500:8426:2</name>
<description>Claranet AS8426</description>
- <passive/>
- <import>ps-deny-all</import>
<import>ps-AS-SELF-REJECT</import>
<import>ps-BOGONS-V6</import>
<import>ps-PRIVATE-AS-BLOCK</import>
@@ -83589,7 +83437,7 @@
<prefix-limit>
<maximum>1200</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -83598,7 +83446,6 @@
</any>
</inet6>
</family>
- <export>ps-deny-all</export>
<export>ps-BOGONS-V6</export>
<export>ps-PRIVATE-AS-BLOCK</export>
<export>IAS_PS-TO-PUBLIC-PEERS_AMS-IX_HEAD</export>
@@ -83626,7 +83473,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -83662,7 +83509,7 @@
<prefix-limit>
<maximum>172500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -83698,7 +83545,7 @@
<prefix-limit>
<maximum>37500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -83734,7 +83581,7 @@
<prefix-limit>
<maximum>15</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -83755,6 +83602,84 @@
<no-prepend-global-as/>
</local-as>
</neighbor>
+ <neighbor>
+ <name>2001:7f8:1::a503:2934:3</name>
+ <description>Facebook AS32934</description>
+ <passive/>
+ <import>ps-deny-all</import>
+ <import>ps-AS-SELF-REJECT</import>
+ <import>ps-BOGONS-V6</import>
+ <import>ps-PRIVATE-AS-BLOCK</import>
+ <import>IAS_PS-FROM-PUBLIC-PEERS_AMS-IX_HEAD</import>
+ <import>IAS_PS-FROM-PUBLIC-PEER_AS32934_Facebook</import>
+ <import>IAS_PS-FROM-PUBLIC-PEERS_AMS-IX_TAIL</import>
+ <family>
+ <inet6>
+ <any>
+ <prefix-limit>
+ <maximum>150</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
+ </prefix-limit>
+ </any>
+ </inet6>
+ </family>
+ <export>ps-deny-all</export>
+ <export>ps-BOGONS-V6</export>
+ <export>ps-PRIVATE-AS-BLOCK</export>
+ <export>IAS_PS-TO-PUBLIC-PEERS_AMS-IX_HEAD</export>
+ <export>IAS_PS-TO-PUBLIC-PEER_AS32934_Facebook</export>
+ <export>IAS_PS-TO-PUBLIC-PEERS_AMS-IX_TAIL</export>
+ <peer-as>32934</peer-as>
+ <local-as>
+ <as-number>21320</as-number>
+ <private/>
+ <no-prepend-global-as/>
+ </local-as>
+ </neighbor>
+ <neighbor>
+ <name>2001:7f8:1::a503:2934:4</name>
+ <description>Facebook AS32934</description>
+ <passive/>
+ <import>ps-deny-all</import>
+ <import>ps-AS-SELF-REJECT</import>
+ <import>ps-BOGONS-V6</import>
+ <import>ps-PRIVATE-AS-BLOCK</import>
+ <import>IAS_PS-FROM-PUBLIC-PEERS_AMS-IX_HEAD</import>
+ <import>IAS_PS-FROM-PUBLIC-PEER_AS32934_Facebook</import>
+ <import>IAS_PS-FROM-PUBLIC-PEERS_AMS-IX_TAIL</import>
+ <family>
+ <inet6>
+ <any>
+ <prefix-limit>
+ <maximum>150</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
+ </prefix-limit>
+ </any>
+ </inet6>
+ </family>
+ <export>ps-deny-all</export>
+ <export>ps-BOGONS-V6</export>
+ <export>ps-PRIVATE-AS-BLOCK</export>
+ <export>IAS_PS-TO-PUBLIC-PEERS_AMS-IX_HEAD</export>
+ <export>IAS_PS-TO-PUBLIC-PEER_AS32934_Facebook</export>
+ <export>IAS_PS-TO-PUBLIC-PEERS_AMS-IX_TAIL</export>
+ <peer-as>32934</peer-as>
+ <local-as>
+ <as-number>21320</as-number>
+ <private/>
+ <no-prepend-global-as/>
+ </local-as>
+ </neighbor>
</group>
<group>
<name>GEANT-Peers</name>
@@ -83956,6 +83881,12 @@
<interface>
<name>ge-0/3/3.101</name>
</interface>
+ <interface>
+ <name>ge-0/3/3.201</name>
+ </interface>
+ <interface>
+ <name>ge-0/3/3.203</name>
+ </interface>
<route-distinguisher>
<rd-type>20965:991</rd-type>
</route-distinguisher>
@@ -84006,6 +83937,9 @@
<interface>
<name>ae16.111</name>
</interface>
+ <interface>
+ <name>ae20.200</name>
+ </interface>
<route-distinguisher>
<rd-type>62.40.97.11:111</rd-type>
</route-distinguisher>
@@ -84177,6 +84111,36 @@
<export>ps-to-lhcone-peer</export>
<peer-as>17579</peer-as>
</neighbor>
+ <neighbor>
+ <name>62.40.126.23</name>
+ <description>SINET LHCONE</description>
+ <local-preference>150</local-preference>
+ <out-delay>10</out-delay>
+ <import>ps-BOGONS</import>
+ <import>ps-PRIVATE-AS-BLOCK</import>
+ <import>ps-from-lhcone-peer</import>
+ <family>
+ <inet>
+ <any>
+ <prefix-limit>
+ <maximum>100</maximum>
+ <teardown>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
+ </prefix-limit>
+ </any>
+ </inet>
+ </family>
+ <authentication-key>/* SECRET-DATA */</authentication-key>
+ <export>ps-BOGONS</export>
+ <export>ps-PRIVATE-AS-BLOCK</export>
+ <export>ps-to-ASIA-TIFR-prepend</export>
+ <export>ps-to-SINET-LHCONE-TE</export>
+ <export>ps-to-lhcone-peer</export>
+ <peer-as>2907</peer-as>
+ </neighbor>
</group>
<group>
<name>lhcone-nrens</name>
@@ -84420,6 +84384,34 @@
<export>ps-to-lhcone-peer-v6</export>
<peer-as>24167</peer-as>
</neighbor>
+ <neighbor>
+ <name>2001:798:111:1::b2</name>
+ <description>SINET LHCONE IPv6 VPN</description>
+ <import>ps-BOGONS-V6</import>
+ <import>ps-PRIVATE-AS-BLOCK</import>
+ <import>ps-from-lhcone-peer</import>
+ <family>
+ <inet6>
+ <any>
+ <prefix-limit>
+ <maximum>100</maximum>
+ <teardown>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
+ </prefix-limit>
+ </any>
+ </inet6>
+ </family>
+ <authentication-key>/* SECRET-DATA */</authentication-key>
+ <export>ps-BOGONS-V6</export>
+ <export>ps-PRIVATE-AS-BLOCK</export>
+ <export>ps-to-ASIA-TIFR-prepend</export>
+ <export>ps-to-SINET-LHCONE-TE</export>
+ <export>ps-to-lhcone-peer-v6</export>
+ <peer-as>2907</peer-as>
+ </neighbor>
</group>
</bgp>
</protocols>
@@ -84468,7 +84460,10 @@
<prefix-limit>
<maximum>1000</maximum>
<teardown>
- <limit-threshold>50</limit-threshold>
+ <limit-threshold>90</limit-threshold>
+ <idle-timeout>
+ <timeout>15</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</labeled-unicast>
diff --git a/test/data/mx1.ath2.gr.geant.net-netconf.xml b/test/data/mx1.ath2.gr.geant.net-netconf.xml
index a3b5b441f5498d30bd9abb2fb0e8d495797afce2..54d3485c7bf3dcf35a3f20f86de9d40af2784970 100644
--- a/test/data/mx1.ath2.gr.geant.net-netconf.xml
+++ b/test/data/mx1.ath2.gr.geant.net-netconf.xml
@@ -1,4 +1,4 @@
-<configuration changed-seconds="1545214011" changed-localtime="2018-12-19 10:06:51 UTC">
+<configuration changed-seconds="1549111156" changed-localtime="2019-02-02 12:39:16 UTC">
<version>15.1F6-S10.9</version>
<groups>
<name>re0</name>
@@ -250,6 +250,38 @@
<allow-commands>show .*</allow-commands>
<deny-commands>(ssh .*|telnet .*)</deny-commands>
</class>
+ <class>
+ <name>opennsa</name>
+ <idle-timeout>5</idle-timeout>
+ <permissions>configure</permissions>
+ <deny-commands>(file.*)|(load.*)|(op.*)|(request.*)|(save.*)|(start.*)|(test.*)|(set cli.*)|(set date.*)|(clear.*)|(help.*)|(telnet.*)|(ssh.*)|(traceroute.*)|(mtrace.*)|(monitor.*)|(ping.*)|(show.*)|(set.*)</deny-commands>
+ <allow-configuration-regexps>interfaces .*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections remote-interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols mpls label-switched-path.*</allow-configuration-regexps>
+ <deny-configuration-regexps>vmhost .*</deny-configuration-regexps>
+ <deny-configuration-regexps>session-limit-group .*</deny-configuration-regexps>
+ <deny-configuration-regexps>multi-chassis .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc-partition .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc .*</deny-configuration-regexps>
+ <deny-configuration-regexps>groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>dynamic-profiles .*</deny-configuration-regexps>
+ <deny-configuration-regexps>diameter .*</deny-configuration-regexps>
+ <deny-configuration-regexps>apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>access-profile .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces traceoptions .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-set .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-range .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups-except .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lt-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces ms-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces si-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces gr-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lo.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces dsc.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces irb.*</deny-configuration-regexps>
+ </class>
<class>
<name>readonly-permissions</name>
<permissions>view</permissions>
@@ -564,6 +596,22 @@
<encrypted-password>/* SECRET-DATA */</encrypted-password>
</authentication>
</user>
+ <user>
+ <name>opennsa</name>
+ <uid>2059</uid>
+ <class>opennsa</class>
+ <authentication>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ </authentication>
+ </user>
<user>
<name>opnet</name>
<full-name>OPNET NEOP Planning system @ 62.40.105.114</full-name>
@@ -2531,6 +2579,9 @@
<clients>
<name>83.97.93.196/32</name>
</clients>
+ <clients>
+ <name>83.97.93.238/32</name>
+ </clients>
</community>
<community>
<name>As4n0gN!</name>
@@ -2983,13 +3034,13 @@
<name>multicastv6</name>
<import-rib>inet6.2</import-rib>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias</name>
<import-rib>IAS.inet.0</import-rib>
<import-rib>CLEAN_IAS.inet.0</import-rib>
<import-policy>ps-into-clean-ias-import</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias-v6</name>
<import-rib>IAS.inet6.0</import-rib>
<import-rib>CLEAN_IAS.inet6.0</import-rib>
@@ -6931,15 +6982,13 @@
</prefix-list>
<prefix-list>
<name>geantncc-address-space</name>
+ <comment>/* NCC DR VPN */</comment>
<prefix-list-item>
- <name>62.40.108.192/26</name>
+ <name>62.40.108.192/27</name>
</prefix-list-item>
<prefix-list-item>
<name>62.40.119.0/24</name>
</prefix-list-item>
- <prefix-list-item>
- <name>62.40.119.134/32</name>
- </prefix-list-item>
<prefix-list-item>
<name>62.40.125.250/32</name>
</prefix-list-item>
@@ -8152,9 +8201,15 @@
<prefix-list-item>
<name>195.130.89.0/29</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>195.130.89.8/29</name>
+ </prefix-list-item>
<prefix-list-item>
<name>195.130.89.16/29</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>195.130.89.24/29</name>
+ </prefix-list-item>
<prefix-list-item>
<name>195.130.90.0/23</name>
</prefix-list-item>
@@ -8404,6 +8459,9 @@
<prefix-list-item>
<name>195.251.98.0/24</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>195.251.99.0/27</name>
+ </prefix-list-item>
<prefix-list-item>
<name>195.251.99.32/27</name>
</prefix-list-item>
@@ -8479,6 +8537,9 @@
<prefix-list-item>
<name>195.251.116.0/26</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>195.251.116.64/27</name>
+ </prefix-list-item>
<prefix-list-item>
<name>195.251.116.128/27</name>
</prefix-list-item>
@@ -8965,6 +9026,9 @@
<prefix-list-item>
<name>2001:648:28a0::/48</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>2001:648:28b0::/48</name>
+ </prefix-list-item>
<prefix-list-item>
<name>2001:648:28c0::/48</name>
</prefix-list-item>
@@ -8980,6 +9044,9 @@
<prefix-list-item>
<name>2001:648:2920::/48</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>2001:648:2930::/48</name>
+ </prefix-list-item>
<prefix-list-item>
<name>2001:648:2c00::/48</name>
</prefix-list-item>
@@ -9007,6 +9074,9 @@
<prefix-list-item>
<name>2001:648:2ca0::/48</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>2001:648:2cb0::/48</name>
+ </prefix-list-item>
<prefix-list-item>
<name>2001:648:2cef::/48</name>
</prefix-list-item>
@@ -9529,6 +9599,14 @@
</prefix-list>
<prefix-list>
<name>corporate-address-space</name>
+ <comment>/* LON2 CORP VPN (MAC) */</comment>
+ <prefix-list-item>
+ <name>62.40.99.194/32</name>
+ </prefix-list-item>
+ <comment>/* LON2 CORP VPN */</comment>
+ <prefix-list-item>
+ <name>62.40.99.201/32</name>
+ </prefix-list-item>
<prefix-list-item>
<name>62.40.119.128/25</name>
</prefix-list-item>
@@ -9665,6 +9743,18 @@
<name>2001:798::/32</name>
</prefix-list-item>
</prefix-list>
+ <prefix-list>
+ <name>opennsa-servers</name>
+ <prefix-list-item>
+ <name>83.97.93.92/32</name>
+ </prefix-list-item>
+ </prefix-list>
+ <prefix-list>
+ <name>opennsa-servers-v6</name>
+ <prefix-list-item>
+ <name>2001:798:3::15f/128</name>
+ </prefix-list-item>
+ </prefix-list>
<policy-statement>
<name>ASM-Allow</name>
<term>
@@ -10168,6 +10258,10 @@
<address>185.1.68.0/24</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>193.188.137.0/24</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -10289,6 +10383,10 @@
<address>2001:7f8:a0::/64</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>2001:7f8:35::/64</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -12593,13 +12691,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -12615,14 +12706,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp>
<name>backbone-classifier</name>
@@ -12634,18 +12717,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -12653,195 +12724,16 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>iperf-classifier</name>
- <import>default</import>
<forwarding-class>
<name>expedited-forwarding</name>
<loss-priority>
<name>low</name>
- <code-points>af12</code-points>
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>backbone-classifier</name>
@@ -12853,18 +12745,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -12872,13 +12752,7 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -12901,13 +12775,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -12923,187 +12790,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>iperf-classifier</name>
- <import>default</import>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>af12</code-points>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-access-classifier</name>
@@ -13112,16 +12798,16 @@
<name>be</name>
<loss-priority>
<name>low</name>
- <code-points>000</code-points>
- <code-points>001</code-points>
- <code-points>010</code-points>
- <code-points>011</code-points>
- <code-points>110</code-points>
- <code-points>111</code-points>
+ <code-points>100</code-points>
+ <code-points>101</code-points>
</loss-priority>
</forwarding-class>
+ </exp>
+ <exp>
+ <name>mpls-backbone-classifier</name>
+ <import>default</import>
<forwarding-class>
- <name>less-than-best-effort</name>
+ <name>be</name>
<loss-priority>
<name>low</name>
<code-points>100</code-points>
@@ -13129,40 +12815,7 @@
</loss-priority>
</forwarding-class>
</exp>
- <exp>
- <name>mpls-backbone-classifier</name>
- <import>default</import>
- </exp>
</classifiers>
- <code-point-aliases>
- <dscp>
- <name>ix</name>
- <bits>101001</bits>
- </dscp>
- <dscp>
- <name>dws</name>
- <bits>100000</bits>
- </dscp>
- <dscp-ipv6>
- <name>dws</name>
- <bits>100000</bits>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix</name>
- <bits>101001</bits>
- </dscp-ipv6>
- </code-point-aliases>
- <drop-profiles>
- <name>dws-drop-profile</name>
- <fill-level>
- <name>35</name>
- <drop-probability>10</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<drop-profiles>
<name>be-drop-profile</name>
<fill-level>
@@ -13182,59 +12835,44 @@
<drop-probability>100</drop-probability>
</fill-level>
</drop-profiles>
- <drop-profiles>
- <name>less-than-be-drop-profile</name>
- <fill-level>
- <name>25</name>
- <drop-probability>30</drop-probability>
- </fill-level>
- <fill-level>
- <name>30</name>
- <drop-probability>50</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>70</drop-probability>
- </fill-level>
- <fill-level>
- <name>50</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<forwarding-classes>
<class>
<name>be</name>
<queue-num>0</queue-num>
</class>
- <class>
- <name>be-ix</name>
- <queue-num>0</queue-num>
- </class>
<class>
<name>expedited-forwarding</name>
<queue-num>1</queue-num>
</class>
- <class>
- <name>less-than-best-effort</name>
- <queue-num>2</queue-num>
- </class>
<class>
<name>network-control</name>
<queue-num>3</queue-num>
</class>
- <class>
- <name>be-dws</name>
- <queue-num>0</queue-num>
- </class>
- <class>
- <name>be-bleach</name>
- <queue-num>0</queue-num>
- </class>
</forwarding-classes>
<interfaces>
+ <interface>
+ <name>et-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>ge-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>so-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>xe-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>ae*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
<interface>
<name>ae0</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -13252,17 +12890,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -13272,7 +12902,7 @@
</interface>
<interface>
<name>ae1</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -13290,17 +12920,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -13310,7 +12932,7 @@
</interface>
<interface>
<name>ae11</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>100</name>
<classifiers>
@@ -13341,7 +12963,7 @@
</interface>
<interface>
<name>ae12</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>100</name>
<classifiers>
@@ -13374,13 +12996,6 @@
<rewrite-rules>
<dscp>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -13395,17 +13010,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -13417,37 +13021,9 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -13462,17 +13038,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -13484,13 +13049,6 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
@@ -13498,35 +13056,19 @@
</exp>
</rewrite-rules>
<scheduler-maps>
- <name>MAP-BASIC-IQ2</name>
+ <name>GEANT-BASIC</name>
<forwarding-class>
<name>expedited-forwarding</name>
<scheduler>sch-expedited-forwarding</scheduler>
</forwarding-class>
<forwarding-class>
<name>network-control</name>
- <scheduler>sch-network-ctrl-iq2</scheduler>
+ <scheduler>sch-network-ctrl-geant</scheduler>
</forwarding-class>
<forwarding-class>
<name>be</name>
<scheduler>sch-be</scheduler>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <scheduler>sch-less-than-best-effort</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
</scheduler-maps>
<schedulers>
<name>sch-be</name>
@@ -13546,27 +13088,7 @@
<priority>strict-high</priority>
</schedulers>
<schedulers>
- <name>sch-less-than-best-effort</name>
- <transmit-rate>
- <percent>10</percent>
- </transmit-rate>
- <buffer-size>
- <percent>10</percent>
- </buffer-size>
- <priority>low</priority>
- <drop-profile-map>
- <loss-priority>low</loss-priority>
- <protocol>any</protocol>
- <drop-profile>less-than-be-drop-profile</drop-profile>
- </drop-profile-map>
- <drop-profile-map>
- <loss-priority>high</loss-priority>
- <protocol>any</protocol>
- <drop-profile>be-drop-profile</drop-profile>
- </drop-profile-map>
- </schedulers>
- <schedulers>
- <name>sch-network-ctrl</name>
+ <name>sch-network-ctrl-geant</name>
<transmit-rate>
<percent>5</percent>
</transmit-rate>
@@ -13575,15 +13097,6 @@
</buffer-size>
<priority>high</priority>
</schedulers>
- <schedulers>
- <name>sch-network-ctrl-iq2</name>
- <transmit-rate>
- <percent>5</percent>
- </transmit-rate>
- <buffer-size>
- <percent>5</percent>
- </buffer-size>
- </schedulers>
</class-of-service>
<firewall>
<family>
@@ -13651,6 +13164,9 @@
<source-prefix-list>
<name>dashboard-servers</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers</name>
+ </source-prefix-list>
<protocol>tcp</protocol>
<destination-port>ssh</destination-port>
</from>
@@ -17730,6 +17246,9 @@
<source-prefix-list>
<name>dashboard-servers-v6</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers-v6</name>
+ </source-prefix-list>
<next-header>tcp</next-header>
<port>ssh</port>
</from>
@@ -20020,7 +19539,7 @@
</policer>
</firewall>
<routing-instances>
- <instance>
+ <instance inactive="inactive">
<name>CLEAN_IAS</name>
<description>Clean IAS VRF traffic returned from scrubber</description>
<instance-type>vrf</instance-type>
diff --git a/test/data/mx1.buc.ro.geant.net-netconf.xml b/test/data/mx1.buc.ro.geant.net-netconf.xml
index 0f460360457c49d0f79e50be614845fd56f1fbb6..7f7914af0eee66c549d9e379a81235422c15e0e2 100644
--- a/test/data/mx1.buc.ro.geant.net-netconf.xml
+++ b/test/data/mx1.buc.ro.geant.net-netconf.xml
@@ -1,4 +1,4 @@
-<configuration changed-seconds="1545214010" changed-localtime="2018-12-19 10:06:50 UTC">
+<configuration changed-seconds="1549111161" changed-localtime="2019-02-02 12:39:21 UTC">
<version>15.1F6-S10.9</version>
<groups>
<name>re0</name>
@@ -251,6 +251,38 @@
<allow-commands>show .*</allow-commands>
<deny-commands>(ssh .*|telnet .*)</deny-commands>
</class>
+ <class>
+ <name>opennsa</name>
+ <idle-timeout>5</idle-timeout>
+ <permissions>configure</permissions>
+ <deny-commands>(file.*)|(load.*)|(op.*)|(request.*)|(save.*)|(start.*)|(test.*)|(set cli.*)|(set date.*)|(clear.*)|(help.*)|(telnet.*)|(ssh.*)|(traceroute.*)|(mtrace.*)|(monitor.*)|(ping.*)|(show.*)|(set.*)</deny-commands>
+ <allow-configuration-regexps>interfaces .*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections remote-interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols mpls label-switched-path.*</allow-configuration-regexps>
+ <deny-configuration-regexps>vmhost .*</deny-configuration-regexps>
+ <deny-configuration-regexps>session-limit-group .*</deny-configuration-regexps>
+ <deny-configuration-regexps>multi-chassis .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc-partition .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc .*</deny-configuration-regexps>
+ <deny-configuration-regexps>groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>dynamic-profiles .*</deny-configuration-regexps>
+ <deny-configuration-regexps>diameter .*</deny-configuration-regexps>
+ <deny-configuration-regexps>apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>access-profile .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces traceoptions .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-set .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-range .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups-except .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lt-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces ms-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces si-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces gr-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lo.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces dsc.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces irb.*</deny-configuration-regexps>
+ </class>
<class>
<name>readonly-permissions</name>
<idle-timeout>15</idle-timeout>
@@ -569,6 +601,22 @@
<encrypted-password>/* SECRET-DATA */</encrypted-password>
</authentication>
</user>
+ <user>
+ <name>opennsa</name>
+ <uid>2008</uid>
+ <class>opennsa</class>
+ <authentication>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ </authentication>
+ </user>
<user>
<name>opnet</name>
<full-name>OPNET NEOP Planning system @ 62.40.105.114</full-name>
@@ -2823,6 +2871,9 @@
<clients>
<name>83.97.93.196/32</name>
</clients>
+ <clients>
+ <name>83.97.93.238/32</name>
+ </clients>
</community>
<community>
<name>As4n0gN!</name>
@@ -3371,13 +3422,13 @@
<import-rib>IAS.inet6.0</import-rib>
<import-policy>rtbh-policy</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias</name>
<import-rib>IAS.inet.0</import-rib>
<import-rib>CLEAN_IAS.inet.0</import-rib>
<import-policy>ps-into-clean-ias-import</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias-v6</name>
<import-rib>IAS.inet6.0</import-rib>
<import-rib>CLEAN_IAS.inet6.0</import-rib>
@@ -6955,15 +7006,13 @@
</prefix-list>
<prefix-list>
<name>geantncc-address-space</name>
+ <comment>/* NCC DR VPN */</comment>
<prefix-list-item>
- <name>62.40.108.192/26</name>
+ <name>62.40.108.192/27</name>
</prefix-list-item>
<prefix-list-item>
<name>62.40.119.0/24</name>
</prefix-list-item>
- <prefix-list-item>
- <name>62.40.119.134/32</name>
- </prefix-list-item>
<prefix-list-item>
<name>62.40.125.250/32</name>
</prefix-list-item>
@@ -8138,6 +8187,14 @@
</prefix-list>
<prefix-list>
<name>corporate-address-space</name>
+ <comment>/* LON2 CORP VPN (MAC) */</comment>
+ <prefix-list-item>
+ <name>62.40.99.194/32</name>
+ </prefix-list-item>
+ <comment>/* LON2 CORP VPN */</comment>
+ <prefix-list-item>
+ <name>62.40.99.201/32</name>
+ </prefix-list-item>
<prefix-list-item>
<name>62.40.119.128/25</name>
</prefix-list-item>
@@ -8259,6 +8316,18 @@
<name>2001:798::/32</name>
</prefix-list-item>
</prefix-list>
+ <prefix-list>
+ <name>opennsa-servers</name>
+ <prefix-list-item>
+ <name>83.97.93.92/32</name>
+ </prefix-list-item>
+ </prefix-list>
+ <prefix-list>
+ <name>opennsa-servers-v6</name>
+ <prefix-list-item>
+ <name>2001:798:3::15f/128</name>
+ </prefix-list-item>
+ </prefix-list>
<policy-statement>
<name>ASM-Allow</name>
<term>
@@ -8681,6 +8750,10 @@
<address>185.1.68.0/24</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>193.188.137.0/24</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -8802,6 +8875,10 @@
<address>2001:7f8:a0::/64</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>2001:7f8:35::/64</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -10919,13 +10996,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -10941,14 +11011,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp>
<name>backbone-classifier</name>
@@ -10960,11 +11022,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -10972,13 +11029,7 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -10988,186 +11039,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>iperf-classifier</name>
- <import>default</import>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>af12</code-points>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>backbone-classifier</name>
@@ -11179,18 +11050,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -11198,13 +11057,7 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -11227,13 +11080,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -11249,187 +11095,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>iperf-classifier</name>
- <import>default</import>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>af12</code-points>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-access-classifier</name>
@@ -11438,16 +11103,16 @@
<name>be</name>
<loss-priority>
<name>low</name>
- <code-points>000</code-points>
- <code-points>001</code-points>
- <code-points>010</code-points>
- <code-points>011</code-points>
- <code-points>110</code-points>
- <code-points>111</code-points>
+ <code-points>100</code-points>
+ <code-points>101</code-points>
</loss-priority>
</forwarding-class>
+ </exp>
+ <exp>
+ <name>mpls-backbone-classifier</name>
+ <import>default</import>
<forwarding-class>
- <name>less-than-best-effort</name>
+ <name>be</name>
<loss-priority>
<name>low</name>
<code-points>100</code-points>
@@ -11455,40 +11120,7 @@
</loss-priority>
</forwarding-class>
</exp>
- <exp>
- <name>mpls-backbone-classifier</name>
- <import>default</import>
- </exp>
</classifiers>
- <code-point-aliases>
- <dscp>
- <name>ix</name>
- <bits>101001</bits>
- </dscp>
- <dscp>
- <name>dws</name>
- <bits>100000</bits>
- </dscp>
- <dscp-ipv6>
- <name>dws</name>
- <bits>100000</bits>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix</name>
- <bits>101001</bits>
- </dscp-ipv6>
- </code-point-aliases>
- <drop-profiles>
- <name>dws-drop-profile</name>
- <fill-level>
- <name>35</name>
- <drop-probability>10</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<drop-profiles>
<name>be-drop-profile</name>
<fill-level>
@@ -11508,59 +11140,40 @@
<drop-probability>100</drop-probability>
</fill-level>
</drop-profiles>
- <drop-profiles>
- <name>less-than-be-drop-profile</name>
- <fill-level>
- <name>25</name>
- <drop-probability>30</drop-probability>
- </fill-level>
- <fill-level>
- <name>30</name>
- <drop-probability>50</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>70</drop-probability>
- </fill-level>
- <fill-level>
- <name>50</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<forwarding-classes>
<class>
<name>be</name>
<queue-num>0</queue-num>
</class>
- <class>
- <name>be-ix</name>
- <queue-num>0</queue-num>
- </class>
<class>
<name>expedited-forwarding</name>
<queue-num>1</queue-num>
</class>
- <class>
- <name>less-than-best-effort</name>
- <queue-num>2</queue-num>
- </class>
<class>
<name>network-control</name>
<queue-num>3</queue-num>
</class>
- <class>
- <name>be-dws</name>
- <queue-num>0</queue-num>
- </class>
- <class>
- <name>be-bleach</name>
- <queue-num>0</queue-num>
- </class>
</forwarding-classes>
<interfaces>
+ <interface>
+ <name>et-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>ge-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>so-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>xe-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
<interface>
<name>ge-0/2/0</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>10</name>
<classifiers>
@@ -11625,26 +11238,14 @@
</dscp>
</rewrite-rules>
</unit>
- <unit>
- <name>71</name>
- <classifiers>
- <dscp>
- <name>iperf-classifier</name>
- </dscp>
- <dscp-ipv6>
- <name>iperf-classifier</name>
- </dscp-ipv6>
- </classifiers>
- <rewrite-rules>
- <dscp>
- <name>basic-rewrite-rules</name>
- </dscp>
- </rewrite-rules>
- </unit>
+ </interface>
+ <interface>
+ <name>ae*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
</interface>
<interface>
<name>ae4</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -11662,17 +11263,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -11682,7 +11275,7 @@
</interface>
<interface>
<name>ae8</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -11700,17 +11293,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -11720,7 +11305,7 @@
</interface>
<interface>
<name>ae11</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -11753,13 +11338,6 @@
<rewrite-rules>
<dscp>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -11774,17 +11352,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -11796,97 +11363,9 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -11901,17 +11380,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -11923,73 +11391,6 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
@@ -11997,35 +11398,19 @@
</exp>
</rewrite-rules>
<scheduler-maps>
- <name>MAP-BASIC-IQ2</name>
+ <name>GEANT-BASIC</name>
<forwarding-class>
<name>expedited-forwarding</name>
<scheduler>sch-expedited-forwarding</scheduler>
</forwarding-class>
<forwarding-class>
<name>network-control</name>
- <scheduler>sch-network-ctrl-iq2</scheduler>
+ <scheduler>sch-network-ctrl-geant</scheduler>
</forwarding-class>
<forwarding-class>
<name>be</name>
<scheduler>sch-be</scheduler>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <scheduler>sch-less-than-best-effort</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
</scheduler-maps>
<schedulers>
<name>sch-be</name>
@@ -12045,27 +11430,7 @@
<priority>strict-high</priority>
</schedulers>
<schedulers>
- <name>sch-less-than-best-effort</name>
- <transmit-rate>
- <percent>10</percent>
- </transmit-rate>
- <buffer-size>
- <percent>10</percent>
- </buffer-size>
- <priority>low</priority>
- <drop-profile-map>
- <loss-priority>low</loss-priority>
- <protocol>any</protocol>
- <drop-profile>less-than-be-drop-profile</drop-profile>
- </drop-profile-map>
- <drop-profile-map>
- <loss-priority>high</loss-priority>
- <protocol>any</protocol>
- <drop-profile>be-drop-profile</drop-profile>
- </drop-profile-map>
- </schedulers>
- <schedulers>
- <name>sch-network-ctrl</name>
+ <name>sch-network-ctrl-geant</name>
<transmit-rate>
<percent>5</percent>
</transmit-rate>
@@ -12074,15 +11439,6 @@
</buffer-size>
<priority>high</priority>
</schedulers>
- <schedulers>
- <name>sch-network-ctrl-iq2</name>
- <transmit-rate>
- <percent>5</percent>
- </transmit-rate>
- <buffer-size>
- <percent>5</percent>
- </buffer-size>
- </schedulers>
</class-of-service>
<firewall>
<family>
@@ -14467,6 +13823,9 @@
<source-prefix-list>
<name>dashboard-servers</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers</name>
+ </source-prefix-list>
<protocol>tcp</protocol>
<destination-port>ssh</destination-port>
</from>
@@ -17003,6 +16362,9 @@
<source-prefix-list>
<name>dashboard-servers-v6</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers-v6</name>
+ </source-prefix-list>
<next-header>tcp</next-header>
<port>ssh</port>
</from>
@@ -17958,7 +17320,7 @@
</policer>
</firewall>
<routing-instances>
- <instance>
+ <instance inactive="inactive">
<name>CLEAN_IAS</name>
<description>Clean IAS VRF traffic returned from scrubber</description>
<instance-type>vrf</instance-type>
diff --git a/test/data/mx1.bud.hu.geant.net-netconf.xml b/test/data/mx1.bud.hu.geant.net-netconf.xml
index ef1b9b472659e011582d6e62dbfdca2dc539d08c..47a4c17cf2830ad1ddafeb871e18f498f783ac1d 100644
--- a/test/data/mx1.bud.hu.geant.net-netconf.xml
+++ b/test/data/mx1.bud.hu.geant.net-netconf.xml
@@ -1,4 +1,4 @@
-<configuration changed-seconds="1545215557" changed-localtime="2018-12-19 10:32:37 UTC">
+<configuration changed-seconds="1549111169" changed-localtime="2019-02-02 12:39:29 UTC">
<version>15.1F6-S10.9</version>
<groups>
<name>re0</name>
@@ -251,6 +251,38 @@
<allow-commands>show .*</allow-commands>
<deny-commands>(ssh .*|telnet .*)</deny-commands>
</class>
+ <class>
+ <name>opennsa</name>
+ <idle-timeout>5</idle-timeout>
+ <permissions>configure</permissions>
+ <deny-commands>(file.*)|(load.*)|(op.*)|(request.*)|(save.*)|(start.*)|(test.*)|(set cli.*)|(set date.*)|(clear.*)|(help.*)|(telnet.*)|(ssh.*)|(traceroute.*)|(mtrace.*)|(monitor.*)|(ping.*)|(show.*)|(set.*)</deny-commands>
+ <allow-configuration-regexps>interfaces .*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections remote-interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols mpls label-switched-path.*</allow-configuration-regexps>
+ <deny-configuration-regexps>vmhost .*</deny-configuration-regexps>
+ <deny-configuration-regexps>session-limit-group .*</deny-configuration-regexps>
+ <deny-configuration-regexps>multi-chassis .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc-partition .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc .*</deny-configuration-regexps>
+ <deny-configuration-regexps>groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>dynamic-profiles .*</deny-configuration-regexps>
+ <deny-configuration-regexps>diameter .*</deny-configuration-regexps>
+ <deny-configuration-regexps>apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>access-profile .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces traceoptions .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-set .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-range .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups-except .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lt-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces ms-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces si-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces gr-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lo.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces dsc.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces irb.*</deny-configuration-regexps>
+ </class>
<class>
<name>readonly-permissions</name>
<idle-timeout>15</idle-timeout>
@@ -562,6 +594,22 @@
<encrypted-password>/* SECRET-DATA */</encrypted-password>
</authentication>
</user>
+ <user>
+ <name>opennsa</name>
+ <uid>2011</uid>
+ <class>opennsa</class>
+ <authentication>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ </authentication>
+ </user>
<user>
<name>opnet</name>
<full-name>OPNET NEOP Planning system @ 62.40.105.114</full-name>
@@ -2328,8 +2376,7 @@
</interface>
<interface>
<name>xe-4/2/1</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
- <disable/>
+ <description>PHY RESERVED | For Cogent</description>
</interface>
<interface>
<name>xe-4/2/2</name>
@@ -2501,7 +2548,7 @@
</interface>
<interface>
<name>xe-5/1/0</name>
- <description>PHY SPARE |Reserved for BIX</description>
+ <description>PHY PUBLIC BIX P_AE18 SRF9946211 | GEANT 10G #1 - VH-NX7710-1 Eth2/14</description>
<framing>
<lan-phy/>
</framing>
@@ -3894,7 +3941,7 @@
</interface>
<interface>
<name>ae18</name>
- <description>LAG PUBLIC BIX SRF0000001 | Under Testing</description>
+ <description>LAG PUBLIC BIX SRF9946209</description>
<vlan-tagging/>
<mtu>1518</mtu>
<mac>a8:d0:e5:f7:23:62</mac>
@@ -3910,10 +3957,10 @@
<inet>
<filter>
<input>
- <filter-name>BIX-in</filter-name>
+ <filter-name>BIX.HU-in</filter-name>
</input>
<output>
- <filter-name>BIX-out</filter-name>
+ <filter-name>BIX.HU-out</filter-name>
</output>
</filter>
<address>
@@ -3933,10 +3980,10 @@
<mtu>1500</mtu>
<filter>
<input>
- <filter-name>BIX-v6-in</filter-name>
+ <filter-name>BIX.HU-V6-in</filter-name>
</input>
<output>
- <filter-name>BIX-v6-out</filter-name>
+ <filter-name>BIX.HU-V6-out</filter-name>
</output>
</filter>
<address>
@@ -4219,6 +4266,9 @@
<clients>
<name>83.97.93.196/32</name>
</clients>
+ <clients>
+ <name>83.97.93.238/32</name>
+ </clients>
</community>
<community>
<name>As4n0gN!</name>
@@ -4738,13 +4788,13 @@
<import-rib>IAS.inet6.0</import-rib>
<import-policy>rtbh-policy</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias</name>
<import-rib>IAS.inet.0</import-rib>
<import-rib>CLEAN_IAS.inet.0</import-rib>
<import-policy>ps-into-clean-ias-import</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias-v6</name>
<import-rib>IAS.inet6.0</import-rib>
<import-rib>CLEAN_IAS.inet6.0</import-rib>
@@ -6344,6 +6394,9 @@
<interface>
<name>xe-5/2/7</name>
</interface>
+ <interface>
+ <name>xe-4/2/3</name>
+ </interface>
<interface>
<name>et-11/0/0</name>
</interface>
@@ -6371,9 +6424,6 @@
<interface>
<name>ge-0/3/6</name>
</interface>
- <interface>
- <name>xe-4/2/3</name>
- </interface>
</lldp>
</protocols>
<policy-options>
@@ -6452,16 +6502,13 @@
</prefix-list>
<prefix-list>
<name>geantncc-address-space</name>
- <comment>/* NCC DR VPN LAN */</comment>
+ <comment>/* NCC DR VPN */</comment>
<prefix-list-item>
- <name>62.40.108.192/26</name>
+ <name>62.40.108.192/27</name>
</prefix-list-item>
<prefix-list-item>
<name>62.40.119.0/24</name>
</prefix-list-item>
- <prefix-list-item>
- <name>62.40.119.134/32</name>
- </prefix-list-item>
<prefix-list-item>
<name>62.40.125.250/32</name>
</prefix-list-item>
@@ -10385,6 +10432,9 @@
<prefix-list-item>
<name>176.103.224.0/20</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>176.111.168.0/22</name>
+ </prefix-list-item>
<prefix-list-item>
<name>178.172.212.0/24</name>
</prefix-list-item>
@@ -10859,6 +10909,21 @@
<prefix-list-item>
<name>193.84.116.0/23</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>193.84.124.0/22</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>193.84.124.0/24</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>193.84.125.0/24</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>193.84.126.0/24</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>193.84.127.0/24</name>
+ </prefix-list-item>
<prefix-list-item>
<name>193.84.160.0/20</name>
</prefix-list-item>
@@ -11948,6 +12013,9 @@
<prefix-list-item>
<name>2001:678:618::/48</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>2001:678:8d4::/48</name>
+ </prefix-list-item>
<prefix-list-item>
<name>2001:67c:64::/48</name>
</prefix-list-item>
@@ -12248,6 +12316,9 @@
<prefix-list-item>
<name>2a00:fc00:e009::/48</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>2a01:190:15ed::/48</name>
+ </prefix-list-item>
<prefix-list-item>
<name>2a01:1d8::/30</name>
</prefix-list-item>
@@ -12410,6 +12481,15 @@
<prefix-list-item>
<name>2a07:8d87::/32</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>2a07:dd40::/29</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>2a09:c400::/30</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>2a09:c404::/30</name>
+ </prefix-list-item>
<prefix-list-item>
<name>2a0a:8bc0::/29</name>
</prefix-list-item>
@@ -15939,6 +16019,14 @@
</prefix-list>
<prefix-list>
<name>corporate-address-space</name>
+ <comment>/* LON2 CORP VPN (MAC) */</comment>
+ <prefix-list-item>
+ <name>62.40.99.194/32</name>
+ </prefix-list-item>
+ <comment>/* LON2 CORP VPN */</comment>
+ <prefix-list-item>
+ <name>62.40.99.201/32</name>
+ </prefix-list-item>
<prefix-list-item>
<name>62.40.119.128/25</name>
</prefix-list-item>
@@ -16006,6 +16094,18 @@
<name>2001:798::/32</name>
</prefix-list-item>
</prefix-list>
+ <prefix-list>
+ <name>opennsa-servers</name>
+ <prefix-list-item>
+ <name>83.97.93.92/32</name>
+ </prefix-list-item>
+ </prefix-list>
+ <prefix-list>
+ <name>opennsa-servers-v6</name>
+ <prefix-list-item>
+ <name>2001:798:3::15f/128</name>
+ </prefix-list-item>
+ </prefix-list>
<policy-statement>
<name>ASM-Allow</name>
<term>
@@ -16627,6 +16727,10 @@
<address>185.1.68.0/24</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>193.188.137.0/24</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -16748,6 +16852,10 @@
<address>2001:7f8:a0::/64</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>2001:7f8:35::/64</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -22237,13 +22345,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -22259,14 +22360,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp>
<name>backbone-classifier</name>
@@ -22278,18 +22371,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -22297,342 +22378,17 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>iperf-classifier</name>
- <import>default</import>
<forwarding-class>
<name>expedited-forwarding</name>
<loss-priority>
<name>low</name>
- <code-points>af12</code-points>
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
- <dscp>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp-ipv6>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
<dscp-ipv6>
<name>backbone-classifier</name>
<import>default</import>
@@ -22643,18 +22399,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -22662,13 +22406,7 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -22691,13 +22429,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -22713,41 +22444,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>iperf-classifier</name>
- <import>default</import>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>af12</code-points>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-access-classifier</name>
@@ -22756,16 +22452,16 @@
<name>be</name>
<loss-priority>
<name>low</name>
- <code-points>000</code-points>
- <code-points>001</code-points>
- <code-points>010</code-points>
- <code-points>011</code-points>
- <code-points>110</code-points>
- <code-points>111</code-points>
+ <code-points>100</code-points>
+ <code-points>101</code-points>
</loss-priority>
</forwarding-class>
+ </exp>
+ <exp>
+ <name>mpls-backbone-classifier</name>
+ <import>default</import>
<forwarding-class>
- <name>less-than-best-effort</name>
+ <name>be</name>
<loss-priority>
<name>low</name>
<code-points>100</code-points>
@@ -22773,40 +22469,7 @@
</loss-priority>
</forwarding-class>
</exp>
- <exp>
- <name>mpls-backbone-classifier</name>
- <import>default</import>
- </exp>
</classifiers>
- <code-point-aliases>
- <dscp>
- <name>ix</name>
- <bits>101001</bits>
- </dscp>
- <dscp>
- <name>dws</name>
- <bits>100000</bits>
- </dscp>
- <dscp-ipv6>
- <name>dws</name>
- <bits>100000</bits>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix</name>
- <bits>101001</bits>
- </dscp-ipv6>
- </code-point-aliases>
- <drop-profiles>
- <name>dws-drop-profile</name>
- <fill-level>
- <name>35</name>
- <drop-probability>10</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<drop-profiles>
<name>be-drop-profile</name>
<fill-level>
@@ -22826,17 +22489,6 @@
<drop-probability>100</drop-probability>
</fill-level>
</drop-profiles>
- <drop-profiles>
- <name>less-than-be-drop-profile</name>
- <interpolate>
- <fill-level>15</fill-level>
- <fill-level>40</fill-level>
- <fill-level>60</fill-level>
- <drop-probability>0</drop-probability>
- <drop-probability>50</drop-probability>
- <drop-probability>100</drop-probability>
- </interpolate>
- </drop-profiles>
<drop-profiles>
<name>less-than-be-1g-drop-profile</name>
<interpolate>
@@ -22864,58 +22516,39 @@
<name>be</name>
<queue-num>0</queue-num>
</class>
- <class>
- <name>be-ix</name>
- <queue-num>0</queue-num>
- </class>
<class>
<name>expedited-forwarding</name>
<queue-num>1</queue-num>
</class>
- <class>
- <name>less-than-best-effort</name>
- <queue-num>2</queue-num>
- </class>
<class>
<name>network-control</name>
<queue-num>3</queue-num>
</class>
- <class>
- <name>be-dws</name>
- <queue-num>0</queue-num>
- </class>
- <class>
- <name>be-bleach</name>
- <queue-num>0</queue-num>
- </class>
</forwarding-classes>
<interfaces>
- <interface inactive="inactive">
- <name>xe-5/1/6</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
- <unit>
- <name>0</name>
- <classifiers>
- <dscp>
- <name>dws-access-classifier</name>
- </dscp>
- <dscp-ipv6>
- <name>dws-access-classifier</name>
- </dscp-ipv6>
- </classifiers>
- <rewrite-rules>
- <dscp>
- <name>basic-rewrite-rules</name>
- </dscp>
- <dscp-ipv6>
- <name>basic-rewrite-rules</name>
- </dscp-ipv6>
- </rewrite-rules>
- </unit>
+ <interface>
+ <name>et-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>ge-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>so-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>xe-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>ae*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
</interface>
<interface>
<name>ae0</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -22933,17 +22566,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -22953,7 +22578,7 @@
</interface>
<interface>
<name>ae1</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -22971,17 +22596,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -22991,7 +22608,7 @@
</interface>
<interface>
<name>ae2</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -23009,17 +22626,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -23029,7 +22638,7 @@
</interface>
<interface>
<name>ae3</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -23047,17 +22656,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -23067,7 +22668,7 @@
</interface>
<interface>
<name>ae4</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -23085,17 +22686,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -23103,9 +22696,9 @@
</rewrite-rules>
</unit>
</interface>
- <interface inactive="inactive">
+ <interface>
<name>ae6</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -23123,17 +22716,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -23143,7 +22728,7 @@
</interface>
<interface>
<name>ae7</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -23161,17 +22746,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -23181,7 +22758,7 @@
</interface>
<interface>
<name>ae10</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>100</name>
<classifiers>
@@ -23212,7 +22789,7 @@
</interface>
<interface>
<name>ae11</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>100</name>
<classifiers>
@@ -23243,6 +22820,7 @@
</interface>
<interface>
<name>ae12</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>200</name>
<classifiers>
@@ -23257,12 +22835,34 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
+ <dscp-ipv6>
+ <name>basic-rewrite-rules</name>
+ </dscp-ipv6>
+ </rewrite-rules>
+ </unit>
+ <unit>
+ <name>210</name>
+ <classifiers>
+ <dscp>
+ <name>access-classifier</name>
+ </dscp>
+ <dscp-ipv6>
+ <name>access-classifier</name>
+ </dscp-ipv6>
+ </classifiers>
+ <rewrite-rules>
+ <dscp>
+ <name>basic-rewrite-rules</name>
+ </dscp>
+ <dscp-ipv6>
+ <name>basic-rewrite-rules</name>
+ </dscp-ipv6>
</rewrite-rules>
</unit>
</interface>
<interface>
<name>ae13</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>333</name>
<classifiers>
@@ -23293,7 +22893,7 @@
</interface>
<interface>
<name>ae15</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>100</name>
<classifiers>
@@ -23329,7 +22929,7 @@
</interface>
<interface>
<name>ae16</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>1</name>
<classifiers>
@@ -23362,13 +22962,6 @@
<rewrite-rules>
<dscp>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -23383,17 +22976,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -23405,97 +22987,9 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -23510,17 +23004,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -23532,73 +23015,6 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
@@ -23606,35 +23022,19 @@
</exp>
</rewrite-rules>
<scheduler-maps>
- <name>MAP-BASIC-IQ2</name>
+ <name>GEANT-BASIC</name>
<forwarding-class>
<name>expedited-forwarding</name>
<scheduler>sch-expedited-forwarding</scheduler>
</forwarding-class>
<forwarding-class>
<name>network-control</name>
- <scheduler>sch-network-ctrl-iq2</scheduler>
+ <scheduler>sch-network-ctrl-geant</scheduler>
</forwarding-class>
<forwarding-class>
<name>be</name>
<scheduler>sch-be</scheduler>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <scheduler>sch-less-than-best-effort</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
</scheduler-maps>
<schedulers>
<name>sch-be</name>
@@ -23654,27 +23054,7 @@
<priority>strict-high</priority>
</schedulers>
<schedulers>
- <name>sch-less-than-best-effort</name>
- <transmit-rate>
- <percent>10</percent>
- </transmit-rate>
- <buffer-size>
- <percent>10</percent>
- </buffer-size>
- <priority>low</priority>
- <drop-profile-map>
- <loss-priority>low</loss-priority>
- <protocol>any</protocol>
- <drop-profile>less-than-be-1g-drop-profile</drop-profile>
- </drop-profile-map>
- <drop-profile-map>
- <loss-priority>high</loss-priority>
- <protocol>any</protocol>
- <drop-profile>be-1g-drop-profile</drop-profile>
- </drop-profile-map>
- </schedulers>
- <schedulers>
- <name>sch-network-ctrl</name>
+ <name>sch-network-ctrl-geant</name>
<transmit-rate>
<percent>5</percent>
</transmit-rate>
@@ -23683,15 +23063,6 @@
</buffer-size>
<priority>high</priority>
</schedulers>
- <schedulers>
- <name>sch-network-ctrl-iq2</name>
- <transmit-rate>
- <percent>5</percent>
- </transmit-rate>
- <buffer-size>
- <percent>5</percent>
- </buffer-size>
- </schedulers>
</class-of-service>
<firewall>
<family>
@@ -31115,6 +30486,9 @@
<source-prefix-list>
<name>dashboard-servers</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers</name>
+ </source-prefix-list>
<protocol>tcp</protocol>
<destination-port>ssh</destination-port>
</from>
@@ -32495,7 +31869,7 @@
</term>
</filter>
<filter>
- <name>BIX-out</name>
+ <name>BIX.HU-out</name>
<term>
<name>DWS-out</name>
<from>
@@ -32562,7 +31936,7 @@
</term>
</filter>
<filter>
- <name>BIX-in</name>
+ <name>BIX.HU-in</name>
<interface-specific/>
<term>
<name>sample</name>
@@ -36416,6 +35790,9 @@
<source-prefix-list>
<name>dashboard-servers-v6</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers-v6</name>
+ </source-prefix-list>
<next-header>tcp</next-header>
<port>ssh</port>
</from>
@@ -37786,7 +37163,7 @@
</term>
</filter>
<filter>
- <name>BIX-v6-out</name>
+ <name>BIX.HU-V6-out</name>
<term>
<name>count-ipv6</name>
<then>
@@ -37796,7 +37173,7 @@
</term>
</filter>
<filter>
- <name>BIX-v6-in</name>
+ <name>BIX.HU-V6-in</name>
<term>
<name>sample</name>
<then>
@@ -38196,7 +37573,7 @@
</policer>
</firewall>
<routing-instances>
- <instance>
+ <instance inactive="inactive">
<name>CLEAN_IAS</name>
<description>Clean IAS VRF traffic returned from scrubber</description>
<instance-type>vrf</instance-type>
@@ -38373,6 +37750,12 @@
<interface>
<name>ae17.0</name>
</interface>
+ <interface>
+ <name>ae18.10</name>
+ </interface>
+ <interface>
+ <name>ae18.11</name>
+ </interface>
<route-distinguisher>
<rd-type>20965:333</rd-type>
</route-distinguisher>
@@ -39001,6 +38384,149 @@
</local-as>
</neighbor>
</group>
+ <group>
+ <name>GEANT-IX-BIX.HU</name>
+ <type>external</type>
+ <description>BIX.HU - Public IPv4 Peering Group</description>
+ <out-delay>10</out-delay>
+ <import>ps-deny-all</import>
+ <family>
+ <inet>
+ <unicast>
+ <prefix-limit>
+ <maximum>150000</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
+ </prefix-limit>
+ </unicast>
+ <any>
+ </any>
+ </inet>
+ </family>
+ <export>ps-deny-all</export>
+ <neighbor>
+ <name>193.188.137.1</name>
+ <description>BIX.HU Route Server AS5507</description>
+ <import>ps-deny-all</import>
+ <family>
+ <inet>
+ <any>
+ <prefix-limit>
+ <maximum>125000</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
+ </prefix-limit>
+ </any>
+ </inet>
+ </family>
+ <export>ps-deny-all</export>
+ <peer-as>5507</peer-as>
+ <local-as>
+ <as-number>21320</as-number>
+ <private/>
+ <no-prepend-global-as/>
+ </local-as>
+ </neighbor>
+ <neighbor>
+ <name>193.188.137.2</name>
+ <description>BIX.HU Route Server AS5507</description>
+ <import>ps-deny-all</import>
+ <family>
+ <inet>
+ <any>
+ <prefix-limit>
+ <maximum>125000</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
+ </prefix-limit>
+ </any>
+ </inet>
+ </family>
+ <export>ps-deny-all</export>
+ <peer-as>5507</peer-as>
+ <local-as>
+ <as-number>21320</as-number>
+ <private/>
+ <no-prepend-global-as/>
+ </local-as>
+ </neighbor>
+ </group>
+ <group>
+ <name>GEANT-IXv6-BIX.HU</name>
+ <type>external</type>
+ <description>BIX.HU - Public IPv6 Peering Group</description>
+ <import>ps-deny-all</import>
+ <family>
+ <inet6>
+ <unicast>
+ <prefix-limit>
+ <maximum>150000</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
+ </prefix-limit>
+ </unicast>
+ </inet6>
+ </family>
+ <export>ps-deny-all</export>
+ <neighbor>
+ <name>2001:7f8:35::5507:1</name>
+ <description>BIX.HU Route Server AS5507</description>
+ <import>ps-deny-all</import>
+ <family>
+ <inet6>
+ <any>
+ <prefix-limit>
+ <maximum>125000</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
+ </prefix-limit>
+ </any>
+ </inet6>
+ </family>
+ <export>ps-deny-all</export>
+ <peer-as>5507</peer-as>
+ <local-as>
+ <as-number>21320</as-number>
+ <private/>
+ <no-prepend-global-as/>
+ </local-as>
+ </neighbor>
+ <neighbor>
+ <name>2001:7f8:35::5507:2</name>
+ <description>BIX.HU Route Server AS5507</description>
+ <import>ps-deny-all</import>
+ <family>
+ <inet6>
+ <any>
+ <prefix-limit>
+ <maximum>125000</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
+ </prefix-limit>
+ </any>
+ </inet6>
+ </family>
+ <export>ps-deny-all</export>
+ <peer-as>5507</peer-as>
+ <local-as>
+ <as-number>21320</as-number>
+ <private/>
+ <no-prepend-global-as/>
+ </local-as>
+ </neighbor>
+ </group>
</bgp>
</protocols>
</instance>
@@ -39152,6 +38678,9 @@
<maximum>1000</maximum>
<teardown>
<limit-threshold>90</limit-threshold>
+ <idle-timeout>
+ <timeout>15</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</labeled-unicast>
@@ -39171,6 +38700,9 @@
<maximum>1000</maximum>
<teardown>
<limit-threshold>90</limit-threshold>
+ <idle-timeout>
+ <timeout>15</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</labeled-unicast>
diff --git a/test/data/mx1.dub.ie.geant.net-netconf.xml b/test/data/mx1.dub.ie.geant.net-netconf.xml
index 26b39ae3775329426a4bf754c9a83e0cb2c6f18b..7ee530ac55d581b8111612f3e65410420f653a23 100644
--- a/test/data/mx1.dub.ie.geant.net-netconf.xml
+++ b/test/data/mx1.dub.ie.geant.net-netconf.xml
@@ -1,4 +1,4 @@
-<configuration changed-seconds="1545214012" changed-localtime="2018-12-19 10:06:52 UTC">
+<configuration changed-seconds="1549111184" changed-localtime="2019-02-02 12:39:44 UTC">
<version>15.1F6-S10.9</version>
<groups>
<name>re0</name>
@@ -250,6 +250,38 @@
<allow-commands>show .*</allow-commands>
<deny-commands>(ssh .*|telnet .*)</deny-commands>
</class>
+ <class>
+ <name>opennsa</name>
+ <idle-timeout>5</idle-timeout>
+ <permissions>configure</permissions>
+ <deny-commands>(file.*)|(load.*)|(op.*)|(request.*)|(save.*)|(start.*)|(test.*)|(set cli.*)|(set date.*)|(clear.*)|(help.*)|(telnet.*)|(ssh.*)|(traceroute.*)|(mtrace.*)|(monitor.*)|(ping.*)|(show.*)|(set.*)</deny-commands>
+ <allow-configuration-regexps>interfaces .*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections remote-interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols mpls label-switched-path.*</allow-configuration-regexps>
+ <deny-configuration-regexps>vmhost .*</deny-configuration-regexps>
+ <deny-configuration-regexps>session-limit-group .*</deny-configuration-regexps>
+ <deny-configuration-regexps>multi-chassis .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc-partition .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc .*</deny-configuration-regexps>
+ <deny-configuration-regexps>groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>dynamic-profiles .*</deny-configuration-regexps>
+ <deny-configuration-regexps>diameter .*</deny-configuration-regexps>
+ <deny-configuration-regexps>apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>access-profile .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces traceoptions .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-set .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-range .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups-except .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lt-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces ms-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces si-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces gr-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lo.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces dsc.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces irb.*</deny-configuration-regexps>
+ </class>
<class>
<name>readonly-permissions</name>
<idle-timeout>15</idle-timeout>
@@ -552,6 +584,22 @@
<encrypted-password>/* SECRET-DATA */</encrypted-password>
</authentication>
</user>
+ <user>
+ <name>opennsa</name>
+ <uid>2007</uid>
+ <class>opennsa</class>
+ <authentication>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ </authentication>
+ </user>
<user>
<name>opnet</name>
<full-name>OPNET NEOP Planning system @ 62.40.105.114</full-name>
@@ -2653,6 +2701,9 @@
<clients>
<name>83.97.93.122/32</name>
</clients>
+ <clients>
+ <name>83.97.93.238/32</name>
+ </clients>
</community>
<community>
<name>As4n0gN!</name>
@@ -3114,13 +3165,13 @@
<import-rib>IAS.inet6.0</import-rib>
<import-policy>rtbh-policy</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias</name>
<import-rib>IAS.inet.0</import-rib>
<import-rib>CLEAN_IAS.inet.0</import-rib>
<import-policy>ps-into-clean-ias-import</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias-v6</name>
<import-rib>IAS.inet6.0</import-rib>
<import-rib>CLEAN_IAS.inet6.0</import-rib>
@@ -6814,15 +6865,13 @@
</prefix-list>
<prefix-list>
<name>geantncc-address-space</name>
+ <comment>/* NCC DR VPN */</comment>
<prefix-list-item>
- <name>62.40.108.192/26</name>
+ <name>62.40.108.192/27</name>
</prefix-list-item>
<prefix-list-item>
<name>62.40.119.0/24</name>
</prefix-list-item>
- <prefix-list-item>
- <name>62.40.119.134/32</name>
- </prefix-list-item>
<prefix-list-item>
<name>62.40.125.250/32</name>
</prefix-list-item>
@@ -7640,6 +7689,14 @@
</prefix-list>
<prefix-list>
<name>corporate-address-space</name>
+ <comment>/* LON2 CORP VPN (MAC) */</comment>
+ <prefix-list-item>
+ <name>62.40.99.194/32</name>
+ </prefix-list-item>
+ <comment>/* LON2 CORP VPN */</comment>
+ <prefix-list-item>
+ <name>62.40.99.201/32</name>
+ </prefix-list-item>
<prefix-list-item>
<name>62.40.119.128/25</name>
</prefix-list-item>
@@ -7830,6 +7887,18 @@
<name>2001:798::/32</name>
</prefix-list-item>
</prefix-list>
+ <prefix-list>
+ <name>opennsa-servers</name>
+ <prefix-list-item>
+ <name>83.97.93.92/32</name>
+ </prefix-list-item>
+ </prefix-list>
+ <prefix-list>
+ <name>opennsa-servers-v6</name>
+ <prefix-list-item>
+ <name>2001:798:3::15f/128</name>
+ </prefix-list-item>
+ </prefix-list>
<policy-statement>
<name>ASM-Allow</name>
<term>
@@ -10266,6 +10335,10 @@
<address>185.1.68.0/24</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>193.188.137.0/24</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -10387,6 +10460,10 @@
<address>2001:7f8:a0::/64</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>2001:7f8:35::/64</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -14099,13 +14176,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -14121,14 +14191,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp>
<name>backbone-classifier</name>
@@ -14140,18 +14202,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -14159,195 +14209,16 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>iperf-classifier</name>
- <import>default</import>
<forwarding-class>
<name>expedited-forwarding</name>
<loss-priority>
<name>low</name>
- <code-points>af12</code-points>
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>backbone-classifier</name>
@@ -14359,18 +14230,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -14378,13 +14237,7 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -14407,13 +14260,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -14429,187 +14275,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>iperf-classifier</name>
- <import>default</import>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>af12</code-points>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-access-classifier</name>
@@ -14618,16 +14283,16 @@
<name>be</name>
<loss-priority>
<name>low</name>
- <code-points>000</code-points>
- <code-points>001</code-points>
- <code-points>010</code-points>
- <code-points>011</code-points>
- <code-points>110</code-points>
- <code-points>111</code-points>
+ <code-points>100</code-points>
+ <code-points>101</code-points>
</loss-priority>
</forwarding-class>
+ </exp>
+ <exp>
+ <name>mpls-backbone-classifier</name>
+ <import>default</import>
<forwarding-class>
- <name>less-than-best-effort</name>
+ <name>be</name>
<loss-priority>
<name>low</name>
<code-points>100</code-points>
@@ -14635,40 +14300,7 @@
</loss-priority>
</forwarding-class>
</exp>
- <exp>
- <name>mpls-backbone-classifier</name>
- <import>default</import>
- </exp>
</classifiers>
- <code-point-aliases>
- <dscp>
- <name>ix</name>
- <bits>101001</bits>
- </dscp>
- <dscp>
- <name>dws</name>
- <bits>100000</bits>
- </dscp>
- <dscp-ipv6>
- <name>dws</name>
- <bits>100000</bits>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix</name>
- <bits>101001</bits>
- </dscp-ipv6>
- </code-point-aliases>
- <drop-profiles>
- <name>dws-drop-profile</name>
- <fill-level>
- <name>35</name>
- <drop-probability>10</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<drop-profiles>
<name>be-drop-profile</name>
<fill-level>
@@ -14688,59 +14320,44 @@
<drop-probability>100</drop-probability>
</fill-level>
</drop-profiles>
- <drop-profiles>
- <name>less-than-be-drop-profile</name>
- <fill-level>
- <name>25</name>
- <drop-probability>30</drop-probability>
- </fill-level>
- <fill-level>
- <name>30</name>
- <drop-probability>50</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>70</drop-probability>
- </fill-level>
- <fill-level>
- <name>50</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<forwarding-classes>
<class>
<name>be</name>
<queue-num>0</queue-num>
</class>
- <class>
- <name>be-ix</name>
- <queue-num>0</queue-num>
- </class>
<class>
<name>expedited-forwarding</name>
<queue-num>1</queue-num>
</class>
- <class>
- <name>less-than-best-effort</name>
- <queue-num>2</queue-num>
- </class>
<class>
<name>network-control</name>
<queue-num>3</queue-num>
</class>
- <class>
- <name>be-dws</name>
- <queue-num>0</queue-num>
- </class>
- <class>
- <name>be-bleach</name>
- <queue-num>0</queue-num>
- </class>
</forwarding-classes>
<interfaces>
+ <interface>
+ <name>et-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>ge-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>so-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>xe-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>ae*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
<interface>
<name>ae1</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -14758,17 +14375,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -14778,7 +14387,7 @@
</interface>
<interface>
<name>ae2</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -14796,17 +14405,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -14816,7 +14417,7 @@
</interface>
<interface>
<name>ae10</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>12</name>
<classifiers>
@@ -14838,73 +14439,6 @@
<rewrite-rules>
<dscp>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -14919,17 +14453,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -14941,97 +14464,9 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -15046,17 +14481,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -15068,13 +14492,6 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
@@ -15082,35 +14499,19 @@
</exp>
</rewrite-rules>
<scheduler-maps>
- <name>MAP-BASIC-IQ2</name>
+ <name>GEANT-BASIC</name>
<forwarding-class>
<name>expedited-forwarding</name>
<scheduler>sch-expedited-forwarding</scheduler>
</forwarding-class>
<forwarding-class>
<name>network-control</name>
- <scheduler>sch-network-ctrl-iq2</scheduler>
+ <scheduler>sch-network-ctrl-geant</scheduler>
</forwarding-class>
<forwarding-class>
<name>be</name>
<scheduler>sch-be</scheduler>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <scheduler>sch-less-than-best-effort</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
</scheduler-maps>
<schedulers>
<name>sch-be</name>
@@ -15130,27 +14531,7 @@
<priority>strict-high</priority>
</schedulers>
<schedulers>
- <name>sch-less-than-best-effort</name>
- <transmit-rate>
- <percent>10</percent>
- </transmit-rate>
- <buffer-size>
- <percent>10</percent>
- </buffer-size>
- <priority>low</priority>
- <drop-profile-map>
- <loss-priority>low</loss-priority>
- <protocol>any</protocol>
- <drop-profile>less-than-be-drop-profile</drop-profile>
- </drop-profile-map>
- <drop-profile-map>
- <loss-priority>high</loss-priority>
- <protocol>any</protocol>
- <drop-profile>be-drop-profile</drop-profile>
- </drop-profile-map>
- </schedulers>
- <schedulers>
- <name>sch-network-ctrl</name>
+ <name>sch-network-ctrl-geant</name>
<transmit-rate>
<percent>5</percent>
</transmit-rate>
@@ -15159,15 +14540,6 @@
</buffer-size>
<priority>high</priority>
</schedulers>
- <schedulers>
- <name>sch-network-ctrl-iq2</name>
- <transmit-rate>
- <percent>5</percent>
- </transmit-rate>
- <buffer-size>
- <percent>5</percent>
- </buffer-size>
- </schedulers>
</class-of-service>
<firewall>
<family>
@@ -17386,6 +16758,9 @@
<source-prefix-list>
<name>dashboard-servers</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers</name>
+ </source-prefix-list>
<protocol>tcp</protocol>
<destination-port>ssh</destination-port>
</from>
@@ -19090,6 +18465,9 @@
<source-prefix-list>
<name>dashboard-servers-v6</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers-v6</name>
+ </source-prefix-list>
<next-header>tcp</next-header>
<port>ssh</port>
</from>
@@ -20574,7 +19952,7 @@
</policer>
</firewall>
<routing-instances>
- <instance>
+ <instance inactive="inactive">
<name>CLEAN_IAS</name>
<description>Clean IAS VRF traffic returned from scrubber</description>
<instance-type>vrf</instance-type>
@@ -20884,7 +20262,7 @@
<prefix-limit>
<maximum>150000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -20933,7 +20311,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -20969,7 +20347,7 @@
<prefix-limit>
<maximum>900</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -21005,7 +20383,7 @@
<prefix-limit>
<maximum>2250</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -21041,7 +20419,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -21077,7 +20455,7 @@
<prefix-limit>
<maximum>4500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -21113,7 +20491,7 @@
<prefix-limit>
<maximum>247500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -21149,7 +20527,7 @@
<prefix-limit>
<maximum>3000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -21185,7 +20563,7 @@
<prefix-limit>
<maximum>7350</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -21222,7 +20600,7 @@
<prefix-limit>
<maximum>450</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -21259,7 +20637,7 @@
<prefix-limit>
<maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -21294,7 +20672,7 @@
<prefix-limit>
<maximum>375</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -21329,7 +20707,7 @@
<prefix-limit>
<maximum>15000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -21364,7 +20742,7 @@
<prefix-limit>
<maximum>15000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -21399,7 +20777,7 @@
<prefix-limit>
<maximum>900</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -21434,7 +20812,7 @@
<prefix-limit>
<maximum>900</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -21469,7 +20847,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -21504,7 +20882,7 @@
<prefix-limit>
<maximum>105</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -21539,7 +20917,7 @@
<prefix-limit>
<maximum>15</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -21571,7 +20949,7 @@
<prefix-limit>
<maximum>150000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -21620,7 +20998,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -21656,7 +21034,7 @@
<prefix-limit>
<maximum>900</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -21692,7 +21070,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -21728,7 +21106,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -21764,7 +21142,7 @@
<prefix-limit>
<maximum>4500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -21800,7 +21178,7 @@
<prefix-limit>
<maximum>247500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -21836,7 +21214,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -21872,7 +21250,7 @@
<prefix-limit>
<maximum>7350</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -21909,7 +21287,7 @@
<prefix-limit>
<maximum>450</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -21946,7 +21324,7 @@
<prefix-limit>
<maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -21981,7 +21359,7 @@
<prefix-limit>
<maximum>375</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -22016,7 +21394,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -22051,7 +21429,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -22086,7 +21464,7 @@
<prefix-limit>
<maximum>900</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -22121,7 +21499,7 @@
<prefix-limit>
<maximum>900</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -22156,7 +21534,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -22191,7 +21569,7 @@
<prefix-limit>
<maximum>105</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -22226,7 +21604,7 @@
<prefix-limit>
<maximum>15</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -22398,6 +21776,9 @@
<maximum>1000</maximum>
<teardown>
<limit-threshold>90</limit-threshold>
+ <idle-timeout>
+ <timeout>15</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</labeled-unicast>
diff --git a/test/data/mx1.dub2.ie.geant.net-netconf.xml b/test/data/mx1.dub2.ie.geant.net-netconf.xml
index 927fa0be245706e14e39419dbdf9f7aa291bddee..2decb6368f3d52a80fcdc85f0d8e2b76b28e9171 100644
--- a/test/data/mx1.dub2.ie.geant.net-netconf.xml
+++ b/test/data/mx1.dub2.ie.geant.net-netconf.xml
@@ -1,4 +1,4 @@
-<configuration changed-seconds="1545214011" changed-localtime="2018-12-19 10:06:51 UTC">
+<configuration changed-seconds="1549111196" changed-localtime="2019-02-02 12:39:56 UTC">
<version>15.1F6-S10.9</version>
<groups>
<name>re0</name>
@@ -250,6 +250,38 @@
<allow-commands>show .*</allow-commands>
<deny-commands>(ssh .*|telnet .*)</deny-commands>
</class>
+ <class>
+ <name>opennsa</name>
+ <idle-timeout>5</idle-timeout>
+ <permissions>configure</permissions>
+ <deny-commands>(file.*)|(load.*)|(op.*)|(request.*)|(save.*)|(start.*)|(test.*)|(set cli.*)|(set date.*)|(clear.*)|(help.*)|(telnet.*)|(ssh.*)|(traceroute.*)|(mtrace.*)|(monitor.*)|(ping.*)|(show.*)|(set.*)</deny-commands>
+ <allow-configuration-regexps>interfaces .*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections remote-interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols mpls label-switched-path.*</allow-configuration-regexps>
+ <deny-configuration-regexps>vmhost .*</deny-configuration-regexps>
+ <deny-configuration-regexps>session-limit-group .*</deny-configuration-regexps>
+ <deny-configuration-regexps>multi-chassis .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc-partition .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc .*</deny-configuration-regexps>
+ <deny-configuration-regexps>groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>dynamic-profiles .*</deny-configuration-regexps>
+ <deny-configuration-regexps>diameter .*</deny-configuration-regexps>
+ <deny-configuration-regexps>apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>access-profile .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces traceoptions .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-set .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-range .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups-except .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lt-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces ms-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces si-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces gr-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lo.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces dsc.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces irb.*</deny-configuration-regexps>
+ </class>
<class>
<name>readonly-permissions</name>
<idle-timeout>15</idle-timeout>
@@ -560,6 +592,22 @@
<encrypted-password>/* SECRET-DATA */</encrypted-password>
</authentication>
</user>
+ <user>
+ <name>opennsa</name>
+ <uid>2007</uid>
+ <class>opennsa</class>
+ <authentication>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ </authentication>
+ </user>
<user>
<name>opnet</name>
<full-name>OPNET NEOP Planning system @ 62.40.105.114</full-name>
@@ -2458,6 +2506,9 @@
<clients>
<name>83.97.93.196/32</name>
</clients>
+ <clients>
+ <name>83.97.93.238/32</name>
+ </clients>
</community>
<community>
<name>As4n0gN!</name>
@@ -2955,13 +3006,13 @@
<import-rib>IAS.inet6.0</import-rib>
<import-policy>rtbh-policy</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias</name>
<import-rib>IAS.inet.0</import-rib>
<import-rib>CLEAN_IAS.inet.0</import-rib>
<import-policy>ps-into-clean-ias-import</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias-v6</name>
<import-rib>IAS.inet6.0</import-rib>
<import-rib>CLEAN_IAS.inet6.0</import-rib>
@@ -6539,15 +6590,13 @@
</prefix-list>
<prefix-list>
<name>geantncc-address-space</name>
+ <comment>/* NCC DR VPN */</comment>
<prefix-list-item>
- <name>62.40.108.192/26</name>
+ <name>62.40.108.192/27</name>
</prefix-list-item>
<prefix-list-item>
<name>62.40.119.0/24</name>
</prefix-list-item>
- <prefix-list-item>
- <name>62.40.119.134/32</name>
- </prefix-list-item>
<prefix-list-item>
<name>62.40.125.250/32</name>
</prefix-list-item>
@@ -7374,6 +7423,14 @@
</prefix-list>
<prefix-list>
<name>corporate-address-space</name>
+ <comment>/* LON2 CORP VPN (MAC) */</comment>
+ <prefix-list-item>
+ <name>62.40.99.194/32</name>
+ </prefix-list-item>
+ <comment>/* LON2 CORP VPN */</comment>
+ <prefix-list-item>
+ <name>62.40.99.201/32</name>
+ </prefix-list-item>
<prefix-list-item>
<name>62.40.119.128/25</name>
</prefix-list-item>
@@ -7567,6 +7624,18 @@
<name>2001:798::/32</name>
</prefix-list-item>
</prefix-list>
+ <prefix-list>
+ <name>opennsa-servers</name>
+ <prefix-list-item>
+ <name>83.97.93.92/32</name>
+ </prefix-list-item>
+ </prefix-list>
+ <prefix-list>
+ <name>opennsa-servers-v6</name>
+ <prefix-list-item>
+ <name>2001:798:3::15f/128</name>
+ </prefix-list-item>
+ </prefix-list>
<policy-statement>
<name>ASM-Allow</name>
<term>
@@ -8226,6 +8295,10 @@
<address>185.1.68.0/24</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>193.188.137.0/24</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -8347,6 +8420,10 @@
<address>2001:7f8:a0::/64</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>2001:7f8:35::/64</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -9613,13 +9690,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -9635,14 +9705,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp>
<name>backbone-classifier</name>
@@ -9654,18 +9716,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -9673,195 +9723,16 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>iperf-classifier</name>
- <import>default</import>
<forwarding-class>
<name>expedited-forwarding</name>
<loss-priority>
<name>low</name>
- <code-points>af12</code-points>
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>backbone-classifier</name>
@@ -9873,18 +9744,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -9892,13 +9751,7 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -9921,13 +9774,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -9943,187 +9789,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>iperf-classifier</name>
- <import>default</import>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>af12</code-points>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-access-classifier</name>
@@ -10132,16 +9797,16 @@
<name>be</name>
<loss-priority>
<name>low</name>
- <code-points>000</code-points>
- <code-points>001</code-points>
- <code-points>010</code-points>
- <code-points>011</code-points>
- <code-points>110</code-points>
- <code-points>111</code-points>
+ <code-points>100</code-points>
+ <code-points>101</code-points>
</loss-priority>
</forwarding-class>
+ </exp>
+ <exp>
+ <name>mpls-backbone-classifier</name>
+ <import>default</import>
<forwarding-class>
- <name>less-than-best-effort</name>
+ <name>be</name>
<loss-priority>
<name>low</name>
<code-points>100</code-points>
@@ -10149,40 +9814,7 @@
</loss-priority>
</forwarding-class>
</exp>
- <exp>
- <name>mpls-backbone-classifier</name>
- <import>default</import>
- </exp>
</classifiers>
- <code-point-aliases>
- <dscp>
- <name>ix</name>
- <bits>101001</bits>
- </dscp>
- <dscp>
- <name>dws</name>
- <bits>100000</bits>
- </dscp>
- <dscp-ipv6>
- <name>dws</name>
- <bits>100000</bits>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix</name>
- <bits>101001</bits>
- </dscp-ipv6>
- </code-point-aliases>
- <drop-profiles>
- <name>dws-drop-profile</name>
- <fill-level>
- <name>35</name>
- <drop-probability>10</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<drop-profiles>
<name>be-drop-profile</name>
<fill-level>
@@ -10202,59 +9834,44 @@
<drop-probability>100</drop-probability>
</fill-level>
</drop-profiles>
- <drop-profiles>
- <name>less-than-be-drop-profile</name>
- <fill-level>
- <name>25</name>
- <drop-probability>30</drop-probability>
- </fill-level>
- <fill-level>
- <name>30</name>
- <drop-probability>50</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>70</drop-probability>
- </fill-level>
- <fill-level>
- <name>50</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<forwarding-classes>
<class>
<name>be</name>
<queue-num>0</queue-num>
</class>
- <class>
- <name>be-ix</name>
- <queue-num>0</queue-num>
- </class>
<class>
<name>expedited-forwarding</name>
<queue-num>1</queue-num>
</class>
- <class>
- <name>less-than-best-effort</name>
- <queue-num>2</queue-num>
- </class>
<class>
<name>network-control</name>
<queue-num>3</queue-num>
</class>
- <class>
- <name>be-dws</name>
- <queue-num>0</queue-num>
- </class>
- <class>
- <name>be-bleach</name>
- <queue-num>0</queue-num>
- </class>
</forwarding-classes>
<interfaces>
+ <interface>
+ <name>et-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>ge-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>so-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>xe-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>ae*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
<interface>
<name>ae1</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -10272,17 +9889,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -10292,7 +9901,7 @@
</interface>
<interface>
<name>ae3</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -10310,17 +9919,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -10330,7 +9931,7 @@
</interface>
<interface>
<name>ae10</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>12</name>
<classifiers>
@@ -10352,13 +9953,6 @@
<rewrite-rules>
<dscp>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -10373,17 +9967,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -10395,97 +9978,9 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -10500,17 +9995,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -10522,73 +10006,6 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
@@ -10596,35 +10013,19 @@
</exp>
</rewrite-rules>
<scheduler-maps>
- <name>MAP-BASIC-IQ2</name>
+ <name>GEANT-BASIC</name>
<forwarding-class>
<name>expedited-forwarding</name>
<scheduler>sch-expedited-forwarding</scheduler>
</forwarding-class>
<forwarding-class>
<name>network-control</name>
- <scheduler>sch-network-ctrl-iq2</scheduler>
+ <scheduler>sch-network-ctrl-geant</scheduler>
</forwarding-class>
<forwarding-class>
<name>be</name>
<scheduler>sch-be</scheduler>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <scheduler>sch-less-than-best-effort</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
</scheduler-maps>
<schedulers>
<name>sch-be</name>
@@ -10644,27 +10045,7 @@
<priority>strict-high</priority>
</schedulers>
<schedulers>
- <name>sch-less-than-best-effort</name>
- <transmit-rate>
- <percent>10</percent>
- </transmit-rate>
- <buffer-size>
- <percent>10</percent>
- </buffer-size>
- <priority>low</priority>
- <drop-profile-map>
- <loss-priority>low</loss-priority>
- <protocol>any</protocol>
- <drop-profile>less-than-be-drop-profile</drop-profile>
- </drop-profile-map>
- <drop-profile-map>
- <loss-priority>high</loss-priority>
- <protocol>any</protocol>
- <drop-profile>be-drop-profile</drop-profile>
- </drop-profile-map>
- </schedulers>
- <schedulers>
- <name>sch-network-ctrl</name>
+ <name>sch-network-ctrl-geant</name>
<transmit-rate>
<percent>5</percent>
</transmit-rate>
@@ -10673,15 +10054,6 @@
</buffer-size>
<priority>high</priority>
</schedulers>
- <schedulers>
- <name>sch-network-ctrl-iq2</name>
- <transmit-rate>
- <percent>5</percent>
- </transmit-rate>
- <buffer-size>
- <percent>5</percent>
- </buffer-size>
- </schedulers>
</class-of-service>
<firewall>
<family>
@@ -11656,6 +11028,9 @@
<source-prefix-list>
<name>dashboard-servers</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers</name>
+ </source-prefix-list>
<protocol>tcp</protocol>
<destination-port>ssh</destination-port>
</from>
@@ -12781,6 +12156,9 @@
<source-prefix-list>
<name>dashboard-servers-v6</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers-v6</name>
+ </source-prefix-list>
<next-header>tcp</next-header>
<port>ssh</port>
</from>
@@ -13965,7 +13343,7 @@
</policer>
</firewall>
<routing-instances>
- <instance>
+ <instance inactive="inactive">
<name>CLEAN_IAS</name>
<description>Clean IAS VRF traffic returned from scrubber</description>
<instance-type>vrf</instance-type>
@@ -14405,6 +13783,9 @@
<maximum>1000</maximum>
<teardown>
<limit-threshold>90</limit-threshold>
+ <idle-timeout>
+ <timeout>15</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</labeled-unicast>
diff --git a/test/data/mx1.fra.de.geant.net-netconf.xml b/test/data/mx1.fra.de.geant.net-netconf.xml
index 8dac3590b338b4b6af66b1ca775979dd2d696c4b..69074fcbcbb09ef6e44cc9d5fc0d94684022a15d 100644
--- a/test/data/mx1.fra.de.geant.net-netconf.xml
+++ b/test/data/mx1.fra.de.geant.net-netconf.xml
@@ -1,4 +1,4 @@
-<configuration changed-seconds="1545216293" changed-localtime="2018-12-19 10:44:53 UTC">
+<configuration changed-seconds="1549049195" changed-localtime="2019-02-01 19:26:35 UTC">
<version>15.1F6-S10.9</version>
<groups>
<name>re0</name>
@@ -251,6 +251,38 @@
<allow-commands>show .*</allow-commands>
<deny-commands>(ssh .*|telnet .*)</deny-commands>
</class>
+ <class>
+ <name>opennsa</name>
+ <idle-timeout>5</idle-timeout>
+ <permissions>configure</permissions>
+ <deny-commands>(file.*)|(load.*)|(op.*)|(request.*)|(save.*)|(start.*)|(test.*)|(set cli.*)|(set date.*)|(clear.*)|(help.*)|(telnet.*)|(ssh.*)|(traceroute.*)|(mtrace.*)|(monitor.*)|(ping.*)|(show.*)|(set.*)</deny-commands>
+ <allow-configuration-regexps>interfaces .*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections remote-interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols mpls label-switched-path.*</allow-configuration-regexps>
+ <deny-configuration-regexps>vmhost .*</deny-configuration-regexps>
+ <deny-configuration-regexps>session-limit-group .*</deny-configuration-regexps>
+ <deny-configuration-regexps>multi-chassis .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc-partition .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc .*</deny-configuration-regexps>
+ <deny-configuration-regexps>groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>dynamic-profiles .*</deny-configuration-regexps>
+ <deny-configuration-regexps>diameter .*</deny-configuration-regexps>
+ <deny-configuration-regexps>apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>access-profile .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces traceoptions .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-set .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-range .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups-except .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lt-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces ms-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces si-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces gr-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lo.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces dsc.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces irb.*</deny-configuration-regexps>
+ </class>
<class>
<name>readonly-permissions</name>
<permissions>view</permissions>
@@ -565,6 +597,22 @@
<encrypted-password>/* SECRET-DATA */</encrypted-password>
</authentication>
</user>
+ <user>
+ <name>opennsa</name>
+ <uid>2016</uid>
+ <class>opennsa</class>
+ <authentication>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ </authentication>
+ </user>
<user>
<name>opnet</name>
<full-name>OPNET NEOP Planning system @ 62.40.105.114</full-name>
@@ -4350,16 +4398,12 @@
</interface>
<interface>
<name>xe-3/1/3</name>
- <description>PHY SPARE | Reserved for IUCC</description>
+ <description>PHY SPARE | Reserved for Security port-mirroring</description>
+ <framing>
+ <wan-phy/>
+ </framing>
<unit>
<name>0</name>
- <family>
- <inet>
- <address>
- <name>192.168.40.1/24</name>
- </address>
- </inet>
- </family>
</unit>
</interface>
<interface>
@@ -4723,8 +4767,12 @@
</interface>
<interface>
<name>xe-10/0/0</name>
- <description>PHY SPARE | Reserved for CSTNET</description>
- <disable/>
+ <description>PHY RE_INTERCONNECT CSTNET SRF18112 P_ae33 | ID: DE113258</description>
+ <gigether-options>
+ <ieee-802.3ad>
+ <bundle>ae33</bundle>
+ </ieee-802.3ad>
+ </gigether-options>
</interface>
<interface>
<name>xe-10/0/1</name>
@@ -4776,8 +4824,15 @@
</interface>
<interface>
<name>xe-10/0/7</name>
- <description>PHY SPARE | Reserved for Security port-mirroring</description>
- <disable/>
+ <description>PHY CUSTOMER IUCC P_AE21 SRF99245375 BEZEQ ID: WL-18-8858 DE-IL 10GE</description>
+ <framing>
+ <wan-phy/>
+ </framing>
+ <gigether-options>
+ <ieee-802.3ad>
+ <bundle>ae21</bundle>
+ </ieee-802.3ad>
+ </gigether-options>
</interface>
<interface>
<name>xe-10/1/0</name>
@@ -6264,7 +6319,7 @@
<mtu>9192</mtu>
<encapsulation>flexible-ethernet-services</encapsulation>
<aggregated-ether-options>
- <minimum-links>1</minimum-links>
+ <minimum-links>2</minimum-links>
<lacp>
<active/>
</lacp>
@@ -6977,6 +7032,81 @@
</family>
</unit>
</interface>
+ <interface>
+ <name>ae33</name>
+ <description>LAG RE_INTERCONNECT CSTNET SRF18112</description>
+ <vlan-tagging/>
+ <mtu>1514</mtu>
+ <encapsulation>flexible-ethernet-services</encapsulation>
+ <aggregated-ether-options>
+ <minimum-links>1</minimum-links>
+ </aggregated-ether-options>
+ <unit>
+ <name>111</name>
+ <description>SRV_L3VPN RE CSTNET LHCONE SRF18112 | ASN7497 | Under Testing</description>
+ <vlan-id>111</vlan-id>
+ <family>
+ <inet>
+ <filter>
+ <input>
+ <filter-name>LHCONE-in</filter-name>
+ </input>
+ </filter>
+ <address>
+ <name>62.40.126.24/31</name>
+ </address>
+ </inet>
+ <inet6>
+ <filter>
+ <input>
+ <filter-name>LHCONE6-in</filter-name>
+ </input>
+ <output>
+ <filter-name>LHCONE6-out</filter-name>
+ </output>
+ </filter>
+ <address>
+ <name>2001:798:111:1::b9/126</name>
+ </address>
+ </inet6>
+ </family>
+ </unit>
+ <unit>
+ <name>200</name>
+ <description>SRV_GLOBAL RE_INTERCONNECT CSTNET SRF18112 | ASN7497</description>
+ <vlan-id>200</vlan-id>
+ <family>
+ <inet>
+ <filter>
+ <input>
+ <filter-name>CSTNET-in</filter-name>
+ </input>
+ <output>
+ <filter-name>CSTNET-out</filter-name>
+ </output>
+ </filter>
+ <address>
+ <name>62.40.127.128/31</name>
+ </address>
+ </inet>
+ <iso>
+ </iso>
+ <inet6>
+ <filter>
+ <input>
+ <filter-name>CSTNET6-in</filter-name>
+ </input>
+ <output>
+ <filter-name>CSTNET6-out</filter-name>
+ </output>
+ </filter>
+ <address>
+ <name>2001:798:99:1::b4/127</name>
+ </address>
+ </inet6>
+ </family>
+ </unit>
+ </interface>
<interface>
<name>dsc</name>
<unit>
@@ -7396,6 +7526,9 @@
<clients>
<name>83.97.93.196/32</name>
</clients>
+ <clients>
+ <name>83.97.93.238/32</name>
+ </clients>
</community>
<community>
<name>As4n0gN!</name>
@@ -8982,11 +9115,17 @@
<unicast>
<prefix-limit>
<maximum>500</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
<maximum>500</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
</prefix-limit>
</multicast>
</inet>
@@ -9006,12 +9145,21 @@
<inet>
<unicast>
<prefix-limit>
- <maximum>500</maximum>
+ <maximum>10</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
<maximum>500</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
</prefix-limit>
</multicast>
</inet>
@@ -9031,12 +9179,21 @@
<inet>
<unicast>
<prefix-limit>
- <maximum>500</maximum>
+ <maximum>10</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
<maximum>500</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
</prefix-limit>
</multicast>
</inet>
@@ -9045,6 +9202,38 @@
<export>ps-to-iranet</export>
<peer-as>6736</peer-as>
</neighbor>
+ <neighbor>
+ <name>62.40.127.129</name>
+ <description>---Peering with CSTNET (Beijing)---</description>
+ <out-delay>10</out-delay>
+ <import>ps-from-CSTNET</import>
+ <family>
+ <inet>
+ <unicast>
+ <prefix-limit>
+ <maximum>6000</maximum>
+ <teardown>
+ <limit-threshold>89</limit-threshold>
+ </teardown>
+ </prefix-limit>
+ </unicast>
+ <multicast>
+ <prefix-limit>
+ <maximum>1000</maximum>
+ <teardown>
+ <limit-threshold>89</limit-threshold>
+ </teardown>
+ </prefix-limit>
+ </multicast>
+ </inet>
+ </family>
+ <export>ps-to-CSTNET</export>
+ <peer-as>7497</peer-as>
+ <bfd-liveness-detection>
+ <minimum-interval>3000</minimum-interval>
+ <multiplier>5</multiplier>
+ </bfd-liveness-detection>
+ </neighbor>
</group>
<group>
<name>GEANT-REv6</name>
@@ -9068,13 +9257,16 @@
<prefix-limit>
<maximum>500</maximum>
<teardown>
- <limit-threshold>75</limit-threshold>
+ <limit-threshold>80</limit-threshold>
</teardown>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
<maximum>500</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
</prefix-limit>
</multicast>
</inet6>
@@ -9094,15 +9286,21 @@
<inet6>
<unicast>
<prefix-limit>
- <maximum>500</maximum>
+ <maximum>10</maximum>
<teardown>
- <limit-threshold>75</limit-threshold>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
<maximum>500</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
</prefix-limit>
</multicast>
</inet6>
@@ -9122,12 +9320,21 @@
<inet6>
<unicast>
<prefix-limit>
- <maximum>500</maximum>
+ <maximum>10</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
<maximum>500</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
</prefix-limit>
</multicast>
</inet6>
@@ -9136,6 +9343,34 @@
<export>ps-to-iranet-V6-nren</export>
<peer-as>6736</peer-as>
</neighbor>
+ <neighbor>
+ <name>2001:798:99:1::b5</name>
+ <description>---IPv6 Peering with CSTNET (Beijing)--</description>
+ <out-delay>10</out-delay>
+ <import>ps-from-CSTNET-V6-nren</import>
+ <family>
+ <inet6>
+ <unicast>
+ <prefix-limit>
+ <maximum>2000</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
+ </prefix-limit>
+ </unicast>
+ <multicast>
+ <prefix-limit>
+ <maximum>500</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
+ </prefix-limit>
+ </multicast>
+ </inet6>
+ </family>
+ <export>ps-to-CSTNET-V6-nren</export>
+ <peer-as>7497</peer-as>
+ </neighbor>
</group>
<group>
<name>TOOLS</name>
@@ -9432,7 +9667,7 @@
</bfd-liveness-detection>
<level>
<name>2</name>
- <metric>45</metric>
+ <metric>37</metric>
</level>
</interface>
<interface>
@@ -10390,16 +10625,13 @@
</prefix-list>
<prefix-list>
<name>geantncc-address-space</name>
- <comment>/* NCC DR VPN LAN */</comment>
+ <comment>/* NCC DR VPN */</comment>
<prefix-list-item>
- <name>62.40.108.192/26</name>
+ <name>62.40.108.192/27</name>
</prefix-list-item>
<prefix-list-item>
<name>62.40.119.0/24</name>
</prefix-list-item>
- <prefix-list-item>
- <name>62.40.119.134/32</name>
- </prefix-list-item>
<prefix-list-item>
<name>62.40.125.250/32</name>
</prefix-list-item>
@@ -13365,6 +13597,12 @@
<prefix-list-item>
<name>2a03:db80:3410::/48</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>2a03:db80:3430::/48</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>2a03:db80:3434::/48</name>
+ </prefix-list-item>
<prefix-list-item>
<name>2a03:db80:3810::/48</name>
</prefix-list-item>
@@ -21847,6 +22085,14 @@
</prefix-list>
<prefix-list>
<name>corporate-address-space</name>
+ <comment>/* LON2 CORP VPN (MAC) */</comment>
+ <prefix-list-item>
+ <name>62.40.99.194/32</name>
+ </prefix-list-item>
+ <comment>/* LON2 CORP VPN */</comment>
+ <prefix-list-item>
+ <name>62.40.99.201/32</name>
+ </prefix-list-item>
<prefix-list-item>
<name>62.40.119.128/25</name>
</prefix-list-item>
@@ -21953,6 +22199,255 @@
<name>2001:798::/32</name>
</prefix-list-item>
</prefix-list>
+ <prefix-list>
+ <name>opennsa-servers</name>
+ <prefix-list-item>
+ <name>83.97.93.92/32</name>
+ </prefix-list-item>
+ </prefix-list>
+ <prefix-list>
+ <name>opennsa-servers-v6</name>
+ <prefix-list-item>
+ <name>2001:798:3::15f/128</name>
+ </prefix-list-item>
+ </prefix-list>
+ <prefix-list>
+ <name>ITER-sites-Europe</name>
+ <prefix-list-item>
+ <name>62.204.192.0/19</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>84.88.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>85.142.0.0/15</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>128.178.0.0/15</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>128.219.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>129.13.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>129.16.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>129.67.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>129.69.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>129.104.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>129.215.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>130.183.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>130.192.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>130.206.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>130.225.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>130.226.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>130.233.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>130.237.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>131.169.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>132.166.0.0/15</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>132.168.0.0/15</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>132.180.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>134.94.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>136.206.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>137.205.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>138.100.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>138.232.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>139.191.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>141.20.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>141.52.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>143.225.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>144.32.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>147.83.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>147.94.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>147.102.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>147.213.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>147.230.0.0/15</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>149.220.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>150.178.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>150.254.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>155.207.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>155.253.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>156.18.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>158.195.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>159.149.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>163.1.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>164.15.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>192.16.184.0/24</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>192.42.120.0/21</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>192.55.106.0/24</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>192.76.6.0/23</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>192.76.8.0/21</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>192.101.164.0/22</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>192.101.168.0/24</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>192.107.52.0/22</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>193.2.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>193.48.0.0/14</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>193.52.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>193.54.0.0/15</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>193.60.0.0/14</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>193.136.0.0/15</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>193.144.0.0/14</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>193.170.0.0/15</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>193.190.0.0/15</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>193.204.0.0/15</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>193.219.40.0/21</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>193.231.32.0/20</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>194.66.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>194.80.0.0/14</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>194.94.0.0/15</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>194.177.192.0/19</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>195.83.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>195.130.64.0/18</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>195.134.64.0/18</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>195.216.160.0/19</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>198.124.0.0/14</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>213.175.96.0/20</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>217.156.104.0/24</name>
+ </prefix-list-item>
+ </prefix-list>
<policy-statement>
<name>ASM-Allow</name>
<term>
@@ -22891,6 +23386,15 @@
</then>
</term>
</policy-statement>
+ <policy-statement>
+ <name>IAS_PS-FROM-PUBLIC-PEER_AS32934_Facebook</name>
+ <term>
+ <name>NEXT_POLICY</name>
+ <then>
+ <next>policy</next>
+ </then>
+ </term>
+ </policy-statement>
<policy-statement>
<name>IAS_PS-FROM-PUBLIC-PEER_AS33011_BOXNET_-_Box.com,US__</name>
<term>
@@ -26685,6 +27189,100 @@
</then>
</term>
</policy-statement>
+ <policy-statement>
+ <name>IAS_PS-TO-PUBLIC-PEER_AS32934_Facebook</name>
+ <term>
+ <name>BLOCK_THIS_PEER</name>
+ <from>
+ <community>TE_BLOCK_AS32934</community>
+ <community>TE_BLOCK_AS32934_2</community>
+ <community>TE_BLOCK_AS32934_DE-CIX</community>
+ <community>TE_BLOCK_AS32934_DE-CIX_2</community>
+ </from>
+ <then>
+ <reject/>
+ </then>
+ </term>
+ <term>
+ <name>PREPEND_THIS_PEER_x1</name>
+ <from>
+ <community>TE_PREPEND_AS32934_x1_4byte</community>
+ <community>TE_PREPEND_AS32934_x1_2byte</community>
+ </from>
+ <then>
+ <as-path-expand>
+ <aspath>21320</aspath>
+ </as-path-expand>
+ </then>
+ </term>
+ <term>
+ <name>PREPEND_THIS_PEER_x2</name>
+ <from>
+ <community>TE_PREPEND_AS32934_x2_4byte</community>
+ <community>TE_PREPEND_AS32934_x2_2byte</community>
+ </from>
+ <then>
+ <as-path-expand>
+ <aspath>21320 21320</aspath>
+ </as-path-expand>
+ </then>
+ </term>
+ <term>
+ <name>PREPEND_THIS_PEER_x3</name>
+ <from>
+ <community>TE_PREPEND_AS32934_x3_4byte</community>
+ <community>TE_PREPEND_AS32934_x3_2byte</community>
+ </from>
+ <then>
+ <as-path-expand>
+ <aspath>21320 21320 21320</aspath>
+ </as-path-expand>
+ </then>
+ </term>
+ <term>
+ <name>PREPEND_THIS_PEER_x6</name>
+ <from>
+ <community>TE_PREPEND_AS32934_x6_4byte</community>
+ <community>TE_PREPEND_AS32934_x6_2byte</community>
+ </from>
+ <then>
+ <as-path-expand>
+ <aspath>21320 21320 21320 21320 21320 21320</aspath>
+ </as-path-expand>
+ </then>
+ </term>
+ <term>
+ <name>ANNOUNCE</name>
+ <from>
+ <community>TE_ANNOUNCE_AS32934</community>
+ <community>TE_ANNOUNCE_AS32934_2</community>
+ <community>TE_ANNOUNCE_AS32934_3</community>
+ <community>TE_ANNOUNCE_AS32934_4</community>
+ <community>TE_ANNOUNCE_ALL_PUBLIC_PEERS</community>
+ <community>TE_ANNOUNCE_ALL_PUBLIC_PEERS_2</community>
+ <community>TE_ANNOUNCE_ALL_PUBLIC_PEERS_3</community>
+ <community>TE_ANNOUNCE_AS32934_DE-CIX</community>
+ <community>TE_ANNOUNCE_AS32934_DE-CIX_2</community>
+ </from>
+ <then>
+ <metric>
+ <igp>
+ </igp>
+ </metric>
+ <community>
+ <delete/>
+ <community-name>TE_PRIVATE_COMMUNITIES</community-name>
+ </community>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>NEXT_POLICY</name>
+ <then>
+ <next>policy</next>
+ </then>
+ </term>
+ </policy-statement>
<policy-statement>
<name>IAS_PS-TO-PUBLIC-PEER_AS33011_BOXNET_-_Box.com,US__</name>
<term>
@@ -30744,6 +31342,10 @@
<address>185.1.68.0/24</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>193.188.137.0/24</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -30865,6 +31467,10 @@
<address>2001:7f8:a0::/64</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>2001:7f8:35::/64</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -33939,6 +34545,46 @@
<reject/>
</then>
</term>
+ <term>
+ <name>GOOGLE-test-prepend-1</name>
+ <from>
+ <community>GOOGLE-test-prepend-1</community>
+ </from>
+ <then>
+ <as-path-prepend>21320</as-path-prepend>
+ <next>term</next>
+ </then>
+ </term>
+ <term>
+ <name>GOOGLE-test-prepend-2</name>
+ <from>
+ <community>GOOGLE-test-prepend-2</community>
+ </from>
+ <then>
+ <as-path-prepend>21320 21320</as-path-prepend>
+ <next>term</next>
+ </then>
+ </term>
+ <term>
+ <name>GOOGLE-test-prepend-3</name>
+ <from>
+ <community>GOOGLE-test-prepend-3</community>
+ </from>
+ <then>
+ <as-path-prepend>21320 21320 21320</as-path-prepend>
+ <next>term</next>
+ </then>
+ </term>
+ <term>
+ <name>GOOGLE-test-prepend-6</name>
+ <from>
+ <community>GOOGLE-test-prepend-6</community>
+ </from>
+ <then>
+ <as-path-prepend>21320 21320 21320 21320 21320 21320</as-path-prepend>
+ <next>term</next>
+ </then>
+ </term>
<term>
<name>to-private-peers-prepend-1</name>
<from>
@@ -34580,194 +35226,511 @@
</term>
</policy-statement>
<policy-statement>
- <name>ps-from-CYMRU-BOGONS</name>
+ <name>ps-from-CSTNET</name>
<term>
- <name>RTBH</name>
+ <name>from_commercial-as_reject</name>
<from>
- <community>CYMRU_BOGON</community>
+ <as-path>AS-commercial-reject</as-path>
+ </from>
+ <then>
+ <reject/>
+ </then>
+ </term>
+ <term>
+ <name>remove-RTBH</name>
+ <from>
+ <community>geant-RTBH</community>
</from>
<then>
- <local-preference>
- <local-preference>200</local-preference>
- </local-preference>
<community>
- <add/>
- <community-name>TE_BLOCK_ALL_PUBLIC_PEERS</community-name>
+ <delete/>
+ <community-name>geant-RTBH</community-name>
</community>
+ </then>
+ </term>
+ <term>
+ <name>from_commercial-as_low-pref</name>
+ <from>
+ <as-path>AS-commercial-low-pref</as-path>
+ </from>
+ <then>
<community>
<add/>
- <community-name>TE_BLOCK_PEERS_2</community-name>
+ <community-name>geant-low-pref</community-name>
</community>
+ <next>term</next>
+ </then>
+ </term>
+ <term>
+ <name>from-CSTNET-accept</name>
+ <from>
+ <route-filter>
+ <address>0.0.0.0/0</address>
+ <upto>/27</upto>
+ </route-filter>
+ </from>
+ <then>
+ <local-preference>
+ <local-preference>150</local-preference>
+ </local-preference>
<community>
<add/>
- <community-name>geant-IAS-dws-block</community-name>
+ <community-name>geant-CSTNET</community-name>
</community>
<community>
<add/>
- <community-name>geant-dummy</community-name>
+ <community-name>geant-peer-RE</community-name>
</community>
- <next-hop>
- <address>192.0.2.101</address>
- </next-hop>
<accept/>
</then>
</term>
- <then>
- <reject/>
- </then>
+ <term>
+ <name>default</name>
+ <then>
+ <reject/>
+ </then>
+ </term>
</policy-statement>
<policy-statement>
- <name>ps-from-CYMRU-BOGONS-V6</name>
+ <name>ps-from-CSTNET-V6-nren</name>
<term>
- <name>RTBH</name>
+ <name>from_commercial-as_reject</name>
<from>
- <community>CYMRU_BOGON</community>
+ <as-path>AS-commercial-reject</as-path>
+ </from>
+ <then>
+ <reject/>
+ </then>
+ </term>
+ <term>
+ <name>remove-RTBH</name>
+ <from>
+ <community>geant-RTBH</community>
</from>
<then>
- <local-preference>
- <local-preference>200</local-preference>
- </local-preference>
<community>
- <add/>
- <community-name>TE_BLOCK_ALL_PUBLIC_PEERS</community-name>
+ <delete/>
+ <community-name>geant-RTBH</community-name>
</community>
+ </then>
+ </term>
+ <term>
+ <name>from_commercial-as_low-pref</name>
+ <from>
+ <as-path>AS-commercial-low-pref</as-path>
+ </from>
+ <then>
<community>
<add/>
- <community-name>TE_BLOCK_PEERS_2</community-name>
+ <community-name>geant-low-pref</community-name>
</community>
+ <next>term</next>
+ </then>
+ </term>
+ <term>
+ <name>from-CSTNET-V6-accept</name>
+ <from>
+ <family>inet6</family>
+ <route-filter>
+ <address>::/0</address>
+ <upto>/64</upto>
+ </route-filter>
+ </from>
+ <then>
+ <local-preference>
+ <local-preference>100</local-preference>
+ </local-preference>
<community>
<add/>
- <community-name>geant-IAS-dws-block</community-name>
+ <community-name>geant-CSTNET</community-name>
</community>
<community>
<add/>
- <community-name>geant-dummy</community-name>
+ <community-name>geant-peer-RE</community-name>
</community>
- <next-hop>
- <address>100::</address>
- </next-hop>
<accept/>
</then>
</term>
- <then>
- <reject/>
- </then>
- </policy-statement>
- <policy-statement>
- <name>ps-from-CYNET-nren</name>
<term>
- <name>RTBH</name>
+ <name>from-AfriNIC-prefixes_local-pref-decrease</name>
<from>
- <community>geant-RTBH</community>
<route-filter>
- <address>0.0.0.0/0</address>
- <prefix-length-range>/32-/32</prefix-length-range>
+ <address>2c00:0000::/12</address>
+ <prefix-length-range>/12-/48</prefix-length-range>
+ </route-filter>
+ <route-filter>
+ <address>2001:4200::/23</address>
+ <prefix-length-range>/23-/48</prefix-length-range>
</route-filter>
- <prefix-list-filter>
- <list_name>route-from-CYnet</list_name>
- <orlonger/>
- </prefix-list-filter>
</from>
<then>
<local-preference>
- <local-preference>200</local-preference>
+ <local-preference>80</local-preference>
</local-preference>
<community>
<add/>
- <community-name>TE_BLOCK_ALL_PUBLIC_PEERS</community-name>
+ <community-name>geant-CSTNET</community-name>
</community>
<community>
<add/>
- <community-name>TE_BLOCK_PEERS_2</community-name>
- </community>
- <community>
- <add/>
- <community-name>geant-IAS-dws-block</community-name>
- </community>
- <community>
- <add/>
- <community-name>geant-dummy</community-name>
+ <community-name>geant-peer-RE</community-name>
</community>
- <next-hop>
- <address>192.0.2.101</address>
- </next-hop>
<accept/>
</then>
</term>
<term>
- <name>anycast-prefixes</name>
+ <name>from-LACNIC-prefixes_local-pref-decrease</name>
<from>
- <community>geant-anycast</community>
- <prefix-list>
- <name>geant-anycast</name>
- </prefix-list>
+ <route-filter>
+ <address>2800:0000::/12</address>
+ <prefix-length-range>/12-/48</prefix-length-range>
+ </route-filter>
+ <route-filter>
+ <address>2001:1200::/23</address>
+ <prefix-length-range>/23-/48</prefix-length-range>
+ </route-filter>
</from>
<then>
<local-preference>
- <local-preference>150</local-preference>
+ <local-preference>80</local-preference>
</local-preference>
<community>
<add/>
- <community-name>geant-nrn</community-name>
+ <community-name>geant-CSTNET</community-name>
</community>
<community>
<add/>
- <community-name>geant-dws-nren</community-name>
+ <community-name>geant-peer-RE</community-name>
</community>
<accept/>
</then>
</term>
<term>
- <name>from-CYnet-nren</name>
+ <name>from-ARIN-prefixes_local-pref-decrease</name>
<from>
- <prefix-list>
- <name>route-from-CYnet</name>
- </prefix-list>
+ <route-filter>
+ <address>2001:1800::/23</address>
+ <prefix-length-range>/23-/48</prefix-length-range>
+ </route-filter>
+ <route-filter>
+ <address>2001:4800::/23</address>
+ <prefix-length-range>/23-/48</prefix-length-range>
+ </route-filter>
+ <route-filter>
+ <address>2600:0000::/12</address>
+ <prefix-length-range>/12-/48</prefix-length-range>
+ </route-filter>
+ <route-filter>
+ <address>2610:0000::/23</address>
+ <prefix-length-range>/23-/48</prefix-length-range>
+ </route-filter>
+ <route-filter>
+ <address>2620:0000::/23</address>
+ <prefix-length-range>/23-/48</prefix-length-range>
+ </route-filter>
+ <route-filter>
+ <address>2001:0400::/23</address>
+ <prefix-length-range>/23-/48</prefix-length-range>
+ </route-filter>
</from>
<then>
<local-preference>
- <local-preference>150</local-preference>
+ <local-preference>80</local-preference>
</local-preference>
<community>
<add/>
- <community-name>geant-nrn</community-name>
+ <community-name>geant-CSTNET</community-name>
</community>
<community>
<add/>
- <community-name>geant-dws-nren</community-name>
+ <community-name>geant-peer-RE</community-name>
</community>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>from-RIPE-prefixes_local-pref-decrease</name>
+ <from>
+ <route-filter>
+ <address>2001:0600::/23</address>
+ <prefix-length-range>/23-/48</prefix-length-range>
+ </route-filter>
+ <route-filter>
+ <address>2001:0800::/23</address>
+ <prefix-length-range>/23-/48</prefix-length-range>
+ </route-filter>
+ <route-filter>
+ <address>2001:0a00::/23</address>
+ <prefix-length-range>/23-/48</prefix-length-range>
+ </route-filter>
+ <route-filter>
+ <address>2a00:0000::/12</address>
+ <prefix-length-range>/12-/48</prefix-length-range>
+ </route-filter>
+ <route-filter>
+ <address>2001:4a00::/23</address>
+ <prefix-length-range>/23-/48</prefix-length-range>
+ </route-filter>
+ <route-filter>
+ <address>2001:4c00::/23</address>
+ <prefix-length-range>/23-/48</prefix-length-range>
+ </route-filter>
+ <route-filter>
+ <address>2001:5000::/20</address>
+ <prefix-length-range>/20-/48</prefix-length-range>
+ </route-filter>
+ <route-filter>
+ <address>2003:0000::/18</address>
+ <prefix-length-range>/18-/48</prefix-length-range>
+ </route-filter>
+ <route-filter>
+ <address>2001:4600::/23</address>
+ <prefix-length-range>/23-/48</prefix-length-range>
+ </route-filter>
+ <route-filter>
+ <address>2001:1a00::/23</address>
+ <prefix-length-range>/23-/48</prefix-length-range>
+ </route-filter>
+ <route-filter>
+ <address>2001:1c00::/22</address>
+ <prefix-length-range>/22-/48</prefix-length-range>
+ </route-filter>
+ <route-filter>
+ <address>2001:2000::/20</address>
+ <prefix-length-range>/20-/48</prefix-length-range>
+ </route-filter>
+ <route-filter>
+ <address>2001:3000::/21</address>
+ <prefix-length-range>/21-/48</prefix-length-range>
+ </route-filter>
+ <route-filter>
+ <address>2001:3800::/22</address>
+ <prefix-length-range>/22-/48</prefix-length-range>
+ </route-filter>
+ <route-filter>
+ <address>2001:4000::/23</address>
+ <prefix-length-range>/23-/48</prefix-length-range>
+ </route-filter>
+ <route-filter>
+ <address>2001:1400::/23</address>
+ <prefix-length-range>/23-/48</prefix-length-range>
+ </route-filter>
+ <route-filter>
+ <address>2001:1600::/23</address>
+ <prefix-length-range>/23-/48</prefix-length-range>
+ </route-filter>
+ </from>
+ <then>
+ <local-preference>
+ <local-preference>80</local-preference>
+ </local-preference>
<community>
<add/>
- <community-name>geant-adv2-public-peer</community-name>
+ <community-name>geant-CSTNET</community-name>
</community>
<community>
<add/>
- <community-name>geant-adv2-private-peer</community-name>
+ <community-name>geant-peer-RE</community-name>
</community>
<accept/>
</then>
</term>
<term>
- <name>from-CYNET-nren-drop</name>
+ <name>V6-DEFAULT-drop</name>
<then>
<reject/>
</then>
</term>
</policy-statement>
<policy-statement>
- <name>ps-from-CYnet-V6-nren</name>
+ <name>ps-from-CYMRU-BOGONS</name>
<term>
<name>RTBH</name>
<from>
- <community>geant-RTBH</community>
- <route-filter>
- <address>::/0</address>
- <prefix-length-range>/128-/128</prefix-length-range>
- </route-filter>
- <prefix-list-filter>
- <list_name>route-from-CYNET-v6</list_name>
- <orlonger/>
- </prefix-list-filter>
+ <community>CYMRU_BOGON</community>
+ </from>
+ <then>
+ <local-preference>
+ <local-preference>200</local-preference>
+ </local-preference>
+ <community>
+ <add/>
+ <community-name>TE_BLOCK_ALL_PUBLIC_PEERS</community-name>
+ </community>
+ <community>
+ <add/>
+ <community-name>TE_BLOCK_PEERS_2</community-name>
+ </community>
+ <community>
+ <add/>
+ <community-name>geant-IAS-dws-block</community-name>
+ </community>
+ <community>
+ <add/>
+ <community-name>geant-dummy</community-name>
+ </community>
+ <next-hop>
+ <address>192.0.2.101</address>
+ </next-hop>
+ <accept/>
+ </then>
+ </term>
+ <then>
+ <reject/>
+ </then>
+ </policy-statement>
+ <policy-statement>
+ <name>ps-from-CYMRU-BOGONS-V6</name>
+ <term>
+ <name>RTBH</name>
+ <from>
+ <community>CYMRU_BOGON</community>
+ </from>
+ <then>
+ <local-preference>
+ <local-preference>200</local-preference>
+ </local-preference>
+ <community>
+ <add/>
+ <community-name>TE_BLOCK_ALL_PUBLIC_PEERS</community-name>
+ </community>
+ <community>
+ <add/>
+ <community-name>TE_BLOCK_PEERS_2</community-name>
+ </community>
+ <community>
+ <add/>
+ <community-name>geant-IAS-dws-block</community-name>
+ </community>
+ <community>
+ <add/>
+ <community-name>geant-dummy</community-name>
+ </community>
+ <next-hop>
+ <address>100::</address>
+ </next-hop>
+ <accept/>
+ </then>
+ </term>
+ <then>
+ <reject/>
+ </then>
+ </policy-statement>
+ <policy-statement>
+ <name>ps-from-CYNET-nren</name>
+ <term>
+ <name>RTBH</name>
+ <from>
+ <community>geant-RTBH</community>
+ <route-filter>
+ <address>0.0.0.0/0</address>
+ <prefix-length-range>/32-/32</prefix-length-range>
+ </route-filter>
+ <prefix-list-filter>
+ <list_name>route-from-CYnet</list_name>
+ <orlonger/>
+ </prefix-list-filter>
+ </from>
+ <then>
+ <local-preference>
+ <local-preference>200</local-preference>
+ </local-preference>
+ <community>
+ <add/>
+ <community-name>TE_BLOCK_ALL_PUBLIC_PEERS</community-name>
+ </community>
+ <community>
+ <add/>
+ <community-name>TE_BLOCK_PEERS_2</community-name>
+ </community>
+ <community>
+ <add/>
+ <community-name>geant-IAS-dws-block</community-name>
+ </community>
+ <community>
+ <add/>
+ <community-name>geant-dummy</community-name>
+ </community>
+ <next-hop>
+ <address>192.0.2.101</address>
+ </next-hop>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>anycast-prefixes</name>
+ <from>
+ <community>geant-anycast</community>
+ <prefix-list>
+ <name>geant-anycast</name>
+ </prefix-list>
+ </from>
+ <then>
+ <local-preference>
+ <local-preference>150</local-preference>
+ </local-preference>
+ <community>
+ <add/>
+ <community-name>geant-nrn</community-name>
+ </community>
+ <community>
+ <add/>
+ <community-name>geant-dws-nren</community-name>
+ </community>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>from-CYnet-nren</name>
+ <from>
+ <prefix-list>
+ <name>route-from-CYnet</name>
+ </prefix-list>
+ </from>
+ <then>
+ <local-preference>
+ <local-preference>150</local-preference>
+ </local-preference>
+ <community>
+ <add/>
+ <community-name>geant-nrn</community-name>
+ </community>
+ <community>
+ <add/>
+ <community-name>geant-dws-nren</community-name>
+ </community>
+ <community>
+ <add/>
+ <community-name>geant-adv2-public-peer</community-name>
+ </community>
+ <community>
+ <add/>
+ <community-name>geant-adv2-private-peer</community-name>
+ </community>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>from-CYNET-nren-drop</name>
+ <then>
+ <reject/>
+ </then>
+ </term>
+ </policy-statement>
+ <policy-statement>
+ <name>ps-from-CYnet-V6-nren</name>
+ <term>
+ <name>RTBH</name>
+ <from>
+ <community>geant-RTBH</community>
+ <route-filter>
+ <address>::/0</address>
+ <prefix-length-range>/128-/128</prefix-length-range>
+ </route-filter>
+ <prefix-list-filter>
+ <list_name>route-from-CYNET-v6</list_name>
+ <orlonger/>
+ </prefix-list-filter>
</from>
<then>
<local-preference>
@@ -36701,6 +37664,229 @@
</then>
</term>
</policy-statement>
+ <policy-statement>
+ <name>ps-to-CSTNET</name>
+ <term>
+ <name>to-CSTNET-block</name>
+ <from>
+ <community>geant-interco-block</community>
+ <community>geant-CSTNET-block</community>
+ </from>
+ <then>
+ <reject/>
+ </then>
+ </term>
+ <term>
+ <name>to-CSTNET-prepend1</name>
+ <from>
+ <community>geant-CSTNET-prepend1</community>
+ <community>geant-interco-prepend1</community>
+ </from>
+ <then>
+ <as-path-prepend>20965</as-path-prepend>
+ <next>term</next>
+ </then>
+ </term>
+ <term>
+ <name>to-CSTNET-prepend2</name>
+ <from>
+ <community>geant-CSTNET-prepend2</community>
+ <community>geant-interco-prepend2</community>
+ </from>
+ <then>
+ <as-path-prepend>20965 20965</as-path-prepend>
+ <next>term</next>
+ </then>
+ </term>
+ <term>
+ <name>to-CSTNET-prepend3</name>
+ <from>
+ <community>geant-interco-prepend3</community>
+ <community>geant-CSTNET-prepend3</community>
+ </from>
+ <then>
+ <as-path-prepend>20965 20965 20965</as-path-prepend>
+ <next>term</next>
+ </then>
+ </term>
+ <term>
+ <name>to-CSTNET-prepend6</name>
+ <from>
+ <community>geant-interco-prepend6</community>
+ <community>geant-CSTNET-prepend6</community>
+ </from>
+ <then>
+ <as-path-prepend>20965 20965 20965 20965 20965 20965</as-path-prepend>
+ <next>term</next>
+ </then>
+ </term>
+ <term>
+ <name>CSTNET-community</name>
+ <from>
+ <prefix-list>
+ <name>ITER-sites-Europe</name>
+ </prefix-list>
+ </from>
+ <then>
+ <community>
+ <add/>
+ <community-name>GEANT-ITER</community-name>
+ </community>
+ <next>term</next>
+ </then>
+ </term>
+ <term>
+ <name>to-CSTNET-accept</name>
+ <from>
+ <community>geant-clara</community>
+ <community>geant-nrn</community>
+ <community>geant-ubuntunet</community>
+ <community>geant-silk</community>
+ <community>geant-caren</community>
+ <community>geant-asren</community>
+ </from>
+ <then>
+ <metric>
+ <igp>
+ </igp>
+ </metric>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>to-CSTNET-ernet</name>
+ <from>
+ <route-filter>
+ <address>202.141.144.0/24</address>
+ <exact/>
+ </route-filter>
+ <route-filter>
+ <address>144.16.194.0/24</address>
+ <exact/>
+ </route-filter>
+ </from>
+ <then>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>to-CSTNET-reject</name>
+ <then>
+ <reject/>
+ </then>
+ </term>
+ </policy-statement>
+ <policy-statement>
+ <name>ps-to-CSTNET-V6-nren</name>
+ <term>
+ <name>to-CSTNET-block</name>
+ <from>
+ <community>geant-interco-block</community>
+ <community>geant-CSTNET-block</community>
+ </from>
+ <then>
+ <reject/>
+ </then>
+ </term>
+ <term>
+ <name>to-CSTNET-prepend1</name>
+ <from>
+ <community>geant-CSTNET-prepend1</community>
+ <community>geant-interco-prepend1</community>
+ </from>
+ <then>
+ <as-path-prepend>20965</as-path-prepend>
+ </then>
+ </term>
+ <term>
+ <name>to-CSTNET-prepend2</name>
+ <from>
+ <community>geant-CSTNET-prepend2</community>
+ <community>geant-interco-prepend2</community>
+ </from>
+ <then>
+ <as-path-prepend>20965 20965</as-path-prepend>
+ </then>
+ </term>
+ <term>
+ <name>to-CSTNET-prepend3</name>
+ <from>
+ <community>geant-interco-prepend3</community>
+ <community>geant-CSTNET-prepend3</community>
+ </from>
+ <then>
+ <as-path-prepend>20965 20965 20965</as-path-prepend>
+ <next>term</next>
+ </then>
+ </term>
+ <term>
+ <name>to-CSTNET-prepend6</name>
+ <from>
+ <community>geant-interco-prepend6</community>
+ <community>geant-CSTNET-prepend6</community>
+ </from>
+ <then>
+ <as-path-prepend>20965 20965 20965 20965 20965 20965</as-path-prepend>
+ <next>term</next>
+ </then>
+ </term>
+ <term>
+ <name>CSTNET-community</name>
+ <from>
+ <prefix-list>
+ <name>ITER-sites-Europe</name>
+ </prefix-list>
+ </from>
+ <then>
+ <community>
+ <add/>
+ <community-name>GEANT-ITER</community-name>
+ </community>
+ <next>term</next>
+ </then>
+ </term>
+ <term>
+ <name>to-CSTNET-accept</name>
+ <from>
+ <community>geant-clara</community>
+ <community>geant-nrn</community>
+ <community>geant-ubuntunet</community>
+ </from>
+ <then>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>exception-block</name>
+ <from>
+ <community>geant-dummy</community>
+ </from>
+ <then>
+ <reject/>
+ </then>
+ </term>
+ <term>
+ <name>to-CSTNET-V6-nren-general</name>
+ <from>
+ <family>inet6</family>
+ <community>geant-nrn</community>
+ <community>geant-clara</community>
+ <community>geant-ubuntunet</community>
+ <community>geant-silk</community>
+ <community>geant-caren</community>
+ <community>geant-asren</community>
+ </from>
+ <then>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>to-CSTNET-V6-nren-drop</name>
+ <then>
+ <reject/>
+ </then>
+ </term>
+ </policy-statement>
<policy-statement>
<name>ps-to-CYNET-nren</name>
<term>
@@ -37971,6 +39157,26 @@
<name>GEANT-ITER</name>
<members>20965:65124</members>
</community>
+ <community>
+ <name>GOOGLE-test-prepend-1</name>
+ <members>64801:15169</members>
+ <members>64812:15169</members>
+ </community>
+ <community>
+ <name>GOOGLE-test-prepend-2</name>
+ <members>64802:15169</members>
+ <members>64812:15169</members>
+ </community>
+ <community>
+ <name>GOOGLE-test-prepend-3</name>
+ <members>64803:15169</members>
+ <members>64812:15169</members>
+ </community>
+ <community>
+ <name>GOOGLE-test-prepend-6</name>
+ <members>64806:15169</members>
+ <members>64812:15169</members>
+ </community>
<community>
<name>IAS_AGGREGATE_ROUTES</name>
<members>21320:64912</members>
@@ -47300,6 +48506,30 @@
<name>geant-AzScienceNet</name>
<members>20965:64550</members>
</community>
+ <community>
+ <name>geant-CSTNET</name>
+ <members>20965:7497</members>
+ </community>
+ <community>
+ <name>geant-CSTNET-block</name>
+ <members>20965:2000</members>
+ </community>
+ <community>
+ <name>geant-CSTNET-prepend1</name>
+ <members>20965:2010</members>
+ </community>
+ <community>
+ <name>geant-CSTNET-prepend2</name>
+ <members>20965:2020</members>
+ </community>
+ <community>
+ <name>geant-CSTNET-prepend3</name>
+ <members>20965:2030</members>
+ </community>
+ <community>
+ <name>geant-CSTNET-prepend6</name>
+ <members>20965:2060</members>
+ </community>
<community>
<name>geant-IAS-dws-block</name>
<members>64512:65534</members>
@@ -47692,6 +48922,10 @@
<name>geant-tifr</name>
<members>20965:64512</members>
</community>
+ <community>
+ <name>geant-ubuntunet</name>
+ <members>20965:36944</members>
+ </community>
<community>
<name>geant-ulakbim-block</name>
<members>64512:8517</members>
@@ -47859,13 +49093,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -47881,14 +49108,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp>
<name>backbone-classifier</name>
@@ -47900,18 +49119,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -47919,342 +49126,17 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>iperf-classifier</name>
- <import>default</import>
<forwarding-class>
<name>expedited-forwarding</name>
<loss-priority>
<name>low</name>
- <code-points>af12</code-points>
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
- <dscp-ipv6>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
<dscp-ipv6>
<name>backbone-classifier</name>
<import>default</import>
@@ -48265,18 +49147,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -48284,13 +49154,7 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -48313,13 +49177,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -48335,41 +49192,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>iperf-classifier</name>
- <import>default</import>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>af12</code-points>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-access-classifier</name>
@@ -48378,16 +49200,16 @@
<name>be</name>
<loss-priority>
<name>low</name>
- <code-points>000</code-points>
- <code-points>001</code-points>
- <code-points>010</code-points>
- <code-points>011</code-points>
- <code-points>110</code-points>
- <code-points>111</code-points>
+ <code-points>100</code-points>
+ <code-points>101</code-points>
</loss-priority>
</forwarding-class>
+ </exp>
+ <exp>
+ <name>mpls-backbone-classifier</name>
+ <import>default</import>
<forwarding-class>
- <name>less-than-best-effort</name>
+ <name>be</name>
<loss-priority>
<name>low</name>
<code-points>100</code-points>
@@ -48395,40 +49217,7 @@
</loss-priority>
</forwarding-class>
</exp>
- <exp>
- <name>mpls-backbone-classifier</name>
- <import>default</import>
- </exp>
</classifiers>
- <code-point-aliases>
- <dscp>
- <name>ix</name>
- <bits>101001</bits>
- </dscp>
- <dscp>
- <name>dws</name>
- <bits>100000</bits>
- </dscp>
- <dscp-ipv6>
- <name>dws</name>
- <bits>100000</bits>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix</name>
- <bits>101001</bits>
- </dscp-ipv6>
- </code-point-aliases>
- <drop-profiles>
- <name>dws-drop-profile</name>
- <fill-level>
- <name>35</name>
- <drop-probability>10</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<drop-profiles>
<name>be-drop-profile</name>
<fill-level>
@@ -48448,59 +49237,40 @@
<drop-probability>100</drop-probability>
</fill-level>
</drop-profiles>
- <drop-profiles>
- <name>less-than-be-drop-profile</name>
- <fill-level>
- <name>25</name>
- <drop-probability>30</drop-probability>
- </fill-level>
- <fill-level>
- <name>30</name>
- <drop-probability>50</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>70</drop-probability>
- </fill-level>
- <fill-level>
- <name>50</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<forwarding-classes>
<class>
<name>be</name>
<queue-num>0</queue-num>
</class>
- <class>
- <name>be-ix</name>
- <queue-num>0</queue-num>
- </class>
<class>
<name>expedited-forwarding</name>
<queue-num>1</queue-num>
</class>
- <class>
- <name>less-than-best-effort</name>
- <queue-num>2</queue-num>
- </class>
<class>
<name>network-control</name>
<queue-num>3</queue-num>
</class>
- <class>
- <name>be-dws</name>
- <queue-num>0</queue-num>
- </class>
- <class>
- <name>be-bleach</name>
- <queue-num>0</queue-num>
- </class>
</forwarding-classes>
<interfaces>
+ <interface>
+ <name>et-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>ge-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>so-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>xe-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
<interface>
<name>ge-1/2/8</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>10</name>
<classifiers>
@@ -48565,22 +49335,6 @@
</dscp>
</rewrite-rules>
</unit>
- <unit>
- <name>71</name>
- <classifiers>
- <dscp>
- <name>iperf-classifier</name>
- </dscp>
- <dscp-ipv6>
- <name>iperf-classifier</name>
- </dscp-ipv6>
- </classifiers>
- <rewrite-rules>
- <dscp>
- <name>basic-rewrite-rules</name>
- </dscp>
- </rewrite-rules>
- </unit>
<unit>
<name>153</name>
<classifiers>
@@ -48605,19 +49359,11 @@
</rewrite-rules>
</unit>
</interface>
- <interface inactive="inactive">
+ <interface>
<name>xe-3/0/2</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
- <classifiers>
- <dscp>
- <name>dws-access-classifier</name>
- </dscp>
- <dscp-ipv6>
- <name>dws-access-classifier</name>
- </dscp-ipv6>
- </classifiers>
<rewrite-rules>
<dscp>
<name>basic-rewrite-rules</name>
@@ -48628,9 +49374,13 @@
</rewrite-rules>
</unit>
</interface>
+ <interface>
+ <name>ae*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
<interface>
<name>ae0</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -48648,17 +49398,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -48666,10 +49408,10 @@
</rewrite-rules>
</unit>
</interface>
- <interface inactive="inactive">
+ <interface>
<name>ae1</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
- <unit inactive="inactive">
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ <unit>
<name>0</name>
<classifiers>
<dscp>
@@ -48686,17 +49428,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -48706,7 +49440,7 @@
</interface>
<interface>
<name>ae3</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -48724,17 +49458,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -48742,9 +49468,9 @@
</rewrite-rules>
</unit>
</interface>
- <interface inactive="inactive">
+ <interface>
<name>ae4</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -48762,17 +49488,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -48782,7 +49500,7 @@
</interface>
<interface>
<name>ae5</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -48800,17 +49518,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -48820,7 +49530,7 @@
</interface>
<interface>
<name>ae6</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>1</name>
<classifiers>
@@ -48838,17 +49548,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -48872,17 +49574,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -48892,7 +49586,7 @@
</interface>
<interface>
<name>ae11</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>100</name>
<classifiers>
@@ -48916,47 +49610,9 @@
</classifiers>
</unit>
</interface>
- <interface inactive="inactive">
- <name>ae12</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
- <unit>
- <name>100</name>
- <classifiers>
- <dscp>
- <name>ix-access-classifier</name>
- </dscp>
- <dscp-ipv6>
- <name>ix-access-classifier</name>
- </dscp-ipv6>
- </classifiers>
- <rewrite-rules>
- <dscp>
- <name>basic-rewrite-rules</name>
- </dscp>
- <dscp-ipv6>
- <name>basic-rewrite-rules</name>
- </dscp-ipv6>
- </rewrite-rules>
- </unit>
- </interface>
- <interface inactive="inactive">
- <name>ae13</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
- <unit>
- <name>0</name>
- <classifiers>
- <dscp>
- <name>ix-access-classifier</name>
- </dscp>
- <dscp-ipv6>
- <name>ix-access-classifier</name>
- </dscp-ipv6>
- </classifiers>
- </unit>
- </interface>
<interface>
<name>ae14</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -48983,6 +49639,7 @@
</interface>
<interface>
<name>ae17</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>200</name>
<classifiers>
@@ -48993,11 +49650,19 @@
<name>access-classifier</name>
</dscp-ipv6>
</classifiers>
+ <rewrite-rules>
+ <dscp>
+ <name>basic-rewrite-rules</name>
+ </dscp>
+ <dscp-ipv6>
+ <name>basic-rewrite-rules</name>
+ </dscp-ipv6>
+ </rewrite-rules>
</unit>
</interface>
<interface>
<name>ae18</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>333</name>
<classifiers>
@@ -49028,7 +49693,7 @@
</interface>
<interface>
<name>ae21</name>
- <scheduler-map>MAP-BASIC-IUCC</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>100</name>
<classifiers>
@@ -49059,7 +49724,7 @@
</interface>
<interface>
<name>ae22</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -49090,6 +49755,26 @@
</interface>
<interface>
<name>ae23</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ <unit>
+ <name>200</name>
+ <classifiers>
+ <dscp>
+ <name>access-classifier</name>
+ </dscp>
+ <dscp-ipv6>
+ <name>access-classifier</name>
+ </dscp-ipv6>
+ </classifiers>
+ <rewrite-rules>
+ <dscp>
+ <name>basic-rewrite-rules</name>
+ </dscp>
+ <dscp-ipv6>
+ <name>basic-rewrite-rules</name>
+ </dscp-ipv6>
+ </rewrite-rules>
+ </unit>
<unit>
<name>300</name>
<classifiers>
@@ -49104,12 +49789,15 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
+ <dscp-ipv6>
+ <name>basic-rewrite-rules</name>
+ </dscp-ipv6>
</rewrite-rules>
</unit>
</interface>
<interface>
<name>ae27</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -49138,19 +49826,11 @@
</classifiers>
</unit>
</interface>
- <interface inactive="inactive">
+ <interface>
<name>ae32</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
- <classifiers>
- <dscp>
- <name>dws-access-classifier</name>
- </dscp>
- <dscp-ipv6>
- <name>dws-access-classifier</name>
- </dscp-ipv6>
- </classifiers>
<rewrite-rules>
<dscp>
<name>basic-rewrite-rules</name>
@@ -49165,13 +49845,6 @@
<rewrite-rules>
<dscp>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -49186,17 +49859,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -49208,177 +49870,9 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>basic-rewrite-rules-CAREN</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>000000</code-point>
- </loss-priority>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -49393,17 +49887,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -49415,153 +49898,6 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>basic-rewrite-rules-CAREN</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
@@ -49569,58 +49905,19 @@
</exp>
</rewrite-rules>
<scheduler-maps>
- <name>MAP-BASIC-IQ2</name>
+ <name>GEANT-BASIC</name>
<forwarding-class>
<name>expedited-forwarding</name>
<scheduler>sch-expedited-forwarding</scheduler>
</forwarding-class>
<forwarding-class>
<name>network-control</name>
- <scheduler>sch-network-ctrl-iq2</scheduler>
+ <scheduler>sch-network-ctrl-geant</scheduler>
</forwarding-class>
<forwarding-class>
<name>be</name>
<scheduler>sch-be</scheduler>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <scheduler>sch-less-than-best-effort</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- </scheduler-maps>
- <scheduler-maps>
- <name>MAP-BASIC-IUCC</name>
- <forwarding-class>
- <name>be</name>
- <scheduler>sch-be_2</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <scheduler>sch-be_2</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <scheduler>sch-expedited-forwarding_2</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <scheduler>sch-less-than-best-effort</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <scheduler>sch-network-ctrl</scheduler>
- </forwarding-class>
</scheduler-maps>
<schedulers>
<name>sch-be</name>
@@ -49640,60 +49937,31 @@
<priority>strict-high</priority>
</schedulers>
<schedulers>
- <name>sch-less-than-best-effort</name>
+ <name>sch-be_2</name>
<transmit-rate>
- <percent>10</percent>
+ <percent>45</percent>
</transmit-rate>
<buffer-size>
- <percent>10</percent>
+ <percent>25</percent>
</buffer-size>
<priority>low</priority>
- <drop-profile-map>
- <loss-priority>low</loss-priority>
- <protocol>any</protocol>
- <drop-profile>less-than-be-drop-profile</drop-profile>
- </drop-profile-map>
- <drop-profile-map>
- <loss-priority>high</loss-priority>
- <protocol>any</protocol>
- <drop-profile>be-drop-profile</drop-profile>
- </drop-profile-map>
</schedulers>
<schedulers>
- <name>sch-network-ctrl</name>
- <transmit-rate>
- <percent>5</percent>
- </transmit-rate>
+ <name>sch-expedited-forwarding_2</name>
<buffer-size>
- <percent>5</percent>
+ <percent>10</percent>
</buffer-size>
- <priority>high</priority>
+ <priority>strict-high</priority>
</schedulers>
<schedulers>
- <name>sch-network-ctrl-iq2</name>
+ <name>sch-network-ctrl-geant</name>
<transmit-rate>
<percent>5</percent>
</transmit-rate>
<buffer-size>
<percent>5</percent>
</buffer-size>
- </schedulers>
- <schedulers>
- <name>sch-be_2</name>
- <transmit-rate>
- <percent>45</percent>
- </transmit-rate>
- <buffer-size>
- <percent>25</percent>
- </buffer-size>
- <priority>low</priority>
- </schedulers>
- <schedulers>
- <name>sch-expedited-forwarding_2</name>
- <buffer-size>
- <percent>10</percent>
- </buffer-size>
- <priority>strict-high</priority>
+ <priority>high</priority>
</schedulers>
</class-of-service>
<firewall>
@@ -50229,6 +50497,12 @@
<source-address>
<name>80.81.193.40/32</name>
</source-address>
+ <source-address>
+ <name>80.81.195.176/32</name>
+ </source-address>
+ <source-address>
+ <name>80.81.195.141/32</name>
+ </source-address>
<destination-address>
<name>80.81.192.173/32</name>
</destination-address>
@@ -51205,31 +51479,6 @@
<accept/>
</then>
</term>
- <term inactive="inactive">
- <name>LBE-Karcern-DE1-CH1</name>
- <from>
- <source-address>
- <name>192.108.46.0/24</name>
- </source-address>
- <source-address>
- <name>192.108.45.128/26</name>
- </source-address>
- <destination-address>
- <name>192.16.161.0/28</name>
- </destination-address>
- <destination-address>
- <name>128.142.224.0/20</name>
- </destination-address>
- </from>
- <then>
- <count>lbe-in</count>
- <loss-priority>low</loss-priority>
- <forwarding-class>less-than-best-effort</forwarding-class>
- <routing-instance>
- <routing-instance-name>LSP-next</routing-instance-name>
- </routing-instance>
- </then>
- </term>
<term>
<name>BOGON-filter</name>
<from>
@@ -66448,6 +66697,9 @@
<source-prefix-list>
<name>dashboard-servers</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers</name>
+ </source-prefix-list>
<protocol>tcp</protocol>
<destination-port>ssh</destination-port>
</from>
@@ -67651,37 +67903,6 @@
</discard>
</then>
</term>
- <term inactive="inactive">
- <name>CORE_filter</name>
- <from>
- <destination-prefix-list>
- <name>geant-address-space</name>
- </destination-prefix-list>
- </from>
- <then>
- <count>core-attack</count>
- <discard>
- </discard>
- </then>
- </term>
- <term>
- <name>MCAST_in</name>
- <from>
- <destination-address>
- <name>224.0.0.0/4</name>
- </destination-address>
- </from>
- <then>
- <count>mcast-in</count>
- <accept/>
- </then>
- </term>
- <term>
- <name>default</name>
- <then>
- <accept/>
- </then>
- </term>
<term>
<name>SPOOF_filter</name>
<from>
@@ -67732,6 +67953,19 @@
<accept/>
</then>
</term>
+ <term>
+ <name>ICMP_accept</name>
+ <from>
+ <destination-prefix-list>
+ <name>geant-address-space</name>
+ </destination-prefix-list>
+ <protocol>icmp</protocol>
+ </from>
+ <then>
+ <policer>ICMP-flood</policer>
+ <accept/>
+ </then>
+ </term>
<term>
<name>External_project_interfaces</name>
<from>
@@ -67755,6 +67989,20 @@
<accept/>
</then>
</term>
+ <term>
+ <name>UDP_traceroute</name>
+ <from>
+ <destination-prefix-list>
+ <name>geant-address-space</name>
+ </destination-prefix-list>
+ <protocol>udp</protocol>
+ <destination-port>33434-33690</destination-port>
+ </from>
+ <then>
+ <policer>ICMP-flood</policer>
+ <accept/>
+ </then>
+ </term>
<term>
<name>RSVP_allow</name>
<from>
@@ -67765,29 +68013,33 @@
</then>
</term>
<term>
- <name>ICMP_accept</name>
+ <name>CORE_filter</name>
<from>
<destination-prefix-list>
<name>geant-address-space</name>
</destination-prefix-list>
- <protocol>icmp</protocol>
</from>
<then>
- <policer>ICMP-flood</policer>
- <accept/>
+ <count>core-attack</count>
+ <discard>
+ </discard>
</then>
</term>
<term>
- <name>UDP_traceroute</name>
+ <name>MCAST_in</name>
<from>
- <destination-prefix-list>
- <name>geant-address-space</name>
- </destination-prefix-list>
- <protocol>udp</protocol>
- <destination-port>33434-33690</destination-port>
+ <destination-address>
+ <name>224.0.0.0/4</name>
+ </destination-address>
</from>
<then>
- <policer>ICMP-flood</policer>
+ <count>mcast-in</count>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>default</name>
+ <then>
<accept/>
</then>
</term>
@@ -69011,6 +69263,9 @@
<name>83.97.92.0/22</name>
<except/>
</source-address>
+ <source-address>
+ <name>0.0.0.0/0</name>
+ </source-address>
</from>
<then>
<discard>
@@ -69744,6 +69999,585 @@
</then>
</term>
</filter>
+ <filter>
+ <name>CSTNET-in</name>
+ <interface-specific/>
+ <term>
+ <name>sample</name>
+ <then>
+ <sample/>
+ <next>term</next>
+ </then>
+ </term>
+ <term>
+ <name>temp-china-bad-ip</name>
+ <from>
+ <source-address>
+ <name>116.10.191.185/32</name>
+ </source-address>
+ </from>
+ <then>
+ <count>china-bad</count>
+ <discard>
+ </discard>
+ </then>
+ </term>
+ <term>
+ <name>perfSONAR-temp</name>
+ <from>
+ <source-address>
+ <name>202.179.242.9/32</name>
+ </source-address>
+ <source-address>
+ <name>202.179.246.18/32</name>
+ </source-address>
+ <source-address>
+ <name>202.179.254.18/32</name>
+ </source-address>
+ <source-address>
+ <name>202.179.252.18/32</name>
+ </source-address>
+ <destination-address>
+ <name>62.40.105.2/32</name>
+ </destination-address>
+ <destination-address>
+ <name>62.40.105.4/32</name>
+ </destination-address>
+ </from>
+ <then>
+ <count>tein-nagios</count>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>TEIN-IPERF</name>
+ <from>
+ <source-address>
+ <name>210.25.189.112/32</name>
+ </source-address>
+ <destination-address>
+ <name>62.40.123.114/32</name>
+ </destination-address>
+ <destination-address>
+ <name>62.40.122.114/32</name>
+ </destination-address>
+ </from>
+ <then>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>BOGON-filter</name>
+ <from>
+ <source-prefix-list>
+ <name>bogons-list</name>
+ </source-prefix-list>
+ </from>
+ <then>
+ <count>bogons-source</count>
+ <discard>
+ </discard>
+ </then>
+ </term>
+ <term>
+ <name>dos-source-counting</name>
+ <from>
+ <source-prefix-list>
+ <name>dos-attack-source-count</name>
+ </source-prefix-list>
+ </from>
+ <then>
+ <count>dos-attack-traffic-count</count>
+ <next>term</next>
+ </then>
+ </term>
+ <term>
+ <name>dos-destination-counting</name>
+ <from>
+ <destination-prefix-list>
+ <name>dos-attack-destination-count</name>
+ </destination-prefix-list>
+ </from>
+ <then>
+ <count>dos-attack-traffic-count</count>
+ <next>term</next>
+ </then>
+ </term>
+ <term>
+ <name>dos-source-filtering</name>
+ <from>
+ <source-prefix-list>
+ <name>dos-attack-source</name>
+ </source-prefix-list>
+ </from>
+ <then>
+ <count>dos-attack-traffic</count>
+ <discard>
+ </discard>
+ </then>
+ </term>
+ <term>
+ <name>dos-destination-filtering</name>
+ <from>
+ <destination-prefix-list>
+ <name>dos-attack-destination</name>
+ </destination-prefix-list>
+ </from>
+ <then>
+ <count>dos-attack-traffic</count>
+ <discard>
+ </discard>
+ </then>
+ </term>
+ <term>
+ <name>transit-network-control-traffic</name>
+ <from>
+ <destination-prefix-list>
+ <name>geant-address-space</name>
+ </destination-prefix-list>
+ <dscp>48</dscp>
+ <dscp>56</dscp>
+ </from>
+ <then>
+ <loss-priority>low</loss-priority>
+ <forwarding-class>network-control</forwarding-class>
+ <next>term</next>
+ </then>
+ </term>
+ <term>
+ <name>bfd-ports</name>
+ <from>
+ <source-address>
+ <name>62.40.127.129/32</name>
+ </source-address>
+ <destination-address>
+ <name>62.40.127.128/32</name>
+ </destination-address>
+ <port>3784</port>
+ <port>3785</port>
+ </from>
+ <then>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>BGP-protect</name>
+ <from>
+ <source-address>
+ <name>62.40.127.129/32</name>
+ </source-address>
+ <destination-address>
+ <name>62.40.127.128/32</name>
+ </destination-address>
+ <protocol>tcp</protocol>
+ <port>bgp</port>
+ </from>
+ <then>
+ <count>bgp-accept</count>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>BGP-filter</name>
+ <from>
+ <destination-prefix-list>
+ <name>geant-address-space</name>
+ </destination-prefix-list>
+ <protocol>tcp</protocol>
+ <port>bgp</port>
+ </from>
+ <then>
+ <count>bgp-attack</count>
+ <syslog/>
+ <discard>
+ </discard>
+ </then>
+ </term>
+ <term>
+ <name>MSDP-protect</name>
+ <from>
+ <source-address>
+ <name>202.179.241.21/32</name>
+ </source-address>
+ <source-address>
+ <name>202.179.241.41/32</name>
+ </source-address>
+ <source-address>
+ <name>202.179.240.2/32</name>
+ </source-address>
+ <source-address>
+ <name>210.25.189.2/32</name>
+ </source-address>
+ <destination-address>
+ <name>202.179.241.22/32</name>
+ </destination-address>
+ <destination-address>
+ <name>202.179.241.42/32</name>
+ </destination-address>
+ <destination-address>
+ <name>210.25.189.54/32</name>
+ </destination-address>
+ <destination-address>
+ <name>62.40.114.53/32</name>
+ </destination-address>
+ <destination-address>
+ <name>62.40.127.128/32</name>
+ </destination-address>
+ <protocol>tcp</protocol>
+ <port>msdp</port>
+ </from>
+ <then>
+ <count>msdp-accept</count>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>MSDP-filter</name>
+ <from>
+ <destination-prefix-list>
+ <name>geant-address-space</name>
+ </destination-prefix-list>
+ <protocol>tcp</protocol>
+ <port>msdp</port>
+ </from>
+ <then>
+ <count>msdp-attack</count>
+ <syslog/>
+ <discard>
+ </discard>
+ </then>
+ </term>
+ <term>
+ <name>PIM-protect</name>
+ <from>
+ <source-address>
+ <name>202.179.241.21/32</name>
+ </source-address>
+ <source-address>
+ <name>202.179.241.41/32</name>
+ </source-address>
+ <source-address>
+ <name>62.40.127.129/32</name>
+ </source-address>
+ <destination-address>
+ <name>202.179.241.22/32</name>
+ </destination-address>
+ <destination-address>
+ <name>62.40.114.53/32</name>
+ </destination-address>
+ <destination-address>
+ <name>202.179.241.42/32</name>
+ </destination-address>
+ <destination-address>
+ <name>62.40.127.128/32</name>
+ </destination-address>
+ <protocol>pim</protocol>
+ <protocol>igmp</protocol>
+ </from>
+ <then>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>PIM-filter</name>
+ <from>
+ <destination-prefix-list>
+ <name>geant-address-space</name>
+ </destination-prefix-list>
+ <protocol>pim</protocol>
+ <protocol>igmp</protocol>
+ </from>
+ <then>
+ <count>pim-attack</count>
+ <syslog/>
+ <discard>
+ </discard>
+ </then>
+ </term>
+ <term>
+ <name>TUNNEL-accept</name>
+ <from>
+ <prefix-list>
+ <name>geant-address-space</name>
+ </prefix-list>
+ <protocol>gre</protocol>
+ <protocol>ipip</protocol>
+ </from>
+ <then>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>SPOOF-filter</name>
+ <from>
+ <source-prefix-list>
+ <name>corporate-address-space</name>
+ </source-prefix-list>
+ <source-prefix-list>
+ <name>geantncc-address-space</name>
+ </source-prefix-list>
+ </from>
+ <then>
+ <count>spoofed-attack-traffic</count>
+ <discard>
+ </discard>
+ </then>
+ </term>
+ <term>
+ <name>WEB-server-accept</name>
+ <from>
+ <destination-address>
+ <name>62.40.122.147/32</name>
+ </destination-address>
+ <protocol>tcp</protocol>
+ <port>http</port>
+ </from>
+ <then>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>NTP-server-accept</name>
+ <from>
+ <source-address>
+ <name>132.236.56.250/32</name>
+ </source-address>
+ <protocol>udp</protocol>
+ <port>123</port>
+ <port>ntp</port>
+ </from>
+ <then>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>DNS-server-accept</name>
+ <from>
+ <destination-prefix-list>
+ <name>GEANT-DNS</name>
+ </destination-prefix-list>
+ <protocol>udp</protocol>
+ <protocol>tcp</protocol>
+ <port>domain</port>
+ </from>
+ <then>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>ICMP-accept</name>
+ <from>
+ <destination-prefix-list>
+ <name>geant-address-space</name>
+ </destination-prefix-list>
+ <protocol>icmp</protocol>
+ </from>
+ <then>
+ <policer>ICMP-flood</policer>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>ICMP-TEIN2-accept</name>
+ <from>
+ <destination-address>
+ <name>202.179.241.22/32</name>
+ </destination-address>
+ <destination-address>
+ <name>62.40.114.53/32</name>
+ </destination-address>
+ <protocol>icmp</protocol>
+ </from>
+ <then>
+ <policer>ICMP-flood</policer>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>External-project-interfaces</name>
+ <from>
+ <destination-prefix-list>
+ <name>external-project-interfaces</name>
+ </destination-prefix-list>
+ </from>
+ <then>
+ <discard>
+ </discard>
+ </then>
+ </term>
+ <term>
+ <name>External-Projects</name>
+ <from>
+ <destination-prefix-list>
+ <name>external-project</name>
+ </destination-prefix-list>
+ </from>
+ <then>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>External-Equipment</name>
+ <from>
+ <destination-address>
+ <name>62.40.126.0/24</name>
+ </destination-address>
+ </from>
+ <then>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>UDP-traceroute</name>
+ <from>
+ <destination-prefix-list>
+ <name>geant-address-space</name>
+ </destination-prefix-list>
+ <protocol>udp</protocol>
+ <destination-port>33434-33690</destination-port>
+ </from>
+ <then>
+ <policer>ICMP-flood</policer>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>NOC-accept</name>
+ <from>
+ <destination-prefix-list>
+ <name>geantncc-address-space</name>
+ </destination-prefix-list>
+ </from>
+ <then>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>CORE-filter</name>
+ <from>
+ <destination-prefix-list>
+ <name>geant-address-space</name>
+ </destination-prefix-list>
+ </from>
+ <then>
+ <count>core-attack</count>
+ <discard>
+ </discard>
+ </then>
+ </term>
+ <term>
+ <name>TEIN2-allocated-prefixes</name>
+ <from>
+ <destination-address>
+ <name>202.179.241.22/32</name>
+ </destination-address>
+ <destination-address>
+ <name>62.40.127.129/32</name>
+ </destination-address>
+ </from>
+ <then>
+ <discard>
+ </discard>
+ </then>
+ </term>
+ <term>
+ <name>DWS-in</name>
+ <from>
+ <dscp>32</dscp>
+ </from>
+ <then>
+ <count>dws-in</count>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>LBE-in</name>
+ <from>
+ <dscp>8</dscp>
+ </from>
+ <then>
+ <count>lbe-in</count>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>mcast-in</name>
+ <from>
+ <destination-address>
+ <name>224.0.0.0/4</name>
+ </destination-address>
+ </from>
+ <then>
+ <count>mcast-in</count>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>default</name>
+ <then>
+ <accept/>
+ </then>
+ </term>
+ </filter>
+ <filter>
+ <name>CSTNET-out</name>
+ <interface-specific/>
+ <term>
+ <name>TEIN-IPERF</name>
+ <from>
+ <source-address>
+ <name>62.40.123.114/32</name>
+ </source-address>
+ <source-address>
+ <name>62.40.122.114/32</name>
+ </source-address>
+ <destination-address>
+ <name>210.25.189.112/32</name>
+ </destination-address>
+ </from>
+ <then>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>DWS-out</name>
+ <from>
+ <dscp>32</dscp>
+ </from>
+ <then>
+ <count>DWS-out</count>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>LBE-out</name>
+ <from>
+ <dscp>8</dscp>
+ </from>
+ <then>
+ <count>LBE-out</count>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>mcast-out</name>
+ <from>
+ <destination-address>
+ <name>224.0.0.0/4</name>
+ </destination-address>
+ </from>
+ <then>
+ <count>mcast-out</count>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>default</name>
+ <then>
+ <accept/>
+ </then>
+ </term>
+ </filter>
</inet>
<inet6>
<filter>
@@ -70266,6 +71100,12 @@
<source-address>
<name>2001:7f8::829e:0:2/128</name>
</source-address>
+ <source-address>
+ <name>2001:7f8::80a6:0:4/128</name>
+ </source-address>
+ <source-address>
+ <name>2001:7f8::80a6:0:3/128</name>
+ </source-address>
<destination-address>
<name>2001:798:14:10aa::9/128</name>
</destination-address>
@@ -74509,6 +75349,9 @@
<source-prefix-list>
<name>dashboard-servers-v6</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers-v6</name>
+ </source-prefix-list>
<next-header>tcp</next-header>
<port>ssh</port>
</from>
@@ -77296,6 +78139,9 @@
<name>2001:798:3::/64</name>
<except/>
</source-address>
+ <source-address>
+ <name>::/0</name>
+ </source-address>
</from>
<then>
<discard/>
@@ -78043,21 +78889,291 @@
</term>
</filter>
<filter>
- <name>PSMP_NETMON_V6_OUT</name>
+ <name>PSMP_NETMON_V6_OUT</name>
+ <term>
+ <name>VLAN-Access_Allow_TCP</name>
+ <from>
+ <port>5677</port>
+ <port>8765</port>
+ </from>
+ <then>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>VLAN-Access_Allow_UDP</name>
+ <from>
+ <port>8760-9960</port>
+ </from>
+ <then>
+ <accept/>
+ </then>
+ </term>
+ </filter>
+ <filter>
+ <name>CSTNET6-in</name>
<term>
- <name>VLAN-Access_Allow_TCP</name>
+ <name>sample</name>
+ <then>
+ <sample/>
+ <next>term</next>
+ </then>
+ </term>
+ <term>
+ <name>BOGON-filter6</name>
<from>
- <port>5677</port>
- <port>8765</port>
+ <source-prefix-list>
+ <name>bogons-list6</name>
+ </source-prefix-list>
+ </from>
+ <then>
+ <count>bogons-source6</count>
+ <discard/>
+ </then>
+ </term>
+ <term>
+ <name>dos-source-counting6</name>
+ <from>
+ <source-prefix-list>
+ <name>dos-attack-source-count6</name>
+ </source-prefix-list>
+ </from>
+ <then>
+ <count>dos-attack-traffic-count6</count>
+ <next>term</next>
+ </then>
+ </term>
+ <term>
+ <name>dos-destination-counting6</name>
+ <from>
+ <destination-prefix-list>
+ <name>dos-attack-destination-count6</name>
+ </destination-prefix-list>
+ </from>
+ <then>
+ <count>dos-attack-traffic-count6</count>
+ <next>term</next>
+ </then>
+ </term>
+ <term>
+ <name>dos-source-filtering6</name>
+ <from>
+ <source-prefix-list>
+ <name>dos-attack-source6</name>
+ </source-prefix-list>
+ </from>
+ <then>
+ <count>dos-attack-traffic6</count>
+ <discard/>
+ </then>
+ </term>
+ <term>
+ <name>dos-destination-filtering6</name>
+ <from>
+ <destination-prefix-list>
+ <name>dos-attack-destination6</name>
+ </destination-prefix-list>
+ </from>
+ <then>
+ <count>dos-attack-traffic6</count>
+ <discard/>
+ </then>
+ </term>
+ <term>
+ <name>SPOOF-filter6</name>
+ <from>
+ <source-prefix-list>
+ <name>corporate-address-space6</name>
+ </source-prefix-list>
+ <source-prefix-list>
+ <name>geantnoc-address-space6</name>
+ </source-prefix-list>
+ </from>
+ <then>
+ <count>spoofed-attack-traffic6</count>
+ <discard/>
+ </then>
+ </term>
+ <term>
+ <name>NOC6-accept</name>
+ <from>
+ <destination-prefix-list>
+ <name>geantnoc-address-space6</name>
+ </destination-prefix-list>
</from>
<then>
<accept/>
</then>
</term>
<term>
- <name>VLAN-Access_Allow_UDP</name>
+ <name>TTM-allow-tcp</name>
<from>
- <port>8760-9960</port>
+ <destination-address>
+ <name>2001:798:2012:47::2/128</name>
+ </destination-address>
+ <payload-protocol>tcp</payload-protocol>
+ <port>9142</port>
+ <port>10259</port>
+ </from>
+ <then>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>TTM-allow-udp</name>
+ <from>
+ <destination-address>
+ <name>2001:798:2012:47::2/128</name>
+ </destination-address>
+ <payload-protocol>udp</payload-protocol>
+ </from>
+ <then>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>BGP6-protect</name>
+ <from>
+ <source-address>
+ <name>2001:798:99:1::b5/127</name>
+ </source-address>
+ <destination-address>
+ <name>2001:798:28:10ff::1/128</name>
+ </destination-address>
+ <destination-address>
+ <name>2001:798:99:1::b4/127</name>
+ </destination-address>
+ <port>bgp</port>
+ </from>
+ <then>
+ <count>bgpv6-accept</count>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>BGP6-filter</name>
+ <from>
+ <destination-prefix-list>
+ <name>geant-address-space-V6</name>
+ </destination-prefix-list>
+ <port>bgp</port>
+ </from>
+ <then>
+ <count>bgpv6-attack</count>
+ <syslog/>
+ <discard/>
+ </then>
+ </term>
+ <term>
+ <name>ICMP-accept</name>
+ <from>
+ <destination-prefix-list>
+ <name>geant-address-space-V6</name>
+ </destination-prefix-list>
+ <payload-protocol>icmp6</payload-protocol>
+ </from>
+ <then>
+ <policer>ICMPv6-flood</policer>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>WEB6-accept</name>
+ <from>
+ <destination-address>
+ <name>2001:798:2:284d::60/128</name>
+ </destination-address>
+ <payload-protocol>tcp</payload-protocol>
+ <port>http</port>
+ </from>
+ <then>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>DNSv6-server-accept</name>
+ <from>
+ <destination-address>
+ <name>2001:798:2:284d::30/128</name>
+ </destination-address>
+ <payload-protocol>udp</payload-protocol>
+ <payload-protocol>tcp</payload-protocol>
+ <port>domain</port>
+ </from>
+ <then>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>UDP-traceroute6</name>
+ <from>
+ <destination-prefix-list>
+ <name>geant-address-space-V6</name>
+ </destination-prefix-list>
+ <payload-protocol>udp</payload-protocol>
+ <destination-port>33434-33690</destination-port>
+ </from>
+ <then>
+ <policer>ICMPv6-flood</policer>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>External-Projects-interfaces6</name>
+ <from>
+ <destination-prefix-list>
+ <name>external-project-interfaces6</name>
+ </destination-prefix-list>
+ </from>
+ <then>
+ <count>extv6-attack</count>
+ <discard/>
+ </then>
+ </term>
+ <term>
+ <name>External-Projects6</name>
+ <from>
+ <destination-prefix-list>
+ <name>external-project6</name>
+ </destination-prefix-list>
+ </from>
+ <then>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>CORE-filter</name>
+ <from>
+ <destination-prefix-list>
+ <name>geant-address-space-V6</name>
+ </destination-prefix-list>
+ </from>
+ <then>
+ <count>corev6-attack</count>
+ <discard/>
+ </then>
+ </term>
+ <term>
+ <name>count-ipv6</name>
+ <then>
+ <count>ipv6-counter</count>
+ <accept/>
+ </then>
+ </term>
+ </filter>
+ <filter>
+ <name>CSTNET6-out</name>
+ <term>
+ <name>count-ipv6</name>
+ <then>
+ <count>ipv6-counter</count>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>PIM-log</name>
+ <from>
+ <next-header>pim</next-header>
</from>
<then>
<accept/>
@@ -79258,7 +80374,7 @@
<prefix-limit>
<maximum>150000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79285,7 +80401,7 @@
<prefix-limit>
<maximum>900</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79321,7 +80437,7 @@
<prefix-limit>
<maximum>2250</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79357,7 +80473,7 @@
<prefix-limit>
<maximum>375</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79393,7 +80509,7 @@
<prefix-limit>
<maximum>300</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79430,7 +80546,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79466,7 +80582,7 @@
<prefix-limit>
<maximum>247500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79502,7 +80618,7 @@
<prefix-limit>
<maximum>4500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79538,7 +80654,7 @@
<prefix-limit>
<maximum>3750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79561,20 +80677,23 @@
</neighbor>
<neighbor>
<name>80.81.194.40</name>
- <description>Facebook</description>
+ <description>Facebook AS32934</description>
+ <passive/>
<import>ps-AS-SELF-REJECT</import>
<import>ps-BOGONS</import>
<import>ps-PRIVATE-AS-BLOCK</import>
<import>IAS_PS-FROM-PUBLIC-PEERS_DE-CIX_HEAD</import>
<import>IAS_PS-FROM-PUBLIC-PEER_AS32934_FACEBOOK_-_Facebook,_Inc.,US_</import>
<import>IAS_PS-FROM-PUBLIC-PEERS_DE-CIX_TAIL</import>
+ <import>ps-deny-all</import>
+ <import>IAS_PS-FROM-PUBLIC-PEER_AS32934_Facebook</import>
<family>
<inet>
<any>
<prefix-limit>
<maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79588,6 +80707,8 @@
<export>IAS_PS-TO-PUBLIC-PEERS_DE-CIX_HEAD</export>
<export>IAS_PS-TO-PUBLIC-PEER_AS32934_FACEBOOK_-_Facebook,_Inc.,US_</export>
<export>IAS_PS-TO-PUBLIC-PEERS_DE-CIX_TAIL</export>
+ <export>ps-deny-all</export>
+ <export>IAS_PS-TO-PUBLIC-PEER_AS32934_Facebook</export>
<peer-as>32934</peer-as>
<local-as>
<as-number>21320</as-number>
@@ -79597,20 +80718,23 @@
</neighbor>
<neighbor>
<name>80.81.195.40</name>
- <description>Facebook (2)</description>
+ <description>Facebook AS32934</description>
+ <passive/>
<import>ps-AS-SELF-REJECT</import>
<import>ps-BOGONS</import>
<import>ps-PRIVATE-AS-BLOCK</import>
<import>IAS_PS-FROM-PUBLIC-PEERS_DE-CIX_HEAD</import>
<import>IAS_PS-FROM-PUBLIC-PEER_AS32934_FACEBOOK_-_Facebook,_Inc.,US_</import>
<import>IAS_PS-FROM-PUBLIC-PEERS_DE-CIX_TAIL</import>
+ <import>ps-deny-all</import>
+ <import>IAS_PS-FROM-PUBLIC-PEER_AS32934_Facebook</import>
<family>
<inet>
<any>
<prefix-limit>
<maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79624,6 +80748,8 @@
<export>IAS_PS-TO-PUBLIC-PEERS_DE-CIX_HEAD</export>
<export>IAS_PS-TO-PUBLIC-PEER_AS32934_FACEBOOK_-_Facebook,_Inc.,US_</export>
<export>IAS_PS-TO-PUBLIC-PEERS_DE-CIX_TAIL</export>
+ <export>ps-deny-all</export>
+ <export>IAS_PS-TO-PUBLIC-PEER_AS32934_Facebook</export>
<peer-as>32934</peer-as>
<local-as>
<as-number>21320</as-number>
@@ -79646,7 +80772,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79683,7 +80809,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79719,7 +80845,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79755,7 +80881,7 @@
<prefix-limit>
<maximum>7350</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79790,9 +80916,9 @@
<inet>
<any>
<prefix-limit>
- <maximum>3750</maximum>
+ <maximum>5000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79826,9 +80952,9 @@
<inet>
<any>
<prefix-limit>
- <maximum>3750</maximum>
+ <maximum>5000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79864,7 +80990,7 @@
<prefix-limit>
<maximum>300</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79900,7 +81026,7 @@
<prefix-limit>
<maximum>90</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79936,7 +81062,7 @@
<prefix-limit>
<maximum>7500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -79973,7 +81099,7 @@
<prefix-limit>
<maximum>7500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80010,7 +81136,7 @@
<prefix-limit>
<maximum>4500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80046,7 +81172,7 @@
<prefix-limit>
<maximum>1350</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
</teardown>
</prefix-limit>
</any>
@@ -80079,7 +81205,7 @@
<prefix-limit>
<maximum>3750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
</teardown>
</prefix-limit>
</any>
@@ -80112,7 +81238,7 @@
<prefix-limit>
<maximum>13500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
</teardown>
</prefix-limit>
</any>
@@ -80145,7 +81271,7 @@
<prefix-limit>
<maximum>130</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
</teardown>
</prefix-limit>
</any>
@@ -80178,7 +81304,7 @@
<prefix-limit>
<maximum>90</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
</teardown>
</prefix-limit>
</any>
@@ -80211,7 +81337,7 @@
<prefix-limit>
<maximum>6000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
</teardown>
</prefix-limit>
</any>
@@ -80244,7 +81370,7 @@
<prefix-limit>
<maximum>6000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
</teardown>
</prefix-limit>
</any>
@@ -80275,9 +81401,9 @@
<inet>
<any>
<prefix-limit>
- <maximum>105</maximum>
+ <maximum>250</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
</teardown>
</prefix-limit>
</any>
@@ -80310,7 +81436,7 @@
<prefix-limit>
<maximum>50</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80347,7 +81473,7 @@
<prefix-limit>
<maximum>50</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80384,7 +81510,7 @@
<prefix-limit>
<maximum>15</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80420,7 +81546,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80456,7 +81582,7 @@
<prefix-limit>
<maximum>30</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80492,7 +81618,7 @@
<prefix-limit>
<maximum>30</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80528,7 +81654,7 @@
<prefix-limit>
<maximum>5000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80564,7 +81690,7 @@
<prefix-limit>
<maximum>1000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80600,7 +81726,7 @@
<prefix-limit>
<maximum>600</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80636,7 +81762,7 @@
<prefix-limit>
<maximum>600</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80672,7 +81798,7 @@
<prefix-limit>
<maximum>7500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80708,7 +81834,7 @@
<prefix-limit>
<maximum>13</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80745,7 +81871,7 @@
<prefix-limit>
<maximum>15000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80781,7 +81907,7 @@
<prefix-limit>
<maximum>15000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80817,7 +81943,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80853,7 +81979,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80889,7 +82015,7 @@
<prefix-limit>
<maximum>935</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80925,7 +82051,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80961,7 +82087,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -80997,7 +82123,7 @@
<prefix-limit>
<maximum>2250</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -81033,7 +82159,7 @@
<prefix-limit>
<maximum>15000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -81069,7 +82195,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -81105,7 +82231,7 @@
<prefix-limit>
<maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -81139,9 +82265,9 @@
<inet>
<any>
<prefix-limit>
- <maximum>5000</maximum>
+ <maximum>7500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -81175,9 +82301,9 @@
<inet>
<any>
<prefix-limit>
- <maximum>5000</maximum>
+ <maximum>7500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -81213,7 +82339,7 @@
<prefix-limit>
<maximum>30</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -81249,7 +82375,7 @@
<prefix-limit>
<maximum>300</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -81285,7 +82411,7 @@
<prefix-limit>
<maximum>30</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -81321,7 +82447,7 @@
<prefix-limit>
<maximum>15000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -81357,7 +82483,7 @@
<prefix-limit>
<maximum>15000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -81393,7 +82519,7 @@
<prefix-limit>
<maximum>900</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -81429,7 +82555,7 @@
<prefix-limit>
<maximum>900</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -81465,7 +82591,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -81501,7 +82627,7 @@
<prefix-limit>
<maximum>7500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -81537,7 +82663,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -81573,7 +82699,7 @@
<prefix-limit>
<maximum>15000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -81609,7 +82735,7 @@
<prefix-limit>
<maximum>15000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -81645,7 +82771,7 @@
<prefix-limit>
<maximum>15000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -81681,7 +82807,7 @@
<prefix-limit>
<maximum>15000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -81717,7 +82843,7 @@
<prefix-limit>
<maximum>3000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -81755,7 +82881,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -81792,7 +82918,7 @@
<prefix-limit>
<maximum>100</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -81828,7 +82954,7 @@
<prefix-limit>
<maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -81864,7 +82990,7 @@
<prefix-limit>
<maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -81898,9 +83024,9 @@
<inet>
<any>
<prefix-limit>
- <maximum>33000</maximum>
+ <maximum>42000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -81936,7 +83062,7 @@
<prefix-limit>
<maximum>30000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -81973,7 +83099,7 @@
<prefix-limit>
<maximum>2250</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82009,7 +83135,7 @@
<prefix-limit>
<maximum>375</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82045,7 +83171,7 @@
<prefix-limit>
<maximum>450</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82082,7 +83208,7 @@
<prefix-limit>
<maximum>300</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82118,7 +83244,7 @@
<prefix-limit>
<maximum>300</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82154,7 +83280,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82190,7 +83316,7 @@
<prefix-limit>
<maximum>7500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82226,7 +83352,7 @@
<prefix-limit>
<maximum>7500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82262,7 +83388,7 @@
<prefix-limit>
<maximum>225</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82298,7 +83424,7 @@
<prefix-limit>
<maximum>375</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82334,7 +83460,7 @@
<prefix-limit>
<maximum>375</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82370,7 +83496,7 @@
<prefix-limit>
<maximum>900</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82406,7 +83532,7 @@
<prefix-limit>
<maximum>900</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82442,7 +83568,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82478,7 +83604,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82514,7 +83640,7 @@
<prefix-limit>
<maximum>3000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82550,7 +83676,7 @@
<prefix-limit>
<maximum>37</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82586,7 +83712,7 @@
<prefix-limit>
<maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82622,7 +83748,7 @@
<prefix-limit>
<maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82658,7 +83784,7 @@
<prefix-limit>
<maximum>300</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82694,7 +83820,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82730,7 +83856,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82916,7 +84042,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82953,7 +84079,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -82989,7 +84115,7 @@
<prefix-limit>
<maximum>172500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -83025,7 +84151,7 @@
<prefix-limit>
<maximum>37500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -83061,7 +84187,7 @@
<prefix-limit>
<maximum>37500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -83082,6 +84208,84 @@
<no-prepend-global-as/>
</local-as>
</neighbor>
+ <neighbor>
+ <name>80.81.195.176</name>
+ <description>Facebook AS32934</description>
+ <passive/>
+ <import>ps-deny-all</import>
+ <import>ps-AS-SELF-REJECT</import>
+ <import>ps-BOGONS</import>
+ <import>ps-PRIVATE-AS-BLOCK</import>
+ <import>IAS_PS-FROM-PUBLIC-PEERS_DE-CIX_HEAD</import>
+ <import>IAS_PS-FROM-PUBLIC-PEER_AS32934_Facebook</import>
+ <import>IAS_PS-FROM-PUBLIC-PEERS_DE-CIX_TAIL</import>
+ <family>
+ <inet>
+ <any>
+ <prefix-limit>
+ <maximum>150</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
+ </prefix-limit>
+ </any>
+ </inet>
+ </family>
+ <export>ps-deny-all</export>
+ <export>ps-BOGONS</export>
+ <export>ps-PRIVATE-AS-BLOCK</export>
+ <export>IAS_PS-TO-PUBLIC-PEERS_DE-CIX_HEAD</export>
+ <export>IAS_PS-TO-PUBLIC-PEER_AS32934_Facebook</export>
+ <export>IAS_PS-TO-PUBLIC-PEERS_DE-CIX_TAIL</export>
+ <peer-as>32934</peer-as>
+ <local-as>
+ <as-number>21320</as-number>
+ <private/>
+ <no-prepend-global-as/>
+ </local-as>
+ </neighbor>
+ <neighbor>
+ <name>80.81.195.141</name>
+ <description>Facebook AS32934</description>
+ <passive/>
+ <import>ps-deny-all</import>
+ <import>ps-AS-SELF-REJECT</import>
+ <import>ps-BOGONS</import>
+ <import>ps-PRIVATE-AS-BLOCK</import>
+ <import>IAS_PS-FROM-PUBLIC-PEERS_DE-CIX_HEAD</import>
+ <import>IAS_PS-FROM-PUBLIC-PEER_AS32934_Facebook</import>
+ <import>IAS_PS-FROM-PUBLIC-PEERS_DE-CIX_TAIL</import>
+ <family>
+ <inet>
+ <any>
+ <prefix-limit>
+ <maximum>150</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
+ </prefix-limit>
+ </any>
+ </inet>
+ </family>
+ <export>ps-deny-all</export>
+ <export>ps-BOGONS</export>
+ <export>ps-PRIVATE-AS-BLOCK</export>
+ <export>IAS_PS-TO-PUBLIC-PEERS_DE-CIX_HEAD</export>
+ <export>IAS_PS-TO-PUBLIC-PEER_AS32934_Facebook</export>
+ <export>IAS_PS-TO-PUBLIC-PEERS_DE-CIX_TAIL</export>
+ <peer-as>32934</peer-as>
+ <local-as>
+ <as-number>21320</as-number>
+ <private/>
+ <no-prepend-global-as/>
+ </local-as>
+ </neighbor>
</group>
<group>
<name>GEANT-IXv6-DE-CIX</name>
@@ -83094,7 +84298,7 @@
<prefix-limit>
<maximum>150000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -83119,7 +84323,7 @@
<prefix-limit>
<maximum>375</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -83155,7 +84359,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -83191,7 +84395,7 @@
<prefix-limit>
<maximum>247500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -83227,7 +84431,7 @@
<prefix-limit>
<maximum>4500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -83263,7 +84467,7 @@
<prefix-limit>
<maximum>3750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -83286,20 +84490,23 @@
</neighbor>
<neighbor>
<name>2001:7f8::80a6:0:1</name>
- <description>Facebook</description>
+ <description>Facebook AS32934</description>
+ <passive/>
<import>ps-AS-SELF-REJECT</import>
<import>ps-BOGONS-V6</import>
<import>ps-PRIVATE-AS-BLOCK</import>
<import>IAS_PS-FROM-PUBLIC-PEERS_DE-CIX_HEAD</import>
<import>IAS_PS-FROM-PUBLIC-PEER_AS32934_FACEBOOK_-_Facebook,_Inc.,US_</import>
<import>IAS_PS-FROM-PUBLIC-PEERS_DE-CIX_TAIL</import>
+ <import>ps-deny-all</import>
+ <import>IAS_PS-FROM-PUBLIC-PEER_AS32934_Facebook</import>
<family>
<inet6>
<any>
<prefix-limit>
<maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -83313,6 +84520,8 @@
<export>IAS_PS-TO-PUBLIC-PEERS_DE-CIX_HEAD</export>
<export>IAS_PS-TO-PUBLIC-PEER_AS32934_FACEBOOK_-_Facebook,_Inc.,US_</export>
<export>IAS_PS-TO-PUBLIC-PEERS_DE-CIX_TAIL</export>
+ <export>ps-deny-all</export>
+ <export>IAS_PS-TO-PUBLIC-PEER_AS32934_Facebook</export>
<peer-as>32934</peer-as>
<local-as>
<as-number>21320</as-number>
@@ -83322,20 +84531,23 @@
</neighbor>
<neighbor>
<name>2001:7f8::80a6:0:2</name>
- <description>Facebook (2)</description>
+ <description>Facebook AS32934</description>
+ <passive/>
<import>ps-AS-SELF-REJECT</import>
<import>ps-BOGONS-V6</import>
<import>ps-PRIVATE-AS-BLOCK</import>
<import>IAS_PS-FROM-PUBLIC-PEERS_DE-CIX_HEAD</import>
<import>IAS_PS-FROM-PUBLIC-PEER_AS32934_FACEBOOK_-_Facebook,_Inc.,US_</import>
<import>IAS_PS-FROM-PUBLIC-PEERS_DE-CIX_TAIL</import>
+ <import>ps-deny-all</import>
+ <import>IAS_PS-FROM-PUBLIC-PEER_AS32934_Facebook</import>
<family>
<inet6>
<any>
<prefix-limit>
<maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -83349,6 +84561,8 @@
<export>IAS_PS-TO-PUBLIC-PEERS_DE-CIX_HEAD</export>
<export>IAS_PS-TO-PUBLIC-PEER_AS32934_FACEBOOK_-_Facebook,_Inc.,US_</export>
<export>IAS_PS-TO-PUBLIC-PEERS_DE-CIX_TAIL</export>
+ <export>ps-deny-all</export>
+ <export>IAS_PS-TO-PUBLIC-PEER_AS32934_Facebook</export>
<peer-as>32934</peer-as>
<local-as>
<as-number>21320</as-number>
@@ -83371,7 +84585,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -83408,7 +84622,7 @@
<prefix-limit>
<maximum>3750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -83444,7 +84658,7 @@
<prefix-limit>
<maximum>3750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -83480,7 +84694,7 @@
<prefix-limit>
<maximum>300</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -83516,7 +84730,7 @@
<prefix-limit>
<maximum>90</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -83552,7 +84766,7 @@
<prefix-limit>
<maximum>7500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -83589,7 +84803,7 @@
<prefix-limit>
<maximum>7500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -83626,7 +84840,7 @@
<prefix-limit>
<maximum>4500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -83662,7 +84876,7 @@
<prefix-limit>
<maximum>3750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
</teardown>
</prefix-limit>
</any>
@@ -83695,7 +84909,7 @@
<prefix-limit>
<maximum>1350</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
</teardown>
</prefix-limit>
</any>
@@ -83728,7 +84942,7 @@
<prefix-limit>
<maximum>13500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
</teardown>
</prefix-limit>
</any>
@@ -83761,7 +84975,7 @@
<prefix-limit>
<maximum>30</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
</teardown>
</prefix-limit>
</any>
@@ -83794,7 +85008,7 @@
<prefix-limit>
<maximum>90</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
</teardown>
</prefix-limit>
</any>
@@ -83827,7 +85041,7 @@
<prefix-limit>
<maximum>6000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
</teardown>
</prefix-limit>
</any>
@@ -83860,7 +85074,7 @@
<prefix-limit>
<maximum>6000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
</teardown>
</prefix-limit>
</any>
@@ -83893,7 +85107,7 @@
<prefix-limit>
<maximum>105</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
</teardown>
</prefix-limit>
</any>
@@ -83926,7 +85140,7 @@
<prefix-limit>
<maximum>50</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -83963,7 +85177,7 @@
<prefix-limit>
<maximum>50</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -84000,7 +85214,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -84036,7 +85250,7 @@
<prefix-limit>
<maximum>300</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -84072,7 +85286,7 @@
<prefix-limit>
<maximum>300</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -84108,7 +85322,7 @@
<prefix-limit>
<maximum>300</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -84144,7 +85358,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -84180,7 +85394,7 @@
<prefix-limit>
<maximum>13</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -84217,7 +85431,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -84253,7 +85467,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -84289,7 +85503,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -84325,7 +85539,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -84361,7 +85575,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -84397,7 +85611,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -84433,7 +85647,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -84469,7 +85683,7 @@
<prefix-limit>
<maximum>2250</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -84505,7 +85719,7 @@
<prefix-limit>
<maximum>15000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -84541,7 +85755,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -84577,7 +85791,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -84613,7 +85827,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -84649,7 +85863,7 @@
<prefix-limit>
<maximum>7350</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -84686,7 +85900,7 @@
<prefix-limit>
<maximum>300</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -84722,7 +85936,7 @@
<prefix-limit>
<maximum>300</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -84758,7 +85972,7 @@
<prefix-limit>
<maximum>30</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -84794,7 +86008,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -84830,7 +86044,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -84867,7 +86081,7 @@
<prefix-limit>
<maximum>300</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -84903,7 +86117,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -84939,7 +86153,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -84975,7 +86189,7 @@
<prefix-limit>
<maximum>90</maximum>
<teardown>
- <limit-threshold>75</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -85011,7 +86225,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -85047,7 +86261,7 @@
<prefix-limit>
<maximum>7500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -85083,7 +86297,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -85119,7 +86333,7 @@
<prefix-limit>
<maximum>15000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -85155,7 +86369,7 @@
<prefix-limit>
<maximum>15000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -85191,7 +86405,7 @@
<prefix-limit>
<maximum>15000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -85227,7 +86441,7 @@
<prefix-limit>
<maximum>15000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -85263,7 +86477,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -85300,7 +86514,7 @@
<prefix-limit>
<maximum>90</maximum>
<teardown>
- <limit-threshold>75</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -85337,7 +86551,7 @@
<prefix-limit>
<maximum>100</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -85371,9 +86585,9 @@
<inet6>
<any>
<prefix-limit>
- <maximum>1950</maximum>
+ <maximum>3500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -85409,7 +86623,7 @@
<prefix-limit>
<maximum>10000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -85446,7 +86660,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -85482,7 +86696,7 @@
<prefix-limit>
<maximum>375</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -85518,7 +86732,7 @@
<prefix-limit>
<maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -85554,7 +86768,7 @@
<prefix-limit>
<maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -85590,7 +86804,7 @@
<prefix-limit>
<maximum>450</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -85627,7 +86841,7 @@
<prefix-limit>
<maximum>300</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -85663,7 +86877,7 @@
<prefix-limit>
<maximum>300</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -85699,7 +86913,7 @@
<prefix-limit>
<maximum>7500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -85735,7 +86949,7 @@
<prefix-limit>
<maximum>7500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -85771,7 +86985,7 @@
<prefix-limit>
<maximum>225</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -85807,7 +87021,7 @@
<prefix-limit>
<maximum>375</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -85843,7 +87057,7 @@
<prefix-limit>
<maximum>375</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -85879,7 +87093,7 @@
<prefix-limit>
<maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -85915,7 +87129,7 @@
<prefix-limit>
<maximum>900</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -85951,7 +87165,7 @@
<prefix-limit>
<maximum>900</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -85987,7 +87201,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -86023,7 +87237,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -86059,7 +87273,7 @@
<prefix-limit>
<maximum>3000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -86095,7 +87309,7 @@
<prefix-limit>
<maximum>37</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -86131,7 +87345,7 @@
<prefix-limit>
<maximum>300</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -86167,7 +87381,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -86203,7 +87417,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -86239,7 +87453,7 @@
<prefix-limit>
<maximum>1200</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -86275,7 +87489,7 @@
<prefix-limit>
<maximum>1200</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -86311,7 +87525,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -86347,7 +87561,7 @@
<prefix-limit>
<maximum>90</maximum>
<teardown>
- <limit-threshold>75</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -86383,7 +87597,7 @@
<prefix-limit>
<maximum>172500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -86419,7 +87633,7 @@
<prefix-limit>
<maximum>37500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -86455,7 +87669,7 @@
<prefix-limit>
<maximum>37500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -86476,6 +87690,84 @@
<no-prepend-global-as/>
</local-as>
</neighbor>
+ <neighbor>
+ <name>2001:7f8::80a6:0:4</name>
+ <description>Facebook AS32934</description>
+ <passive/>
+ <import>ps-deny-all</import>
+ <import>ps-AS-SELF-REJECT</import>
+ <import>ps-BOGONS-V6</import>
+ <import>ps-PRIVATE-AS-BLOCK</import>
+ <import>IAS_PS-FROM-PUBLIC-PEERS_DE-CIX_HEAD</import>
+ <import>IAS_PS-FROM-PUBLIC-PEER_AS32934_Facebook</import>
+ <import>IAS_PS-FROM-PUBLIC-PEERS_DE-CIX_TAIL</import>
+ <family>
+ <inet6>
+ <any>
+ <prefix-limit>
+ <maximum>150</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
+ </prefix-limit>
+ </any>
+ </inet6>
+ </family>
+ <export>ps-deny-all</export>
+ <export>ps-BOGONS-V6</export>
+ <export>ps-PRIVATE-AS-BLOCK</export>
+ <export>IAS_PS-TO-PUBLIC-PEERS_DE-CIX_HEAD</export>
+ <export>IAS_PS-TO-PUBLIC-PEER_AS32934_Facebook</export>
+ <export>IAS_PS-TO-PUBLIC-PEERS_DE-CIX_TAIL</export>
+ <peer-as>32934</peer-as>
+ <local-as>
+ <as-number>21320</as-number>
+ <private/>
+ <no-prepend-global-as/>
+ </local-as>
+ </neighbor>
+ <neighbor>
+ <name>2001:7f8::80a6:0:3</name>
+ <description>Facebook AS32934</description>
+ <passive/>
+ <import>ps-deny-all</import>
+ <import>ps-AS-SELF-REJECT</import>
+ <import>ps-BOGONS-V6</import>
+ <import>ps-PRIVATE-AS-BLOCK</import>
+ <import>IAS_PS-FROM-PUBLIC-PEERS_DE-CIX_HEAD</import>
+ <import>IAS_PS-FROM-PUBLIC-PEER_AS32934_Facebook</import>
+ <import>IAS_PS-FROM-PUBLIC-PEERS_DE-CIX_TAIL</import>
+ <family>
+ <inet6>
+ <any>
+ <prefix-limit>
+ <maximum>150</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
+ </prefix-limit>
+ </any>
+ </inet6>
+ </family>
+ <export>ps-deny-all</export>
+ <export>ps-BOGONS-V6</export>
+ <export>ps-PRIVATE-AS-BLOCK</export>
+ <export>IAS_PS-TO-PUBLIC-PEERS_DE-CIX_HEAD</export>
+ <export>IAS_PS-TO-PUBLIC-PEER_AS32934_Facebook</export>
+ <export>IAS_PS-TO-PUBLIC-PEERS_DE-CIX_TAIL</export>
+ <peer-as>32934</peer-as>
+ <local-as>
+ <as-number>21320</as-number>
+ <private/>
+ <no-prepend-global-as/>
+ </local-as>
+ </neighbor>
</group>
<group>
<name>DWS</name>
@@ -86496,6 +87788,21 @@
<import>ps-BOGONS</import>
<import>ps-PRIVATE-AS-BLOCK</import>
<import>ps-IAS-from-DWS-Telia</import>
+ <family>
+ <inet>
+ <unicast>
+ <prefix-limit>
+ <maximum>1077037</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
+ </prefix-limit>
+ </unicast>
+ </inet>
+ </family>
<authentication-key>/* SECRET-DATA */</authentication-key>
<export>ps-BOGONS</export>
<export>ps-PRIVATE-AS-BLOCK</export>
@@ -86515,6 +87822,21 @@
<import>ps-BOGONS</import>
<import>ps-PRIVATE-AS-BLOCK</import>
<import>ps-IAS-from-DWS-Cogent</import>
+ <family>
+ <inet>
+ <unicast>
+ <prefix-limit>
+ <maximum>1079316</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
+ </prefix-limit>
+ </unicast>
+ </inet>
+ </family>
<export>ps-BOGONS</export>
<export>ps-PRIVATE-AS-BLOCK</export>
<export>ps-IAS-to-DWS-Cogent</export>
@@ -86536,6 +87858,21 @@
<import>ps-BOGONS-V6</import>
<import>ps-PRIVATE-AS-BLOCK</import>
<import>ps-IAS-from-DWS-Telia-v6</import>
+ <family>
+ <inet6>
+ <unicast>
+ <prefix-limit>
+ <maximum>86302</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
+ </prefix-limit>
+ </unicast>
+ </inet6>
+ </family>
<authentication-key>/* SECRET-DATA */</authentication-key>
<export>ps-BOGONS-V6</export>
<export>ps-PRIVATE-AS-BLOCK</export>
@@ -86555,6 +87892,21 @@
<import>ps-BOGONS-V6</import>
<import>ps-PRIVATE-AS-BLOCK</import>
<import>ps-IAS-from-DWS-Cogent-v6</import>
+ <family>
+ <inet6>
+ <unicast>
+ <prefix-limit>
+ <maximum>83737</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
+ </prefix-limit>
+ </unicast>
+ </inet6>
+ </family>
<export>ps-BOGONS-V6</export>
<export>ps-PRIVATE-AS-BLOCK</export>
<export>ps-IAS-to-DWS-Cogent-v6</export>
@@ -86578,9 +87930,12 @@
<inet>
<unicast>
<prefix-limit>
- <maximum>22500</maximum>
+ <maximum>877</maximum>
<teardown>
- <limit-threshold>83</limit-threshold>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</unicast>
@@ -86606,9 +87961,12 @@
<inet>
<unicast>
<prefix-limit>
- <maximum>22500</maximum>
+ <maximum>18</maximum>
<teardown>
- <limit-threshold>83</limit-threshold>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</unicast>
@@ -86634,6 +87992,17 @@
<import>ps-IAS-from-google-v6</import>
<family>
<inet6>
+ <unicast>
+ <prefix-limit>
+ <maximum>166</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
+ </prefix-limit>
+ </unicast>
<any>
<prefix-limit>
<maximum>1125</maximum>
@@ -86662,6 +88031,17 @@
<import>ps-IAS-from-verizon-v6</import>
<family>
<inet6>
+ <unicast>
+ <prefix-limit>
+ <maximum>10</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
+ </prefix-limit>
+ </unicast>
<any>
<prefix-limit>
<maximum>1125</maximum>
@@ -86732,15 +88112,15 @@
<group>
<name>SEC_TOOLS-v6</name>
<type>external</type>
- <neighbor>
+ <neighbor inactive="inactive">
<name>2001:798:1::199</name>
<description>A10 Dirty Peering - hijack routes to attract traffic for scrubbing</description>
<import>PS_FROM_A10-v6</import>
- <family>
+ <family inactive="inactive">
<inet6>
<unicast>
</unicast>
- <any>
+ <any inactive="inactive">
</any>
</inet6>
</family>
@@ -86851,6 +88231,9 @@
<interface>
<name>ae11.111</name>
</interface>
+ <interface>
+ <name>ae33.111</name>
+ </interface>
<route-distinguisher>
<rd-type>62.40.97.12:111</rd-type>
</route-distinguisher>
@@ -86915,6 +88298,29 @@
<export>ps-BOGONS</export>
<export>ps-PRIVATE-AS-BLOCK</export>
<export>ps-to-lhcone-peer</export>
+ <neighbor inactive="inactive">
+ <name>62.40.126.25</name>
+ <description>CSTNET LHCONE</description>
+ <local-preference>150</local-preference>
+ <out-delay>10</out-delay>
+ <import>ps-deny-all</import>
+ <family inactive="inactive">
+ <inet>
+ <any>
+ <prefix-limit>
+ <maximum>150</maximum>
+ <teardown>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
+ </prefix-limit>
+ </any>
+ </inet>
+ </family>
+ <export>ps-deny-all</export>
+ <peer-as>7497</peer-as>
+ </neighbor>
</group>
<group>
<name>lhcone-nrens</name>
@@ -86987,6 +88393,27 @@
<export>ps-to-lhcone-nren-v6</export>
<peer-as>680</peer-as>
</neighbor>
+ <neighbor inactive="inactive">
+ <name>2001:798:111:1::ba</name>
+ <description>CSTNET LHCONE IPv6 VPN</description>
+ <import>ps-deny-all</import>
+ <family inactive="inactive">
+ <inet6>
+ <any>
+ <prefix-limit>
+ <maximum>150</maximum>
+ <teardown>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
+ </prefix-limit>
+ </any>
+ </inet6>
+ </family>
+ <export>ps-deny-all</export>
+ <peer-as>7497</peer-as>
+ </neighbor>
</group>
<group>
<name>lhcone-route-server</name>
@@ -87081,6 +88508,9 @@
<maximum>1000</maximum>
<teardown>
<limit-threshold>90</limit-threshold>
+ <idle-timeout>
+ <timeout>15</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</labeled-unicast>
@@ -87102,7 +88532,10 @@
<prefix-limit>
<maximum>1000</maximum>
<teardown>
- <limit-threshold>50</limit-threshold>
+ <limit-threshold>90</limit-threshold>
+ <idle-timeout>
+ <timeout>15</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</labeled-unicast>
diff --git a/test/data/mx1.gen.ch.geant.net-netconf.xml b/test/data/mx1.gen.ch.geant.net-netconf.xml
index 28c4709cc9bf7a28b7659e9b8e4a730130d2704b..e31592e79b28a4e5828b91be6f9f03fd2493c990 100644
--- a/test/data/mx1.gen.ch.geant.net-netconf.xml
+++ b/test/data/mx1.gen.ch.geant.net-netconf.xml
@@ -1,4 +1,4 @@
-<configuration changed-seconds="1545214014" changed-localtime="2018-12-19 10:06:54 UTC">
+<configuration changed-seconds="1549110939" changed-localtime="2019-02-02 12:35:39 UTC">
<version>15.1F6-S10.9</version>
<groups>
<name>re0</name>
@@ -252,6 +252,38 @@
<allow-commands>show .*</allow-commands>
<deny-commands>(ssh .*|telnet .*)</deny-commands>
</class>
+ <class>
+ <name>opennsa</name>
+ <idle-timeout>5</idle-timeout>
+ <permissions>configure</permissions>
+ <deny-commands>(file.*)|(load.*)|(op.*)|(request.*)|(save.*)|(start.*)|(test.*)|(set cli.*)|(set date.*)|(clear.*)|(help.*)|(telnet.*)|(ssh.*)|(traceroute.*)|(mtrace.*)|(monitor.*)|(ping.*)|(show.*)|(set.*)</deny-commands>
+ <allow-configuration-regexps>interfaces .*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections remote-interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols mpls label-switched-path.*</allow-configuration-regexps>
+ <deny-configuration-regexps>vmhost .*</deny-configuration-regexps>
+ <deny-configuration-regexps>session-limit-group .*</deny-configuration-regexps>
+ <deny-configuration-regexps>multi-chassis .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc-partition .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc .*</deny-configuration-regexps>
+ <deny-configuration-regexps>groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>dynamic-profiles .*</deny-configuration-regexps>
+ <deny-configuration-regexps>diameter .*</deny-configuration-regexps>
+ <deny-configuration-regexps>apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>access-profile .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces traceoptions .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-set .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-range .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups-except .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lt-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces ms-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces si-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces gr-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lo.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces dsc.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces irb.*</deny-configuration-regexps>
+ </class>
<class>
<name>readonly-permissions</name>
<idle-timeout>15</idle-timeout>
@@ -555,6 +587,22 @@
<encrypted-password>/* SECRET-DATA */</encrypted-password>
</authentication>
</user>
+ <user>
+ <name>opennsa</name>
+ <uid>2046</uid>
+ <class>opennsa</class>
+ <authentication>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ </authentication>
+ </user>
<user>
<name>opnet</name>
<full-name>OPNET NEOP Planning system @ 62.40.105.114</full-name>
@@ -3322,7 +3370,9 @@
<interface>
<name>et-3/1/0</name>
<description>PHY SPARE |Reserved for Renater 1/2</description>
- <disable/>
+ <undocumented><enable/></undocumented>
+ <vlan-tagging/>
+ <mtu>9192</mtu>
</interface>
<interface>
<name>xe-3/2/0</name>
@@ -3347,7 +3397,7 @@
<interface>
<name>et-3/3/0</name>
<description>PHY SPARE |Reserved for Renater 2/2</description>
- <disable/>
+ <undocumented><enable/></undocumented>
</interface>
<interface>
<name>xe-7/0/0</name>
@@ -5200,6 +5250,9 @@
<clients>
<name>83.97.93.196/32</name>
</clients>
+ <clients>
+ <name>83.97.93.238/32</name>
+ </clients>
</community>
<community>
<name>As4n0gN!</name>
@@ -5707,13 +5760,13 @@
<import-rib>IAS.inet6.0</import-rib>
<import-policy>rtbh-policy</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias</name>
<import-rib>IAS.inet.0</import-rib>
<import-rib>CLEAN_IAS.inet.0</import-rib>
<import-policy>ps-into-clean-ias-import</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias-v6</name>
<import-rib>IAS.inet6.0</import-rib>
<import-rib>CLEAN_IAS.inet6.0</import-rib>
@@ -6251,9 +6304,12 @@
<inet>
<unicast>
<prefix-limit>
- <maximum>500</maximum>
+ <maximum>10</maximum>
<teardown>
- <limit-threshold>89</limit-threshold>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</unicast>
@@ -6282,17 +6338,23 @@
<inet>
<unicast>
<prefix-limit>
- <maximum>500</maximum>
+ <maximum>213</maximum>
<teardown>
- <limit-threshold>89</limit-threshold>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
- <maximum>500</maximum>
+ <maximum>22</maximum>
<teardown>
- <limit-threshold>89</limit-threshold>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</multicast>
@@ -6323,12 +6385,21 @@
<inet6>
<unicast>
<prefix-limit>
- <maximum>500</maximum>
+ <maximum>31</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
<maximum>500</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
</prefix-limit>
</multicast>
</inet6>
@@ -7381,16 +7452,13 @@
</prefix-list>
<prefix-list>
<name>geantncc-address-space</name>
- <comment>/* NCC DR VPN LAN */</comment>
+ <comment>/* NCC DR VPN */</comment>
<prefix-list-item>
- <name>62.40.108.192/26</name>
+ <name>62.40.108.192/27</name>
</prefix-list-item>
<prefix-list-item>
<name>62.40.119.0/24</name>
</prefix-list-item>
- <prefix-list-item>
- <name>62.40.119.134/32</name>
- </prefix-list-item>
<prefix-list-item>
<name>62.40.125.250/32</name>
</prefix-list-item>
@@ -9865,21 +9933,9 @@
<prefix-list-item>
<name>185.11.155.0/24</name>
</prefix-list-item>
- <prefix-list-item>
- <name>185.14.11.0/24</name>
- </prefix-list-item>
- <prefix-list-item>
- <name>185.33.56.0/22</name>
- </prefix-list-item>
- <prefix-list-item>
- <name>185.33.56.0/23</name>
- </prefix-list-item>
<prefix-list-item>
<name>185.33.58.0/23</name>
</prefix-list-item>
- <prefix-list-item>
- <name>185.33.58.0/24</name>
- </prefix-list-item>
<prefix-list-item>
<name>185.33.59.0/24</name>
</prefix-list-item>
@@ -10114,12 +10170,6 @@
<prefix-list-item>
<name>193.43.80.0/21</name>
</prefix-list-item>
- <prefix-list-item>
- <name>193.43.80.0/22</name>
- </prefix-list-item>
- <prefix-list-item>
- <name>193.43.84.0/22</name>
- </prefix-list-item>
<prefix-list-item>
<name>193.43.97.0/24</name>
</prefix-list-item>
@@ -10141,21 +10191,9 @@
<prefix-list-item>
<name>193.43.184.0/21</name>
</prefix-list-item>
- <prefix-list-item>
- <name>193.43.184.0/22</name>
- </prefix-list-item>
- <prefix-list-item>
- <name>193.43.188.0/22</name>
- </prefix-list-item>
<prefix-list-item>
<name>193.43.192.0/20</name>
</prefix-list-item>
- <prefix-list-item>
- <name>193.43.192.0/21</name>
- </prefix-list-item>
- <prefix-list-item>
- <name>193.43.200.0/21</name>
- </prefix-list-item>
<prefix-list-item>
<name>193.104.137.0/24</name>
</prefix-list-item>
@@ -14155,6 +14193,12 @@
<prefix-list-item>
<name>2a03:3c20::/32</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>2a04:8ec0::/32</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>2a04:8ec0::/48</name>
+ </prefix-list-item>
<prefix-list-item>
<name>2a07:2e40::/29</name>
</prefix-list-item>
@@ -15632,6 +15676,14 @@
</prefix-list>
<prefix-list>
<name>corporate-address-space</name>
+ <comment>/* LON2 CORP VPN (MAC) */</comment>
+ <prefix-list-item>
+ <name>62.40.99.194/32</name>
+ </prefix-list-item>
+ <comment>/* LON2 CORP VPN */</comment>
+ <prefix-list-item>
+ <name>62.40.99.201/32</name>
+ </prefix-list-item>
<prefix-list-item>
<name>62.40.119.128/25</name>
</prefix-list-item>
@@ -15696,6 +15748,18 @@
<name>2001:798::/32</name>
</prefix-list-item>
</prefix-list>
+ <prefix-list>
+ <name>opennsa-servers</name>
+ <prefix-list-item>
+ <name>83.97.93.92/32</name>
+ </prefix-list-item>
+ </prefix-list>
+ <prefix-list>
+ <name>opennsa-servers-v6</name>
+ <prefix-list-item>
+ <name>2001:798:3::15f/128</name>
+ </prefix-list-item>
+ </prefix-list>
<policy-statement>
<name>ASM-Allow</name>
<term>
@@ -17388,6 +17452,10 @@
<address>185.1.68.0/24</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>193.188.137.0/24</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -17505,6 +17573,10 @@
<address>2001:7f8:a0::/64</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>2001:7f8:35::/64</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -24039,13 +24111,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -24061,14 +24126,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp>
<name>backbone-classifier</name>
@@ -24080,18 +24137,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -24099,195 +24144,16 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>iperf-classifier</name>
- <import>default</import>
<forwarding-class>
<name>expedited-forwarding</name>
<loss-priority>
<name>low</name>
- <code-points>af12</code-points>
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>backbone-classifier</name>
@@ -24299,18 +24165,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -24318,13 +24172,7 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -24347,13 +24195,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -24369,187 +24210,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>iperf-classifier</name>
- <import>default</import>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>af12</code-points>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-access-classifier</name>
@@ -24558,16 +24218,16 @@
<name>be</name>
<loss-priority>
<name>low</name>
- <code-points>000</code-points>
- <code-points>001</code-points>
- <code-points>010</code-points>
- <code-points>011</code-points>
- <code-points>110</code-points>
- <code-points>111</code-points>
+ <code-points>100</code-points>
+ <code-points>101</code-points>
</loss-priority>
</forwarding-class>
+ </exp>
+ <exp>
+ <name>mpls-backbone-classifier</name>
+ <import>default</import>
<forwarding-class>
- <name>less-than-best-effort</name>
+ <name>be</name>
<loss-priority>
<name>low</name>
<code-points>100</code-points>
@@ -24575,40 +24235,7 @@
</loss-priority>
</forwarding-class>
</exp>
- <exp>
- <name>mpls-backbone-classifier</name>
- <import>default</import>
- </exp>
</classifiers>
- <code-point-aliases>
- <dscp>
- <name>ix</name>
- <bits>101001</bits>
- </dscp>
- <dscp>
- <name>dws</name>
- <bits>100000</bits>
- </dscp>
- <dscp-ipv6>
- <name>dws</name>
- <bits>100000</bits>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix</name>
- <bits>101001</bits>
- </dscp-ipv6>
- </code-point-aliases>
- <drop-profiles>
- <name>dws-drop-profile</name>
- <fill-level>
- <name>35</name>
- <drop-probability>10</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<drop-profiles>
<name>be-drop-profile</name>
<fill-level>
@@ -24628,59 +24255,40 @@
<drop-probability>100</drop-probability>
</fill-level>
</drop-profiles>
- <drop-profiles>
- <name>less-than-be-drop-profile</name>
- <fill-level>
- <name>25</name>
- <drop-probability>30</drop-probability>
- </fill-level>
- <fill-level>
- <name>30</name>
- <drop-probability>50</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>70</drop-probability>
- </fill-level>
- <fill-level>
- <name>50</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<forwarding-classes>
<class>
<name>be</name>
<queue-num>0</queue-num>
</class>
- <class>
- <name>be-ix</name>
- <queue-num>0</queue-num>
- </class>
<class>
<name>expedited-forwarding</name>
<queue-num>1</queue-num>
</class>
- <class>
- <name>less-than-best-effort</name>
- <queue-num>2</queue-num>
- </class>
<class>
<name>network-control</name>
<queue-num>3</queue-num>
</class>
- <class>
- <name>be-dws</name>
- <queue-num>0</queue-num>
- </class>
- <class>
- <name>be-bleach</name>
- <queue-num>0</queue-num>
- </class>
</forwarding-classes>
<interfaces>
+ <interface>
+ <name>et-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>ge-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>so-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>xe-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
<interface>
<name>ge-0/3/2</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -24700,7 +24308,7 @@
</interface>
<interface>
<name>ge-0/3/4</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>10</name>
<classifiers>
@@ -24766,13 +24374,13 @@
</rewrite-rules>
</unit>
<unit>
- <name>71</name>
+ <name>100</name>
<classifiers>
<dscp>
- <name>iperf-classifier</name>
+ <name>access-classifier</name>
</dscp>
<dscp-ipv6>
- <name>iperf-classifier</name>
+ <name>access-classifier</name>
</dscp-ipv6>
</classifiers>
<rewrite-rules>
@@ -24781,8 +24389,12 @@
</dscp>
</rewrite-rules>
</unit>
+ </interface>
+ <interface>
+ <name>ge-0/3/5</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
- <name>100</name>
+ <name>0</name>
<classifiers>
<dscp>
<name>access-classifier</name>
@@ -24799,8 +24411,8 @@
</unit>
</interface>
<interface>
- <name>ge-0/3/5</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <name>ge-0/3/7</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -24819,10 +24431,10 @@
</unit>
</interface>
<interface>
- <name>ge-0/3/7</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <name>et-1/0/5</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
- <name>0</name>
+ <name>100</name>
<classifiers>
<dscp>
<name>access-classifier</name>
@@ -24835,11 +24447,11 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
+ <dscp-ipv6>
+ <name>basic-rewrite-rules</name>
+ </dscp-ipv6>
</rewrite-rules>
</unit>
- </interface>
- <interface>
- <name>et-1/0/5</name>
<unit>
<name>333</name>
<classifiers>
@@ -24850,11 +24462,57 @@
<name>access-classifier</name>
</dscp-ipv6>
</classifiers>
+ <rewrite-rules>
+ <dscp>
+ <name>basic-rewrite-rules</name>
+ </dscp>
+ <dscp-ipv6>
+ <name>basic-rewrite-rules</name>
+ </dscp-ipv6>
+ </rewrite-rules>
+ </unit>
+ <unit>
+ <name>667</name>
+ <classifiers>
+ <dscp>
+ <name>access-classifier</name>
+ </dscp>
+ <dscp-ipv6>
+ <name>access-classifier</name>
+ </dscp-ipv6>
+ </classifiers>
+ <rewrite-rules>
+ <dscp>
+ <name>basic-rewrite-rules</name>
+ </dscp>
+ <dscp-ipv6>
+ <name>basic-rewrite-rules</name>
+ </dscp-ipv6>
+ </rewrite-rules>
+ </unit>
+ <unit>
+ <name>677</name>
+ <classifiers>
+ <dscp>
+ <name>access-classifier</name>
+ </dscp>
+ <dscp-ipv6>
+ <name>access-classifier</name>
+ </dscp-ipv6>
+ </classifiers>
+ <rewrite-rules>
+ <dscp>
+ <name>basic-rewrite-rules</name>
+ </dscp>
+ <dscp-ipv6>
+ <name>basic-rewrite-rules</name>
+ </dscp-ipv6>
+ </rewrite-rules>
</unit>
</interface>
<interface>
<name>et-10/1/0</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>104</name>
<classifiers>
@@ -24888,10 +24546,14 @@
</rewrite-rules>
</unit>
</interface>
- <interface inactive="inactive">
+ <interface>
+ <name>ae*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
<name>ae1</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
- <unit inactive="inactive">
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ <unit>
<name>0</name>
<classifiers>
<dscp>
@@ -24908,17 +24570,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -24928,7 +24582,7 @@
</interface>
<interface>
<name>ae2</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -24946,17 +24600,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -24966,7 +24612,7 @@
</interface>
<interface>
<name>ae4</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -24984,17 +24630,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -25004,7 +24642,7 @@
</interface>
<interface>
<name>ae7</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -25022,17 +24660,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -25042,7 +24672,7 @@
</interface>
<interface>
<name>ae8</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -25060,17 +24690,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -25080,6 +24702,7 @@
</interface>
<interface>
<name>ae12</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>333</name>
<classifiers>
@@ -25090,6 +24713,14 @@
<name>access-classifier</name>
</dscp-ipv6>
</classifiers>
+ <rewrite-rules>
+ <dscp>
+ <name>basic-rewrite-rules</name>
+ </dscp>
+ <dscp-ipv6>
+ <name>basic-rewrite-rules</name>
+ </dscp-ipv6>
+ </rewrite-rules>
</unit>
<unit>
<name>1000</name>
@@ -25105,12 +24736,15 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
+ <dscp-ipv6>
+ <name>basic-rewrite-rules</name>
+ </dscp-ipv6>
</rewrite-rules>
</unit>
</interface>
<interface>
<name>ae14</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -25146,7 +24780,7 @@
</interface>
<interface>
<name>ae15</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>281</name>
<classifiers>
@@ -25177,6 +24811,7 @@
</interface>
<interface>
<name>ae17</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>200</name>
<classifiers>
@@ -25191,6 +24826,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
+ <dscp-ipv6>
+ <name>basic-rewrite-rules</name>
+ </dscp-ipv6>
</rewrite-rules>
</unit>
<unit>
@@ -25203,21 +24841,6 @@
<name>access-classifier</name>
</dscp-ipv6>
</classifiers>
- </unit>
- </interface>
- <interface inactive="inactive">
- <name>ae18</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
- <unit>
- <name>0</name>
- <classifiers>
- <dscp>
- <name>ix-access-classifier</name>
- </dscp>
- <dscp-ipv6>
- <name>ix-access-classifier</name>
- </dscp-ipv6>
- </classifiers>
<rewrite-rules>
<dscp>
<name>basic-rewrite-rules</name>
@@ -25230,6 +24853,7 @@
</interface>
<interface>
<name>ae19</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>333</name>
<classifiers>
@@ -25240,79 +24864,20 @@
<name>access-classifier</name>
</dscp-ipv6>
</classifiers>
+ <rewrite-rules>
+ <dscp>
+ <name>basic-rewrite-rules</name>
+ </dscp>
+ <dscp-ipv6>
+ <name>basic-rewrite-rules</name>
+ </dscp-ipv6>
+ </rewrite-rules>
</unit>
</interface>
</interfaces>
<rewrite-rules>
<dscp>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -25327,17 +24892,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -25349,37 +24903,9 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -25394,17 +24920,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -25416,73 +24931,6 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
@@ -25490,35 +24938,19 @@
</exp>
</rewrite-rules>
<scheduler-maps>
- <name>MAP-BASIC-IQ2</name>
+ <name>GEANT-BASIC</name>
<forwarding-class>
<name>expedited-forwarding</name>
<scheduler>sch-expedited-forwarding</scheduler>
</forwarding-class>
<forwarding-class>
<name>network-control</name>
- <scheduler>sch-network-ctrl-iq2</scheduler>
+ <scheduler>sch-network-ctrl-geant</scheduler>
</forwarding-class>
<forwarding-class>
<name>be</name>
<scheduler>sch-be</scheduler>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <scheduler>sch-less-than-best-effort</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
</scheduler-maps>
<schedulers>
<name>sch-be</name>
@@ -25538,27 +24970,7 @@
<priority>strict-high</priority>
</schedulers>
<schedulers>
- <name>sch-less-than-best-effort</name>
- <transmit-rate>
- <percent>10</percent>
- </transmit-rate>
- <buffer-size>
- <percent>10</percent>
- </buffer-size>
- <priority>low</priority>
- <drop-profile-map>
- <loss-priority>low</loss-priority>
- <protocol>any</protocol>
- <drop-profile>less-than-be-drop-profile</drop-profile>
- </drop-profile-map>
- <drop-profile-map>
- <loss-priority>high</loss-priority>
- <protocol>any</protocol>
- <drop-profile>be-drop-profile</drop-profile>
- </drop-profile-map>
- </schedulers>
- <schedulers>
- <name>sch-network-ctrl</name>
+ <name>sch-network-ctrl-geant</name>
<transmit-rate>
<percent>5</percent>
</transmit-rate>
@@ -25567,15 +24979,6 @@
</buffer-size>
<priority>high</priority>
</schedulers>
- <schedulers>
- <name>sch-network-ctrl-iq2</name>
- <transmit-rate>
- <percent>5</percent>
- </transmit-rate>
- <buffer-size>
- <percent>5</percent>
- </buffer-size>
- </schedulers>
</class-of-service>
<firewall>
<family>
@@ -34080,6 +33483,9 @@
<source-prefix-list>
<name>dashboard-servers</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers</name>
+ </source-prefix-list>
<protocol>tcp</protocol>
<destination-port>ssh</destination-port>
</from>
@@ -39117,6 +38523,9 @@
<source-prefix-list>
<name>dashboard-servers-v6</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers-v6</name>
+ </source-prefix-list>
<next-header>tcp</next-header>
<port>ssh</port>
</from>
@@ -40526,7 +39935,7 @@
</policer>
</firewall>
<routing-instances>
- <instance>
+ <instance inactive="inactive">
<name>CLEAN_IAS</name>
<description>Clean IAS VRF traffic returned from scrubber</description>
<instance-type>vrf</instance-type>
@@ -41060,12 +40469,12 @@
<family>
<inet>
<unicast>
- <rib-group>ias-to-clean-ias</rib-group>
+ <rib-group inactive="inactive">ias-to-clean-ias</rib-group>
</unicast>
</inet>
<inet6>
<unicast>
- <rib-group>ias-to-clean-ias-v6</rib-group>
+ <rib-group inactive="inactive">ias-to-clean-ias-v6</rib-group>
</unicast>
</inet6>
</family>
@@ -41324,7 +40733,7 @@
<prefix-limit>
<maximum>150000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -41349,9 +40758,9 @@
<inet>
<any>
<prefix-limit>
- <maximum>4000</maximum>
+ <maximum>5000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -41387,7 +40796,7 @@
<prefix-limit>
<maximum>30</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -41423,7 +40832,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -41459,7 +40868,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -41495,7 +40904,7 @@
<prefix-limit>
<maximum>6000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -41531,7 +40940,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -41565,9 +40974,9 @@
<inet>
<any>
<prefix-limit>
- <maximum>6000</maximum>
+ <maximum>12000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -41600,7 +41009,7 @@
<prefix-limit>
<maximum>150000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -41627,7 +41036,7 @@
<prefix-limit>
<maximum>3750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -41663,7 +41072,7 @@
<prefix-limit>
<maximum>30</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -41699,7 +41108,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -41735,7 +41144,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -41771,7 +41180,7 @@
<prefix-limit>
<maximum>6000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -41807,7 +41216,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -41843,7 +41252,7 @@
<prefix-limit>
<maximum>6000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -42374,6 +41783,9 @@
<maximum>1000</maximum>
<teardown>
<limit-threshold>90</limit-threshold>
+ <idle-timeout>
+ <timeout>15</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</labeled-unicast>
@@ -42392,6 +41804,9 @@
<maximum>1000</maximum>
<teardown>
<limit-threshold>90</limit-threshold>
+ <idle-timeout>
+ <timeout>15</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</labeled-unicast>
@@ -42417,7 +41832,10 @@
<prefix-limit>
<maximum>1000</maximum>
<teardown>
- <limit-threshold>50</limit-threshold>
+ <limit-threshold>90</limit-threshold>
+ <idle-timeout>
+ <timeout>15</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</labeled-unicast>
diff --git a/test/data/mx1.ham.de.geant.net-netconf.xml b/test/data/mx1.ham.de.geant.net-netconf.xml
index e0c250e3f4518043672066c1e3adf3d308f3007d..cdd20813057c57b31f27e2efa023ab22c441126a 100644
--- a/test/data/mx1.ham.de.geant.net-netconf.xml
+++ b/test/data/mx1.ham.de.geant.net-netconf.xml
@@ -1,4 +1,4 @@
-<configuration changed-seconds="1545214013" changed-localtime="2018-12-19 10:06:53 UTC">
+<configuration changed-seconds="1549111230" changed-localtime="2019-02-02 12:40:30 UTC">
<version>15.1F6-S10.9</version>
<groups>
<name>re0</name>
@@ -262,6 +262,38 @@
<allow-commands>show .*</allow-commands>
<deny-commands>(ssh .*|telnet .*)</deny-commands>
</class>
+ <class>
+ <name>opennsa</name>
+ <idle-timeout>5</idle-timeout>
+ <permissions>configure</permissions>
+ <deny-commands>(file.*)|(load.*)|(op.*)|(request.*)|(save.*)|(start.*)|(test.*)|(set cli.*)|(set date.*)|(clear.*)|(help.*)|(telnet.*)|(ssh.*)|(traceroute.*)|(mtrace.*)|(monitor.*)|(ping.*)|(show.*)|(set.*)</deny-commands>
+ <allow-configuration-regexps>interfaces .*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections remote-interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols mpls label-switched-path.*</allow-configuration-regexps>
+ <deny-configuration-regexps>vmhost .*</deny-configuration-regexps>
+ <deny-configuration-regexps>session-limit-group .*</deny-configuration-regexps>
+ <deny-configuration-regexps>multi-chassis .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc-partition .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc .*</deny-configuration-regexps>
+ <deny-configuration-regexps>groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>dynamic-profiles .*</deny-configuration-regexps>
+ <deny-configuration-regexps>diameter .*</deny-configuration-regexps>
+ <deny-configuration-regexps>apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>access-profile .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces traceoptions .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-set .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-range .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups-except .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lt-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces ms-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces si-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces gr-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lo.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces dsc.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces irb.*</deny-configuration-regexps>
+ </class>
<class>
<name>readonly-permissions</name>
<idle-timeout>15</idle-timeout>
@@ -588,6 +620,22 @@
<encrypted-password>/* SECRET-DATA */</encrypted-password>
</authentication>
</user>
+ <user>
+ <name>opennsa</name>
+ <uid>2009</uid>
+ <class>opennsa</class>
+ <authentication>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ </authentication>
+ </user>
<user>
<name>opnet</name>
<full-name>OPNET NEOP Planning system @ 62.40.105.114</full-name>
@@ -1672,9 +1720,7 @@
</interface>
<interface>
<name>xe-0/1/0</name>
- <apply-groups>NO_TRAPS</apply-groups>
- <description>PHY INFRASTRUCTURE GTS SRF0000001 | link to GTS SERVER 4</description>
- <mtu>9192</mtu>
+ <mtu>9000</mtu>
<encapsulation>ethernet-ccc</encapsulation>
<unit>
<name>0</name>
@@ -1688,7 +1734,7 @@
<name>xe-0/1/1</name>
<apply-groups>NO_TRAPS</apply-groups>
<description>PHY INFRASTRUCTURE GTS SRF0000001 | link to GTS SERVER 5</description>
- <mtu>9192</mtu>
+ <mtu>9000</mtu>
<encapsulation>ethernet-ccc</encapsulation>
<unit>
<name>0</name>
@@ -1785,7 +1831,7 @@
<name>xe-1/2/0</name>
<apply-groups>NO_TRAPS</apply-groups>
<description>PHY INFRASTRUCTURE GTS SRF0000001 | link to GTS SERVER 6</description>
- <mtu>9192</mtu>
+ <mtu>9000</mtu>
<encapsulation>ethernet-ccc</encapsulation>
<unit>
<name>0</name>
@@ -1993,9 +2039,9 @@
<mtu>9192</mtu>
<encapsulation>flexible-ethernet-services</encapsulation>
<unit>
- <name>11</name>
+ <name>16</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>11</vlan-id>
+ <vlan-id>16</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -2004,9 +2050,9 @@
</output-vlan-map>
</unit>
<unit>
- <name>12</name>
+ <name>17</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>12</vlan-id>
+ <vlan-id>17</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -2015,9 +2061,9 @@
</output-vlan-map>
</unit>
<unit>
- <name>13</name>
+ <name>18</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>13</vlan-id>
+ <vlan-id>18</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -2026,9 +2072,9 @@
</output-vlan-map>
</unit>
<unit>
- <name>14</name>
+ <name>19</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>14</vlan-id>
+ <vlan-id>19</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -2037,9 +2083,9 @@
</output-vlan-map>
</unit>
<unit>
- <name>15</name>
+ <name>20</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>15</vlan-id>
+ <vlan-id>20</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -2047,10 +2093,18 @@
<push/>
</output-vlan-map>
</unit>
+ </interface>
+ <interface>
+ <name>xe-2/2/1</name>
+ <apply-groups>NO_TRAPS</apply-groups>
+ <description>PHY INFRASTRUCTURE GTS SRF0000001 | GTS link to Server 1</description>
+ <flexible-vlan-tagging/>
+ <mtu>9000</mtu>
+ <encapsulation>flexible-ethernet-services</encapsulation>
<unit>
- <name>16</name>
+ <name>11</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>16</vlan-id>
+ <vlan-id>11</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -2059,9 +2113,9 @@
</output-vlan-map>
</unit>
<unit>
- <name>17</name>
+ <name>12</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>17</vlan-id>
+ <vlan-id>12</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -2070,9 +2124,9 @@
</output-vlan-map>
</unit>
<unit>
- <name>18</name>
+ <name>13</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>18</vlan-id>
+ <vlan-id>13</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -2081,9 +2135,9 @@
</output-vlan-map>
</unit>
<unit>
- <name>19</name>
+ <name>14</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>19</vlan-id>
+ <vlan-id>14</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -2092,9 +2146,9 @@
</output-vlan-map>
</unit>
<unit>
- <name>20</name>
+ <name>15</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>20</vlan-id>
+ <vlan-id>15</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -2102,14 +2156,6 @@
<push/>
</output-vlan-map>
</unit>
- </interface>
- <interface>
- <name>xe-2/2/1</name>
- <apply-groups>NO_TRAPS</apply-groups>
- <description>PHY INFRASTRUCTURE GTS SRF0000001 | GTS link to Server 1</description>
- <flexible-vlan-tagging/>
- <mtu>9000</mtu>
- <encapsulation>flexible-ethernet-services</encapsulation>
<unit>
<name>16</name>
<encapsulation>vlan-ccc</encapsulation>
@@ -2121,6 +2167,17 @@
<push/>
</output-vlan-map>
</unit>
+ <unit>
+ <name>17</name>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>17</vlan-id>
+ <input-vlan-map>
+ <pop/>
+ </input-vlan-map>
+ <output-vlan-map>
+ <push/>
+ </output-vlan-map>
+ </unit>
</interface>
<interface>
<name>xe-2/2/2</name>
@@ -2269,39 +2326,6 @@
<push/>
</output-vlan-map>
</unit>
- <unit>
- <name>15</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>15</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>16</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>16</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>17</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>17</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
<unit>
<name>18</name>
<encapsulation>vlan-ccc</encapsulation>
@@ -2502,50 +2526,6 @@
<flexible-vlan-tagging/>
<mtu>9000</mtu>
<encapsulation>flexible-ethernet-services</encapsulation>
- <unit>
- <name>1304</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>1304</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>1305</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>1305</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>1306</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>1306</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>1307</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>1307</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
</interface>
<interface>
<name>ge-3/2/9</name>
@@ -3676,6 +3656,9 @@
<clients>
<name>83.97.93.196/32</name>
</clients>
+ <clients>
+ <name>83.97.93.238/32</name>
+ </clients>
</community>
<community>
<name>As4n0gN!</name>
@@ -4167,13 +4150,13 @@
<import-rib>IAS.inet6.0</import-rib>
<import-policy>rtbh-policy</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias</name>
<import-rib>IAS.inet.0</import-rib>
<import-rib>CLEAN_IAS.inet.0</import-rib>
<import-policy>ps-into-clean-ias-import</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias-v6</name>
<import-rib>IAS.inet6.0</import-rib>
<import-rib>CLEAN_IAS.inet6.0</import-rib>
@@ -4239,213 +4222,148 @@
</primary>
</label-switched-path>
<label-switched-path>
- <name>T-prg.cc-F-ham.cc-mpls3</name>
- <no-install-to-address/>
- <to>62.40.97.2</to>
+ <name>T-bra.cc-F-ham.cc-mpls5</name>
+ <to>62.40.97.4</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-prg.cc-F-ham.cc-mpls4</name>
- <no-install-to-address/>
- <to>62.40.97.2</to>
+ <name>T-lon.cc-F-ham.cc-mpls3</name>
+ <to>62.40.96.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-prg.cc-F-ham.cc-mpls1</name>
- <no-install-to-address/>
- <to>62.40.97.2</to>
+ <name>T-ams.cc-F-ham.cc-mpls3</name>
+ <to>62.40.97.11</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-mil.cc-F-ham.cc-mpls1</name>
- <no-install-to-address/>
+ <name>T-mil.cc-F-ham.cc-mpls5</name>
<to>62.40.97.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-prg.cc-F-ham.cc-mpls2</name>
- <no-install-to-address/>
+ <name>T-prg.cc-F-ham.cc-mpls14</name>
<to>62.40.97.2</to>
<no-cspf/>
</label-switched-path>
- <label-switched-path>
- <name>T-mil.cc-F-ham.cc-mpls2</name>
- <no-install-to-address/>
- <to>62.40.97.15</to>
- <no-cspf/>
- </label-switched-path>
<label-switched-path>
<name>T-prg.cc-F-ham.cc-mpls5</name>
- <no-install-to-address/>
<to>62.40.97.2</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-mad.cc-F-ham.cc-mpls4</name>
- <no-install-to-address/>
- <to>62.40.97.16</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-lon.cc-F-ham.cc-mpls5</name>
- <no-install-to-address/>
+ <name>T-lon.cc-F-ham.cc-mpls2</name>
<to>62.40.96.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-mad.cc-F-ham.cc-mpls5</name>
- <no-install-to-address/>
+ <name>T-mad.cc-F-ham.cc-mpls3</name>
<to>62.40.97.16</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-prg.cc-F-ham.cc-mpls6</name>
- <no-install-to-address/>
- <to>62.40.97.2</to>
+ <name>T-mil.cc-F-ham.cc-mpls4</name>
+ <to>62.40.97.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-mad.cc-F-ham.cc-mpls1</name>
- <no-install-to-address/>
- <to>62.40.97.16</to>
+ <name>T-ams.cc-F-ham.cc-mpls2</name>
+ <to>62.40.97.11</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-prg.cc-F-ham.cc-mpls7</name>
- <no-install-to-address/>
+ <name>T-prg.cc-F-ham.cc-mpls13</name>
<to>62.40.97.2</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-prg.cc-F-ham.cc-mpls8</name>
- <no-install-to-address/>
- <to>62.40.97.2</to>
+ <name>T-bra.cc-F-ham.cc-mpls1</name>
+ <to>62.40.97.4</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-prg.cc-F-ham.cc-mpls9</name>
- <no-install-to-address/>
- <to>62.40.97.2</to>
+ <name>T-par.cc-F-ham.cc-mpls1</name>
+ <to>62.40.97.13</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-prg.cc-F-ham.cc-mpls10</name>
- <no-install-to-address/>
- <to>62.40.97.2</to>
+ <name>T-bra.cc-F-ham.cc-mpls2</name>
+ <to>62.40.97.4</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-prg.cc-F-ham.cc-mpls11</name>
- <no-install-to-address/>
+ <name>T-prg.cc-F-ham.cc-mpls15</name>
<to>62.40.97.2</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-prg.cc-F-ham.cc-mpls14</name>
- <no-install-to-address/>
- <to>62.40.97.2</to>
+ <name>T-ams.cc-F-ham.cc-mpls4</name>
+ <to>62.40.97.11</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-bra.cc-F-ham.cc-mpls5</name>
- <no-install-to-address/>
- <to>62.40.97.4</to>
+ <name>T-lon.cc-F-ham.cc-mpls1</name>
+ <to>62.40.96.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-mil.cc-F-ham.cc-mpls5</name>
- <no-install-to-address/>
+ <name>T-mil.cc-F-ham.cc-mpls3</name>
<to>62.40.97.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-ams.cc-F-ham.cc-mpls3</name>
- <no-install-to-address/>
- <to>62.40.97.11</to>
+ <name>T-mil.cc-F-ham.cc-mpls6</name>
+ <to>62.40.97.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-lon.cc-F-ham.cc-mpls3</name>
- <no-install-to-address/>
+ <name>T-lon.cc-F-ham.cc-mpls4</name>
<to>62.40.96.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
<name>T-prg.cc-F-ham.cc-mpls12</name>
- <no-install-to-address/>
<to>62.40.97.2</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-mad.cc-F-ham.cc-mpls3</name>
- <no-install-to-address/>
- <to>62.40.97.16</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-mil.cc-F-ham.cc-mpls4</name>
- <no-install-to-address/>
- <to>62.40.97.15</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-bra.cc-F-ham.cc-mpls1</name>
- <no-install-to-address/>
- <to>62.40.97.4</to>
+ <name>T-ams.cc-F-ham.cc-mpls6</name>
+ <to>62.40.97.11</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-lon.cc-F-ham.cc-mpls2</name>
- <no-install-to-address/>
- <to>62.40.96.15</to>
+ <name>T-ams.cc-F-ham.cc-mpls7</name>
+ <to>62.40.97.11</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-ams.cc-F-ham.cc-mpls2</name>
- <no-install-to-address/>
+ <name>T-ams.cc-F-ham.cc-mpls5</name>
<to>62.40.97.11</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-prg.cc-F-ham.cc-mpls13</name>
- <no-install-to-address/>
- <to>62.40.97.2</to>
+ <name>T-bra.cc-F-ham.cc-mpls3</name>
+ <to>62.40.97.4</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-par.cc-F-ham.cc-mpls1</name>
- <no-install-to-address/>
+ <name>T-par.cc-F-ham.cc-mpls2</name>
<to>62.40.97.13</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-ams.cc-F-ham.cc-mpls4</name>
- <no-install-to-address/>
+ <name>T-ams.cc-F-ham.cc-mpls1</name>
<to>62.40.97.11</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-bra.cc-F-ham.cc-mpls2</name>
- <no-install-to-address/>
- <to>62.40.97.4</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-prg.cc-F-ham.cc-mpls15</name>
- <no-install-to-address/>
+ <name>T-prg.cc-F-ham.cc-mpls1</name>
<to>62.40.97.2</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-mil.cc-F-ham.cc-mpls6</name>
- <no-install-to-address/>
- <to>62.40.97.15</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-lon.cc-F-ham.cc-mpls4</name>
- <no-install-to-address/>
- <to>62.40.96.15</to>
+ <name>T-bra.cc-F-ham.cc-mpls4</name>
+ <to>62.40.97.4</to>
<no-cspf/>
</label-switched-path>
<path>
@@ -5003,7 +4921,7 @@
</bfd-liveness-detection>
<level>
<name>2</name>
- <metric>45</metric>
+ <metric>37</metric>
</level>
</interface>
<interface>
@@ -5238,43 +5156,16 @@
</pim>
<connections>
<interface-switch>
- <name>GTS-local-HA-1eb8a97b8c</name>
- <interface>
- <name>xe-2/2/3.17</name>
- </interface>
- <interface>
- <name>xe-2/2/3.12</name>
- </interface>
- </interface-switch>
- <interface-switch>
- <name>GTS-local-HA-64bc6fca12</name>
- <interface>
- <name>xe-2/2/0.13</name>
- </interface>
- <interface>
- <name>xe-2/2/3.15</name>
- </interface>
- </interface-switch>
- <interface-switch>
- <name>GTS-local-HA-cb1079c022</name>
+ <name>NSI-HA-73c5f6f238</name>
<interface>
- <name>xe-2/2/0.15</name>
- </interface>
- <interface>
- <name>xe-2/2/3.11</name>
- </interface>
- </interface-switch>
- <interface-switch>
- <name>GTS-local-HA-4ec246df63</name>
- <interface>
- <name>xe-2/2/3.30</name>
+ <name>xe-1/2/0.0</name>
</interface>
<interface>
- <name>xe-2/0/0.14</name>
+ <name>xe-2/2/0.19</name>
</interface>
</interface-switch>
<interface-switch>
- <name>GTS-local-HA-a460055dbc</name>
+ <name>NSI-HA-a460055dbc</name>
<interface>
<name>xe-0/1/1.0</name>
</interface>
@@ -5283,12 +5174,12 @@
</interface>
</interface-switch>
<interface-switch>
- <name>GTS-local-HA-73c5f6f238</name>
+ <name>NSI-HA-03e0e64fc4</name>
<interface>
- <name>xe-1/2/0.0</name>
+ <name>xe-2/2/3.11</name>
</interface>
<interface>
- <name>xe-2/2/0.19</name>
+ <name>xe-2/2/1.13</name>
</interface>
</interface-switch>
<remote-interface-switch>
@@ -5298,214 +5189,178 @@
<receive-lsp>sc17-ams-ham</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-HA-6d4abedb91</name>
- <interface>xe-2/2/3.13</interface>
- <transmit-lsp>T-prg.cc-F-ham.cc-mpls3</transmit-lsp>
- <receive-lsp>T-ham.cc-F-prg.cc-mpls3</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-HA-21ff7a7094</name>
- <interface>xe-2/2/0.11</interface>
- <transmit-lsp>T-prg.cc-F-ham.cc-mpls4</transmit-lsp>
- <receive-lsp>T-ham.cc-F-prg.cc-mpls4</receive-lsp>
+ <name>HA-b444493782</name>
+ <interface>xe-1/3/0.11</interface>
+ <transmit-lsp>T-bra.cc-F-ham.cc-mpls5</transmit-lsp>
+ <receive-lsp>T-ham.cc-F-bra.cc-mpls5</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-HA-167c4189cf</name>
- <interface>xe-2/2/3.14</interface>
- <transmit-lsp>T-prg.cc-F-ham.cc-mpls1</transmit-lsp>
- <receive-lsp>T-ham.cc-F-prg.cc-mpls1</receive-lsp>
+ <name>HA-8f6d939dd9</name>
+ <interface>xe-1/3/0.15</interface>
+ <transmit-lsp>T-lon.cc-F-ham.cc-mpls3</transmit-lsp>
+ <receive-lsp>T-ham.cc-F-lon.cc-mpls3</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-HA-10217e08b8</name>
- <interface>xe-2/2/3.16</interface>
- <transmit-lsp>T-mil.cc-F-ham.cc-mpls1</transmit-lsp>
- <receive-lsp>T-ham.cc-F-mil.cc-mpls1</receive-lsp>
+ <name>HA-8842c6c9e7</name>
+ <interface>xe-1/3/0.14</interface>
+ <transmit-lsp>T-ams.cc-F-ham.cc-mpls3</transmit-lsp>
+ <receive-lsp>T-ham.cc-F-ams.cc-mpls3</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-HA-4e8abce4d0</name>
- <interface>xe-2/2/0.12</interface>
- <transmit-lsp>T-prg.cc-F-ham.cc-mpls2</transmit-lsp>
- <receive-lsp>T-ham.cc-F-prg.cc-mpls2</receive-lsp>
+ <name>HA-737a476773</name>
+ <interface>xe-1/3/0.13</interface>
+ <transmit-lsp>T-mil.cc-F-ham.cc-mpls5</transmit-lsp>
+ <receive-lsp>T-ham.cc-F-mil.cc-mpls5</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-HA-05e76276f3</name>
- <interface>xe-2/2/0.14</interface>
- <transmit-lsp>T-mil.cc-F-ham.cc-mpls2</transmit-lsp>
- <receive-lsp>T-ham.cc-F-mil.cc-mpls2</receive-lsp>
+ <name>HA-968abbeb2d</name>
+ <interface>xe-1/3/0.12</interface>
+ <transmit-lsp>T-prg.cc-F-ham.cc-mpls14</transmit-lsp>
+ <receive-lsp>T-ham.cc-F-prg.cc-mpls14</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-HA-78f22aac1b</name>
+ <name>HA-78f22aac1b</name>
<interface>xe-2/2/0.16</interface>
<transmit-lsp>T-prg.cc-F-ham.cc-mpls5</transmit-lsp>
<receive-lsp>T-ham.cc-F-prg.cc-mpls5</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-HA-f7c0e7da1a</name>
- <interface>xe-2/0/0.15</interface>
- <transmit-lsp>T-mad.cc-F-ham.cc-mpls4</transmit-lsp>
- <receive-lsp>T-ham.cc-F-mad.cc-mpls4</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-HA-9f52b0cf82</name>
- <interface>xe-2/0/0.16</interface>
- <transmit-lsp>T-lon.cc-F-ham.cc-mpls5</transmit-lsp>
- <receive-lsp>T-ham.cc-F-lon.cc-mpls5</receive-lsp>
+ <name>HA-93a6c27c9e</name>
+ <interface>xe-2/2/2.13</interface>
+ <transmit-lsp>T-lon.cc-F-ham.cc-mpls2</transmit-lsp>
+ <receive-lsp>T-ham.cc-F-lon.cc-mpls2</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-HA-f111735c66</name>
- <interface>xe-2/2/2.15</interface>
- <transmit-lsp>T-mad.cc-F-ham.cc-mpls5</transmit-lsp>
- <receive-lsp>T-ham.cc-F-mad.cc-mpls5</receive-lsp>
+ <name>HA-c2b6a028a1</name>
+ <interface>xe-2/2/2.14</interface>
+ <transmit-lsp>T-mad.cc-F-ham.cc-mpls3</transmit-lsp>
+ <receive-lsp>T-ham.cc-F-mad.cc-mpls3</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-HA-82b23da73b</name>
- <interface>xe-2/0/0.13</interface>
- <transmit-lsp>T-prg.cc-F-ham.cc-mpls6</transmit-lsp>
- <receive-lsp>T-ham.cc-F-prg.cc-mpls6</receive-lsp>
+ <name>HA-8b5109e9a4</name>
+ <interface>xe-2/2/2.16</interface>
+ <transmit-lsp>T-mil.cc-F-ham.cc-mpls4</transmit-lsp>
+ <receive-lsp>T-ham.cc-F-mil.cc-mpls4</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-HA-6ad8364fbc</name>
- <interface>xe-2/0/0.12</interface>
- <transmit-lsp>T-mad.cc-F-ham.cc-mpls1</transmit-lsp>
- <receive-lsp>T-ham.cc-F-mad.cc-mpls1</receive-lsp>
+ <name>HA-a0298785e1</name>
+ <interface>xe-2/2/2.12</interface>
+ <transmit-lsp>T-ams.cc-F-ham.cc-mpls2</transmit-lsp>
+ <receive-lsp>T-ham.cc-F-ams.cc-mpls2</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-HA-a9f3c9802c</name>
- <interface>xe-2/0/0.11</interface>
- <transmit-lsp>T-prg.cc-F-ham.cc-mpls7</transmit-lsp>
- <receive-lsp>T-ham.cc-F-prg.cc-mpls7</receive-lsp>
+ <name>HA-c83a4b32bd</name>
+ <interface>xe-2/2/2.18</interface>
+ <transmit-lsp>T-prg.cc-F-ham.cc-mpls13</transmit-lsp>
+ <receive-lsp>T-ham.cc-F-prg.cc-mpls13</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-HA-cc3c066bab</name>
- <interface>ge-3/2/8.1304</interface>
- <transmit-lsp>T-prg.cc-F-ham.cc-mpls8</transmit-lsp>
- <receive-lsp>T-ham.cc-F-prg.cc-mpls8</receive-lsp>
+ <name>HA-eb23850cf6</name>
+ <interface>xe-2/2/2.19</interface>
+ <transmit-lsp>T-bra.cc-F-ham.cc-mpls1</transmit-lsp>
+ <receive-lsp>T-ham.cc-F-bra.cc-mpls1</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-HA-7f0e63f13b</name>
- <interface>ge-3/2/8.1305</interface>
- <transmit-lsp>T-prg.cc-F-ham.cc-mpls9</transmit-lsp>
- <receive-lsp>T-ham.cc-F-prg.cc-mpls9</receive-lsp>
+ <name>HA-b19e8f5474</name>
+ <interface>xe-2/2/2.17</interface>
+ <transmit-lsp>T-par.cc-F-ham.cc-mpls1</transmit-lsp>
+ <receive-lsp>T-ham.cc-F-par.cc-mpls1</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-HA-eb21d98fa8</name>
- <interface>ge-3/2/8.1306</interface>
- <transmit-lsp>T-prg.cc-F-ham.cc-mpls10</transmit-lsp>
- <receive-lsp>T-ham.cc-F-prg.cc-mpls10</receive-lsp>
+ <name>HA-68f06e67e3</name>
+ <interface>xe-2/2/0.18</interface>
+ <transmit-lsp>T-bra.cc-F-ham.cc-mpls2</transmit-lsp>
+ <receive-lsp>T-ham.cc-F-bra.cc-mpls2</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-HA-eceed2e72c</name>
- <interface>ge-3/2/8.1307</interface>
- <transmit-lsp>T-prg.cc-F-ham.cc-mpls11</transmit-lsp>
- <receive-lsp>T-ham.cc-F-prg.cc-mpls11</receive-lsp>
+ <name>HA-a90b474c2d</name>
+ <interface>xe-2/2/0.20</interface>
+ <transmit-lsp>T-prg.cc-F-ham.cc-mpls15</transmit-lsp>
+ <receive-lsp>T-ham.cc-F-prg.cc-mpls15</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-HA-968abbeb2d</name>
- <interface>xe-1/3/0.12</interface>
- <transmit-lsp>T-prg.cc-F-ham.cc-mpls14</transmit-lsp>
- <receive-lsp>T-ham.cc-F-prg.cc-mpls14</receive-lsp>
+ <name>HA-0abcebccaa</name>
+ <interface>xe-2/2/0.17</interface>
+ <transmit-lsp>T-ams.cc-F-ham.cc-mpls4</transmit-lsp>
+ <receive-lsp>T-ham.cc-F-ams.cc-mpls4</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-HA-b444493782</name>
- <interface>xe-1/3/0.11</interface>
- <transmit-lsp>T-bra.cc-F-ham.cc-mpls5</transmit-lsp>
- <receive-lsp>T-ham.cc-F-bra.cc-mpls5</receive-lsp>
+ <name>HA-da17c79dd6</name>
+ <interface>xe-2/2/1.12</interface>
+ <transmit-lsp>T-lon.cc-F-ham.cc-mpls1</transmit-lsp>
+ <receive-lsp>T-ham.cc-F-lon.cc-mpls1</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-HA-737a476773</name>
- <interface>xe-1/3/0.13</interface>
- <transmit-lsp>T-mil.cc-F-ham.cc-mpls5</transmit-lsp>
- <receive-lsp>T-ham.cc-F-mil.cc-mpls5</receive-lsp>
+ <name>HA-f821dbf45b</name>
+ <interface>xe-2/2/1.11</interface>
+ <transmit-lsp>T-mil.cc-F-ham.cc-mpls3</transmit-lsp>
+ <receive-lsp>T-ham.cc-F-mil.cc-mpls3</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-HA-8842c6c9e7</name>
- <interface>xe-1/3/0.14</interface>
- <transmit-lsp>T-ams.cc-F-ham.cc-mpls3</transmit-lsp>
- <receive-lsp>T-ham.cc-F-ams.cc-mpls3</receive-lsp>
+ <name>HA-020bd84c87</name>
+ <interface>xe-2/2/3.18</interface>
+ <transmit-lsp>T-mil.cc-F-ham.cc-mpls6</transmit-lsp>
+ <receive-lsp>T-ham.cc-F-mil.cc-mpls6</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-HA-8f6d939dd9</name>
- <interface>xe-1/3/0.15</interface>
- <transmit-lsp>T-lon.cc-F-ham.cc-mpls3</transmit-lsp>
- <receive-lsp>T-ham.cc-F-lon.cc-mpls3</receive-lsp>
+ <name>HA-0e2e39c479</name>
+ <interface>xe-2/2/3.19</interface>
+ <transmit-lsp>T-lon.cc-F-ham.cc-mpls4</transmit-lsp>
+ <receive-lsp>T-ham.cc-F-lon.cc-mpls4</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-HA-8628c718ae</name>
+ <name>HA-8628c718ae</name>
<interface>xe-0/1/0.0</interface>
<transmit-lsp>T-prg.cc-F-ham.cc-mpls12</transmit-lsp>
<receive-lsp>T-ham.cc-F-prg.cc-mpls12</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-HA-c2b6a028a1</name>
- <interface>xe-2/2/2.14</interface>
- <transmit-lsp>T-mad.cc-F-ham.cc-mpls3</transmit-lsp>
- <receive-lsp>T-ham.cc-F-mad.cc-mpls3</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-HA-8b5109e9a4</name>
- <interface>xe-2/2/2.16</interface>
- <transmit-lsp>T-mil.cc-F-ham.cc-mpls4</transmit-lsp>
- <receive-lsp>T-ham.cc-F-mil.cc-mpls4</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-HA-eb23850cf6</name>
- <interface>xe-2/2/2.19</interface>
- <transmit-lsp>T-bra.cc-F-ham.cc-mpls1</transmit-lsp>
- <receive-lsp>T-ham.cc-F-bra.cc-mpls1</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-HA-93a6c27c9e</name>
- <interface>xe-2/2/2.13</interface>
- <transmit-lsp>T-lon.cc-F-ham.cc-mpls2</transmit-lsp>
- <receive-lsp>T-ham.cc-F-lon.cc-mpls2</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-HA-a0298785e1</name>
- <interface>xe-2/2/2.12</interface>
- <transmit-lsp>T-ams.cc-F-ham.cc-mpls2</transmit-lsp>
- <receive-lsp>T-ham.cc-F-ams.cc-mpls2</receive-lsp>
+ <name>HA-28cd397e7f</name>
+ <interface>xe-2/2/2.15</interface>
+ <transmit-lsp>T-ams.cc-F-ham.cc-mpls6</transmit-lsp>
+ <receive-lsp>T-ham.cc-F-ams.cc-mpls6</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-HA-c83a4b32bd</name>
- <interface>xe-2/2/2.18</interface>
- <transmit-lsp>T-prg.cc-F-ham.cc-mpls13</transmit-lsp>
- <receive-lsp>T-ham.cc-F-prg.cc-mpls13</receive-lsp>
+ <name>HA-773e26e6f6</name>
+ <interface>xe-2/2/3.30</interface>
+ <transmit-lsp>T-ams.cc-F-ham.cc-mpls7</transmit-lsp>
+ <receive-lsp>T-ham.cc-F-ams.cc-mpls7</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-HA-b19e8f5474</name>
- <interface>xe-2/2/2.17</interface>
- <transmit-lsp>T-par.cc-F-ham.cc-mpls1</transmit-lsp>
- <receive-lsp>T-ham.cc-F-par.cc-mpls1</receive-lsp>
+ <name>HA-8612092354</name>
+ <interface>xe-2/2/3.13</interface>
+ <transmit-lsp>T-ams.cc-F-ham.cc-mpls5</transmit-lsp>
+ <receive-lsp>T-ham.cc-F-ams.cc-mpls5</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-HA-0abcebccaa</name>
- <interface>xe-2/2/0.17</interface>
- <transmit-lsp>T-ams.cc-F-ham.cc-mpls4</transmit-lsp>
- <receive-lsp>T-ham.cc-F-ams.cc-mpls4</receive-lsp>
+ <name>HA-19e5b13b2d</name>
+ <interface>xe-2/2/1.14</interface>
+ <transmit-lsp>T-bra.cc-F-ham.cc-mpls3</transmit-lsp>
+ <receive-lsp>T-ham.cc-F-bra.cc-mpls3</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-HA-68f06e67e3</name>
- <interface>xe-2/2/0.18</interface>
- <transmit-lsp>T-bra.cc-F-ham.cc-mpls2</transmit-lsp>
- <receive-lsp>T-ham.cc-F-bra.cc-mpls2</receive-lsp>
+ <name>HA-83b45de1c0</name>
+ <interface>xe-2/2/3.14</interface>
+ <transmit-lsp>T-par.cc-F-ham.cc-mpls2</transmit-lsp>
+ <receive-lsp>T-ham.cc-F-par.cc-mpls2</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-HA-a90b474c2d</name>
- <interface>xe-2/2/0.20</interface>
- <transmit-lsp>T-prg.cc-F-ham.cc-mpls15</transmit-lsp>
- <receive-lsp>T-ham.cc-F-prg.cc-mpls15</receive-lsp>
+ <name>HA-420f45e7a2</name>
+ <interface>xe-2/2/1.15</interface>
+ <transmit-lsp>T-ams.cc-F-ham.cc-mpls1</transmit-lsp>
+ <receive-lsp>T-ham.cc-F-ams.cc-mpls1</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-HA-020bd84c87</name>
- <interface>xe-2/2/3.18</interface>
- <transmit-lsp>T-mil.cc-F-ham.cc-mpls6</transmit-lsp>
- <receive-lsp>T-ham.cc-F-mil.cc-mpls6</receive-lsp>
+ <name>HA-3b476fdeaf</name>
+ <interface>xe-2/2/1.17</interface>
+ <transmit-lsp>T-prg.cc-F-ham.cc-mpls1</transmit-lsp>
+ <receive-lsp>T-ham.cc-F-prg.cc-mpls1</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-HA-0e2e39c479</name>
- <interface>xe-2/2/3.19</interface>
- <transmit-lsp>T-lon.cc-F-ham.cc-mpls4</transmit-lsp>
- <receive-lsp>T-ham.cc-F-lon.cc-mpls4</receive-lsp>
+ <name>HA-5f83d49592</name>
+ <interface>xe-2/2/3.12</interface>
+ <transmit-lsp>T-bra.cc-F-ham.cc-mpls4</transmit-lsp>
+ <receive-lsp>T-ham.cc-F-bra.cc-mpls4</receive-lsp>
</remote-interface-switch>
</connections>
<l2circuit>
@@ -8472,14 +8327,12 @@
</prefix-list>
<prefix-list>
<name>geantncc-address-space</name>
+ <comment>/* NCC DR VPN */</comment>
<prefix-list-item>
- <name>62.40.108.192/26</name>
- </prefix-list-item>
- <prefix-list-item>
- <name>62.40.119.0/24</name>
+ <name>62.40.108.192/27</name>
</prefix-list-item>
<prefix-list-item>
- <name>62.40.119.134/32</name>
+ <name>62.40.119.0/24</name>
</prefix-list-item>
<prefix-list-item>
<name>62.40.125.250/32</name>
@@ -9165,6 +9018,12 @@
<prefix-list-item>
<name>2a03:db80:3410::/48</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>2a03:db80:3430::/48</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>2a03:db80:3434::/48</name>
+ </prefix-list-item>
<prefix-list-item>
<name>2a03:db80:3810::/48</name>
</prefix-list-item>
@@ -13098,15 +12957,6 @@
<prefix-list-item>
<name>2a00:4860:2::/48</name>
</prefix-list-item>
- <prefix-list-item>
- <name>2a00:7540::/32</name>
- </prefix-list-item>
- <prefix-list-item>
- <name>2a00:7540::/48</name>
- </prefix-list-item>
- <prefix-list-item>
- <name>2a00:7540:1::/48</name>
- </prefix-list-item>
<prefix-list-item>
<name>2a00:7c00:8000::/40</name>
</prefix-list-item>
@@ -14372,6 +14222,9 @@
<prefix-list-item>
<name>176.103.224.0/20</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>176.111.168.0/22</name>
+ </prefix-list-item>
<prefix-list-item>
<name>178.172.212.0/24</name>
</prefix-list-item>
@@ -14447,6 +14300,21 @@
<prefix-list-item>
<name>193.41.88.0/24</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>193.84.124.0/22</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>193.84.124.0/24</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>193.84.125.0/24</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>193.84.126.0/24</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>193.84.127.0/24</name>
+ </prefix-list-item>
<prefix-list-item>
<name>193.104.244.0/24</name>
</prefix-list-item>
@@ -15158,6 +15026,15 @@
<prefix-list-item>
<name>2a04:9440::/30</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>2a07:dd40::/29</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>2a09:c400::/30</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>2a09:c404::/30</name>
+ </prefix-list-item>
<prefix-list-item>
<name>2a0b:2e80::/32</name>
</prefix-list-item>
@@ -15911,6 +15788,9 @@
<prefix-list-item>
<name>81.95.40.0/21</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>81.95.42.0/24</name>
+ </prefix-list-item>
<prefix-list-item>
<name>82.130.0.0/18</name>
</prefix-list-item>
@@ -16385,6 +16265,9 @@
<prefix-list-item>
<name>91.151.190.0/24</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>91.189.114.0/23</name>
+ </prefix-list-item>
<prefix-list-item>
<name>91.192.28.0/22</name>
</prefix-list-item>
@@ -16958,18 +16841,6 @@
<prefix-list-item>
<name>128.39.0.0/16</name>
</prefix-list-item>
- <prefix-list-item>
- <name>128.127.144.0/22</name>
- </prefix-list-item>
- <prefix-list-item>
- <name>128.127.144.0/24</name>
- </prefix-list-item>
- <prefix-list-item>
- <name>128.127.146.0/24</name>
- </prefix-list-item>
- <prefix-list-item>
- <name>128.127.147.0/24</name>
- </prefix-list-item>
<prefix-list-item>
<name>128.214.0.0/16</name>
</prefix-list-item>
@@ -17294,6 +17165,9 @@
<prefix-list-item>
<name>144.206.192.0/18</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>144.206.221.0/24</name>
+ </prefix-list-item>
<prefix-list-item>
<name>144.206.222.0/24</name>
</prefix-list-item>
@@ -17438,6 +17312,9 @@
<prefix-list-item>
<name>159.93.0.0/16</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>160.210.0.0/16</name>
+ </prefix-list-item>
<prefix-list-item>
<name>161.4.0.0/16</name>
</prefix-list-item>
@@ -17768,6 +17645,9 @@
<prefix-list-item>
<name>185.71.96.0/22</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>185.76.84.0/22</name>
+ </prefix-list-item>
<prefix-list-item>
<name>185.76.144.0/22</name>
</prefix-list-item>
@@ -17826,7 +17706,7 @@
<name>185.175.172.0/22</name>
</prefix-list-item>
<prefix-list-item>
- <name>185.182.108.0/22</name>
+ <name>185.182.108.0/24</name>
</prefix-list-item>
<prefix-list-item>
<name>185.189.28.0/22</name>
@@ -18461,9 +18341,6 @@
<prefix-list-item>
<name>193.41.140.0/22</name>
</prefix-list-item>
- <prefix-list-item>
- <name>193.104.170.0/24</name>
- </prefix-list-item>
<prefix-list-item>
<name>193.104.248.0/24</name>
</prefix-list-item>
@@ -18791,6 +18668,9 @@
<prefix-list-item>
<name>194.14.96.0/24</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>194.31.156.0/22</name>
+ </prefix-list-item>
<prefix-list-item>
<name>194.47.0.0/16</name>
</prefix-list-item>
@@ -20280,7 +20160,7 @@
<name>213.131.30.0/23</name>
</prefix-list-item>
<prefix-list-item>
- <name>213.159.64.0/19</name>
+ <name>213.159.64.0/20</name>
</prefix-list-item>
<prefix-list-item>
<name>213.247.128.0/17</name>
@@ -20522,6 +20402,14 @@
</prefix-list>
<prefix-list>
<name>corporate-address-space</name>
+ <comment>/* LON2 CORP VPN (MAC) */</comment>
+ <prefix-list-item>
+ <name>62.40.99.194/32</name>
+ </prefix-list-item>
+ <comment>/* LON2 CORP VPN */</comment>
+ <prefix-list-item>
+ <name>62.40.99.201/32</name>
+ </prefix-list-item>
<prefix-list-item>
<name>62.40.119.128/25</name>
</prefix-list-item>
@@ -20640,6 +20528,18 @@
<name>2001:798::/32</name>
</prefix-list-item>
</prefix-list>
+ <prefix-list>
+ <name>opennsa-servers</name>
+ <prefix-list-item>
+ <name>83.97.93.92/32</name>
+ </prefix-list-item>
+ </prefix-list>
+ <prefix-list>
+ <name>opennsa-servers-v6</name>
+ <prefix-list-item>
+ <name>2001:798:3::15f/128</name>
+ </prefix-list-item>
+ </prefix-list>
<policy-statement>
<name>ASM-Allow</name>
<term>
@@ -21088,6 +20988,10 @@
<address>185.1.68.0/24</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>193.188.137.0/24</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -21197,6 +21101,10 @@
<address>2001:7f8:a0::/64</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>2001:7f8:35::/64</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -24184,13 +24092,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -24206,14 +24107,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp>
<name>backbone-classifier</name>
@@ -24225,18 +24118,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -24244,195 +24125,16 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>iperf-classifier</name>
- <import>default</import>
<forwarding-class>
<name>expedited-forwarding</name>
<loss-priority>
<name>low</name>
- <code-points>af12</code-points>
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>backbone-classifier</name>
@@ -24444,18 +24146,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -24463,13 +24153,7 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -24492,13 +24176,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -24514,187 +24191,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>iperf-classifier</name>
- <import>default</import>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>af12</code-points>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-access-classifier</name>
@@ -24703,16 +24199,16 @@
<name>be</name>
<loss-priority>
<name>low</name>
- <code-points>000</code-points>
- <code-points>001</code-points>
- <code-points>010</code-points>
- <code-points>011</code-points>
- <code-points>110</code-points>
- <code-points>111</code-points>
+ <code-points>100</code-points>
+ <code-points>101</code-points>
</loss-priority>
</forwarding-class>
+ </exp>
+ <exp>
+ <name>mpls-backbone-classifier</name>
+ <import>default</import>
<forwarding-class>
- <name>less-than-best-effort</name>
+ <name>be</name>
<loss-priority>
<name>low</name>
<code-points>100</code-points>
@@ -24720,40 +24216,7 @@
</loss-priority>
</forwarding-class>
</exp>
- <exp>
- <name>mpls-backbone-classifier</name>
- <import>default</import>
- </exp>
</classifiers>
- <code-point-aliases>
- <dscp>
- <name>ix</name>
- <bits>101001</bits>
- </dscp>
- <dscp>
- <name>dws</name>
- <bits>100000</bits>
- </dscp>
- <dscp-ipv6>
- <name>dws</name>
- <bits>100000</bits>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix</name>
- <bits>101001</bits>
- </dscp-ipv6>
- </code-point-aliases>
- <drop-profiles>
- <name>dws-drop-profile</name>
- <fill-level>
- <name>35</name>
- <drop-probability>10</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<drop-profiles>
<name>be-drop-profile</name>
<fill-level>
@@ -24773,59 +24236,44 @@
<drop-probability>100</drop-probability>
</fill-level>
</drop-profiles>
- <drop-profiles>
- <name>less-than-be-drop-profile</name>
- <fill-level>
- <name>25</name>
- <drop-probability>30</drop-probability>
- </fill-level>
- <fill-level>
- <name>30</name>
- <drop-probability>50</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>70</drop-probability>
- </fill-level>
- <fill-level>
- <name>50</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<forwarding-classes>
<class>
<name>be</name>
<queue-num>0</queue-num>
</class>
- <class>
- <name>be-ix</name>
- <queue-num>0</queue-num>
- </class>
<class>
<name>expedited-forwarding</name>
<queue-num>1</queue-num>
</class>
- <class>
- <name>less-than-best-effort</name>
- <queue-num>2</queue-num>
- </class>
<class>
<name>network-control</name>
<queue-num>3</queue-num>
</class>
- <class>
- <name>be-dws</name>
- <queue-num>0</queue-num>
- </class>
- <class>
- <name>be-bleach</name>
- <queue-num>0</queue-num>
- </class>
</forwarding-classes>
<interfaces>
+ <interface>
+ <name>et-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>ge-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>so-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>xe-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>ae*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
<interface>
<name>ae0</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -24843,17 +24291,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -24863,7 +24303,7 @@
</interface>
<interface>
<name>ae1</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -24881,17 +24321,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -24901,7 +24333,7 @@
</interface>
<interface>
<name>ae2</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -24919,17 +24351,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -24939,6 +24363,26 @@
</interface>
<interface>
<name>ae10</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ <unit>
+ <name>100</name>
+ <classifiers>
+ <dscp>
+ <name>access-classifier</name>
+ </dscp>
+ <dscp-ipv6>
+ <name>access-classifier</name>
+ </dscp-ipv6>
+ </classifiers>
+ <rewrite-rules>
+ <dscp>
+ <name>basic-rewrite-rules</name>
+ </dscp>
+ <dscp-ipv6>
+ <name>basic-rewrite-rules</name>
+ </dscp-ipv6>
+ </rewrite-rules>
+ </unit>
<unit>
<name>333</name>
<classifiers>
@@ -24949,11 +24393,19 @@
<name>access-classifier</name>
</dscp-ipv6>
</classifiers>
+ <rewrite-rules>
+ <dscp>
+ <name>basic-rewrite-rules</name>
+ </dscp>
+ <dscp-ipv6>
+ <name>basic-rewrite-rules</name>
+ </dscp-ipv6>
+ </rewrite-rules>
</unit>
</interface>
<interface>
<name>ae11</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>100</name>
<classifiers>
@@ -24968,6 +24420,7 @@
</interface>
<interface>
<name>ae12</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>320</name>
<classifiers>
@@ -24982,6 +24435,28 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
+ <dscp-ipv6>
+ <name>basic-rewrite-rules</name>
+ </dscp-ipv6>
+ </rewrite-rules>
+ </unit>
+ <unit>
+ <name>334</name>
+ <classifiers>
+ <dscp>
+ <name>access-classifier</name>
+ </dscp>
+ <dscp-ipv6>
+ <name>access-classifier</name>
+ </dscp-ipv6>
+ </classifiers>
+ <rewrite-rules>
+ <dscp>
+ <name>basic-rewrite-rules</name>
+ </dscp>
+ <dscp-ipv6>
+ <name>basic-rewrite-rules</name>
+ </dscp-ipv6>
</rewrite-rules>
</unit>
</interface>
@@ -24989,73 +24464,6 @@
<rewrite-rules>
<dscp>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -25070,17 +24478,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -25092,97 +24489,9 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -25197,17 +24506,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -25219,13 +24517,6 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
@@ -25233,35 +24524,19 @@
</exp>
</rewrite-rules>
<scheduler-maps>
- <name>MAP-BASIC-IQ2</name>
+ <name>GEANT-BASIC</name>
<forwarding-class>
<name>expedited-forwarding</name>
<scheduler>sch-expedited-forwarding</scheduler>
</forwarding-class>
<forwarding-class>
<name>network-control</name>
- <scheduler>sch-network-ctrl-iq2</scheduler>
+ <scheduler>sch-network-ctrl-geant</scheduler>
</forwarding-class>
<forwarding-class>
<name>be</name>
<scheduler>sch-be</scheduler>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <scheduler>sch-less-than-best-effort</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
</scheduler-maps>
<schedulers>
<name>sch-be</name>
@@ -25281,27 +24556,7 @@
<priority>strict-high</priority>
</schedulers>
<schedulers>
- <name>sch-less-than-best-effort</name>
- <transmit-rate>
- <percent>10</percent>
- </transmit-rate>
- <buffer-size>
- <percent>10</percent>
- </buffer-size>
- <priority>low</priority>
- <drop-profile-map>
- <loss-priority>low</loss-priority>
- <protocol>any</protocol>
- <drop-profile>less-than-be-drop-profile</drop-profile>
- </drop-profile-map>
- <drop-profile-map>
- <loss-priority>high</loss-priority>
- <protocol>any</protocol>
- <drop-profile>be-drop-profile</drop-profile>
- </drop-profile-map>
- </schedulers>
- <schedulers>
- <name>sch-network-ctrl</name>
+ <name>sch-network-ctrl-geant</name>
<transmit-rate>
<percent>5</percent>
</transmit-rate>
@@ -25310,15 +24565,6 @@
</buffer-size>
<priority>high</priority>
</schedulers>
- <schedulers>
- <name>sch-network-ctrl-iq2</name>
- <transmit-rate>
- <percent>5</percent>
- </transmit-rate>
- <buffer-size>
- <percent>5</percent>
- </buffer-size>
- </schedulers>
</class-of-service>
<firewall>
<family>
@@ -25394,31 +24640,6 @@
<accept/>
</then>
</term>
- <term inactive="inactive">
- <name>LBE-Karcern-DE1-CH1</name>
- <from>
- <source-address>
- <name>192.108.46.0/24</name>
- </source-address>
- <source-address>
- <name>192.108.45.128/26</name>
- </source-address>
- <destination-address>
- <name>192.16.161.0/28</name>
- </destination-address>
- <destination-address>
- <name>128.142.224.0/20</name>
- </destination-address>
- </from>
- <then>
- <count>lbe-in</count>
- <loss-priority>low</loss-priority>
- <forwarding-class>less-than-best-effort</forwarding-class>
- <routing-instance>
- <routing-instance-name>LSP-next</routing-instance-name>
- </routing-instance>
- </then>
- </term>
<term>
<name>BOGON-filter</name>
<from>
@@ -28026,6 +27247,9 @@
<source-prefix-list>
<name>dashboard-servers</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers</name>
+ </source-prefix-list>
<protocol>tcp</protocol>
<destination-port>ssh</destination-port>
</from>
@@ -30797,6 +30021,9 @@
<source-prefix-list>
<name>dashboard-servers-v6</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers-v6</name>
+ </source-prefix-list>
<next-header>tcp</next-header>
<port>ssh</port>
</from>
@@ -32167,7 +31394,7 @@
</policer>
</firewall>
<routing-instances>
- <instance>
+ <instance inactive="inactive">
<name>CLEAN_IAS</name>
<description>Clean IAS VRF traffic returned from scrubber</description>
<instance-type>vrf</instance-type>
@@ -32964,6 +32191,9 @@
<maximum>1000</maximum>
<teardown>
<limit-threshold>90</limit-threshold>
+ <idle-timeout>
+ <timeout>15</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</labeled-unicast>
@@ -32981,7 +32211,10 @@
<prefix-limit>
<maximum>1000</maximum>
<teardown>
- <limit-threshold>50</limit-threshold>
+ <limit-threshold>90</limit-threshold>
+ <idle-timeout>
+ <timeout>15</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</labeled-unicast>
@@ -33000,6 +32233,9 @@
<maximum>1000</maximum>
<teardown>
<limit-threshold>90</limit-threshold>
+ <idle-timeout>
+ <timeout>15</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</labeled-unicast>
diff --git a/test/data/mx1.kau.lt.geant.net-netconf.xml b/test/data/mx1.kau.lt.geant.net-netconf.xml
index 6d4a542a5ca17b943ee3a45953d568906f7312b4..0b0b4f8c234c282fca7ab80b9d90e8881133e264 100644
--- a/test/data/mx1.kau.lt.geant.net-netconf.xml
+++ b/test/data/mx1.kau.lt.geant.net-netconf.xml
@@ -1,4 +1,4 @@
-<configuration changed-seconds="1545214011" changed-localtime="2018-12-19 10:06:51 UTC">
+<configuration changed-seconds="1549111253" changed-localtime="2019-02-02 12:40:53 UTC">
<version>15.1F6-S10.9</version>
<groups>
<name>re0</name>
@@ -252,6 +252,38 @@
<allow-commands>show .*</allow-commands>
<deny-commands>(ssh .*|telnet .*)</deny-commands>
</class>
+ <class>
+ <name>opennsa</name>
+ <idle-timeout>5</idle-timeout>
+ <permissions>configure</permissions>
+ <deny-commands>(file.*)|(load.*)|(op.*)|(request.*)|(save.*)|(start.*)|(test.*)|(set cli.*)|(set date.*)|(clear.*)|(help.*)|(telnet.*)|(ssh.*)|(traceroute.*)|(mtrace.*)|(monitor.*)|(ping.*)|(show.*)|(set.*)</deny-commands>
+ <allow-configuration-regexps>interfaces .*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections remote-interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols mpls label-switched-path.*</allow-configuration-regexps>
+ <deny-configuration-regexps>vmhost .*</deny-configuration-regexps>
+ <deny-configuration-regexps>session-limit-group .*</deny-configuration-regexps>
+ <deny-configuration-regexps>multi-chassis .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc-partition .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc .*</deny-configuration-regexps>
+ <deny-configuration-regexps>groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>dynamic-profiles .*</deny-configuration-regexps>
+ <deny-configuration-regexps>diameter .*</deny-configuration-regexps>
+ <deny-configuration-regexps>apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>access-profile .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces traceoptions .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-set .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-range .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups-except .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lt-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces ms-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces si-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces gr-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lo.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces dsc.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces irb.*</deny-configuration-regexps>
+ </class>
<class>
<name>readonly-permissions</name>
<idle-timeout>15</idle-timeout>
@@ -555,6 +587,22 @@
<encrypted-password>/* SECRET-DATA */</encrypted-password>
</authentication>
</user>
+ <user>
+ <name>opennsa</name>
+ <uid>2047</uid>
+ <class>opennsa</class>
+ <authentication>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ </authentication>
+ </user>
<user>
<name>opnet</name>
<full-name>OPNET NEOP Planning system @ 62.40.105.114</full-name>
@@ -2698,6 +2746,9 @@
<clients>
<name>83.97.93.196/32</name>
</clients>
+ <clients>
+ <name>83.97.93.238/32</name>
+ </clients>
</community>
<community>
<name>As4n0gN!</name>
@@ -3256,13 +3307,13 @@
<import-rib>IAS.inet6.0</import-rib>
<import-policy>rtbh-policy</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias</name>
<import-rib>IAS.inet.0</import-rib>
<import-rib>CLEAN_IAS.inet.0</import-rib>
<import-policy>ps-into-clean-ias-import</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias-v6</name>
<import-rib>IAS.inet6.0</import-rib>
<import-rib>CLEAN_IAS.inet6.0</import-rib>
@@ -6602,16 +6653,13 @@
</prefix-list>
<prefix-list>
<name>geantncc-address-space</name>
- <comment>/* NCC DR VPN LAN */</comment>
+ <comment>/* NCC DR VPN */</comment>
<prefix-list-item>
- <name>62.40.108.192/26</name>
+ <name>62.40.108.192/27</name>
</prefix-list-item>
<prefix-list-item>
<name>62.40.119.0/24</name>
</prefix-list-item>
- <prefix-list-item>
- <name>62.40.119.134/32</name>
- </prefix-list-item>
<prefix-list-item>
<name>62.40.125.250/32</name>
</prefix-list-item>
@@ -7745,6 +7793,14 @@
</prefix-list>
<prefix-list>
<name>corporate-address-space</name>
+ <comment>/* LON2 CORP VPN (MAC) */</comment>
+ <prefix-list-item>
+ <name>62.40.99.194/32</name>
+ </prefix-list-item>
+ <comment>/* LON2 CORP VPN */</comment>
+ <prefix-list-item>
+ <name>62.40.99.201/32</name>
+ </prefix-list-item>
<prefix-list-item>
<name>62.40.119.128/25</name>
</prefix-list-item>
@@ -7842,6 +7898,18 @@
<name>2001:798::/32</name>
</prefix-list-item>
</prefix-list>
+ <prefix-list>
+ <name>opennsa-servers</name>
+ <prefix-list-item>
+ <name>83.97.93.92/32</name>
+ </prefix-list-item>
+ </prefix-list>
+ <prefix-list>
+ <name>opennsa-servers-v6</name>
+ <prefix-list-item>
+ <name>2001:798:3::15f/128</name>
+ </prefix-list-item>
+ </prefix-list>
<policy-statement>
<name>ASM-Allow</name>
<term>
@@ -8254,6 +8322,10 @@
<address>185.1.68.0/24</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>193.188.137.0/24</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -8375,6 +8447,10 @@
<address>2001:7f8:a0::/64</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>2001:7f8:35::/64</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -9920,13 +9996,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -9942,14 +10011,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp>
<name>backbone-classifier</name>
@@ -9961,18 +10022,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -9980,195 +10029,16 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>iperf-classifier</name>
- <import>default</import>
<forwarding-class>
<name>expedited-forwarding</name>
<loss-priority>
<name>low</name>
- <code-points>af12</code-points>
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>backbone-classifier</name>
@@ -10180,18 +10050,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -10199,13 +10057,7 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -10228,13 +10080,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -10250,187 +10095,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>iperf-classifier</name>
- <import>default</import>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>af12</code-points>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-access-classifier</name>
@@ -10439,16 +10103,16 @@
<name>be</name>
<loss-priority>
<name>low</name>
- <code-points>000</code-points>
- <code-points>001</code-points>
- <code-points>010</code-points>
- <code-points>011</code-points>
- <code-points>110</code-points>
- <code-points>111</code-points>
+ <code-points>100</code-points>
+ <code-points>101</code-points>
</loss-priority>
</forwarding-class>
+ </exp>
+ <exp>
+ <name>mpls-backbone-classifier</name>
+ <import>default</import>
<forwarding-class>
- <name>less-than-best-effort</name>
+ <name>be</name>
<loss-priority>
<name>low</name>
<code-points>100</code-points>
@@ -10456,40 +10120,7 @@
</loss-priority>
</forwarding-class>
</exp>
- <exp>
- <name>mpls-backbone-classifier</name>
- <import>default</import>
- </exp>
</classifiers>
- <code-point-aliases>
- <dscp>
- <name>ix</name>
- <bits>101001</bits>
- </dscp>
- <dscp>
- <name>dws</name>
- <bits>100000</bits>
- </dscp>
- <dscp-ipv6>
- <name>dws</name>
- <bits>100000</bits>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix</name>
- <bits>101001</bits>
- </dscp-ipv6>
- </code-point-aliases>
- <drop-profiles>
- <name>dws-drop-profile</name>
- <fill-level>
- <name>35</name>
- <drop-probability>10</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<drop-profiles>
<name>be-drop-profile</name>
<fill-level>
@@ -10509,58 +10140,59 @@
<drop-probability>100</drop-probability>
</fill-level>
</drop-profiles>
- <drop-profiles>
- <name>less-than-be-drop-profile</name>
- <fill-level>
- <name>25</name>
- <drop-probability>30</drop-probability>
- </fill-level>
- <fill-level>
- <name>30</name>
- <drop-probability>50</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>70</drop-probability>
- </fill-level>
- <fill-level>
- <name>50</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<forwarding-classes>
<class>
<name>be</name>
<queue-num>0</queue-num>
</class>
- <class>
- <name>be-ix</name>
- <queue-num>0</queue-num>
- </class>
<class>
<name>expedited-forwarding</name>
<queue-num>1</queue-num>
</class>
- <class>
- <name>less-than-best-effort</name>
- <queue-num>2</queue-num>
- </class>
<class>
<name>network-control</name>
<queue-num>3</queue-num>
</class>
- <class>
- <name>be-dws</name>
- <queue-num>0</queue-num>
- </class>
- <class>
- <name>be-bleach</name>
- <queue-num>0</queue-num>
- </class>
</forwarding-classes>
<interfaces>
+ <interface>
+ <name>et-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>ge-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>so-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>xe-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
<interface>
<name>xe-0/1/0</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ <unit>
+ <name>100</name>
+ <classifiers>
+ <dscp>
+ <name>access-classifier</name>
+ </dscp>
+ <dscp-ipv6>
+ <name>access-classifier</name>
+ </dscp-ipv6>
+ </classifiers>
+ <rewrite-rules>
+ <dscp>
+ <name>basic-rewrite-rules</name>
+ </dscp>
+ <dscp-ipv6>
+ <name>basic-rewrite-rules</name>
+ </dscp-ipv6>
+ </rewrite-rules>
+ </unit>
<unit>
<name>333</name>
<classifiers>
@@ -10571,11 +10203,19 @@
<name>access-classifier</name>
</dscp-ipv6>
</classifiers>
+ <rewrite-rules>
+ <dscp>
+ <name>basic-rewrite-rules</name>
+ </dscp>
+ <dscp-ipv6>
+ <name>basic-rewrite-rules</name>
+ </dscp-ipv6>
+ </rewrite-rules>
</unit>
</interface>
<interface>
<name>xe-1/0/1</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -10593,9 +10233,13 @@
</rewrite-rules>
</unit>
</interface>
+ <interface>
+ <name>ae*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
<interface>
<name>ae1</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -10613,17 +10257,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -10633,7 +10269,7 @@
</interface>
<interface>
<name>ae2</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -10660,7 +10296,7 @@
</interface>
<interface>
<name>ae5</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -10678,17 +10314,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -10700,13 +10328,6 @@
<rewrite-rules>
<dscp>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -10721,17 +10342,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -10743,97 +10353,9 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -10848,17 +10370,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -10870,73 +10381,6 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
@@ -10944,35 +10388,19 @@
</exp>
</rewrite-rules>
<scheduler-maps>
- <name>MAP-BASIC-IQ2</name>
- <forwarding-class>
- <name>be-dws</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
+ <name>GEANT-BASIC</name>
<forwarding-class>
<name>expedited-forwarding</name>
<scheduler>sch-expedited-forwarding</scheduler>
</forwarding-class>
<forwarding-class>
<name>network-control</name>
- <scheduler>sch-network-ctrl-iq2</scheduler>
+ <scheduler>sch-network-ctrl-geant</scheduler>
</forwarding-class>
<forwarding-class>
<name>be</name>
<scheduler>sch-be</scheduler>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <scheduler>sch-less-than-best-effort</scheduler>
- </forwarding-class>
</scheduler-maps>
<schedulers>
<name>sch-be</name>
@@ -10992,27 +10420,7 @@
<priority>strict-high</priority>
</schedulers>
<schedulers>
- <name>sch-less-than-best-effort</name>
- <transmit-rate>
- <percent>10</percent>
- </transmit-rate>
- <buffer-size>
- <percent>10</percent>
- </buffer-size>
- <priority>low</priority>
- <drop-profile-map>
- <loss-priority>low</loss-priority>
- <protocol>any</protocol>
- <drop-profile>less-than-be-drop-profile</drop-profile>
- </drop-profile-map>
- <drop-profile-map>
- <loss-priority>high</loss-priority>
- <protocol>any</protocol>
- <drop-profile>be-drop-profile</drop-profile>
- </drop-profile-map>
- </schedulers>
- <schedulers>
- <name>sch-network-ctrl</name>
+ <name>sch-network-ctrl-geant</name>
<transmit-rate>
<percent>5</percent>
</transmit-rate>
@@ -11021,15 +10429,6 @@
</buffer-size>
<priority>high</priority>
</schedulers>
- <schedulers>
- <name>sch-network-ctrl-iq2</name>
- <transmit-rate>
- <percent>5</percent>
- </transmit-rate>
- <buffer-size>
- <percent>5</percent>
- </buffer-size>
- </schedulers>
</class-of-service>
<firewall>
<family>
@@ -13205,6 +12604,9 @@
<source-prefix-list>
<name>dashboard-servers</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers</name>
+ </source-prefix-list>
<protocol>tcp</protocol>
<destination-port>ssh</destination-port>
</from>
@@ -15083,6 +14485,9 @@
<source-prefix-list>
<name>dashboard-servers-v6</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers-v6</name>
+ </source-prefix-list>
<next-header>tcp</next-header>
<port>ssh</port>
</from>
@@ -15750,7 +15155,7 @@
</policer>
</firewall>
<routing-instances>
- <instance>
+ <instance inactive="inactive">
<name>CLEAN_IAS</name>
<description>Clean IAS VRF traffic returned from scrubber</description>
<instance-type>vrf</instance-type>
diff --git a/test/data/mx1.lis.pt.geant.net-netconf.xml b/test/data/mx1.lis.pt.geant.net-netconf.xml
index 2e634fea83d25d91fee66e8ad4e68198cdff0d3a..c6bb38cbfa8a2f4c07c04b88fadf8142145b47ce 100644
--- a/test/data/mx1.lis.pt.geant.net-netconf.xml
+++ b/test/data/mx1.lis.pt.geant.net-netconf.xml
@@ -1,4 +1,4 @@
-<configuration changed-seconds="1545214011" changed-localtime="2018-12-19 10:06:51 UTC">
+<configuration changed-seconds="1549111264" changed-localtime="2019-02-02 12:41:04 UTC">
<version>15.1F6-S10.9</version>
<groups>
<name>re0</name>
@@ -250,6 +250,38 @@
<allow-commands>show .*</allow-commands>
<deny-commands>(ssh .*|telnet .*)</deny-commands>
</class>
+ <class>
+ <name>opennsa</name>
+ <idle-timeout>5</idle-timeout>
+ <permissions>configure</permissions>
+ <deny-commands>(file.*)|(load.*)|(op.*)|(request.*)|(save.*)|(start.*)|(test.*)|(set cli.*)|(set date.*)|(clear.*)|(help.*)|(telnet.*)|(ssh.*)|(traceroute.*)|(mtrace.*)|(monitor.*)|(ping.*)|(show.*)|(set.*)</deny-commands>
+ <allow-configuration-regexps>interfaces .*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections remote-interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols mpls label-switched-path.*</allow-configuration-regexps>
+ <deny-configuration-regexps>vmhost .*</deny-configuration-regexps>
+ <deny-configuration-regexps>session-limit-group .*</deny-configuration-regexps>
+ <deny-configuration-regexps>multi-chassis .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc-partition .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc .*</deny-configuration-regexps>
+ <deny-configuration-regexps>groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>dynamic-profiles .*</deny-configuration-regexps>
+ <deny-configuration-regexps>diameter .*</deny-configuration-regexps>
+ <deny-configuration-regexps>apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>access-profile .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces traceoptions .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-set .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-range .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups-except .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lt-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces ms-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces si-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces gr-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lo.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces dsc.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces irb.*</deny-configuration-regexps>
+ </class>
<class>
<name>readonly-permissions</name>
<idle-timeout>15</idle-timeout>
@@ -553,6 +585,22 @@
<encrypted-password>/* SECRET-DATA */</encrypted-password>
</authentication>
</user>
+ <user>
+ <name>opennsa</name>
+ <uid>2002</uid>
+ <class>opennsa</class>
+ <authentication>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ </authentication>
+ </user>
<user>
<name>opnet</name>
<full-name>OPNET NEOP Planning system @ 62.40.105.114</full-name>
@@ -1659,8 +1707,10 @@
</interface>
<interface>
<name>xe-0/1/0</name>
- <description>PHY SPARE</description>
- <disable/>
+ <description>PHY SPARE |Reserved for LIS-LON Upgrade</description>
+ <framing>
+ <wan-phy/>
+ </framing>
</interface>
<interface>
<name>xe-0/1/1</name>
@@ -1694,8 +1744,12 @@
</interface>
<interface>
<name>xe-1/1/0</name>
- <description>PHY SPARE</description>
- <disable/>
+ <description>PHY CUSTOMER FCCN P_AE10 SRF18096</description>
+ <gigether-options>
+ <ieee-802.3ad>
+ <bundle>ae10</bundle>
+ </ieee-802.3ad>
+ </gigether-options>
</interface>
<interface>
<name>xe-1/1/1</name>
@@ -1733,6 +1787,25 @@
</family>
</unit>
</interface>
+ <interface>
+ <name>xe-2/0/0</name>
+ <description>PHY SPARE |Reserved for LIS1-LIS2 Upgrade</description>
+ </interface>
+ <interface>
+ <name>xe-2/0/1</name>
+ <description>PHY SPARE</description>
+ <disable/>
+ </interface>
+ <interface>
+ <name>xe-2/1/0</name>
+ <description>PHY SPARE</description>
+ <disable/>
+ </interface>
+ <interface>
+ <name>xe-2/1/1</name>
+ <description>PHY SPARE</description>
+ <disable/>
+ </interface>
<interface>
<name>ae0</name>
<description>LAG INFRASTRUCTURE BACKBONE LIS SRF0000001 | lis-lis</description>
@@ -2201,6 +2274,9 @@
<clients>
<name>83.97.93.196/32</name>
</clients>
+ <clients>
+ <name>83.97.93.238/32</name>
+ </clients>
</community>
<community>
<name>As4n0gN!</name>
@@ -2687,13 +2763,13 @@
<import-rib>IAS.inet6.0</import-rib>
<import-policy>rtbh-policy</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias</name>
<import-rib>IAS.inet.0</import-rib>
<import-rib>CLEAN_IAS.inet.0</import-rib>
<import-policy>ps-into-clean-ias-import</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias-v6</name>
<import-rib>IAS.inet6.0</import-rib>
<import-rib>CLEAN_IAS.inet6.0</import-rib>
@@ -6162,16 +6238,13 @@
</prefix-list>
<prefix-list>
<name>geantncc-address-space</name>
- <comment>/* NCC DR VPN LAN */</comment>
+ <comment>/* NCC DR VPN */</comment>
<prefix-list-item>
- <name>62.40.108.192/26</name>
+ <name>62.40.108.192/27</name>
</prefix-list-item>
<prefix-list-item>
<name>62.40.119.0/24</name>
</prefix-list-item>
- <prefix-list-item>
- <name>62.40.119.134/32</name>
- </prefix-list-item>
<prefix-list-item>
<name>62.40.125.250/32</name>
</prefix-list-item>
@@ -7209,6 +7282,14 @@
</prefix-list>
<prefix-list>
<name>corporate-address-space</name>
+ <comment>/* LON2 CORP VPN (MAC) */</comment>
+ <prefix-list-item>
+ <name>62.40.99.194/32</name>
+ </prefix-list-item>
+ <comment>/* LON2 CORP VPN */</comment>
+ <prefix-list-item>
+ <name>62.40.99.201/32</name>
+ </prefix-list-item>
<prefix-list-item>
<name>62.40.119.128/25</name>
</prefix-list-item>
@@ -7315,6 +7396,18 @@
<name>2001:798::/32</name>
</prefix-list-item>
</prefix-list>
+ <prefix-list>
+ <name>opennsa-servers</name>
+ <prefix-list-item>
+ <name>83.97.93.92/32</name>
+ </prefix-list-item>
+ </prefix-list>
+ <prefix-list>
+ <name>opennsa-servers-v6</name>
+ <prefix-list-item>
+ <name>2001:798:3::15f/128</name>
+ </prefix-list-item>
+ </prefix-list>
<policy-statement>
<name>ASM-Allow</name>
<term>
@@ -7727,6 +7820,10 @@
<address>185.1.68.0/24</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>193.188.137.0/24</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -7848,6 +7945,10 @@
<address>2001:7f8:a0::/64</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>2001:7f8:35::/64</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -9701,13 +9802,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -9723,14 +9817,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp>
<name>backbone-classifier</name>
@@ -9742,18 +9828,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -9761,13 +9835,7 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -9778,179 +9846,6 @@
</loss-priority>
</forwarding-class>
</dscp>
- <dscp>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>iperf-classifier</name>
- <import>default</import>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>af12</code-points>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
<dscp-ipv6>
<name>backbone-classifier</name>
<import>default</import>
@@ -9961,18 +9856,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -9980,13 +9863,7 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -10009,13 +9886,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -10031,187 +9901,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>iperf-classifier</name>
- <import>default</import>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>af12</code-points>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-access-classifier</name>
@@ -10220,16 +9909,16 @@
<name>be</name>
<loss-priority>
<name>low</name>
- <code-points>000</code-points>
- <code-points>001</code-points>
- <code-points>010</code-points>
- <code-points>011</code-points>
- <code-points>110</code-points>
- <code-points>111</code-points>
+ <code-points>100</code-points>
+ <code-points>101</code-points>
</loss-priority>
</forwarding-class>
+ </exp>
+ <exp>
+ <name>mpls-backbone-classifier</name>
+ <import>default</import>
<forwarding-class>
- <name>less-than-best-effort</name>
+ <name>be</name>
<loss-priority>
<name>low</name>
<code-points>100</code-points>
@@ -10237,40 +9926,7 @@
</loss-priority>
</forwarding-class>
</exp>
- <exp>
- <name>mpls-backbone-classifier</name>
- <import>default</import>
- </exp>
</classifiers>
- <code-point-aliases>
- <dscp>
- <name>ix</name>
- <bits>101001</bits>
- </dscp>
- <dscp>
- <name>dws</name>
- <bits>100000</bits>
- </dscp>
- <dscp-ipv6>
- <name>dws</name>
- <bits>100000</bits>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix</name>
- <bits>101001</bits>
- </dscp-ipv6>
- </code-point-aliases>
- <drop-profiles>
- <name>dws-drop-profile</name>
- <fill-level>
- <name>35</name>
- <drop-probability>10</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<drop-profiles>
<name>be-drop-profile</name>
<fill-level>
@@ -10290,59 +9946,44 @@
<drop-probability>100</drop-probability>
</fill-level>
</drop-profiles>
- <drop-profiles>
- <name>less-than-be-drop-profile</name>
- <fill-level>
- <name>25</name>
- <drop-probability>30</drop-probability>
- </fill-level>
- <fill-level>
- <name>30</name>
- <drop-probability>50</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>70</drop-probability>
- </fill-level>
- <fill-level>
- <name>50</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<forwarding-classes>
<class>
<name>be</name>
<queue-num>0</queue-num>
</class>
- <class>
- <name>be-ix</name>
- <queue-num>0</queue-num>
- </class>
<class>
<name>expedited-forwarding</name>
<queue-num>1</queue-num>
</class>
- <class>
- <name>less-than-best-effort</name>
- <queue-num>2</queue-num>
- </class>
<class>
<name>network-control</name>
<queue-num>3</queue-num>
</class>
- <class>
- <name>be-dws</name>
- <queue-num>0</queue-num>
- </class>
- <class>
- <name>be-bleach</name>
- <queue-num>0</queue-num>
- </class>
</forwarding-classes>
<interfaces>
+ <interface>
+ <name>et-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>ge-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>so-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>xe-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>ae*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
<interface>
<name>ae0</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -10360,17 +10001,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -10380,7 +10013,7 @@
</interface>
<interface>
<name>ae5</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -10398,17 +10031,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -10418,8 +10043,8 @@
</interface>
<interface>
<name>ae10</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
- <unit inactive="inactive">
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ <unit>
<name>333</name>
<classifiers>
<dscp>
@@ -10459,13 +10084,6 @@
<rewrite-rules>
<dscp>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -10480,17 +10098,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -10502,97 +10109,9 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -10607,17 +10126,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -10629,73 +10137,6 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
@@ -10703,35 +10144,19 @@
</exp>
</rewrite-rules>
<scheduler-maps>
- <name>MAP-BASIC-IQ2</name>
- <forwarding-class>
- <name>be-dws</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
+ <name>GEANT-BASIC</name>
<forwarding-class>
<name>expedited-forwarding</name>
<scheduler>sch-expedited-forwarding</scheduler>
</forwarding-class>
<forwarding-class>
<name>network-control</name>
- <scheduler>sch-network-ctrl-iq2</scheduler>
+ <scheduler>sch-network-ctrl-geant</scheduler>
</forwarding-class>
<forwarding-class>
<name>be</name>
<scheduler>sch-be</scheduler>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <scheduler>sch-less-than-best-effort</scheduler>
- </forwarding-class>
</scheduler-maps>
<schedulers>
<name>sch-be</name>
@@ -10751,27 +10176,7 @@
<priority>strict-high</priority>
</schedulers>
<schedulers>
- <name>sch-less-than-best-effort</name>
- <transmit-rate>
- <percent>10</percent>
- </transmit-rate>
- <buffer-size>
- <percent>10</percent>
- </buffer-size>
- <priority>low</priority>
- <drop-profile-map>
- <loss-priority>low</loss-priority>
- <protocol>any</protocol>
- <drop-profile>less-than-be-drop-profile</drop-profile>
- </drop-profile-map>
- <drop-profile-map>
- <loss-priority>high</loss-priority>
- <protocol>any</protocol>
- <drop-profile>be-drop-profile</drop-profile>
- </drop-profile-map>
- </schedulers>
- <schedulers>
- <name>sch-network-ctrl</name>
+ <name>sch-network-ctrl-geant</name>
<transmit-rate>
<percent>5</percent>
</transmit-rate>
@@ -10780,15 +10185,6 @@
</buffer-size>
<priority>high</priority>
</schedulers>
- <schedulers>
- <name>sch-network-ctrl-iq2</name>
- <transmit-rate>
- <percent>5</percent>
- </transmit-rate>
- <buffer-size>
- <percent>5</percent>
- </buffer-size>
- </schedulers>
</class-of-service>
<firewall>
<family>
@@ -11806,6 +11202,9 @@
<source-prefix-list>
<name>dashboard-servers</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers</name>
+ </source-prefix-list>
<protocol>tcp</protocol>
<destination-port>ssh</destination-port>
</from>
@@ -12887,6 +12286,9 @@
<source-prefix-list>
<name>dashboard-servers-v6</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers-v6</name>
+ </source-prefix-list>
<next-header>tcp</next-header>
<port>ssh</port>
</from>
@@ -13159,7 +12561,7 @@
</policer>
</firewall>
<routing-instances>
- <instance>
+ <instance inactive="inactive">
<name>CLEAN_IAS</name>
<description>Clean IAS VRF traffic returned from scrubber</description>
<instance-type>vrf</instance-type>
diff --git a/test/data/mx1.lon.uk.geant.net-netconf.xml b/test/data/mx1.lon.uk.geant.net-netconf.xml
index f28e146800f42907eaecb2ce20f70a2523785e50..49b5c026d9c4adce402bd7adc981acf89b6a884d 100644
--- a/test/data/mx1.lon.uk.geant.net-netconf.xml
+++ b/test/data/mx1.lon.uk.geant.net-netconf.xml
@@ -1,4 +1,4 @@
-<configuration changed-seconds="1545216944" changed-localtime="2018-12-19 10:55:44 UTC">
+<configuration changed-seconds="1549016486" changed-localtime="2019-02-01 10:21:26 UTC">
<version>15.1F6-S10.9</version>
<groups>
<name>re0</name>
@@ -251,6 +251,38 @@
<allow-commands>show .*</allow-commands>
<deny-commands>(ssh .*|telnet .*)</deny-commands>
</class>
+ <class>
+ <name>opennsa</name>
+ <idle-timeout>5</idle-timeout>
+ <permissions>configure</permissions>
+ <deny-commands>(file.*)|(load.*)|(op.*)|(request.*)|(save.*)|(start.*)|(test.*)|(set cli.*)|(set date.*)|(clear.*)|(help.*)|(telnet.*)|(ssh.*)|(traceroute.*)|(mtrace.*)|(monitor.*)|(ping.*)|(show.*)|(set.*)</deny-commands>
+ <allow-configuration-regexps>interfaces .*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections remote-interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols mpls label-switched-path.*</allow-configuration-regexps>
+ <deny-configuration-regexps>vmhost .*</deny-configuration-regexps>
+ <deny-configuration-regexps>session-limit-group .*</deny-configuration-regexps>
+ <deny-configuration-regexps>multi-chassis .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc-partition .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc .*</deny-configuration-regexps>
+ <deny-configuration-regexps>groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>dynamic-profiles .*</deny-configuration-regexps>
+ <deny-configuration-regexps>diameter .*</deny-configuration-regexps>
+ <deny-configuration-regexps>apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>access-profile .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces traceoptions .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-set .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-range .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups-except .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lt-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces ms-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces si-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces gr-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lo.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces dsc.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces irb.*</deny-configuration-regexps>
+ </class>
<class>
<name>readonly-permissions</name>
<permissions>view</permissions>
@@ -569,6 +601,22 @@
<encrypted-password>/* SECRET-DATA */</encrypted-password>
</authentication>
</user>
+ <user>
+ <name>opennsa</name>
+ <uid>2053</uid>
+ <class>opennsa</class>
+ <authentication>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ </authentication>
+ </user>
<user>
<name>opnet</name>
<full-name>OPNET NEOP Planning system @ 62.40.105.114</full-name>
@@ -2526,6 +2574,15 @@
</family>
</unit>
</interface>
+ <interface>
+ <name>ge-0/2/3</name>
+ <description>PHY RE_INTERCONNECT ASREN P_AE15 SRF9943959 |Equinix CXC SN:20809250 </description>
+ <gigether-options>
+ <ieee-802.3ad>
+ <bundle>ae15</bundle>
+ </ieee-802.3ad>
+ </gigether-options>
+ </interface>
<interface>
<name>ge-0/2/4</name>
<description>PHY INFRASTRUCTURE ACCESS NETMON SRF9911041 | Netmon interface</description>
@@ -4078,6 +4135,36 @@
</inet>
</family>
</unit>
+ <unit>
+ <name>401</name>
+ <description>SRV_GLOBAL INFRASTRUCTURE | LON Groove 2</description>
+ <vlan-id>401</vlan-id>
+ <family>
+ <inet>
+ <address>
+ <name>10.0.6.13/30</name>
+ </address>
+ </inet>
+ </family>
+ </unit>
+ <unit>
+ <name>402</name>
+ <description>SRV_GLOBAL INFRASTRUCTURE | LON Groove 2 Direct Management</description>
+ <vlan-id>402</vlan-id>
+ <family>
+ <inet>
+ <filter>
+ <input-list>INTERNAL_HEAD_IN</input-list>
+ <input-list>INTERNAL_TAIL_IN</input-list>
+ <output-list>INTERNAL_HEAD_OUT</output-list>
+ <output-list>INTERNAL_TAIL_OUT</output-list>
+ </filter>
+ <address>
+ <name>62.40.108.176/31</name>
+ </address>
+ </inet>
+ </family>
+ </unit>
<unit>
<name>902</name>
<description>SRV_L2CIRCUIT CUSTOMER INTERNET2 SRF9940169| lon-lon_MISC_GEANT-INTERNET2_9940169</description>
@@ -4168,36 +4255,10 @@
</family>
</unit>
</interface>
- <interface inactive="inactive">
+ <interface>
<name>ge-0/3/1</name>
- <description>PHY PRIVATE INTEROUTE SRF9925099 | INTEROUTE ID: INTR3/SDETH/164484</description>
- <mtu>1514</mtu>
- <gigether-options>
- <no-auto-negotiation/>
- </gigether-options>
- <unit>
- <name>0</name>
- <description>SRV_IAS PRIVATE INTEROUTE SRF9925423 | ASN8928 | Helix Nebula</description>
- <family>
- <inet>
- <mtu>1500</mtu>
- <filter>
- <input>
- <filter-name>interoute-in</filter-name>
- </input>
- <output>
- <filter-name>interoute-out</filter-name>
- </output>
- </filter>
- <address>
- <name>89.202.226.130/30</name>
- </address>
- </inet>
- <inet6>
- <mtu>1500</mtu>
- </inet6>
- </family>
- </unit>
+ <description>PHY SPARE</description>
+ <disable/>
</interface>
<interface>
<name>ge-0/3/2</name>
@@ -4209,6 +4270,21 @@
<flexible-vlan-tagging/>
<mtu>9192</mtu>
<encapsulation>flexible-ethernet-services</encapsulation>
+ <unit>
+ <name>2019</name>
+ <description>lon_ams_BoD_AutoBAHNTest1</description>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-tags>
+ <outer>2019</outer>
+ </vlan-tags>
+ <family>
+ <ccc>
+ <filter>
+ <input>filter_in_ge-0/3/3_2019</input>
+ </filter>
+ </ccc>
+ </family>
+ </unit>
</interface>
<interface>
<name>ge-0/3/4</name>
@@ -4468,6 +4544,12 @@
<encapsulation>vlan-ccc</encapsulation>
<vlan-id>201</vlan-id>
</unit>
+ <unit>
+ <name>220</name>
+ <description>SRV_L2CIRCUIT CUSTOMER TENET SRF19004 | lon-lon_GEANTOPEN_INTERNET2-TENET_19004</description>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>220</vlan-id>
+ </unit>
<unit>
<name>240</name>
<description>SRV_L2CIRCUIT CUSTOMER TENET SRF18075 | lon-lon_GEANTOPEN_NORDUNET-TENET_18075</description>
@@ -4708,7 +4790,6 @@
<interface>
<name>et-1/3/0</name>
<description>PHY SPARE | Reserved for AARnet</description>
- <disable/>
</interface>
<interface>
<name>lt-1/3/0</name>
@@ -4768,21 +4849,16 @@
</interface>
<interface>
<name>xe-2/0/0</name>
- <description>PHY RE_INTERCONNECT ASREN P_AE15 SRF9943959 |Equinix CXC SN:20809250 </description>
- <gigether-options>
+ <description inactive="inactive">PHY RE_INTERCONNECT ASREN P_AE15 SRF9943959 |Equinix CXC SN:20809250 </description>
+ <gigether-options inactive="inactive">
<ieee-802.3ad>
<bundle>ae15</bundle>
</ieee-802.3ad>
</gigether-options>
</interface>
- <interface>
- <name>xe-2/0/1</name>
- <description>PHY SPARE</description>
- <disable/>
- </interface>
<interface>
<name>xe-2/0/2</name>
- <description>PHY INFRASTRUCTURE ACCESS PERFSONAR SRF9925113 | BWCTL CONTACT: ivan.garnizov@fau.de IMPLEMENTED: 20150806;</description>
+ <description>PHY INFRASTRUCTURE ACCESS PERFSONAR SRF9925113 | BWCTL CONTACT: ivan.garnizov@fau.de IMPLEMENTED: 20150806</description>
<mtu>9192</mtu>
<unit>
<name>0</name>
@@ -4821,47 +4897,6 @@
</family>
</unit>
</interface>
- <interface>
- <name>xe-2/0/3</name>
- <description>PHY INFRASTRUCTURE ACCESS PERFSONAR SRF0000001 | PSMP BWCTL</description>
- <mtu>9192</mtu>
- <unit>
- <name>0</name>
- <description>SRV_GLOBAL INFRASTRUCTURE ACCESS PERFSONAR SRF0000001 | BWCTL CONTACT: ivan.garnizov@fau.de IMPLEMENTED: 20160602</description>
- <family>
- <inet>
- <mtu>9000</mtu>
- <filter>
- <input-list>EXTERNAL_HEAD_IN</input-list>
- <input-list>BWCTL_MIDDLE_IN</input-list>
- <input-list>EXTERNAL_TAIL_IN</input-list>
- <output-list>EXTERNAL_HEAD_OUT</output-list>
- <output-list>BWCTL_MIDDLE_OUT</output-list>
- <output-list>EXTERNAL_TAIL_OUT</output-list>
- </filter>
- <address>
- <name>62.40.126.192/31</name>
- </address>
- </inet>
- <iso>
- </iso>
- <inet6>
- <mtu>9000</mtu>
- <filter>
- <input-list>EXTERNAL_V6_HEAD_IN</input-list>
- <input-list>BWCTL_V6_MIDDLE_IN</input-list>
- <input-list>EXTERNAL_V6_TAIL_IN</input-list>
- <output-list>EXTERNAL_V6_HEAD_OUT</output-list>
- <output-list>BWCTL_V6_MIDDLE_OUT</output-list>
- <output-list>EXTERNAL_V6_TAIL_OUT</output-list>
- </filter>
- <address>
- <name>2001:798:111:1::6d/126</name>
- </address>
- </inet6>
- </family>
- </unit>
- </interface>
<interface>
<name>xe-2/1/0</name>
<description>PHY INFRASTRUCTURE BACKBONE P_AE4 SRF0000001 |</description>
@@ -5070,6 +5105,12 @@
<flexible-vlan-tagging/>
<mtu>9192</mtu>
<encapsulation>flexible-ethernet-services</encapsulation>
+ <unit>
+ <name>2110</name>
+ <description>SRV_L2CIRCUIT CUSTOMER HBKU SRF19009 | lon-lon2_GEANTOPEN_HBKU-INTERNET2_190092</description>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>2110</vlan-id>
+ </unit>
<unit>
<name>2200</name>
<description>SRV_GLOBAL RE_INTERCONNECT HBKU SRF18085 | ASN34945|</description>
@@ -5096,10 +5137,23 @@
</inet>
</family>
</unit>
+ <unit>
+ <name>2210</name>
+ <description>SRV_L2CIRCUIT CUSTOMER HBKU SRF19009 | lon-lon2_GEANTOPEN_HBKU-INTERNET2_190091</description>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>2210</vlan-id>
+ </unit>
</interface>
<interface>
<name>xe-3/0/3</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY RESERVED |New LON-LIS</description>
+ <framing>
+ <wan-phy/>
+ </framing>
+ </interface>
+ <interface>
+ <name>xe-3/0/5</name>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
@@ -5178,8 +5232,11 @@
</interface>
<interface>
<name>et-4/0/2</name>
- <description>PHY SPARE |Reserved for AMS-LON GRV AW</description>
+ <description>PHY INFRASTRUCTURE BACKBONE P_AE8 SRF0000001 | Coriant G30 link </description>
<gigether-options>
+ <ieee-802.3ad>
+ <bundle>ae8</bundle>
+ </ieee-802.3ad>
<undocumented><fec>fec91</fec></undocumented>
</gigether-options>
</interface>
@@ -5840,6 +5897,22 @@
</ccc>
</family>
</unit>
+ <unit>
+ <name>3760</name>
+ <description>mar_lon_BoD_urn_uuid_8d0f472e_be78_452_1050134863</description>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-tags>
+ <outer>3760</outer>
+ </vlan-tags>
+ <input-vlan-map>
+ <swap/>
+ <vlan-id>404</vlan-id>
+ </input-vlan-map>
+ <family>
+ <ccc>
+ </ccc>
+ </family>
+ </unit>
<unit>
<name>3762</name>
<description>lon_lon_BoD_urn_uuid_a49aac85_0feb_489_3112963142</description>
@@ -6048,7 +6121,7 @@
</interface>
<interface>
<name>et-9/1/5</name>
- <description>PHY INFRASTRUCTURE BACKBONE P_AE6 SRF0000001 | Coriant G30 link 5</description>
+ <description>PHY INFRASTRUCTURE BACKBONE P_AE6 SRF0000001 | Coriant G30 link 3</description>
<undocumented><enable/></undocumented>
<gigether-options>
<ieee-802.3ad>
@@ -6160,6 +6233,12 @@
<encapsulation>vlan-ccc</encapsulation>
<vlan-id>70</vlan-id>
</unit>
+ <unit>
+ <name>220</name>
+ <description>SRV_L2CIRCUIT CUSTOMER INTERNET2 SRF19004 | lon-lon_GEANTOPEN_INTERNET2-TENET_19004 </description>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>220</vlan-id>
+ </unit>
<unit>
<name>360</name>
<description>SRV_L2CIRCUIT CUSTOMER INTERNET2 SRF9906002 | lon-lon2_GEANTOpen_INTERNET2-SINET_06002</description>
@@ -6281,6 +6360,12 @@
<encapsulation>vlan-ccc</encapsulation>
<vlan-id>2128</vlan-id>
</unit>
+ <unit>
+ <name>2210</name>
+ <description>SRV_L2CIRCUIT CUSTOMER INTERNET2 SRF19009 | lon-lon2_GEANTOPEN_HBKU-INTERNET2_190091</description>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>2210</vlan-id>
+ </unit>
<unit>
<name>2762</name>
<vlan-id>2762</vlan-id>
@@ -6656,8 +6741,15 @@
</interface>
<interface>
<name>xe-11/2/0</name>
- <description>PHY SPARE |Reserved for IUCC AP Upgrade</description>
- <disable/>
+ <description>PHY CUSTOMER IUCC P_AE21 SRF9945377 | BEZEQ ID: WL-18-8868</description>
+ <framing>
+ <wan-phy/>
+ </framing>
+ <gigether-options>
+ <ieee-802.3ad>
+ <bundle>ae21</bundle>
+ </ieee-802.3ad>
+ </gigether-options>
</interface>
<interface>
<name>xe-11/2/1</name>
@@ -7250,6 +7342,65 @@
</family>
</unit>
</interface>
+ <interface>
+ <name>ae8</name>
+ <description>LAG INFRASTRUCTURE BACKBONE AMS SRF0000001 | ams-lon | Coriant G30 100G</description>
+ <mtu>9192</mtu>
+ <aggregated-ether-options>
+ <load-balance>
+ <adaptive>
+ </adaptive>
+ </load-balance>
+ <minimum-links>1</minimum-links>
+ <lacp>
+ <active/>
+ <periodic>fast</periodic>
+ </lacp>
+ </aggregated-ether-options>
+ <unit>
+ <name>0</name>
+ <description>SRV_GLOBAL INFRASTRUCTURE BACKBONE PAR SRF0000001 | ams-lon | Coriant G30 100G</description>
+ <family>
+ <inet>
+ <accounting>
+ <source-class-usage>
+ <input/>
+ </source-class-usage>
+ </accounting>
+ <mtu>9100</mtu>
+ <filter>
+ <input>
+ <filter-name>bone-in</filter-name>
+ </input>
+ <output>
+ <filter-name>bone-out</filter-name>
+ </output>
+ </filter>
+ <address>
+ <name>62.40.98.165/31</name>
+ </address>
+ </inet>
+ <iso>
+ </iso>
+ <inet6>
+ <mtu>9100</mtu>
+ <filter>
+ <input>
+ <filter-name>bone6-in</filter-name>
+ </input>
+ <output>
+ <filter-name>bone6-out</filter-name>
+ </output>
+ </filter>
+ <address>
+ <name>2001:798:cc::6/126</name>
+ </address>
+ </inet6>
+ <mpls>
+ </mpls>
+ </family>
+ </unit>
+ </interface>
<interface>
<name>ae10</name>
<description>LAG CUSTOMER JANET SRF9923031 |</description>
@@ -8094,7 +8245,7 @@
<mtu>9192</mtu>
<encapsulation>flexible-ethernet-services</encapsulation>
<aggregated-ether-options>
- <minimum-links>1</minimum-links>
+ <minimum-links>2</minimum-links>
<lacp>
<active/>
</lacp>
@@ -8600,6 +8751,9 @@
<clients>
<name>83.97.93.196/32</name>
</clients>
+ <clients>
+ <name>83.97.93.238/32</name>
+ </clients>
</community>
<community>
<name>As4n0gN!</name>
@@ -9875,18 +10029,12 @@
<inet>
<unicast>
<prefix-limit>
- <maximum>6000</maximum>
- <teardown>
- <limit-threshold>89</limit-threshold>
- </teardown>
+ <maximum>3430</maximum>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
- <maximum>1000</maximum>
- <teardown>
- <limit-threshold>89</limit-threshold>
- </teardown>
+ <maximum>111</maximum>
</prefix-limit>
</multicast>
</inet>
@@ -9909,18 +10057,12 @@
<inet>
<unicast>
<prefix-limit>
- <maximum>500</maximum>
- <teardown>
- <limit-threshold>89</limit-threshold>
- </teardown>
+ <maximum>211</maximum>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
- <maximum>500</maximum>
- <teardown>
- <limit-threshold>89</limit-threshold>
- </teardown>
+ <maximum>22</maximum>
</prefix-limit>
</multicast>
</inet>
@@ -9940,18 +10082,12 @@
<inet>
<unicast>
<prefix-limit>
- <maximum>19027</maximum>
- <teardown>
- <limit-threshold>89</limit-threshold>
- </teardown>
+ <maximum>21951</maximum>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
- <maximum>3000</maximum>
- <teardown>
- <limit-threshold>89</limit-threshold>
- </teardown>
+ <maximum>2722</maximum>
</prefix-limit>
</multicast>
</inet>
@@ -9972,10 +10108,7 @@
<inet>
<unicast>
<prefix-limit inactive="inactive">
- <maximum>500</maximum>
- <teardown>
- <limit-threshold>67</limit-threshold>
- </teardown>
+ <maximum>10</maximum>
</prefix-limit>
</unicast>
<multicast>
@@ -10003,18 +10136,12 @@
<inet>
<unicast>
<prefix-limit>
- <maximum>1576</maximum>
- <teardown>
- <limit-threshold>89</limit-threshold>
- </teardown>
+ <maximum>1612</maximum>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
- <maximum>500</maximum>
- <teardown>
- <limit-threshold>89</limit-threshold>
- </teardown>
+ <maximum>66</maximum>
</prefix-limit>
</multicast>
</inet>
@@ -10033,18 +10160,12 @@
<inet>
<unicast>
<prefix-limit>
- <maximum>9000</maximum>
- <teardown>
- <limit-threshold>90</limit-threshold>
- </teardown>
+ <maximum>5980</maximum>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
- <maximum>750</maximum>
- <teardown>
- <limit-threshold>90</limit-threshold>
- </teardown>
+ <maximum>111</maximum>
</prefix-limit>
</multicast>
</inet>
@@ -10064,10 +10185,7 @@
<inet>
<unicast>
<prefix-limit>
- <maximum>2200</maximum>
- <teardown>
- <limit-threshold>75</limit-threshold>
- </teardown>
+ <maximum>1527</maximum>
</prefix-limit>
</unicast>
<multicast>
@@ -10094,18 +10212,12 @@
<inet>
<unicast>
<prefix-limit>
- <maximum>1000</maximum>
- <teardown>
- <limit-threshold>85</limit-threshold>
- </teardown>
+ <maximum>789</maximum>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
- <maximum>1000</maximum>
- <teardown>
- <limit-threshold>85</limit-threshold>
- </teardown>
+ <maximum>10</maximum>
</prefix-limit>
</multicast>
</inet>
@@ -10129,12 +10241,12 @@
<inet>
<unicast>
<prefix-limit>
- <maximum>1000</maximum>
+ <maximum>10</maximum>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
- <maximum>1000</maximum>
+ <maximum>10</maximum>
</prefix-limit>
</multicast>
</inet>
@@ -10154,10 +10266,7 @@
<inet>
<unicast>
<prefix-limit>
- <maximum>9000</maximum>
- <teardown>
- <limit-threshold>90</limit-threshold>
- </teardown>
+ <maximum>24</maximum>
</prefix-limit>
</unicast>
<multicast>
@@ -10184,10 +10293,7 @@
<inet>
<unicast>
<prefix-limit>
- <maximum>9000</maximum>
- <teardown>
- <limit-threshold>90</limit-threshold>
- </teardown>
+ <maximum>10</maximum>
</prefix-limit>
</unicast>
<multicast>
@@ -10225,12 +10331,12 @@
<inet6>
<unicast>
<prefix-limit>
- <maximum>2000</maximum>
+ <maximum>547</maximum>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
- <maximum>500</maximum>
+ <maximum>10</maximum>
</prefix-limit>
</multicast>
</inet6>
@@ -10249,12 +10355,15 @@
<inet6>
<unicast>
<prefix-limit>
- <maximum>500</maximum>
+ <maximum>33</maximum>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
<maximum>500</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
</prefix-limit>
</multicast>
</inet6>
@@ -10274,15 +10383,18 @@
<inet6>
<unicast>
<prefix-limit>
- <maximum>4000</maximum>
- <teardown>
- <limit-threshold>75</limit-threshold>
- </teardown>
+ <maximum>2104</maximum>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
- <maximum>500</maximum>
+ <maximum>37</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
</prefix-limit>
</multicast>
</inet6>
@@ -10302,10 +10414,7 @@
<inet6>
<unicast>
<prefix-limit>
- <maximum>500</maximum>
- <teardown>
- <limit-threshold>75</limit-threshold>
- </teardown>
+ <maximum>10</maximum>
</prefix-limit>
</unicast>
<multicast>
@@ -10330,15 +10439,18 @@
<inet6>
<unicast>
<prefix-limit>
- <maximum>500</maximum>
- <teardown>
- <limit-threshold>75</limit-threshold>
- </teardown>
+ <maximum>67</maximum>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
- <maximum>500</maximum>
+ <maximum>10</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
</prefix-limit>
</multicast>
</inet6>
@@ -10357,12 +10469,12 @@
<inet6>
<unicast>
<prefix-limit>
- <maximum>1200</maximum>
+ <maximum>937</maximum>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
- <maximum>1000</maximum>
+ <maximum>13</maximum>
</prefix-limit>
</multicast>
</inet6>
@@ -10382,12 +10494,15 @@
<inet6>
<unicast>
<prefix-limit>
- <maximum>500</maximum>
+ <maximum>274</maximum>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
<maximum>500</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
</prefix-limit>
</multicast>
</inet6>
@@ -10406,10 +10521,7 @@
<inet6>
<unicast>
<prefix-limit>
- <maximum>500</maximum>
- <teardown>
- <limit-threshold>80</limit-threshold>
- </teardown>
+ <maximum>15</maximum>
</prefix-limit>
</unicast>
<multicast>
@@ -10436,12 +10548,15 @@
<inet6>
<unicast>
<prefix-limit>
- <maximum>1000</maximum>
+ <maximum>10</maximum>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
<maximum>1000</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
</prefix-limit>
</multicast>
</inet6>
@@ -10461,12 +10576,15 @@
<inet6>
<unicast>
<prefix-limit>
- <maximum>500</maximum>
+ <maximum>10</maximum>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
<maximum>500</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
</prefix-limit>
</multicast>
</inet6>
@@ -10815,6 +10933,17 @@
<metric>500</metric>
</level>
</interface>
+ <interface>
+ <name>ae8.0</name>
+ <point-to-point/>
+ <bfd-liveness-detection>
+ <minimum-interval>100</minimum-interval>
+ </bfd-liveness-detection>
+ <level>
+ <name>2</name>
+ <metric>500</metric>
+ </level>
+ </interface>
<interface>
<name>all</name>
<passive>
@@ -11013,6 +11142,9 @@
<interface>
<name>ae7.0</name>
</interface>
+ <interface>
+ <name>ae8.0</name>
+ </interface>
<interface>
<name>lo0.0</name>
</interface>
@@ -11156,6 +11288,12 @@
<virtual-circuit-id>18009</virtual-circuit-id>
<ignore-mtu-mismatch/>
</interface>
+ <interface>
+ <name>ge-0/3/3.2019</name>
+ <virtual-circuit-id>1572885</virtual-circuit-id>
+ <no-control-word/>
+ <mtu>9192</mtu>
+ </interface>
</neighbor>
<neighbor>
<name>62.40.97.1</name>
@@ -11279,6 +11417,12 @@
<no-control-word/>
<ignore-mtu-mismatch/>
</interface>
+ <interface>
+ <name>xe-3/0/2.2110</name>
+ <virtual-circuit-id>190092</virtual-circuit-id>
+ <no-control-word/>
+ <ignore-mtu-mismatch/>
+ </interface>
</neighbor>
<neighbor>
<name>62.40.96.20</name>
@@ -11405,6 +11549,12 @@
<no-control-word/>
<mtu>9192</mtu>
</interface>
+ <interface>
+ <name>xe-7/0/0.3760</name>
+ <virtual-circuit-id>1572883</virtual-circuit-id>
+ <no-control-word/>
+ <mtu>9192</mtu>
+ </interface>
</neighbor>
<neighbor>
<name>62.40.96.11</name>
@@ -11526,12 +11676,6 @@
</end-interface>
<ignore-mtu-mismatch/>
</interface>
- <interface>
- <name>xe-11/2/0.0</name>
- <end-interface>
- <interface>xe-11/2/1.0</interface>
- </end-interface>
- </interface>
<interface>
<name>et-5/0/5.2</name>
<end-interface>
@@ -11658,6 +11802,19 @@
<interface>xe-7/0/0.3762</interface>
</end-interface>
</interface>
+ <interface>
+ <name>et-10/3/0.220</name>
+ <end-interface>
+ <interface>xe-1/0/0.220</interface>
+ </end-interface>
+ </interface>
+ <interface>
+ <name>xe-3/0/2.2210</name>
+ <end-interface>
+ <interface>et-10/3/0.2210</interface>
+ </end-interface>
+ <ignore-mtu-mismatch/>
+ </interface>
</local-switching>
</l2circuit>
<neighbor-discovery>
@@ -12002,6 +12159,9 @@
<interface>
<name>et-3/3/0</name>
</interface>
+ <interface>
+ <name>et-4/0/2</name>
+ </interface>
<interface>
<name>ge-0/2/9</name>
</interface>
@@ -12219,16 +12379,13 @@
</prefix-list>
<prefix-list>
<name>geantncc-address-space</name>
- <comment>/* NCC DR VPN LAN */</comment>
+ <comment>/* NCC DR VPN */</comment>
<prefix-list-item>
- <name>62.40.108.192/26</name>
+ <name>62.40.108.192/27</name>
</prefix-list-item>
<prefix-list-item>
<name>62.40.119.0/24</name>
</prefix-list-item>
- <prefix-list-item>
- <name>62.40.119.134/32</name>
- </prefix-list-item>
<prefix-list-item>
<name>62.40.125.250/32</name>
</prefix-list-item>
@@ -17728,9 +17885,6 @@
<prefix-list-item>
<name>193.37.225.0/24</name>
</prefix-list-item>
- <prefix-list-item>
- <name>193.37.229.0/24</name>
- </prefix-list-item>
<prefix-list-item>
<name>193.37.240.0/21</name>
</prefix-list-item>
@@ -18298,9 +18452,18 @@
<prefix-list-item>
<name>217.180.0.0/15</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>217.180.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>217.181.0.0/17</name>
+ </prefix-list-item>
<prefix-list-item>
<name>217.181.8.0/21</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>217.181.128.0/17</name>
+ </prefix-list-item>
</prefix-list>
<prefix-list>
<name>route-from-JANET-v6</name>
@@ -20325,6 +20488,9 @@
<prefix-list-item>
<name>185.153.60.0/22</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>185.206.140.0/22</name>
+ </prefix-list-item>
<prefix-list-item>
<name>185.215.40.0/22</name>
</prefix-list-item>
@@ -26532,15 +26698,6 @@
<prefix-list-item>
<name>2a00:4860:2::/48</name>
</prefix-list-item>
- <prefix-list-item>
- <name>2a00:7540::/32</name>
- </prefix-list-item>
- <prefix-list-item>
- <name>2a00:7540::/48</name>
- </prefix-list-item>
- <prefix-list-item>
- <name>2a00:7540:1::/48</name>
- </prefix-list-item>
<prefix-list-item>
<name>2a00:7c00:8000::/40</name>
</prefix-list-item>
@@ -28875,6 +29032,9 @@
<prefix-list-item>
<name>81.95.40.0/21</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>81.95.42.0/24</name>
+ </prefix-list-item>
<prefix-list-item>
<name>82.130.0.0/18</name>
</prefix-list-item>
@@ -29349,6 +29509,9 @@
<prefix-list-item>
<name>91.151.190.0/24</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>91.189.114.0/23</name>
+ </prefix-list-item>
<prefix-list-item>
<name>91.192.28.0/22</name>
</prefix-list-item>
@@ -29922,18 +30085,6 @@
<prefix-list-item>
<name>128.39.0.0/16</name>
</prefix-list-item>
- <prefix-list-item>
- <name>128.127.144.0/22</name>
- </prefix-list-item>
- <prefix-list-item>
- <name>128.127.144.0/24</name>
- </prefix-list-item>
- <prefix-list-item>
- <name>128.127.146.0/24</name>
- </prefix-list-item>
- <prefix-list-item>
- <name>128.127.147.0/24</name>
- </prefix-list-item>
<prefix-list-item>
<name>128.214.0.0/16</name>
</prefix-list-item>
@@ -30258,6 +30409,9 @@
<prefix-list-item>
<name>144.206.192.0/18</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>144.206.221.0/24</name>
+ </prefix-list-item>
<prefix-list-item>
<name>144.206.222.0/24</name>
</prefix-list-item>
@@ -30402,6 +30556,9 @@
<prefix-list-item>
<name>159.93.0.0/16</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>160.210.0.0/16</name>
+ </prefix-list-item>
<prefix-list-item>
<name>161.4.0.0/16</name>
</prefix-list-item>
@@ -30732,6 +30889,9 @@
<prefix-list-item>
<name>185.71.96.0/22</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>185.76.84.0/22</name>
+ </prefix-list-item>
<prefix-list-item>
<name>185.76.144.0/22</name>
</prefix-list-item>
@@ -30790,7 +30950,7 @@
<name>185.175.172.0/22</name>
</prefix-list-item>
<prefix-list-item>
- <name>185.182.108.0/22</name>
+ <name>185.182.108.0/24</name>
</prefix-list-item>
<prefix-list-item>
<name>185.189.28.0/22</name>
@@ -31425,9 +31585,6 @@
<prefix-list-item>
<name>193.41.140.0/22</name>
</prefix-list-item>
- <prefix-list-item>
- <name>193.104.170.0/24</name>
- </prefix-list-item>
<prefix-list-item>
<name>193.104.248.0/24</name>
</prefix-list-item>
@@ -31755,6 +31912,9 @@
<prefix-list-item>
<name>194.14.96.0/24</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>194.31.156.0/22</name>
+ </prefix-list-item>
<prefix-list-item>
<name>194.47.0.0/16</name>
</prefix-list-item>
@@ -33244,7 +33404,7 @@
<name>213.131.30.0/23</name>
</prefix-list-item>
<prefix-list-item>
- <name>213.159.64.0/19</name>
+ <name>213.159.64.0/20</name>
</prefix-list-item>
<prefix-list-item>
<name>213.247.128.0/17</name>
@@ -33594,6 +33754,14 @@
</prefix-list>
<prefix-list>
<name>corporate-address-space</name>
+ <comment>/* LON2 CORP VPN (MAC) */</comment>
+ <prefix-list-item>
+ <name>62.40.99.194/32</name>
+ </prefix-list-item>
+ <comment>/* LON2 CORP VPN */</comment>
+ <prefix-list-item>
+ <name>62.40.99.201/32</name>
+ </prefix-list-item>
<prefix-list-item>
<name>62.40.119.128/25</name>
</prefix-list-item>
@@ -33769,6 +33937,18 @@
<name>2001:798::/32</name>
</prefix-list-item>
</prefix-list>
+ <prefix-list>
+ <name>opennsa-servers</name>
+ <prefix-list-item>
+ <name>83.97.93.92/32</name>
+ </prefix-list-item>
+ </prefix-list>
+ <prefix-list>
+ <name>opennsa-servers-v6</name>
+ <prefix-list-item>
+ <name>2001:798:3::15f/128</name>
+ </prefix-list-item>
+ </prefix-list>
<policy-statement>
<name>ASM-Allow</name>
<term>
@@ -34354,6 +34534,15 @@
</then>
</term>
</policy-statement>
+ <policy-statement>
+ <name>IAS_PS-FROM-PUBLIC-PEER_AS32934_Facebook</name>
+ <term>
+ <name>NEXT_POLICY</name>
+ <then>
+ <next>policy</next>
+ </then>
+ </term>
+ </policy-statement>
<policy-statement>
<name>IAS_PS-FROM-PUBLIC-PEER_AS33891_Core-Backbone_GmbH</name>
<term>
@@ -37633,6 +37822,100 @@
</then>
</term>
</policy-statement>
+ <policy-statement>
+ <name>IAS_PS-TO-PUBLIC-PEER_AS32934_Facebook</name>
+ <term>
+ <name>BLOCK_THIS_PEER</name>
+ <from>
+ <community>TE_BLOCK_AS32934</community>
+ <community>TE_BLOCK_AS32934_2</community>
+ <community>TE_BLOCK_AS32934_LINX</community>
+ <community>TE_BLOCK_AS32934_LINX_2</community>
+ </from>
+ <then>
+ <reject/>
+ </then>
+ </term>
+ <term>
+ <name>PREPEND_THIS_PEER_x1</name>
+ <from>
+ <community>TE_PREPEND_AS32934_x1_4byte</community>
+ <community>TE_PREPEND_AS32934_x1_2byte</community>
+ </from>
+ <then>
+ <as-path-expand>
+ <aspath>21320</aspath>
+ </as-path-expand>
+ </then>
+ </term>
+ <term>
+ <name>PREPEND_THIS_PEER_x2</name>
+ <from>
+ <community>TE_PREPEND_AS32934_x2_4byte</community>
+ <community>TE_PREPEND_AS32934_x2_2byte</community>
+ </from>
+ <then>
+ <as-path-expand>
+ <aspath>21320 21320</aspath>
+ </as-path-expand>
+ </then>
+ </term>
+ <term>
+ <name>PREPEND_THIS_PEER_x3</name>
+ <from>
+ <community>TE_PREPEND_AS32934_x3_4byte</community>
+ <community>TE_PREPEND_AS32934_x3_2byte</community>
+ </from>
+ <then>
+ <as-path-expand>
+ <aspath>21320 21320 21320</aspath>
+ </as-path-expand>
+ </then>
+ </term>
+ <term>
+ <name>PREPEND_THIS_PEER_x6</name>
+ <from>
+ <community>TE_PREPEND_AS32934_x6_4byte</community>
+ <community>TE_PREPEND_AS32934_x6_2byte</community>
+ </from>
+ <then>
+ <as-path-expand>
+ <aspath>21320 21320 21320 21320 21320 21320</aspath>
+ </as-path-expand>
+ </then>
+ </term>
+ <term>
+ <name>ANNOUNCE</name>
+ <from>
+ <community>TE_ANNOUNCE_AS32934</community>
+ <community>TE_ANNOUNCE_AS32934_2</community>
+ <community>TE_ANNOUNCE_AS32934_3</community>
+ <community>TE_ANNOUNCE_AS32934_4</community>
+ <community>TE_ANNOUNCE_ALL_PUBLIC_PEERS</community>
+ <community>TE_ANNOUNCE_ALL_PUBLIC_PEERS_2</community>
+ <community>TE_ANNOUNCE_ALL_PUBLIC_PEERS_3</community>
+ <community>TE_ANNOUNCE_AS32934_LINX</community>
+ <community>TE_ANNOUNCE_AS32934_LINX_2</community>
+ </from>
+ <then>
+ <metric>
+ <igp>
+ </igp>
+ </metric>
+ <community>
+ <delete/>
+ <community-name>TE_PRIVATE_COMMUNITIES</community-name>
+ </community>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>NEXT_POLICY</name>
+ <then>
+ <next>policy</next>
+ </then>
+ </term>
+ </policy-statement>
<policy-statement>
<name>IAS_PS-TO-PUBLIC-PEER_AS33891_Core-Backbone_GmbH</name>
<term>
@@ -41056,6 +41339,10 @@
<address>185.1.68.0/24</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>193.188.137.0/24</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -41177,6 +41464,10 @@
<address>2001:7f8:a0::/64</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>2001:7f8:35::/64</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -51565,6 +51856,7 @@
<community>geant-caren</community>
<community>geant-cngi-6ix</community>
<community>geant-asren</community>
+ <community>geant-wacren</community>
</from>
<then>
<accept/>
@@ -51654,6 +51946,7 @@
<community>geant-caren</community>
<community>geant-cngi-6ix</community>
<community>geant-asren</community>
+ <community>geant-wacren</community>
</from>
<then>
<accept/>
@@ -62311,14 +62604,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp>
<name>backbone-classifier</name>
@@ -62351,13 +62636,6 @@
<code-points>nc2</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>expedited-forwarding</name>
<loss-priority>
@@ -62439,106 +62717,6 @@
</loss-priority>
</forwarding-class>
</dscp>
- <dscp>
- <name>iperf-classifier</name>
- <import>default</import>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>af12</code-points>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
<dscp-ipv6>
<name>backbone-classifier</name>
<import>default</import>
@@ -62570,13 +62748,6 @@
<code-points>nc2</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>expedited-forwarding</name>
<loss-priority>
@@ -62619,41 +62790,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>iperf-classifier</name>
- <import>default</import>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>af12</code-points>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<dscp-ipv6>
<name>dws-access-classifier</name>
@@ -62728,79 +62864,6 @@
</loss-priority>
</forwarding-class>
</dscp-ipv6>
- <dscp-ipv6>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
<exp>
<name>mpls-access-classifier</name>
<import>default</import>
@@ -62831,10 +62894,6 @@
</exp>
</classifiers>
<code-point-aliases>
- <dscp>
- <name>ix</name>
- <bits>101001</bits>
- </dscp>
<dscp>
<name>dws</name>
<bits>100000</bits>
@@ -62843,10 +62902,6 @@
<name>dws</name>
<bits>100000</bits>
</dscp-ipv6>
- <dscp-ipv6>
- <name>ix</name>
- <bits>101001</bits>
- </dscp-ipv6>
</code-point-aliases>
<drop-profiles>
<name>dws-drop-profile</name>
@@ -62897,38 +62952,11 @@
<drop-probability>100</drop-probability>
</fill-level>
</drop-profiles>
- <drop-profiles>
- <name>ana-high-drop</name>
- <interpolate>
- <fill-level>25</fill-level>
- <fill-level>50</fill-level>
- <drop-probability>50</drop-probability>
- <drop-probability>100</drop-probability>
- </interpolate>
- </drop-profiles>
- <drop-profiles>
- <name>ana-tail-drop</name>
- <fill-level>
- <name>100</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
- <drop-profiles>
- <name>ana-low-drop</name>
- <fill-level>
- <name>100</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<forwarding-classes>
<class>
<name>be</name>
<queue-num>0</queue-num>
</class>
- <class>
- <name>be-ix</name>
- <queue-num>0</queue-num>
- </class>
<class>
<name>expedited-forwarding</name>
<queue-num>1</queue-num>
@@ -62945,15 +62973,27 @@
<name>be-dws</name>
<queue-num>0</queue-num>
</class>
- <class>
- <name>be-bleach</name>
- <queue-num>0</queue-num>
- </class>
</forwarding-classes>
<interfaces>
+ <interface>
+ <name>et-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>ge-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>so-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>xe-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
<interface>
<name>xe-0/0/1</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>200</name>
<classifiers>
@@ -62973,7 +63013,7 @@
</interface>
<interface>
<name>ge-0/2/7</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -62993,7 +63033,7 @@
</interface>
<interface>
<name>ge-0/2/9</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>10</name>
<classifiers>
@@ -63081,26 +63121,10 @@
</dscp>
</rewrite-rules>
</unit>
- <unit>
- <name>71</name>
- <classifiers>
- <dscp>
- <name>iperf-classifier</name>
- </dscp>
- <dscp-ipv6>
- <name>iperf-classifier</name>
- </dscp-ipv6>
- </classifiers>
- <rewrite-rules>
- <dscp>
- <name>basic-rewrite-rules</name>
- </dscp>
- </rewrite-rules>
- </unit>
</interface>
<interface>
<name>ge-0/3/4</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>35</name>
<classifiers>
@@ -63118,17 +63142,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -63136,28 +63152,9 @@
</rewrite-rules>
</unit>
</interface>
- <interface>
- <name>xe-1/0/1</name>
- <scheduler-map>MAP-BASIC-IUCC</scheduler-map>
- <unit>
- <name>0</name>
- <classifiers>
- <dscp>
- <name>access-classifier</name>
- </dscp>
- <dscp-ipv6>
- <name>access-classifier</name>
- </dscp-ipv6>
- </classifiers>
- <rewrite-rules>
- <dscp>
- <name>basic-rewrite-rules</name>
- </dscp>
- </rewrite-rules>
- </unit>
- </interface>
<interface>
<name>xe-1/2/2</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>500</name>
<classifiers>
@@ -63191,23 +63188,9 @@
</rewrite-rules>
</unit>
</interface>
- <interface>
- <name>xe-2/2/3</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
- <unit>
- <name>0</name>
- <classifiers>
- <dscp>
- <name>ix-access-classifier</name>
- </dscp>
- <dscp-ipv6>
- <name>ix-access-classifier</name>
- </dscp-ipv6>
- </classifiers>
- </unit>
- </interface>
<interface>
<name>xe-3/0/2</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>2200</name>
<classifiers>
@@ -63222,7 +63205,7 @@
</interface>
<interface>
<name>et-5/0/5</name>
- <scheduler-map>ANA-test</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>*</name>
<classifiers>
@@ -63245,7 +63228,7 @@
</interface>
<interface>
<name>et-5/1/2</name>
- <scheduler-map>ANA-test</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>*</name>
<classifiers>
@@ -63257,7 +63240,7 @@
</interface>
<interface>
<name>et-9/0/2</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>104</name>
<classifiers>
@@ -63293,7 +63276,7 @@
</interface>
<interface>
<name>et-10/3/0</name>
- <scheduler-map>ANA-test</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>*</name>
<classifiers>
@@ -63332,6 +63315,7 @@
</interface>
<interface>
<name>xe-11/0/1</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>1000</name>
<classifiers>
@@ -63346,7 +63330,7 @@
</interface>
<interface>
<name>xe-11/0/2</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -63366,7 +63350,7 @@
</interface>
<interface>
<name>et-11/3/0</name>
- <scheduler-map>ANA-test</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>*</name>
<classifiers>
@@ -63376,9 +63360,13 @@
</classifiers>
</unit>
</interface>
+ <interface>
+ <name>ae*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
<interface>
<name>ae1</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -63396,17 +63384,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -63416,7 +63396,7 @@
</interface>
<interface>
<name>ae2</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -63434,17 +63414,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -63454,7 +63426,7 @@
</interface>
<interface>
<name>ae3</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -63475,9 +63447,6 @@
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -63498,7 +63467,7 @@
</interface>
<interface>
<name>ae4</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -63516,17 +63485,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -63536,7 +63497,7 @@
</interface>
<interface>
<name>ae5</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -63554,17 +63515,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -63574,7 +63527,7 @@
</interface>
<interface>
<name>ae6</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -63595,9 +63548,6 @@
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -63607,7 +63557,7 @@
</interface>
<interface>
<name>ae7</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -63625,17 +63575,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -63655,39 +63597,38 @@
</unit>
</interface>
<interface>
- <name>ae10</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <name>ae8</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
<dscp>
- <name>access-classifier</name>
+ <name>backbone-classifier</name>
</dscp>
<dscp-ipv6>
- <name>access-classifier</name>
+ <name>backbone-classifier</name>
</dscp-ipv6>
+ <exp>
+ <classifier-name>mpls-backbone-classifier</classifier-name>
+ </exp>
</classifiers>
<rewrite-rules>
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- </rewrite-rules>
- </unit>
- <unit>
- <name>333</name>
- <classifiers>
- <dscp>
- <name>access-classifier</name>
- </dscp>
<dscp-ipv6>
- <name>access-classifier</name>
+ <name>basic-rewrite-rules</name>
</dscp-ipv6>
- </classifiers>
+ <exp>
+ <name>mpls-rewrite-rules</name>
+ <protocol>mpls-any</protocol>
+ </exp>
+ </rewrite-rules>
</unit>
</interface>
<interface>
- <name>ae11</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <name>ae10</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -63716,31 +63657,40 @@
</classifiers>
</unit>
</interface>
- <interface inactive="inactive">
- <name>ae14</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <interface>
+ <name>ae11</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
<dscp>
- <name>ix-access-classifier</name>
+ <name>access-classifier</name>
</dscp>
<dscp-ipv6>
- <name>ix-access-classifier</name>
+ <name>access-classifier</name>
</dscp-ipv6>
</classifiers>
<rewrite-rules>
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
+ </rewrite-rules>
+ </unit>
+ <unit>
+ <name>333</name>
+ <classifiers>
+ <dscp>
+ <name>access-classifier</name>
+ </dscp>
<dscp-ipv6>
- <name>basic-rewrite-rules</name>
+ <name>access-classifier</name>
</dscp-ipv6>
- </rewrite-rules>
+ </classifiers>
</unit>
</interface>
<interface>
<name>ae15</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>333</name>
<classifiers>
@@ -63766,7 +63716,7 @@
</interface>
<interface>
<name>ae16</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -63786,7 +63736,7 @@
</interface>
<interface>
<name>ae19</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -63815,17 +63765,17 @@
</classifiers>
</unit>
</interface>
- <interface inactive="inactive">
- <name>ae20</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <interface>
+ <name>ae21</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
- <name>0</name>
+ <name>100</name>
<classifiers>
<dscp>
- <name>ix-access-classifier</name>
+ <name>access-classifier</name>
</dscp>
<dscp-ipv6>
- <name>ix-access-classifier</name>
+ <name>access-classifier</name>
</dscp-ipv6>
</classifiers>
<rewrite-rules>
@@ -63837,9 +63787,6 @@
</dscp-ipv6>
</rewrite-rules>
</unit>
- </interface>
- <interface>
- <name>ae21</name>
<unit>
<name>333</name>
<classifiers>
@@ -63850,10 +63797,19 @@
<name>access-classifier</name>
</dscp-ipv6>
</classifiers>
+ <rewrite-rules>
+ <dscp>
+ <name>basic-rewrite-rules</name>
+ </dscp>
+ <dscp-ipv6>
+ <name>basic-rewrite-rules</name>
+ </dscp-ipv6>
+ </rewrite-rules>
</unit>
</interface>
<interface>
<name>ae22</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>100</name>
<classifiers>
@@ -63870,73 +63826,6 @@
<rewrite-rules>
<dscp>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -63980,13 +63869,6 @@
<code-point>dws</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
@@ -63997,73 +63879,6 @@
<code-point>dws</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -64100,13 +63915,6 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
@@ -64114,23 +63922,19 @@
</exp>
</rewrite-rules>
<scheduler-maps>
- <name>MAP-BASIC-IQ2</name>
+ <name>GEANT-BASIC</name>
<forwarding-class>
<name>expedited-forwarding</name>
<scheduler>sch-expedited-forwarding</scheduler>
</forwarding-class>
<forwarding-class>
<name>network-control</name>
- <scheduler>sch-network-ctrl-iq2</scheduler>
+ <scheduler>sch-network-ctrl-geant</scheduler>
</forwarding-class>
<forwarding-class>
<name>be</name>
<scheduler>sch-be</scheduler>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
<forwarding-class>
<name>less-than-best-effort</name>
<scheduler>sch-less-than-best-effort</scheduler>
@@ -64139,44 +63943,6 @@
<name>be-dws</name>
<scheduler>sch-be</scheduler>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- </scheduler-maps>
- <scheduler-maps>
- <name>MAP-BASIC-IUCC</name>
- <forwarding-class>
- <name>be</name>
- <scheduler>sch-be_2</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <scheduler>sch-be_2</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <scheduler>sch-expedited-forwarding_2</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <scheduler>sch-less-than-best-effort</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <scheduler>sch-network-ctrl</scheduler>
- </forwarding-class>
- </scheduler-maps>
- <scheduler-maps>
- <name>ANA-test</name>
- <forwarding-class>
- <name>be</name>
- <scheduler>ana-best-effort</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <scheduler>ana-network-control</scheduler>
- </forwarding-class>
</scheduler-maps>
<schedulers>
<name>sch-be</name>
@@ -64215,35 +63981,6 @@
<drop-profile>be-drop-profile</drop-profile>
</drop-profile-map>
</schedulers>
- <schedulers>
- <name>sch-network-ctrl</name>
- <transmit-rate>
- <percent>5</percent>
- </transmit-rate>
- <buffer-size>
- <percent>5</percent>
- </buffer-size>
- <priority>high</priority>
- </schedulers>
- <schedulers>
- <name>sch-network-ctrl-iq2</name>
- <transmit-rate>
- <percent>5</percent>
- </transmit-rate>
- <buffer-size>
- <percent>5</percent>
- </buffer-size>
- </schedulers>
- <schedulers>
- <name>sch-be_2</name>
- <transmit-rate>
- <percent>45</percent>
- </transmit-rate>
- <buffer-size>
- <percent>25</percent>
- </buffer-size>
- <priority>low</priority>
- </schedulers>
<schedulers>
<name>sch-expedited-forwarding_2</name>
<buffer-size>
@@ -64252,39 +63989,14 @@
<priority>strict-high</priority>
</schedulers>
<schedulers>
- <name>ana-best-effort</name>
- <transmit-rate>
- <percent>95</percent>
- </transmit-rate>
- <buffer-size>
- <percent>95</percent>
- </buffer-size>
- <priority>low</priority>
- <drop-profile-map>
- <loss-priority>low</loss-priority>
- <protocol>any</protocol>
- <drop-profile>ana-low-drop</drop-profile>
- </drop-profile-map>
- <drop-profile-map>
- <loss-priority>high</loss-priority>
- <protocol>any</protocol>
- <drop-profile>ana-high-drop</drop-profile>
- </drop-profile-map>
- </schedulers>
- <schedulers>
- <name>ana-network-control</name>
+ <name>sch-network-ctrl-geant</name>
<transmit-rate>
<percent>5</percent>
</transmit-rate>
<buffer-size>
<percent>5</percent>
</buffer-size>
- <priority>low</priority>
- <drop-profile-map>
- <loss-priority>any</loss-priority>
- <protocol>any</protocol>
- <drop-profile>ana-tail-drop</drop-profile>
- </drop-profile-map>
+ <priority>high</priority>
</schedulers>
</class-of-service>
<firewall>
@@ -65059,6 +64771,13 @@
<next>term</next>
</then>
</term>
+ <term>
+ <name>MARK_DSCP_41</name>
+ <then>
+ <next>term</next>
+ <dscp>41</dscp>
+ </then>
+ </term>
<term>
<name>temp_xantaro_ftp</name>
<from>
@@ -65076,13 +64795,6 @@
<accept/>
</then>
</term>
- <term>
- <name>MARK_DSCP_41</name>
- <then>
- <next>term</next>
- <dscp>41</dscp>
- </then>
- </term>
<term>
<name>BOGON-filter</name>
<from>
@@ -79246,6 +78958,12 @@
<source-address>
<name>195.66.227.152/32</name>
</source-address>
+ <source-address>
+ <name>195.66.227.19/32</name>
+ </source-address>
+ <source-address>
+ <name>195.66.226.140/32</name>
+ </source-address>
<destination-address>
<name>195.66.226.161/32</name>
</destination-address>
@@ -85807,6 +85525,9 @@
<source-prefix-list>
<name>dashboard-servers</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers</name>
+ </source-prefix-list>
<protocol>tcp</protocol>
<destination-port>ssh</destination-port>
</from>
@@ -94542,6 +94263,12 @@
<source-address>
<name>2001:7f8:4::193d:1/128</name>
</source-address>
+ <source-address>
+ <name>2001:7f8:4::80a6:5/128</name>
+ </source-address>
+ <source-address>
+ <name>2001:7f8:4::80a6:3/128</name>
+ </source-address>
<destination-address>
<name>2001:798:14:20ff::1/128</name>
</destination-address>
@@ -97646,6 +97373,9 @@
<source-prefix-list>
<name>dashboard-servers-v6</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers-v6</name>
+ </source-prefix-list>
<next-header>tcp</next-header>
<port>ssh</port>
</from>
@@ -101267,6 +100997,17 @@
</then>
</term>
</filter>
+ <filter>
+ <name>filter_in_ge-0/3/3_2019</name>
+ <interface-specific/>
+ <term>
+ <name>1</name>
+ <then>
+ <policer>policer_in_ge-0/3/3_2019</policer>
+ <accept/>
+ </then>
+ </term>
+ </filter>
</ccc>
</family>
<policer>
@@ -101716,6 +101457,16 @@
<discard/>
</then>
</policer>
+ <policer>
+ <name>policer_in_ge-0/3/3_2019</name>
+ <if-exceeding>
+ <bandwidth-limit>100m</bandwidth-limit>
+ <burst-size-limit>15220</burst-size-limit>
+ </if-exceeding>
+ <then>
+ <discard/>
+ </then>
+ </policer>
</firewall>
<routing-instances>
<instance inactive="inactive">
@@ -103356,13 +103107,16 @@
</neighbor>
<neighbor>
<name>195.66.225.69</name>
- <description>Facebook</description>
+ <description>Facebook AS32934</description>
+ <passive/>
<import>ps-AS-SELF-REJECT</import>
<import>ps-BOGONS</import>
<import>ps-PRIVATE-AS-BLOCK</import>
<import>IAS_PS-FROM-PUBLIC-PEERS_LINX_HEAD</import>
<import>IAS_PS-FROM-PUBLIC-PEER_AS32934_FACEBOOK_-_Facebook,_Inc.,US_</import>
<import>IAS_PS-FROM-PUBLIC-PEERS_LINX_TAIL</import>
+ <import>ps-deny-all</import>
+ <import>IAS_PS-FROM-PUBLIC-PEER_AS32934_Facebook</import>
<family>
<inet>
<any>
@@ -103383,6 +103137,8 @@
<export>IAS_PS-TO-PUBLIC-PEERS_LINX_HEAD</export>
<export>IAS_PS-TO-PUBLIC-PEER_AS32934_FACEBOOK_-_Facebook,_Inc.,US_</export>
<export>IAS_PS-TO-PUBLIC-PEERS_LINX_TAIL</export>
+ <export>ps-deny-all</export>
+ <export>IAS_PS-TO-PUBLIC-PEER_AS32934_Facebook</export>
<peer-as>32934</peer-as>
<local-as>
<as-number>21320</as-number>
@@ -103392,13 +103148,16 @@
</neighbor>
<neighbor>
<name>195.66.225.121</name>
- <description>Facebook</description>
+ <description>Facebook AS32934</description>
+ <passive/>
<import>ps-AS-SELF-REJECT</import>
<import>ps-BOGONS</import>
<import>ps-PRIVATE-AS-BLOCK</import>
<import>IAS_PS-FROM-PUBLIC-PEERS_LINX_HEAD</import>
<import>IAS_PS-FROM-PUBLIC-PEER_AS32934_FACEBOOK_-_Facebook,_Inc.,US_</import>
<import>IAS_PS-FROM-PUBLIC-PEERS_LINX_TAIL</import>
+ <import>ps-deny-all</import>
+ <import>IAS_PS-FROM-PUBLIC-PEER_AS32934_Facebook</import>
<family>
<inet>
<any>
@@ -103419,6 +103178,8 @@
<export>IAS_PS-TO-PUBLIC-PEERS_LINX_HEAD</export>
<export>IAS_PS-TO-PUBLIC-PEER_AS32934_FACEBOOK_-_Facebook,_Inc.,US_</export>
<export>IAS_PS-TO-PUBLIC-PEERS_LINX_TAIL</export>
+ <export>ps-deny-all</export>
+ <export>IAS_PS-TO-PUBLIC-PEER_AS32934_Facebook</export>
<peer-as>32934</peer-as>
<local-as>
<as-number>21320</as-number>
@@ -104125,7 +103886,7 @@
<inet>
<any>
<prefix-limit>
- <maximum>5000</maximum>
+ <maximum>7500</maximum>
<teardown>
<limit-threshold>90</limit-threshold>
<idle-timeout>
@@ -104161,7 +103922,7 @@
<inet>
<any>
<prefix-limit>
- <maximum>5000</maximum>
+ <maximum>7500</maximum>
<teardown>
<limit-threshold>90</limit-threshold>
<idle-timeout>
@@ -105305,8 +105066,6 @@
<neighbor>
<name>195.66.225.79</name>
<description>alibaba AS45102</description>
- <passive/>
- <import>ps-deny-all</import>
<import>ps-AS-SELF-REJECT</import>
<import>ps-BOGONS</import>
<import>ps-PRIVATE-AS-BLOCK</import>
@@ -105328,7 +105087,6 @@
</any>
</inet>
</family>
- <export>ps-deny-all</export>
<export>ps-BOGONS</export>
<export>ps-PRIVATE-AS-BLOCK</export>
<export>IAS_PS-TO-PUBLIC-PEERS_LINX_HEAD</export>
@@ -105344,8 +105102,6 @@
<neighbor>
<name>195.66.227.152</name>
<description>alibaba AS45102</description>
- <passive/>
- <import>ps-deny-all</import>
<import>ps-AS-SELF-REJECT</import>
<import>ps-BOGONS</import>
<import>ps-PRIVATE-AS-BLOCK</import>
@@ -105367,7 +105123,6 @@
</any>
</inet>
</family>
- <export>ps-deny-all</export>
<export>ps-BOGONS</export>
<export>ps-PRIVATE-AS-BLOCK</export>
<export>IAS_PS-TO-PUBLIC-PEERS_LINX_HEAD</export>
@@ -105380,6 +105135,84 @@
<no-prepend-global-as/>
</local-as>
</neighbor>
+ <neighbor>
+ <name>195.66.227.19</name>
+ <description>Facebook AS32934</description>
+ <passive/>
+ <import>ps-deny-all</import>
+ <import>ps-AS-SELF-REJECT</import>
+ <import>ps-BOGONS</import>
+ <import>ps-PRIVATE-AS-BLOCK</import>
+ <import>IAS_PS-FROM-PUBLIC-PEERS_LINX_HEAD</import>
+ <import>IAS_PS-FROM-PUBLIC-PEER_AS32934_Facebook</import>
+ <import>IAS_PS-FROM-PUBLIC-PEERS_LINX_TAIL</import>
+ <family>
+ <inet>
+ <any>
+ <prefix-limit>
+ <maximum>150</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
+ </prefix-limit>
+ </any>
+ </inet>
+ </family>
+ <export>ps-deny-all</export>
+ <export>ps-BOGONS</export>
+ <export>ps-PRIVATE-AS-BLOCK</export>
+ <export>IAS_PS-TO-PUBLIC-PEERS_LINX_HEAD</export>
+ <export>IAS_PS-TO-PUBLIC-PEER_AS32934_Facebook</export>
+ <export>IAS_PS-TO-PUBLIC-PEERS_LINX_TAIL</export>
+ <peer-as>32934</peer-as>
+ <local-as>
+ <as-number>21320</as-number>
+ <private/>
+ <no-prepend-global-as/>
+ </local-as>
+ </neighbor>
+ <neighbor>
+ <name>195.66.226.140</name>
+ <description>Facebook AS32934</description>
+ <passive/>
+ <import>ps-deny-all</import>
+ <import>ps-AS-SELF-REJECT</import>
+ <import>ps-BOGONS</import>
+ <import>ps-PRIVATE-AS-BLOCK</import>
+ <import>IAS_PS-FROM-PUBLIC-PEERS_LINX_HEAD</import>
+ <import>IAS_PS-FROM-PUBLIC-PEER_AS32934_Facebook</import>
+ <import>IAS_PS-FROM-PUBLIC-PEERS_LINX_TAIL</import>
+ <family>
+ <inet>
+ <any>
+ <prefix-limit>
+ <maximum>150</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
+ </prefix-limit>
+ </any>
+ </inet>
+ </family>
+ <export>ps-deny-all</export>
+ <export>ps-BOGONS</export>
+ <export>ps-PRIVATE-AS-BLOCK</export>
+ <export>IAS_PS-TO-PUBLIC-PEERS_LINX_HEAD</export>
+ <export>IAS_PS-TO-PUBLIC-PEER_AS32934_Facebook</export>
+ <export>IAS_PS-TO-PUBLIC-PEERS_LINX_TAIL</export>
+ <peer-as>32934</peer-as>
+ <local-as>
+ <as-number>21320</as-number>
+ <private/>
+ <no-prepend-global-as/>
+ </local-as>
+ </neighbor>
</group>
<group>
<name>GEANT-IXv6-LINX</name>
@@ -106054,13 +105887,16 @@
</neighbor>
<neighbor>
<name>2001:7f8:4::80a6:1</name>
- <description>Facebook</description>
+ <description>Facebook AS32934</description>
+ <passive/>
<import>ps-AS-SELF-REJECT</import>
<import>ps-BOGONS-V6</import>
<import>ps-PRIVATE-AS-BLOCK</import>
<import>IAS_PS-FROM-PUBLIC-PEERS_LINX_HEAD</import>
<import>IAS_PS-FROM-PUBLIC-PEER_AS32934_FACEBOOK_-_Facebook,_Inc.,US_</import>
<import>IAS_PS-FROM-PUBLIC-PEERS_LINX_TAIL</import>
+ <import>ps-deny-all</import>
+ <import>IAS_PS-FROM-PUBLIC-PEER_AS32934_Facebook</import>
<family>
<inet6>
<any>
@@ -106081,6 +105917,8 @@
<export>IAS_PS-TO-PUBLIC-PEERS_LINX_HEAD</export>
<export>IAS_PS-TO-PUBLIC-PEER_AS32934_FACEBOOK_-_Facebook,_Inc.,US_</export>
<export>IAS_PS-TO-PUBLIC-PEERS_LINX_TAIL</export>
+ <export>ps-deny-all</export>
+ <export>IAS_PS-TO-PUBLIC-PEER_AS32934_Facebook</export>
<peer-as>32934</peer-as>
<local-as>
<as-number>21320</as-number>
@@ -106090,13 +105928,16 @@
</neighbor>
<neighbor>
<name>2001:7f8:4::80a6:2</name>
- <description>Facebook</description>
+ <description>Facebook AS32934</description>
+ <passive/>
<import>ps-AS-SELF-REJECT</import>
<import>ps-BOGONS-V6</import>
<import>ps-PRIVATE-AS-BLOCK</import>
<import>IAS_PS-FROM-PUBLIC-PEERS_LINX_HEAD</import>
<import>IAS_PS-FROM-PUBLIC-PEER_AS32934_FACEBOOK_-_Facebook,_Inc.,US_</import>
<import>IAS_PS-FROM-PUBLIC-PEERS_LINX_TAIL</import>
+ <import>ps-deny-all</import>
+ <import>IAS_PS-FROM-PUBLIC-PEER_AS32934_Facebook</import>
<family>
<inet6>
<any>
@@ -106117,6 +105958,8 @@
<export>IAS_PS-TO-PUBLIC-PEERS_LINX_HEAD</export>
<export>IAS_PS-TO-PUBLIC-PEER_AS32934_FACEBOOK_-_Facebook,_Inc.,US_</export>
<export>IAS_PS-TO-PUBLIC-PEERS_LINX_TAIL</export>
+ <export>ps-deny-all</export>
+ <export>IAS_PS-TO-PUBLIC-PEER_AS32934_Facebook</export>
<peer-as>32934</peer-as>
<local-as>
<as-number>21320</as-number>
@@ -106823,7 +106666,7 @@
<inet6>
<any>
<prefix-limit>
- <maximum>2250</maximum>
+ <maximum>1500</maximum>
<teardown>
<limit-threshold>90</limit-threshold>
<idle-timeout>
@@ -106859,7 +106702,7 @@
<inet6>
<any>
<prefix-limit>
- <maximum>2250</maximum>
+ <maximum>1500</maximum>
<teardown>
<limit-threshold>90</limit-threshold>
<idle-timeout>
@@ -108000,6 +107843,84 @@
<no-prepend-global-as/>
</local-as>
</neighbor>
+ <neighbor>
+ <name>2001:7f8:4::80a6:5</name>
+ <description>Facebook AS32934</description>
+ <passive/>
+ <import>ps-deny-all</import>
+ <import>ps-AS-SELF-REJECT</import>
+ <import>ps-BOGONS-V6</import>
+ <import>ps-PRIVATE-AS-BLOCK</import>
+ <import>IAS_PS-FROM-PUBLIC-PEERS_LINX_HEAD</import>
+ <import>IAS_PS-FROM-PUBLIC-PEER_AS32934_Facebook</import>
+ <import>IAS_PS-FROM-PUBLIC-PEERS_LINX_TAIL</import>
+ <family>
+ <inet6>
+ <any>
+ <prefix-limit>
+ <maximum>150</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
+ </prefix-limit>
+ </any>
+ </inet6>
+ </family>
+ <export>ps-deny-all</export>
+ <export>ps-BOGONS-V6</export>
+ <export>ps-PRIVATE-AS-BLOCK</export>
+ <export>IAS_PS-TO-PUBLIC-PEERS_LINX_HEAD</export>
+ <export>IAS_PS-TO-PUBLIC-PEER_AS32934_Facebook</export>
+ <export>IAS_PS-TO-PUBLIC-PEERS_LINX_TAIL</export>
+ <peer-as>32934</peer-as>
+ <local-as>
+ <as-number>21320</as-number>
+ <private/>
+ <no-prepend-global-as/>
+ </local-as>
+ </neighbor>
+ <neighbor>
+ <name>2001:7f8:4::80a6:3</name>
+ <description>Facebook AS32934</description>
+ <passive/>
+ <import>ps-deny-all</import>
+ <import>ps-AS-SELF-REJECT</import>
+ <import>ps-BOGONS-V6</import>
+ <import>ps-PRIVATE-AS-BLOCK</import>
+ <import>IAS_PS-FROM-PUBLIC-PEERS_LINX_HEAD</import>
+ <import>IAS_PS-FROM-PUBLIC-PEER_AS32934_Facebook</import>
+ <import>IAS_PS-FROM-PUBLIC-PEERS_LINX_TAIL</import>
+ <family>
+ <inet6>
+ <any>
+ <prefix-limit>
+ <maximum>150</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
+ </prefix-limit>
+ </any>
+ </inet6>
+ </family>
+ <export>ps-deny-all</export>
+ <export>ps-BOGONS-V6</export>
+ <export>ps-PRIVATE-AS-BLOCK</export>
+ <export>IAS_PS-TO-PUBLIC-PEERS_LINX_HEAD</export>
+ <export>IAS_PS-TO-PUBLIC-PEER_AS32934_Facebook</export>
+ <export>IAS_PS-TO-PUBLIC-PEERS_LINX_TAIL</export>
+ <peer-as>32934</peer-as>
+ <local-as>
+ <as-number>21320</as-number>
+ <private/>
+ <no-prepend-global-as/>
+ </local-as>
+ </neighbor>
</group>
<group>
<name>GEANT-Peers</name>
@@ -108019,6 +107940,17 @@
<import>ps-IAS-from-NORDUnet-peer</import>
<family>
<inet>
+ <unicast>
+ <prefix-limit>
+ <maximum>75826</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
+ </prefix-limit>
+ </unicast>
<any>
<prefix-limit>
<maximum>450000</maximum>
@@ -108040,33 +107972,6 @@
<no-prepend-global-as/>
</local-as>
</neighbor>
- <neighbor inactive="inactive">
- <name>89.202.226.129</name>
- <description>-- Peering with Interoute for Helix Nebula --</description>
- <out-delay>10</out-delay>
- <import>ps-BOGONS</import>
- <import>ps-IAS-from-Interoute-helix</import>
- <family inactive="inactive">
- <inet>
- <unicast>
- <prefix-limit>
- <maximum>50</maximum>
- <teardown>
- <limit-threshold>90</limit-threshold>
- </teardown>
- </prefix-limit>
- </unicast>
- </inet>
- </family>
- <export>ps-BOGONS</export>
- <export>ps-IAS-to-Interoute-helix</export>
- <peer-as>8928</peer-as>
- <local-as>
- <as-number>21320</as-number>
- <private/>
- <no-prepend-global-as/>
- </local-as>
- </neighbor>
<neighbor>
<name>62.40.124.66</name>
<description>TWITCH AS46489</description>
@@ -108076,6 +107981,17 @@
<import>ps-IAS-from-TWITCH</import>
<family>
<inet>
+ <unicast>
+ <prefix-limit>
+ <maximum>10</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
+ </prefix-limit>
+ </unicast>
<any>
<prefix-limit>
<maximum>30</maximum>
@@ -108105,6 +108021,17 @@
<import>ps-IAS-from-FACEBOOK</import>
<family>
<inet>
+ <unicast>
+ <prefix-limit>
+ <maximum>54</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
+ </prefix-limit>
+ </unicast>
<any>
<prefix-limit>
<maximum>150</maximum>
@@ -108134,6 +108061,17 @@
<import>ps-IAS-from-FACEBOOK</import>
<family>
<inet>
+ <unicast>
+ <prefix-limit>
+ <maximum>54</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
+ </prefix-limit>
+ </unicast>
<any>
<prefix-limit>
<maximum>150</maximum>
@@ -108172,6 +108110,17 @@
<import>ps-IAS-from-NORDUnet-peer</import>
<family>
<inet6>
+ <unicast>
+ <prefix-limit>
+ <maximum>4119</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
+ </prefix-limit>
+ </unicast>
<any>
<prefix-limit>
<maximum>48000</maximum>
@@ -108202,6 +108151,17 @@
<import>ps-IAS-from-TWITCH</import>
<family>
<inet6>
+ <unicast>
+ <prefix-limit>
+ <maximum>10</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
+ </prefix-limit>
+ </unicast>
<any>
<prefix-limit>
<maximum>30</maximum>
@@ -108231,6 +108191,17 @@
<import>ps-IAS-from-FACEBOOK</import>
<family>
<inet6>
+ <unicast>
+ <prefix-limit>
+ <maximum>42</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
+ </prefix-limit>
+ </unicast>
<any>
<prefix-limit>
<maximum>130</maximum>
@@ -108260,6 +108231,17 @@
<import>ps-IAS-from-FACEBOOK</import>
<family>
<inet6>
+ <unicast>
+ <prefix-limit>
+ <maximum>42</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
+ </prefix-limit>
+ </unicast>
<any>
<prefix-limit>
<maximum>100</maximum>
@@ -108346,6 +108328,9 @@
<interface>
<name>ge-0/2/9.301</name>
</interface>
+ <interface>
+ <name>ge-0/2/9.401</name>
+ </interface>
<route-distinguisher>
<rd-type>20965:991</rd-type>
</route-distinguisher>
@@ -108946,9 +108931,6 @@
<labeled-unicast>
<prefix-limit>
<maximum>1000</maximum>
- <teardown>
- <limit-threshold>50</limit-threshold>
- </teardown>
</prefix-limit>
</labeled-unicast>
</inet>
@@ -108968,9 +108950,6 @@
<labeled-unicast>
<prefix-limit>
<maximum>1000</maximum>
- <teardown>
- <limit-threshold>50</limit-threshold>
- </teardown>
</prefix-limit>
</labeled-unicast>
</inet>
diff --git a/test/data/mx1.lon2.uk.geant.net-netconf.xml b/test/data/mx1.lon2.uk.geant.net-netconf.xml
index f9277236455c77f77f048537a9c147547bb27975..abbffb90dd9727289d45ebd738eb8f4c5d7e4aff 100644
--- a/test/data/mx1.lon2.uk.geant.net-netconf.xml
+++ b/test/data/mx1.lon2.uk.geant.net-netconf.xml
@@ -1,4 +1,4 @@
-<configuration changed-seconds="1545214015" changed-localtime="2018-12-19 10:06:55 UTC">
+<configuration changed-seconds="1549111285" changed-localtime="2019-02-02 12:41:25 UTC">
<version>15.1F6-S10.9</version>
<groups>
<name>re0</name>
@@ -262,6 +262,38 @@
<allow-commands>show .*</allow-commands>
<deny-commands>(ssh .*|telnet .*)</deny-commands>
</class>
+ <class>
+ <name>opennsa</name>
+ <idle-timeout>5</idle-timeout>
+ <permissions>configure</permissions>
+ <deny-commands>(file.*)|(load.*)|(op.*)|(request.*)|(save.*)|(start.*)|(test.*)|(set cli.*)|(set date.*)|(clear.*)|(help.*)|(telnet.*)|(ssh.*)|(traceroute.*)|(mtrace.*)|(monitor.*)|(ping.*)|(show.*)|(set.*)</deny-commands>
+ <allow-configuration-regexps>interfaces .*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections remote-interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols mpls label-switched-path.*</allow-configuration-regexps>
+ <deny-configuration-regexps>vmhost .*</deny-configuration-regexps>
+ <deny-configuration-regexps>session-limit-group .*</deny-configuration-regexps>
+ <deny-configuration-regexps>multi-chassis .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc-partition .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc .*</deny-configuration-regexps>
+ <deny-configuration-regexps>groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>dynamic-profiles .*</deny-configuration-regexps>
+ <deny-configuration-regexps>diameter .*</deny-configuration-regexps>
+ <deny-configuration-regexps>apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>access-profile .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces traceoptions .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-set .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-range .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups-except .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lt-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces ms-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces si-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces gr-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lo.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces dsc.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces irb.*</deny-configuration-regexps>
+ </class>
<class>
<name>readonly-permissions</name>
<idle-timeout>15</idle-timeout>
@@ -580,6 +612,22 @@
<encrypted-password>/* SECRET-DATA */</encrypted-password>
</authentication>
</user>
+ <user>
+ <name>opennsa</name>
+ <uid>2057</uid>
+ <class>opennsa</class>
+ <authentication>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ </authentication>
+ </user>
<user>
<name>opnet</name>
<full-name>OPNET NEOP Planning system @ 62.40.105.114</full-name>
@@ -2576,52 +2624,8 @@
<name>ge-0/1/5</name>
<description>PHY INFRASTRUCTURE GTS SRF0000001 | GTS.SW2 P09 - BMS</description>
<flexible-vlan-tagging/>
- <mtu>9000</mtu>
+ <mtu>9192</mtu>
<encapsulation>flexible-ethernet-services</encapsulation>
- <unit>
- <name>1304</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>1304</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>1305</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>1305</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>1306</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>1306</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>1307</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>1307</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
</interface>
<interface>
<name>ge-0/1/6</name>
@@ -2914,7 +2918,7 @@
<name>xe-1/2/4</name>
<apply-groups>NO_TRAPS</apply-groups>
<description>PHY INFRASTRUCTURE GTS SRF0000001 | GTS link to Server 4</description>
- <mtu>9192</mtu>
+ <mtu>9000</mtu>
<encapsulation>ethernet-ccc</encapsulation>
<unit>
<name>0</name>
@@ -2990,17 +2994,6 @@
<push/>
</output-vlan-map>
</unit>
- <unit>
- <name>15</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>15</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
<unit>
<name>16</name>
<encapsulation>vlan-ccc</encapsulation>
@@ -3079,9 +3072,42 @@
</output-vlan-map>
</unit>
<unit>
- <name>26</name>
+ <name>24</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>26</vlan-id>
+ <vlan-id>24</vlan-id>
+ <input-vlan-map>
+ <pop/>
+ </input-vlan-map>
+ <output-vlan-map>
+ <push/>
+ </output-vlan-map>
+ </unit>
+ <unit>
+ <name>25</name>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>25</vlan-id>
+ <input-vlan-map>
+ <pop/>
+ </input-vlan-map>
+ <output-vlan-map>
+ <push/>
+ </output-vlan-map>
+ </unit>
+ <unit>
+ <name>27</name>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>27</vlan-id>
+ <input-vlan-map>
+ <pop/>
+ </input-vlan-map>
+ <output-vlan-map>
+ <push/>
+ </output-vlan-map>
+ </unit>
+ <unit>
+ <name>28</name>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>28</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -3556,7 +3582,7 @@
</interface>
<interface>
<name>et-10/0/2</name>
- <description>PHY SPARE</description>
+ <description>PHY RESERVED | singAREN 100GB</description>
<disable/>
</interface>
<interface>
@@ -3637,97 +3663,9 @@
<mtu>9000</mtu>
<encapsulation>flexible-ethernet-services</encapsulation>
<unit>
- <name>11</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>11</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>12</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>12</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>13</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>13</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>14</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>14</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>15</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>15</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>16</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>16</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>17</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>17</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>18</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>18</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>19</name>
+ <name>21</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>19</vlan-id>
+ <vlan-id>21</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -3736,9 +3674,9 @@
</output-vlan-map>
</unit>
<unit>
- <name>20</name>
+ <name>22</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>20</vlan-id>
+ <vlan-id>22</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -3787,28 +3725,6 @@
<push/>
</output-vlan-map>
</unit>
- <unit>
- <name>15</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>15</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>16</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>16</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
</interface>
<interface>
<name>xe-11/2/2</name>
@@ -3957,72 +3873,6 @@
<push/>
</output-vlan-map>
</unit>
- <unit>
- <name>15</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>15</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>16</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>16</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>17</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>17</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>18</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>18</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>19</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>19</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>20</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>20</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
</interface>
<interface>
<name>et-11/3/0</name>
@@ -4790,6 +4640,12 @@
</inet>
</family>
</unit>
+ <unit>
+ <name>2110</name>
+ <description>SRV_L2CIRCUIT CUSTOMER INTERNET2 SRF19009 | lon-lon2_GEANTOPEN_HBKU-INTERNET2_190092</description>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>2110</vlan-id>
+ </unit>
<unit>
<name>3410</name>
<description>SRV_GLOBAL INFRASTRUCTURE ACCESS PERFSONAR SRF0000001 | ACE PerfSonar test, 24/10/14 - AK</description>
@@ -5208,6 +5064,9 @@
<clients>
<name>83.97.93.196/32</name>
</clients>
+ <clients>
+ <name>83.97.93.238/32</name>
+ </clients>
</community>
<community>
<name>As4n0gN!</name>
@@ -5683,13 +5542,13 @@
<name>multicastv6</name>
<import-rib>inet6.2</import-rib>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias</name>
<import-rib>IAS.inet.0</import-rib>
<import-rib>CLEAN_IAS.inet.0</import-rib>
<import-policy>ps-into-clean-ias-import</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias-v6</name>
<import-rib>IAS.inet6.0</import-rib>
<import-rib>CLEAN_IAS.inet6.0</import-rib>
@@ -5739,189 +5598,138 @@
<ipv6-tunneling/>
<icmp-tunneling/>
<label-switched-path>
- <name>T-bra.cc-F-lon.cc-mpls4</name>
- <no-install-to-address/>
- <to>62.40.97.4</to>
+ <name>T-ham.cc-F-lon.cc-mpls3</name>
+ <to>62.40.96.26</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-bra.cc-F-lon.cc-mpls3</name>
- <no-install-to-address/>
- <to>62.40.97.4</to>
+ <name>T-mil.cc-F-lon.cc-mpls3</name>
+ <to>62.40.97.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-bra.cc-F-lon.cc-mpls1</name>
- <no-install-to-address/>
- <to>62.40.97.4</to>
+ <name>T-ams.cc-F-lon.cc-mpls5</name>
+ <to>62.40.97.11</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-bra.cc-F-lon.cc-mpls2</name>
- <no-install-to-address/>
+ <name>T-bra.cc-F-lon.cc-mpls7</name>
<to>62.40.97.4</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-mad.cc-F-lon.cc-mpls1</name>
- <no-install-to-address/>
- <to>62.40.97.16</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-ham.cc-F-lon.cc-mpls5</name>
- <no-install-to-address/>
- <to>62.40.96.26</to>
+ <name>T-prg.cc-F-lon.cc-mpls7</name>
+ <to>62.40.97.2</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
<name>T-par.cc-F-lon.cc-mpls1</name>
- <no-install-to-address/>
<to>62.40.97.13</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-prg.cc-F-lon.cc-mpls1</name>
- <no-install-to-address/>
- <to>62.40.97.2</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-prg.cc-F-lon.cc-mpls2</name>
- <no-install-to-address/>
- <to>62.40.97.2</to>
+ <name>T-ham.cc-F-lon.cc-mpls2</name>
+ <to>62.40.96.26</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-prg.cc-F-lon.cc-mpls3</name>
- <no-install-to-address/>
- <to>62.40.97.2</to>
+ <name>T-bra.cc-F-lon.cc-mpls5</name>
+ <to>62.40.97.4</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-prg.cc-F-lon.cc-mpls4</name>
- <no-install-to-address/>
- <to>62.40.97.2</to>
+ <name>T-ams.cc-F-lon.cc-mpls3</name>
+ <to>62.40.97.11</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-mil.cc-F-lon.cc-mpls3</name>
- <no-install-to-address/>
+ <name>T-mil.cc-F-lon.cc-mpls2</name>
<to>62.40.97.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-ams.cc-F-lon.cc-mpls5</name>
- <no-install-to-address/>
- <to>62.40.97.11</to>
+ <name>T-prg.cc-F-lon.cc-mpls5</name>
+ <to>62.40.97.2</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-bra.cc-F-lon.cc-mpls7</name>
- <no-install-to-address/>
- <to>62.40.97.4</to>
+ <name>T-par.cc-F-lon.cc-mpls3</name>
+ <to>62.40.97.13</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-prg.cc-F-lon.cc-mpls7</name>
- <no-install-to-address/>
- <to>62.40.97.2</to>
+ <name>T-mad.cc-F-lon.cc-mpls2</name>
+ <to>62.40.97.16</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-ham.cc-F-lon.cc-mpls3</name>
- <no-install-to-address/>
- <to>62.40.96.26</to>
+ <name>T-par.cc-F-lon.cc-mpls4</name>
+ <to>62.40.97.13</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-par.cc-F-lon.cc-mpls2</name>
- <no-install-to-address/>
- <to>62.40.97.13</to>
+ <name>T-prg.cc-F-lon.cc-mpls6</name>
+ <to>62.40.97.2</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-ams.cc-F-lon.cc-mpls2</name>
- <no-install-to-address/>
+ <name>T-ams.cc-F-lon.cc-mpls4</name>
<to>62.40.97.11</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-bra.cc-F-lon.cc-mpls5</name>
- <no-install-to-address/>
- <to>62.40.97.4</to>
+ <name>T-ams.cc-F-lon.cc-mpls2</name>
+ <to>62.40.97.11</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-par.cc-F-lon.cc-mpls3</name>
- <no-install-to-address/>
- <to>62.40.97.13</to>
+ <name>T-ham.cc-F-lon.cc-mpls1</name>
+ <to>62.40.96.26</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-ams.cc-F-lon.cc-mpls3</name>
- <no-install-to-address/>
- <to>62.40.97.11</to>
+ <name>T-mil.cc-F-lon.cc-mpls1</name>
+ <to>62.40.97.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-prg.cc-F-lon.cc-mpls5</name>
- <no-install-to-address/>
- <to>62.40.97.2</to>
+ <name>T-mil.cc-F-lon.cc-mpls4</name>
+ <to>62.40.97.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-ham.cc-F-lon.cc-mpls2</name>
- <no-install-to-address/>
+ <name>T-ham.cc-F-lon.cc-mpls4</name>
<to>62.40.96.26</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-mad.cc-F-lon.cc-mpls2</name>
- <no-install-to-address/>
- <to>62.40.97.16</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-mil.cc-F-lon.cc-mpls2</name>
- <no-install-to-address/>
+ <name>T-mil.cc-F-lon.cc-mpls5</name>
<to>62.40.97.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-par.cc-F-lon.cc-mpls4</name>
- <no-install-to-address/>
- <to>62.40.97.13</to>
+ <name>T-bra.cc-F-lon.cc-mpls1</name>
+ <to>62.40.97.4</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-prg.cc-F-lon.cc-mpls6</name>
- <no-install-to-address/>
- <to>62.40.97.2</to>
+ <name>T-mad.cc-F-lon.cc-mpls1</name>
+ <to>62.40.97.16</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-ams.cc-F-lon.cc-mpls4</name>
- <no-install-to-address/>
+ <name>T-ams.cc-F-lon.cc-mpls1</name>
<to>62.40.97.11</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-par.cc-F-lon.cc-mpls5</name>
- <no-install-to-address/>
- <to>62.40.97.13</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-ham.cc-F-lon.cc-mpls4</name>
- <no-install-to-address/>
- <to>62.40.96.26</to>
+ <name>T-bra.cc-F-lon.cc-mpls2</name>
+ <to>62.40.97.4</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-mil.cc-F-lon.cc-mpls4</name>
- <no-install-to-address/>
- <to>62.40.97.15</to>
+ <name>T-ams.cc-F-lon.cc-mpls6</name>
+ <to>62.40.97.11</to>
<no-cspf/>
</label-switched-path>
<interface>
@@ -6305,9 +6113,12 @@
<inet>
<unicast>
<prefix-limit>
- <maximum>1417</maximum>
+ <maximum>1540</maximum>
<teardown>
- <limit-threshold>89</limit-threshold>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</unicast>
@@ -6336,17 +6147,23 @@
<inet>
<unicast>
<prefix-limit>
- <maximum>17947</maximum>
+ <maximum>22203</maximum>
<teardown>
- <limit-threshold>89</limit-threshold>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
- <maximum>3000</maximum>
+ <maximum>2722</maximum>
<teardown>
- <limit-threshold>89</limit-threshold>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</multicast>
@@ -6367,17 +6184,23 @@
<inet>
<unicast>
<prefix-limit>
- <maximum>500</maximum>
+ <maximum>211</maximum>
<teardown>
- <limit-threshold>89</limit-threshold>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
- <maximum>500</maximum>
+ <maximum>22</maximum>
<teardown>
- <limit-threshold>89</limit-threshold>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</multicast>
@@ -6398,17 +6221,23 @@
<inet>
<unicast>
<prefix-limit>
- <maximum>500</maximum>
+ <maximum>229</maximum>
<teardown>
- <limit-threshold>89</limit-threshold>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
- <maximum>500</maximum>
+ <maximum>10</maximum>
<teardown>
- <limit-threshold>89</limit-threshold>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</multicast>
@@ -6429,9 +6258,12 @@
<inet>
<unicast>
<prefix-limit>
- <maximum>2200</maximum>
+ <maximum>1527</maximum>
<teardown>
- <limit-threshold>75</limit-threshold>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</unicast>
@@ -6462,12 +6294,21 @@
<inet6>
<unicast>
<prefix-limit>
- <maximum>500</maximum>
+ <maximum>10</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
<maximum>500</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
</prefix-limit>
</multicast>
</inet6>
@@ -6487,17 +6328,23 @@
<inet6>
<unicast>
<prefix-limit>
- <maximum>2100</maximum>
+ <maximum>2118</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
- <maximum>500</maximum>
+ <maximum>37</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</multicast>
@@ -6518,12 +6365,21 @@
<inet6>
<unicast>
<prefix-limit>
- <maximum>500</maximum>
+ <maximum>33</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
<maximum>500</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
</prefix-limit>
</multicast>
</inet6>
@@ -6543,9 +6399,9 @@
<inet6>
<unicast>
<prefix-limit>
- <maximum>500</maximum>
+ <maximum>10</maximum>
<teardown>
- <limit-threshold>89</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -6555,6 +6411,9 @@
<multicast>
<prefix-limit>
<maximum>500</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
</prefix-limit>
</multicast>
</inet6>
@@ -6574,12 +6433,21 @@
<inet6>
<unicast>
<prefix-limit>
- <maximum>500</maximum>
+ <maximum>273</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
<maximum>500</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
</prefix-limit>
</multicast>
</inet6>
@@ -6979,281 +6847,194 @@
</pim>
<connections>
<interface-switch>
- <name>GTS-local-LO-6761dbbec8</name>
+ <name>NSI-LO-f6a4e15ae8</name>
<interface>
- <name>xe-11/2/3.15</name>
- </interface>
- <interface>
- <name>xe-11/2/0.20</name>
- </interface>
- </interface-switch>
- <interface-switch>
- <name>GTS-local-LO-0ee12bde4d</name>
- <interface>
- <name>xe-11/2/3.16</name>
- </interface>
- <interface>
- <name>xe-11/2/3.18</name>
- </interface>
- </interface-switch>
- <interface-switch>
- <name>GTS-local-LO-524849712c</name>
- <interface>
- <name>xe-11/2/0.14</name>
- </interface>
- <interface>
- <name>xe-11/2/3.17</name>
- </interface>
- </interface-switch>
- <interface-switch>
- <name>GTS-local-LO-15b8c2e200</name>
- <interface>
- <name>xe-11/2/3.14</name>
+ <name>xe-1/2/5.0</name>
</interface>
<interface>
- <name>xe-11/2/3.20</name>
+ <name>xe-11/2/2.15</name>
</interface>
</interface-switch>
<interface-switch>
- <name>GTS-local-LO-66bea13844</name>
+ <name>NSI-LO-734f406c21</name>
<interface>
- <name>xe-11/2/0.15</name>
+ <name>xe-1/2/4.0</name>
</interface>
<interface>
- <name>xe-11/2/0.19</name>
+ <name>xe-1/2/8.13</name>
</interface>
</interface-switch>
<interface-switch>
- <name>GTS-local-LO-b437900338</name>
- <interface>
- <name>xe-11/2/0.11</name>
- </interface>
+ <name>NSI-LO-5148ecad52</name>
<interface>
<name>xe-11/2/3.11</name>
</interface>
- </interface-switch>
- <interface-switch>
- <name>GTS-local-LO-e51fb87ecb</name>
- <interface>
- <name>xe-11/2/0.17</name>
- </interface>
<interface>
- <name>xe-11/2/0.18</name>
- </interface>
- </interface-switch>
- <interface-switch>
- <name>GTS-local-LO-ca5acfefb7</name>
- <interface>
- <name>xe-11/2/0.16</name>
- </interface>
- <interface>
- <name>xe-11/2/3.19</name>
- </interface>
- </interface-switch>
- <interface-switch>
- <name>GTS-local-LO-f6a4e15ae8</name>
- <interface>
- <name>xe-1/2/5.0</name>
- </interface>
- <interface>
- <name>xe-11/2/2.15</name>
- </interface>
- </interface-switch>
- <interface-switch>
- <name>GTS-local-LO-734f406c21</name>
- <interface>
- <name>xe-1/2/4.0</name>
- </interface>
- <interface>
- <name>xe-1/2/8.13</name>
+ <name>xe-1/2/8.24</name>
</interface>
</interface-switch>
<remote-interface-switch>
- <name>GTS-local-LO-04189136f8</name>
- <interface>xe-11/2/3.13</interface>
- <transmit-lsp>T-bra.cc-F-lon.cc-mpls4</transmit-lsp>
- <receive-lsp>T-lon.cc-F-bra.cc-mpls4</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-LO-32282522ec</name>
- <interface>xe-11/2/3.12</interface>
- <transmit-lsp>T-bra.cc-F-lon.cc-mpls3</transmit-lsp>
- <receive-lsp>T-lon.cc-F-bra.cc-mpls3</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-LO-43c30e3cdc</name>
- <interface>xe-11/2/0.12</interface>
- <transmit-lsp>T-bra.cc-F-lon.cc-mpls1</transmit-lsp>
- <receive-lsp>T-lon.cc-F-bra.cc-mpls1</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-LO-0fe298b08f</name>
- <interface>xe-11/2/0.13</interface>
- <transmit-lsp>T-bra.cc-F-lon.cc-mpls2</transmit-lsp>
- <receive-lsp>T-lon.cc-F-bra.cc-mpls2</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-LO-f5bee5e2bc</name>
- <interface>xe-11/2/1.15</interface>
- <transmit-lsp>T-mad.cc-F-lon.cc-mpls1</transmit-lsp>
- <receive-lsp>T-lon.cc-F-mad.cc-mpls1</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-LO-218d7720ab</name>
- <interface>xe-11/2/1.16</interface>
- <transmit-lsp>T-ham.cc-F-lon.cc-mpls5</transmit-lsp>
- <receive-lsp>T-lon.cc-F-ham.cc-mpls5</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-LO-ee17e0d496</name>
- <interface>xe-1/2/8.11</interface>
- <transmit-lsp>T-par.cc-F-lon.cc-mpls1</transmit-lsp>
- <receive-lsp>T-lon.cc-F-par.cc-mpls1</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-LO-bff0fd2491</name>
- <interface>ge-0/1/5.1304</interface>
- <transmit-lsp>T-prg.cc-F-lon.cc-mpls1</transmit-lsp>
- <receive-lsp>T-lon.cc-F-prg.cc-mpls1</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-LO-1e0e66fe1d</name>
- <interface>ge-0/1/5.1305</interface>
- <transmit-lsp>T-prg.cc-F-lon.cc-mpls2</transmit-lsp>
- <receive-lsp>T-lon.cc-F-prg.cc-mpls2</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-LO-ac081f598a</name>
- <interface>ge-0/1/5.1306</interface>
- <transmit-lsp>T-prg.cc-F-lon.cc-mpls3</transmit-lsp>
- <receive-lsp>T-lon.cc-F-prg.cc-mpls3</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-LO-35eab55bb1</name>
- <interface>ge-0/1/5.1307</interface>
- <transmit-lsp>T-prg.cc-F-lon.cc-mpls4</transmit-lsp>
- <receive-lsp>T-lon.cc-F-prg.cc-mpls4</receive-lsp>
+ <name>LO-06567ceb43</name>
+ <interface>xe-11/2/2.17</interface>
+ <transmit-lsp>T-ham.cc-F-lon.cc-mpls3</transmit-lsp>
+ <receive-lsp>T-lon.cc-F-ham.cc-mpls3</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-LO-ad15d3ab24</name>
+ <name>LO-ad15d3ab24</name>
<interface>xe-11/2/2.20</interface>
<transmit-lsp>T-mil.cc-F-lon.cc-mpls3</transmit-lsp>
<receive-lsp>T-lon.cc-F-mil.cc-mpls3</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-LO-54de326c95</name>
+ <name>LO-54de326c95</name>
<interface>xe-11/2/2.21</interface>
<transmit-lsp>T-ams.cc-F-lon.cc-mpls5</transmit-lsp>
<receive-lsp>T-lon.cc-F-ams.cc-mpls5</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-LO-d9847a1630</name>
+ <name>LO-d9847a1630</name>
<interface>xe-11/2/2.18</interface>
<transmit-lsp>T-bra.cc-F-lon.cc-mpls7</transmit-lsp>
<receive-lsp>T-lon.cc-F-bra.cc-mpls7</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-LO-d3ab540902</name>
+ <name>LO-d3ab540902</name>
<interface>xe-11/2/2.19</interface>
<transmit-lsp>T-prg.cc-F-lon.cc-mpls7</transmit-lsp>
<receive-lsp>T-lon.cc-F-prg.cc-mpls7</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-LO-06567ceb43</name>
- <interface>xe-11/2/2.17</interface>
- <transmit-lsp>T-ham.cc-F-lon.cc-mpls3</transmit-lsp>
- <receive-lsp>T-lon.cc-F-ham.cc-mpls3</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-LO-c5ec182385</name>
- <interface>xe-1/2/8.15</interface>
- <transmit-lsp>T-par.cc-F-lon.cc-mpls2</transmit-lsp>
- <receive-lsp>T-lon.cc-F-par.cc-mpls2</receive-lsp>
+ <name>LO-ee17e0d496</name>
+ <interface>xe-1/2/8.11</interface>
+ <transmit-lsp>T-par.cc-F-lon.cc-mpls1</transmit-lsp>
+ <receive-lsp>T-lon.cc-F-par.cc-mpls1</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-LO-89692f66c5</name>
- <interface>xe-1/2/8.16</interface>
- <transmit-lsp>T-ams.cc-F-lon.cc-mpls2</transmit-lsp>
- <receive-lsp>T-lon.cc-F-ams.cc-mpls2</receive-lsp>
+ <name>LO-9e81336f53</name>
+ <interface>xe-1/2/8.12</interface>
+ <transmit-lsp>T-ham.cc-F-lon.cc-mpls2</transmit-lsp>
+ <receive-lsp>T-lon.cc-F-ham.cc-mpls2</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-LO-df12506429</name>
+ <name>LO-df12506429</name>
<interface>xe-1/2/8.23</interface>
<transmit-lsp>T-bra.cc-F-lon.cc-mpls5</transmit-lsp>
<receive-lsp>T-lon.cc-F-bra.cc-mpls5</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-LO-6bf1e77f03</name>
- <interface>xe-1/2/8.21</interface>
- <transmit-lsp>T-par.cc-F-lon.cc-mpls3</transmit-lsp>
- <receive-lsp>T-lon.cc-F-par.cc-mpls3</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-LO-b1caba4ffe</name>
+ <name>LO-b1caba4ffe</name>
<interface>xe-1/2/8.19</interface>
<transmit-lsp>T-ams.cc-F-lon.cc-mpls3</transmit-lsp>
<receive-lsp>T-lon.cc-F-ams.cc-mpls3</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-LO-da19ce13d6</name>
+ <name>LO-f3908a2aca</name>
+ <interface>xe-1/2/8.20</interface>
+ <transmit-lsp>T-mil.cc-F-lon.cc-mpls2</transmit-lsp>
+ <receive-lsp>T-lon.cc-F-mil.cc-mpls2</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>LO-da19ce13d6</name>
<interface>xe-1/2/8.22</interface>
<transmit-lsp>T-prg.cc-F-lon.cc-mpls5</transmit-lsp>
<receive-lsp>T-lon.cc-F-prg.cc-mpls5</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-LO-9e81336f53</name>
- <interface>xe-1/2/8.12</interface>
- <transmit-lsp>T-ham.cc-F-lon.cc-mpls2</transmit-lsp>
- <receive-lsp>T-lon.cc-F-ham.cc-mpls2</receive-lsp>
+ <name>LO-6bf1e77f03</name>
+ <interface>xe-1/2/8.21</interface>
+ <transmit-lsp>T-par.cc-F-lon.cc-mpls3</transmit-lsp>
+ <receive-lsp>T-lon.cc-F-par.cc-mpls3</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-LO-1c024fd02a</name>
+ <name>LO-1c024fd02a</name>
<interface>xe-1/2/8.17</interface>
<transmit-lsp>T-mad.cc-F-lon.cc-mpls2</transmit-lsp>
<receive-lsp>T-lon.cc-F-mad.cc-mpls2</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-LO-f3908a2aca</name>
- <interface>xe-1/2/8.20</interface>
- <transmit-lsp>T-mil.cc-F-lon.cc-mpls2</transmit-lsp>
- <receive-lsp>T-lon.cc-F-mil.cc-mpls2</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-LO-c2d371680b</name>
+ <name>LO-c2d371680b</name>
<interface>xe-11/2/1.11</interface>
<transmit-lsp>T-par.cc-F-lon.cc-mpls4</transmit-lsp>
<receive-lsp>T-lon.cc-F-par.cc-mpls4</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-LO-cdd401d0b3</name>
+ <name>LO-cdd401d0b3</name>
<interface>xe-11/2/1.13</interface>
<transmit-lsp>T-prg.cc-F-lon.cc-mpls6</transmit-lsp>
<receive-lsp>T-lon.cc-F-prg.cc-mpls6</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-LO-ab2e858f34</name>
+ <name>LO-ab2e858f34</name>
<interface>xe-11/2/1.12</interface>
<transmit-lsp>T-ams.cc-F-lon.cc-mpls4</transmit-lsp>
<receive-lsp>T-lon.cc-F-ams.cc-mpls4</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-LO-0238ada89d</name>
- <interface>xe-1/2/8.26</interface>
- <transmit-lsp>T-par.cc-F-lon.cc-mpls5</transmit-lsp>
- <receive-lsp>T-lon.cc-F-par.cc-mpls5</receive-lsp>
+ <name>LO-89692f66c5</name>
+ <interface>xe-1/2/8.16</interface>
+ <transmit-lsp>T-ams.cc-F-lon.cc-mpls2</transmit-lsp>
+ <receive-lsp>T-lon.cc-F-ams.cc-mpls2</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-LO-ee5adf8f28</name>
- <interface>xe-11/2/2.11</interface>
- <transmit-lsp>T-ham.cc-F-lon.cc-mpls4</transmit-lsp>
- <receive-lsp>T-lon.cc-F-ham.cc-mpls4</receive-lsp>
+ <name>LO-804e5d7a81</name>
+ <interface>xe-11/2/0.21</interface>
+ <transmit-lsp>T-ham.cc-F-lon.cc-mpls1</transmit-lsp>
+ <receive-lsp>T-lon.cc-F-ham.cc-mpls1</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>LO-b2d4e4616d</name>
+ <interface>xe-11/2/0.22</interface>
+ <transmit-lsp>T-mil.cc-F-lon.cc-mpls1</transmit-lsp>
+ <receive-lsp>T-lon.cc-F-mil.cc-mpls1</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-LO-9c90191163</name>
+ <name>LO-9c90191163</name>
<interface>xe-11/2/2.12</interface>
<transmit-lsp>T-mil.cc-F-lon.cc-mpls4</transmit-lsp>
<receive-lsp>T-lon.cc-F-mil.cc-mpls4</receive-lsp>
</remote-interface-switch>
+ <remote-interface-switch>
+ <name>LO-ee5adf8f28</name>
+ <interface>xe-11/2/2.11</interface>
+ <transmit-lsp>T-ham.cc-F-lon.cc-mpls4</transmit-lsp>
+ <receive-lsp>T-lon.cc-F-ham.cc-mpls4</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>LO-1f5c0894d9</name>
+ <interface>xe-1/2/8.28</interface>
+ <transmit-lsp>T-mil.cc-F-lon.cc-mpls5</transmit-lsp>
+ <receive-lsp>T-lon.cc-F-mil.cc-mpls5</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>LO-c0cca99ed1</name>
+ <interface>xe-11/2/3.13</interface>
+ <transmit-lsp>T-bra.cc-F-lon.cc-mpls1</transmit-lsp>
+ <receive-lsp>T-lon.cc-F-bra.cc-mpls1</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>LO-8b7dc47479</name>
+ <interface>xe-11/2/3.14</interface>
+ <transmit-lsp>T-mad.cc-F-lon.cc-mpls1</transmit-lsp>
+ <receive-lsp>T-lon.cc-F-mad.cc-mpls1</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>LO-ed3e263aeb</name>
+ <interface>xe-1/2/8.25</interface>
+ <transmit-lsp>T-ams.cc-F-lon.cc-mpls1</transmit-lsp>
+ <receive-lsp>T-lon.cc-F-ams.cc-mpls1</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>LO-a8572539fa</name>
+ <interface>xe-1/2/8.27</interface>
+ <transmit-lsp>T-bra.cc-F-lon.cc-mpls2</transmit-lsp>
+ <receive-lsp>T-lon.cc-F-bra.cc-mpls2</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>LO-eb4b27c20d</name>
+ <interface>xe-11/2/3.12</interface>
+ <transmit-lsp>T-ams.cc-F-lon.cc-mpls6</transmit-lsp>
+ <receive-lsp>T-lon.cc-F-ams.cc-mpls6</receive-lsp>
+ </remote-interface-switch>
</connections>
<l2circuit>
<traceoptions>
@@ -7362,6 +7143,12 @@
<no-control-word/>
<ignore-mtu-mismatch/>
</interface>
+ <interface>
+ <name>ae14.2110</name>
+ <virtual-circuit-id>190092</virtual-circuit-id>
+ <no-control-word/>
+ <ignore-mtu-mismatch/>
+ </interface>
</neighbor>
<neighbor>
<name>62.40.97.14</name>
@@ -10438,8 +10225,9 @@
</prefix-list>
<prefix-list>
<name>geantncc-address-space</name>
+ <comment>/* NCC DR VPN */</comment>
<prefix-list-item>
- <name>62.40.108.192/26</name>
+ <name>62.40.108.192/27</name>
</prefix-list-item>
<prefix-list-item>
<name>62.40.111.0/24</name>
@@ -10447,9 +10235,6 @@
<prefix-list-item>
<name>62.40.119.0/24</name>
</prefix-list-item>
- <prefix-list-item>
- <name>62.40.119.134/32</name>
- </prefix-list-item>
<prefix-list-item>
<name>62.40.125.250/32</name>
</prefix-list-item>
@@ -12738,9 +12523,6 @@
<prefix-list-item>
<name>193.37.225.0/24</name>
</prefix-list-item>
- <prefix-list-item>
- <name>193.37.229.0/24</name>
- </prefix-list-item>
<prefix-list-item>
<name>193.37.240.0/21</name>
</prefix-list-item>
@@ -13308,9 +13090,18 @@
<prefix-list-item>
<name>217.180.0.0/15</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>217.180.0.0/16</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>217.181.0.0/17</name>
+ </prefix-list-item>
<prefix-list-item>
<name>217.181.8.0/21</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>217.181.128.0/17</name>
+ </prefix-list-item>
</prefix-list>
<prefix-list>
<name>route-from-JANET-v6</name>
@@ -14073,6 +13864,14 @@
</prefix-list>
<prefix-list>
<name>corporate-address-space</name>
+ <comment>/* LON2 CORP VPN (MAC) */</comment>
+ <prefix-list-item>
+ <name>62.40.99.194/32</name>
+ </prefix-list-item>
+ <comment>/* LON2 CORP VPN */</comment>
+ <prefix-list-item>
+ <name>62.40.99.201/32</name>
+ </prefix-list-item>
<prefix-list-item>
<name>62.40.119.128/25</name>
</prefix-list-item>
@@ -14242,6 +14041,18 @@
<name>2001:798::/32</name>
</prefix-list-item>
</prefix-list>
+ <prefix-list>
+ <name>opennsa-servers</name>
+ <prefix-list-item>
+ <name>83.97.93.92/32</name>
+ </prefix-list-item>
+ </prefix-list>
+ <prefix-list>
+ <name>opennsa-servers-v6</name>
+ <prefix-list-item>
+ <name>2001:798:3::15f/128</name>
+ </prefix-list-item>
+ </prefix-list>
<policy-statement>
<name>ASM-Allow</name>
<term>
@@ -14917,6 +14728,10 @@
<address>185.1.68.0/24</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>193.188.137.0/24</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -15038,6 +14853,10 @@
<address>2001:7f8:a0::/64</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>2001:7f8:35::/64</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -19345,13 +19164,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -19367,14 +19179,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp>
<name>backbone-classifier</name>
@@ -19386,18 +19190,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -19405,195 +19197,16 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>iperf-classifier</name>
- <import>default</import>
<forwarding-class>
<name>expedited-forwarding</name>
<loss-priority>
<name>low</name>
- <code-points>af12</code-points>
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>backbone-classifier</name>
@@ -19605,18 +19218,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -19624,13 +19225,7 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -19653,13 +19248,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -19675,187 +19263,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>iperf-classifier</name>
- <import>default</import>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>af12</code-points>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-access-classifier</name>
@@ -19864,16 +19271,16 @@
<name>be</name>
<loss-priority>
<name>low</name>
- <code-points>000</code-points>
- <code-points>001</code-points>
- <code-points>010</code-points>
- <code-points>011</code-points>
- <code-points>110</code-points>
- <code-points>111</code-points>
+ <code-points>100</code-points>
+ <code-points>101</code-points>
</loss-priority>
</forwarding-class>
+ </exp>
+ <exp>
+ <name>mpls-backbone-classifier</name>
+ <import>default</import>
<forwarding-class>
- <name>less-than-best-effort</name>
+ <name>be</name>
<loss-priority>
<name>low</name>
<code-points>100</code-points>
@@ -19881,40 +19288,7 @@
</loss-priority>
</forwarding-class>
</exp>
- <exp>
- <name>mpls-backbone-classifier</name>
- <import>default</import>
- </exp>
</classifiers>
- <code-point-aliases>
- <dscp>
- <name>ix</name>
- <bits>101001</bits>
- </dscp>
- <dscp>
- <name>dws</name>
- <bits>100000</bits>
- </dscp>
- <dscp-ipv6>
- <name>dws</name>
- <bits>100000</bits>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix</name>
- <bits>101001</bits>
- </dscp-ipv6>
- </code-point-aliases>
- <drop-profiles>
- <name>dws-drop-profile</name>
- <fill-level>
- <name>35</name>
- <drop-probability>10</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<drop-profiles>
<name>be-drop-profile</name>
<fill-level>
@@ -19934,59 +19308,44 @@
<drop-probability>100</drop-probability>
</fill-level>
</drop-profiles>
- <drop-profiles>
- <name>less-than-be-drop-profile</name>
- <fill-level>
- <name>25</name>
- <drop-probability>30</drop-probability>
- </fill-level>
- <fill-level>
- <name>30</name>
- <drop-probability>50</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>70</drop-probability>
- </fill-level>
- <fill-level>
- <name>50</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<forwarding-classes>
<class>
<name>be</name>
<queue-num>0</queue-num>
</class>
- <class>
- <name>be-ix</name>
- <queue-num>0</queue-num>
- </class>
<class>
<name>expedited-forwarding</name>
<queue-num>1</queue-num>
</class>
- <class>
- <name>less-than-best-effort</name>
- <queue-num>2</queue-num>
- </class>
<class>
<name>network-control</name>
<queue-num>3</queue-num>
</class>
- <class>
- <name>be-dws</name>
- <queue-num>0</queue-num>
- </class>
- <class>
- <name>be-bleach</name>
- <queue-num>0</queue-num>
- </class>
</forwarding-classes>
<interfaces>
+ <interface>
+ <name>et-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>ge-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>so-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>xe-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>ae*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
<interface>
<name>ae0</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -20004,17 +19363,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -20024,7 +19375,7 @@
</interface>
<interface>
<name>ae1</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -20042,17 +19393,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -20062,7 +19405,7 @@
</interface>
<interface>
<name>ae3</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -20080,17 +19423,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -20100,7 +19435,7 @@
</interface>
<interface>
<name>ae6</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -20121,9 +19456,6 @@
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -20133,7 +19465,7 @@
</interface>
<interface>
<name>ae14</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>202</name>
<classifiers>
@@ -20183,13 +19515,6 @@
<rewrite-rules>
<dscp>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -20204,17 +19529,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -20226,37 +19540,9 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -20271,17 +19557,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -20293,13 +19568,6 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
@@ -20307,35 +19575,19 @@
</exp>
</rewrite-rules>
<scheduler-maps>
- <name>MAP-BASIC-IQ2</name>
+ <name>GEANT-BASIC</name>
<forwarding-class>
<name>expedited-forwarding</name>
<scheduler>sch-expedited-forwarding</scheduler>
</forwarding-class>
<forwarding-class>
<name>network-control</name>
- <scheduler>sch-network-ctrl-iq2</scheduler>
+ <scheduler>sch-network-ctrl-geant</scheduler>
</forwarding-class>
<forwarding-class>
<name>be</name>
<scheduler>sch-be</scheduler>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <scheduler>sch-less-than-best-effort</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
</scheduler-maps>
<schedulers>
<name>sch-be</name>
@@ -20355,27 +19607,7 @@
<priority>strict-high</priority>
</schedulers>
<schedulers>
- <name>sch-less-than-best-effort</name>
- <transmit-rate>
- <percent>10</percent>
- </transmit-rate>
- <buffer-size>
- <percent>10</percent>
- </buffer-size>
- <priority>low</priority>
- <drop-profile-map>
- <loss-priority>low</loss-priority>
- <protocol>any</protocol>
- <drop-profile>less-than-be-drop-profile</drop-profile>
- </drop-profile-map>
- <drop-profile-map>
- <loss-priority>high</loss-priority>
- <protocol>any</protocol>
- <drop-profile>be-drop-profile</drop-profile>
- </drop-profile-map>
- </schedulers>
- <schedulers>
- <name>sch-network-ctrl</name>
+ <name>sch-network-ctrl-geant</name>
<transmit-rate>
<percent>5</percent>
</transmit-rate>
@@ -20384,15 +19616,6 @@
</buffer-size>
<priority>high</priority>
</schedulers>
- <schedulers>
- <name>sch-network-ctrl-iq2</name>
- <transmit-rate>
- <percent>5</percent>
- </transmit-rate>
- <buffer-size>
- <percent>5</percent>
- </buffer-size>
- </schedulers>
</class-of-service>
<firewall>
<family>
@@ -26720,6 +25943,9 @@
<source-prefix-list>
<name>dashboard-servers</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers</name>
+ </source-prefix-list>
<protocol>tcp</protocol>
<destination-port>ssh</destination-port>
</from>
@@ -30458,6 +29684,9 @@
<source-prefix-list>
<name>dashboard-servers-v6</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers-v6</name>
+ </source-prefix-list>
<next-header>tcp</next-header>
<port>ssh</port>
</from>
@@ -33820,7 +33049,7 @@
</policer>
</firewall>
<routing-instances>
- <instance>
+ <instance inactive="inactive">
<name>CLEAN_IAS</name>
<description>Clean IAS VRF traffic returned from scrubber</description>
<instance-type>vrf</instance-type>
@@ -34154,6 +33383,17 @@
<import>ps-IAS-from-FACEBOOK</import>
<family>
<inet>
+ <unicast>
+ <prefix-limit>
+ <maximum>10</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
+ </prefix-limit>
+ </unicast>
<any>
<prefix-limit>
<maximum>150</maximum>
@@ -34192,6 +33432,17 @@
<import>ps-IAS-from-FACEBOOK</import>
<family>
<inet6>
+ <unicast>
+ <prefix-limit>
+ <maximum>10</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
+ </prefix-limit>
+ </unicast>
<any>
<prefix-limit>
<maximum>30</maximum>
diff --git a/test/data/mx1.mad.es.geant.net-netconf.xml b/test/data/mx1.mad.es.geant.net-netconf.xml
index 9b6430c08af9fdf8c5044295860fac2508947a9a..f789110fd9a1e6777f7e9278a93cc317ea9596c8 100644
--- a/test/data/mx1.mad.es.geant.net-netconf.xml
+++ b/test/data/mx1.mad.es.geant.net-netconf.xml
@@ -1,4 +1,4 @@
-<configuration changed-seconds="1545214329" changed-localtime="2018-12-19 10:12:09 UTC">
+<configuration changed-seconds="1549111328" changed-localtime="2019-02-02 12:42:08 UTC">
<version>15.1F6-S10.9</version>
<groups>
<name>re0</name>
@@ -263,6 +263,38 @@
<allow-commands>show .*</allow-commands>
<deny-commands>(ssh .*|telnet .*)</deny-commands>
</class>
+ <class>
+ <name>opennsa</name>
+ <idle-timeout>5</idle-timeout>
+ <permissions>configure</permissions>
+ <deny-commands>(file.*)|(load.*)|(op.*)|(request.*)|(save.*)|(start.*)|(test.*)|(set cli.*)|(set date.*)|(clear.*)|(help.*)|(telnet.*)|(ssh.*)|(traceroute.*)|(mtrace.*)|(monitor.*)|(ping.*)|(show.*)|(set.*)</deny-commands>
+ <allow-configuration-regexps>interfaces .*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections remote-interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols mpls label-switched-path.*</allow-configuration-regexps>
+ <deny-configuration-regexps>vmhost .*</deny-configuration-regexps>
+ <deny-configuration-regexps>session-limit-group .*</deny-configuration-regexps>
+ <deny-configuration-regexps>multi-chassis .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc-partition .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc .*</deny-configuration-regexps>
+ <deny-configuration-regexps>groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>dynamic-profiles .*</deny-configuration-regexps>
+ <deny-configuration-regexps>diameter .*</deny-configuration-regexps>
+ <deny-configuration-regexps>apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>access-profile .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces traceoptions .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-set .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-range .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups-except .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lt-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces ms-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces si-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces gr-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lo.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces dsc.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces irb.*</deny-configuration-regexps>
+ </class>
<class>
<name>readonly-permissions</name>
<idle-timeout>15</idle-timeout>
@@ -574,6 +606,22 @@
<encrypted-password>/* SECRET-DATA */</encrypted-password>
</authentication>
</user>
+ <user>
+ <name>opennsa</name>
+ <uid>2047</uid>
+ <class>opennsa</class>
+ <authentication>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ </authentication>
+ </user>
<user>
<name>opnet</name>
<full-name>OPNET NEOP Planning system @ 62.40.105.114</full-name>
@@ -1782,28 +1830,6 @@
<flexible-vlan-tagging/>
<mtu>9000</mtu>
<encapsulation>flexible-ethernet-services</encapsulation>
- <unit>
- <name>1301</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>1301</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>1303</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>1303</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
</interface>
<interface>
<name>ge-0/2/8</name>
@@ -2433,7 +2459,6 @@
<interface>
<name>xe-1/0/0</name>
<description>PHY SPARE</description>
- <disable/>
</interface>
<interface>
<name>xe-1/0/1</name>
@@ -2524,72 +2549,6 @@
<flexible-vlan-tagging/>
<mtu>9000</mtu>
<encapsulation>flexible-ethernet-services</encapsulation>
- <unit>
- <name>11</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>11</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>12</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>12</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>13</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>13</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>14</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>14</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>15</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>15</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>16</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>16</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
</interface>
<interface>
<name>xe-2/0/2</name>
@@ -2617,14 +2576,14 @@
<apply-groups>NO_TRAPS</apply-groups>
<description>PHY INFRASTRUCTURE GTS SRF0000001 | GTS link to Server 0</description>
<flexible-vlan-tagging/>
- <mtu>9000</mtu>
+ <mtu>9192</mtu>
<encapsulation>flexible-ethernet-services</encapsulation>
</interface>
<interface>
<name>xe-2/1/2</name>
<apply-groups>NO_TRAPS</apply-groups>
<description>PHY INFRASTRUCTURE GTS SRF0000001 | GTS link to Server 1</description>
- <mtu>9192</mtu>
+ <mtu>9000</mtu>
<encapsulation>ethernet-ccc</encapsulation>
<unit>
<name>0</name>
@@ -2674,6 +2633,17 @@
<push/>
</output-vlan-map>
</unit>
+ <unit>
+ <name>14</name>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>14</vlan-id>
+ <input-vlan-map>
+ <pop/>
+ </input-vlan-map>
+ <output-vlan-map>
+ <push/>
+ </output-vlan-map>
+ </unit>
<unit>
<name>15</name>
<encapsulation>vlan-ccc</encapsulation>
@@ -2773,6 +2743,72 @@
<push/>
</output-vlan-map>
</unit>
+ <unit>
+ <name>25</name>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>25</vlan-id>
+ <input-vlan-map>
+ <pop/>
+ </input-vlan-map>
+ <output-vlan-map>
+ <push/>
+ </output-vlan-map>
+ </unit>
+ <unit>
+ <name>26</name>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>26</vlan-id>
+ <input-vlan-map>
+ <pop/>
+ </input-vlan-map>
+ <output-vlan-map>
+ <push/>
+ </output-vlan-map>
+ </unit>
+ <unit>
+ <name>27</name>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>27</vlan-id>
+ <input-vlan-map>
+ <pop/>
+ </input-vlan-map>
+ <output-vlan-map>
+ <push/>
+ </output-vlan-map>
+ </unit>
+ <unit>
+ <name>28</name>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>28</vlan-id>
+ <input-vlan-map>
+ <pop/>
+ </input-vlan-map>
+ <output-vlan-map>
+ <push/>
+ </output-vlan-map>
+ </unit>
+ <unit>
+ <name>29</name>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>29</vlan-id>
+ <input-vlan-map>
+ <pop/>
+ </input-vlan-map>
+ <output-vlan-map>
+ <push/>
+ </output-vlan-map>
+ </unit>
+ <unit>
+ <name>30</name>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>30</vlan-id>
+ <input-vlan-map>
+ <pop/>
+ </input-vlan-map>
+ <output-vlan-map>
+ <push/>
+ </output-vlan-map>
+ </unit>
</interface>
<interface>
<name>xe-2/2/0</name>
@@ -2826,7 +2862,7 @@
<name>xe-2/2/2</name>
<apply-groups>NO_TRAPS</apply-groups>
<description>PHY INFRASTRUCTURE GTS SRF0000001 | GTS link to Server 3</description>
- <mtu>9192</mtu>
+ <mtu>9000</mtu>
<encapsulation>ethernet-ccc</encapsulation>
<unit>
<name>0</name>
@@ -2870,8 +2906,10 @@
</interface>
<interface>
<name>xe-2/3/3</name>
- <description>PHY SPARE |Reserved for LIS-MAD Upgrade</description>
- <disable/>
+ <description>PHY SPARE</description>
+ <framing>
+ <wan-phy/>
+ </framing>
</interface>
<interface>
<name>xe-3/0/0</name>
@@ -2896,8 +2934,10 @@
</interface>
<interface>
<name>xe-3/1/1</name>
- <description>PHY SPARE</description>
- <disable/>
+ <description>PHY SPARE |Reserved for FCCN Madrid Upgrade</description>
+ <framing>
+ <wan-phy/>
+ </framing>
</interface>
<interface>
<name>ms-3/2/0</name>
@@ -3588,6 +3628,9 @@
<clients>
<name>83.97.93.196/32</name>
</clients>
+ <clients>
+ <name>83.97.93.238/32</name>
+ </clients>
</community>
<community>
<name>As4n0gN!</name>
@@ -4071,13 +4114,13 @@
<import-rib>IAS.inet6.0</import-rib>
<import-policy>rtbh-policy</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias</name>
<import-rib>IAS.inet.0</import-rib>
<import-rib>CLEAN_IAS.inet.0</import-rib>
<import-policy>ps-into-clean-ias-import</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias-v6</name>
<import-rib>IAS.inet6.0</import-rib>
<import-rib>CLEAN_IAS.inet6.0</import-rib>
@@ -4149,111 +4192,78 @@
<ipv6-tunneling/>
<icmp-tunneling/>
<label-switched-path>
- <name>T-lon.cc-F-mad.cc-mpls1</name>
- <no-install-to-address/>
- <to>62.40.96.15</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-ham.cc-F-mad.cc-mpls4</name>
- <no-install-to-address/>
- <to>62.40.96.26</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-ham.cc-F-mad.cc-mpls5</name>
- <no-install-to-address/>
+ <name>T-ham.cc-F-mad.cc-mpls3</name>
<to>62.40.96.26</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-prg.cc-F-mad.cc-mpls1</name>
- <no-install-to-address/>
- <to>62.40.97.2</to>
+ <name>T-ams.cc-F-mad.cc-mpls5</name>
+ <to>62.40.97.11</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-ham.cc-F-mad.cc-mpls1</name>
- <no-install-to-address/>
- <to>62.40.96.26</to>
+ <name>T-mil.cc-F-mad.cc-mpls1</name>
+ <to>62.40.97.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-ams.cc-F-mad.cc-mpls1</name>
- <no-install-to-address/>
- <to>62.40.97.11</to>
+ <name>T-par.cc-F-mad.cc-mpls1</name>
+ <to>62.40.97.13</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-prg.cc-F-mad.cc-mpls2</name>
- <no-install-to-address/>
+ <name>T-prg.cc-F-mad.cc-mpls4</name>
<to>62.40.97.2</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-prg.cc-F-mad.cc-mpls3</name>
- <no-install-to-address/>
- <to>62.40.97.2</to>
+ <name>T-bra.cc-F-mad.cc-mpls1</name>
+ <to>62.40.97.4</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-ams.cc-F-mad.cc-mpls2</name>
- <no-install-to-address/>
- <to>62.40.97.11</to>
+ <name>T-lon.cc-F-mad.cc-mpls2</name>
+ <to>62.40.96.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-ham.cc-F-mad.cc-mpls3</name>
- <no-install-to-address/>
- <to>62.40.96.26</to>
+ <name>T-prg.cc-F-mad.cc-mpls6</name>
+ <to>62.40.97.2</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-bra.cc-F-mad.cc-mpls1</name>
- <no-install-to-address/>
- <to>62.40.97.4</to>
+ <name>T-par.cc-F-mad.cc-mpls2</name>
+ <to>62.40.97.13</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-ams.cc-F-mad.cc-mpls5</name>
- <no-install-to-address/>
- <to>62.40.97.11</to>
+ <name>T-lon.cc-F-mad.cc-mpls1</name>
+ <to>62.40.96.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-prg.cc-F-mad.cc-mpls4</name>
- <no-install-to-address/>
- <to>62.40.97.2</to>
+ <name>T-par.cc-F-mad.cc-mpls3</name>
+ <to>62.40.97.13</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-mil.cc-F-mad.cc-mpls1</name>
- <no-install-to-address/>
+ <name>T-mil.cc-F-mad.cc-mpls3</name>
<to>62.40.97.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-lon.cc-F-mad.cc-mpls2</name>
- <no-install-to-address/>
- <to>62.40.96.15</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-par.cc-F-mad.cc-mpls1</name>
- <no-install-to-address/>
- <to>62.40.97.13</to>
+ <name>T-mil.cc-F-mad.cc-mpls2</name>
+ <to>62.40.97.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-par.cc-F-mad.cc-mpls2</name>
- <no-install-to-address/>
+ <name>T-par.cc-F-mad.cc-mpls4</name>
<to>62.40.97.13</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-prg.cc-F-mad.cc-mpls6</name>
- <no-install-to-address/>
- <to>62.40.97.2</to>
+ <name>T-bra.cc-F-mad.cc-mpls2</name>
+ <to>62.40.97.4</to>
<no-cspf/>
</label-switched-path>
<interface>
@@ -5009,7 +5019,16 @@
</pim>
<connections>
<interface-switch>
- <name>GTS-local-MA-866c1dafb7</name>
+ <name>NSI-MA-9fa5d7556c</name>
+ <interface>
+ <name>xe-2/2/2.0</name>
+ </interface>
+ <interface>
+ <name>xe-2/1/3.13</name>
+ </interface>
+ </interface-switch>
+ <interface-switch>
+ <name>NSI-MA-866c1dafb7</name>
<interface>
<name>xe-2/1/2.0</name>
</interface>
@@ -5018,121 +5037,103 @@
</interface>
</interface-switch>
<interface-switch>
- <name>GTS-local-MA-9fa5d7556c</name>
+ <name>NSI-MA-5c685eeb86</name>
<interface>
- <name>xe-2/2/2.0</name>
+ <name>xe-2/1/3.11</name>
</interface>
<interface>
- <name>xe-2/1/3.13</name>
+ <name>xe-2/1/3.27</name>
</interface>
</interface-switch>
<remote-interface-switch>
- <name>GTS-local-MA-45e8ff6a14</name>
- <interface>xe-2/0/1.16</interface>
- <transmit-lsp>T-lon.cc-F-mad.cc-mpls1</transmit-lsp>
- <receive-lsp>T-mad.cc-F-lon.cc-mpls1</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-MA-46596df05d</name>
- <interface>xe-2/0/1.15</interface>
- <transmit-lsp>T-ham.cc-F-mad.cc-mpls4</transmit-lsp>
- <receive-lsp>T-mad.cc-F-ham.cc-mpls4</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-MA-eebbedf53e</name>
- <interface>xe-2/0/1.14</interface>
- <transmit-lsp>T-ham.cc-F-mad.cc-mpls5</transmit-lsp>
- <receive-lsp>T-mad.cc-F-ham.cc-mpls5</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-MA-bb8122a6cf</name>
- <interface>xe-2/0/1.13</interface>
- <transmit-lsp>T-prg.cc-F-mad.cc-mpls1</transmit-lsp>
- <receive-lsp>T-mad.cc-F-prg.cc-mpls1</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-MA-13c35128a7</name>
- <interface>xe-2/0/1.12</interface>
- <transmit-lsp>T-ham.cc-F-mad.cc-mpls1</transmit-lsp>
- <receive-lsp>T-mad.cc-F-ham.cc-mpls1</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-MA-4f7e98b840</name>
- <interface>xe-2/0/1.11</interface>
- <transmit-lsp>T-ams.cc-F-mad.cc-mpls1</transmit-lsp>
- <receive-lsp>T-mad.cc-F-ams.cc-mpls1</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-MA-9657da44a3</name>
- <interface>ge-0/2/7.1303</interface>
- <transmit-lsp>T-prg.cc-F-mad.cc-mpls2</transmit-lsp>
- <receive-lsp>T-mad.cc-F-prg.cc-mpls2</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-MA-b1a2a9660e</name>
- <interface>ge-0/2/7.1301</interface>
- <transmit-lsp>T-prg.cc-F-mad.cc-mpls3</transmit-lsp>
- <receive-lsp>T-mad.cc-F-prg.cc-mpls3</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-MA-9f0822c1f6</name>
- <interface>xe-2/1/3.11</interface>
- <transmit-lsp>T-ams.cc-F-mad.cc-mpls2</transmit-lsp>
- <receive-lsp>T-mad.cc-F-ams.cc-mpls2</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-MA-5744136ebb</name>
+ <name>MA-5744136ebb</name>
<interface>xe-2/1/3.17</interface>
<transmit-lsp>T-ham.cc-F-mad.cc-mpls3</transmit-lsp>
<receive-lsp>T-mad.cc-F-ham.cc-mpls3</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-MA-10c94452fe</name>
- <interface>xe-2/1/3.21</interface>
- <transmit-lsp>T-bra.cc-F-mad.cc-mpls1</transmit-lsp>
- <receive-lsp>T-mad.cc-F-bra.cc-mpls1</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-MA-8518794818</name>
+ <name>MA-8518794818</name>
<interface>xe-2/1/3.19</interface>
<transmit-lsp>T-ams.cc-F-mad.cc-mpls5</transmit-lsp>
<receive-lsp>T-mad.cc-F-ams.cc-mpls5</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-MA-25adbaeda1</name>
+ <name>MA-b8e62b8dcb</name>
+ <interface>xe-2/1/3.16</interface>
+ <transmit-lsp>T-mil.cc-F-mad.cc-mpls1</transmit-lsp>
+ <receive-lsp>T-mad.cc-F-mil.cc-mpls1</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>MA-2c4db78f1d</name>
+ <interface>xe-2/1/3.18</interface>
+ <transmit-lsp>T-par.cc-F-mad.cc-mpls1</transmit-lsp>
+ <receive-lsp>T-mad.cc-F-par.cc-mpls1</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>MA-25adbaeda1</name>
<interface>xe-2/1/3.20</interface>
<transmit-lsp>T-prg.cc-F-mad.cc-mpls4</transmit-lsp>
<receive-lsp>T-mad.cc-F-prg.cc-mpls4</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-MA-b8e62b8dcb</name>
- <interface>xe-2/1/3.16</interface>
- <transmit-lsp>T-mil.cc-F-mad.cc-mpls1</transmit-lsp>
- <receive-lsp>T-mad.cc-F-mil.cc-mpls1</receive-lsp>
+ <name>MA-10c94452fe</name>
+ <interface>xe-2/1/3.21</interface>
+ <transmit-lsp>T-bra.cc-F-mad.cc-mpls1</transmit-lsp>
+ <receive-lsp>T-mad.cc-F-bra.cc-mpls1</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-MA-db35dbed3d</name>
+ <name>MA-db35dbed3d</name>
<interface>xe-2/1/3.15</interface>
<transmit-lsp>T-lon.cc-F-mad.cc-mpls2</transmit-lsp>
<receive-lsp>T-mad.cc-F-lon.cc-mpls2</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-MA-2c4db78f1d</name>
- <interface>xe-2/1/3.18</interface>
- <transmit-lsp>T-par.cc-F-mad.cc-mpls1</transmit-lsp>
- <receive-lsp>T-mad.cc-F-par.cc-mpls1</receive-lsp>
+ <name>MA-0c323903eb</name>
+ <interface>xe-2/1/3.24</interface>
+ <transmit-lsp>T-prg.cc-F-mad.cc-mpls6</transmit-lsp>
+ <receive-lsp>T-mad.cc-F-prg.cc-mpls6</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-MA-019b9d43d1</name>
+ <name>MA-019b9d43d1</name>
<interface>xe-2/1/3.23</interface>
<transmit-lsp>T-par.cc-F-mad.cc-mpls2</transmit-lsp>
<receive-lsp>T-mad.cc-F-par.cc-mpls2</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-MA-0c323903eb</name>
- <interface>xe-2/1/3.24</interface>
- <transmit-lsp>T-prg.cc-F-mad.cc-mpls6</transmit-lsp>
- <receive-lsp>T-mad.cc-F-prg.cc-mpls6</receive-lsp>
+ <name>MA-a63724360c</name>
+ <interface>xe-2/1/3.26</interface>
+ <transmit-lsp>T-lon.cc-F-mad.cc-mpls1</transmit-lsp>
+ <receive-lsp>T-mad.cc-F-lon.cc-mpls1</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>MA-5b74c04ae5</name>
+ <interface>xe-2/1/3.14</interface>
+ <transmit-lsp>T-par.cc-F-mad.cc-mpls3</transmit-lsp>
+ <receive-lsp>T-mad.cc-F-par.cc-mpls3</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>MA-41b19c76b5</name>
+ <interface>xe-2/1/3.29</interface>
+ <transmit-lsp>T-mil.cc-F-mad.cc-mpls3</transmit-lsp>
+ <receive-lsp>T-mad.cc-F-mil.cc-mpls3</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>MA-302d18369d</name>
+ <interface>xe-2/1/3.25</interface>
+ <transmit-lsp>T-mil.cc-F-mad.cc-mpls2</transmit-lsp>
+ <receive-lsp>T-mad.cc-F-mil.cc-mpls2</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>MA-325b0ee983</name>
+ <interface>xe-2/1/3.28</interface>
+ <transmit-lsp>T-par.cc-F-mad.cc-mpls4</transmit-lsp>
+ <receive-lsp>T-mad.cc-F-par.cc-mpls4</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>MA-3a4c2794a8</name>
+ <interface>xe-2/1/3.30</interface>
+ <transmit-lsp>T-bra.cc-F-mad.cc-mpls2</transmit-lsp>
+ <receive-lsp>T-mad.cc-F-bra.cc-mpls2</receive-lsp>
</remote-interface-switch>
<lsp-switch>
<name>I2CAT-L2-VPN-IRIS-CLARA</name>
@@ -5513,16 +5514,13 @@
</prefix-list>
<prefix-list>
<name>geantncc-address-space</name>
- <comment>/* NCC DR VPN LAN */</comment>
+ <comment>/* NCC DR VPN */</comment>
<prefix-list-item>
- <name>62.40.108.192/26</name>
+ <name>62.40.108.192/27</name>
</prefix-list-item>
<prefix-list-item>
<name>62.40.119.0/24</name>
</prefix-list-item>
- <prefix-list-item>
- <name>62.40.119.134/32</name>
- </prefix-list-item>
<prefix-list-item>
<name>62.40.125.250/32</name>
</prefix-list-item>
@@ -9832,6 +9830,14 @@
</prefix-list>
<prefix-list>
<name>corporate-address-space</name>
+ <comment>/* LON2 CORP VPN (MAC) */</comment>
+ <prefix-list-item>
+ <name>62.40.99.194/32</name>
+ </prefix-list-item>
+ <comment>/* LON2 CORP VPN */</comment>
+ <prefix-list-item>
+ <name>62.40.99.201/32</name>
+ </prefix-list-item>
<prefix-list-item>
<name>62.40.119.128/25</name>
</prefix-list-item>
@@ -10193,6 +10199,18 @@
<name>2001:798::/32</name>
</prefix-list-item>
</prefix-list>
+ <prefix-list>
+ <name>opennsa-servers</name>
+ <prefix-list-item>
+ <name>83.97.93.92/32</name>
+ </prefix-list-item>
+ </prefix-list>
+ <prefix-list>
+ <name>opennsa-servers-v6</name>
+ <prefix-list-item>
+ <name>2001:798:3::15f/128</name>
+ </prefix-list-item>
+ </prefix-list>
<policy-statement>
<name>ASM-Allow</name>
<term>
@@ -10493,6 +10511,15 @@
</then>
</term>
</policy-statement>
+ <policy-statement>
+ <name>IAS_PS-FROM-PUBLIC-PEER_AS32934_Facebook</name>
+ <term>
+ <name>NEXT_POLICY</name>
+ <then>
+ <next>policy</next>
+ </then>
+ </term>
+ </policy-statement>
<policy-statement>
<name>IAS_PS-FROM-PUBLIC-PEER_AS33891_Core-Backbone_GmbH</name>
<term>
@@ -11664,6 +11691,100 @@
</then>
</term>
</policy-statement>
+ <policy-statement>
+ <name>IAS_PS-TO-PUBLIC-PEER_AS32934_Facebook</name>
+ <term>
+ <name>BLOCK_THIS_PEER</name>
+ <from>
+ <community>TE_BLOCK_AS32934</community>
+ <community>TE_BLOCK_AS32934_2</community>
+ <community>TE_BLOCK_AS32934_DE-CIX-MAD</community>
+ <community>TE_BLOCK_AS32934_DE-CIX-MAD_2</community>
+ </from>
+ <then>
+ <reject/>
+ </then>
+ </term>
+ <term>
+ <name>PREPEND_THIS_PEER_x1</name>
+ <from>
+ <community>TE_PREPEND_AS32934_x1_4byte</community>
+ <community>TE_PREPEND_AS32934_x1_2byte</community>
+ </from>
+ <then>
+ <as-path-expand>
+ <aspath>21320</aspath>
+ </as-path-expand>
+ </then>
+ </term>
+ <term>
+ <name>PREPEND_THIS_PEER_x2</name>
+ <from>
+ <community>TE_PREPEND_AS32934_x2_4byte</community>
+ <community>TE_PREPEND_AS32934_x2_2byte</community>
+ </from>
+ <then>
+ <as-path-expand>
+ <aspath>21320 21320</aspath>
+ </as-path-expand>
+ </then>
+ </term>
+ <term>
+ <name>PREPEND_THIS_PEER_x3</name>
+ <from>
+ <community>TE_PREPEND_AS32934_x3_4byte</community>
+ <community>TE_PREPEND_AS32934_x3_2byte</community>
+ </from>
+ <then>
+ <as-path-expand>
+ <aspath>21320 21320 21320</aspath>
+ </as-path-expand>
+ </then>
+ </term>
+ <term>
+ <name>PREPEND_THIS_PEER_x6</name>
+ <from>
+ <community>TE_PREPEND_AS32934_x6_4byte</community>
+ <community>TE_PREPEND_AS32934_x6_2byte</community>
+ </from>
+ <then>
+ <as-path-expand>
+ <aspath>21320 21320 21320 21320 21320 21320</aspath>
+ </as-path-expand>
+ </then>
+ </term>
+ <term>
+ <name>ANNOUNCE</name>
+ <from>
+ <community>TE_ANNOUNCE_AS32934</community>
+ <community>TE_ANNOUNCE_AS32934_2</community>
+ <community>TE_ANNOUNCE_AS32934_3</community>
+ <community>TE_ANNOUNCE_AS32934_4</community>
+ <community>TE_ANNOUNCE_ALL_PUBLIC_PEERS</community>
+ <community>TE_ANNOUNCE_ALL_PUBLIC_PEERS_2</community>
+ <community>TE_ANNOUNCE_ALL_PUBLIC_PEERS_3</community>
+ <community>TE_ANNOUNCE_AS32934_DE-CIX-MAD</community>
+ <community>TE_ANNOUNCE_AS32934_DE-CIX-MAD_2</community>
+ </from>
+ <then>
+ <metric>
+ <igp>
+ </igp>
+ </metric>
+ <community>
+ <delete/>
+ <community-name>TE_PRIVATE_COMMUNITIES</community-name>
+ </community>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>NEXT_POLICY</name>
+ <then>
+ <next>policy</next>
+ </then>
+ </term>
+ </policy-statement>
<policy-statement>
<name>IAS_PS-TO-PUBLIC-PEER_AS33891_Core-Backbone_GmbH</name>
<term>
@@ -12519,6 +12640,10 @@
<address>185.1.68.0/24</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>193.188.137.0/24</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -12640,6 +12765,10 @@
<address>2001:7f8:a0::/64</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>2001:7f8:35::/64</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -14823,6 +14952,30 @@
<name>TE_ANNOUNCE_AS32590_DE-CIX-MAD_2</name>
<members>origin:32590L:64789</members>
</community>
+ <community>
+ <name>TE_ANNOUNCE_AS32934</name>
+ <members>64700:32934</members>
+ </community>
+ <community>
+ <name>TE_ANNOUNCE_AS32934_2</name>
+ <members>64712:32934</members>
+ </community>
+ <community>
+ <name>TE_ANNOUNCE_AS32934_3</name>
+ <members>origin:32934L:64700</members>
+ </community>
+ <community>
+ <name>TE_ANNOUNCE_AS32934_4</name>
+ <members>origin:32934L:64712</members>
+ </community>
+ <community>
+ <name>TE_ANNOUNCE_AS32934_DE-CIX-MAD</name>
+ <members>64789:32934</members>
+ </community>
+ <community>
+ <name>TE_ANNOUNCE_AS32934_DE-CIX-MAD_2</name>
+ <members>origin:32934L:64789</members>
+ </community>
<community>
<name>TE_ANNOUNCE_AS33891</name>
<members>64700:33891</members>
@@ -15155,6 +15308,22 @@
<name>TE_BLOCK_AS32590_DE-CIX-MAD_2</name>
<members>origin:32590L:64589</members>
</community>
+ <community>
+ <name>TE_BLOCK_AS32934</name>
+ <members>64512:32934</members>
+ </community>
+ <community>
+ <name>TE_BLOCK_AS32934_2</name>
+ <members>origin:32934L:64512</members>
+ </community>
+ <community>
+ <name>TE_BLOCK_AS32934_DE-CIX-MAD</name>
+ <members>64589:32934</members>
+ </community>
+ <community>
+ <name>TE_BLOCK_AS32934_DE-CIX-MAD_2</name>
+ <members>origin:32934L:64589</members>
+ </community>
<community>
<name>TE_BLOCK_AS33891</name>
<members>64512:33891</members>
@@ -16159,6 +16328,86 @@
<name>TE_PREPEND_AS32590_x6_PREPEND_4byte</name>
<members>origin:32590L:64806</members>
</community>
+ <community>
+ <name>TE_PREPEND_AS32934_DE-CIX-MAD_2byte</name>
+ <members>64889:32934</members>
+ </community>
+ <community>
+ <name>TE_PREPEND_AS32934_DE-CIX-MAD_4byte</name>
+ <members>origin:32934L:64889</members>
+ </community>
+ <community>
+ <name>TE_PREPEND_AS32934_x1_2byte</name>
+ <members>TE_PREPEND_AS32934_x1_PREPEND_2byte</members>
+ <members>TE_PREPEND_AS32934_DE-CIX-MAD_2byte</members>
+ </community>
+ <community>
+ <name>TE_PREPEND_AS32934_x1_4byte</name>
+ <members>TE_PREPEND_AS32934_x1_PREPEND_4byte</members>
+ <members>TE_PREPEND_AS32934_DE-CIX-MAD_4byte</members>
+ </community>
+ <community>
+ <name>TE_PREPEND_AS32934_x1_PREPEND_2byte</name>
+ <members>64801:32934</members>
+ </community>
+ <community>
+ <name>TE_PREPEND_AS32934_x1_PREPEND_4byte</name>
+ <members>origin:32934L:64801</members>
+ </community>
+ <community>
+ <name>TE_PREPEND_AS32934_x2_2byte</name>
+ <members>TE_PREPEND_AS32934_x2_PREPEND_2byte</members>
+ <members>TE_PREPEND_AS32934_DE-CIX-MAD_2byte</members>
+ </community>
+ <community>
+ <name>TE_PREPEND_AS32934_x2_4byte</name>
+ <members>TE_PREPEND_AS32934_x2_PREPEND_4byte</members>
+ <members>TE_PREPEND_AS32934_DE-CIX-MAD_4byte</members>
+ </community>
+ <community>
+ <name>TE_PREPEND_AS32934_x2_PREPEND_2byte</name>
+ <members>64802:32934</members>
+ </community>
+ <community>
+ <name>TE_PREPEND_AS32934_x2_PREPEND_4byte</name>
+ <members>origin:32934L:64802</members>
+ </community>
+ <community>
+ <name>TE_PREPEND_AS32934_x3_2byte</name>
+ <members>TE_PREPEND_AS32934_x3_PREPEND_2byte</members>
+ <members>TE_PREPEND_AS32934_DE-CIX-MAD_2byte</members>
+ </community>
+ <community>
+ <name>TE_PREPEND_AS32934_x3_4byte</name>
+ <members>TE_PREPEND_AS32934_x3_PREPEND_4byte</members>
+ <members>TE_PREPEND_AS32934_DE-CIX-MAD_4byte</members>
+ </community>
+ <community>
+ <name>TE_PREPEND_AS32934_x3_PREPEND_2byte</name>
+ <members>64803:32934</members>
+ </community>
+ <community>
+ <name>TE_PREPEND_AS32934_x3_PREPEND_4byte</name>
+ <members>origin:32934L:64803</members>
+ </community>
+ <community>
+ <name>TE_PREPEND_AS32934_x6_2byte</name>
+ <members>TE_PREPEND_AS32934_x6_PREPEND_2byte</members>
+ <members>TE_PREPEND_AS32934_DE-CIX-MAD_2byte</members>
+ </community>
+ <community>
+ <name>TE_PREPEND_AS32934_x6_4byte</name>
+ <members>TE_PREPEND_AS32934_x6_PREPEND_4byte</members>
+ <members>TE_PREPEND_AS32934_DE-CIX-MAD_4byte</members>
+ </community>
+ <community>
+ <name>TE_PREPEND_AS32934_x6_PREPEND_2byte</name>
+ <members>64806:32934</members>
+ </community>
+ <community>
+ <name>TE_PREPEND_AS32934_x6_PREPEND_4byte</name>
+ <members>origin:32934L:64806</members>
+ </community>
<community>
<name>TE_PREPEND_AS33891_DE-CIX-MAD_2byte</name>
<members>64889:33891</members>
@@ -16850,13 +17099,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -16872,14 +17114,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp>
<name>backbone-classifier</name>
@@ -16891,251 +17125,42 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
</loss-priority>
+ </forwarding-class>
+ <forwarding-class>
+ <name>network-control</name>
<loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
+ <name>low</name>
+ <code-points>nc2</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
- <name>less-than-best-effort</name>
+ <name>expedited-forwarding</name>
<loss-priority>
<name>low</name>
- <code-points>cs1</code-points>
+ <code-points>ef</code-points>
</loss-priority>
</forwarding-class>
+ </dscp>
+ <dscp-ipv6>
+ <name>backbone-classifier</name>
+ <import>default</import>
<forwarding-class>
- <name>network-control</name>
+ <name>be</name>
<loss-priority>
<name>low</name>
- <code-points>nc2</code-points>
+ <code-points>af11</code-points>
+ <code-points>af12</code-points>
+ <code-points>af13</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
- <name>be-ix</name>
+ <name>network-control</name>
<loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>iperf-classifier</name>
- <import>default</import>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>af12</code-points>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp-ipv6>
- <name>backbone-classifier</name>
- <import>default</import>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>low</name>
- <code-points>af11</code-points>
- <code-points>af12</code-points>
- <code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
+ <name>low</name>
+ <code-points>nc2</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -17158,13 +17183,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -17180,187 +17198,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>iperf-classifier</name>
- <import>default</import>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>af12</code-points>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-access-classifier</name>
@@ -17369,16 +17206,16 @@
<name>be</name>
<loss-priority>
<name>low</name>
- <code-points>000</code-points>
- <code-points>001</code-points>
- <code-points>010</code-points>
- <code-points>011</code-points>
- <code-points>110</code-points>
- <code-points>111</code-points>
+ <code-points>100</code-points>
+ <code-points>101</code-points>
</loss-priority>
</forwarding-class>
+ </exp>
+ <exp>
+ <name>mpls-backbone-classifier</name>
+ <import>default</import>
<forwarding-class>
- <name>less-than-best-effort</name>
+ <name>be</name>
<loss-priority>
<name>low</name>
<code-points>100</code-points>
@@ -17386,40 +17223,7 @@
</loss-priority>
</forwarding-class>
</exp>
- <exp>
- <name>mpls-backbone-classifier</name>
- <import>default</import>
- </exp>
</classifiers>
- <code-point-aliases>
- <dscp>
- <name>ix</name>
- <bits>101001</bits>
- </dscp>
- <dscp>
- <name>dws</name>
- <bits>100000</bits>
- </dscp>
- <dscp-ipv6>
- <name>dws</name>
- <bits>100000</bits>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix</name>
- <bits>101001</bits>
- </dscp-ipv6>
- </code-point-aliases>
- <drop-profiles>
- <name>dws-drop-profile</name>
- <fill-level>
- <name>35</name>
- <drop-probability>10</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<drop-profiles>
<name>be-drop-profile</name>
<fill-level>
@@ -17439,75 +17243,40 @@
<drop-probability>100</drop-probability>
</fill-level>
</drop-profiles>
- <drop-profiles>
- <name>less-than-be-drop-profile</name>
- <fill-level>
- <name>25</name>
- <drop-probability>30</drop-probability>
- </fill-level>
- <fill-level>
- <name>30</name>
- <drop-probability>50</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>70</drop-probability>
- </fill-level>
- <fill-level>
- <name>50</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<forwarding-classes>
<class>
<name>be</name>
<queue-num>0</queue-num>
</class>
- <class>
- <name>be-ix</name>
- <queue-num>0</queue-num>
- </class>
<class>
<name>expedited-forwarding</name>
<queue-num>1</queue-num>
</class>
- <class>
- <name>less-than-best-effort</name>
- <queue-num>2</queue-num>
- </class>
<class>
<name>network-control</name>
<queue-num>3</queue-num>
</class>
- <class>
- <name>be-dws</name>
- <queue-num>0</queue-num>
- </class>
- <class>
- <name>be-bleach</name>
- <queue-num>0</queue-num>
- </class>
</forwarding-classes>
<interfaces>
+ <interface>
+ <name>et-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>ge-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>so-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>xe-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
<interface>
<name>ge-0/3/8</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
- <unit>
- <name>0</name>
- <classifiers>
- <dscp>
- <name>iperf-classifier</name>
- </dscp>
- <dscp-ipv6>
- <name>iperf-classifier</name>
- </dscp-ipv6>
- </classifiers>
- <rewrite-rules>
- <dscp>
- <name>basic-rewrite-rules</name>
- </dscp>
- </rewrite-rules>
- </unit>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>10</name>
<classifiers>
@@ -17572,22 +17341,6 @@
</dscp>
</rewrite-rules>
</unit>
- <unit>
- <name>71</name>
- <classifiers>
- <dscp>
- <name>iperf-classifier</name>
- </dscp>
- <dscp-ipv6>
- <name>iperf-classifier</name>
- </dscp-ipv6>
- </classifiers>
- <rewrite-rules>
- <dscp>
- <name>basic-rewrite-rules</name>
- </dscp>
- </rewrite-rules>
- </unit>
<unit>
<name>95</name>
<classifiers>
@@ -17621,9 +17374,13 @@
</rewrite-rules>
</unit>
</interface>
+ <interface>
+ <name>ae*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
<interface>
<name>ae0</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -17641,17 +17398,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -17661,7 +17410,7 @@
</interface>
<interface>
<name>ae1</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -17679,17 +17428,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -17699,7 +17440,7 @@
</interface>
<interface>
<name>ae2</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -17717,17 +17458,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -17737,7 +17470,7 @@
</interface>
<interface>
<name>ae3</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -17758,179 +17491,45 @@
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
- </exp>
- </rewrite-rules>
- </unit>
- </interface>
- <interface>
- <name>ae13</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
- <unit>
- <name>0</name>
- <classifiers>
- <dscp>
- <name>access-classifier</name>
- </dscp>
- <dscp-ipv6>
- <name>access-classifier</name>
- </dscp-ipv6>
- </classifiers>
- <rewrite-rules>
- <dscp>
- <name>basic-rewrite-rules</name>
- </dscp>
- </rewrite-rules>
- </unit>
- <unit>
- <name>333</name>
- <classifiers>
- <dscp>
- <name>access-classifier</name>
- </dscp>
- <dscp-ipv6>
- <name>access-classifier</name>
- </dscp-ipv6>
- </classifiers>
- </unit>
- </interface>
- </interfaces>
- <rewrite-rules>
- <dscp>
- <name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp-ipv6>
+ </exp>
+ </rewrite-rules>
+ </unit>
+ </interface>
+ <interface>
+ <name>ae13</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ <unit>
+ <name>0</name>
+ <classifiers>
+ <dscp>
+ <name>access-classifier</name>
+ </dscp>
+ <dscp-ipv6>
+ <name>access-classifier</name>
+ </dscp-ipv6>
+ </classifiers>
+ <rewrite-rules>
+ <dscp>
+ <name>basic-rewrite-rules</name>
+ </dscp>
+ </rewrite-rules>
+ </unit>
+ <unit>
+ <name>333</name>
+ <classifiers>
+ <dscp>
+ <name>access-classifier</name>
+ </dscp>
+ <dscp-ipv6>
+ <name>access-classifier</name>
+ </dscp-ipv6>
+ </classifiers>
+ </unit>
+ </interface>
+ </interfaces>
+ <rewrite-rules>
+ <dscp>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -17945,17 +17544,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -17967,30 +17555,9 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
+ </dscp>
<dscp-ipv6>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
+ <name>basic-rewrite-rules</name>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -18005,17 +17572,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -18027,13 +17583,6 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
@@ -18041,35 +17590,19 @@
</exp>
</rewrite-rules>
<scheduler-maps>
- <name>MAP-BASIC-IQ2</name>
+ <name>GEANT-BASIC</name>
<forwarding-class>
<name>expedited-forwarding</name>
<scheduler>sch-expedited-forwarding</scheduler>
</forwarding-class>
<forwarding-class>
<name>network-control</name>
- <scheduler>sch-network-ctrl-iq2</scheduler>
+ <scheduler>sch-network-ctrl-geant</scheduler>
</forwarding-class>
<forwarding-class>
<name>be</name>
<scheduler>sch-be</scheduler>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <scheduler>sch-less-than-best-effort</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
</scheduler-maps>
<schedulers>
<name>sch-be</name>
@@ -18089,27 +17622,7 @@
<priority>strict-high</priority>
</schedulers>
<schedulers>
- <name>sch-less-than-best-effort</name>
- <transmit-rate>
- <percent>10</percent>
- </transmit-rate>
- <buffer-size>
- <percent>10</percent>
- </buffer-size>
- <priority>low</priority>
- <drop-profile-map>
- <loss-priority>low</loss-priority>
- <protocol>any</protocol>
- <drop-profile>less-than-be-drop-profile</drop-profile>
- </drop-profile-map>
- <drop-profile-map>
- <loss-priority>high</loss-priority>
- <protocol>any</protocol>
- <drop-profile>be-drop-profile</drop-profile>
- </drop-profile-map>
- </schedulers>
- <schedulers>
- <name>sch-network-ctrl</name>
+ <name>sch-network-ctrl-geant</name>
<transmit-rate>
<percent>5</percent>
</transmit-rate>
@@ -18118,15 +17631,6 @@
</buffer-size>
<priority>high</priority>
</schedulers>
- <schedulers>
- <name>sch-network-ctrl-iq2</name>
- <transmit-rate>
- <percent>5</percent>
- </transmit-rate>
- <buffer-size>
- <percent>5</percent>
- </buffer-size>
- </schedulers>
</class-of-service>
<firewall>
<family>
@@ -21705,6 +21209,9 @@
<source-prefix-list>
<name>dashboard-servers</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers</name>
+ </source-prefix-list>
<protocol>tcp</protocol>
<destination-port>ssh</destination-port>
</from>
@@ -22511,6 +22018,12 @@
<source-address>
<name>185.1.68.133/32</name>
</source-address>
+ <source-address>
+ <name>185.1.68.30/32</name>
+ </source-address>
+ <source-address>
+ <name>185.1.68.31/32</name>
+ </source-address>
<destination-address>
<name>185.1.68.126/32</name>
</destination-address>
@@ -23778,6 +23291,9 @@
<source-prefix-list>
<name>dashboard-servers-v6</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers-v6</name>
+ </source-prefix-list>
<next-header>tcp</next-header>
<port>ssh</port>
</from>
@@ -24649,6 +24165,12 @@
<source-address>
<name>2001:7f8:a0::8463:0:1/128</name>
</source-address>
+ <source-address>
+ <name>2001:7f8:a0::80a6:0:1/128</name>
+ </source-address>
+ <source-address>
+ <name>2001:7f8:a0::80a6:0:2/128</name>
+ </source-address>
<destination-address>
<name>2001:7f8:a0::51e5:0:1/128</name>
</destination-address>
@@ -25282,7 +24804,7 @@
<prefix-limit>
<maximum>150000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -25311,7 +24833,7 @@
<prefix-limit>
<maximum>7500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -25348,7 +24870,7 @@
<prefix-limit>
<maximum>9000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -25386,7 +24908,7 @@
<prefix-limit>
<maximum>6000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -25423,7 +24945,7 @@
<prefix-limit>
<maximum>225</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -25459,7 +24981,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -25495,7 +25017,7 @@
<prefix-limit>
<maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -25531,7 +25053,7 @@
<prefix-limit>
<maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -25567,7 +25089,7 @@
<prefix-limit>
<maximum>247500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -25605,7 +25127,7 @@
<prefix-limit>
<maximum>6000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -25642,7 +25164,7 @@
<prefix-limit>
<maximum>2250</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -25678,7 +25200,7 @@
<prefix-limit>
<maximum>375</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -25714,7 +25236,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -25750,7 +25272,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -25786,7 +25308,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -25824,7 +25346,7 @@
<prefix-limit>
<maximum>300</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -25861,7 +25383,7 @@
<prefix-limit>
<maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -25897,7 +25419,7 @@
<prefix-limit>
<maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -25933,7 +25455,7 @@
<prefix-limit>
<maximum>7500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -25969,7 +25491,7 @@
<prefix-limit>
<maximum>1200</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -26005,7 +25527,7 @@
<prefix-limit>
<maximum>12000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -26026,6 +25548,84 @@
<no-prepend-global-as/>
</local-as>
</neighbor>
+ <neighbor>
+ <name>185.1.68.30</name>
+ <description>Facebook AS32934</description>
+ <passive/>
+ <import>ps-deny-all</import>
+ <import>ps-AS-SELF-REJECT</import>
+ <import>ps-BOGONS</import>
+ <import>ps-PRIVATE-AS-BLOCK</import>
+ <import>IAS_PS-FROM-PUBLIC-PEERS_DE-CIX-MAD_HEAD</import>
+ <import>IAS_PS-FROM-PUBLIC-PEER_AS32934_Facebook</import>
+ <import>IAS_PS-FROM-PUBLIC-PEERS_DE-CIX-MAD_TAIL</import>
+ <family>
+ <inet>
+ <any>
+ <prefix-limit>
+ <maximum>150</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
+ </prefix-limit>
+ </any>
+ </inet>
+ </family>
+ <export>ps-deny-all</export>
+ <export>ps-BOGONS</export>
+ <export>ps-PRIVATE-AS-BLOCK</export>
+ <export>IAS_PS-TO-PUBLIC-PEERS_DE-CIX-MAD_HEAD</export>
+ <export>IAS_PS-TO-PUBLIC-PEER_AS32934_Facebook</export>
+ <export>IAS_PS-TO-PUBLIC-PEERS_DE-CIX-MAD_TAIL</export>
+ <peer-as>32934</peer-as>
+ <local-as>
+ <as-number>21320</as-number>
+ <private/>
+ <no-prepend-global-as/>
+ </local-as>
+ </neighbor>
+ <neighbor>
+ <name>185.1.68.31</name>
+ <description>Facebook AS32934</description>
+ <passive/>
+ <import>ps-deny-all</import>
+ <import>ps-AS-SELF-REJECT</import>
+ <import>ps-BOGONS</import>
+ <import>ps-PRIVATE-AS-BLOCK</import>
+ <import>IAS_PS-FROM-PUBLIC-PEERS_DE-CIX-MAD_HEAD</import>
+ <import>IAS_PS-FROM-PUBLIC-PEER_AS32934_Facebook</import>
+ <import>IAS_PS-FROM-PUBLIC-PEERS_DE-CIX-MAD_TAIL</import>
+ <family>
+ <inet>
+ <any>
+ <prefix-limit>
+ <maximum>150</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
+ </prefix-limit>
+ </any>
+ </inet>
+ </family>
+ <export>ps-deny-all</export>
+ <export>ps-BOGONS</export>
+ <export>ps-PRIVATE-AS-BLOCK</export>
+ <export>IAS_PS-TO-PUBLIC-PEERS_DE-CIX-MAD_HEAD</export>
+ <export>IAS_PS-TO-PUBLIC-PEER_AS32934_Facebook</export>
+ <export>IAS_PS-TO-PUBLIC-PEERS_DE-CIX-MAD_TAIL</export>
+ <peer-as>32934</peer-as>
+ <local-as>
+ <as-number>21320</as-number>
+ <private/>
+ <no-prepend-global-as/>
+ </local-as>
+ </neighbor>
</group>
<group>
<name>GEANT-IXv6-DE-CIX-MAD</name>
@@ -26038,7 +25638,7 @@
<prefix-limit>
<maximum>150000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -26065,7 +25665,7 @@
<prefix-limit>
<maximum>7500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -26102,7 +25702,7 @@
<prefix-limit>
<maximum>9000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -26140,7 +25740,7 @@
<prefix-limit>
<maximum>6000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -26177,7 +25777,7 @@
<prefix-limit>
<maximum>225</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -26213,7 +25813,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -26249,7 +25849,7 @@
<prefix-limit>
<maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -26285,7 +25885,7 @@
<prefix-limit>
<maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -26321,7 +25921,7 @@
<prefix-limit>
<maximum>247500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -26359,7 +25959,7 @@
<prefix-limit>
<maximum>6000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -26396,7 +25996,7 @@
<prefix-limit>
<maximum>2250</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -26432,7 +26032,7 @@
<prefix-limit>
<maximum>375</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -26468,7 +26068,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -26504,7 +26104,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -26540,7 +26140,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -26578,7 +26178,7 @@
<prefix-limit>
<maximum>300</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -26615,7 +26215,7 @@
<prefix-limit>
<maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -26651,7 +26251,7 @@
<prefix-limit>
<maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -26687,7 +26287,7 @@
<prefix-limit>
<maximum>7500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -26723,7 +26323,7 @@
<prefix-limit>
<maximum>1200</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -26759,7 +26359,7 @@
<prefix-limit>
<maximum>12000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -26780,6 +26380,84 @@
<no-prepend-global-as/>
</local-as>
</neighbor>
+ <neighbor>
+ <name>2001:7f8:a0::80a6:0:1</name>
+ <description>Facebook AS32934</description>
+ <passive/>
+ <import>ps-deny-all</import>
+ <import>ps-AS-SELF-REJECT</import>
+ <import>ps-BOGONS-V6</import>
+ <import>ps-PRIVATE-AS-BLOCK</import>
+ <import>IAS_PS-FROM-PUBLIC-PEERS_DE-CIX-MAD_HEAD</import>
+ <import>IAS_PS-FROM-PUBLIC-PEER_AS32934_Facebook</import>
+ <import>IAS_PS-FROM-PUBLIC-PEERS_DE-CIX-MAD_TAIL</import>
+ <family>
+ <inet6>
+ <any>
+ <prefix-limit>
+ <maximum>150</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
+ </prefix-limit>
+ </any>
+ </inet6>
+ </family>
+ <export>ps-deny-all</export>
+ <export>ps-BOGONS-V6</export>
+ <export>ps-PRIVATE-AS-BLOCK</export>
+ <export>IAS_PS-TO-PUBLIC-PEERS_DE-CIX-MAD_HEAD</export>
+ <export>IAS_PS-TO-PUBLIC-PEER_AS32934_Facebook</export>
+ <export>IAS_PS-TO-PUBLIC-PEERS_DE-CIX-MAD_TAIL</export>
+ <peer-as>32934</peer-as>
+ <local-as>
+ <as-number>21320</as-number>
+ <private/>
+ <no-prepend-global-as/>
+ </local-as>
+ </neighbor>
+ <neighbor>
+ <name>2001:7f8:a0::80a6:0:2</name>
+ <description>Facebook AS32934</description>
+ <passive/>
+ <import>ps-deny-all</import>
+ <import>ps-AS-SELF-REJECT</import>
+ <import>ps-BOGONS-V6</import>
+ <import>ps-PRIVATE-AS-BLOCK</import>
+ <import>IAS_PS-FROM-PUBLIC-PEERS_DE-CIX-MAD_HEAD</import>
+ <import>IAS_PS-FROM-PUBLIC-PEER_AS32934_Facebook</import>
+ <import>IAS_PS-FROM-PUBLIC-PEERS_DE-CIX-MAD_TAIL</import>
+ <family>
+ <inet6>
+ <any>
+ <prefix-limit>
+ <maximum>150</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
+ </prefix-limit>
+ </any>
+ </inet6>
+ </family>
+ <export>ps-deny-all</export>
+ <export>ps-BOGONS-V6</export>
+ <export>ps-PRIVATE-AS-BLOCK</export>
+ <export>IAS_PS-TO-PUBLIC-PEERS_DE-CIX-MAD_HEAD</export>
+ <export>IAS_PS-TO-PUBLIC-PEER_AS32934_Facebook</export>
+ <export>IAS_PS-TO-PUBLIC-PEERS_DE-CIX-MAD_TAIL</export>
+ <peer-as>32934</peer-as>
+ <local-as>
+ <as-number>21320</as-number>
+ <private/>
+ <no-prepend-global-as/>
+ </local-as>
+ </neighbor>
</group>
</bgp>
</protocols>
diff --git a/test/data/mx1.mar.fr.geant.net-netconf.xml b/test/data/mx1.mar.fr.geant.net-netconf.xml
index e8c9460e9ca652c114db0c9b4663d1e9cfe34e74..49a216c5f9eb95ef063de702d7b52903d003de80 100644
--- a/test/data/mx1.mar.fr.geant.net-netconf.xml
+++ b/test/data/mx1.mar.fr.geant.net-netconf.xml
@@ -1,4 +1,4 @@
-<configuration changed-seconds="1545215740" changed-localtime="2018-12-19 10:35:40 UTC">
+<configuration changed-seconds="1549111350" changed-localtime="2019-02-02 12:42:30 UTC">
<version>15.1F6-S10.9</version>
<groups>
<name>re0</name>
@@ -250,6 +250,38 @@
<allow-commands>show .*</allow-commands>
<deny-commands>(ssh .*|telnet .*)</deny-commands>
</class>
+ <class>
+ <name>opennsa</name>
+ <idle-timeout>5</idle-timeout>
+ <permissions>configure</permissions>
+ <deny-commands>(file.*)|(load.*)|(op.*)|(request.*)|(save.*)|(start.*)|(test.*)|(set cli.*)|(set date.*)|(clear.*)|(help.*)|(telnet.*)|(ssh.*)|(traceroute.*)|(mtrace.*)|(monitor.*)|(ping.*)|(show.*)|(set.*)</deny-commands>
+ <allow-configuration-regexps>interfaces .*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections remote-interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols mpls label-switched-path.*</allow-configuration-regexps>
+ <deny-configuration-regexps>vmhost .*</deny-configuration-regexps>
+ <deny-configuration-regexps>session-limit-group .*</deny-configuration-regexps>
+ <deny-configuration-regexps>multi-chassis .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc-partition .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc .*</deny-configuration-regexps>
+ <deny-configuration-regexps>groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>dynamic-profiles .*</deny-configuration-regexps>
+ <deny-configuration-regexps>diameter .*</deny-configuration-regexps>
+ <deny-configuration-regexps>apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>access-profile .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces traceoptions .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-set .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-range .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups-except .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lt-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces ms-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces si-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces gr-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lo.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces dsc.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces irb.*</deny-configuration-regexps>
+ </class>
<class>
<name>readonly-permissions</name>
<idle-timeout>15</idle-timeout>
@@ -566,6 +598,22 @@
<encrypted-password>/* SECRET-DATA */</encrypted-password>
</authentication>
</user>
+ <user>
+ <name>opennsa</name>
+ <uid>2006</uid>
+ <class>opennsa</class>
+ <authentication>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ </authentication>
+ </user>
<user>
<name>opnet</name>
<full-name>OPNET NEOP Planning system @ 62.40.105.114</full-name>
@@ -3395,6 +3443,41 @@
</inet6>
</family>
</unit>
+ <unit>
+ <name>403</name>
+ <description>mar_ams_BoD_urn_uuid_b97aa49a_fec5_482_371705323</description>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-tags>
+ <outer>403</outer>
+ </vlan-tags>
+ <input-vlan-map>
+ <swap/>
+ <vlan-id>3755</vlan-id>
+ </input-vlan-map>
+ <family>
+ <ccc>
+ <filter>
+ <input>filter_in_ae15_403</input>
+ </filter>
+ </ccc>
+ </family>
+ </unit>
+ <unit>
+ <name>404</name>
+ <description>mar_lon_BoD_urn_uuid_8d0f472e_be78_452_1050134863</description>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-tags>
+ <outer>404</outer>
+ </vlan-tags>
+ <input-vlan-map>
+ <swap/>
+ <vlan-id>3760</vlan-id>
+ </input-vlan-map>
+ <family>
+ <ccc>
+ </ccc>
+ </family>
+ </unit>
<unit>
<name>667</name>
<description>SRV_CLS CUSTOMER REDIRIS AP1 SRF9939011 | ASN766 |</description>
@@ -3428,93 +3511,6 @@
</inet6>
</family>
</unit>
- <unit>
- <name>687</name>
- <description>SRV_L2CIRCUIT CUSTOMER REDIRIS BELNET SRF9915017 | bru-mar_iMinds-RedIRIS_I2CAT_15017_687</description>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>687</vlan-id>
- <input-vlan-map>
- <swap/>
- <vlan-id>1275</vlan-id>
- </input-vlan-map>
- <family>
- <ccc>
- </ccc>
- </family>
- </unit>
- <unit>
- <name>688</name>
- <description>SRV_L2CIRCUIT CUSTOMER REDIRIS BELNET SRF9915017 | bru-mar_iMinds-RedIRIS_I2CAT_15017_688</description>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>688</vlan-id>
- <input-vlan-map>
- <swap/>
- <vlan-id>1276</vlan-id>
- </input-vlan-map>
- <family>
- <ccc>
- </ccc>
- </family>
- </unit>
- <unit>
- <name>689</name>
- <description>SRV_L2CIRCUIT CUSTOMER REDIRIS REDCLARA SRF9912201 | mar-par_I2CAT_RedIRIS-RedCLARA_12201</description>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>689</vlan-id>
- <family>
- <ccc>
- <mtu>9000</mtu>
- </ccc>
- </family>
- </unit>
- <unit>
- <name>690</name>
- <description>SRV_L2CIRCUIT CUSTOMER REDIRIS BELNET SRF9915017 | bru-mar_iMinds-RedIRIS_I2CAT_15017_690</description>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>690</vlan-id>
- <input-vlan-map>
- <swap/>
- <vlan-id>1277</vlan-id>
- </input-vlan-map>
- <family>
- <ccc>
- </ccc>
- </family>
- </unit>
- <unit>
- <name>691</name>
- <description>SRV_L2CIRCUIT CUSTOMER REDIRIS GRNET SRF0000001 | ath-mar_I2CAT_GRnet-RedIRIS</description>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>691</vlan-id>
- </unit>
- <unit>
- <name>693</name>
- <description>SRV_L2CIRCUIT CUSTOMER REDIRIS BELNET SRF9915017 | bru-mar_iMinds-RedIRIS_I2CAT_15017_693</description>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>693</vlan-id>
- <input-vlan-map>
- <swap/>
- <vlan-id>1278</vlan-id>
- </input-vlan-map>
- <family>
- <ccc>
- </ccc>
- </family>
- </unit>
- <unit>
- <name>694</name>
- <description>SRV_L2CIRCUIT CUSTOMER REDIRIS BELNET SRF9915017 | bru-mar_iMinds-RedIRIS_I2CAT_15017_694</description>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>694</vlan-id>
- <input-vlan-map>
- <swap/>
- <vlan-id>1279</vlan-id>
- </input-vlan-map>
- <family>
- <ccc>
- </ccc>
- </family>
- </unit>
<unit>
<name>902</name>
<disable/>
@@ -3912,6 +3908,9 @@
<clients>
<name>83.97.93.196/32</name>
</clients>
+ <clients>
+ <name>83.97.93.238/32</name>
+ </clients>
</community>
<community>
<name>As4n0gN!</name>
@@ -4382,13 +4381,13 @@
<import-rib>IAS.inet6.0</import-rib>
<import-policy>rtbh-policy</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias</name>
<import-rib>IAS.inet.0</import-rib>
<import-rib>CLEAN_IAS.inet.0</import-rib>
<import-policy>ps-into-clean-ias-import</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias-v6</name>
<import-rib>IAS.inet6.0</import-rib>
<import-rib>CLEAN_IAS.inet6.0</import-rib>
@@ -5282,36 +5281,6 @@
<virtual-circuit-id>14010</virtual-circuit-id>
<ignore-mtu-mismatch/>
</interface>
- <interface>
- <name>ae15.693</name>
- <virtual-circuit-id>150174</virtual-circuit-id>
- <no-control-word/>
- <ignore-mtu-mismatch/>
- </interface>
- <interface>
- <name>ae15.694</name>
- <virtual-circuit-id>150175</virtual-circuit-id>
- <no-control-word/>
- <ignore-mtu-mismatch/>
- </interface>
- <interface>
- <name>ae15.687</name>
- <virtual-circuit-id>150171</virtual-circuit-id>
- <no-control-word/>
- <ignore-mtu-mismatch/>
- </interface>
- <interface>
- <name>ae15.688</name>
- <virtual-circuit-id>150172</virtual-circuit-id>
- <no-control-word/>
- <ignore-mtu-mismatch/>
- </interface>
- <interface>
- <name>ae15.690</name>
- <virtual-circuit-id>150173</virtual-circuit-id>
- <no-control-word/>
- <ignore-mtu-mismatch/>
- </interface>
<interface>
<name>ae15.189</name>
<virtual-circuit-id>14013</virtual-circuit-id>
@@ -5369,6 +5338,12 @@
<no-control-word/>
<mtu>9192</mtu>
</interface>
+ <interface>
+ <name>ae15.404</name>
+ <virtual-circuit-id>1572883</virtual-circuit-id>
+ <no-control-word/>
+ <mtu>9192</mtu>
+ </interface>
</neighbor>
<neighbor>
<name>62.40.97.13</name>
@@ -5378,12 +5353,6 @@
<no-control-word/>
<ignore-mtu-mismatch/>
</interface>
- <interface>
- <name>ae15.689</name>
- <virtual-circuit-id>12201</virtual-circuit-id>
- <description>lon-mar_I2CAT_RedIRIS-RedCLARA_12201</description>
- <ignore-mtu-mismatch/>
- </interface>
</neighbor>
<neighbor>
<name>62.40.97.11</name>
@@ -5400,6 +5369,12 @@
<no-control-word/>
<mtu>9192</mtu>
</interface>
+ <interface>
+ <name>ae15.403</name>
+ <virtual-circuit-id>1572882</virtual-circuit-id>
+ <no-control-word/>
+ <mtu>9192</mtu>
+ </interface>
</neighbor>
<neighbor>
<name>62.40.97.14</name>
@@ -5412,12 +5387,6 @@
</neighbor>
<neighbor>
<name>62.40.96.11</name>
- <interface>
- <name>ae15.691</name>
- <virtual-circuit-id>691</virtual-circuit-id>
- <description>ath-mar_I2CAT_GRnet-RedIRIS_12207</description>
- <ignore-mtu-mismatch/>
- </interface>
</neighbor>
</l2circuit>
<neighbor-discovery>
@@ -8322,15 +8291,13 @@
</prefix-list>
<prefix-list>
<name>geantncc-address-space</name>
+ <comment>/* NCC DR VPN */</comment>
<prefix-list-item>
- <name>62.40.108.192/26</name>
+ <name>62.40.108.192/27</name>
</prefix-list-item>
<prefix-list-item>
<name>62.40.119.0/24</name>
</prefix-list-item>
- <prefix-list-item>
- <name>62.40.119.134/32</name>
- </prefix-list-item>
<prefix-list-item>
<name>62.40.125.250/32</name>
</prefix-list-item>
@@ -10253,6 +10220,14 @@
</prefix-list>
<prefix-list>
<name>corporate-address-space</name>
+ <comment>/* LON2 CORP VPN (MAC) */</comment>
+ <prefix-list-item>
+ <name>62.40.99.194/32</name>
+ </prefix-list-item>
+ <comment>/* LON2 CORP VPN */</comment>
+ <prefix-list-item>
+ <name>62.40.99.201/32</name>
+ </prefix-list-item>
<prefix-list-item>
<name>62.40.119.128/25</name>
</prefix-list-item>
@@ -10447,6 +10422,18 @@
<name>2001:798:3::/64</name>
</prefix-list-item>
</prefix-list>
+ <prefix-list>
+ <name>opennsa-servers</name>
+ <prefix-list-item>
+ <name>83.97.93.92/32</name>
+ </prefix-list-item>
+ </prefix-list>
+ <prefix-list>
+ <name>opennsa-servers-v6</name>
+ <prefix-list-item>
+ <name>2001:798:3::15f/128</name>
+ </prefix-list-item>
+ </prefix-list>
<policy-statement>
<name>ASM-Allow</name>
<term>
@@ -11386,6 +11373,10 @@
<address>185.1.68.0/24</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>193.188.137.0/24</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -11507,6 +11498,10 @@
<address>2001:7f8:a0::/64</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>2001:7f8:35::/64</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -14036,13 +14031,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -14058,14 +14046,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp>
<name>backbone-classifier</name>
@@ -14077,18 +14057,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -14096,195 +14064,16 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>iperf-classifier</name>
- <import>default</import>
<forwarding-class>
<name>expedited-forwarding</name>
<loss-priority>
<name>low</name>
- <code-points>af12</code-points>
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>backbone-classifier</name>
@@ -14296,18 +14085,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -14315,13 +14092,7 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -14344,13 +14115,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -14366,205 +14130,24 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
- <dscp-ipv6>
- <name>iperf-classifier</name>
+ <exp>
+ <name>mpls-access-classifier</name>
<import>default</import>
<forwarding-class>
- <name>expedited-forwarding</name>
+ <name>be</name>
<loss-priority>
<name>low</name>
- <code-points>af12</code-points>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
+ <code-points>100</code-points>
+ <code-points>101</code-points>
</loss-priority>
</forwarding-class>
- </dscp-ipv6>
+ </exp>
<exp>
- <name>mpls-access-classifier</name>
+ <name>mpls-backbone-classifier</name>
<import>default</import>
<forwarding-class>
<name>be</name>
- <loss-priority>
- <name>low</name>
- <code-points>000</code-points>
- <code-points>001</code-points>
- <code-points>010</code-points>
- <code-points>011</code-points>
- <code-points>110</code-points>
- <code-points>111</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
<loss-priority>
<name>low</name>
<code-points>100</code-points>
@@ -14572,40 +14155,7 @@
</loss-priority>
</forwarding-class>
</exp>
- <exp>
- <name>mpls-backbone-classifier</name>
- <import>default</import>
- </exp>
</classifiers>
- <code-point-aliases>
- <dscp>
- <name>ix</name>
- <bits>101001</bits>
- </dscp>
- <dscp>
- <name>dws</name>
- <bits>100000</bits>
- </dscp>
- <dscp-ipv6>
- <name>dws</name>
- <bits>100000</bits>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix</name>
- <bits>101001</bits>
- </dscp-ipv6>
- </code-point-aliases>
- <drop-profiles>
- <name>dws-drop-profile</name>
- <fill-level>
- <name>35</name>
- <drop-probability>10</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<drop-profiles>
<name>be-drop-profile</name>
<fill-level>
@@ -14625,59 +14175,40 @@
<drop-probability>100</drop-probability>
</fill-level>
</drop-profiles>
- <drop-profiles>
- <name>less-than-be-drop-profile</name>
- <fill-level>
- <name>25</name>
- <drop-probability>30</drop-probability>
- </fill-level>
- <fill-level>
- <name>30</name>
- <drop-probability>50</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>70</drop-probability>
- </fill-level>
- <fill-level>
- <name>50</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<forwarding-classes>
<class>
<name>be</name>
<queue-num>0</queue-num>
</class>
- <class>
- <name>be-ix</name>
- <queue-num>0</queue-num>
- </class>
<class>
<name>expedited-forwarding</name>
<queue-num>1</queue-num>
</class>
- <class>
- <name>less-than-best-effort</name>
- <queue-num>2</queue-num>
- </class>
<class>
<name>network-control</name>
<queue-num>3</queue-num>
</class>
- <class>
- <name>be-dws</name>
- <queue-num>0</queue-num>
- </class>
- <class>
- <name>be-bleach</name>
- <queue-num>0</queue-num>
- </class>
</forwarding-classes>
<interfaces>
- <interface inactive="inactive">
+ <interface>
+ <name>et-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>ge-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>so-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>xe-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
<name>so-2/2/0</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>100</name>
<classifiers>
@@ -14701,9 +14232,13 @@
</classifiers>
</unit>
</interface>
+ <interface>
+ <name>ae*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
<interface>
<name>ae0</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -14721,17 +14256,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -14741,7 +14268,7 @@
</interface>
<interface>
<name>ae1</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -14759,17 +14286,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -14779,7 +14298,7 @@
</interface>
<interface>
<name>ae15</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>281</name>
<classifiers>
@@ -14812,13 +14331,6 @@
<rewrite-rules>
<dscp>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -14833,17 +14345,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -14855,97 +14356,9 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -14960,17 +14373,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -14982,73 +14384,6 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
@@ -15056,35 +14391,19 @@
</exp>
</rewrite-rules>
<scheduler-maps>
- <name>MAP-BASIC-IQ2</name>
+ <name>GEANT-BASIC</name>
<forwarding-class>
<name>expedited-forwarding</name>
<scheduler>sch-expedited-forwarding</scheduler>
</forwarding-class>
<forwarding-class>
<name>network-control</name>
- <scheduler>sch-network-ctrl-iq2</scheduler>
+ <scheduler>sch-network-ctrl-geant</scheduler>
</forwarding-class>
<forwarding-class>
<name>be</name>
<scheduler>sch-be</scheduler>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <scheduler>sch-less-than-best-effort</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
</scheduler-maps>
<schedulers>
<name>sch-be</name>
@@ -15104,27 +14423,7 @@
<priority>strict-high</priority>
</schedulers>
<schedulers>
- <name>sch-less-than-best-effort</name>
- <transmit-rate>
- <percent>10</percent>
- </transmit-rate>
- <buffer-size>
- <percent>10</percent>
- </buffer-size>
- <priority>low</priority>
- <drop-profile-map>
- <loss-priority>low</loss-priority>
- <protocol>any</protocol>
- <drop-profile>less-than-be-drop-profile</drop-profile>
- </drop-profile-map>
- <drop-profile-map>
- <loss-priority>high</loss-priority>
- <protocol>any</protocol>
- <drop-profile>be-drop-profile</drop-profile>
- </drop-profile-map>
- </schedulers>
- <schedulers>
- <name>sch-network-ctrl</name>
+ <name>sch-network-ctrl-geant</name>
<transmit-rate>
<percent>5</percent>
</transmit-rate>
@@ -15133,15 +14432,6 @@
</buffer-size>
<priority>high</priority>
</schedulers>
- <schedulers>
- <name>sch-network-ctrl-iq2</name>
- <transmit-rate>
- <percent>5</percent>
- </transmit-rate>
- <buffer-size>
- <percent>5</percent>
- </buffer-size>
- </schedulers>
</class-of-service>
<firewall>
<family>
@@ -17530,6 +16820,9 @@
<source-prefix-list>
<name>dashboard-servers</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers</name>
+ </source-prefix-list>
<protocol>tcp</protocol>
<destination-port>ssh</destination-port>
</from>
@@ -21442,6 +20735,9 @@
<source-prefix-list>
<name>GEANT-lg-v6</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers-v6</name>
+ </source-prefix-list>
<payload-protocol>tcp</payload-protocol>
<destination-port>ssh</destination-port>
</from>
@@ -21692,6 +20988,17 @@
</then>
</term>
</filter>
+ <filter>
+ <name>filter_in_ae15_403</name>
+ <interface-specific/>
+ <term>
+ <name>1</name>
+ <then>
+ <policer>policer_in_ae15_403</policer>
+ <accept/>
+ </then>
+ </term>
+ </filter>
</ccc>
</family>
<policer>
@@ -21775,9 +21082,19 @@
<discard/>
</then>
</policer>
+ <policer>
+ <name>policer_in_ae15_403</name>
+ <if-exceeding>
+ <bandwidth-limit>1g</bandwidth-limit>
+ <burst-size-limit>625k</burst-size-limit>
+ </if-exceeding>
+ <then>
+ <discard/>
+ </then>
+ </policer>
</firewall>
<routing-instances>
- <instance>
+ <instance inactive="inactive">
<name>CLEAN_IAS</name>
<description>Clean IAS VRF traffic returned from scrubber</description>
<instance-type>vrf</instance-type>
@@ -22209,7 +21526,7 @@
<prefix-limit>
<maximum>150000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -22236,7 +21553,7 @@
<prefix-limit>
<maximum>247500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -22267,7 +21584,7 @@
<prefix-limit>
<maximum>3</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -22294,7 +21611,7 @@
<prefix-limit>
<maximum>3</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -22326,7 +21643,7 @@
<prefix-limit>
<maximum>7500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -22362,7 +21679,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -22398,7 +21715,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -22431,7 +21748,7 @@
<prefix-limit>
<maximum>150000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -22456,7 +21773,7 @@
<prefix-limit>
<maximum>247500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -22487,7 +21804,7 @@
<prefix-limit>
<maximum>3</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -22514,7 +21831,7 @@
<prefix-limit>
<maximum>3</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -22546,7 +21863,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -22582,7 +21899,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -22618,7 +21935,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -22717,7 +22034,10 @@
<prefix-limit>
<maximum>1000</maximum>
<teardown>
- <limit-threshold>50</limit-threshold>
+ <limit-threshold>90</limit-threshold>
+ <idle-timeout>
+ <timeout>15</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</labeled-unicast>
@@ -22739,6 +22059,9 @@
<maximum>1000</maximum>
<teardown>
<limit-threshold>90</limit-threshold>
+ <idle-timeout>
+ <timeout>15</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</labeled-unicast>
diff --git a/test/data/mx1.mil2.it.geant.net-netconf.xml b/test/data/mx1.mil2.it.geant.net-netconf.xml
index 87d30987dafae60e97eeaaec4a2544e70dff7b80..f08d4fcac14dffe3e6547312b20c185e4b9373c7 100644
--- a/test/data/mx1.mil2.it.geant.net-netconf.xml
+++ b/test/data/mx1.mil2.it.geant.net-netconf.xml
@@ -1,4 +1,4 @@
-<configuration changed-seconds="1545214013" changed-localtime="2018-12-19 10:06:53 UTC">
+<configuration changed-seconds="1549111367" changed-localtime="2019-02-02 12:42:47 UTC">
<version>15.1F6-S10.9</version>
<groups>
<name>re0</name>
@@ -266,6 +266,38 @@
<allow-commands>show .*</allow-commands>
<deny-commands>(ssh .*|telnet .*)</deny-commands>
</class>
+ <class>
+ <name>opennsa</name>
+ <idle-timeout>5</idle-timeout>
+ <permissions>configure</permissions>
+ <deny-commands>(file.*)|(load.*)|(op.*)|(request.*)|(save.*)|(start.*)|(test.*)|(set cli.*)|(set date.*)|(clear.*)|(help.*)|(telnet.*)|(ssh.*)|(traceroute.*)|(mtrace.*)|(monitor.*)|(ping.*)|(show.*)|(set.*)</deny-commands>
+ <allow-configuration-regexps>interfaces .*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections remote-interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols mpls label-switched-path.*</allow-configuration-regexps>
+ <deny-configuration-regexps>vmhost .*</deny-configuration-regexps>
+ <deny-configuration-regexps>session-limit-group .*</deny-configuration-regexps>
+ <deny-configuration-regexps>multi-chassis .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc-partition .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc .*</deny-configuration-regexps>
+ <deny-configuration-regexps>groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>dynamic-profiles .*</deny-configuration-regexps>
+ <deny-configuration-regexps>diameter .*</deny-configuration-regexps>
+ <deny-configuration-regexps>apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>access-profile .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces traceoptions .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-set .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-range .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups-except .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lt-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces ms-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces si-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces gr-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lo.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces dsc.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces irb.*</deny-configuration-regexps>
+ </class>
<class>
<name>readonly-permissions</name>
<permissions>view</permissions>
@@ -584,6 +616,22 @@
<encrypted-password>/* SECRET-DATA */</encrypted-password>
</authentication>
</user>
+ <user>
+ <name>opennsa</name>
+ <uid>2050</uid>
+ <class>opennsa</class>
+ <authentication>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ </authentication>
+ </user>
<user>
<name>opnet</name>
<full-name>OPNET NEOP Planning system @ 62.40.105.114</full-name>
@@ -2716,30 +2764,8 @@
<name>ge-0/3/8</name>
<description>PHY INFRASTRUCTURE GTS SRF0000001 | BMS Internet Access | TO GTS EX P12</description>
<flexible-vlan-tagging/>
- <mtu>9000</mtu>
+ <mtu>9192</mtu>
<encapsulation>flexible-ethernet-services</encapsulation>
- <unit>
- <name>1301</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>1301</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>1303</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>1303</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
</interface>
<interface>
<name>ge-0/3/9</name>
@@ -3270,231 +3296,6 @@
<push/>
</output-vlan-map>
</unit>
- <unit>
- <name>19</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>19</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>20</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>20</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>21</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>21</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>22</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>22</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>23</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>23</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>24</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>24</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>25</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>25</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>26</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>26</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>27</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>27</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>28</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>28</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>31</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>31</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>32</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>32</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- </interface>
- <interface>
- <name>xe-2/2/3</name>
- <apply-groups>NO_TRAPS</apply-groups>
- <description>PHY INFRASTRUCTURE GTS SRF0000001 | GTS link to Server 1</description>
- <mtu>9000</mtu>
- </interface>
- <interface>
- <name>xe-2/3/0</name>
- <description>PHY PUBLIC MIX P_AE11 SRF9938863 | MIX ID: Switch 5, port 10/12, CID20170620-01</description>
- <link-mode>full-duplex</link-mode>
- <no-gratuitous-arp-reply/>
- <no-gratuitous-arp-request/>
- <gigether-options>
- <no-auto-negotiation/>
- <ieee-802.3ad>
- <bundle>ae11</bundle>
- </ieee-802.3ad>
- </gigether-options>
- </interface>
- <interface>
- <name>xe-2/3/1</name>
- <apply-groups>NO_TRAPS</apply-groups>
- <description>PHY INFRASTRUCTURE GTS SRF0000001 | GTS link to Server 2</description>
- <flexible-vlan-tagging/>
- <mtu>9000</mtu>
- <encapsulation>flexible-ethernet-services</encapsulation>
- <unit>
- <name>11</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>11</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>12</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>12</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>13</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>13</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>14</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>14</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>15</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>15</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>16</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>16</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
<unit>
<name>17</name>
<encapsulation>vlan-ccc</encapsulation>
@@ -3572,6 +3373,198 @@
<push/>
</output-vlan-map>
</unit>
+ <unit>
+ <name>24</name>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>24</vlan-id>
+ <input-vlan-map>
+ <pop/>
+ </input-vlan-map>
+ <output-vlan-map>
+ <push/>
+ </output-vlan-map>
+ </unit>
+ <unit>
+ <name>25</name>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>25</vlan-id>
+ <input-vlan-map>
+ <pop/>
+ </input-vlan-map>
+ <output-vlan-map>
+ <push/>
+ </output-vlan-map>
+ </unit>
+ <unit>
+ <name>26</name>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>26</vlan-id>
+ <input-vlan-map>
+ <pop/>
+ </input-vlan-map>
+ <output-vlan-map>
+ <push/>
+ </output-vlan-map>
+ </unit>
+ <unit>
+ <name>27</name>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>27</vlan-id>
+ <input-vlan-map>
+ <pop/>
+ </input-vlan-map>
+ <output-vlan-map>
+ <push/>
+ </output-vlan-map>
+ </unit>
+ <unit>
+ <name>28</name>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>28</vlan-id>
+ <input-vlan-map>
+ <pop/>
+ </input-vlan-map>
+ <output-vlan-map>
+ <push/>
+ </output-vlan-map>
+ </unit>
+ <unit>
+ <name>29</name>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>29</vlan-id>
+ <input-vlan-map>
+ <pop/>
+ </input-vlan-map>
+ <output-vlan-map>
+ <push/>
+ </output-vlan-map>
+ </unit>
+ <unit>
+ <name>30</name>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>30</vlan-id>
+ <input-vlan-map>
+ <pop/>
+ </input-vlan-map>
+ <output-vlan-map>
+ <push/>
+ </output-vlan-map>
+ </unit>
+ <unit>
+ <name>31</name>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>31</vlan-id>
+ <input-vlan-map>
+ <pop/>
+ </input-vlan-map>
+ <output-vlan-map>
+ <push/>
+ </output-vlan-map>
+ </unit>
+ <unit>
+ <name>32</name>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>32</vlan-id>
+ <input-vlan-map>
+ <pop/>
+ </input-vlan-map>
+ <output-vlan-map>
+ <push/>
+ </output-vlan-map>
+ </unit>
+ <unit>
+ <name>33</name>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>33</vlan-id>
+ <input-vlan-map>
+ <pop/>
+ </input-vlan-map>
+ <output-vlan-map>
+ <push/>
+ </output-vlan-map>
+ </unit>
+ <unit>
+ <name>34</name>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>34</vlan-id>
+ <input-vlan-map>
+ <pop/>
+ </input-vlan-map>
+ <output-vlan-map>
+ <push/>
+ </output-vlan-map>
+ </unit>
+ </interface>
+ <interface>
+ <name>xe-2/2/3</name>
+ <apply-groups>NO_TRAPS</apply-groups>
+ <description>PHY INFRASTRUCTURE GTS SRF0000001 | GTS link to Server 1</description>
+ <mtu>9000</mtu>
+ </interface>
+ <interface>
+ <name>xe-2/3/0</name>
+ <description>PHY PUBLIC MIX P_AE11 SRF9938863 | MIX ID: Switch 5, port 10/12, CID20170620-01</description>
+ <link-mode>full-duplex</link-mode>
+ <no-gratuitous-arp-reply/>
+ <no-gratuitous-arp-request/>
+ <gigether-options>
+ <no-auto-negotiation/>
+ <ieee-802.3ad>
+ <bundle>ae11</bundle>
+ </ieee-802.3ad>
+ </gigether-options>
+ </interface>
+ <interface>
+ <name>xe-2/3/1</name>
+ <apply-groups>NO_TRAPS</apply-groups>
+ <description>PHY INFRASTRUCTURE GTS SRF0000001 | GTS link to Server 2</description>
+ <flexible-vlan-tagging/>
+ <mtu>9000</mtu>
+ <encapsulation>flexible-ethernet-services</encapsulation>
+ <unit>
+ <name>11</name>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>11</vlan-id>
+ <input-vlan-map>
+ <pop/>
+ </input-vlan-map>
+ <output-vlan-map>
+ <push/>
+ </output-vlan-map>
+ </unit>
+ <unit>
+ <name>12</name>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>12</vlan-id>
+ <input-vlan-map>
+ <pop/>
+ </input-vlan-map>
+ <output-vlan-map>
+ <push/>
+ </output-vlan-map>
+ </unit>
+ <unit>
+ <name>13</name>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>13</vlan-id>
+ <input-vlan-map>
+ <pop/>
+ </input-vlan-map>
+ <output-vlan-map>
+ <push/>
+ </output-vlan-map>
+ </unit>
+ <unit>
+ <name>14</name>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>14</vlan-id>
+ <input-vlan-map>
+ <pop/>
+ </input-vlan-map>
+ <output-vlan-map>
+ <push/>
+ </output-vlan-map>
+ </unit>
</interface>
<interface>
<name>xe-2/3/2</name>
@@ -4083,6 +4076,19 @@
</inet6>
</family>
</unit>
+ <unit>
+ <name>550</name>
+ <description>SRV_L2CIRCUIT CUSTOMER GARR ARNES TEST| TT#2019010934000713 </description>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>550</vlan-id>
+ <family>
+ <ccc>
+ <filter>
+ <input>filter_in_ae10_550</input>
+ </filter>
+ </ccc>
+ </family>
+ </unit>
<unit>
<name>667</name>
<description>SRV_CLS CUSTOMER GARR AP1 SRF9916035 | ASN137 |</description>
@@ -4665,6 +4671,9 @@
<clients>
<name>83.97.93.196/32</name>
</clients>
+ <clients>
+ <name>83.97.93.238/32</name>
+ </clients>
</community>
<community>
<name>As4n0gN!</name>
@@ -5022,41 +5031,41 @@
</static>
<flow>
<route>
- <name>ddos_openresolver_83_171_0_154_3ZGEVC</name>
+ <name>ddos-193-219-177-224_DF9YV3</name>
<then>
<discard/>
</then>
<match>
<protocol>udp</protocol>
- <source-port>0</source-port>
- <source-port>53</source-port>
- <fragment>is-fragment</fragment>
- <destination>83.171.0.154/32</destination>
+ <destination>193.219.177.224/32</destination>
<source>0.0.0.0/0</source>
</match>
</route>
<route>
- <name>ddos_openresolver_83_171_0_167_O2NVLR</name>
+ <name>ddos_openresolver_83_171_0_154_3ZGEVC</name>
<then>
<discard/>
</then>
<match>
<protocol>udp</protocol>
<source-port>0</source-port>
- <source-port>389</source-port>
+ <source-port>53</source-port>
<fragment>is-fragment</fragment>
- <destination>83.171.0.167/32</destination>
+ <destination>83.171.0.154/32</destination>
<source>0.0.0.0/0</source>
</match>
</route>
<route>
- <name>ataque_DoS_Lusofona_PQVHMD</name>
+ <name>lusofona_sem_arbor_20180911_IHNYNF</name>
<then>
<discard/>
</then>
<match>
- <destination>193.137.75.162/32</destination>
- <source>195.201.113.54/32</source>
+ <protocol>icmp</protocol>
+ <protocol>tcp</protocol>
+ <protocol>udp</protocol>
+ <destination>193.136.1.74/32</destination>
+ <source>0.0.0.0/0</source>
</match>
</route>
<route>
@@ -5075,53 +5084,31 @@
</match>
</route>
<route>
- <name>ldap_ddos-158-129-226-53_VYHWTP</name>
+ <name>Ataque_DoS_Escolas_2C2KXF</name>
<then>
<discard/>
</then>
<match>
<protocol>udp</protocol>
- <source-port>0</source-port>
<source-port>53</source-port>
- <source-port>389</source-port>
- <fragment>is-fragment</fragment>
- <destination>158.129.226.53/32</destination>
+ <destination>193.236.40.120/32</destination>
<source>0.0.0.0/0</source>
</match>
</route>
<route>
- <name>EENet_ns_eenet_port_0_389_6NG2LU</name>
+ <name>BruteForce_UDP_Escolas_59DHKJ</name>
<then>
<discard/>
</then>
<match>
<protocol>udp</protocol>
+ <destination-port>0</destination-port>
<source-port>0</source-port>
- <source-port>389</source-port>
- <destination>193.40.56.245/32</destination>
+ <source-port>53</source-port>
+ <destination>193.236.81.216/32</destination>
<source>0.0.0.0/0</source>
</match>
</route>
- <route>
- <name>BruteForceRDP_10122018_YR1SGH</name>
- <then>
- <discard/>
- </then>
- <match>
- <destination>193.136.6.46/32</destination>
- <source>95.213.184.20/32</source>
- </match>
- </route>
- <route>
- <name>BruteForceRDP_10122018_NDXK5J</name>
- <then>
- <discard/>
- </then>
- <match>
- <destination>193.136.6.227/32</destination>
- <source>95.213.184.20/32</source>
- </match>
- </route>
</flow>
<rib-groups>
<name>unicast-multicast</name>
@@ -5186,13 +5173,13 @@
<import-rib>IAS.inet6.0</import-rib>
<import-policy>rtbh-policy</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias</name>
<import-rib>IAS.inet.0</import-rib>
<import-rib>CLEAN_IAS.inet.0</import-rib>
<import-policy>ps-into-clean-ias-import</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias-v6</name>
<import-rib>IAS.inet6.0</import-rib>
<import-rib>CLEAN_IAS.inet6.0</import-rib>
@@ -5279,171 +5266,138 @@
<ipv6-tunneling/>
<icmp-tunneling/>
<label-switched-path>
- <name>T-par.cc-F-mil.cc-mpls5</name>
- <no-install-to-address/>
- <to>62.40.97.13</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-par.cc-F-mil.cc-mpls4</name>
- <no-install-to-address/>
- <to>62.40.97.13</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-par.cc-F-mil.cc-mpls1</name>
- <no-install-to-address/>
- <to>62.40.97.13</to>
+ <name>T-lon.cc-F-mil.cc-mpls3</name>
+ <to>62.40.96.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-par.cc-F-mil.cc-mpls3</name>
- <no-install-to-address/>
- <to>62.40.97.13</to>
+ <name>T-ham.cc-F-mil.cc-mpls5</name>
+ <to>62.40.96.26</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-par.cc-F-mil.cc-mpls2</name>
- <no-install-to-address/>
- <to>62.40.97.13</to>
+ <name>T-prg.cc-F-mil.cc-mpls5</name>
+ <to>62.40.97.2</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-ham.cc-F-mil.cc-mpls1</name>
- <no-install-to-address/>
- <to>62.40.96.26</to>
+ <name>T-bra.cc-F-mil.cc-mpls5</name>
+ <to>62.40.97.4</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-ham.cc-F-mil.cc-mpls2</name>
- <no-install-to-address/>
- <to>62.40.96.26</to>
+ <name>T-ams.cc-F-mil.cc-mpls17</name>
+ <to>62.40.97.11</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-prg.cc-F-mil.cc-mpls1</name>
- <no-install-to-address/>
+ <name>T-prg.cc-F-mil.cc-mpls3</name>
<to>62.40.97.2</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-prg.cc-F-mil.cc-mpls2</name>
- <no-install-to-address/>
- <to>62.40.97.2</to>
+ <name>T-mad.cc-F-mil.cc-mpls1</name>
+ <to>62.40.97.16</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-lon.cc-F-mil.cc-mpls3</name>
- <no-install-to-address/>
- <to>62.40.96.15</to>
+ <name>T-ham.cc-F-mil.cc-mpls4</name>
+ <to>62.40.96.26</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-prg.cc-F-mil.cc-mpls5</name>
- <no-install-to-address/>
- <to>62.40.97.2</to>
+ <name>T-par.cc-F-mil.cc-mpls7</name>
+ <to>62.40.97.13</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-ams.cc-F-mil.cc-mpls17</name>
- <no-install-to-address/>
- <to>62.40.97.11</to>
+ <name>T-bra.cc-F-mil.cc-mpls1</name>
+ <to>62.40.97.4</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-bra.cc-F-mil.cc-mpls5</name>
- <no-install-to-address/>
- <to>62.40.97.4</to>
+ <name>T-ams.cc-F-mil.cc-mpls15</name>
+ <to>62.40.97.11</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-ham.cc-F-mil.cc-mpls5</name>
- <no-install-to-address/>
- <to>62.40.96.26</to>
+ <name>T-lon.cc-F-mil.cc-mpls2</name>
+ <to>62.40.96.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-ams.cc-F-mil.cc-mpls15</name>
- <no-install-to-address/>
+ <name>T-ams.cc-F-mil.cc-mpls16</name>
<to>62.40.97.11</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-ham.cc-F-mil.cc-mpls4</name>
- <no-install-to-address/>
- <to>62.40.96.26</to>
+ <name>T-par.cc-F-mil.cc-mpls8</name>
+ <to>62.40.97.13</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-bra.cc-F-mil.cc-mpls1</name>
- <no-install-to-address/>
+ <name>T-bra.cc-F-mil.cc-mpls2</name>
<to>62.40.97.4</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-par.cc-F-mil.cc-mpls7</name>
- <no-install-to-address/>
- <to>62.40.97.13</to>
+ <name>T-ams.cc-F-mil.cc-mpls1</name>
+ <to>62.40.97.11</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-prg.cc-F-mil.cc-mpls3</name>
- <no-install-to-address/>
+ <name>T-prg.cc-F-mil.cc-mpls4</name>
<to>62.40.97.2</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-mad.cc-F-mil.cc-mpls1</name>
- <no-install-to-address/>
- <to>62.40.97.16</to>
+ <name>T-lon.cc-F-mil.cc-mpls1</name>
+ <to>62.40.96.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-lon.cc-F-mil.cc-mpls2</name>
- <no-install-to-address/>
- <to>62.40.96.15</to>
+ <name>T-ham.cc-F-mil.cc-mpls3</name>
+ <to>62.40.96.26</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-bra.cc-F-mil.cc-mpls2</name>
- <no-install-to-address/>
- <to>62.40.97.4</to>
+ <name>T-ham.cc-F-mil.cc-mpls6</name>
+ <to>62.40.96.26</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-ams.cc-F-mil.cc-mpls16</name>
- <no-install-to-address/>
- <to>62.40.97.11</to>
+ <name>T-lon.cc-F-mil.cc-mpls4</name>
+ <to>62.40.96.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-par.cc-F-mil.cc-mpls8</name>
- <no-install-to-address/>
- <to>62.40.97.13</to>
+ <name>T-lon.cc-F-mil.cc-mpls5</name>
+ <to>62.40.96.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-ham.cc-F-mil.cc-mpls6</name>
- <no-install-to-address/>
- <to>62.40.96.26</to>
+ <name>T-prg.cc-F-mil.cc-mpls6</name>
+ <to>62.40.97.2</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-lon.cc-F-mil.cc-mpls4</name>
- <no-install-to-address/>
- <to>62.40.96.15</to>
+ <name>T-mad.cc-F-mil.cc-mpls3</name>
+ <to>62.40.97.16</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-ams.cc-F-mil.cc-mpls1</name>
- <no-install-to-address/>
- <to>62.40.97.11</to>
+ <name>T-prg.cc-F-mil.cc-mpls7</name>
+ <to>62.40.97.2</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-prg.cc-F-mil.cc-mpls4</name>
- <no-install-to-address/>
- <to>62.40.97.2</to>
+ <name>T-mad.cc-F-mil.cc-mpls2</name>
+ <to>62.40.97.16</to>
+ <no-cspf/>
+ </label-switched-path>
+ <label-switched-path>
+ <name>T-bra.cc-F-mil.cc-mpls3</name>
+ <to>62.40.97.4</to>
<no-cspf/>
</label-switched-path>
<interface>
@@ -6358,208 +6312,184 @@
</pim>
<connections>
<interface-switch>
- <name>GTS-local-MI-a00b418958</name>
+ <name>NSI-MI-27f98b6cfe</name>
<interface>
- <name>xe-2/3/1.21</name>
- </interface>
- <interface>
- <name>xe-2/3/1.23</name>
- </interface>
- </interface-switch>
- <interface-switch>
- <name>GTS-local-MI-2aad173c5c</name>
- <interface>
- <name>xe-2/3/1.15</name>
- </interface>
- <interface>
- <name>xe-2/3/1.22</name>
- </interface>
- </interface-switch>
- <interface-switch>
- <name>GTS-local-MI-517ee6bcb2</name>
- <interface>
- <name>xe-2/3/1.14</name>
+ <name>xe-2/2/1.0</name>
</interface>
<interface>
- <name>xe-2/3/1.18</name>
+ <name>xe-2/2/2.13</name>
</interface>
</interface-switch>
<interface-switch>
- <name>GTS-local-MI-27f98b6cfe</name>
+ <name>NSI-MI-d4527143a6</name>
<interface>
- <name>xe-2/2/1.0</name>
+ <name>xe-2/3/1.11</name>
</interface>
<interface>
- <name>xe-2/2/2.13</name>
+ <name>xe-2/2/2.29</name>
</interface>
</interface-switch>
<remote-interface-switch>
- <name>GTS-local-MI-89454f1439</name>
- <interface>xe-2/3/1.12</interface>
- <transmit-lsp>T-par.cc-F-mil.cc-mpls5</transmit-lsp>
- <receive-lsp>T-mil.cc-F-par.cc-mpls5</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-MI-76c4a8fdae</name>
- <interface>xe-2/3/1.17</interface>
- <transmit-lsp>T-par.cc-F-mil.cc-mpls4</transmit-lsp>
- <receive-lsp>T-mil.cc-F-par.cc-mpls4</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-MI-73b7ad2e53</name>
- <interface>xe-2/3/1.20</interface>
- <transmit-lsp>T-par.cc-F-mil.cc-mpls1</transmit-lsp>
- <receive-lsp>T-mil.cc-F-par.cc-mpls1</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-MI-2fb8c857de</name>
- <interface>xe-2/3/1.13</interface>
- <transmit-lsp>T-par.cc-F-mil.cc-mpls3</transmit-lsp>
- <receive-lsp>T-mil.cc-F-par.cc-mpls3</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-MI-4174668e49</name>
- <interface>xe-2/3/1.19</interface>
- <transmit-lsp>T-par.cc-F-mil.cc-mpls2</transmit-lsp>
- <receive-lsp>T-mil.cc-F-par.cc-mpls2</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-MI-13df68f24d</name>
- <interface>xe-2/3/1.11</interface>
- <transmit-lsp>T-ham.cc-F-mil.cc-mpls1</transmit-lsp>
- <receive-lsp>T-mil.cc-F-ham.cc-mpls1</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-MI-40d37e008a</name>
- <interface>xe-2/3/1.16</interface>
- <transmit-lsp>T-ham.cc-F-mil.cc-mpls2</transmit-lsp>
- <receive-lsp>T-mil.cc-F-ham.cc-mpls2</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-MI-2fe8a9c2a2</name>
- <interface>ge-0/3/8.1303</interface>
- <transmit-lsp>T-prg.cc-F-mil.cc-mpls1</transmit-lsp>
- <receive-lsp>T-mil.cc-F-prg.cc-mpls1</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-MI-54ac959f38</name>
- <interface>ge-0/3/8.1301</interface>
- <transmit-lsp>T-prg.cc-F-mil.cc-mpls2</transmit-lsp>
- <receive-lsp>T-mil.cc-F-prg.cc-mpls2</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-MI-5114dbe1ef</name>
+ <name>MI-5114dbe1ef</name>
<interface>xe-2/2/2.12</interface>
<transmit-lsp>T-lon.cc-F-mil.cc-mpls3</transmit-lsp>
<receive-lsp>T-mil.cc-F-lon.cc-mpls3</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-MI-c531ace2f0</name>
+ <name>MI-1d1fac291f</name>
+ <interface>xe-2/2/2.14</interface>
+ <transmit-lsp>T-ham.cc-F-mil.cc-mpls5</transmit-lsp>
+ <receive-lsp>T-mil.cc-F-ham.cc-mpls5</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>MI-c531ace2f0</name>
<interface>xe-2/2/2.16</interface>
<transmit-lsp>T-prg.cc-F-mil.cc-mpls5</transmit-lsp>
<receive-lsp>T-mil.cc-F-prg.cc-mpls5</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-MI-f0bc72ca8b</name>
- <interface>xe-2/2/2.11</interface>
- <transmit-lsp>T-ams.cc-F-mil.cc-mpls17</transmit-lsp>
- <receive-lsp>T-mil.cc-F-ams.cc-mpls17</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-MI-5b6d09e1df</name>
+ <name>MI-5b6d09e1df</name>
<interface>xe-2/2/2.15</interface>
<transmit-lsp>T-bra.cc-F-mil.cc-mpls5</transmit-lsp>
<receive-lsp>T-mil.cc-F-bra.cc-mpls5</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-MI-1d1fac291f</name>
- <interface>xe-2/2/2.14</interface>
- <transmit-lsp>T-ham.cc-F-mil.cc-mpls5</transmit-lsp>
- <receive-lsp>T-mil.cc-F-ham.cc-mpls5</receive-lsp>
+ <name>MI-f0bc72ca8b</name>
+ <interface>xe-2/2/2.11</interface>
+ <transmit-lsp>T-ams.cc-F-mil.cc-mpls17</transmit-lsp>
+ <receive-lsp>T-mil.cc-F-ams.cc-mpls17</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-MI-a369d9ee24</name>
- <interface>xe-2/2/2.25</interface>
- <transmit-lsp>T-ams.cc-F-mil.cc-mpls15</transmit-lsp>
- <receive-lsp>T-mil.cc-F-ams.cc-mpls15</receive-lsp>
+ <name>MI-3d224e8a50</name>
+ <interface>xe-2/2/2.22</interface>
+ <transmit-lsp>T-prg.cc-F-mil.cc-mpls3</transmit-lsp>
+ <receive-lsp>T-mil.cc-F-prg.cc-mpls3</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-MI-2d97b955ec</name>
+ <name>MI-db1f7b2c30</name>
+ <interface>xe-2/2/2.19</interface>
+ <transmit-lsp>T-mad.cc-F-mil.cc-mpls1</transmit-lsp>
+ <receive-lsp>T-mil.cc-F-mad.cc-mpls1</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>MI-2d97b955ec</name>
<interface>xe-2/2/2.23</interface>
<transmit-lsp>T-ham.cc-F-mil.cc-mpls4</transmit-lsp>
<receive-lsp>T-mil.cc-F-ham.cc-mpls4</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-MI-8a43664a43</name>
- <interface>xe-2/2/2.24</interface>
- <transmit-lsp>T-bra.cc-F-mil.cc-mpls1</transmit-lsp>
- <receive-lsp>T-mil.cc-F-bra.cc-mpls1</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-MI-5b376dfdb9</name>
+ <name>MI-5b376dfdb9</name>
<interface>xe-2/2/2.20</interface>
<transmit-lsp>T-par.cc-F-mil.cc-mpls7</transmit-lsp>
<receive-lsp>T-mil.cc-F-par.cc-mpls7</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-MI-3d224e8a50</name>
- <interface>xe-2/2/2.22</interface>
- <transmit-lsp>T-prg.cc-F-mil.cc-mpls3</transmit-lsp>
- <receive-lsp>T-mil.cc-F-prg.cc-mpls3</receive-lsp>
+ <name>MI-8a43664a43</name>
+ <interface>xe-2/2/2.24</interface>
+ <transmit-lsp>T-bra.cc-F-mil.cc-mpls1</transmit-lsp>
+ <receive-lsp>T-mil.cc-F-bra.cc-mpls1</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-MI-db1f7b2c30</name>
- <interface>xe-2/2/2.19</interface>
- <transmit-lsp>T-mad.cc-F-mil.cc-mpls1</transmit-lsp>
- <receive-lsp>T-mil.cc-F-mad.cc-mpls1</receive-lsp>
+ <name>MI-a369d9ee24</name>
+ <interface>xe-2/2/2.25</interface>
+ <transmit-lsp>T-ams.cc-F-mil.cc-mpls15</transmit-lsp>
+ <receive-lsp>T-mil.cc-F-ams.cc-mpls15</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-MI-818aea077e</name>
+ <name>MI-818aea077e</name>
<interface>xe-2/2/2.21</interface>
<transmit-lsp>T-lon.cc-F-mil.cc-mpls2</transmit-lsp>
<receive-lsp>T-mil.cc-F-lon.cc-mpls2</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-MI-17cb622fa0</name>
- <interface>xe-2/2/2.27</interface>
- <transmit-lsp>T-bra.cc-F-mil.cc-mpls2</transmit-lsp>
- <receive-lsp>T-mil.cc-F-bra.cc-mpls2</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-MI-ac07b32b0e</name>
+ <name>MI-ac07b32b0e</name>
<interface>xe-2/2/2.28</interface>
<transmit-lsp>T-ams.cc-F-mil.cc-mpls16</transmit-lsp>
<receive-lsp>T-mil.cc-F-ams.cc-mpls16</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-MI-8b93dc5ffd</name>
+ <name>MI-8b93dc5ffd</name>
<interface>xe-2/2/2.26</interface>
<transmit-lsp>T-par.cc-F-mil.cc-mpls8</transmit-lsp>
<receive-lsp>T-mil.cc-F-par.cc-mpls8</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-MI-90ef663879</name>
+ <name>MI-17cb622fa0</name>
+ <interface>xe-2/2/2.27</interface>
+ <transmit-lsp>T-bra.cc-F-mil.cc-mpls2</transmit-lsp>
+ <receive-lsp>T-mil.cc-F-bra.cc-mpls2</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>MI-df646dae7b</name>
+ <interface>xe-2/2/0.11</interface>
+ <transmit-lsp>T-ams.cc-F-mil.cc-mpls1</transmit-lsp>
+ <receive-lsp>T-mil.cc-F-ams.cc-mpls1</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>MI-39f6d68f10</name>
+ <interface>xe-2/2/0.12</interface>
+ <transmit-lsp>T-prg.cc-F-mil.cc-mpls4</transmit-lsp>
+ <receive-lsp>T-mil.cc-F-prg.cc-mpls4</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>MI-d0f6d192c2</name>
+ <interface>xe-2/2/2.18</interface>
+ <transmit-lsp>T-lon.cc-F-mil.cc-mpls1</transmit-lsp>
+ <receive-lsp>T-mil.cc-F-lon.cc-mpls1</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>MI-011716a5f8</name>
+ <interface>xe-2/2/2.17</interface>
+ <transmit-lsp>T-ham.cc-F-mil.cc-mpls3</transmit-lsp>
+ <receive-lsp>T-mil.cc-F-ham.cc-mpls3</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>MI-90ef663879</name>
<interface>xe-2/2/2.31</interface>
<transmit-lsp>T-ham.cc-F-mil.cc-mpls6</transmit-lsp>
<receive-lsp>T-mil.cc-F-ham.cc-mpls6</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-MI-d329aaaac2</name>
+ <name>MI-d329aaaac2</name>
<interface>xe-2/2/2.32</interface>
<transmit-lsp>T-lon.cc-F-mil.cc-mpls4</transmit-lsp>
<receive-lsp>T-mil.cc-F-lon.cc-mpls4</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-MI-df646dae7b</name>
- <interface>xe-2/2/0.11</interface>
- <transmit-lsp>T-ams.cc-F-mil.cc-mpls1</transmit-lsp>
- <receive-lsp>T-mil.cc-F-ams.cc-mpls1</receive-lsp>
+ <name>MI-057336b11b</name>
+ <interface>xe-2/3/1.14</interface>
+ <transmit-lsp>T-lon.cc-F-mil.cc-mpls5</transmit-lsp>
+ <receive-lsp>T-mil.cc-F-lon.cc-mpls5</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-MI-39f6d68f10</name>
- <interface>xe-2/2/0.12</interface>
- <transmit-lsp>T-prg.cc-F-mil.cc-mpls4</transmit-lsp>
- <receive-lsp>T-mil.cc-F-prg.cc-mpls4</receive-lsp>
+ <name>MI-17fe9c63aa</name>
+ <interface>xe-2/2/2.30</interface>
+ <transmit-lsp>T-prg.cc-F-mil.cc-mpls6</transmit-lsp>
+ <receive-lsp>T-mil.cc-F-prg.cc-mpls6</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>MI-25426a0467</name>
+ <interface>xe-2/2/2.33</interface>
+ <transmit-lsp>T-mad.cc-F-mil.cc-mpls3</transmit-lsp>
+ <receive-lsp>T-mil.cc-F-mad.cc-mpls3</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>MI-bedd9db287</name>
+ <interface>xe-2/3/1.12</interface>
+ <transmit-lsp>T-prg.cc-F-mil.cc-mpls7</transmit-lsp>
+ <receive-lsp>T-mil.cc-F-prg.cc-mpls7</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>MI-45ee83db3f</name>
+ <interface>xe-2/3/1.13</interface>
+ <transmit-lsp>T-mad.cc-F-mil.cc-mpls2</transmit-lsp>
+ <receive-lsp>T-mil.cc-F-mad.cc-mpls2</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>MI-dc7490e51d</name>
+ <interface>xe-2/2/2.34</interface>
+ <transmit-lsp>T-bra.cc-F-mil.cc-mpls3</transmit-lsp>
+ <receive-lsp>T-mil.cc-F-bra.cc-mpls3</receive-lsp>
</remote-interface-switch>
</connections>
<l2circuit>
@@ -6591,6 +6521,13 @@
</neighbor>
<neighbor>
<name>62.40.96.10</name>
+ <interface>
+ <name>ae10.550</name>
+ <virtual-circuit-id>4000713</virtual-circuit-id>
+ <no-control-word/>
+ <mtu>9000</mtu>
+ <ignore-mtu-mismatch/>
+ </interface>
</neighbor>
<neighbor>
<name>62.40.97.11</name>
@@ -8525,16 +8462,13 @@
</prefix-list>
<prefix-list>
<name>geantncc-address-space</name>
- <comment>/* NCC DR VPN LAN */</comment>
+ <comment>/* NCC DR VPN */</comment>
<prefix-list-item>
- <name>62.40.108.192/26</name>
+ <name>62.40.108.192/27</name>
</prefix-list-item>
<prefix-list-item>
<name>62.40.119.0/24</name>
</prefix-list-item>
- <prefix-list-item>
- <name>62.40.119.134/32</name>
- </prefix-list-item>
<prefix-list-item>
<name>62.40.125.250/32</name>
</prefix-list-item>
@@ -9144,21 +9078,9 @@
<prefix-list-item>
<name>185.11.155.0/24</name>
</prefix-list-item>
- <prefix-list-item>
- <name>185.14.11.0/24</name>
- </prefix-list-item>
- <prefix-list-item>
- <name>185.33.56.0/22</name>
- </prefix-list-item>
- <prefix-list-item>
- <name>185.33.56.0/23</name>
- </prefix-list-item>
<prefix-list-item>
<name>185.33.58.0/23</name>
</prefix-list-item>
- <prefix-list-item>
- <name>185.33.58.0/24</name>
- </prefix-list-item>
<prefix-list-item>
<name>185.33.59.0/24</name>
</prefix-list-item>
@@ -9393,12 +9315,6 @@
<prefix-list-item>
<name>193.43.80.0/21</name>
</prefix-list-item>
- <prefix-list-item>
- <name>193.43.80.0/22</name>
- </prefix-list-item>
- <prefix-list-item>
- <name>193.43.84.0/22</name>
- </prefix-list-item>
<prefix-list-item>
<name>193.43.97.0/24</name>
</prefix-list-item>
@@ -9420,21 +9336,9 @@
<prefix-list-item>
<name>193.43.184.0/21</name>
</prefix-list-item>
- <prefix-list-item>
- <name>193.43.184.0/22</name>
- </prefix-list-item>
- <prefix-list-item>
- <name>193.43.188.0/22</name>
- </prefix-list-item>
<prefix-list-item>
<name>193.43.192.0/20</name>
</prefix-list-item>
- <prefix-list-item>
- <name>193.43.192.0/21</name>
- </prefix-list-item>
- <prefix-list-item>
- <name>193.43.200.0/21</name>
- </prefix-list-item>
<prefix-list-item>
<name>193.104.137.0/24</name>
</prefix-list-item>
@@ -11667,6 +11571,14 @@
</prefix-list>
<prefix-list>
<name>corporate-address-space</name>
+ <comment>/* LON2 CORP VPN (MAC) */</comment>
+ <prefix-list-item>
+ <name>62.40.99.194/32</name>
+ </prefix-list-item>
+ <comment>/* LON2 CORP VPN */</comment>
+ <prefix-list-item>
+ <name>62.40.99.201/32</name>
+ </prefix-list-item>
<prefix-list-item>
<name>62.40.119.128/25</name>
</prefix-list-item>
@@ -11752,6 +11664,18 @@
<name>2001:798::/32</name>
</prefix-list-item>
</prefix-list>
+ <prefix-list>
+ <name>opennsa-servers</name>
+ <prefix-list-item>
+ <name>83.97.93.92/32</name>
+ </prefix-list-item>
+ </prefix-list>
+ <prefix-list>
+ <name>opennsa-servers-v6</name>
+ <prefix-list-item>
+ <name>2001:798:3::15f/128</name>
+ </prefix-list-item>
+ </prefix-list>
<policy-statement>
<name>ASM-Allow</name>
<term>
@@ -15001,6 +14925,10 @@
<address>185.1.68.0/24</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>193.188.137.0/24</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -15118,6 +15046,10 @@
<address>2001:7f8:a0::/64</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>2001:7f8:35::/64</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -16176,6 +16108,46 @@
<reject/>
</then>
</term>
+ <term>
+ <name>GOOGLE-test-prepend-1</name>
+ <from>
+ <community>GOOGLE-test-prepend-1</community>
+ </from>
+ <then>
+ <as-path-prepend>21320</as-path-prepend>
+ <next>term</next>
+ </then>
+ </term>
+ <term>
+ <name>GOOGLE-test-prepend-2</name>
+ <from>
+ <community>GOOGLE-test-prepend-2</community>
+ </from>
+ <then>
+ <as-path-prepend>21320 21320</as-path-prepend>
+ <next>term</next>
+ </then>
+ </term>
+ <term>
+ <name>GOOGLE-test-prepend-3</name>
+ <from>
+ <community>GOOGLE-test-prepend-3</community>
+ </from>
+ <then>
+ <as-path-prepend>21320 21320 21320</as-path-prepend>
+ <next>term</next>
+ </then>
+ </term>
+ <term>
+ <name>GOOGLE-test-prepend-6</name>
+ <from>
+ <community>GOOGLE-test-prepend-6</community>
+ </from>
+ <then>
+ <as-path-prepend>21320 21320 21320 21320 21320 21320</as-path-prepend>
+ <next>term</next>
+ </then>
+ </term>
<term>
<name>to-private-peers-prepend-1</name>
<from>
@@ -18123,6 +18095,26 @@
<name>CLS_PROVIDER_ROUTES</name>
<members>20965:65102</members>
</community>
+ <community>
+ <name>GOOGLE-test-prepend-1</name>
+ <members>64801:15169</members>
+ <members>64812:15169</members>
+ </community>
+ <community>
+ <name>GOOGLE-test-prepend-2</name>
+ <members>64802:15169</members>
+ <members>64812:15169</members>
+ </community>
+ <community>
+ <name>GOOGLE-test-prepend-3</name>
+ <members>64803:15169</members>
+ <members>64812:15169</members>
+ </community>
+ <community>
+ <name>GOOGLE-test-prepend-6</name>
+ <members>64806:15169</members>
+ <members>64812:15169</members>
+ </community>
<community>
<name>IAS_AGGREGATE_ROUTES</name>
<members>21320:64912</members>
@@ -21724,13 +21716,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -21746,14 +21731,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp>
<name>backbone-classifier</name>
@@ -21765,18 +21742,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -21784,161 +21749,16 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>iperf-classifier</name>
- <import>default</import>
<forwarding-class>
<name>expedited-forwarding</name>
<loss-priority>
<name>low</name>
- <code-points>af12</code-points>
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>backbone-classifier</name>
@@ -21950,18 +21770,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -21969,13 +21777,7 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -21998,13 +21800,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -22020,187 +21815,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>iperf-classifier</name>
- <import>default</import>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>af12</code-points>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-access-classifier</name>
@@ -22209,16 +21823,16 @@
<name>be</name>
<loss-priority>
<name>low</name>
- <code-points>000</code-points>
- <code-points>001</code-points>
- <code-points>010</code-points>
- <code-points>011</code-points>
- <code-points>110</code-points>
- <code-points>111</code-points>
+ <code-points>100</code-points>
+ <code-points>101</code-points>
</loss-priority>
</forwarding-class>
+ </exp>
+ <exp>
+ <name>mpls-backbone-classifier</name>
+ <import>default</import>
<forwarding-class>
- <name>less-than-best-effort</name>
+ <name>be</name>
<loss-priority>
<name>low</name>
<code-points>100</code-points>
@@ -22226,40 +21840,7 @@
</loss-priority>
</forwarding-class>
</exp>
- <exp>
- <name>mpls-backbone-classifier</name>
- <import>default</import>
- </exp>
</classifiers>
- <code-point-aliases>
- <dscp>
- <name>ix</name>
- <bits>101001</bits>
- </dscp>
- <dscp>
- <name>dws</name>
- <bits>100000</bits>
- </dscp>
- <dscp-ipv6>
- <name>dws</name>
- <bits>100000</bits>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix</name>
- <bits>101001</bits>
- </dscp-ipv6>
- </code-point-aliases>
- <drop-profiles>
- <name>dws-drop-profile</name>
- <fill-level>
- <name>35</name>
- <drop-probability>10</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<drop-profiles>
<name>be-drop-profile</name>
<fill-level>
@@ -22279,59 +21860,40 @@
<drop-probability>100</drop-probability>
</fill-level>
</drop-profiles>
- <drop-profiles>
- <name>less-than-be-drop-profile</name>
- <fill-level>
- <name>25</name>
- <drop-probability>30</drop-probability>
- </fill-level>
- <fill-level>
- <name>30</name>
- <drop-probability>50</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>70</drop-probability>
- </fill-level>
- <fill-level>
- <name>50</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<forwarding-classes>
<class>
<name>be</name>
<queue-num>0</queue-num>
</class>
- <class>
- <name>be-ix</name>
- <queue-num>0</queue-num>
- </class>
<class>
<name>expedited-forwarding</name>
<queue-num>1</queue-num>
</class>
- <class>
- <name>less-than-best-effort</name>
- <queue-num>2</queue-num>
- </class>
<class>
<name>network-control</name>
<queue-num>3</queue-num>
</class>
- <class>
- <name>be-dws</name>
- <queue-num>0</queue-num>
- </class>
- <class>
- <name>be-bleach</name>
- <queue-num>0</queue-num>
- </class>
</forwarding-classes>
<interfaces>
+ <interface>
+ <name>et-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>ge-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>so-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>xe-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
<interface>
<name>xe-0/0/1</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>333</name>
<classifiers>
@@ -22346,7 +21908,7 @@
</interface>
<interface>
<name>so-1/2/0</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -22364,17 +21926,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -22384,11 +21938,15 @@
</interface>
<interface>
<name>ge-3/2/0</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>ae*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
</interface>
<interface>
<name>ae0</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -22406,17 +21964,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -22426,7 +21976,7 @@
</interface>
<interface>
<name>ae2</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -22444,17 +21994,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -22464,7 +22006,7 @@
</interface>
<interface>
<name>ae3</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -22482,17 +22024,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -22502,7 +22036,7 @@
</interface>
<interface>
<name>ae4</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -22520,17 +22054,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -22540,6 +22066,7 @@
</interface>
<interface>
<name>ae10</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>333</name>
<classifiers>
@@ -22550,35 +22077,23 @@
<name>access-classifier</name>
</dscp-ipv6>
</classifiers>
- </unit>
- <unit>
- <name>1000</name>
- <classifiers>
- <dscp>
- <name>access-classifier</name>
- </dscp>
- <dscp-ipv6>
- <name>access-classifier</name>
- </dscp-ipv6>
- </classifiers>
<rewrite-rules>
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
+ <dscp-ipv6>
+ <name>basic-rewrite-rules</name>
+ </dscp-ipv6>
</rewrite-rules>
</unit>
- </interface>
- <interface inactive="inactive">
- <name>ae11</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
<unit>
- <name>0</name>
+ <name>1000</name>
<classifiers>
<dscp>
- <name>ix-access-classifier</name>
+ <name>access-classifier</name>
</dscp>
<dscp-ipv6>
- <name>ix-access-classifier</name>
+ <name>access-classifier</name>
</dscp-ipv6>
</classifiers>
<rewrite-rules>
@@ -22591,77 +22106,14 @@
</rewrite-rules>
</unit>
</interface>
+ <interface>
+ <name>ae12</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
</interfaces>
<rewrite-rules>
<dscp>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -22676,17 +22128,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -22698,97 +22139,9 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -22803,17 +22156,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -22825,13 +22167,6 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
@@ -22839,35 +22174,19 @@
</exp>
</rewrite-rules>
<scheduler-maps>
- <name>MAP-BASIC-IQ2</name>
+ <name>GEANT-BASIC</name>
<forwarding-class>
<name>expedited-forwarding</name>
<scheduler>sch-expedited-forwarding</scheduler>
</forwarding-class>
<forwarding-class>
<name>network-control</name>
- <scheduler>sch-network-ctrl-iq2</scheduler>
+ <scheduler>sch-network-ctrl-geant</scheduler>
</forwarding-class>
<forwarding-class>
<name>be</name>
<scheduler>sch-be</scheduler>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <scheduler>sch-less-than-best-effort</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
</scheduler-maps>
<schedulers>
<name>sch-be</name>
@@ -22887,27 +22206,7 @@
<priority>strict-high</priority>
</schedulers>
<schedulers>
- <name>sch-less-than-best-effort</name>
- <transmit-rate>
- <percent>10</percent>
- </transmit-rate>
- <buffer-size>
- <percent>10</percent>
- </buffer-size>
- <priority>low</priority>
- <drop-profile-map>
- <loss-priority>low</loss-priority>
- <protocol>any</protocol>
- <drop-profile>less-than-be-drop-profile</drop-profile>
- </drop-profile-map>
- <drop-profile-map>
- <loss-priority>high</loss-priority>
- <protocol>any</protocol>
- <drop-profile>be-drop-profile</drop-profile>
- </drop-profile-map>
- </schedulers>
- <schedulers>
- <name>sch-network-ctrl</name>
+ <name>sch-network-ctrl-geant</name>
<transmit-rate>
<percent>5</percent>
</transmit-rate>
@@ -22916,15 +22215,6 @@
</buffer-size>
<priority>high</priority>
</schedulers>
- <schedulers>
- <name>sch-network-ctrl-iq2</name>
- <transmit-rate>
- <percent>5</percent>
- </transmit-rate>
- <buffer-size>
- <percent>5</percent>
- </buffer-size>
- </schedulers>
</class-of-service>
<firewall>
<family>
@@ -26758,7 +26048,7 @@
<name>217.29.66.153/32</name>
</source-address>
<source-address>
- <name>217.29.66.117/32</name>
+ <name>217.29.67.16/32</name>
</source-address>
<source-address>
<name>217.29.66.125/32</name>
@@ -29872,6 +29162,9 @@
<source-prefix-list>
<name>dashboard-servers</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers</name>
+ </source-prefix-list>
<protocol>tcp</protocol>
<destination-port>ssh</destination-port>
</from>
@@ -33781,6 +33074,9 @@
<source-prefix-list>
<name>dashboard-servers-v6</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers-v6</name>
+ </source-prefix-list>
<next-header>tcp</next-header>
<port>ssh</port>
</from>
@@ -35083,6 +34379,17 @@
</then>
</term>
</filter>
+ <filter>
+ <name>filter_in_ae10_550</name>
+ <interface-specific/>
+ <term>
+ <name>1</name>
+ <then>
+ <policer>policer_in_ae10_550</policer>
+ <accept/>
+ </then>
+ </term>
+ </filter>
</ccc>
</family>
<policer>
@@ -35238,9 +34545,19 @@
<discard/>
</then>
</policer>
+ <policer>
+ <name>policer_in_ae10_550</name>
+ <if-exceeding>
+ <bandwidth-limit>5g</bandwidth-limit>
+ <burst-size-limit>3125000</burst-size-limit>
+ </if-exceeding>
+ <then>
+ <discard/>
+ </then>
+ </policer>
</firewall>
<routing-instances>
- <instance>
+ <instance inactive="inactive">
<name>CLEAN_IAS</name>
<description>Clean IAS VRF traffic returned from scrubber</description>
<instance-type>vrf</instance-type>
@@ -35781,7 +35098,7 @@
<prefix-limit>
<maximum>150000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -35829,7 +35146,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -35865,7 +35182,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -35901,7 +35218,7 @@
<prefix-limit>
<maximum>900</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -35937,7 +35254,7 @@
<prefix-limit>
<maximum>900</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -35973,7 +35290,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -35995,7 +35312,7 @@
</local-as>
</neighbor>
<neighbor>
- <name>217.29.66.117</name>
+ <name>217.29.67.16</name>
<description>Amazon.com</description>
<import>ps-AS-SELF-REJECT</import>
<import>ps-BOGONS</import>
@@ -36009,7 +35326,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -36045,7 +35362,7 @@
<prefix-limit>
<maximum>247500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -36081,7 +35398,7 @@
<prefix-limit>
<maximum>300</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -36117,7 +35434,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -36153,7 +35470,7 @@
<prefix-limit>
<maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -36189,7 +35506,7 @@
<prefix-limit>
<maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -36225,7 +35542,7 @@
<prefix-limit>
<maximum>2250</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -36261,7 +35578,7 @@
<prefix-limit>
<maximum>4500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -36297,7 +35614,7 @@
<prefix-limit>
<maximum>7500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -36334,7 +35651,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -36370,7 +35687,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -36450,7 +35767,7 @@
<prefix-limit>
<maximum>7350</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -36485,9 +35802,9 @@
<inet>
<any>
<prefix-limit>
- <maximum>33000</maximum>
+ <maximum>42000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -36523,7 +35840,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -36559,7 +35876,7 @@
<prefix-limit>
<maximum>450</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -36596,7 +35913,7 @@
<prefix-limit>
<maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -36632,7 +35949,7 @@
<prefix-limit>
<maximum>375</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -36668,7 +35985,7 @@
<prefix-limit>
<maximum>375</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -36704,7 +36021,7 @@
<prefix-limit>
<maximum>225</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -36740,7 +36057,7 @@
<prefix-limit>
<maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -36776,7 +36093,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -36812,7 +36129,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -36848,7 +36165,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -36884,7 +36201,7 @@
<prefix-limit>
<maximum>105</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -36917,7 +36234,7 @@
<prefix-limit>
<maximum>150000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -36965,7 +36282,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -37037,7 +36354,7 @@
<prefix-limit>
<maximum>900</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -37073,7 +36390,7 @@
<prefix-limit>
<maximum>900</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -37109,7 +36426,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -37145,7 +36462,7 @@
<prefix-limit>
<maximum>247500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -37181,7 +36498,7 @@
<prefix-limit>
<maximum>300</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -37217,7 +36534,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -37253,7 +36570,7 @@
<prefix-limit>
<maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -37289,7 +36606,7 @@
<prefix-limit>
<maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -37325,7 +36642,7 @@
<prefix-limit>
<maximum>2250</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -37361,7 +36678,7 @@
<prefix-limit>
<maximum>4500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -37397,7 +36714,7 @@
<prefix-limit>
<maximum>7500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -37434,7 +36751,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -37470,7 +36787,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -37550,7 +36867,7 @@
<prefix-limit>
<maximum>7350</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -37587,7 +36904,7 @@
<prefix-limit>
<maximum>3000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -37659,7 +36976,7 @@
<prefix-limit>
<maximum>450</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -37696,7 +37013,7 @@
<prefix-limit>
<maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -37732,7 +37049,7 @@
<prefix-limit>
<maximum>375</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -37768,7 +37085,7 @@
<prefix-limit>
<maximum>375</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -37804,7 +37121,7 @@
<prefix-limit>
<maximum>225</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -37840,7 +37157,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -37876,7 +37193,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -37912,7 +37229,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -37948,7 +37265,7 @@
<prefix-limit>
<maximum>105</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -38468,6 +37785,9 @@
<maximum>1000</maximum>
<teardown>
<limit-threshold>90</limit-threshold>
+ <idle-timeout>
+ <timeout>15</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</labeled-unicast>
diff --git a/test/data/mx1.par.fr.geant.net-netconf.xml b/test/data/mx1.par.fr.geant.net-netconf.xml
index 2eccc78007b31d68ab9e209a5da7ab534c2f03da..b8e1ffbbb1425f3cc184035ff3edc2db5498d8a5 100644
--- a/test/data/mx1.par.fr.geant.net-netconf.xml
+++ b/test/data/mx1.par.fr.geant.net-netconf.xml
@@ -1,4 +1,4 @@
-<configuration changed-seconds="1545214014" changed-localtime="2018-12-19 10:06:54 UTC">
+<configuration changed-seconds="1549111409" changed-localtime="2019-02-02 12:43:29 UTC">
<version>15.1F6-S10.9</version>
<groups>
<name>fxp0</name>
@@ -288,6 +288,38 @@
<allow-commands>show .*</allow-commands>
<deny-commands>(ssh .*|telnet .*)</deny-commands>
</class>
+ <class>
+ <name>opennsa</name>
+ <idle-timeout>5</idle-timeout>
+ <permissions>configure</permissions>
+ <deny-commands>(file.*)|(load.*)|(op.*)|(request.*)|(save.*)|(start.*)|(test.*)|(set cli.*)|(set date.*)|(clear.*)|(help.*)|(telnet.*)|(ssh.*)|(traceroute.*)|(mtrace.*)|(monitor.*)|(ping.*)|(show.*)|(set.*)</deny-commands>
+ <allow-configuration-regexps>interfaces .*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections remote-interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols mpls label-switched-path.*</allow-configuration-regexps>
+ <deny-configuration-regexps>vmhost .*</deny-configuration-regexps>
+ <deny-configuration-regexps>session-limit-group .*</deny-configuration-regexps>
+ <deny-configuration-regexps>multi-chassis .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc-partition .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc .*</deny-configuration-regexps>
+ <deny-configuration-regexps>groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>dynamic-profiles .*</deny-configuration-regexps>
+ <deny-configuration-regexps>diameter .*</deny-configuration-regexps>
+ <deny-configuration-regexps>apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>access-profile .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces traceoptions .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-set .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-range .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups-except .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lt-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces ms-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces si-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces gr-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lo.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces dsc.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces irb.*</deny-configuration-regexps>
+ </class>
<class>
<name>readonly-permissions</name>
<permissions>view</permissions>
@@ -597,6 +629,22 @@
<encrypted-password>/* SECRET-DATA */</encrypted-password>
</authentication>
</user>
+ <user>
+ <name>opennsa</name>
+ <uid>2052</uid>
+ <class>opennsa</class>
+ <authentication>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ </authentication>
+ </user>
<user>
<name>opnet</name>
<full-name>OPNET NEOP Planning system @ 62.40.105.114</full-name>
@@ -2924,6 +2972,7 @@
<vlan-id>104</vlan-id>
<family>
<inet>
+ <mtu>1500</mtu>
<filter>
<input>
<filter-name>NEBACKUP-IN</filter-name>
@@ -2937,6 +2986,7 @@
</address>
</inet>
<inet6>
+ <mtu>1500</mtu>
<address>
<name>2001:798:bb:26::1/64</name>
</address>
@@ -3257,6 +3307,66 @@
</inet6>
</family>
</unit>
+ <unit>
+ <name>201</name>
+ <description>SRV_GLOBAL INFRASTRUCTURE | PAR Groove 1</description>
+ <vlan-id>201</vlan-id>
+ <family>
+ <inet>
+ <address>
+ <name>10.0.3.13/30</name>
+ </address>
+ </inet>
+ </family>
+ </unit>
+ <unit>
+ <name>202</name>
+ <description>SRV_GLOBAL INFRASTRUCTURE | PAR Groove 1 Direct Management</description>
+ <vlan-id>202</vlan-id>
+ <family>
+ <inet>
+ <filter>
+ <input-list>INTERNAL_HEAD_IN</input-list>
+ <input-list>INTERNAL_TAIL_IN</input-list>
+ <output-list>INTERNAL_HEAD_OUT</output-list>
+ <output-list>INTERNAL_TAIL_OUT</output-list>
+ </filter>
+ <address>
+ <name>62.40.108.124/31</name>
+ </address>
+ </inet>
+ </family>
+ </unit>
+ <unit>
+ <name>203</name>
+ <description>SRV_GLOBAL INFRASTRUCTURE | PAR Groove 2</description>
+ <vlan-id>203</vlan-id>
+ <family>
+ <inet>
+ <address>
+ <name>10.0.3.17/30</name>
+ </address>
+ </inet>
+ </family>
+ </unit>
+ <unit>
+ <name>204</name>
+ <description>SRV_GLOBAL INFRASTRUCTURE | PAR Groove 2 Direct Management</description>
+ <vlan-id>204</vlan-id>
+ <family>
+ <inet>
+ <filter>
+ <input-list>INTERNAL_HEAD_IN</input-list>
+ <input-list>INTERNAL_TAIL_IN</input-list>
+ <output-list>INTERNAL_HEAD_OUT</output-list>
+ <output-list>INTERNAL_TAIL_OUT</output-list>
+ </filter>
+ <address>
+ <name>62.40.108.126/31</name>
+ </address>
+ </inet>
+ </family>
+ </unit>
<unit>
<name>230</name>
<description>SRV_GLOBAL INFRASTRUCTURE ACCESS SRF0000001 | Docker CONTACT: michael.haller@geant.org IMPLEMENTED: 20161220</description>
@@ -3631,61 +3741,6 @@
<flexible-vlan-tagging/>
<mtu>9000</mtu>
<encapsulation>flexible-ethernet-services</encapsulation>
- <unit>
- <name>1301</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>1301</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>1303</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>1303</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>1304</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>1304</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>1305</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>1305</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>1306</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>1306</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
</interface>
<interface>
<name>ge-0/2/8</name>
@@ -3876,12 +3931,25 @@
<interface>
<name>et-1/1/5</name>
<description>PHY SPARE NON-OPERATIONAL | RESERVED RENATER 200G</description>
- <disable/>
+ <undocumented><enable/></undocumented>
</interface>
<interface>
<name>et-2/0/2</name>
- <description>PHY SPARE |Reserved for renater 200GB upgrade LL2</description>
- <disable/>
+ <description>PHY SPARE |Reserved for RENATER 100G GEANT LHCONE</description>
+ <undocumented><enable/></undocumented>
+ <vlan-tagging/>
+ <mtu>9192</mtu>
+ <unit>
+ <name>160</name>
+ <vlan-id>160</vlan-id>
+ <family>
+ <inet>
+ <address>
+ <name>10.10.110.109/30</name>
+ </address>
+ </inet>
+ </family>
+ </unit>
</interface>
<interface>
<name>et-2/0/5</name>
@@ -4594,94 +4662,6 @@
<push/>
</output-vlan-map>
</unit>
- <unit>
- <name>15</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>15</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>16</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>16</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>17</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>17</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>18</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>18</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>19</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>19</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>20</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>20</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>21</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>21</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>23</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>23</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
<unit>
<name>24</name>
<encapsulation>vlan-ccc</encapsulation>
@@ -4817,72 +4797,6 @@
<push/>
</output-vlan-map>
</unit>
- <unit>
- <name>15</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>15</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>16</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>16</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>17</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>17</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>18</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>18</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>19</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>19</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>20</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>20</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
<unit>
<name>27</name>
<encapsulation>vlan-ccc</encapsulation>
@@ -4899,7 +4813,7 @@
<name>xe-10/2/3</name>
<apply-groups>NO_TRAPS</apply-groups>
<description>PHY INFRASTRUCTURE GTS SRF0000001 | GTS link to Server 3</description>
- <mtu>9192</mtu>
+ <mtu>9000</mtu>
<encapsulation>ethernet-ccc</encapsulation>
<unit>
<name>0</name>
@@ -4924,34 +4838,6 @@
<description>PHY INFRASTRUCTURE GTS SERVER 4 | GTS link to Server 4</description>
<mtu>9000</mtu>
</interface>
- <interface>
- <name>xe-11/0/1</name>
- <apply-groups>NO_TRAPS</apply-groups>
- <description>PHY INFRASTRUCTURE GTS SERVER 5 | GTS link to Server 5</description>
- <mtu>9000</mtu>
- <encapsulation>ethernet-ccc</encapsulation>
- <unit>
- <name>0</name>
- <family>
- <ccc>
- </ccc>
- </family>
- </unit>
- </interface>
- <interface>
- <name>xe-11/0/2</name>
- <apply-groups>NO_TRAPS</apply-groups>
- <description>PHY INFRASTRUCTURE GTS SERVER 6 | GTS link to Server 6</description>
- <mtu>9000</mtu>
- <encapsulation>ethernet-ccc</encapsulation>
- <unit>
- <name>0</name>
- <family>
- <ccc>
- </ccc>
- </family>
- </unit>
- </interface>
<interface>
<name>xe-11/0/3</name>
<apply-groups>NO_TRAPS</apply-groups>
@@ -4992,17 +4878,6 @@
<push/>
</output-vlan-map>
</unit>
- <unit>
- <name>14</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>14</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
<unit>
<name>15</name>
<encapsulation>vlan-ccc</encapsulation>
@@ -6068,17 +5943,6 @@
</ccc>
</family>
</unit>
- <unit>
- <name>689</name>
- <description>SRV_L2CIRCUIT CUSTOMER REDIRIS REDCLARA SRF9912201 | mar-par_I2CAT_RedIRIS-RedCLARA_12201</description>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>689</vlan-id>
- <family>
- <ccc>
- <mtu>9000</mtu>
- </ccc>
- </family>
- </unit>
<unit>
<name>903</name>
<description>SRV_L2CIRCUIT CUSTOMER INTERNET2 SRF9940539| par-par_MISC_GEANT-INTERNET2_9940539</description>
@@ -6777,6 +6641,9 @@
<clients>
<name>83.97.93.196/32</name>
</clients>
+ <clients>
+ <name>83.97.93.238/32</name>
+ </clients>
</community>
<community>
<name>As4n0gN!</name>
@@ -7288,13 +7155,13 @@
<import-rib>IAS.inet6.0</import-rib>
<import-policy>rtbh-policy</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias</name>
<import-rib>IAS.inet.0</import-rib>
<import-rib>CLEAN_IAS.inet.0</import-rib>
<import-policy>ps-into-clean-ias-import</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias-v6</name>
<import-rib>IAS.inet6.0</import-rib>
<import-rib>CLEAN_IAS.inet6.0</import-rib>
@@ -7395,155 +7262,90 @@
<ipv6-tunneling/>
<icmp-tunneling/>
<label-switched-path>
- <name>T-mil.cc-F-par.cc-mpls4</name>
- <no-install-to-address/>
- <to>62.40.97.15</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-mil.cc-F-par.cc-mpls5</name>
- <no-install-to-address/>
- <to>62.40.97.15</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-mil.cc-F-par.cc-mpls3</name>
- <no-install-to-address/>
- <to>62.40.97.15</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-mil.cc-F-par.cc-mpls1</name>
- <no-install-to-address/>
- <to>62.40.97.15</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-mil.cc-F-par.cc-mpls2</name>
- <no-install-to-address/>
- <to>62.40.97.15</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-bra.cc-F-par.cc-mpls2</name>
- <no-install-to-address/>
- <to>62.40.97.4</to>
+ <name>T-lon.cc-F-par.cc-mpls1</name>
+ <to>62.40.96.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-bra.cc-F-par.cc-mpls1</name>
- <no-install-to-address/>
+ <name>T-bra.cc-F-par.cc-mpls3</name>
<to>62.40.97.4</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-lon.cc-F-par.cc-mpls1</name>
- <no-install-to-address/>
- <to>62.40.96.15</to>
+ <name>T-mad.cc-F-par.cc-mpls1</name>
+ <to>62.40.97.16</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-prg.cc-F-par.cc-mpls1</name>
- <no-install-to-address/>
- <to>62.40.97.2</to>
+ <name>T-mil.cc-F-par.cc-mpls7</name>
+ <to>62.40.97.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-prg.cc-F-par.cc-mpls2</name>
- <no-install-to-address/>
- <to>62.40.97.2</to>
+ <name>T-ams.cc-F-par.cc-mpls1</name>
+ <to>62.40.97.11</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-prg.cc-F-par.cc-mpls3</name>
- <no-install-to-address/>
+ <name>T-prg.cc-F-par.cc-mpls6</name>
<to>62.40.97.2</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-prg.cc-F-par.cc-mpls4</name>
- <no-install-to-address/>
- <to>62.40.97.2</to>
+ <name>T-lon.cc-F-par.cc-mpls3</name>
+ <to>62.40.96.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-prg.cc-F-par.cc-mpls5</name>
- <no-install-to-address/>
- <to>62.40.97.2</to>
+ <name>T-ham.cc-F-par.cc-mpls1</name>
+ <to>62.40.96.26</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-lon.cc-F-par.cc-mpls2</name>
- <no-install-to-address/>
+ <name>T-lon.cc-F-par.cc-mpls4</name>
<to>62.40.96.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-lon.cc-F-par.cc-mpls3</name>
- <no-install-to-address/>
- <to>62.40.96.15</to>
+ <name>T-mil.cc-F-par.cc-mpls8</name>
+ <to>62.40.97.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-bra.cc-F-par.cc-mpls3</name>
- <no-install-to-address/>
- <to>62.40.97.4</to>
+ <name>T-mad.cc-F-par.cc-mpls2</name>
+ <to>62.40.97.16</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-mil.cc-F-par.cc-mpls7</name>
- <no-install-to-address/>
- <to>62.40.97.15</to>
+ <name>T-mad.cc-F-par.cc-mpls3</name>
+ <to>62.40.97.16</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-ham.cc-F-par.cc-mpls1</name>
- <no-install-to-address/>
+ <name>T-ham.cc-F-par.cc-mpls2</name>
<to>62.40.96.26</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-prg.cc-F-par.cc-mpls6</name>
- <no-install-to-address/>
+ <name>T-prg.cc-F-par.cc-mpls8</name>
<to>62.40.97.2</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-mad.cc-F-par.cc-mpls1</name>
- <no-install-to-address/>
- <to>62.40.97.16</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-ams.cc-F-par.cc-mpls1</name>
- <no-install-to-address/>
+ <name>T-ams.cc-F-par.cc-mpls2</name>
<to>62.40.97.11</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-lon.cc-F-par.cc-mpls4</name>
- <no-install-to-address/>
- <to>62.40.96.15</to>
+ <name>T-prg.cc-F-par.cc-mpls7</name>
+ <to>62.40.97.2</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-mad.cc-F-par.cc-mpls2</name>
- <no-install-to-address/>
+ <name>T-mad.cc-F-par.cc-mpls4</name>
<to>62.40.97.16</to>
<no-cspf/>
</label-switched-path>
- <label-switched-path>
- <name>T-mil.cc-F-par.cc-mpls8</name>
- <no-install-to-address/>
- <to>62.40.97.15</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-lon.cc-F-par.cc-mpls5</name>
- <no-install-to-address/>
- <to>62.40.96.15</to>
- <no-cspf/>
- </label-switched-path>
<interface>
<name>all</name>
</interface>
@@ -7964,17 +7766,23 @@
<inet>
<unicast>
<prefix-limit>
- <maximum>1534</maximum>
+ <maximum>1611</maximum>
<teardown>
- <limit-threshold>89</limit-threshold>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
- <maximum>500</maximum>
+ <maximum>76</maximum>
<teardown>
- <limit-threshold>89</limit-threshold>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</multicast>
@@ -8000,9 +7808,12 @@
<inet>
<unicast>
<prefix-limit>
- <maximum>1381</maximum>
+ <maximum>1561</maximum>
<teardown>
- <limit-threshold>89</limit-threshold>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</unicast>
@@ -8032,17 +7843,23 @@
<inet>
<unicast>
<prefix-limit>
- <maximum>500</maximum>
+ <maximum>213</maximum>
<teardown>
- <limit-threshold>89</limit-threshold>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
- <maximum>500</maximum>
+ <maximum>22</maximum>
<teardown>
- <limit-threshold>89</limit-threshold>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</multicast>
@@ -8063,9 +7880,12 @@
<inet>
<unicast>
<prefix-limit>
- <maximum>1200</maximum>
+ <maximum>73</maximum>
<teardown>
- <limit-threshold>83</limit-threshold>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</unicast>
@@ -8094,17 +7914,23 @@
<inet>
<unicast>
<prefix-limit>
- <maximum>17947</maximum>
+ <maximum>22584</maximum>
<teardown>
- <limit-threshold>89</limit-threshold>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
- <maximum>3000</maximum>
+ <maximum>2739</maximum>
<teardown>
- <limit-threshold>89</limit-threshold>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</multicast>
@@ -8125,17 +7951,23 @@
<inet>
<unicast>
<prefix-limit>
- <maximum>1536</maximum>
+ <maximum>1611</maximum>
<teardown>
- <limit-threshold>89</limit-threshold>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
- <maximum>500</maximum>
+ <maximum>76</maximum>
<teardown>
- <limit-threshold>89</limit-threshold>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</multicast>
@@ -8155,9 +7987,12 @@
<inet>
<unicast>
<prefix-limit>
- <maximum>2200</maximum>
+ <maximum>1543</maximum>
<teardown>
- <limit-threshold>75</limit-threshold>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</unicast>
@@ -8185,9 +8020,12 @@
<inet>
<unicast>
<prefix-limit>
- <maximum>9000</maximum>
+ <maximum>10</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</unicast>
@@ -8225,15 +8063,24 @@
<inet6>
<unicast>
<prefix-limit>
- <maximum>500</maximum>
+ <maximum>61</maximum>
<teardown>
- <limit-threshold>75</limit-threshold>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
- <maximum>500</maximum>
+ <maximum>10</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
</prefix-limit>
</multicast>
</inet6>
@@ -8253,12 +8100,21 @@
<inet6>
<unicast>
<prefix-limit>
- <maximum>500</maximum>
+ <maximum>72</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
<maximum>500</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
</prefix-limit>
</multicast>
</inet6>
@@ -8278,12 +8134,21 @@
<inet6>
<unicast>
<prefix-limit>
- <maximum>500</maximum>
+ <maximum>31</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
<maximum>500</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
</prefix-limit>
</multicast>
</inet6>
@@ -8303,12 +8168,21 @@
<inet6>
<unicast>
<prefix-limit>
- <maximum>1000</maximum>
+ <maximum>10</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
<maximum>1000</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
</prefix-limit>
</multicast>
</inet6>
@@ -8328,12 +8202,24 @@
<inet6>
<unicast>
<prefix-limit>
- <maximum>2064</maximum>
+ <maximum>2071</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
- <maximum>500</maximum>
+ <maximum>37</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
</prefix-limit>
</multicast>
</inet6>
@@ -8353,15 +8239,24 @@
<inet6>
<unicast>
<prefix-limit>
- <maximum>500</maximum>
+ <maximum>61</maximum>
<teardown>
- <limit-threshold>75</limit-threshold>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
- <maximum>500</maximum>
+ <maximum>10</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
</prefix-limit>
</multicast>
</inet6>
@@ -8380,12 +8275,21 @@
<inet6>
<unicast>
<prefix-limit>
- <maximum>500</maximum>
+ <maximum>264</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
</prefix-limit>
</unicast>
<multicast>
<prefix-limit>
<maximum>500</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ </teardown>
</prefix-limit>
</multicast>
</inet6>
@@ -8880,235 +8784,124 @@
</pim>
<connections>
<interface-switch>
- <name>GTS-local-PA-d471495ea0</name>
- <interface>
- <name>xe-10/2/0.15</name>
- </interface>
+ <name>NSI-PA-552dcf4382</name>
<interface>
- <name>xe-10/2/2.12</name>
- </interface>
- </interface-switch>
- <interface-switch>
- <name>GTS-local-PA-71d28d81ef</name>
- <interface>
- <name>xe-10/2/0.21</name>
- </interface>
- <interface>
- <name>xe-10/2/2.17</name>
- </interface>
- </interface-switch>
- <interface-switch>
- <name>GTS-local-PA-7571b0bb9b</name>
- <interface>
- <name>xe-10/2/2.13</name>
- </interface>
- <interface>
- <name>xe-11/0/1.0</name>
- </interface>
- </interface-switch>
- <interface-switch>
- <name>GTS-local-PA-e6eabcaf5b</name>
- <interface>
- <name>xe-10/2/0.16</name>
- </interface>
- <interface>
- <name>xe-10/2/2.18</name>
- </interface>
- </interface-switch>
- <interface-switch>
- <name>GTS-local-PA-0116870bae</name>
- <interface>
- <name>xe-10/2/2.15</name>
- </interface>
- <interface>
- <name>xe-10/2/0.23</name>
- </interface>
- </interface-switch>
- <interface-switch>
- <name>GTS-local-PA-9771dffa70</name>
- <interface>
- <name>xe-10/2/2.14</name>
- </interface>
- <interface>
- <name>xe-11/0/2.0</name>
- </interface>
- </interface-switch>
- <interface-switch>
- <name>GTS-local-PA-2a5c8cff1e</name>
- <interface>
- <name>xe-10/2/2.16</name>
- </interface>
- <interface>
- <name>xe-10/2/2.19</name>
- </interface>
- </interface-switch>
- <interface-switch>
- <name>GTS-local-PA-3f56f48802</name>
- <interface>
- <name>xe-10/2/0.18</name>
+ <name>xe-10/2/3.0</name>
</interface>
<interface>
- <name>xe-10/2/0.12</name>
+ <name>xe-10/2/2.27</name>
</interface>
</interface-switch>
<interface-switch>
- <name>GTS-local-PA-552dcf4382</name>
+ <name>NSI-PA-790c299f57</name>
<interface>
- <name>xe-10/2/3.0</name>
+ <name>xe-10/2/2.11</name>
</interface>
<interface>
- <name>xe-10/2/2.27</name>
+ <name>xe-10/2/0.11</name>
</interface>
</interface-switch>
<remote-interface-switch>
- <name>GTS-local-PA-189ee00729</name>
- <interface>xe-10/2/0.20</interface>
- <transmit-lsp>T-mil.cc-F-par.cc-mpls4</transmit-lsp>
- <receive-lsp>T-par.cc-F-mil.cc-mpls4</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-PA-f0e45c2865</name>
- <interface>xe-10/2/0.19</interface>
- <transmit-lsp>T-mil.cc-F-par.cc-mpls5</transmit-lsp>
- <receive-lsp>T-par.cc-F-mil.cc-mpls5</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-PA-46a9750450</name>
- <interface>xe-10/2/0.13</interface>
- <transmit-lsp>T-mil.cc-F-par.cc-mpls3</transmit-lsp>
- <receive-lsp>T-par.cc-F-mil.cc-mpls3</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-PA-2e2b403c27</name>
- <interface>xe-10/2/2.11</interface>
- <transmit-lsp>T-mil.cc-F-par.cc-mpls1</transmit-lsp>
- <receive-lsp>T-par.cc-F-mil.cc-mpls1</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-PA-77440f1343</name>
- <interface>xe-10/2/0.14</interface>
- <transmit-lsp>T-mil.cc-F-par.cc-mpls2</transmit-lsp>
- <receive-lsp>T-par.cc-F-mil.cc-mpls2</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-PA-b32487a361</name>
- <interface>xe-10/2/0.17</interface>
- <transmit-lsp>T-bra.cc-F-par.cc-mpls2</transmit-lsp>
- <receive-lsp>T-par.cc-F-bra.cc-mpls2</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-PA-d6474b00ad</name>
- <interface>xe-10/2/0.11</interface>
- <transmit-lsp>T-bra.cc-F-par.cc-mpls1</transmit-lsp>
- <receive-lsp>T-par.cc-F-bra.cc-mpls1</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-PA-61797021e0</name>
+ <name>PA-61797021e0</name>
<interface>xe-11/0/3.11</interface>
<transmit-lsp>T-lon.cc-F-par.cc-mpls1</transmit-lsp>
<receive-lsp>T-par.cc-F-lon.cc-mpls1</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-PA-87e48dde06</name>
- <interface>ge-0/2/7.1303</interface>
- <transmit-lsp>T-prg.cc-F-par.cc-mpls1</transmit-lsp>
- <receive-lsp>T-par.cc-F-prg.cc-mpls1</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-PA-5c828f410d</name>
- <interface>ge-0/2/7.1301</interface>
- <transmit-lsp>T-prg.cc-F-par.cc-mpls2</transmit-lsp>
- <receive-lsp>T-par.cc-F-prg.cc-mpls2</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-PA-ee4beed5ac</name>
- <interface>ge-0/2/7.1304</interface>
- <transmit-lsp>T-prg.cc-F-par.cc-mpls3</transmit-lsp>
- <receive-lsp>T-par.cc-F-prg.cc-mpls3</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-PA-67f317c2f5</name>
- <interface>ge-0/2/7.1305</interface>
- <transmit-lsp>T-prg.cc-F-par.cc-mpls4</transmit-lsp>
- <receive-lsp>T-par.cc-F-prg.cc-mpls4</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-PA-756cf8eef1</name>
- <interface>ge-0/2/7.1306</interface>
- <transmit-lsp>T-prg.cc-F-par.cc-mpls5</transmit-lsp>
- <receive-lsp>T-par.cc-F-prg.cc-mpls5</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-PA-eac2a2fbfb</name>
- <interface>xe-11/0/3.14</interface>
- <transmit-lsp>T-lon.cc-F-par.cc-mpls2</transmit-lsp>
- <receive-lsp>T-par.cc-F-lon.cc-mpls2</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-PA-1008a62d30</name>
- <interface>xe-10/2/0.28</interface>
- <transmit-lsp>T-lon.cc-F-par.cc-mpls3</transmit-lsp>
- <receive-lsp>T-par.cc-F-lon.cc-mpls3</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-PA-06a9cc8c81</name>
+ <name>PA-06a9cc8c81</name>
<interface>xe-10/2/0.27</interface>
<transmit-lsp>T-bra.cc-F-par.cc-mpls3</transmit-lsp>
<receive-lsp>T-par.cc-F-bra.cc-mpls3</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-PA-9018371c3d</name>
+ <name>PA-5fb428bc28</name>
+ <interface>xe-10/2/0.26</interface>
+ <transmit-lsp>T-mad.cc-F-par.cc-mpls1</transmit-lsp>
+ <receive-lsp>T-par.cc-F-mad.cc-mpls1</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>PA-9018371c3d</name>
<interface>xe-10/2/0.24</interface>
<transmit-lsp>T-mil.cc-F-par.cc-mpls7</transmit-lsp>
<receive-lsp>T-par.cc-F-mil.cc-mpls7</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-PA-110ccb9d8d</name>
- <interface>xe-10/2/0.29</interface>
- <transmit-lsp>T-ham.cc-F-par.cc-mpls1</transmit-lsp>
- <receive-lsp>T-par.cc-F-ham.cc-mpls1</receive-lsp>
+ <name>PA-be7464b7e2</name>
+ <interface>xe-10/2/0.30</interface>
+ <transmit-lsp>T-ams.cc-F-par.cc-mpls1</transmit-lsp>
+ <receive-lsp>T-par.cc-F-ams.cc-mpls1</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-PA-e87ff3519c</name>
+ <name>PA-e87ff3519c</name>
<interface>xe-10/2/0.25</interface>
<transmit-lsp>T-prg.cc-F-par.cc-mpls6</transmit-lsp>
<receive-lsp>T-par.cc-F-prg.cc-mpls6</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-PA-5fb428bc28</name>
- <interface>xe-10/2/0.26</interface>
- <transmit-lsp>T-mad.cc-F-par.cc-mpls1</transmit-lsp>
- <receive-lsp>T-par.cc-F-mad.cc-mpls1</receive-lsp>
+ <name>PA-1008a62d30</name>
+ <interface>xe-10/2/0.28</interface>
+ <transmit-lsp>T-lon.cc-F-par.cc-mpls3</transmit-lsp>
+ <receive-lsp>T-par.cc-F-lon.cc-mpls3</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-PA-be7464b7e2</name>
- <interface>xe-10/2/0.30</interface>
- <transmit-lsp>T-ams.cc-F-par.cc-mpls1</transmit-lsp>
- <receive-lsp>T-par.cc-F-ams.cc-mpls1</receive-lsp>
+ <name>PA-110ccb9d8d</name>
+ <interface>xe-10/2/0.29</interface>
+ <transmit-lsp>T-ham.cc-F-par.cc-mpls1</transmit-lsp>
+ <receive-lsp>T-par.cc-F-ham.cc-mpls1</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-PA-3103d52daf</name>
+ <name>PA-3103d52daf</name>
<interface>xe-11/0/3.13</interface>
<transmit-lsp>T-lon.cc-F-par.cc-mpls4</transmit-lsp>
<receive-lsp>T-par.cc-F-lon.cc-mpls4</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-PA-204f196ae3</name>
+ <name>PA-067921c28c</name>
+ <interface>xe-11/0/3.15</interface>
+ <transmit-lsp>T-mil.cc-F-par.cc-mpls8</transmit-lsp>
+ <receive-lsp>T-par.cc-F-mil.cc-mpls8</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>PA-204f196ae3</name>
<interface>xe-11/0/3.12</interface>
<transmit-lsp>T-mad.cc-F-par.cc-mpls2</transmit-lsp>
<receive-lsp>T-par.cc-F-mad.cc-mpls2</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-PA-067921c28c</name>
- <interface>xe-11/0/3.15</interface>
- <transmit-lsp>T-mil.cc-F-par.cc-mpls8</transmit-lsp>
- <receive-lsp>T-par.cc-F-mil.cc-mpls8</receive-lsp>
+ <name>PA-40463a7180</name>
+ <interface>xe-10/2/0.12</interface>
+ <transmit-lsp>T-mad.cc-F-par.cc-mpls3</transmit-lsp>
+ <receive-lsp>T-par.cc-F-mad.cc-mpls3</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>PA-ec37f18eb4</name>
+ <interface>xe-10/2/2.14</interface>
+ <transmit-lsp>T-ham.cc-F-par.cc-mpls2</transmit-lsp>
+ <receive-lsp>T-par.cc-F-ham.cc-mpls2</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>PA-ade3f64bec</name>
+ <interface>xe-10/2/0.13</interface>
+ <transmit-lsp>T-prg.cc-F-par.cc-mpls8</transmit-lsp>
+ <receive-lsp>T-par.cc-F-prg.cc-mpls8</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>PA-ad016b408c</name>
+ <interface>xe-10/2/0.14</interface>
+ <transmit-lsp>T-ams.cc-F-par.cc-mpls2</transmit-lsp>
+ <receive-lsp>T-par.cc-F-ams.cc-mpls2</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>PA-437a940a72</name>
+ <interface>xe-10/2/2.13</interface>
+ <transmit-lsp>T-prg.cc-F-par.cc-mpls7</transmit-lsp>
+ <receive-lsp>T-par.cc-F-prg.cc-mpls7</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-PA-e3f2f55357</name>
- <interface>xe-10/2/2.20</interface>
- <transmit-lsp>T-lon.cc-F-par.cc-mpls5</transmit-lsp>
- <receive-lsp>T-par.cc-F-lon.cc-mpls5</receive-lsp>
+ <name>PA-b35b0b2063</name>
+ <interface>xe-10/2/2.12</interface>
+ <transmit-lsp>T-mad.cc-F-par.cc-mpls4</transmit-lsp>
+ <receive-lsp>T-par.cc-F-mad.cc-mpls4</receive-lsp>
</remote-interface-switch>
</connections>
<vrrp>
@@ -9296,12 +9089,6 @@
<no-control-word/>
<ignore-mtu-mismatch/>
</interface>
- <interface>
- <name>ae15.689</name>
- <virtual-circuit-id>12201</virtual-circuit-id>
- <description>mar-par_I2CAT_RedIRIS-RedCLARA_12201</description>
- <ignore-mtu-mismatch/>
- </interface>
</neighbor>
<neighbor>
<name>62.40.97.16</name>
@@ -9894,16 +9681,13 @@
</prefix-list>
<prefix-list>
<name>geantncc-address-space</name>
- <comment>/* NCC DR VPN LAN */</comment>
+ <comment>/* NCC DR VPN */</comment>
<prefix-list-item>
- <name>62.40.108.192/26</name>
+ <name>62.40.108.192/27</name>
</prefix-list-item>
<prefix-list-item>
<name>62.40.119.0/24</name>
</prefix-list-item>
- <prefix-list-item>
- <name>62.40.119.134/32</name>
- </prefix-list-item>
<prefix-list-item>
<name>62.40.125.250/32</name>
</prefix-list-item>
@@ -14128,6 +13912,12 @@
<prefix-list-item>
<name>2a03:3c20::/32</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>2a04:8ec0::/32</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>2a04:8ec0::/48</name>
+ </prefix-list-item>
<prefix-list-item>
<name>2a07:2e40::/29</name>
</prefix-list-item>
@@ -16259,6 +16049,12 @@
<prefix-list-item>
<name>83.97.92.157/32</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>83.97.92.218/32</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>83.97.92.219/32</name>
+ </prefix-list-item>
<comment>/* BOD Server */</comment>
<prefix-list-item>
<name>83.97.92.245/32</name>
@@ -18781,6 +18577,14 @@
</prefix-list>
<prefix-list>
<name>corporate-address-space</name>
+ <comment>/* LON2 CORP VPN (MAC) */</comment>
+ <prefix-list-item>
+ <name>62.40.99.194/32</name>
+ </prefix-list-item>
+ <comment>/* LON2 CORP VPN */</comment>
+ <prefix-list-item>
+ <name>62.40.99.201/32</name>
+ </prefix-list-item>
<prefix-list-item>
<name>62.40.119.128/25</name>
</prefix-list-item>
@@ -18935,6 +18739,18 @@
<name>2001:798::/32</name>
</prefix-list-item>
</prefix-list>
+ <prefix-list>
+ <name>opennsa-servers</name>
+ <prefix-list-item>
+ <name>83.97.93.92/32</name>
+ </prefix-list-item>
+ </prefix-list>
+ <prefix-list>
+ <name>opennsa-servers-v6</name>
+ <prefix-list-item>
+ <name>2001:798:3::15f/128</name>
+ </prefix-list-item>
+ </prefix-list>
<policy-statement>
<name>ASM-Allow</name>
<term>
@@ -19541,6 +19357,10 @@
<address>185.1.68.0/24</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>193.188.137.0/24</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -19662,6 +19482,10 @@
<address>2001:7f8:a0::/64</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>2001:7f8:35::/64</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -24454,6 +24278,7 @@
<community>geant-caren</community>
<community>geant-cngi-6ix</community>
<community>geant-asren</community>
+ <community>geant-wacren</community>
</from>
<then>
<accept/>
@@ -24544,6 +24369,7 @@
<community>geant-cngi-6ix</community>
<community>geant-ernet</community>
<community>geant-asren</community>
+ <community>geant-wacren</community>
</from>
<then>
<accept/>
@@ -26164,6 +25990,10 @@
<name>geant-ubuntunet</name>
<members>20965:36944</members>
</community>
+ <community>
+ <name>geant-wacren</name>
+ <members>20965:37288</members>
+ </community>
<community>
<name>ias-routes</name>
<members>target:20965:333</members>
@@ -26283,13 +26113,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -26305,14 +26128,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp>
<name>backbone-classifier</name>
@@ -26324,18 +26139,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -26343,195 +26146,16 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>iperf-classifier</name>
- <import>default</import>
<forwarding-class>
<name>expedited-forwarding</name>
<loss-priority>
<name>low</name>
- <code-points>af12</code-points>
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>backbone-classifier</name>
@@ -26543,18 +26167,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -26562,13 +26174,7 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -26591,13 +26197,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -26613,187 +26212,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>iperf-classifier</name>
- <import>default</import>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>af12</code-points>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-access-classifier</name>
@@ -26802,16 +26220,16 @@
<name>be</name>
<loss-priority>
<name>low</name>
- <code-points>000</code-points>
- <code-points>001</code-points>
- <code-points>010</code-points>
- <code-points>011</code-points>
- <code-points>110</code-points>
- <code-points>111</code-points>
+ <code-points>100</code-points>
+ <code-points>101</code-points>
</loss-priority>
</forwarding-class>
+ </exp>
+ <exp>
+ <name>mpls-backbone-classifier</name>
+ <import>default</import>
<forwarding-class>
- <name>less-than-best-effort</name>
+ <name>be</name>
<loss-priority>
<name>low</name>
<code-points>100</code-points>
@@ -26819,40 +26237,7 @@
</loss-priority>
</forwarding-class>
</exp>
- <exp>
- <name>mpls-backbone-classifier</name>
- <import>default</import>
- </exp>
</classifiers>
- <code-point-aliases>
- <dscp>
- <name>ix</name>
- <bits>101001</bits>
- </dscp>
- <dscp>
- <name>dws</name>
- <bits>100000</bits>
- </dscp>
- <dscp-ipv6>
- <name>dws</name>
- <bits>100000</bits>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix</name>
- <bits>101001</bits>
- </dscp-ipv6>
- </code-point-aliases>
- <drop-profiles>
- <name>dws-drop-profile</name>
- <fill-level>
- <name>35</name>
- <drop-probability>10</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<drop-profiles>
<name>be-drop-profile</name>
<fill-level>
@@ -26872,58 +26257,40 @@
<drop-probability>100</drop-probability>
</fill-level>
</drop-profiles>
- <drop-profiles>
- <name>less-than-be-drop-profile</name>
- <fill-level>
- <name>25</name>
- <drop-probability>30</drop-probability>
- </fill-level>
- <fill-level>
- <name>30</name>
- <drop-probability>50</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>70</drop-probability>
- </fill-level>
- <fill-level>
- <name>50</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<forwarding-classes>
<class>
<name>be</name>
<queue-num>0</queue-num>
</class>
- <class>
- <name>be-ix</name>
- <queue-num>0</queue-num>
- </class>
<class>
<name>expedited-forwarding</name>
<queue-num>1</queue-num>
</class>
- <class>
- <name>less-than-best-effort</name>
- <queue-num>2</queue-num>
- </class>
<class>
<name>network-control</name>
<queue-num>3</queue-num>
</class>
- <class>
- <name>be-dws</name>
- <queue-num>0</queue-num>
- </class>
- <class>
- <name>be-bleach</name>
- <queue-num>0</queue-num>
- </class>
</forwarding-classes>
<interfaces>
+ <interface>
+ <name>et-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>ge-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>so-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>xe-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
<interface>
<name>xe-0/1/1</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>2100</name>
<classifiers>
@@ -26934,11 +26301,23 @@
<name>access-classifier</name>
</dscp-ipv6>
</classifiers>
+ <rewrite-rules>
+ <dscp>
+ <name>basic-rewrite-rules</name>
+ </dscp>
+ <dscp-ipv6>
+ <name>basic-rewrite-rules</name>
+ </dscp-ipv6>
+ </rewrite-rules>
</unit>
</interface>
+ <interface>
+ <name>ae*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
<interface>
<name>ae0</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -26956,17 +26335,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -26976,7 +26347,7 @@
</interface>
<interface>
<name>ae3</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -26994,17 +26365,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -27014,7 +26377,7 @@
</interface>
<interface>
<name>ae4</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -27032,17 +26395,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -27050,11 +26405,11 @@
</rewrite-rules>
</unit>
</interface>
- <interface inactive="inactive">
+ <interface>
<name>ae11</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
- <name>100</name>
+ <name>0</name>
<classifiers>
<dscp>
<name>access-classifier</name>
@@ -27072,7 +26427,7 @@
</interface>
<interface>
<name>ae12</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>160</name>
<classifiers>
@@ -27103,7 +26458,7 @@
</interface>
<interface>
<name>ae13</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -27134,7 +26489,7 @@
</interface>
<interface>
<name>ae15</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>102</name>
<classifiers>
@@ -27247,73 +26602,6 @@
<rewrite-rules>
<dscp>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -27328,17 +26616,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -27350,37 +26627,9 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -27395,17 +26644,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -27417,73 +26655,6 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
@@ -27491,35 +26662,19 @@
</exp>
</rewrite-rules>
<scheduler-maps>
- <name>MAP-BASIC-IQ2</name>
+ <name>GEANT-BASIC</name>
<forwarding-class>
<name>expedited-forwarding</name>
<scheduler>sch-expedited-forwarding</scheduler>
</forwarding-class>
<forwarding-class>
<name>network-control</name>
- <scheduler>sch-network-ctrl-iq2</scheduler>
+ <scheduler>sch-network-ctrl-geant</scheduler>
</forwarding-class>
<forwarding-class>
<name>be</name>
<scheduler>sch-be</scheduler>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <scheduler>sch-less-than-best-effort</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
</scheduler-maps>
<schedulers>
<name>sch-be</name>
@@ -27539,27 +26694,7 @@
<priority>strict-high</priority>
</schedulers>
<schedulers>
- <name>sch-less-than-best-effort</name>
- <transmit-rate>
- <percent>10</percent>
- </transmit-rate>
- <buffer-size>
- <percent>10</percent>
- </buffer-size>
- <priority>low</priority>
- <drop-profile-map>
- <loss-priority>low</loss-priority>
- <protocol>any</protocol>
- <drop-profile>less-than-be-drop-profile</drop-profile>
- </drop-profile-map>
- <drop-profile-map>
- <loss-priority>high</loss-priority>
- <protocol>any</protocol>
- <drop-profile>be-drop-profile</drop-profile>
- </drop-profile-map>
- </schedulers>
- <schedulers>
- <name>sch-network-ctrl</name>
+ <name>sch-network-ctrl-geant</name>
<transmit-rate>
<percent>5</percent>
</transmit-rate>
@@ -27568,15 +26703,6 @@
</buffer-size>
<priority>high</priority>
</schedulers>
- <schedulers>
- <name>sch-network-ctrl-iq2</name>
- <transmit-rate>
- <percent>5</percent>
- </transmit-rate>
- <buffer-size>
- <percent>5</percent>
- </buffer-size>
- </schedulers>
</class-of-service>
<firewall>
<family>
@@ -27697,31 +26823,6 @@
<filter>
<name>SWITCH-in</name>
<interface-specific/>
- <term inactive="inactive">
- <name>LBE-Karcern-CH1-DE1</name>
- <from>
- <source-address>
- <name>192.16.161.0/28</name>
- </source-address>
- <source-address>
- <name>128.142.224.0/20</name>
- </source-address>
- <destination-address>
- <name>192.108.46.0/24</name>
- </destination-address>
- <destination-address>
- <name>192.108.45.128/26</name>
- </destination-address>
- </from>
- <then>
- <count>lbe-in</count>
- <loss-priority>low</loss-priority>
- <forwarding-class>less-than-best-effort</forwarding-class>
- <routing-instance>
- <routing-instance-name>LSP-next</routing-instance-name>
- </routing-instance>
- </then>
- </term>
<term>
<name>sample</name>
<then>
@@ -37555,6 +36656,22 @@
</filter>
<filter>
<name>NEBACKUP-IN</name>
+ <term>
+ <name>ANTISPOOF</name>
+ <from>
+ <source-address>
+ <name>62.40.123.137/32</name>
+ <except/>
+ </source-address>
+ <source-address>
+ <name>0.0.0.0/0</name>
+ </source-address>
+ </from>
+ <then>
+ <discard>
+ </discard>
+ </then>
+ </term>
<term>
<name>TO-GEANT</name>
<from>
@@ -39986,6 +39103,9 @@
<source-prefix-list>
<name>dashboard-servers</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers</name>
+ </source-prefix-list>
<protocol>tcp</protocol>
<destination-port>ssh</destination-port>
</from>
@@ -42004,6 +41124,9 @@
<name>83.97.92.0/22</name>
<except/>
</source-address>
+ <source-address>
+ <name>0.0.0.0/0</name>
+ </source-address>
</from>
<then>
<discard>
@@ -46137,6 +45260,9 @@
<source-prefix-list>
<name>dashboard-servers-v6</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers-v6</name>
+ </source-prefix-list>
<next-header>tcp</next-header>
<port>ssh</port>
</from>
@@ -47867,6 +46993,9 @@
<name>2001:798:3::/64</name>
<except/>
</source-address>
+ <source-address>
+ <name>::/0</name>
+ </source-address>
</from>
<then>
<discard/>
@@ -48112,7 +47241,7 @@
</policer>
</firewall>
<routing-instances>
- <instance>
+ <instance inactive="inactive">
<name>CLEAN_IAS</name>
<description>Clean IAS VRF traffic returned from scrubber</description>
<instance-type>vrf</instance-type>
@@ -48578,6 +47707,17 @@
<import>ps-IAS-from-TWITCH</import>
<family>
<inet>
+ <unicast>
+ <prefix-limit>
+ <maximum>10</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
+ </prefix-limit>
+ </unicast>
<any>
<prefix-limit>
<maximum>30</maximum>
@@ -48610,6 +47750,17 @@
<import>ps-IAS-from-TWITCH</import>
<family>
<inet6>
+ <unicast>
+ <prefix-limit>
+ <maximum>10</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
+ </prefix-limit>
+ </unicast>
<any>
<prefix-limit>
<maximum>30</maximum>
@@ -48703,6 +47854,12 @@
<name>coriant-mgmt</name>
<description>L3VPN for Coriant Groove Management</description>
<instance-type>vrf</instance-type>
+ <interface>
+ <name>ge-0/2/0.201</name>
+ </interface>
+ <interface>
+ <name>ge-0/2/0.203</name>
+ </interface>
<interface>
<name>ae30.991</name>
</interface>
@@ -49166,6 +48323,9 @@
<maximum>1000</maximum>
<teardown>
<limit-threshold>90</limit-threshold>
+ <idle-timeout>
+ <timeout>15</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</labeled-unicast>
diff --git a/test/data/mx1.poz.pl.geant.net-netconf.xml b/test/data/mx1.poz.pl.geant.net-netconf.xml
index fbc1b5bbdfd28315638ccd2c224748712df45b6d..d320ef7fbcf25aea45278256282b4309450566ba 100644
--- a/test/data/mx1.poz.pl.geant.net-netconf.xml
+++ b/test/data/mx1.poz.pl.geant.net-netconf.xml
@@ -1,4 +1,4 @@
-<configuration changed-seconds="1545214012" changed-localtime="2018-12-19 10:06:52 UTC">
+<configuration changed-seconds="1549111456" changed-localtime="2019-02-02 12:44:16 UTC">
<version>15.1F6-S10.9</version>
<groups>
<name>re0</name>
@@ -250,6 +250,38 @@
<allow-commands>show .*</allow-commands>
<deny-commands>(ssh .*|telnet .*)</deny-commands>
</class>
+ <class>
+ <name>opennsa</name>
+ <idle-timeout>5</idle-timeout>
+ <permissions>configure</permissions>
+ <deny-commands>(file.*)|(load.*)|(op.*)|(request.*)|(save.*)|(start.*)|(test.*)|(set cli.*)|(set date.*)|(clear.*)|(help.*)|(telnet.*)|(ssh.*)|(traceroute.*)|(mtrace.*)|(monitor.*)|(ping.*)|(show.*)|(set.*)</deny-commands>
+ <allow-configuration-regexps>interfaces .*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections remote-interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols mpls label-switched-path.*</allow-configuration-regexps>
+ <deny-configuration-regexps>vmhost .*</deny-configuration-regexps>
+ <deny-configuration-regexps>session-limit-group .*</deny-configuration-regexps>
+ <deny-configuration-regexps>multi-chassis .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc-partition .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc .*</deny-configuration-regexps>
+ <deny-configuration-regexps>groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>dynamic-profiles .*</deny-configuration-regexps>
+ <deny-configuration-regexps>diameter .*</deny-configuration-regexps>
+ <deny-configuration-regexps>apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>access-profile .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces traceoptions .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-set .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-range .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups-except .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lt-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces ms-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces si-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces gr-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lo.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces dsc.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces irb.*</deny-configuration-regexps>
+ </class>
<class>
<name>readonly-permissions</name>
<permissions>view</permissions>
@@ -551,6 +583,22 @@
<encrypted-password>/* SECRET-DATA */</encrypted-password>
</authentication>
</user>
+ <user>
+ <name>opennsa</name>
+ <uid>2050</uid>
+ <class>opennsa</class>
+ <authentication>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ </authentication>
+ </user>
<user>
<name>opnet</name>
<full-name>OPNET NEOP Planning system @ 62.40.105.114</full-name>
@@ -3237,6 +3285,9 @@
<clients>
<name>83.97.93.196/32</name>
</clients>
+ <clients>
+ <name>83.97.93.238/32</name>
+ </clients>
</community>
<community>
<name>As4n0gN!</name>
@@ -3717,13 +3768,13 @@
<import-rib>IAS.inet6.0</import-rib>
<import-policy>rtbh-policy</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias</name>
<import-rib>IAS.inet.0</import-rib>
<import-rib>CLEAN_IAS.inet.0</import-rib>
<import-policy>ps-into-clean-ias-import</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias-v6</name>
<import-rib>IAS.inet6.0</import-rib>
<import-rib>CLEAN_IAS.inet6.0</import-rib>
@@ -4933,16 +4984,13 @@
</prefix-list>
<prefix-list>
<name>geantncc-address-space</name>
- <comment>/* NCC DR VPN LAN */</comment>
+ <comment>/* NCC DR VPN */</comment>
<prefix-list-item>
- <name>62.40.108.192/26</name>
+ <name>62.40.108.192/27</name>
</prefix-list-item>
<prefix-list-item>
<name>62.40.119.0/24</name>
</prefix-list-item>
- <prefix-list-item>
- <name>62.40.119.134/32</name>
- </prefix-list-item>
<prefix-list-item>
<name>62.40.125.250/32</name>
</prefix-list-item>
@@ -8034,6 +8082,9 @@
<prefix-list-item>
<name>176.103.224.0/20</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>176.111.168.0/22</name>
+ </prefix-list-item>
<prefix-list-item>
<name>178.172.212.0/24</name>
</prefix-list-item>
@@ -8109,6 +8160,21 @@
<prefix-list-item>
<name>193.41.88.0/24</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>193.84.124.0/22</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>193.84.124.0/24</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>193.84.125.0/24</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>193.84.126.0/24</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>193.84.127.0/24</name>
+ </prefix-list-item>
<prefix-list-item>
<name>193.104.244.0/24</name>
</prefix-list-item>
@@ -8766,6 +8832,15 @@
<prefix-list-item>
<name>2a04:9440::/30</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>2a07:dd40::/29</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>2a09:c400::/30</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>2a09:c404::/30</name>
+ </prefix-list-item>
<prefix-list-item>
<name>2a0b:2e80::/32</name>
</prefix-list-item>
@@ -9351,6 +9426,12 @@
<prefix-list-item>
<name>2a03:5dc0:6::/48</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>2a09:c400::/30</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>2a09:c404::/30</name>
+ </prefix-list-item>
</prefix-list>
<prefix-list>
<name>allowed-pert</name>
@@ -10628,6 +10709,14 @@
</prefix-list>
<prefix-list>
<name>corporate-address-space</name>
+ <comment>/* LON2 CORP VPN (MAC) */</comment>
+ <prefix-list-item>
+ <name>62.40.99.194/32</name>
+ </prefix-list-item>
+ <comment>/* LON2 CORP VPN */</comment>
+ <prefix-list-item>
+ <name>62.40.99.201/32</name>
+ </prefix-list-item>
<prefix-list-item>
<name>62.40.119.128/25</name>
</prefix-list-item>
@@ -10725,6 +10814,18 @@
<name>2001:798::/32</name>
</prefix-list-item>
</prefix-list>
+ <prefix-list>
+ <name>opennsa-servers</name>
+ <prefix-list-item>
+ <name>83.97.93.92/32</name>
+ </prefix-list-item>
+ </prefix-list>
+ <prefix-list>
+ <name>opennsa-servers-v6</name>
+ <prefix-list-item>
+ <name>2001:798:3::15f/128</name>
+ </prefix-list-item>
+ </prefix-list>
<policy-statement>
<name>ASM-Allow</name>
<term>
@@ -11192,6 +11293,10 @@
<address>185.1.68.0/24</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>193.188.137.0/24</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -11313,6 +11418,10 @@
<address>2001:7f8:a0::/64</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>2001:7f8:35::/64</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -13952,13 +14061,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -13974,14 +14076,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp>
<name>backbone-classifier</name>
@@ -13993,18 +14087,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -14012,13 +14094,7 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -14029,179 +14105,6 @@
</loss-priority>
</forwarding-class>
</dscp>
- <dscp>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>iperf-classifier</name>
- <import>default</import>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>af12</code-points>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
<dscp-ipv6>
<name>backbone-classifier</name>
<import>default</import>
@@ -14212,18 +14115,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -14231,13 +14122,7 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -14260,13 +14145,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -14282,187 +14160,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>iperf-classifier</name>
- <import>default</import>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>af12</code-points>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-access-classifier</name>
@@ -14471,16 +14168,16 @@
<name>be</name>
<loss-priority>
<name>low</name>
- <code-points>000</code-points>
- <code-points>001</code-points>
- <code-points>010</code-points>
- <code-points>011</code-points>
- <code-points>110</code-points>
- <code-points>111</code-points>
+ <code-points>100</code-points>
+ <code-points>101</code-points>
</loss-priority>
</forwarding-class>
+ </exp>
+ <exp>
+ <name>mpls-backbone-classifier</name>
+ <import>default</import>
<forwarding-class>
- <name>less-than-best-effort</name>
+ <name>be</name>
<loss-priority>
<name>low</name>
<code-points>100</code-points>
@@ -14488,40 +14185,7 @@
</loss-priority>
</forwarding-class>
</exp>
- <exp>
- <name>mpls-backbone-classifier</name>
- <import>default</import>
- </exp>
</classifiers>
- <code-point-aliases>
- <dscp>
- <name>ix</name>
- <bits>101001</bits>
- </dscp>
- <dscp>
- <name>dws</name>
- <bits>100000</bits>
- </dscp>
- <dscp-ipv6>
- <name>dws</name>
- <bits>100000</bits>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix</name>
- <bits>101001</bits>
- </dscp-ipv6>
- </code-point-aliases>
- <drop-profiles>
- <name>dws-drop-profile</name>
- <fill-level>
- <name>35</name>
- <drop-probability>10</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<drop-profiles>
<name>be-drop-profile</name>
<fill-level>
@@ -14541,59 +14205,40 @@
<drop-probability>100</drop-probability>
</fill-level>
</drop-profiles>
- <drop-profiles>
- <name>less-than-be-drop-profile</name>
- <fill-level>
- <name>25</name>
- <drop-probability>30</drop-probability>
- </fill-level>
- <fill-level>
- <name>30</name>
- <drop-probability>50</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>70</drop-probability>
- </fill-level>
- <fill-level>
- <name>50</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<forwarding-classes>
<class>
<name>be</name>
<queue-num>0</queue-num>
</class>
- <class>
- <name>be-ix</name>
- <queue-num>0</queue-num>
- </class>
<class>
<name>expedited-forwarding</name>
<queue-num>1</queue-num>
</class>
- <class>
- <name>less-than-best-effort</name>
- <queue-num>2</queue-num>
- </class>
<class>
<name>network-control</name>
<queue-num>3</queue-num>
</class>
- <class>
- <name>be-dws</name>
- <queue-num>0</queue-num>
- </class>
- <class>
- <name>be-bleach</name>
- <queue-num>0</queue-num>
- </class>
</forwarding-classes>
<interfaces>
+ <interface>
+ <name>et-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>ge-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>so-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>xe-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
<interface>
<name>xe-1/0/0</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -14624,7 +14269,7 @@
</interface>
<interface>
<name>xe-1/1/1</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -14671,7 +14316,7 @@
</interface>
<interface>
<name>xe-1/2/0</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>110</name>
<classifiers>
@@ -14696,9 +14341,13 @@
</rewrite-rules>
</unit>
</interface>
+ <interface>
+ <name>ae*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
<interface>
<name>ae0</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -14716,17 +14365,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -14736,7 +14377,7 @@
</interface>
<interface>
<name>ae1</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -14763,7 +14404,7 @@
</interface>
<interface>
<name>ae3</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -14781,17 +14422,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -14801,7 +14434,7 @@
</interface>
<interface>
<name>ae5</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -14819,17 +14452,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -14839,6 +14464,26 @@
</interface>
<interface>
<name>ae11</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ <unit>
+ <name>100</name>
+ <classifiers>
+ <dscp>
+ <name>access-classifier</name>
+ </dscp>
+ <dscp-ipv6>
+ <name>access-classifier</name>
+ </dscp-ipv6>
+ </classifiers>
+ <rewrite-rules>
+ <dscp>
+ <name>basic-rewrite-rules</name>
+ </dscp>
+ <dscp-ipv6>
+ <name>basic-rewrite-rules</name>
+ </dscp-ipv6>
+ </rewrite-rules>
+ </unit>
<unit>
<name>333</name>
<classifiers>
@@ -14849,19 +14494,20 @@
<name>access-classifier</name>
</dscp-ipv6>
</classifiers>
+ <rewrite-rules>
+ <dscp>
+ <name>basic-rewrite-rules</name>
+ </dscp>
+ <dscp-ipv6>
+ <name>basic-rewrite-rules</name>
+ </dscp-ipv6>
+ </rewrite-rules>
</unit>
</interface>
</interfaces>
<rewrite-rules>
<dscp>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -14876,17 +14522,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -14898,97 +14533,9 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -15003,17 +14550,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -15025,73 +14561,6 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
@@ -15099,35 +14568,19 @@
</exp>
</rewrite-rules>
<scheduler-maps>
- <name>MAP-BASIC-IQ2</name>
+ <name>GEANT-BASIC</name>
<forwarding-class>
<name>expedited-forwarding</name>
<scheduler>sch-expedited-forwarding</scheduler>
</forwarding-class>
<forwarding-class>
<name>network-control</name>
- <scheduler>sch-network-ctrl-iq2</scheduler>
+ <scheduler>sch-network-ctrl-geant</scheduler>
</forwarding-class>
<forwarding-class>
<name>be</name>
<scheduler>sch-be</scheduler>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <scheduler>sch-less-than-best-effort</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
</scheduler-maps>
<schedulers>
<name>sch-be</name>
@@ -15147,27 +14600,7 @@
<priority>strict-high</priority>
</schedulers>
<schedulers>
- <name>sch-less-than-best-effort</name>
- <transmit-rate>
- <percent>10</percent>
- </transmit-rate>
- <buffer-size>
- <percent>10</percent>
- </buffer-size>
- <priority>low</priority>
- <drop-profile-map>
- <loss-priority>low</loss-priority>
- <protocol>any</protocol>
- <drop-profile>less-than-be-drop-profile</drop-profile>
- </drop-profile-map>
- <drop-profile-map>
- <loss-priority>high</loss-priority>
- <protocol>any</protocol>
- <drop-profile>be-drop-profile</drop-profile>
- </drop-profile-map>
- </schedulers>
- <schedulers>
- <name>sch-network-ctrl</name>
+ <name>sch-network-ctrl-geant</name>
<transmit-rate>
<percent>5</percent>
</transmit-rate>
@@ -15176,15 +14609,6 @@
</buffer-size>
<priority>high</priority>
</schedulers>
- <schedulers>
- <name>sch-network-ctrl-iq2</name>
- <transmit-rate>
- <percent>5</percent>
- </transmit-rate>
- <buffer-size>
- <percent>5</percent>
- </buffer-size>
- </schedulers>
</class-of-service>
<firewall>
<family>
@@ -20126,6 +19550,9 @@
<source-prefix-list>
<name>dashboard-servers</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers</name>
+ </source-prefix-list>
<protocol>tcp</protocol>
<destination-port>ssh</destination-port>
</from>
@@ -22688,6 +22115,9 @@
<source-prefix-list>
<name>dashboard-servers-v6</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers-v6</name>
+ </source-prefix-list>
<next-header>tcp</next-header>
<port>ssh</port>
</from>
@@ -23493,7 +22923,7 @@
</policer>
</firewall>
<routing-instances>
- <instance>
+ <instance inactive="inactive">
<name>CLEAN_IAS</name>
<description>Clean IAS VRF traffic returned from scrubber</description>
<instance-type>vrf</instance-type>
@@ -24098,6 +23528,9 @@
<maximum>1000</maximum>
<teardown>
<limit-threshold>90</limit-threshold>
+ <idle-timeout>
+ <timeout>15</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</labeled-unicast>
diff --git a/test/data/mx1.pra.cz.geant.net-netconf.xml b/test/data/mx1.pra.cz.geant.net-netconf.xml
index 16b273b12b2d4992942ed908b9834937bc351464..e20d0c801a7b34d4c3b82ca4f15743d1e045538c 100644
--- a/test/data/mx1.pra.cz.geant.net-netconf.xml
+++ b/test/data/mx1.pra.cz.geant.net-netconf.xml
@@ -1,4 +1,4 @@
-<configuration changed-seconds="1545214011" changed-localtime="2018-12-19 10:06:51 UTC">
+<configuration changed-seconds="1549111490" changed-localtime="2019-02-02 12:44:50 UTC">
<version>15.1F6-S10.9</version>
<groups>
<name>re0</name>
@@ -265,6 +265,38 @@
<allow-commands>show .*</allow-commands>
<deny-commands>(ssh .*|telnet .*)</deny-commands>
</class>
+ <class>
+ <name>opennsa</name>
+ <idle-timeout>5</idle-timeout>
+ <permissions>configure</permissions>
+ <deny-commands>(file.*)|(load.*)|(op.*)|(request.*)|(save.*)|(start.*)|(test.*)|(set cli.*)|(set date.*)|(clear.*)|(help.*)|(telnet.*)|(ssh.*)|(traceroute.*)|(mtrace.*)|(monitor.*)|(ping.*)|(show.*)|(set.*)</deny-commands>
+ <allow-configuration-regexps>interfaces .*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections remote-interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols mpls label-switched-path.*</allow-configuration-regexps>
+ <deny-configuration-regexps>vmhost .*</deny-configuration-regexps>
+ <deny-configuration-regexps>session-limit-group .*</deny-configuration-regexps>
+ <deny-configuration-regexps>multi-chassis .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc-partition .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc .*</deny-configuration-regexps>
+ <deny-configuration-regexps>groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>dynamic-profiles .*</deny-configuration-regexps>
+ <deny-configuration-regexps>diameter .*</deny-configuration-regexps>
+ <deny-configuration-regexps>apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>access-profile .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces traceoptions .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-set .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-range .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups-except .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lt-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces ms-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces si-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces gr-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lo.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces dsc.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces irb.*</deny-configuration-regexps>
+ </class>
<class>
<name>readonly-permissions</name>
<idle-timeout>15</idle-timeout>
@@ -556,6 +588,22 @@
<encrypted-password>/* SECRET-DATA */</encrypted-password>
</authentication>
</user>
+ <user>
+ <name>opennsa</name>
+ <uid>2006</uid>
+ <class>opennsa</class>
+ <authentication>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ </authentication>
+ </user>
<user>
<name>opnet</name>
<full-name>OPNET NEOP Planning system @ 62.40.105.114</full-name>
@@ -2629,462 +2677,132 @@
<name>ge-0/3/7</name>
<description>PHY INFRASTRUCTURE GTS SRF0000001 | BMS Internet Access | To GTS EX P23</description>
<flexible-vlan-tagging/>
- <mtu>9000</mtu>
+ <mtu>9192</mtu>
+ <encapsulation>flexible-ethernet-services</encapsulation>
+ </interface>
+ <interface>
+ <name>ge-0/3/8</name>
+ <description>PHY SPARE | Reserved For GTS BOD</description>
+ <disable/>
+ </interface>
+ <interface>
+ <name>ge-0/3/9</name>
+ <description>PHY INFRASTRUCTURE ACCESS LAN SRF0000001 | pra cz POP LAN</description>
+ <flexible-vlan-tagging/>
<encapsulation>flexible-ethernet-services</encapsulation>
<unit>
- <name>11</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>11</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>12</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>12</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>13</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>13</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>14</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>14</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>15</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>15</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>16</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>16</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>17</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>17</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>18</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>18</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>19</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>19</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
+ <name>10</name>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS SRF0000001 | TEST</description>
+ <vlan-id>10</vlan-id>
+ <family>
+ <inet>
+ <filter>
+ <input>
+ <filter-name>LAN-in</filter-name>
+ </input>
+ <output>
+ <filter-name>LAN-out</filter-name>
+ </output>
+ </filter>
+ <address>
+ <name>62.40.115.97/29</name>
+ </address>
+ <address>
+ <name>62.40.107.145/29</name>
+ </address>
+ </inet>
+ <iso>
+ </iso>
+ <inet6>
+ <address>
+ <name>2001:798:13:a::1/64</name>
+ </address>
+ <address>
+ <name>2001:798:fc01:13::1/125</name>
+ </address>
+ </inet6>
+ </family>
</unit>
<unit>
<name>20</name>
- <encapsulation>vlan-ccc</encapsulation>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS SRF0000001 | C1N1 iDRAC CONTACT: allen.long@geant.org IMPLEMENTED: 20161027</description>
<vlan-id>20</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
+ <family>
+ <inet>
+ <filter>
+ <input-list>PROTECTED_EXTERNAL_HEAD_IN</input-list>
+ <input-list>PROTECTED_EXTERNAL_TAIL_IN</input-list>
+ <output-list>PROTECTED_EXTERNAL_HEAD_OUT</output-list>
+ <output-list>PROTECTED_EXTERNAL_TAIL_OUT</output-list>
+ </filter>
+ <address>
+ <name>62.40.118.242/31</name>
+ </address>
+ </inet>
+ <iso>
+ </iso>
+ </family>
</unit>
<unit>
<name>21</name>
- <encapsulation>vlan-ccc</encapsulation>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS SRF0000001 | HADES DRAC</description>
<vlan-id>21</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
+ <family>
+ <inet>
+ <filter>
+ <input>
+ <filter-name>HADES-IN</filter-name>
+ </input>
+ <output>
+ <filter-name>HADES-OUT</filter-name>
+ </output>
+ </filter>
+ <address>
+ <name>62.40.117.98/31</name>
+ </address>
+ </inet>
+ <iso>
+ </iso>
+ </family>
</unit>
<unit>
<name>22</name>
- <encapsulation>vlan-ccc</encapsulation>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS SRF0000001 | OWAMP CONTACT: ivan.garnizov@fau.de IMPLEMENTED: 20150811</description>
<vlan-id>22</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
+ <family>
+ <inet>
+ <filter>
+ <input-list>PROTECTED_EXTERNAL_HEAD_IN</input-list>
+ <input-list>VL022_MIDDLE_IN</input-list>
+ <input-list>PROTECTED_EXTERNAL_TAIL_IN</input-list>
+ <output-list>PROTECTED_EXTERNAL_HEAD_OUT</output-list>
+ <output-list>VL022_MIDDLE_OUT</output-list>
+ <output-list>PROTECTED_EXTERNAL_TAIL_OUT</output-list>
+ </filter>
+ <address>
+ <name>62.40.106.160/31</name>
+ </address>
+ </inet>
+ <iso>
+ </iso>
+ <inet6>
+ <filter>
+ <input-list>PROTECTED_EXTERNAL_V6_HEAD_IN</input-list>
+ <input-list>VL022_V6_MIDDLE_IN</input-list>
+ <input-list>PROTECTED_EXTERNAL_V6_TAIL_OUT</input-list>
+ <output-list>PROTECTED_EXTERNAL_V6_HEAD_OUT</output-list>
+ <output-list>VL022_V6_MIDDLE_OUT</output-list>
+ <output-list>PROTECTED_EXTERNAL_V6_TAIL_OUT</output-list>
+ </filter>
+ <address>
+ <name>2001:0798:fc00:0013::1/126</name>
+ </address>
+ </inet6>
+ </family>
</unit>
<unit>
<name>23</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>23</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>24</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>24</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>25</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>25</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>26</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>26</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>27</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>27</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>28</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>28</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>29</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>29</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>30</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>30</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>31</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>31</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>32</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>32</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>33</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>33</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>34</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>34</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>35</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>35</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>36</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>36</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>1304</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>1304</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>1305</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>1305</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>1306</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>1306</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>1307</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>1307</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- </interface>
- <interface>
- <name>ge-0/3/8</name>
- <description>PHY SPARE | Reserved For GTS BOD</description>
- <disable/>
- </interface>
- <interface>
- <name>ge-0/3/9</name>
- <description>PHY INFRASTRUCTURE ACCESS LAN SRF0000001 | pra cz POP LAN</description>
- <flexible-vlan-tagging/>
- <encapsulation>flexible-ethernet-services</encapsulation>
- <unit>
- <name>10</name>
- <description>SRV_GLOBAL INFRASTRUCTURE ACCESS SRF0000001 | TEST</description>
- <vlan-id>10</vlan-id>
- <family>
- <inet>
- <filter>
- <input>
- <filter-name>LAN-in</filter-name>
- </input>
- <output>
- <filter-name>LAN-out</filter-name>
- </output>
- </filter>
- <address>
- <name>62.40.115.97/29</name>
- </address>
- <address>
- <name>62.40.107.145/29</name>
- </address>
- </inet>
- <iso>
- </iso>
- <inet6>
- <address>
- <name>2001:798:13:a::1/64</name>
- </address>
- <address>
- <name>2001:798:fc01:13::1/125</name>
- </address>
- </inet6>
- </family>
- </unit>
- <unit>
- <name>20</name>
- <description>SRV_GLOBAL INFRASTRUCTURE ACCESS SRF0000001 | C1N1 iDRAC CONTACT: allen.long@geant.org IMPLEMENTED: 20161027</description>
- <vlan-id>20</vlan-id>
- <family>
- <inet>
- <filter>
- <input-list>PROTECTED_EXTERNAL_HEAD_IN</input-list>
- <input-list>PROTECTED_EXTERNAL_TAIL_IN</input-list>
- <output-list>PROTECTED_EXTERNAL_HEAD_OUT</output-list>
- <output-list>PROTECTED_EXTERNAL_TAIL_OUT</output-list>
- </filter>
- <address>
- <name>62.40.118.242/31</name>
- </address>
- </inet>
- <iso>
- </iso>
- </family>
- </unit>
- <unit>
- <name>21</name>
- <description>SRV_GLOBAL INFRASTRUCTURE ACCESS SRF0000001 | HADES DRAC</description>
- <vlan-id>21</vlan-id>
- <family>
- <inet>
- <filter>
- <input>
- <filter-name>HADES-IN</filter-name>
- </input>
- <output>
- <filter-name>HADES-OUT</filter-name>
- </output>
- </filter>
- <address>
- <name>62.40.117.98/31</name>
- </address>
- </inet>
- <iso>
- </iso>
- </family>
- </unit>
- <unit>
- <name>22</name>
- <description>SRV_GLOBAL INFRASTRUCTURE ACCESS SRF0000001 | OWAMP CONTACT: ivan.garnizov@fau.de IMPLEMENTED: 20150811</description>
- <vlan-id>22</vlan-id>
- <family>
- <inet>
- <filter>
- <input-list>PROTECTED_EXTERNAL_HEAD_IN</input-list>
- <input-list>VL022_MIDDLE_IN</input-list>
- <input-list>PROTECTED_EXTERNAL_TAIL_IN</input-list>
- <output-list>PROTECTED_EXTERNAL_HEAD_OUT</output-list>
- <output-list>VL022_MIDDLE_OUT</output-list>
- <output-list>PROTECTED_EXTERNAL_TAIL_OUT</output-list>
- </filter>
- <address>
- <name>62.40.106.160/31</name>
- </address>
- </inet>
- <iso>
- </iso>
- <inet6>
- <filter>
- <input-list>PROTECTED_EXTERNAL_V6_HEAD_IN</input-list>
- <input-list>VL022_V6_MIDDLE_IN</input-list>
- <input-list>PROTECTED_EXTERNAL_V6_TAIL_OUT</input-list>
- <output-list>PROTECTED_EXTERNAL_V6_HEAD_OUT</output-list>
- <output-list>VL022_V6_MIDDLE_OUT</output-list>
- <output-list>PROTECTED_EXTERNAL_V6_TAIL_OUT</output-list>
- </filter>
- <address>
- <name>2001:0798:fc00:0013::1/126</name>
- </address>
- </inet6>
- </family>
- </unit>
- <unit>
- <name>23</name>
- <description>SRV_GLOBAL INFRASTRUCTURE ACCESS SRF0000001 | perfSONAR iDRAC</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS SRF0000001 | perfSONAR iDRAC</description>
<vlan-id>23</vlan-id>
<family>
<inet>
@@ -3409,7 +3127,7 @@
<description>PHY INFRASTRUCTURE GTS SERVER 9 | link to GTS SERVER 9</description>
<undocumented><enable/></undocumented>
<flexible-vlan-tagging/>
- <mtu>9192</mtu>
+ <mtu>9000</mtu>
<encapsulation>flexible-ethernet-services</encapsulation>
<unit>
<name>11</name>
@@ -3423,31 +3141,9 @@
</output-vlan-map>
</unit>
<unit>
- <name>12</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>12</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>13</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>13</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>14</name>
+ <name>18</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>14</vlan-id>
+ <vlan-id>18</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -3456,9 +3152,9 @@
</output-vlan-map>
</unit>
<unit>
- <name>15</name>
+ <name>19</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>15</vlan-id>
+ <vlan-id>19</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -3467,9 +3163,9 @@
</output-vlan-map>
</unit>
<unit>
- <name>16</name>
+ <name>20</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>16</vlan-id>
+ <vlan-id>20</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -3478,9 +3174,9 @@
</output-vlan-map>
</unit>
<unit>
- <name>17</name>
+ <name>21</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>17</vlan-id>
+ <vlan-id>21</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -3489,9 +3185,9 @@
</output-vlan-map>
</unit>
<unit>
- <name>18</name>
+ <name>22</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>18</vlan-id>
+ <vlan-id>22</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -3500,9 +3196,9 @@
</output-vlan-map>
</unit>
<unit>
- <name>20</name>
+ <name>23</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>20</vlan-id>
+ <vlan-id>23</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -3511,9 +3207,9 @@
</output-vlan-map>
</unit>
<unit>
- <name>21</name>
+ <name>24</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>21</vlan-id>
+ <vlan-id>24</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -3522,9 +3218,9 @@
</output-vlan-map>
</unit>
<unit>
- <name>22</name>
+ <name>25</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>22</vlan-id>
+ <vlan-id>25</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -3533,9 +3229,9 @@
</output-vlan-map>
</unit>
<unit>
- <name>23</name>
+ <name>26</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>23</vlan-id>
+ <vlan-id>26</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -3544,9 +3240,9 @@
</output-vlan-map>
</unit>
<unit>
- <name>24</name>
+ <name>27</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>24</vlan-id>
+ <vlan-id>27</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -3555,9 +3251,9 @@
</output-vlan-map>
</unit>
<unit>
- <name>25</name>
+ <name>28</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>25</vlan-id>
+ <vlan-id>28</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -3998,147 +3694,7 @@
<description>PHY INFRASTRUCTURE GTS SRF0000001 | link to GTS SERVER 8</description>
<undocumented><enable/></undocumented>
<flexible-vlan-tagging/>
- <mtu>9000</mtu>
- <encapsulation>flexible-ethernet-services</encapsulation>
- <unit>
- <name>11</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>11</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>12</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>12</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>13</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>13</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>14</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>14</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>15</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>15</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>16</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>16</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>17</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>17</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>18</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>18</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>19</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>19</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>20</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>20</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>21</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>21</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>22</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>22</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- </interface>
- <interface>
- <name>xe-3/0/0</name>
- <apply-groups>NO_TRAPS</apply-groups>
- <description>PHY INFRASTRUCTURE GTS SRF0000001 | GTS link to Server 0</description>
- <flexible-vlan-tagging/>
- <mtu>9000</mtu>
+ <mtu>9192</mtu>
<encapsulation>flexible-ethernet-services</encapsulation>
<unit>
<name>11</name>
@@ -4184,107 +3740,21 @@
<push/>
</output-vlan-map>
</unit>
- <unit>
- <name>15</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>15</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
<unit>
<name>16</name>
<encapsulation>vlan-ccc</encapsulation>
<vlan-id>16</vlan-id>
<input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>17</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>17</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>18</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>18</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>19</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>19</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>20</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>20</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>21</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>21</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>22</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>22</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- </interface>
- <interface>
- <name>xe-3/0/1</name>
- <apply-groups>NO_TRAPS</apply-groups>
- <description>PHY INFRASTRUCTURE GTS SRF0000001 | GTS link to Server 1</description>
- <undocumented><enable/></undocumented>
- <flexible-vlan-tagging/>
- <mtu>9000</mtu>
- <encapsulation>flexible-ethernet-services</encapsulation>
+ <pop/>
+ </input-vlan-map>
+ <output-vlan-map>
+ <push/>
+ </output-vlan-map>
+ </unit>
<unit>
- <name>11</name>
+ <name>17</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>11</vlan-id>
+ <vlan-id>17</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -4293,9 +3763,9 @@
</output-vlan-map>
</unit>
<unit>
- <name>12</name>
+ <name>18</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>12</vlan-id>
+ <vlan-id>18</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -4304,9 +3774,9 @@
</output-vlan-map>
</unit>
<unit>
- <name>13</name>
+ <name>19</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>13</vlan-id>
+ <vlan-id>19</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -4315,9 +3785,9 @@
</output-vlan-map>
</unit>
<unit>
- <name>14</name>
+ <name>20</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>14</vlan-id>
+ <vlan-id>20</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -4326,9 +3796,9 @@
</output-vlan-map>
</unit>
<unit>
- <name>15</name>
+ <name>21</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>15</vlan-id>
+ <vlan-id>21</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -4337,9 +3807,9 @@
</output-vlan-map>
</unit>
<unit>
- <name>16</name>
+ <name>22</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>16</vlan-id>
+ <vlan-id>22</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -4347,10 +3817,18 @@
<push/>
</output-vlan-map>
</unit>
+ </interface>
+ <interface>
+ <name>xe-3/0/0</name>
+ <apply-groups>NO_TRAPS</apply-groups>
+ <description>PHY INFRASTRUCTURE GTS SRF0000001 | GTS link to Server 0</description>
+ <flexible-vlan-tagging/>
+ <mtu>9192</mtu>
+ <encapsulation>flexible-ethernet-services</encapsulation>
<unit>
- <name>17</name>
+ <name>11</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>17</vlan-id>
+ <vlan-id>11</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -4359,9 +3837,9 @@
</output-vlan-map>
</unit>
<unit>
- <name>18</name>
+ <name>12</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>18</vlan-id>
+ <vlan-id>12</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -4369,10 +3847,19 @@
<push/>
</output-vlan-map>
</unit>
+ </interface>
+ <interface>
+ <name>xe-3/0/1</name>
+ <apply-groups>NO_TRAPS</apply-groups>
+ <description>PHY INFRASTRUCTURE GTS SRF0000001 | GTS link to Server 1</description>
+ <undocumented><enable/></undocumented>
+ <flexible-vlan-tagging/>
+ <mtu>9000</mtu>
+ <encapsulation>flexible-ethernet-services</encapsulation>
<unit>
- <name>19</name>
+ <name>11</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>19</vlan-id>
+ <vlan-id>11</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -4381,9 +3868,9 @@
</output-vlan-map>
</unit>
<unit>
- <name>20</name>
+ <name>12</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>20</vlan-id>
+ <vlan-id>12</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -4392,9 +3879,9 @@
</output-vlan-map>
</unit>
<unit>
- <name>21</name>
+ <name>13</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>21</vlan-id>
+ <vlan-id>13</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -4403,9 +3890,9 @@
</output-vlan-map>
</unit>
<unit>
- <name>23</name>
+ <name>14</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>23</vlan-id>
+ <vlan-id>14</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -4528,10 +4015,7 @@
</interface>
<interface>
<name>xe-3/2/0</name>
- <apply-groups>NO_TRAPS</apply-groups>
- <description>PHY INFRASTRUCTURE GTS SRF0000001 | link to GTS SERVER 4</description>
- <undocumented><enable/></undocumented>
- <mtu>9192</mtu>
+ <mtu>9000</mtu>
<encapsulation>ethernet-ccc</encapsulation>
<unit>
<name>0</name>
@@ -5223,6 +4707,9 @@
<clients>
<name>83.97.93.196/32</name>
</clients>
+ <clients>
+ <name>83.97.93.238/32</name>
+ </clients>
</community>
<community>
<name>As4n0gN!</name>
@@ -5704,13 +5191,13 @@
<import-rib>IAS.inet6.0</import-rib>
<import-policy>rtbh-policy</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias</name>
<import-rib>IAS.inet.0</import-rib>
<import-rib>CLEAN_IAS.inet.0</import-rib>
<import-policy>ps-into-clean-ias-import</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias-v6</name>
<import-rib>IAS.inet6.0</import-rib>
<import-rib>CLEAN_IAS.inet6.0</import-rib>
@@ -5787,291 +5274,128 @@
<ipv6-tunneling/>
<icmp-tunneling/>
<label-switched-path>
- <name>T-ham.cc-F-prg.cc-mpls3</name>
- <no-install-to-address/>
- <to>62.40.96.26</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-ham.cc-F-prg.cc-mpls4</name>
- <no-install-to-address/>
- <to>62.40.96.26</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-ham.cc-F-prg.cc-mpls1</name>
- <no-install-to-address/>
- <to>62.40.96.26</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-ham.cc-F-prg.cc-mpls2</name>
- <no-install-to-address/>
- <to>62.40.96.26</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-ham.cc-F-prg.cc-mpls5</name>
- <no-install-to-address/>
- <to>62.40.96.26</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-mad.cc-F-prg.cc-mpls1</name>
- <no-install-to-address/>
- <to>62.40.97.16</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-ham.cc-F-prg.cc-mpls6</name>
- <no-install-to-address/>
- <to>62.40.96.26</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-ham.cc-F-prg.cc-mpls7</name>
- <no-install-to-address/>
+ <name>T-ham.cc-F-prg.cc-mpls14</name>
<to>62.40.96.26</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-mad.cc-F-prg.cc-mpls2</name>
- <no-install-to-address/>
- <to>62.40.97.16</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-par.cc-F-prg.cc-mpls1</name>
- <no-install-to-address/>
- <to>62.40.97.13</to>
+ <name>T-bra.cc-F-prg.cc-mpls6</name>
+ <to>62.40.97.4</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-mil.cc-F-prg.cc-mpls1</name>
- <no-install-to-address/>
+ <name>T-mil.cc-F-prg.cc-mpls5</name>
<to>62.40.97.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-ams.cc-F-prg.cc-mpls1</name>
- <no-install-to-address/>
+ <name>T-ams.cc-F-prg.cc-mpls6</name>
<to>62.40.97.11</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-bra.cc-F-prg.cc-mpls1</name>
- <no-install-to-address/>
- <to>62.40.97.4</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-par.cc-F-prg.cc-mpls2</name>
- <no-install-to-address/>
- <to>62.40.97.13</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-par.cc-F-prg.cc-mpls3</name>
- <no-install-to-address/>
- <to>62.40.97.13</to>
+ <name>T-lon.cc-F-prg.cc-mpls7</name>
+ <to>62.40.96.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-par.cc-F-prg.cc-mpls4</name>
- <no-install-to-address/>
- <to>62.40.97.13</to>
+ <name>T-ham.cc-F-prg.cc-mpls5</name>
+ <to>62.40.96.26</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-par.cc-F-prg.cc-mpls5</name>
- <no-install-to-address/>
- <to>62.40.97.13</to>
+ <name>T-mil.cc-F-prg.cc-mpls3</name>
+ <to>62.40.97.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-bra.cc-F-prg.cc-mpls2</name>
- <no-install-to-address/>
+ <name>T-bra.cc-F-prg.cc-mpls3</name>
<to>62.40.97.4</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-mad.cc-F-prg.cc-mpls3</name>
- <no-install-to-address/>
+ <name>T-mad.cc-F-prg.cc-mpls4</name>
<to>62.40.97.16</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-lon.cc-F-prg.cc-mpls1</name>
- <no-install-to-address/>
- <to>62.40.96.15</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-lon.cc-F-prg.cc-mpls2</name>
- <no-install-to-address/>
- <to>62.40.96.15</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-lon.cc-F-prg.cc-mpls3</name>
- <no-install-to-address/>
- <to>62.40.96.15</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-lon.cc-F-prg.cc-mpls4</name>
- <no-install-to-address/>
- <to>62.40.96.15</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-mil.cc-F-prg.cc-mpls2</name>
- <no-install-to-address/>
- <to>62.40.97.15</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-ams.cc-F-prg.cc-mpls2</name>
- <no-install-to-address/>
+ <name>T-ams.cc-F-prg.cc-mpls8</name>
<to>62.40.97.11</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-ams.cc-F-prg.cc-mpls3</name>
- <no-install-to-address/>
- <to>62.40.97.11</to>
+ <name>T-par.cc-F-prg.cc-mpls6</name>
+ <to>62.40.97.13</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-ham.cc-F-prg.cc-mpls8</name>
- <no-install-to-address/>
+ <name>T-ham.cc-F-prg.cc-mpls13</name>
<to>62.40.96.26</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-ham.cc-F-prg.cc-mpls9</name>
- <no-install-to-address/>
- <to>62.40.96.26</to>
+ <name>T-lon.cc-F-prg.cc-mpls5</name>
+ <to>62.40.96.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-ham.cc-F-prg.cc-mpls10</name>
- <no-install-to-address/>
- <to>62.40.96.26</to>
+ <name>T-bra.cc-F-prg.cc-mpls4</name>
+ <to>62.40.97.4</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-ham.cc-F-prg.cc-mpls11</name>
- <no-install-to-address/>
- <to>62.40.96.26</to>
+ <name>T-mad.cc-F-prg.cc-mpls6</name>
+ <to>62.40.97.16</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-ams.cc-F-prg.cc-mpls6</name>
- <no-install-to-address/>
- <to>62.40.97.11</to>
+ <name>T-ham.cc-F-prg.cc-mpls15</name>
+ <to>62.40.96.26</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-lon.cc-F-prg.cc-mpls7</name>
- <no-install-to-address/>
+ <name>T-lon.cc-F-prg.cc-mpls6</name>
<to>62.40.96.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-ham.cc-F-prg.cc-mpls14</name>
- <no-install-to-address/>
- <to>62.40.96.26</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-mil.cc-F-prg.cc-mpls5</name>
- <no-install-to-address/>
+ <name>T-mil.cc-F-prg.cc-mpls4</name>
<to>62.40.97.15</to>
<no-cspf/>
</label-switched-path>
- <label-switched-path>
- <name>T-bra.cc-F-prg.cc-mpls6</name>
- <no-install-to-address/>
- <to>62.40.97.4</to>
- <no-cspf/>
- </label-switched-path>
<label-switched-path>
<name>T-ham.cc-F-prg.cc-mpls12</name>
- <no-install-to-address/>
<to>62.40.96.26</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-ams.cc-F-prg.cc-mpls8</name>
- <no-install-to-address/>
- <to>62.40.97.11</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-lon.cc-F-prg.cc-mpls5</name>
- <no-install-to-address/>
- <to>62.40.96.15</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-mad.cc-F-prg.cc-mpls4</name>
- <no-install-to-address/>
- <to>62.40.97.16</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-bra.cc-F-prg.cc-mpls3</name>
- <no-install-to-address/>
- <to>62.40.97.4</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-mil.cc-F-prg.cc-mpls3</name>
- <no-install-to-address/>
+ <name>T-mil.cc-F-prg.cc-mpls6</name>
<to>62.40.97.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-ham.cc-F-prg.cc-mpls13</name>
- <no-install-to-address/>
- <to>62.40.96.26</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-par.cc-F-prg.cc-mpls6</name>
- <no-install-to-address/>
+ <name>T-par.cc-F-prg.cc-mpls8</name>
<to>62.40.97.13</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-lon.cc-F-prg.cc-mpls6</name>
- <no-install-to-address/>
- <to>62.40.96.15</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-bra.cc-F-prg.cc-mpls4</name>
- <no-install-to-address/>
- <to>62.40.97.4</to>
+ <name>T-ams.cc-F-prg.cc-mpls4</name>
+ <to>62.40.97.11</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-mad.cc-F-prg.cc-mpls6</name>
- <no-install-to-address/>
- <to>62.40.97.16</to>
+ <name>T-ham.cc-F-prg.cc-mpls1</name>
+ <to>62.40.96.26</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-ham.cc-F-prg.cc-mpls15</name>
- <no-install-to-address/>
- <to>62.40.96.26</to>
+ <name>T-mil.cc-F-prg.cc-mpls7</name>
+ <to>62.40.97.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-mil.cc-F-prg.cc-mpls4</name>
- <no-install-to-address/>
- <to>62.40.97.15</to>
+ <name>T-par.cc-F-prg.cc-mpls7</name>
+ <to>62.40.97.13</to>
<no-cspf/>
</label-switched-path>
<interface>
@@ -6816,31 +6140,13 @@
<version>2</version>
</interface>
<interface>
- <name>fxp0.0</name>
- <disable/>
- </interface>
- </pim>
- <connections>
- <interface-switch>
- <name>GTS-local-PR-8f9b3258ec</name>
- <interface>
- <name>xe-2/3/3.13</name>
- </interface>
- <interface>
- <name>xe-3/0/0.12</name>
- </interface>
- </interface-switch>
- <interface-switch>
- <name>GTS-local-PR-11d2db7716</name>
- <interface>
- <name>xe-2/3/3.14</name>
- </interface>
- <interface>
- <name>xe-2/3/3.12</name>
- </interface>
- </interface-switch>
+ <name>fxp0.0</name>
+ <disable/>
+ </interface>
+ </pim>
+ <connections>
<interface-switch>
- <name>GTS-local-PR-a9cbbba6a1</name>
+ <name>NSI-PR-a9cbbba6a1</name>
<interface>
<name>xe-2/3/3.11</name>
</interface>
@@ -6849,115 +6155,25 @@
</interface>
</interface-switch>
<interface-switch>
- <name>GTS-local-PR-7c828cebfd</name>
- <interface>
- <name>xe-3/0/0.20</name>
- </interface>
- <interface>
- <name>xe-3/0/0.15</name>
- </interface>
- </interface-switch>
- <interface-switch>
- <name>GTS-local-PR-44d984ba5c</name>
- <interface>
- <name>xe-3/0/0.17</name>
- </interface>
- <interface>
- <name>xe-3/0/1.14</name>
- </interface>
- </interface-switch>
- <interface-switch>
- <name>GTS-local-PR-07ddddec5e</name>
- <interface>
- <name>xe-3/0/0.21</name>
- </interface>
- <interface>
- <name>xe-3/0/0.13</name>
- </interface>
- </interface-switch>
- <interface-switch>
- <name>GTS-local-PR-7b45ce59d6</name>
- <interface>
- <name>xe-3/0/1.18</name>
- </interface>
- <interface>
- <name>xe-3/0/0.14</name>
- </interface>
- </interface-switch>
- <interface-switch>
- <name>GTS-local-PR-a747e7152f</name>
- <interface>
- <name>xe-3/0/1.17</name>
- </interface>
- <interface>
- <name>xe-3/0/0.16</name>
- </interface>
- </interface-switch>
- <interface-switch>
- <name>GTS-local-PR-e5c110daa2</name>
- <interface>
- <name>xe-3/0/1.19</name>
- </interface>
- <interface>
- <name>xe-3/0/1.13</name>
- </interface>
- </interface-switch>
- <interface-switch>
- <name>GTS-local-PR-11c50685ca</name>
- <interface>
- <name>xe-3/0/1.20</name>
- </interface>
- <interface>
- <name>xe-3/0/1.11</name>
- </interface>
- </interface-switch>
- <interface-switch>
- <name>GTS-local-PR-23ac101671</name>
- <interface>
- <name>xe-3/0/0.22</name>
- </interface>
- <interface>
- <name>xe-3/0/1.12</name>
- </interface>
- </interface-switch>
- <interface-switch>
- <name>GTS-local-PR-7d649a82f7</name>
- <interface>
- <name>ge-0/3/7.1304</name>
- </interface>
- <interface>
- <name>ge-0/3/7.33</name>
- </interface>
- </interface-switch>
- <interface-switch>
- <name>GTS-local-PR-78e34a6b64</name>
- <interface>
- <name>ge-0/3/7.1305</name>
- </interface>
- <interface>
- <name>ge-0/3/7.34</name>
- </interface>
- </interface-switch>
- <interface-switch>
- <name>GTS-local-PR-104896392f</name>
+ <name>NSI-PR-11d2db7716</name>
<interface>
- <name>ge-0/3/7.1306</name>
+ <name>xe-2/3/3.14</name>
</interface>
<interface>
- <name>ge-0/3/7.35</name>
+ <name>xe-2/3/3.12</name>
</interface>
</interface-switch>
<interface-switch>
- <name>GTS-local-PR-669d7a2b06</name>
+ <name>NSI-PR-8f9b3258ec</name>
<interface>
- <name>ge-0/3/7.1307</name>
+ <name>xe-2/3/3.13</name>
</interface>
<interface>
- <name>ge-0/3/7.36</name>
+ <name>xe-3/0/0.12</name>
</interface>
</interface-switch>
<interface-switch>
- <name>GTS-local-PR-cdd8694f49</name>
+ <name>NSI-PR-cdd8694f49</name>
<interface>
<name>xe-3/0/1.35</name>
</interface>
@@ -6966,25 +6182,25 @@
</interface>
</interface-switch>
<interface-switch>
- <name>GTS-local-PR-e76bf1f3ed</name>
+ <name>NSI-PR-248ff63f6b</name>
<interface>
- <name>xe-3/0/1.36</name>
+ <name>xe-3/0/1.37</name>
</interface>
<interface>
- <name>xe-2/1/0.17</name>
+ <name>xe-2/1/0.16</name>
</interface>
</interface-switch>
<interface-switch>
- <name>GTS-local-PR-248ff63f6b</name>
+ <name>NSI-PR-e76bf1f3ed</name>
<interface>
- <name>xe-3/0/1.37</name>
+ <name>xe-3/0/1.36</name>
</interface>
<interface>
- <name>xe-2/1/0.16</name>
+ <name>xe-2/1/0.17</name>
</interface>
</interface-switch>
<interface-switch>
- <name>GTS-local-PR-080a73b12c</name>
+ <name>NSI-PR-080a73b12c</name>
<interface>
<name>xe-1/0/0.20</name>
</interface>
@@ -6993,7 +6209,7 @@
</interface>
</interface-switch>
<interface-switch>
- <name>GTS-local-PR-6a28daffdc</name>
+ <name>NSI-PR-6a28daffdc</name>
<interface>
<name>xe-1/0/0.21</name>
</interface>
@@ -7002,320 +6218,164 @@
</interface>
</interface-switch>
<interface-switch>
- <name>GTS-local-PR-34a2bbfd2d</name>
- <interface>
- <name>xe-1/0/0.14</name>
- </interface>
- <interface>
- <name>xe-1/0/0.12</name>
- </interface>
- </interface-switch>
- <interface-switch>
- <name>GTS-local-PR-6543712622</name>
- <interface>
- <name>xe-1/0/0.16</name>
- </interface>
- <interface>
- <name>xe-1/0/0.13</name>
- </interface>
- </interface-switch>
- <interface-switch>
- <name>GTS-local-PR-92bbe1508d</name>
+ <name>NSI-PR-c2e0bbdf7d</name>
<interface>
- <name>xe-1/0/0.17</name>
+ <name>xe-3/0/1.11</name>
</interface>
<interface>
- <name>xe-1/0/0.15</name>
+ <name>xe-1/0/0.19</name>
</interface>
</interface-switch>
<remote-interface-switch>
- <name>GTS-local-PR-e65930296b</name>
- <interface>xe-3/0/0.19</interface>
- <transmit-lsp>T-ham.cc-F-prg.cc-mpls3</transmit-lsp>
- <receive-lsp>T-prg.cc-F-ham.cc-mpls3</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-PR-bb89f8d0f8</name>
- <interface>xe-3/0/0.18</interface>
- <transmit-lsp>T-ham.cc-F-prg.cc-mpls4</transmit-lsp>
- <receive-lsp>T-prg.cc-F-ham.cc-mpls4</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-PR-01a0655bd3</name>
- <interface>xe-3/0/1.16</interface>
- <transmit-lsp>T-ham.cc-F-prg.cc-mpls1</transmit-lsp>
- <receive-lsp>T-prg.cc-F-ham.cc-mpls1</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-PR-048ec49973</name>
- <interface>xe-3/0/1.15</interface>
- <transmit-lsp>T-ham.cc-F-prg.cc-mpls2</transmit-lsp>
- <receive-lsp>T-prg.cc-F-ham.cc-mpls2</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-PR-88be0c34cc</name>
- <interface>xe-1/0/0.11</interface>
- <transmit-lsp>T-ham.cc-F-prg.cc-mpls5</transmit-lsp>
- <receive-lsp>T-prg.cc-F-ham.cc-mpls5</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-PR-a499d4711e</name>
- <interface>xe-3/0/1.21</interface>
- <transmit-lsp>T-mad.cc-F-prg.cc-mpls1</transmit-lsp>
- <receive-lsp>T-prg.cc-F-mad.cc-mpls1</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-PR-38214d33b6</name>
- <interface>xe-3/0/1.23</interface>
- <transmit-lsp>T-ham.cc-F-prg.cc-mpls6</transmit-lsp>
- <receive-lsp>T-prg.cc-F-ham.cc-mpls6</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-PR-b877e0e43e</name>
- <interface>xe-2/3/3.15</interface>
- <transmit-lsp>T-ham.cc-F-prg.cc-mpls7</transmit-lsp>
- <receive-lsp>T-prg.cc-F-ham.cc-mpls7</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-PR-0900830f91</name>
- <interface>ge-0/3/7.11</interface>
- <transmit-lsp>T-mad.cc-F-prg.cc-mpls2</transmit-lsp>
- <receive-lsp>T-prg.cc-F-mad.cc-mpls2</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-PR-65a1dbcde9</name>
- <interface>ge-0/3/7.12</interface>
- <transmit-lsp>T-par.cc-F-prg.cc-mpls1</transmit-lsp>
- <receive-lsp>T-prg.cc-F-par.cc-mpls1</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-PR-558ede63d8</name>
- <interface>ge-0/3/7.13</interface>
- <transmit-lsp>T-mil.cc-F-prg.cc-mpls1</transmit-lsp>
- <receive-lsp>T-prg.cc-F-mil.cc-mpls1</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-PR-608e704192</name>
- <interface>ge-0/3/7.26</interface>
- <transmit-lsp>T-ams.cc-F-prg.cc-mpls1</transmit-lsp>
- <receive-lsp>T-prg.cc-F-ams.cc-mpls1</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-PR-6150375887</name>
- <interface>ge-0/3/7.14</interface>
- <transmit-lsp>T-bra.cc-F-prg.cc-mpls1</transmit-lsp>
- <receive-lsp>T-prg.cc-F-bra.cc-mpls1</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-PR-354e6c1033</name>
- <interface>ge-0/3/7.15</interface>
- <transmit-lsp>T-par.cc-F-prg.cc-mpls2</transmit-lsp>
- <receive-lsp>T-prg.cc-F-par.cc-mpls2</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-PR-ee12311e12</name>
- <interface>ge-0/3/7.16</interface>
- <transmit-lsp>T-par.cc-F-prg.cc-mpls3</transmit-lsp>
- <receive-lsp>T-prg.cc-F-par.cc-mpls3</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-PR-b7d73ee660</name>
- <interface>ge-0/3/7.17</interface>
- <transmit-lsp>T-par.cc-F-prg.cc-mpls4</transmit-lsp>
- <receive-lsp>T-prg.cc-F-par.cc-mpls4</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-PR-4d5ff47926</name>
- <interface>ge-0/3/7.18</interface>
- <transmit-lsp>T-par.cc-F-prg.cc-mpls5</transmit-lsp>
- <receive-lsp>T-prg.cc-F-par.cc-mpls5</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-PR-f295ff388f</name>
- <interface>ge-0/3/7.19</interface>
- <transmit-lsp>T-bra.cc-F-prg.cc-mpls2</transmit-lsp>
- <receive-lsp>T-prg.cc-F-bra.cc-mpls2</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-PR-8b1a8d1d5e</name>
- <interface>ge-0/3/7.20</interface>
- <transmit-lsp>T-mad.cc-F-prg.cc-mpls3</transmit-lsp>
- <receive-lsp>T-prg.cc-F-mad.cc-mpls3</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-PR-eaab35d792</name>
- <interface>ge-0/3/7.21</interface>
- <transmit-lsp>T-lon.cc-F-prg.cc-mpls1</transmit-lsp>
- <receive-lsp>T-prg.cc-F-lon.cc-mpls1</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-PR-c6fa9ad7a1</name>
- <interface>ge-0/3/7.22</interface>
- <transmit-lsp>T-lon.cc-F-prg.cc-mpls2</transmit-lsp>
- <receive-lsp>T-prg.cc-F-lon.cc-mpls2</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-PR-fce9626b49</name>
- <interface>ge-0/3/7.23</interface>
- <transmit-lsp>T-lon.cc-F-prg.cc-mpls3</transmit-lsp>
- <receive-lsp>T-prg.cc-F-lon.cc-mpls3</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-PR-42b092cc76</name>
- <interface>ge-0/3/7.24</interface>
- <transmit-lsp>T-lon.cc-F-prg.cc-mpls4</transmit-lsp>
- <receive-lsp>T-prg.cc-F-lon.cc-mpls4</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-PR-d18c518dce</name>
- <interface>ge-0/3/7.25</interface>
- <transmit-lsp>T-mil.cc-F-prg.cc-mpls2</transmit-lsp>
- <receive-lsp>T-prg.cc-F-mil.cc-mpls2</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-PR-11314732f2</name>
- <interface>ge-0/3/7.27</interface>
- <transmit-lsp>T-ams.cc-F-prg.cc-mpls2</transmit-lsp>
- <receive-lsp>T-prg.cc-F-ams.cc-mpls2</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-PR-6556d59143</name>
- <interface>ge-0/3/7.28</interface>
- <transmit-lsp>T-ams.cc-F-prg.cc-mpls3</transmit-lsp>
- <receive-lsp>T-prg.cc-F-ams.cc-mpls3</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-PR-c171404d9c</name>
- <interface>ge-0/3/7.29</interface>
- <transmit-lsp>T-ham.cc-F-prg.cc-mpls8</transmit-lsp>
- <receive-lsp>T-prg.cc-F-ham.cc-mpls8</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-PR-8f48fa555b</name>
- <interface>ge-0/3/7.30</interface>
- <transmit-lsp>T-ham.cc-F-prg.cc-mpls9</transmit-lsp>
- <receive-lsp>T-prg.cc-F-ham.cc-mpls9</receive-lsp>
+ <name>PR-760cc65c48</name>
+ <interface>xe-3/0/1.32</interface>
+ <transmit-lsp>T-ham.cc-F-prg.cc-mpls14</transmit-lsp>
+ <receive-lsp>T-prg.cc-F-ham.cc-mpls14</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-PR-a540d09105</name>
- <interface>ge-0/3/7.31</interface>
- <transmit-lsp>T-ham.cc-F-prg.cc-mpls10</transmit-lsp>
- <receive-lsp>T-prg.cc-F-ham.cc-mpls10</receive-lsp>
+ <name>PR-5414547719</name>
+ <interface>xe-3/0/1.33</interface>
+ <transmit-lsp>T-bra.cc-F-prg.cc-mpls6</transmit-lsp>
+ <receive-lsp>T-prg.cc-F-bra.cc-mpls6</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-PR-67ff7d244e</name>
- <interface>ge-0/3/7.32</interface>
- <transmit-lsp>T-ham.cc-F-prg.cc-mpls11</transmit-lsp>
- <receive-lsp>T-prg.cc-F-ham.cc-mpls11</receive-lsp>
+ <name>PR-4d2b505ade</name>
+ <interface>xe-3/0/1.25</interface>
+ <transmit-lsp>T-mil.cc-F-prg.cc-mpls5</transmit-lsp>
+ <receive-lsp>T-prg.cc-F-mil.cc-mpls5</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-PR-d104ea1fa1</name>
+ <name>PR-d104ea1fa1</name>
<interface>xe-3/0/1.26</interface>
<transmit-lsp>T-ams.cc-F-prg.cc-mpls6</transmit-lsp>
<receive-lsp>T-prg.cc-F-ams.cc-mpls6</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-PR-9b76c74b3b</name>
+ <name>PR-9b76c74b3b</name>
<interface>xe-3/0/1.31</interface>
<transmit-lsp>T-lon.cc-F-prg.cc-mpls7</transmit-lsp>
<receive-lsp>T-prg.cc-F-lon.cc-mpls7</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-PR-760cc65c48</name>
- <interface>xe-3/0/1.32</interface>
- <transmit-lsp>T-ham.cc-F-prg.cc-mpls14</transmit-lsp>
- <receive-lsp>T-prg.cc-F-ham.cc-mpls14</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-PR-4d2b505ade</name>
- <interface>xe-3/0/1.25</interface>
- <transmit-lsp>T-mil.cc-F-prg.cc-mpls5</transmit-lsp>
- <receive-lsp>T-prg.cc-F-mil.cc-mpls5</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-PR-5414547719</name>
- <interface>xe-3/0/1.33</interface>
- <transmit-lsp>T-bra.cc-F-prg.cc-mpls6</transmit-lsp>
- <receive-lsp>T-prg.cc-F-bra.cc-mpls6</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-PR-9561daf2fa</name>
- <interface>xe-3/2/0.0</interface>
- <transmit-lsp>T-ham.cc-F-prg.cc-mpls12</transmit-lsp>
- <receive-lsp>T-prg.cc-F-ham.cc-mpls12</receive-lsp>
+ <name>PR-88be0c34cc</name>
+ <interface>xe-1/0/0.11</interface>
+ <transmit-lsp>T-ham.cc-F-prg.cc-mpls5</transmit-lsp>
+ <receive-lsp>T-prg.cc-F-ham.cc-mpls5</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-PR-6c35968184</name>
- <interface>xe-2/3/3.22</interface>
- <transmit-lsp>T-ams.cc-F-prg.cc-mpls8</transmit-lsp>
- <receive-lsp>T-prg.cc-F-ams.cc-mpls8</receive-lsp>
+ <name>PR-915e5951c3</name>
+ <interface>xe-2/3/3.18</interface>
+ <transmit-lsp>T-mil.cc-F-prg.cc-mpls3</transmit-lsp>
+ <receive-lsp>T-prg.cc-F-mil.cc-mpls3</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-PR-b28238eb4e</name>
- <interface>xe-2/3/3.20</interface>
- <transmit-lsp>T-lon.cc-F-prg.cc-mpls5</transmit-lsp>
- <receive-lsp>T-prg.cc-F-lon.cc-mpls5</receive-lsp>
+ <name>PR-8296e59d22</name>
+ <interface>xe-2/3/3.17</interface>
+ <transmit-lsp>T-bra.cc-F-prg.cc-mpls3</transmit-lsp>
+ <receive-lsp>T-prg.cc-F-bra.cc-mpls3</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-PR-c8f11b7b56</name>
+ <name>PR-c8f11b7b56</name>
<interface>xe-2/3/3.19</interface>
<transmit-lsp>T-mad.cc-F-prg.cc-mpls4</transmit-lsp>
<receive-lsp>T-prg.cc-F-mad.cc-mpls4</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-PR-8296e59d22</name>
- <interface>xe-2/3/3.17</interface>
- <transmit-lsp>T-bra.cc-F-prg.cc-mpls3</transmit-lsp>
- <receive-lsp>T-prg.cc-F-bra.cc-mpls3</receive-lsp>
+ <name>PR-6c35968184</name>
+ <interface>xe-2/3/3.22</interface>
+ <transmit-lsp>T-ams.cc-F-prg.cc-mpls8</transmit-lsp>
+ <receive-lsp>T-prg.cc-F-ams.cc-mpls8</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-PR-915e5951c3</name>
- <interface>xe-2/3/3.18</interface>
- <transmit-lsp>T-mil.cc-F-prg.cc-mpls3</transmit-lsp>
- <receive-lsp>T-prg.cc-F-mil.cc-mpls3</receive-lsp>
+ <name>PR-f70cad54e2</name>
+ <interface>xe-2/3/3.16</interface>
+ <transmit-lsp>T-par.cc-F-prg.cc-mpls6</transmit-lsp>
+ <receive-lsp>T-prg.cc-F-par.cc-mpls6</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-PR-a28239eecf</name>
+ <name>PR-a28239eecf</name>
<interface>xe-2/3/3.21</interface>
<transmit-lsp>T-ham.cc-F-prg.cc-mpls13</transmit-lsp>
<receive-lsp>T-prg.cc-F-ham.cc-mpls13</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-PR-f70cad54e2</name>
- <interface>xe-2/3/3.16</interface>
- <transmit-lsp>T-par.cc-F-prg.cc-mpls6</transmit-lsp>
- <receive-lsp>T-prg.cc-F-par.cc-mpls6</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-PR-de6b227283</name>
- <interface>xe-1/0/0.25</interface>
- <transmit-lsp>T-lon.cc-F-prg.cc-mpls6</transmit-lsp>
- <receive-lsp>T-prg.cc-F-lon.cc-mpls6</receive-lsp>
+ <name>PR-b28238eb4e</name>
+ <interface>xe-2/3/3.20</interface>
+ <transmit-lsp>T-lon.cc-F-prg.cc-mpls5</transmit-lsp>
+ <receive-lsp>T-prg.cc-F-lon.cc-mpls5</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-PR-8c46d96ee6</name>
+ <name>PR-8c46d96ee6</name>
<interface>xe-1/0/0.22</interface>
<transmit-lsp>T-bra.cc-F-prg.cc-mpls4</transmit-lsp>
<receive-lsp>T-prg.cc-F-bra.cc-mpls4</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-PR-65eba7ee79</name>
+ <name>PR-65eba7ee79</name>
<interface>xe-1/0/0.24</interface>
<transmit-lsp>T-mad.cc-F-prg.cc-mpls6</transmit-lsp>
<receive-lsp>T-prg.cc-F-mad.cc-mpls6</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-PR-d278153947</name>
+ <name>PR-d278153947</name>
<interface>xe-1/0/0.23</interface>
<transmit-lsp>T-ham.cc-F-prg.cc-mpls15</transmit-lsp>
<receive-lsp>T-prg.cc-F-ham.cc-mpls15</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-PR-8457aadbf3</name>
+ <name>PR-de6b227283</name>
+ <interface>xe-1/0/0.25</interface>
+ <transmit-lsp>T-lon.cc-F-prg.cc-mpls6</transmit-lsp>
+ <receive-lsp>T-prg.cc-F-lon.cc-mpls6</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>PR-8457aadbf3</name>
<interface>xe-1/0/0.18</interface>
<transmit-lsp>T-mil.cc-F-prg.cc-mpls4</transmit-lsp>
<receive-lsp>T-prg.cc-F-mil.cc-mpls4</receive-lsp>
</remote-interface-switch>
+ <remote-interface-switch>
+ <name>PR-9561daf2fa</name>
+ <interface>xe-3/2/0.0</interface>
+ <transmit-lsp>T-ham.cc-F-prg.cc-mpls12</transmit-lsp>
+ <receive-lsp>T-prg.cc-F-ham.cc-mpls12</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>PR-f0b4cffb7e</name>
+ <interface>xe-1/0/0.26</interface>
+ <transmit-lsp>T-mil.cc-F-prg.cc-mpls6</transmit-lsp>
+ <receive-lsp>T-prg.cc-F-mil.cc-mpls6</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>PR-00bbd339e5</name>
+ <interface>xe-3/0/1.13</interface>
+ <transmit-lsp>T-par.cc-F-prg.cc-mpls8</transmit-lsp>
+ <receive-lsp>T-prg.cc-F-par.cc-mpls8</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>PR-fbc4afbf10</name>
+ <interface>xe-3/0/1.14</interface>
+ <transmit-lsp>T-ams.cc-F-prg.cc-mpls4</transmit-lsp>
+ <receive-lsp>T-prg.cc-F-ams.cc-mpls4</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>PR-7764a60103</name>
+ <interface>xe-1/0/0.28</interface>
+ <transmit-lsp>T-ham.cc-F-prg.cc-mpls1</transmit-lsp>
+ <receive-lsp>T-prg.cc-F-ham.cc-mpls1</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>PR-c908f7b932</name>
+ <interface>xe-3/0/1.12</interface>
+ <transmit-lsp>T-mil.cc-F-prg.cc-mpls7</transmit-lsp>
+ <receive-lsp>T-prg.cc-F-mil.cc-mpls7</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>PR-f4157da72f</name>
+ <interface>xe-1/0/0.27</interface>
+ <transmit-lsp>T-par.cc-F-prg.cc-mpls7</transmit-lsp>
+ <receive-lsp>T-prg.cc-F-par.cc-mpls7</receive-lsp>
+ </remote-interface-switch>
</connections>
<l2circuit>
<traceoptions>
@@ -7692,16 +6752,13 @@
</prefix-list>
<prefix-list>
<name>geantncc-address-space</name>
- <comment>/* NCC DR VPN LAN */</comment>
+ <comment>/* NCC DR VPN */</comment>
<prefix-list-item>
- <name>62.40.108.192/26</name>
+ <name>62.40.108.192/27</name>
</prefix-list-item>
<prefix-list-item>
<name>62.40.119.0/24</name>
</prefix-list-item>
- <prefix-list-item>
- <name>62.40.119.134/32</name>
- </prefix-list-item>
<prefix-list-item>
<name>62.40.125.250/32</name>
</prefix-list-item>
@@ -11019,6 +10076,9 @@
<prefix-list-item>
<name>176.103.224.0/20</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>176.111.168.0/22</name>
+ </prefix-list-item>
<prefix-list-item>
<name>178.172.212.0/24</name>
</prefix-list-item>
@@ -11493,6 +10553,21 @@
<prefix-list-item>
<name>193.84.116.0/23</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>193.84.124.0/22</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>193.84.124.0/24</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>193.84.125.0/24</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>193.84.126.0/24</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>193.84.127.0/24</name>
+ </prefix-list-item>
<prefix-list-item>
<name>193.84.160.0/20</name>
</prefix-list-item>
@@ -12576,6 +11651,9 @@
<prefix-list-item>
<name>2001:678:618::/48</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>2001:678:8d4::/48</name>
+ </prefix-list-item>
<prefix-list-item>
<name>2001:67c:64::/48</name>
</prefix-list-item>
@@ -12876,6 +11954,9 @@
<prefix-list-item>
<name>2a00:fc00:e009::/48</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>2a01:190:15ed::/48</name>
+ </prefix-list-item>
<prefix-list-item>
<name>2a01:1d8::/30</name>
</prefix-list-item>
@@ -13038,6 +12119,15 @@
<prefix-list-item>
<name>2a07:8d87::/32</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>2a07:dd40::/29</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>2a09:c400::/30</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>2a09:c404::/30</name>
+ </prefix-list-item>
<prefix-list-item>
<name>2a0a:8bc0::/29</name>
</prefix-list-item>
@@ -14855,6 +13945,14 @@
</prefix-list>
<prefix-list>
<name>corporate-address-space</name>
+ <comment>/* LON2 CORP VPN (MAC) */</comment>
+ <prefix-list-item>
+ <name>62.40.99.194/32</name>
+ </prefix-list-item>
+ <comment>/* LON2 CORP VPN */</comment>
+ <prefix-list-item>
+ <name>62.40.99.201/32</name>
+ </prefix-list-item>
<prefix-list-item>
<name>62.40.119.128/25</name>
</prefix-list-item>
@@ -14943,6 +14041,18 @@
<name>2001:798::/32</name>
</prefix-list-item>
</prefix-list>
+ <prefix-list>
+ <name>opennsa-servers</name>
+ <prefix-list-item>
+ <name>83.97.93.92/32</name>
+ </prefix-list-item>
+ </prefix-list>
+ <prefix-list>
+ <name>opennsa-servers-v6</name>
+ <prefix-list-item>
+ <name>2001:798:3::15f/128</name>
+ </prefix-list-item>
+ </prefix-list>
<policy-statement>
<name>ASM-Allow</name>
<term>
@@ -15216,6 +14326,15 @@
</then>
</term>
</policy-statement>
+ <policy-statement>
+ <name>IAS_PS-FROM-PUBLIC-PEER_AS32934_Facebook</name>
+ <term>
+ <name>NEXT_POLICY</name>
+ <then>
+ <next>policy</next>
+ </then>
+ </term>
+ </policy-statement>
<policy-statement>
<name>IAS_PS-FROM-PUBLIC-PEER_AS33891_Core-Backbone_GmbH</name>
<term>
@@ -16114,6 +15233,100 @@
</then>
</term>
</policy-statement>
+ <policy-statement>
+ <name>IAS_PS-TO-PUBLIC-PEER_AS32934_Facebook</name>
+ <term>
+ <name>BLOCK_THIS_PEER</name>
+ <from>
+ <community>TE_BLOCK_AS32934</community>
+ <community>TE_BLOCK_AS32934_2</community>
+ <community>TE_BLOCK_AS32934_NIX.CZ</community>
+ <community>TE_BLOCK_AS32934_NIX.CZ_2</community>
+ </from>
+ <then>
+ <reject/>
+ </then>
+ </term>
+ <term>
+ <name>PREPEND_THIS_PEER_x1</name>
+ <from>
+ <community>TE_PREPEND_AS32934_x1_4byte</community>
+ <community>TE_PREPEND_AS32934_x1_2byte</community>
+ </from>
+ <then>
+ <as-path-expand>
+ <aspath>21320</aspath>
+ </as-path-expand>
+ </then>
+ </term>
+ <term>
+ <name>PREPEND_THIS_PEER_x2</name>
+ <from>
+ <community>TE_PREPEND_AS32934_x2_4byte</community>
+ <community>TE_PREPEND_AS32934_x2_2byte</community>
+ </from>
+ <then>
+ <as-path-expand>
+ <aspath>21320 21320</aspath>
+ </as-path-expand>
+ </then>
+ </term>
+ <term>
+ <name>PREPEND_THIS_PEER_x3</name>
+ <from>
+ <community>TE_PREPEND_AS32934_x3_4byte</community>
+ <community>TE_PREPEND_AS32934_x3_2byte</community>
+ </from>
+ <then>
+ <as-path-expand>
+ <aspath>21320 21320 21320</aspath>
+ </as-path-expand>
+ </then>
+ </term>
+ <term>
+ <name>PREPEND_THIS_PEER_x6</name>
+ <from>
+ <community>TE_PREPEND_AS32934_x6_4byte</community>
+ <community>TE_PREPEND_AS32934_x6_2byte</community>
+ </from>
+ <then>
+ <as-path-expand>
+ <aspath>21320 21320 21320 21320 21320 21320</aspath>
+ </as-path-expand>
+ </then>
+ </term>
+ <term>
+ <name>ANNOUNCE</name>
+ <from>
+ <community>TE_ANNOUNCE_AS32934</community>
+ <community>TE_ANNOUNCE_AS32934_2</community>
+ <community>TE_ANNOUNCE_AS32934_3</community>
+ <community>TE_ANNOUNCE_AS32934_4</community>
+ <community>TE_ANNOUNCE_ALL_PUBLIC_PEERS</community>
+ <community>TE_ANNOUNCE_ALL_PUBLIC_PEERS_2</community>
+ <community>TE_ANNOUNCE_ALL_PUBLIC_PEERS_3</community>
+ <community>TE_ANNOUNCE_AS32934_NIX.CZ</community>
+ <community>TE_ANNOUNCE_AS32934_NIX.CZ_2</community>
+ </from>
+ <then>
+ <metric>
+ <igp>
+ </igp>
+ </metric>
+ <community>
+ <delete/>
+ <community-name>TE_PRIVATE_COMMUNITIES</community-name>
+ </community>
+ <accept/>
+ </then>
+ </term>
+ <term>
+ <name>NEXT_POLICY</name>
+ <then>
+ <next>policy</next>
+ </then>
+ </term>
+ </policy-statement>
<policy-statement>
<name>IAS_PS-TO-PUBLIC-PEER_AS33891_Core-Backbone_GmbH</name>
<term>
@@ -17179,6 +16392,10 @@
<address>80.81.192.0/21</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>193.188.137.0/24</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -17296,6 +16513,10 @@
<address>2001:7f8:36::/64</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>2001:7f8:35::/64</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -19289,6 +18510,30 @@
<name>TE_ANNOUNCE_AS30134_NIX.CZ_2</name>
<members>origin:30134L:64791</members>
</community>
+ <community>
+ <name>TE_ANNOUNCE_AS32934</name>
+ <members>64700:32934</members>
+ </community>
+ <community>
+ <name>TE_ANNOUNCE_AS32934_2</name>
+ <members>64712:32934</members>
+ </community>
+ <community>
+ <name>TE_ANNOUNCE_AS32934_3</name>
+ <members>origin:32934L:64700</members>
+ </community>
+ <community>
+ <name>TE_ANNOUNCE_AS32934_4</name>
+ <members>origin:32934L:64712</members>
+ </community>
+ <community>
+ <name>TE_ANNOUNCE_AS32934_NIX.CZ</name>
+ <members>64791:32934</members>
+ </community>
+ <community>
+ <name>TE_ANNOUNCE_AS32934_NIX.CZ_2</name>
+ <members>origin:32934L:64791</members>
+ </community>
<community>
<name>TE_ANNOUNCE_AS33891</name>
<members>64700:33891</members>
@@ -19613,6 +18858,22 @@
<name>TE_BLOCK_AS30134_NIX.CZ_2</name>
<members>origin:30134L:64591</members>
</community>
+ <community>
+ <name>TE_BLOCK_AS32934</name>
+ <members>64512:32934</members>
+ </community>
+ <community>
+ <name>TE_BLOCK_AS32934_2</name>
+ <members>origin:32934L:64512</members>
+ </community>
+ <community>
+ <name>TE_BLOCK_AS32934_NIX.CZ</name>
+ <members>64591:32934</members>
+ </community>
+ <community>
+ <name>TE_BLOCK_AS32934_NIX.CZ_2</name>
+ <members>origin:32934L:64591</members>
+ </community>
<community>
<name>TE_BLOCK_AS33891</name>
<members>64512:33891</members>
@@ -20373,6 +19634,86 @@
<name>TE_PREPEND_AS30134_x6_PREPEND_4byte</name>
<members>origin:30134L:64806</members>
</community>
+ <community>
+ <name>TE_PREPEND_AS32934_NIX.CZ_2byte</name>
+ <members>64891:32934</members>
+ </community>
+ <community>
+ <name>TE_PREPEND_AS32934_NIX.CZ_4byte</name>
+ <members>origin:32934L:64891</members>
+ </community>
+ <community>
+ <name>TE_PREPEND_AS32934_x1_2byte</name>
+ <members>TE_PREPEND_AS32934_x1_PREPEND_2byte</members>
+ <members>TE_PREPEND_AS32934_NIX.CZ_2byte</members>
+ </community>
+ <community>
+ <name>TE_PREPEND_AS32934_x1_4byte</name>
+ <members>TE_PREPEND_AS32934_x1_PREPEND_4byte</members>
+ <members>TE_PREPEND_AS32934_NIX.CZ_4byte</members>
+ </community>
+ <community>
+ <name>TE_PREPEND_AS32934_x1_PREPEND_2byte</name>
+ <members>64801:32934</members>
+ </community>
+ <community>
+ <name>TE_PREPEND_AS32934_x1_PREPEND_4byte</name>
+ <members>origin:32934L:64801</members>
+ </community>
+ <community>
+ <name>TE_PREPEND_AS32934_x2_2byte</name>
+ <members>TE_PREPEND_AS32934_x2_PREPEND_2byte</members>
+ <members>TE_PREPEND_AS32934_NIX.CZ_2byte</members>
+ </community>
+ <community>
+ <name>TE_PREPEND_AS32934_x2_4byte</name>
+ <members>TE_PREPEND_AS32934_x2_PREPEND_4byte</members>
+ <members>TE_PREPEND_AS32934_NIX.CZ_4byte</members>
+ </community>
+ <community>
+ <name>TE_PREPEND_AS32934_x2_PREPEND_2byte</name>
+ <members>64802:32934</members>
+ </community>
+ <community>
+ <name>TE_PREPEND_AS32934_x2_PREPEND_4byte</name>
+ <members>origin:32934L:64802</members>
+ </community>
+ <community>
+ <name>TE_PREPEND_AS32934_x3_2byte</name>
+ <members>TE_PREPEND_AS32934_x3_PREPEND_2byte</members>
+ <members>TE_PREPEND_AS32934_NIX.CZ_2byte</members>
+ </community>
+ <community>
+ <name>TE_PREPEND_AS32934_x3_4byte</name>
+ <members>TE_PREPEND_AS32934_x3_PREPEND_4byte</members>
+ <members>TE_PREPEND_AS32934_NIX.CZ_4byte</members>
+ </community>
+ <community>
+ <name>TE_PREPEND_AS32934_x3_PREPEND_2byte</name>
+ <members>64803:32934</members>
+ </community>
+ <community>
+ <name>TE_PREPEND_AS32934_x3_PREPEND_4byte</name>
+ <members>origin:32934L:64803</members>
+ </community>
+ <community>
+ <name>TE_PREPEND_AS32934_x6_2byte</name>
+ <members>TE_PREPEND_AS32934_x6_PREPEND_2byte</members>
+ <members>TE_PREPEND_AS32934_NIX.CZ_2byte</members>
+ </community>
+ <community>
+ <name>TE_PREPEND_AS32934_x6_4byte</name>
+ <members>TE_PREPEND_AS32934_x6_PREPEND_4byte</members>
+ <members>TE_PREPEND_AS32934_NIX.CZ_4byte</members>
+ </community>
+ <community>
+ <name>TE_PREPEND_AS32934_x6_PREPEND_2byte</name>
+ <members>64806:32934</members>
+ </community>
+ <community>
+ <name>TE_PREPEND_AS32934_x6_PREPEND_4byte</name>
+ <members>origin:32934L:64806</members>
+ </community>
<community>
<name>TE_PREPEND_AS33891_NIX.CZ_2byte</name>
<members>64891:33891</members>
@@ -21492,174 +20833,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>backbone-classifier</name>
- <import>default</import>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>low</name>
- <code-points>af11</code-points>
- <code-points>af12</code-points>
- <code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>iperf-classifier</name>
- <import>default</import>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>af12</code-points>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -21668,81 +20841,15 @@
<code-points>nc2</code-points>
</loss-priority>
</forwarding-class>
- </dscp>
- <dscp>
- <name>ix-access-classifier</name>
<forwarding-class>
- <name>be-ix</name>
+ <name>expedited-forwarding</name>
<loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
+ <name>low</name>
+ <code-points>ef</code-points>
</loss-priority>
</forwarding-class>
</dscp>
- <dscp-ipv6>
+ <dscp>
<name>backbone-classifier</name>
<import>default</import>
<forwarding-class>
@@ -21752,18 +20859,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -21771,13 +20866,7 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -21787,9 +20876,9 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- </dscp-ipv6>
+ </dscp>
<dscp-ipv6>
- <name>access-classifier</name>
+ <name>backbone-classifier</name>
<import>default</import>
<forwarding-class>
<name>be</name>
@@ -21800,19 +20889,12 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
+ <name>low</name>
<code-points>nc2</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -21822,31 +20904,17 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<dscp-ipv6>
- <name>iperf-classifier</name>
+ <name>access-classifier</name>
<import>default</import>
<forwarding-class>
- <name>expedited-forwarding</name>
+ <name>be</name>
<loss-priority>
<name>low</name>
+ <code-points>af11</code-points>
<code-points>af12</code-points>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
+ <code-points>af13</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -21857,150 +20925,11 @@
<code-points>nc2</code-points>
</loss-priority>
</forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix-access-classifier</name>
<forwarding-class>
- <name>be-ix</name>
+ <name>expedited-forwarding</name>
<loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
+ <name>low</name>
+ <code-points>ef</code-points>
</loss-priority>
</forwarding-class>
</dscp-ipv6>
@@ -22011,16 +20940,16 @@
<name>be</name>
<loss-priority>
<name>low</name>
- <code-points>000</code-points>
- <code-points>001</code-points>
- <code-points>010</code-points>
- <code-points>011</code-points>
- <code-points>110</code-points>
- <code-points>111</code-points>
+ <code-points>100</code-points>
+ <code-points>101</code-points>
</loss-priority>
</forwarding-class>
+ </exp>
+ <exp>
+ <name>mpls-backbone-classifier</name>
+ <import>default</import>
<forwarding-class>
- <name>less-than-best-effort</name>
+ <name>be</name>
<loss-priority>
<name>low</name>
<code-points>100</code-points>
@@ -22028,29 +20957,7 @@
</loss-priority>
</forwarding-class>
</exp>
- <exp>
- <name>mpls-backbone-classifier</name>
- <import>default</import>
- </exp>
</classifiers>
- <code-point-aliases>
- <dscp>
- <name>ix</name>
- <bits>101001</bits>
- </dscp>
- <dscp>
- <name>dws</name>
- <bits>100000</bits>
- </dscp>
- <dscp-ipv6>
- <name>dws</name>
- <bits>100000</bits>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix</name>
- <bits>101001</bits>
- </dscp-ipv6>
- </code-point-aliases>
<drop-profiles>
<name>be-drop-profile</name>
<fill-level>
@@ -22070,70 +20977,40 @@
<drop-probability>70</drop-probability>
</fill-level>
</drop-profiles>
- <drop-profiles>
- <name>less-than-be-drop-profile</name>
- <fill-level>
- <name>25</name>
- <drop-probability>30</drop-probability>
- </fill-level>
- <fill-level>
- <name>30</name>
- <drop-probability>50</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>70</drop-probability>
- </fill-level>
- <fill-level>
- <name>50</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
- <drop-profiles>
- <name>dws-drop-profile</name>
- <fill-level>
- <name>35</name>
- <drop-probability>10</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<forwarding-classes>
<class>
<name>be</name>
<queue-num>0</queue-num>
</class>
- <class>
- <name>be-ix</name>
- <queue-num>0</queue-num>
- </class>
<class>
<name>expedited-forwarding</name>
<queue-num>1</queue-num>
</class>
- <class>
- <name>less-than-best-effort</name>
- <queue-num>2</queue-num>
- </class>
<class>
<name>network-control</name>
<queue-num>3</queue-num>
</class>
- <class>
- <name>be-dws</name>
- <queue-num>0</queue-num>
- </class>
- <class>
- <name>be-bleach</name>
- <queue-num>0</queue-num>
- </class>
</forwarding-classes>
<interfaces>
+ <interface>
+ <name>et-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>ge-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>so-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>xe-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
<interface>
<name>ge-0/2/9</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>100</name>
<classifiers>
@@ -22160,7 +21037,7 @@
</interface>
<interface>
<name>ge-0/3/9</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>10</name>
<classifiers>
@@ -22225,22 +21102,6 @@
</dscp>
</rewrite-rules>
</unit>
- <unit>
- <name>71</name>
- <classifiers>
- <dscp>
- <name>iperf-classifier</name>
- </dscp>
- <dscp-ipv6>
- <name>iperf-classifier</name>
- </dscp-ipv6>
- </classifiers>
- <rewrite-rules>
- <dscp>
- <name>basic-rewrite-rules</name>
- </dscp>
- </rewrite-rules>
- </unit>
<unit>
<name>99</name>
<classifiers>
@@ -22290,9 +21151,13 @@
</rewrite-rules>
</unit>
</interface>
+ <interface>
+ <name>ae*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
<interface>
<name>ae1</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -22319,7 +21184,7 @@
</interface>
<interface>
<name>ae3</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -22337,17 +21202,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -22357,7 +21214,7 @@
</interface>
<interface>
<name>ae6</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>1</name>
<classifiers>
@@ -22375,17 +21232,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -22409,17 +21258,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -22429,7 +21270,7 @@
</interface>
<interface>
<name>ae11</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -22453,149 +21294,15 @@
<name>access-classifier</name>
</dscp>
<dscp-ipv6>
- <name>access-classifier</name>
- </dscp-ipv6>
- </classifiers>
- </unit>
- </interface>
- </interfaces>
- <rewrite-rules>
- <dscp>
- <name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp-ipv6>
+ <name>access-classifier</name>
+ </dscp-ipv6>
+ </classifiers>
+ </unit>
+ </interface>
+ </interfaces>
+ <rewrite-rules>
+ <dscp>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -22610,17 +21317,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -22632,30 +21328,9 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
+ </dscp>
<dscp-ipv6>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
+ <name>basic-rewrite-rules</name>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -22670,17 +21345,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -22692,13 +21356,6 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
@@ -22706,35 +21363,19 @@
</exp>
</rewrite-rules>
<scheduler-maps>
- <name>MAP-BASIC-IQ2</name>
+ <name>GEANT-BASIC</name>
<forwarding-class>
<name>expedited-forwarding</name>
<scheduler>sch-expedited-forwarding</scheduler>
</forwarding-class>
<forwarding-class>
<name>network-control</name>
- <scheduler>sch-network-ctrl-iq2</scheduler>
+ <scheduler>sch-network-ctrl-geant</scheduler>
</forwarding-class>
<forwarding-class>
<name>be</name>
<scheduler>sch-be</scheduler>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <scheduler>sch-less-than-best-effort</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
</scheduler-maps>
<schedulers>
<name>sch-be</name>
@@ -22754,27 +21395,7 @@
<priority>strict-high</priority>
</schedulers>
<schedulers>
- <name>sch-less-than-best-effort</name>
- <transmit-rate>
- <percent>10</percent>
- </transmit-rate>
- <buffer-size>
- <percent>10</percent>
- </buffer-size>
- <priority>low</priority>
- <drop-profile-map>
- <loss-priority>low</loss-priority>
- <protocol>any</protocol>
- <drop-profile>less-than-be-drop-profile</drop-profile>
- </drop-profile-map>
- <drop-profile-map>
- <loss-priority>high</loss-priority>
- <protocol>any</protocol>
- <drop-profile>be-drop-profile</drop-profile>
- </drop-profile-map>
- </schedulers>
- <schedulers>
- <name>sch-network-ctrl</name>
+ <name>sch-network-ctrl-geant</name>
<transmit-rate>
<percent>5</percent>
</transmit-rate>
@@ -22783,15 +21404,6 @@
</buffer-size>
<priority>high</priority>
</schedulers>
- <schedulers>
- <name>sch-network-ctrl-iq2</name>
- <transmit-rate>
- <percent>5</percent>
- </transmit-rate>
- <buffer-size>
- <percent>5</percent>
- </buffer-size>
- </schedulers>
</class-of-service>
<firewall>
<family>
@@ -26268,6 +24880,12 @@
<source-address>
<name>91.210.16.223/32</name>
</source-address>
+ <source-address>
+ <name>91.210.16.19/32</name>
+ </source-address>
+ <source-address>
+ <name>91.210.16.52/32</name>
+ </source-address>
<destination-address>
<name>91.210.16.189/32</name>
</destination-address>
@@ -26777,6 +25395,9 @@
<source-prefix-list>
<name>dashboard-servers</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers</name>
+ </source-prefix-list>
<protocol>tcp</protocol>
<destination-port>ssh</destination-port>
</from>
@@ -28580,6 +27201,9 @@
<source-prefix-list>
<name>dashboard-servers-v6</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers-v6</name>
+ </source-prefix-list>
<next-header>tcp</next-header>
<port>ssh</port>
</from>
@@ -29456,6 +28080,12 @@
<source-address>
<name>2001:7f8:14::97:1/128</name>
</source-address>
+ <source-address>
+ <name>2001:7f8:14::7f:1/128</name>
+ </source-address>
+ <source-address>
+ <name>2001:7f8:14::7f:2/128</name>
+ </source-address>
<destination-address>
<name>2001:798:14:20ff::1/128</name>
</destination-address>
@@ -30036,7 +28666,7 @@
</policer>
</firewall>
<routing-instances>
- <instance>
+ <instance inactive="inactive">
<name>CLEAN_IAS</name>
<description>Clean IAS VRF traffic returned from scrubber</description>
<instance-type>vrf</instance-type>
@@ -30446,7 +29076,7 @@
<prefix-limit>
<maximum>150000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -30473,7 +29103,7 @@
<prefix-limit>
<maximum>15</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -30509,7 +29139,7 @@
<prefix-limit>
<maximum>30</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -30545,7 +29175,7 @@
<prefix-limit>
<maximum>30</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -30581,7 +29211,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -30617,7 +29247,7 @@
<prefix-limit>
<maximum>3000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -30653,7 +29283,7 @@
<prefix-limit>
<maximum>7350</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -30690,7 +29320,7 @@
<prefix-limit>
<maximum>1000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -30726,7 +29356,7 @@
<prefix-limit>
<maximum>247500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -30762,7 +29392,7 @@
<prefix-limit>
<maximum>45</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -30798,7 +29428,7 @@
<prefix-limit>
<maximum>45</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -30834,7 +29464,7 @@
<prefix-limit>
<maximum>2250</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -30870,7 +29500,7 @@
<prefix-limit>
<maximum>105</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -30906,7 +29536,7 @@
<prefix-limit>
<maximum>3300</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -30942,7 +29572,7 @@
<prefix-limit>
<maximum>90</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -30978,7 +29608,7 @@
<prefix-limit>
<maximum>90</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -31014,7 +29644,7 @@
<prefix-limit>
<maximum>450</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -31051,7 +29681,7 @@
<prefix-limit>
<maximum>7500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -31087,7 +29717,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -31123,7 +29753,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -31159,7 +29789,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -31180,6 +29810,84 @@
<no-prepend-global-as/>
</local-as>
</neighbor>
+ <neighbor>
+ <name>91.210.16.19</name>
+ <description>Facebook AS32934</description>
+ <passive/>
+ <import>ps-deny-all</import>
+ <import>ps-AS-SELF-REJECT</import>
+ <import>ps-BOGONS</import>
+ <import>ps-PRIVATE-AS-BLOCK</import>
+ <import>IAS_PS-FROM-PUBLIC-PEERS_NIX.CZ_HEAD</import>
+ <import>IAS_PS-FROM-PUBLIC-PEER_AS32934_Facebook</import>
+ <import>IAS_PS-FROM-PUBLIC-PEERS_NIX.CZ_TAIL</import>
+ <family>
+ <inet>
+ <any>
+ <prefix-limit>
+ <maximum>150</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
+ </prefix-limit>
+ </any>
+ </inet>
+ </family>
+ <export>ps-deny-all</export>
+ <export>ps-BOGONS</export>
+ <export>ps-PRIVATE-AS-BLOCK</export>
+ <export>IAS_PS-TO-PUBLIC-PEERS_NIX.CZ_HEAD</export>
+ <export>IAS_PS-TO-PUBLIC-PEER_AS32934_Facebook</export>
+ <export>IAS_PS-TO-PUBLIC-PEERS_NIX.CZ_TAIL</export>
+ <peer-as>32934</peer-as>
+ <local-as>
+ <as-number>21320</as-number>
+ <private/>
+ <no-prepend-global-as/>
+ </local-as>
+ </neighbor>
+ <neighbor>
+ <name>91.210.16.52</name>
+ <description>Facebook AS32934</description>
+ <passive/>
+ <import>ps-deny-all</import>
+ <import>ps-AS-SELF-REJECT</import>
+ <import>ps-BOGONS</import>
+ <import>ps-PRIVATE-AS-BLOCK</import>
+ <import>IAS_PS-FROM-PUBLIC-PEERS_NIX.CZ_HEAD</import>
+ <import>IAS_PS-FROM-PUBLIC-PEER_AS32934_Facebook</import>
+ <import>IAS_PS-FROM-PUBLIC-PEERS_NIX.CZ_TAIL</import>
+ <family>
+ <inet>
+ <any>
+ <prefix-limit>
+ <maximum>150</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
+ </prefix-limit>
+ </any>
+ </inet>
+ </family>
+ <export>ps-deny-all</export>
+ <export>ps-BOGONS</export>
+ <export>ps-PRIVATE-AS-BLOCK</export>
+ <export>IAS_PS-TO-PUBLIC-PEERS_NIX.CZ_HEAD</export>
+ <export>IAS_PS-TO-PUBLIC-PEER_AS32934_Facebook</export>
+ <export>IAS_PS-TO-PUBLIC-PEERS_NIX.CZ_TAIL</export>
+ <peer-as>32934</peer-as>
+ <local-as>
+ <as-number>21320</as-number>
+ <private/>
+ <no-prepend-global-as/>
+ </local-as>
+ </neighbor>
</group>
<group>
<name>GEANT-IXv6-NIX.CZ</name>
@@ -31192,7 +29900,7 @@
<prefix-limit>
<maximum>150000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -31219,7 +29927,7 @@
<prefix-limit>
<maximum>15</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -31255,7 +29963,7 @@
<prefix-limit>
<maximum>30</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -31291,7 +29999,7 @@
<prefix-limit>
<maximum>30</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -31327,7 +30035,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -31363,7 +30071,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -31399,7 +30107,7 @@
<prefix-limit>
<maximum>368</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -31436,7 +30144,7 @@
<prefix-limit>
<maximum>150</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -31472,7 +30180,7 @@
<prefix-limit>
<maximum>247500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -31508,7 +30216,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -31544,7 +30252,7 @@
<prefix-limit>
<maximum>15</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -31580,7 +30288,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -31616,7 +30324,7 @@
<prefix-limit>
<maximum>45</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -31652,7 +30360,7 @@
<prefix-limit>
<maximum>45</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -31688,7 +30396,7 @@
<prefix-limit>
<maximum>450</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -31725,7 +30433,7 @@
<prefix-limit>
<maximum>15</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -31761,7 +30469,7 @@
<prefix-limit>
<maximum>15</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -31797,7 +30505,7 @@
<prefix-limit>
<maximum>7500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -31833,7 +30541,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -31869,7 +30577,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -31905,7 +30613,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -31926,6 +30634,84 @@
<no-prepend-global-as/>
</local-as>
</neighbor>
+ <neighbor>
+ <name>2001:7f8:14::7f:1</name>
+ <description>Facebook AS32934</description>
+ <passive/>
+ <import>ps-deny-all</import>
+ <import>ps-AS-SELF-REJECT</import>
+ <import>ps-BOGONS-V6</import>
+ <import>ps-PRIVATE-AS-BLOCK</import>
+ <import>IAS_PS-FROM-PUBLIC-PEERS_NIX.CZ_HEAD</import>
+ <import>IAS_PS-FROM-PUBLIC-PEER_AS32934_Facebook</import>
+ <import>IAS_PS-FROM-PUBLIC-PEERS_NIX.CZ_TAIL</import>
+ <family>
+ <inet6>
+ <any>
+ <prefix-limit>
+ <maximum>150</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
+ </prefix-limit>
+ </any>
+ </inet6>
+ </family>
+ <export>ps-deny-all</export>
+ <export>ps-BOGONS-V6</export>
+ <export>ps-PRIVATE-AS-BLOCK</export>
+ <export>IAS_PS-TO-PUBLIC-PEERS_NIX.CZ_HEAD</export>
+ <export>IAS_PS-TO-PUBLIC-PEER_AS32934_Facebook</export>
+ <export>IAS_PS-TO-PUBLIC-PEERS_NIX.CZ_TAIL</export>
+ <peer-as>32934</peer-as>
+ <local-as>
+ <as-number>21320</as-number>
+ <private/>
+ <no-prepend-global-as/>
+ </local-as>
+ </neighbor>
+ <neighbor>
+ <name>2001:7f8:14::7f:2</name>
+ <description>Facebook AS32934</description>
+ <passive/>
+ <import>ps-deny-all</import>
+ <import>ps-AS-SELF-REJECT</import>
+ <import>ps-BOGONS-V6</import>
+ <import>ps-PRIVATE-AS-BLOCK</import>
+ <import>IAS_PS-FROM-PUBLIC-PEERS_NIX.CZ_HEAD</import>
+ <import>IAS_PS-FROM-PUBLIC-PEER_AS32934_Facebook</import>
+ <import>IAS_PS-FROM-PUBLIC-PEERS_NIX.CZ_TAIL</import>
+ <family>
+ <inet6>
+ <any>
+ <prefix-limit>
+ <maximum>150</maximum>
+ <teardown>
+ <limit-threshold>80</limit-threshold>
+ <idle-timeout>
+ <timeout>30</timeout>
+ </idle-timeout>
+ </teardown>
+ </prefix-limit>
+ </any>
+ </inet6>
+ </family>
+ <export>ps-deny-all</export>
+ <export>ps-BOGONS-V6</export>
+ <export>ps-PRIVATE-AS-BLOCK</export>
+ <export>IAS_PS-TO-PUBLIC-PEERS_NIX.CZ_HEAD</export>
+ <export>IAS_PS-TO-PUBLIC-PEER_AS32934_Facebook</export>
+ <export>IAS_PS-TO-PUBLIC-PEERS_NIX.CZ_TAIL</export>
+ <peer-as>32934</peer-as>
+ <local-as>
+ <as-number>21320</as-number>
+ <private/>
+ <no-prepend-global-as/>
+ </local-as>
+ </neighbor>
</group>
</bgp>
<pim>
diff --git a/test/data/mx1.sof.bg.geant.net-netconf.xml b/test/data/mx1.sof.bg.geant.net-netconf.xml
index af6288701571a81c0931d4121ebaf5938f6a8744..95d266a0fc409d587e427b5354bd71964893d3c4 100644
--- a/test/data/mx1.sof.bg.geant.net-netconf.xml
+++ b/test/data/mx1.sof.bg.geant.net-netconf.xml
@@ -1,4 +1,4 @@
-<configuration changed-seconds="1545214011" changed-localtime="2018-12-19 10:06:51 UTC">
+<configuration changed-seconds="1549111510" changed-localtime="2019-02-02 12:45:10 UTC">
<version>15.1F6-S10.9</version>
<groups>
<name>re0</name>
@@ -252,6 +252,38 @@
<allow-commands>show .*</allow-commands>
<deny-commands>(ssh .*|telnet .*)</deny-commands>
</class>
+ <class>
+ <name>opennsa</name>
+ <idle-timeout>5</idle-timeout>
+ <permissions>configure</permissions>
+ <deny-commands>(file.*)|(load.*)|(op.*)|(request.*)|(save.*)|(start.*)|(test.*)|(set cli.*)|(set date.*)|(clear.*)|(help.*)|(telnet.*)|(ssh.*)|(traceroute.*)|(mtrace.*)|(monitor.*)|(ping.*)|(show.*)|(set.*)</deny-commands>
+ <allow-configuration-regexps>interfaces .*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections remote-interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols mpls label-switched-path.*</allow-configuration-regexps>
+ <deny-configuration-regexps>vmhost .*</deny-configuration-regexps>
+ <deny-configuration-regexps>session-limit-group .*</deny-configuration-regexps>
+ <deny-configuration-regexps>multi-chassis .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc-partition .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc .*</deny-configuration-regexps>
+ <deny-configuration-regexps>groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>dynamic-profiles .*</deny-configuration-regexps>
+ <deny-configuration-regexps>diameter .*</deny-configuration-regexps>
+ <deny-configuration-regexps>apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>access-profile .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces traceoptions .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-set .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-range .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups-except .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lt-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces ms-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces si-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces gr-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lo.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces dsc.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces irb.*</deny-configuration-regexps>
+ </class>
<class>
<name>readonly-permissions</name>
<idle-timeout>15</idle-timeout>
@@ -581,6 +613,22 @@
<encrypted-password>/* SECRET-DATA */</encrypted-password>
</authentication>
</user>
+ <user>
+ <name>opennsa</name>
+ <uid>2008</uid>
+ <class>opennsa</class>
+ <authentication>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ </authentication>
+ </user>
<user>
<name>opnet</name>
<full-name>OPNET NEOP Planning system @ 62.40.105.114</full-name>
@@ -2887,6 +2935,9 @@
<clients>
<name>83.97.93.196/32</name>
</clients>
+ <clients>
+ <name>83.97.93.238/32</name>
+ </clients>
</community>
<community>
<name>As4n0gN!</name>
@@ -3472,13 +3523,13 @@
<import-rib>IAS.inet6.0</import-rib>
<import-policy>rtbh-policy</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias</name>
<import-rib>IAS.inet.0</import-rib>
<import-rib>CLEAN_IAS.inet.0</import-rib>
<import-policy>ps-into-clean-ias-import</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias-v6</name>
<import-rib>IAS.inet6.0</import-rib>
<import-rib>CLEAN_IAS.inet6.0</import-rib>
@@ -7182,15 +7233,13 @@
</prefix-list>
<prefix-list>
<name>geantncc-address-space</name>
+ <comment>/* NCC DR VPN */</comment>
<prefix-list-item>
- <name>62.40.108.192/26</name>
+ <name>62.40.108.192/27</name>
</prefix-list-item>
<prefix-list-item>
<name>62.40.119.0/24</name>
</prefix-list-item>
- <prefix-list-item>
- <name>62.40.119.134/32</name>
- </prefix-list-item>
<prefix-list-item>
<name>62.40.125.250/32</name>
</prefix-list-item>
@@ -8786,6 +8835,14 @@
</prefix-list>
<prefix-list>
<name>corporate-address-space</name>
+ <comment>/* LON2 CORP VPN (MAC) */</comment>
+ <prefix-list-item>
+ <name>62.40.99.194/32</name>
+ </prefix-list-item>
+ <comment>/* LON2 CORP VPN */</comment>
+ <prefix-list-item>
+ <name>62.40.99.201/32</name>
+ </prefix-list-item>
<prefix-list-item>
<name>62.40.119.128/25</name>
</prefix-list-item>
@@ -8883,6 +8940,18 @@
<name>2001:798::/32</name>
</prefix-list-item>
</prefix-list>
+ <prefix-list>
+ <name>opennsa-servers</name>
+ <prefix-list-item>
+ <name>83.97.93.92/32</name>
+ </prefix-list-item>
+ </prefix-list>
+ <prefix-list>
+ <name>opennsa-servers-v6</name>
+ <prefix-list-item>
+ <name>2001:798:3::15f/128</name>
+ </prefix-list-item>
+ </prefix-list>
<policy-statement>
<name>ASM-Allow</name>
<term>
@@ -9356,6 +9425,10 @@
<address>185.1.68.0/24</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>193.188.137.0/24</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -9477,6 +9550,10 @@
<address>2001:7f8:a0::/64</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>2001:7f8:35::/64</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -12578,13 +12655,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -12600,14 +12670,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp>
<name>backbone-classifier</name>
@@ -12619,18 +12681,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -12638,13 +12688,7 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -12655,179 +12699,6 @@
</loss-priority>
</forwarding-class>
</dscp>
- <dscp>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>iperf-classifier</name>
- <import>default</import>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>af12</code-points>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
<dscp-ipv6>
<name>backbone-classifier</name>
<import>default</import>
@@ -12838,18 +12709,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -12857,13 +12716,7 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -12886,13 +12739,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -12908,187 +12754,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>iperf-classifier</name>
- <import>default</import>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>af12</code-points>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-access-classifier</name>
@@ -13097,16 +12762,16 @@
<name>be</name>
<loss-priority>
<name>low</name>
- <code-points>000</code-points>
- <code-points>001</code-points>
- <code-points>010</code-points>
- <code-points>011</code-points>
- <code-points>110</code-points>
- <code-points>111</code-points>
+ <code-points>100</code-points>
+ <code-points>101</code-points>
</loss-priority>
</forwarding-class>
+ </exp>
+ <exp>
+ <name>mpls-backbone-classifier</name>
+ <import>default</import>
<forwarding-class>
- <name>less-than-best-effort</name>
+ <name>be</name>
<loss-priority>
<name>low</name>
<code-points>100</code-points>
@@ -13114,40 +12779,7 @@
</loss-priority>
</forwarding-class>
</exp>
- <exp>
- <name>mpls-backbone-classifier</name>
- <import>default</import>
- </exp>
</classifiers>
- <code-point-aliases>
- <dscp>
- <name>ix</name>
- <bits>101001</bits>
- </dscp>
- <dscp>
- <name>dws</name>
- <bits>100000</bits>
- </dscp>
- <dscp-ipv6>
- <name>dws</name>
- <bits>100000</bits>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix</name>
- <bits>101001</bits>
- </dscp-ipv6>
- </code-point-aliases>
- <drop-profiles>
- <name>dws-drop-profile</name>
- <fill-level>
- <name>35</name>
- <drop-probability>10</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<drop-profiles>
<name>be-drop-profile</name>
<fill-level>
@@ -13167,59 +12799,40 @@
<drop-probability>100</drop-probability>
</fill-level>
</drop-profiles>
- <drop-profiles>
- <name>less-than-be-drop-profile</name>
- <fill-level>
- <name>25</name>
- <drop-probability>30</drop-probability>
- </fill-level>
- <fill-level>
- <name>30</name>
- <drop-probability>50</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>70</drop-probability>
- </fill-level>
- <fill-level>
- <name>50</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<forwarding-classes>
<class>
<name>be</name>
<queue-num>0</queue-num>
</class>
- <class>
- <name>be-ix</name>
- <queue-num>0</queue-num>
- </class>
<class>
<name>expedited-forwarding</name>
<queue-num>1</queue-num>
</class>
- <class>
- <name>less-than-best-effort</name>
- <queue-num>2</queue-num>
- </class>
<class>
<name>network-control</name>
<queue-num>3</queue-num>
</class>
- <class>
- <name>be-dws</name>
- <queue-num>0</queue-num>
- </class>
- <class>
- <name>be-bleach</name>
- <queue-num>0</queue-num>
- </class>
</forwarding-classes>
<interfaces>
+ <interface>
+ <name>et-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>ge-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>so-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>xe-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
<interface>
<name>xe-0/0/0</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -13243,7 +12856,7 @@
</interface>
<interface>
<name>ge-0/2/0</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>1</name>
<classifiers>
@@ -13282,7 +12895,7 @@
</interface>
<interface>
<name>ge-0/2/3</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>10</name>
<classifiers>
@@ -13335,23 +12948,10 @@
</dscp>
</rewrite-rules>
</unit>
- <unit>
- <name>71</name>
- <classifiers>
- <dscp>
- <name>iperf-classifier</name>
- </dscp>
- </classifiers>
- <rewrite-rules>
- <dscp>
- <name>basic-rewrite-rules</name>
- </dscp>
- </rewrite-rules>
- </unit>
</interface>
<interface>
<name>xe-1/0/1</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>100</name>
<classifiers>
@@ -13377,6 +12977,10 @@
</classifiers>
</unit>
</interface>
+ <interface>
+ <name>ae*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
<interface>
<name>ae0</name>
<unit>
@@ -13401,7 +13005,7 @@
</interface>
<interface>
<name>ae7</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -13419,17 +13023,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -13439,7 +13035,7 @@
</interface>
<interface>
<name>ae8</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -13457,17 +13053,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -13477,7 +13065,7 @@
</interface>
<interface>
<name>ae11</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -13507,13 +13095,6 @@
<rewrite-rules>
<dscp>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -13528,17 +13109,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -13550,97 +13120,9 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -13655,17 +13137,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -13677,73 +13148,6 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
@@ -13751,35 +13155,19 @@
</exp>
</rewrite-rules>
<scheduler-maps>
- <name>MAP-BASIC-IQ2</name>
+ <name>GEANT-BASIC</name>
<forwarding-class>
<name>expedited-forwarding</name>
<scheduler>sch-expedited-forwarding</scheduler>
</forwarding-class>
<forwarding-class>
<name>network-control</name>
- <scheduler>sch-network-ctrl-iq2</scheduler>
+ <scheduler>sch-network-ctrl-geant</scheduler>
</forwarding-class>
<forwarding-class>
<name>be</name>
<scheduler>sch-be</scheduler>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <scheduler>sch-less-than-best-effort</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
</scheduler-maps>
<schedulers>
<name>sch-be</name>
@@ -13799,27 +13187,7 @@
<priority>strict-high</priority>
</schedulers>
<schedulers>
- <name>sch-less-than-best-effort</name>
- <transmit-rate>
- <percent>10</percent>
- </transmit-rate>
- <buffer-size>
- <percent>10</percent>
- </buffer-size>
- <priority>low</priority>
- <drop-profile-map>
- <loss-priority>low</loss-priority>
- <protocol>any</protocol>
- <drop-profile>less-than-be-drop-profile</drop-profile>
- </drop-profile-map>
- <drop-profile-map>
- <loss-priority>high</loss-priority>
- <protocol>any</protocol>
- <drop-profile>be-drop-profile</drop-profile>
- </drop-profile-map>
- </schedulers>
- <schedulers>
- <name>sch-network-ctrl</name>
+ <name>sch-network-ctrl-geant</name>
<transmit-rate>
<percent>5</percent>
</transmit-rate>
@@ -13828,15 +13196,6 @@
</buffer-size>
<priority>high</priority>
</schedulers>
- <schedulers>
- <name>sch-network-ctrl-iq2</name>
- <transmit-rate>
- <percent>5</percent>
- </transmit-rate>
- <buffer-size>
- <percent>5</percent>
- </buffer-size>
- </schedulers>
</class-of-service>
<firewall>
<family>
@@ -16990,6 +16349,9 @@
<source-prefix-list>
<name>dashboard-servers</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers</name>
+ </source-prefix-list>
<protocol>tcp</protocol>
<destination-port>ssh</destination-port>
</from>
@@ -19251,6 +18613,9 @@
<source-prefix-list>
<name>dashboard-servers-v6</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers-v6</name>
+ </source-prefix-list>
<next-header>tcp</next-header>
<port>ssh</port>
</from>
@@ -19848,7 +19213,7 @@
</policer>
</firewall>
<routing-instances>
- <instance>
+ <instance inactive="inactive">
<name>CLEAN_IAS</name>
<description>Clean IAS VRF traffic returned from scrubber</description>
<instance-type>vrf</instance-type>
@@ -20435,6 +19800,9 @@
<maximum>1000</maximum>
<teardown>
<limit-threshold>90</limit-threshold>
+ <idle-timeout>
+ <timeout>15</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</labeled-unicast>
diff --git a/test/data/mx1.tal.ee.geant.net-netconf.xml b/test/data/mx1.tal.ee.geant.net-netconf.xml
index 1b0a79a9b491e12f7443544856e77b8f23dd15a5..ea071c2764df727852ebee31ba6ca5bf398c5313 100644
--- a/test/data/mx1.tal.ee.geant.net-netconf.xml
+++ b/test/data/mx1.tal.ee.geant.net-netconf.xml
@@ -1,4 +1,4 @@
-<configuration changed-seconds="1545214010" changed-localtime="2018-12-19 10:06:50 UTC">
+<configuration changed-seconds="1549111542" changed-localtime="2019-02-02 12:45:42 UTC">
<version>15.1F6-S10.9</version>
<groups>
<name>re0</name>
@@ -233,6 +233,38 @@
<allow-commands>show .*</allow-commands>
<deny-commands>(ssh .*|telnet .*)</deny-commands>
</class>
+ <class>
+ <name>opennsa</name>
+ <idle-timeout>5</idle-timeout>
+ <permissions>configure</permissions>
+ <deny-commands>(file.*)|(load.*)|(op.*)|(request.*)|(save.*)|(start.*)|(test.*)|(set cli.*)|(set date.*)|(clear.*)|(help.*)|(telnet.*)|(ssh.*)|(traceroute.*)|(mtrace.*)|(monitor.*)|(ping.*)|(show.*)|(set.*)</deny-commands>
+ <allow-configuration-regexps>interfaces .*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections remote-interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols mpls label-switched-path.*</allow-configuration-regexps>
+ <deny-configuration-regexps>vmhost .*</deny-configuration-regexps>
+ <deny-configuration-regexps>session-limit-group .*</deny-configuration-regexps>
+ <deny-configuration-regexps>multi-chassis .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc-partition .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc .*</deny-configuration-regexps>
+ <deny-configuration-regexps>groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>dynamic-profiles .*</deny-configuration-regexps>
+ <deny-configuration-regexps>diameter .*</deny-configuration-regexps>
+ <deny-configuration-regexps>apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>access-profile .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces traceoptions .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-set .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-range .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups-except .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lt-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces ms-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces si-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces gr-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lo.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces dsc.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces irb.*</deny-configuration-regexps>
+ </class>
<class>
<name>readonly-permissions</name>
<idle-timeout>15</idle-timeout>
@@ -544,6 +576,22 @@
<encrypted-password>/* SECRET-DATA */</encrypted-password>
</authentication>
</user>
+ <user>
+ <name>opennsa</name>
+ <uid>2052</uid>
+ <class>opennsa</class>
+ <authentication>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ </authentication>
+ </user>
<user>
<name>opnet</name>
<full-name>OPNET NEOP Planning system @ 62.40.105.114</full-name>
@@ -2210,6 +2258,9 @@
<clients>
<name>83.97.93.196/32</name>
</clients>
+ <clients>
+ <name>83.97.93.238/32</name>
+ </clients>
</community>
<community>
<name>As4n0gN!</name>
@@ -2692,13 +2743,13 @@
<import-rib>IAS.inet6.0</import-rib>
<import-policy>rtbh-policy</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias</name>
<import-rib>IAS.inet.0</import-rib>
<import-rib>CLEAN_IAS.inet.0</import-rib>
<import-policy>ps-into-clean-ias-import</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias-v6</name>
<import-rib>IAS.inet6.0</import-rib>
<import-rib>CLEAN_IAS.inet6.0</import-rib>
@@ -3796,16 +3847,13 @@
</prefix-list>
<prefix-list>
<name>geantncc-address-space</name>
- <comment>/* NCC DR VPN LAN */</comment>
+ <comment>/* NCC DR VPN */</comment>
<prefix-list-item>
- <name>62.40.108.192/26</name>
+ <name>62.40.108.192/27</name>
</prefix-list-item>
<prefix-list-item>
<name>62.40.119.0/24</name>
</prefix-list-item>
- <prefix-list-item>
- <name>62.40.119.134/32</name>
- </prefix-list-item>
<prefix-list-item>
<name>62.40.125.250/32</name>
</prefix-list-item>
@@ -6872,6 +6920,14 @@
</prefix-list>
<prefix-list>
<name>corporate-address-space</name>
+ <comment>/* LON2 CORP VPN (MAC) */</comment>
+ <prefix-list-item>
+ <name>62.40.99.194/32</name>
+ </prefix-list-item>
+ <comment>/* LON2 CORP VPN */</comment>
+ <prefix-list-item>
+ <name>62.40.99.201/32</name>
+ </prefix-list-item>
<prefix-list-item>
<name>62.40.119.128/25</name>
</prefix-list-item>
@@ -6978,6 +7034,18 @@
<name>2001:798::/32</name>
</prefix-list-item>
</prefix-list>
+ <prefix-list>
+ <name>opennsa-servers</name>
+ <prefix-list-item>
+ <name>83.97.93.92/32</name>
+ </prefix-list-item>
+ </prefix-list>
+ <prefix-list>
+ <name>opennsa-servers-v6</name>
+ <prefix-list-item>
+ <name>2001:798:3::15f/128</name>
+ </prefix-list-item>
+ </prefix-list>
<policy-statement>
<name>ASM-Allow</name>
<term>
@@ -7384,6 +7452,10 @@
<address>185.1.68.0/24</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>193.188.137.0/24</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -7505,6 +7577,10 @@
<address>2001:7f8:a0::/64</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>2001:7f8:35::/64</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -9322,13 +9398,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -9344,14 +9413,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp>
<name>backbone-classifier</name>
@@ -9363,18 +9424,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -9382,13 +9431,7 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -9399,88 +9442,6 @@
</loss-priority>
</forwarding-class>
</dscp>
- <dscp>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
<dscp-ipv6>
<name>backbone-classifier</name>
<import>default</import>
@@ -9491,18 +9452,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -9510,13 +9459,7 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -9539,13 +9482,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -9561,187 +9497,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>iperf-classifier</name>
- <import>default</import>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>af12</code-points>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-access-classifier</name>
@@ -9750,16 +9505,16 @@
<name>be</name>
<loss-priority>
<name>low</name>
- <code-points>000</code-points>
- <code-points>001</code-points>
- <code-points>010</code-points>
- <code-points>011</code-points>
- <code-points>110</code-points>
- <code-points>111</code-points>
+ <code-points>100</code-points>
+ <code-points>101</code-points>
</loss-priority>
</forwarding-class>
+ </exp>
+ <exp>
+ <name>mpls-backbone-classifier</name>
+ <import>default</import>
<forwarding-class>
- <name>less-than-best-effort</name>
+ <name>be</name>
<loss-priority>
<name>low</name>
<code-points>100</code-points>
@@ -9767,40 +9522,7 @@
</loss-priority>
</forwarding-class>
</exp>
- <exp>
- <name>mpls-backbone-classifier</name>
- <import>default</import>
- </exp>
</classifiers>
- <code-point-aliases>
- <dscp>
- <name>ix</name>
- <bits>101001</bits>
- </dscp>
- <dscp>
- <name>dws</name>
- <bits>100000</bits>
- </dscp>
- <dscp-ipv6>
- <name>dws</name>
- <bits>100000</bits>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix</name>
- <bits>101001</bits>
- </dscp-ipv6>
- </code-point-aliases>
- <drop-profiles>
- <name>dws-drop-profile</name>
- <fill-level>
- <name>35</name>
- <drop-probability>10</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<drop-profiles>
<name>be-drop-profile</name>
<fill-level>
@@ -9820,59 +9542,44 @@
<drop-probability>100</drop-probability>
</fill-level>
</drop-profiles>
- <drop-profiles>
- <name>less-than-be-drop-profile</name>
- <fill-level>
- <name>25</name>
- <drop-probability>30</drop-probability>
- </fill-level>
- <fill-level>
- <name>30</name>
- <drop-probability>50</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>70</drop-probability>
- </fill-level>
- <fill-level>
- <name>50</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<forwarding-classes>
<class>
<name>be</name>
<queue-num>0</queue-num>
</class>
- <class>
- <name>be-ix</name>
- <queue-num>0</queue-num>
- </class>
<class>
<name>expedited-forwarding</name>
<queue-num>1</queue-num>
</class>
- <class>
- <name>less-than-best-effort</name>
- <queue-num>2</queue-num>
- </class>
<class>
<name>network-control</name>
<queue-num>3</queue-num>
</class>
- <class>
- <name>be-dws</name>
- <queue-num>0</queue-num>
- </class>
- <class>
- <name>be-bleach</name>
- <queue-num>0</queue-num>
- </class>
</forwarding-classes>
<interfaces>
+ <interface>
+ <name>et-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>ge-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>so-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>xe-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>ae*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
<interface>
<name>ae1</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -9890,17 +9597,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -9910,7 +9609,7 @@
</interface>
<interface>
<name>ae2</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -9928,17 +9627,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -9948,7 +9639,7 @@
</interface>
<interface>
<name>ae10</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>100</name>
<classifiers>
@@ -9981,13 +9672,6 @@
<rewrite-rules>
<dscp>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -10002,17 +9686,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -10024,157 +9697,9 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -10189,17 +9714,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -10211,13 +9725,6 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
@@ -10225,35 +9732,19 @@
</exp>
</rewrite-rules>
<scheduler-maps>
- <name>MAP-BASIC-IQ2</name>
- <forwarding-class>
- <name>be-dws</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
+ <name>GEANT-BASIC</name>
<forwarding-class>
<name>expedited-forwarding</name>
<scheduler>sch-expedited-forwarding</scheduler>
</forwarding-class>
<forwarding-class>
<name>network-control</name>
- <scheduler>sch-network-ctrl-iq2</scheduler>
+ <scheduler>sch-network-ctrl-geant</scheduler>
</forwarding-class>
<forwarding-class>
<name>be</name>
<scheduler>sch-be</scheduler>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <scheduler>sch-less-than-best-effort</scheduler>
- </forwarding-class>
</scheduler-maps>
<schedulers>
<name>sch-be</name>
@@ -10273,27 +9764,7 @@
<priority>strict-high</priority>
</schedulers>
<schedulers>
- <name>sch-less-than-best-effort</name>
- <transmit-rate>
- <percent>10</percent>
- </transmit-rate>
- <buffer-size>
- <percent>10</percent>
- </buffer-size>
- <priority>low</priority>
- <drop-profile-map>
- <loss-priority>low</loss-priority>
- <protocol>any</protocol>
- <drop-profile>less-than-be-drop-profile</drop-profile>
- </drop-profile-map>
- <drop-profile-map>
- <loss-priority>high</loss-priority>
- <protocol>any</protocol>
- <drop-profile>be-drop-profile</drop-profile>
- </drop-profile-map>
- </schedulers>
- <schedulers>
- <name>sch-network-ctrl</name>
+ <name>sch-network-ctrl-geant</name>
<transmit-rate>
<percent>5</percent>
</transmit-rate>
@@ -10302,15 +9773,6 @@
</buffer-size>
<priority>high</priority>
</schedulers>
- <schedulers>
- <name>sch-network-ctrl-iq2</name>
- <transmit-rate>
- <percent>5</percent>
- </transmit-rate>
- <buffer-size>
- <percent>5</percent>
- </buffer-size>
- </schedulers>
</class-of-service>
<firewall>
<family>
@@ -11282,6 +10744,9 @@
<source-prefix-list>
<name>dashboard-servers</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers</name>
+ </source-prefix-list>
<protocol>tcp</protocol>
<destination-port>ssh</destination-port>
</from>
@@ -12321,6 +11786,9 @@
<source-prefix-list>
<name>dashboard-servers-v6</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers-v6</name>
+ </source-prefix-list>
<next-header>tcp</next-header>
<port>ssh</port>
</from>
@@ -12591,7 +12059,7 @@
</policer>
</firewall>
<routing-instances>
- <instance>
+ <instance inactive="inactive">
<name>CLEAN_IAS</name>
<description>Clean IAS VRF traffic returned from scrubber</description>
<instance-type>vrf</instance-type>
diff --git a/test/data/mx1.vie.at.geant.net-netconf.xml b/test/data/mx1.vie.at.geant.net-netconf.xml
index 7bc4c75c96b739ebec6ac6e6b88217b33023f42d..375c6eed6842687be96a68f7ee66dfaa728542fb 100644
--- a/test/data/mx1.vie.at.geant.net-netconf.xml
+++ b/test/data/mx1.vie.at.geant.net-netconf.xml
@@ -1,4 +1,4 @@
-<configuration changed-seconds="1545215309" changed-localtime="2018-12-19 10:28:29 UTC">
+<configuration changed-seconds="1549111559" changed-localtime="2019-02-02 12:45:59 UTC">
<version>15.1F6-S10.9</version>
<groups>
<name>re0</name>
@@ -253,6 +253,38 @@
<allow-commands>show .*</allow-commands>
<deny-commands>(ssh .*|telnet .*)</deny-commands>
</class>
+ <class>
+ <name>opennsa</name>
+ <idle-timeout>5</idle-timeout>
+ <permissions>configure</permissions>
+ <deny-commands>(file.*)|(load.*)|(op.*)|(request.*)|(save.*)|(start.*)|(test.*)|(set cli.*)|(set date.*)|(clear.*)|(help.*)|(telnet.*)|(ssh.*)|(traceroute.*)|(mtrace.*)|(monitor.*)|(ping.*)|(show.*)|(set.*)</deny-commands>
+ <allow-configuration-regexps>interfaces .*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections remote-interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols mpls label-switched-path.*</allow-configuration-regexps>
+ <deny-configuration-regexps>vmhost .*</deny-configuration-regexps>
+ <deny-configuration-regexps>session-limit-group .*</deny-configuration-regexps>
+ <deny-configuration-regexps>multi-chassis .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc-partition .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc .*</deny-configuration-regexps>
+ <deny-configuration-regexps>groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>dynamic-profiles .*</deny-configuration-regexps>
+ <deny-configuration-regexps>diameter .*</deny-configuration-regexps>
+ <deny-configuration-regexps>apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>access-profile .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces traceoptions .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-set .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-range .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups-except .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lt-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces ms-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces si-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces gr-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lo.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces dsc.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces irb.*</deny-configuration-regexps>
+ </class>
<class>
<name>readonly-permissions</name>
<idle-timeout>15</idle-timeout>
@@ -563,6 +595,22 @@
<encrypted-password>/* SECRET-DATA */</encrypted-password>
</authentication>
</user>
+ <user>
+ <name>opennsa</name>
+ <uid>2015</uid>
+ <class>opennsa</class>
+ <authentication>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ </authentication>
+ </user>
<user>
<name>opnet</name>
<full-name>OPNET NEOP Planning system @ 62.40.105.114</full-name>
@@ -3638,41 +3686,11 @@
<interface>
<name>xe-4/1/5</name>
<description>PHY UPSTREAM COGENT | Cogent ID: 1-300280812</description>
- <mtu>1514</mtu>
- <unit>
- <name>0</name>
- <description>SRV_IAS UPSTREAM COGENT | ASN174 |</description>
- <family>
- <inet>
- <mtu>1500</mtu>
- <filter>
- <input>
- <filter-name>Cogent-in</filter-name>
- </input>
- <output>
- <filter-name>Cogent-out</filter-name>
- </output>
- </filter>
- <address>
- <name>149.6.174.34/30</name>
- </address>
- </inet>
- <inet6>
- <mtu>1500</mtu>
- <filter>
- <input>
- <filter-name>Cogent6-in</filter-name>
- </input>
- <output>
- <filter-name>Cogent6-out</filter-name>
- </output>
- </filter>
- <address>
- <name>2001:978:2::3:2/112</name>
- </address>
- </inet6>
- </family>
- </unit>
+ <gigether-options>
+ <ieee-802.3ad>
+ <bundle>ae29</bundle>
+ </ieee-802.3ad>
+ </gigether-options>
</interface>
<interface>
<name>xe-4/1/6</name>
@@ -5685,7 +5703,6 @@
<minimum-links>1</minimum-links>
<lacp>
<active/>
- <periodic>fast</periodic>
</lacp>
</aggregated-ether-options>
<unit>
@@ -5997,6 +6014,9 @@
<clients>
<name>83.97.93.196/32</name>
</clients>
+ <clients>
+ <name>83.97.93.238/32</name>
+ </clients>
</community>
<community>
<name>As4n0gN!</name>
@@ -6527,13 +6547,13 @@
<import-rib>IAS.inet6.0</import-rib>
<import-policy>rtbh-policy</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias</name>
<import-rib>IAS.inet.0</import-rib>
<import-rib>CLEAN_IAS.inet.0</import-rib>
<import-policy>ps-into-clean-ias-import</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias-v6</name>
<import-rib>IAS.inet6.0</import-rib>
<import-rib>CLEAN_IAS.inet6.0</import-rib>
@@ -8279,6 +8299,9 @@
<interface>
<name>xe-11/2/3</name>
</interface>
+ <interface>
+ <name>xe-4/1/2</name>
+ </interface>
<interface>
<name>xe-11/2/1</name>
</interface>
@@ -8385,16 +8408,13 @@
<prefix-list-item>
<name>62.40.104.162/32</name>
</prefix-list-item>
- <comment>/* NCC DR VPN LAN */</comment>
+ <comment>/* NCC DR VPN */</comment>
<prefix-list-item>
- <name>62.40.108.192/26</name>
+ <name>62.40.108.192/27</name>
</prefix-list-item>
<prefix-list-item>
<name>62.40.119.0/24</name>
</prefix-list-item>
- <prefix-list-item>
- <name>62.40.119.134/32</name>
- </prefix-list-item>
<prefix-list-item>
<name>62.40.125.250/32</name>
</prefix-list-item>
@@ -11666,6 +11686,9 @@
<prefix-list-item>
<name>2001:678:24::/48</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>2001:678:8d4::/48</name>
+ </prefix-list-item>
<prefix-list-item>
<name>2001:67c:64::/48</name>
</prefix-list-item>
@@ -11861,6 +11884,9 @@
<prefix-list-item>
<name>2a00:4400::/32</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>2a01:190:15ed::/48</name>
+ </prefix-list-item>
<prefix-list-item>
<name>2a01:468::/29</name>
</prefix-list-item>
@@ -15118,6 +15144,12 @@
<prefix-list-item>
<name>2a03:5dc0:6::/48</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>2a09:c400::/30</name>
+ </prefix-list-item>
+ <prefix-list-item>
+ <name>2a09:c404::/30</name>
+ </prefix-list-item>
</prefix-list>
<prefix-list>
<name>route-from-URAN</name>
@@ -15718,6 +15750,14 @@
</prefix-list>
<prefix-list>
<name>corporate-address-space</name>
+ <comment>/* LON2 CORP VPN (MAC) */</comment>
+ <prefix-list-item>
+ <name>62.40.99.194/32</name>
+ </prefix-list-item>
+ <comment>/* LON2 CORP VPN */</comment>
+ <prefix-list-item>
+ <name>62.40.99.201/32</name>
+ </prefix-list-item>
<prefix-list-item>
<name>62.40.119.128/25</name>
</prefix-list-item>
@@ -15851,6 +15891,18 @@
<name>2001:798::/32</name>
</prefix-list-item>
</prefix-list>
+ <prefix-list>
+ <name>opennsa-servers</name>
+ <prefix-list-item>
+ <name>83.97.93.92/32</name>
+ </prefix-list-item>
+ </prefix-list>
+ <prefix-list>
+ <name>opennsa-servers-v6</name>
+ <prefix-list-item>
+ <name>2001:798:3::15f/128</name>
+ </prefix-list-item>
+ </prefix-list>
<policy-statement>
<name>ASM-Allow</name>
<term>
@@ -19662,6 +19714,10 @@
<address>185.1.68.0/24</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>193.188.137.0/24</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -19783,6 +19839,10 @@
<address>2001:7f8:a0::/64</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>2001:7f8:35::/64</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -22618,6 +22678,46 @@
<reject/>
</then>
</term>
+ <term>
+ <name>GOOGLE-test-prepend-1</name>
+ <from>
+ <community>GOOGLE-test-prepend-1</community>
+ </from>
+ <then>
+ <as-path-prepend>21320</as-path-prepend>
+ <next>term</next>
+ </then>
+ </term>
+ <term>
+ <name>GOOGLE-test-prepend-2</name>
+ <from>
+ <community>GOOGLE-test-prepend-2</community>
+ </from>
+ <then>
+ <as-path-prepend>21320 21320</as-path-prepend>
+ <next>term</next>
+ </then>
+ </term>
+ <term>
+ <name>GOOGLE-test-prepend-3</name>
+ <from>
+ <community>GOOGLE-test-prepend-3</community>
+ </from>
+ <then>
+ <as-path-prepend>21320 21320 21320</as-path-prepend>
+ <next>term</next>
+ </then>
+ </term>
+ <term>
+ <name>GOOGLE-test-prepend-6</name>
+ <from>
+ <community>GOOGLE-test-prepend-6</community>
+ </from>
+ <then>
+ <as-path-prepend>21320 21320 21320 21320 21320 21320</as-path-prepend>
+ <next>term</next>
+ </then>
+ </term>
<term>
<name>to-private-peers-prepend-1</name>
<from>
@@ -25648,6 +25748,26 @@
<name>CLS_PROVIDER_ROUTES</name>
<members>20965:65102</members>
</community>
+ <community>
+ <name>GOOGLE-test-prepend-1</name>
+ <members>64801:15169</members>
+ <members>64812:15169</members>
+ </community>
+ <community>
+ <name>GOOGLE-test-prepend-2</name>
+ <members>64802:15169</members>
+ <members>64812:15169</members>
+ </community>
+ <community>
+ <name>GOOGLE-test-prepend-3</name>
+ <members>64803:15169</members>
+ <members>64812:15169</members>
+ </community>
+ <community>
+ <name>GOOGLE-test-prepend-6</name>
+ <members>64806:15169</members>
+ <members>64812:15169</members>
+ </community>
<community>
<name>IAS_AGGREGATE_ROUTES</name>
<members>21320:64912</members>
@@ -29682,13 +29802,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -29704,14 +29817,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp>
<name>backbone-classifier</name>
@@ -29723,18 +29828,6 @@
<code-points>af12</code-points>
<code-points>af11</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -29742,342 +29835,17 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>iperf-classifier</name>
- <import>default</import>
<forwarding-class>
<name>expedited-forwarding</name>
<loss-priority>
<name>low</name>
- <code-points>af12</code-points>
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
- <dscp>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp-ipv6>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
<dscp-ipv6>
<name>backbone-classifier</name>
<import>default</import>
@@ -30088,18 +29856,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -30107,13 +29863,7 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -30136,13 +29886,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -30158,41 +29901,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>iperf-classifier</name>
- <import>default</import>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>af12</code-points>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-access-classifier</name>
@@ -30201,16 +29909,16 @@
<name>be</name>
<loss-priority>
<name>low</name>
- <code-points>000</code-points>
- <code-points>001</code-points>
- <code-points>010</code-points>
- <code-points>011</code-points>
- <code-points>110</code-points>
- <code-points>111</code-points>
+ <code-points>100</code-points>
+ <code-points>101</code-points>
</loss-priority>
</forwarding-class>
+ </exp>
+ <exp>
+ <name>mpls-backbone-classifier</name>
+ <import>default</import>
<forwarding-class>
- <name>less-than-best-effort</name>
+ <name>be</name>
<loss-priority>
<name>low</name>
<code-points>100</code-points>
@@ -30218,40 +29926,7 @@
</loss-priority>
</forwarding-class>
</exp>
- <exp>
- <name>mpls-backbone-classifier</name>
- <import>default</import>
- </exp>
</classifiers>
- <code-point-aliases>
- <dscp>
- <name>ix</name>
- <bits>101001</bits>
- </dscp>
- <dscp>
- <name>dws</name>
- <bits>100000</bits>
- </dscp>
- <dscp-ipv6>
- <name>dws</name>
- <bits>100000</bits>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix</name>
- <bits>101001</bits>
- </dscp-ipv6>
- </code-point-aliases>
- <drop-profiles>
- <name>dws-drop-profile</name>
- <fill-level>
- <name>35</name>
- <drop-probability>10</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<drop-profiles>
<name>be-drop-profile</name>
<fill-level>
@@ -30271,86 +29946,40 @@
<drop-probability>100</drop-probability>
</fill-level>
</drop-profiles>
- <drop-profiles>
- <name>less-than-be-drop-profile</name>
- <fill-level>
- <name>25</name>
- <drop-probability>30</drop-probability>
- </fill-level>
- <fill-level>
- <name>30</name>
- <drop-probability>50</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>70</drop-probability>
- </fill-level>
- <fill-level>
- <name>50</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<forwarding-classes>
<class>
<name>be</name>
<queue-num>0</queue-num>
</class>
- <class>
- <name>be-ix</name>
- <queue-num>0</queue-num>
- </class>
<class>
<name>expedited-forwarding</name>
<queue-num>1</queue-num>
</class>
- <class>
- <name>less-than-best-effort</name>
- <queue-num>2</queue-num>
- </class>
<class>
<name>network-control</name>
<queue-num>3</queue-num>
</class>
- <class>
- <name>be-dws</name>
- <queue-num>0</queue-num>
- </class>
- <class>
- <name>be-bleach</name>
- <queue-num>0</queue-num>
- </class>
</forwarding-classes>
<interfaces>
- <interface inactive="inactive">
- <name>xe-0/0/0</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
- <unit>
- <name>0</name>
- <classifiers>
- <dscp>
- <name>backbone-classifier</name>
- </dscp>
- <dscp-ipv6>
- <name>backbone-classifier</name>
- </dscp-ipv6>
- <exp>
- <classifier-name>mpls-backbone-classifier</classifier-name>
- </exp>
- </classifiers>
- <rewrite-rules>
- <dscp>
- <name>basic-rewrite-rules</name>
- </dscp>
- <exp>
- <name>mpls-rewrite-rules</name>
- <protocol>mpls-any</protocol>
- </exp>
- </rewrite-rules>
- </unit>
+ <interface>
+ <name>et-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>ge-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>so-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>xe-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
</interface>
<interface>
<name>ge-0/3/2</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>10</name>
<classifiers>
@@ -30415,69 +30044,14 @@
</dscp>
</rewrite-rules>
</unit>
- <unit>
- <name>71</name>
- <classifiers>
- <dscp>
- <name>iperf-classifier</name>
- </dscp>
- <dscp-ipv6>
- <name>iperf-classifier</name>
- </dscp-ipv6>
- </classifiers>
- <rewrite-rules>
- <dscp>
- <name>basic-rewrite-rules</name>
- </dscp>
- </rewrite-rules>
- </unit>
</interface>
<interface>
- <name>ge-0/3/3</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
- <unit>
- <name>0</name>
- <classifiers>
- <dscp>
- <name>iperf-classifier</name>
- </dscp>
- <dscp-ipv6>
- <name>iperf-classifier</name>
- </dscp-ipv6>
- </classifiers>
- <rewrite-rules>
- <dscp>
- <name>basic-rewrite-rules</name>
- </dscp>
- </rewrite-rules>
- </unit>
- </interface>
- <interface inactive="inactive">
- <name>xe-4/1/5</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
- <unit>
- <name>0</name>
- <classifiers>
- <dscp>
- <name>dws-access-classifier</name>
- </dscp>
- <dscp-ipv6>
- <name>dws-access-classifier</name>
- </dscp-ipv6>
- </classifiers>
- <rewrite-rules>
- <dscp>
- <name>basic-rewrite-rules</name>
- </dscp>
- <dscp-ipv6>
- <name>basic-rewrite-rules</name>
- </dscp-ipv6>
- </rewrite-rules>
- </unit>
+ <name>ae*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
</interface>
<interface>
<name>ae1</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -30495,17 +30069,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -30515,7 +30081,7 @@
</interface>
<interface>
<name>ae2</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -30533,17 +30099,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -30553,7 +30111,7 @@
</interface>
<interface>
<name>ae3</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -30571,17 +30129,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -30591,7 +30141,7 @@
</interface>
<interface>
<name>ae4</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -30609,17 +30159,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -30629,7 +30171,7 @@
</interface>
<interface>
<name>ae5</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -30647,17 +30189,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -30667,7 +30201,7 @@
</interface>
<interface>
<name>ae6</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>2</name>
<classifiers>
@@ -30685,17 +30219,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -30719,17 +30245,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -30739,7 +30257,7 @@
</interface>
<interface>
<name>ae7</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -30757,17 +30275,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -30777,7 +30287,7 @@
</interface>
<interface>
<name>ae9</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -30795,17 +30305,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -30813,32 +30315,9 @@
</rewrite-rules>
</unit>
</interface>
- <interface inactive="inactive">
- <name>ae10</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
- <unit>
- <name>0</name>
- <classifiers>
- <dscp>
- <name>ix-access-classifier</name>
- </dscp>
- <dscp-ipv6>
- <name>ix-access-classifier</name>
- </dscp-ipv6>
- </classifiers>
- <rewrite-rules>
- <dscp>
- <name>basic-rewrite-rules</name>
- </dscp>
- <dscp-ipv6>
- <name>basic-rewrite-rules</name>
- </dscp-ipv6>
- </rewrite-rules>
- </unit>
- </interface>
<interface>
<name>ae11</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>100</name>
<classifiers>
@@ -30869,8 +30348,9 @@
</interface>
<interface>
<name>ae12</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
- <name>333</name>
+ <name>100</name>
<classifiers>
<dscp>
<name>access-classifier</name>
@@ -30879,19 +30359,23 @@
<name>access-classifier</name>
</dscp-ipv6>
</classifiers>
+ <rewrite-rules>
+ <dscp>
+ <name>basic-rewrite-rules</name>
+ </dscp>
+ <dscp-ipv6>
+ <name>basic-rewrite-rules</name>
+ </dscp-ipv6>
+ </rewrite-rules>
</unit>
- </interface>
- <interface inactive="inactive">
- <name>ae13</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
<unit>
- <name>0</name>
+ <name>333</name>
<classifiers>
<dscp>
- <name>dws-access-classifier</name>
+ <name>access-classifier</name>
</dscp>
<dscp-ipv6>
- <name>dws-access-classifier</name>
+ <name>access-classifier</name>
</dscp-ipv6>
</classifiers>
<rewrite-rules>
@@ -30906,7 +30390,7 @@
</interface>
<interface>
<name>ae14</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -30933,7 +30417,7 @@
</interface>
<interface>
<name>ae15</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>51</name>
<classifiers>
@@ -30972,6 +30456,26 @@
</interface>
<interface>
<name>ae17</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ <unit>
+ <name>100</name>
+ <classifiers>
+ <dscp>
+ <name>access-classifier</name>
+ </dscp>
+ <dscp-ipv6>
+ <name>access-classifier</name>
+ </dscp-ipv6>
+ </classifiers>
+ <rewrite-rules>
+ <dscp>
+ <name>basic-rewrite-rules</name>
+ </dscp>
+ <dscp-ipv6>
+ <name>basic-rewrite-rules</name>
+ </dscp-ipv6>
+ </rewrite-rules>
+ </unit>
<unit>
<name>333</name>
<classifiers>
@@ -30982,11 +30486,19 @@
<name>access-classifier</name>
</dscp-ipv6>
</classifiers>
+ <rewrite-rules>
+ <dscp>
+ <name>basic-rewrite-rules</name>
+ </dscp>
+ <dscp-ipv6>
+ <name>basic-rewrite-rules</name>
+ </dscp-ipv6>
+ </rewrite-rules>
</unit>
</interface>
<interface>
<name>ae23</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -31004,17 +30516,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp>
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -31024,7 +30528,7 @@
</interface>
<interface>
<name>ae27</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -31049,40 +30553,10 @@
</rewrite-rules>
</unit>
</interface>
- <interface inactive="inactive">
- <name>ae29</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
- <unit>
- <name>0</name>
- <classifiers>
- <dscp>
- <name>dws-access-classifier</name>
- </dscp>
- <dscp-ipv6>
- <name>dws-access-classifier</name>
- </dscp-ipv6>
- </classifiers>
- <rewrite-rules>
- <dscp>
- <name>basic-rewrite-rules</name>
- </dscp>
- <dscp-ipv6>
- <name>basic-rewrite-rules</name>
- </dscp-ipv6>
- </rewrite-rules>
- </unit>
- </interface>
</interfaces>
<rewrite-rules>
<dscp>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -31097,17 +30571,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -31119,97 +30582,9 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -31224,17 +30599,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -31246,73 +30610,6 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
@@ -31320,75 +30617,20 @@
</exp>
</rewrite-rules>
<scheduler-maps>
- <name>MAP-BASIC-IQ2</name>
+ <name>GEANT-BASIC</name>
<forwarding-class>
<name>expedited-forwarding</name>
<scheduler>sch-expedited-forwarding</scheduler>
</forwarding-class>
<forwarding-class>
<name>network-control</name>
- <scheduler>sch-network-ctrl-iq2</scheduler>
+ <scheduler>sch-network-ctrl-geant</scheduler>
</forwarding-class>
<forwarding-class>
<name>be</name>
<scheduler>sch-be</scheduler>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <scheduler>sch-less-than-best-effort</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
</scheduler-maps>
- <schedulers>
- <name>sch-less-than-best-effort</name>
- <transmit-rate>
- <percent>10</percent>
- </transmit-rate>
- <buffer-size>
- <percent>10</percent>
- </buffer-size>
- <priority>low</priority>
- <drop-profile-map>
- <loss-priority>low</loss-priority>
- <protocol>any</protocol>
- <drop-profile>less-than-be-drop-profile</drop-profile>
- </drop-profile-map>
- <drop-profile-map>
- <loss-priority>high</loss-priority>
- <protocol>any</protocol>
- <drop-profile>be-drop-profile</drop-profile>
- </drop-profile-map>
- </schedulers>
- <schedulers>
- <name>sch-network-ctrl</name>
- <transmit-rate>
- <percent>5</percent>
- </transmit-rate>
- <buffer-size>
- <percent>5</percent>
- </buffer-size>
- <priority>high</priority>
- </schedulers>
- <schedulers>
- <name>sch-network-ctrl-iq2</name>
- <transmit-rate>
- <percent>5</percent>
- </transmit-rate>
- <buffer-size>
- <percent>5</percent>
- </buffer-size>
- </schedulers>
<schedulers>
<name>sch-be</name>
<transmit-rate>
@@ -31409,6 +30651,16 @@
<schedulers>
<name>sc</name>
</schedulers>
+ <schedulers>
+ <name>sch-network-ctrl-geant</name>
+ <transmit-rate>
+ <percent>5</percent>
+ </transmit-rate>
+ <buffer-size>
+ <percent>5</percent>
+ </buffer-size>
+ <priority>high</priority>
+ </schedulers>
</class-of-service>
<firewall>
<family>
@@ -31590,9 +30842,6 @@
<term>
<name>BGP-protect</name>
<from>
- <source-address>
- <name>149.6.174.33/32</name>
- </source-address>
<source-address>
<name>38.229.66.20/32</name>
</source-address>
@@ -31602,15 +30851,9 @@
<source-address>
<name>130.117.20.2/32</name>
</source-address>
- <source-address>
- <name>149.6.174.34/32</name>
- </source-address>
<source-address>
<name>149.6.175.249/32</name>
</source-address>
- <destination-address>
- <name>149.6.174.34/32</name>
- </destination-address>
<destination-address>
<name>62.40.97.11/32</name>
</destination-address>
@@ -31640,15 +30883,9 @@
<source-address>
<name>212.113.0.9/32</name>
</source-address>
- <source-address>
- <name>149.6.174.33/32</name>
- </source-address>
<source-address>
<name>149.6.175.249/32</name>
</source-address>
- <destination-address>
- <name>149.6.174.34/32</name>
- </destination-address>
<destination-address>
<name>62.40.114.1/32</name>
</destination-address>
@@ -31682,15 +30919,9 @@
<term>
<name>PIM-protect</name>
<from>
- <source-address>
- <name>149.6.174.33/32</name>
- </source-address>
<source-address>
<name>149.6.175.249/32</name>
</source-address>
- <destination-address>
- <name>149.6.174.34/32</name>
- </destination-address>
<destination-address>
<name>149.6.175.250/32</name>
</destination-address>
@@ -31811,9 +31042,6 @@
<term>
<name>ICMP-DWS-accept</name>
<from>
- <destination-address>
- <name>149.6.174.34/32</name>
- </destination-address>
<destination-address>
<name>149.6.175.250/32</name>
</destination-address>
@@ -41807,9 +41035,6 @@
<term>
<name>BGP-filter</name>
<from>
- <address>
- <name>149.6.174.34/32</name>
- </address>
<address>
<name>130.117.20.2/32</name>
</address>
@@ -41823,9 +41048,6 @@
<term>
<name>ICMP-DWS-accept</name>
<from>
- <destination-address>
- <name>149.6.174.34/32</name>
- </destination-address>
<protocol>icmp</protocol>
</from>
<then>
@@ -41862,9 +41084,6 @@
<address>
<name>130.117.20.2/32</name>
</address>
- <address>
- <name>149.6.174.34/32</name>
- </address>
<protocol>tcp</protocol>
<port>bgp</port>
</from>
@@ -43952,6 +43171,9 @@
<source-prefix-list>
<name>dashboard-servers</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers</name>
+ </source-prefix-list>
<protocol>tcp</protocol>
<destination-port>ssh</destination-port>
</from>
@@ -50216,6 +49438,9 @@
<source-prefix-list>
<name>dashboard-servers-v6</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers-v6</name>
+ </source-prefix-list>
<next-header>tcp</next-header>
<port>ssh</port>
</from>
@@ -53564,7 +52789,7 @@
</policer>
</firewall>
<routing-instances>
- <instance>
+ <instance inactive="inactive">
<name>CLEAN_IAS</name>
<description>Clean IAS VRF traffic returned from scrubber</description>
<instance-type>vrf</instance-type>
@@ -53910,9 +53135,6 @@
<interface>
<name>xe-4/0/6.333</name>
</interface>
- <interface>
- <name>xe-4/1/5.0</name>
- </interface>
<interface>
<name>xe-4/2/4.0</name>
</interface>
@@ -54327,7 +53549,7 @@
<prefix-limit>
<maximum>150000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -54355,7 +53577,7 @@
<prefix-limit>
<maximum>2250</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -54392,7 +53614,7 @@
<prefix-limit>
<maximum>300</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -54429,7 +53651,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -54466,7 +53688,7 @@
<prefix-limit>
<maximum>900</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -54502,7 +53724,7 @@
<prefix-limit>
<maximum>247500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -54536,9 +53758,9 @@
<inet>
<any>
<prefix-limit>
- <maximum>4000</maximum>
+ <maximum>4500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -54574,7 +53796,7 @@
<prefix-limit>
<maximum>7500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -54611,7 +53833,7 @@
<prefix-limit>
<maximum>3750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
</teardown>
</prefix-limit>
</any>
@@ -54644,7 +53866,7 @@
<prefix-limit>
<maximum>6000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
</teardown>
</prefix-limit>
</any>
@@ -54677,7 +53899,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -54713,7 +53935,7 @@
<prefix-limit>
<maximum>600</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -54749,7 +53971,7 @@
<prefix-limit>
<maximum>13</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -54786,7 +54008,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -54822,7 +54044,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -54907,7 +54129,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -54943,7 +54165,7 @@
<prefix-limit>
<maximum>7500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -54977,9 +54199,9 @@
<inet>
<any>
<prefix-limit>
- <maximum>33000</maximum>
+ <maximum>36000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -55015,7 +54237,7 @@
<prefix-limit>
<maximum>3000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -55051,7 +54273,7 @@
<prefix-limit>
<maximum>45</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -55087,7 +54309,7 @@
<prefix-limit>
<maximum>45</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -55123,7 +54345,7 @@
<prefix-limit>
<maximum>7500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -55159,7 +54381,7 @@
<prefix-limit>
<maximum>225</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -55195,7 +54417,7 @@
<prefix-limit>
<maximum>375</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -55231,7 +54453,7 @@
<prefix-limit>
<maximum>375</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -55267,7 +54489,7 @@
<prefix-limit>
<maximum>900</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -55303,7 +54525,7 @@
<prefix-limit>
<maximum>900</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -55339,7 +54561,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -55375,7 +54597,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -55411,7 +54633,7 @@
<prefix-limit>
<maximum>3000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -55447,7 +54669,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -55480,7 +54702,7 @@
<prefix-limit>
<maximum>150000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -55506,7 +54728,7 @@
<prefix-limit>
<maximum>300</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -55543,7 +54765,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -55579,7 +54801,7 @@
<prefix-limit>
<maximum>247500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -55615,7 +54837,7 @@
<prefix-limit>
<maximum>3750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -55651,7 +54873,7 @@
<prefix-limit>
<maximum>7500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -55688,7 +54910,7 @@
<prefix-limit>
<maximum>3750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
</teardown>
</prefix-limit>
</any>
@@ -55721,7 +54943,7 @@
<prefix-limit>
<maximum>6000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
</teardown>
</prefix-limit>
</any>
@@ -55754,7 +54976,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -55790,7 +55012,7 @@
<prefix-limit>
<maximum>300</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -55826,7 +55048,7 @@
<prefix-limit>
<maximum>13</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -55863,7 +55085,7 @@
<prefix-limit>
<maximum>750</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -55899,7 +55121,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -55964,7 +55186,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -56000,7 +55222,7 @@
<prefix-limit>
<maximum>7500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -56074,7 +55296,7 @@
<prefix-limit>
<maximum>900</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -56108,9 +55330,9 @@
<inet6>
<any>
<prefix-limit>
- <maximum>1950</maximum>
+ <maximum>2500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -56146,7 +55368,7 @@
<prefix-limit>
<maximum>45</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -56182,7 +55404,7 @@
<prefix-limit>
<maximum>45</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -56218,7 +55440,7 @@
<prefix-limit>
<maximum>7500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -56254,7 +55476,7 @@
<prefix-limit>
<maximum>225</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -56290,7 +55512,7 @@
<prefix-limit>
<maximum>375</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -56326,7 +55548,7 @@
<prefix-limit>
<maximum>375</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -56362,7 +55584,7 @@
<prefix-limit>
<maximum>900</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -56398,7 +55620,7 @@
<prefix-limit>
<maximum>900</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -56434,7 +55656,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -56470,7 +55692,7 @@
<prefix-limit>
<maximum>1500</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -56506,7 +55728,7 @@
<prefix-limit>
<maximum>3000</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -56542,7 +55764,7 @@
<prefix-limit>
<maximum>75</maximum>
<teardown>
- <limit-threshold>90</limit-threshold>
+ <limit-threshold>80</limit-threshold>
<idle-timeout>
<timeout>30</timeout>
</idle-timeout>
@@ -56574,25 +55796,6 @@
</any>
</inet>
</family>
- <neighbor>
- <name>149.6.174.33</name>
- <description>--DWS Traffic peering Cogent--</description>
- <out-delay>10</out-delay>
- <import>ps-AS-SELF-REJECT</import>
- <import>ps-BOGONS</import>
- <import>ps-PRIVATE-AS-BLOCK</import>
- <import>ps-IAS-from-DWS-Cogent</import>
- <authentication-key>/* SECRET-DATA */</authentication-key>
- <export>ps-BOGONS</export>
- <export>ps-PRIVATE-AS-BLOCK</export>
- <export>ps-IAS-to-DWS-Cogent</export>
- <peer-as>174</peer-as>
- <local-as>
- <as-number>21320</as-number>
- <private/>
- <no-prepend-global-as/>
- </local-as>
- </neighbor>
<neighbor>
<name>80.239.135.54</name>
<description>--- DWS Traffic peering with Telia ---</description>
@@ -56945,7 +56148,6 @@
<multihop>
<ttl>255</ttl>
</multihop>
- <local-address>149.6.174.34</local-address>
<import>ps-deny-all</import>
<authentication-key>/* SECRET-DATA */</authentication-key>
<export>ps-IAS-to-GWS-Cogent-RTBH</export>
@@ -57342,7 +56544,10 @@
<prefix-limit>
<maximum>1000</maximum>
<teardown>
- <limit-threshold>50</limit-threshold>
+ <limit-threshold>90</limit-threshold>
+ <idle-timeout>
+ <timeout>15</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</labeled-unicast>
diff --git a/test/data/mx2.ath.gr.geant.net-netconf.xml b/test/data/mx2.ath.gr.geant.net-netconf.xml
index 6e1af6c8838f639718bcfd96e356d5e8d9685b7c..28a343d4caa6be8b96fb7af4adf32c2c1ee0420b 100644
--- a/test/data/mx2.ath.gr.geant.net-netconf.xml
+++ b/test/data/mx2.ath.gr.geant.net-netconf.xml
@@ -1,4 +1,4 @@
-<configuration changed-seconds="1545214012" changed-localtime="2018-12-19 10:06:52 UTC">
+<configuration changed-seconds="1549111584" changed-localtime="2019-02-02 12:46:24 UTC">
<version>15.1F6-S10.9</version>
<groups>
<name>re0</name>
@@ -252,6 +252,38 @@
<allow-commands>show .*</allow-commands>
<deny-commands>(ssh .*|telnet .*)</deny-commands>
</class>
+ <class>
+ <name>opennsa</name>
+ <idle-timeout>5</idle-timeout>
+ <permissions>configure</permissions>
+ <deny-commands>(file.*)|(load.*)|(op.*)|(request.*)|(save.*)|(start.*)|(test.*)|(set cli.*)|(set date.*)|(clear.*)|(help.*)|(telnet.*)|(ssh.*)|(traceroute.*)|(mtrace.*)|(monitor.*)|(ping.*)|(show.*)|(set.*)</deny-commands>
+ <allow-configuration-regexps>interfaces .*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections remote-interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols mpls label-switched-path.*</allow-configuration-regexps>
+ <deny-configuration-regexps>vmhost .*</deny-configuration-regexps>
+ <deny-configuration-regexps>session-limit-group .*</deny-configuration-regexps>
+ <deny-configuration-regexps>multi-chassis .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc-partition .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc .*</deny-configuration-regexps>
+ <deny-configuration-regexps>groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>dynamic-profiles .*</deny-configuration-regexps>
+ <deny-configuration-regexps>diameter .*</deny-configuration-regexps>
+ <deny-configuration-regexps>apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>access-profile .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces traceoptions .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-set .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-range .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups-except .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lt-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces ms-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces si-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces gr-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lo.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces dsc.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces irb.*</deny-configuration-regexps>
+ </class>
<class>
<name>readonly-permissions</name>
<idle-timeout>15</idle-timeout>
@@ -565,6 +597,22 @@
<encrypted-password>/* SECRET-DATA */</encrypted-password>
</authentication>
</user>
+ <user>
+ <name>opennsa</name>
+ <uid>2052</uid>
+ <class>opennsa</class>
+ <authentication>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ </authentication>
+ </user>
<user>
<name>opnet</name>
<full-name>OPNET NEOP Planning system @ 62.40.105.114</full-name>
@@ -1825,16 +1873,6 @@
</inet6>
</family>
</unit>
- <unit>
- <name>691</name>
- <description>SRV_L2CIRCUIT CUSTOMER GRNET I2CAT SRF9916033 | ath-gen_I2CAT_GRnet-RedIRIS_12207</description>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>691</vlan-id>
- <family>
- <ccc>
- </ccc>
- </family>
- </unit>
<unit>
<name>692</name>
<description>SRV_L2CIRCUIT CUSTOMER GRNET JANET SRF9912204 | ath-lon_FutureInternet_GRNET-JANET_12204</description>
@@ -2892,6 +2930,9 @@
<clients>
<name>83.97.93.196/32</name>
</clients>
+ <clients>
+ <name>83.97.93.238/32</name>
+ </clients>
</community>
<community>
<name>As4n0gN!</name>
@@ -3503,13 +3544,13 @@
<import-rib>IAS.inet6.0</import-rib>
<import-policy>rtbh-policy</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias</name>
<import-rib>IAS.inet.0</import-rib>
<import-rib>CLEAN_IAS.inet.0</import-rib>
<import-policy>ps-into-clean-ias-import</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias-v6</name>
<import-rib>IAS.inet6.0</import-rib>
<import-rib>CLEAN_IAS.inet6.0</import-rib>
@@ -4338,12 +4379,6 @@
</traceoptions>
<neighbor>
<name>62.40.96.12</name>
- <interface>
- <name>xe-2/0/0.691</name>
- <virtual-circuit-id>691</virtual-circuit-id>
- <description>ath-mad_I2CAT_GRnet-RedIRIS</description>
- <ignore-mtu-mismatch/>
- </interface>
</neighbor>
<neighbor>
<name>62.40.97.5</name>
@@ -5504,9 +5539,15 @@
<prefix-list-item>
<name>195.130.89.0/29</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>195.130.89.8/29</name>
+ </prefix-list-item>
<prefix-list-item>
<name>195.130.89.16/29</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>195.130.89.24/29</name>
+ </prefix-list-item>
<prefix-list-item>
<name>195.130.90.0/23</name>
</prefix-list-item>
@@ -5756,6 +5797,9 @@
<prefix-list-item>
<name>195.251.98.0/24</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>195.251.99.0/27</name>
+ </prefix-list-item>
<prefix-list-item>
<name>195.251.99.32/27</name>
</prefix-list-item>
@@ -5831,6 +5875,9 @@
<prefix-list-item>
<name>195.251.116.0/26</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>195.251.116.64/27</name>
+ </prefix-list-item>
<prefix-list-item>
<name>195.251.116.128/27</name>
</prefix-list-item>
@@ -6644,6 +6691,9 @@
<prefix-list-item>
<name>2001:648:28a0::/48</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>2001:648:28b0::/48</name>
+ </prefix-list-item>
<prefix-list-item>
<name>2001:648:28c0::/48</name>
</prefix-list-item>
@@ -6659,6 +6709,9 @@
<prefix-list-item>
<name>2001:648:2920::/48</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>2001:648:2930::/48</name>
+ </prefix-list-item>
<prefix-list-item>
<name>2001:648:2c00::/48</name>
</prefix-list-item>
@@ -6686,6 +6739,9 @@
<prefix-list-item>
<name>2001:648:2ca0::/48</name>
</prefix-list-item>
+ <prefix-list-item>
+ <name>2001:648:2cb0::/48</name>
+ </prefix-list-item>
<prefix-list-item>
<name>2001:648:2cef::/48</name>
</prefix-list-item>
@@ -8897,16 +8953,13 @@
</prefix-list>
<prefix-list>
<name>geantncc-address-space</name>
- <comment>/* NCC DR VPN LAN */</comment>
+ <comment>/* NCC DR VPN */</comment>
<prefix-list-item>
- <name>62.40.108.192/26</name>
+ <name>62.40.108.192/27</name>
</prefix-list-item>
<prefix-list-item>
<name>62.40.119.0/24</name>
</prefix-list-item>
- <prefix-list-item>
- <name>62.40.119.134/32</name>
- </prefix-list-item>
<prefix-list-item>
<name>62.40.125.250/32</name>
</prefix-list-item>
@@ -10097,6 +10150,14 @@
</prefix-list>
<prefix-list>
<name>corporate-address-space</name>
+ <comment>/* LON2 CORP VPN (MAC) */</comment>
+ <prefix-list-item>
+ <name>62.40.99.194/32</name>
+ </prefix-list-item>
+ <comment>/* LON2 CORP VPN */</comment>
+ <prefix-list-item>
+ <name>62.40.99.201/32</name>
+ </prefix-list-item>
<prefix-list-item>
<name>62.40.119.128/25</name>
</prefix-list-item>
@@ -10194,6 +10255,18 @@
<name>2001:798::/32</name>
</prefix-list-item>
</prefix-list>
+ <prefix-list>
+ <name>opennsa-servers</name>
+ <prefix-list-item>
+ <name>83.97.93.92/32</name>
+ </prefix-list-item>
+ </prefix-list>
+ <prefix-list>
+ <name>opennsa-servers-v6</name>
+ <prefix-list-item>
+ <name>2001:798:3::15f/128</name>
+ </prefix-list-item>
+ </prefix-list>
<policy-statement>
<name>ASM-Allow</name>
<term>
@@ -10661,6 +10734,10 @@
<address>185.1.68.0/24</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>193.188.137.0/24</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -10782,6 +10859,10 @@
<address>2001:7f8:a0::/64</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>2001:7f8:35::/64</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -13049,13 +13130,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -13071,14 +13145,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp>
<name>backbone-classifier</name>
@@ -13090,18 +13156,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -13109,195 +13163,16 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>iperf-classifier</name>
- <import>default</import>
<forwarding-class>
<name>expedited-forwarding</name>
<loss-priority>
<name>low</name>
- <code-points>af12</code-points>
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>backbone-classifier</name>
@@ -13309,18 +13184,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -13328,13 +13191,7 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -13357,13 +13214,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -13379,187 +13229,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>iperf-classifier</name>
- <import>default</import>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>af12</code-points>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-access-classifier</name>
@@ -13568,16 +13237,16 @@
<name>be</name>
<loss-priority>
<name>low</name>
- <code-points>000</code-points>
- <code-points>001</code-points>
- <code-points>010</code-points>
- <code-points>011</code-points>
- <code-points>110</code-points>
- <code-points>111</code-points>
+ <code-points>100</code-points>
+ <code-points>101</code-points>
</loss-priority>
</forwarding-class>
+ </exp>
+ <exp>
+ <name>mpls-backbone-classifier</name>
+ <import>default</import>
<forwarding-class>
- <name>less-than-best-effort</name>
+ <name>be</name>
<loss-priority>
<name>low</name>
<code-points>100</code-points>
@@ -13585,40 +13254,7 @@
</loss-priority>
</forwarding-class>
</exp>
- <exp>
- <name>mpls-backbone-classifier</name>
- <import>default</import>
- </exp>
</classifiers>
- <code-point-aliases>
- <dscp>
- <name>ix</name>
- <bits>101001</bits>
- </dscp>
- <dscp>
- <name>dws</name>
- <bits>100000</bits>
- </dscp>
- <dscp-ipv6>
- <name>dws</name>
- <bits>100000</bits>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix</name>
- <bits>101001</bits>
- </dscp-ipv6>
- </code-point-aliases>
- <drop-profiles>
- <name>dws-drop-profile</name>
- <fill-level>
- <name>35</name>
- <drop-probability>10</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<drop-profiles>
<name>be-drop-profile</name>
<fill-level>
@@ -13638,59 +13274,40 @@
<drop-probability>100</drop-probability>
</fill-level>
</drop-profiles>
- <drop-profiles>
- <name>less-than-be-drop-profile</name>
- <fill-level>
- <name>25</name>
- <drop-probability>30</drop-probability>
- </fill-level>
- <fill-level>
- <name>30</name>
- <drop-probability>50</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>70</drop-probability>
- </fill-level>
- <fill-level>
- <name>50</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<forwarding-classes>
<class>
<name>be</name>
<queue-num>0</queue-num>
</class>
- <class>
- <name>be-ix</name>
- <queue-num>0</queue-num>
- </class>
<class>
<name>expedited-forwarding</name>
<queue-num>1</queue-num>
</class>
- <class>
- <name>less-than-best-effort</name>
- <queue-num>2</queue-num>
- </class>
<class>
<name>network-control</name>
<queue-num>3</queue-num>
</class>
- <class>
- <name>be-dws</name>
- <queue-num>0</queue-num>
- </class>
- <class>
- <name>be-bleach</name>
- <queue-num>0</queue-num>
- </class>
</forwarding-classes>
<interfaces>
+ <interface>
+ <name>et-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>ge-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>so-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>xe-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
<interface>
<name>ge-2/2/1</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>10</name>
<classifiers>
@@ -13755,26 +13372,14 @@
</dscp>
</rewrite-rules>
</unit>
- <unit>
- <name>71</name>
- <classifiers>
- <dscp>
- <name>iperf-classifier</name>
- </dscp>
- <dscp-ipv6>
- <name>iperf-classifier</name>
- </dscp-ipv6>
- </classifiers>
- <rewrite-rules>
- <dscp>
- <name>basic-rewrite-rules</name>
- </dscp>
- </rewrite-rules>
- </unit>
+ </interface>
+ <interface>
+ <name>ae*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
</interface>
<interface>
<name>ae0</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -13792,17 +13397,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -13812,7 +13409,7 @@
</interface>
<interface>
<name>ae3</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -13830,17 +13427,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -13850,7 +13439,7 @@
</interface>
<interface>
<name>ae10</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>100</name>
<classifiers>
@@ -13890,13 +13479,6 @@
<rewrite-rules>
<dscp>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -13911,77 +13493,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -13993,37 +13504,9 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -14038,17 +13521,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -14060,73 +13532,6 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
@@ -14134,35 +13539,19 @@
</exp>
</rewrite-rules>
<scheduler-maps>
- <name>MAP-BASIC-IQ2</name>
+ <name>GEANT-BASIC</name>
<forwarding-class>
<name>expedited-forwarding</name>
<scheduler>sch-expedited-forwarding</scheduler>
</forwarding-class>
<forwarding-class>
<name>network-control</name>
- <scheduler>sch-network-ctrl-iq2</scheduler>
+ <scheduler>sch-network-ctrl-geant</scheduler>
</forwarding-class>
<forwarding-class>
<name>be</name>
<scheduler>sch-be</scheduler>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <scheduler>sch-less-than-best-effort</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
</scheduler-maps>
<schedulers>
<name>sch-be</name>
@@ -14182,27 +13571,7 @@
<priority>strict-high</priority>
</schedulers>
<schedulers>
- <name>sch-less-than-best-effort</name>
- <transmit-rate>
- <percent>10</percent>
- </transmit-rate>
- <buffer-size>
- <percent>10</percent>
- </buffer-size>
- <priority>low</priority>
- <drop-profile-map>
- <loss-priority>low</loss-priority>
- <protocol>any</protocol>
- <drop-profile>less-than-be-drop-profile</drop-profile>
- </drop-profile-map>
- <drop-profile-map>
- <loss-priority>high</loss-priority>
- <protocol>any</protocol>
- <drop-profile>be-drop-profile</drop-profile>
- </drop-profile-map>
- </schedulers>
- <schedulers>
- <name>sch-network-ctrl</name>
+ <name>sch-network-ctrl-geant</name>
<transmit-rate>
<percent>5</percent>
</transmit-rate>
@@ -14211,15 +13580,6 @@
</buffer-size>
<priority>high</priority>
</schedulers>
- <schedulers>
- <name>sch-network-ctrl-iq2</name>
- <transmit-rate>
- <percent>5</percent>
- </transmit-rate>
- <buffer-size>
- <percent>5</percent>
- </buffer-size>
- </schedulers>
</class-of-service>
<firewall>
<family>
@@ -15236,6 +14596,9 @@
<source-prefix-list>
<name>dashboard-servers</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers</name>
+ </source-prefix-list>
<protocol>tcp</protocol>
<destination-port>ssh</destination-port>
</from>
@@ -18286,6 +17649,9 @@
<source-prefix-list>
<name>dashboard-servers-v6</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers-v6</name>
+ </source-prefix-list>
<next-header>tcp</next-header>
<port>ssh</port>
</from>
@@ -19536,7 +18902,7 @@
</policer>
</firewall>
<routing-instances>
- <instance>
+ <instance inactive="inactive">
<name>CLEAN_IAS</name>
<description>Clean IAS VRF traffic returned from scrubber</description>
<instance-type>vrf</instance-type>
@@ -20114,7 +19480,10 @@
<prefix-limit>
<maximum>1000</maximum>
<teardown>
- <limit-threshold>80</limit-threshold>
+ <limit-threshold>90</limit-threshold>
+ <idle-timeout>
+ <timeout>15</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</labeled-unicast>
diff --git a/test/data/mx2.bra.sk.geant.net-netconf.xml b/test/data/mx2.bra.sk.geant.net-netconf.xml
index 285c63a1deabf49746d41b650c9d416056bd95d1..299da54d04073920565404029076eac4084cfa66 100644
--- a/test/data/mx2.bra.sk.geant.net-netconf.xml
+++ b/test/data/mx2.bra.sk.geant.net-netconf.xml
@@ -1,4 +1,4 @@
-<configuration changed-seconds="1545214010" changed-localtime="2018-12-19 10:06:50 UTC">
+<configuration changed-seconds="1549111620" changed-localtime="2019-02-02 12:47:00 UTC">
<version>15.1F6-S10.9</version>
<groups>
<name>re0</name>
@@ -263,6 +263,38 @@
<allow-commands>show .*</allow-commands>
<deny-commands>(ssh .*|telnet .*)</deny-commands>
</class>
+ <class>
+ <name>opennsa</name>
+ <idle-timeout>5</idle-timeout>
+ <permissions>configure</permissions>
+ <deny-commands>(file.*)|(load.*)|(op.*)|(request.*)|(save.*)|(start.*)|(test.*)|(set cli.*)|(set date.*)|(clear.*)|(help.*)|(telnet.*)|(ssh.*)|(traceroute.*)|(mtrace.*)|(monitor.*)|(ping.*)|(show.*)|(set.*)</deny-commands>
+ <allow-configuration-regexps>interfaces .*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections remote-interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols mpls label-switched-path.*</allow-configuration-regexps>
+ <deny-configuration-regexps>vmhost .*</deny-configuration-regexps>
+ <deny-configuration-regexps>session-limit-group .*</deny-configuration-regexps>
+ <deny-configuration-regexps>multi-chassis .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc-partition .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc .*</deny-configuration-regexps>
+ <deny-configuration-regexps>groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>dynamic-profiles .*</deny-configuration-regexps>
+ <deny-configuration-regexps>diameter .*</deny-configuration-regexps>
+ <deny-configuration-regexps>apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>access-profile .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces traceoptions .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-set .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-range .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups-except .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lt-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces ms-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces si-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces gr-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lo.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces dsc.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces irb.*</deny-configuration-regexps>
+ </class>
<class>
<name>readonly-permissions</name>
<permissions>view</permissions>
@@ -572,6 +604,22 @@
<encrypted-password>/* SECRET-DATA */</encrypted-password>
</authentication>
</user>
+ <user>
+ <name>opennsa</name>
+ <uid>2056</uid>
+ <class>opennsa</class>
+ <authentication>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ </authentication>
+ </user>
<user>
<name>opnet</name>
<full-name>OPNET NEOP Planning system @ 62.40.105.114</full-name>
@@ -2344,28 +2392,6 @@
<flexible-vlan-tagging/>
<mtu>9000</mtu>
<encapsulation>flexible-ethernet-services</encapsulation>
- <unit>
- <name>1301</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>1301</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>1303</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>1303</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
</interface>
<interface>
<name>ge-0/3/3</name>
@@ -2643,6 +2669,17 @@
<push/>
</output-vlan-map>
</unit>
+ <unit>
+ <name>12</name>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>12</vlan-id>
+ <input-vlan-map>
+ <pop/>
+ </input-vlan-map>
+ <output-vlan-map>
+ <push/>
+ </output-vlan-map>
+ </unit>
<unit>
<name>13</name>
<encapsulation>vlan-ccc</encapsulation>
@@ -2764,76 +2801,10 @@
<push/>
</output-vlan-map>
</unit>
- </interface>
- <interface>
- <name>xe-2/0/7</name>
- <apply-groups>NO_TRAPS</apply-groups>
- <description>PHY INFRASTRUCTURE GTS SRF0000001 | GTS link to Server 1</description>
- <mtu>9000</mtu>
- <encapsulation>ethernet-ccc</encapsulation>
- <unit>
- <name>0</name>
- <family>
- <ccc>
- </ccc>
- </family>
- </unit>
- </interface>
- <interface>
- <name>xe-2/0/8</name>
- <apply-groups>NO_TRAPS</apply-groups>
- <description>PHY INFRASTRUCTURE GTS SRF0000001 | GTS link to Server 2</description>
- <flexible-vlan-tagging/>
- <mtu>9000</mtu>
- <encapsulation>flexible-ethernet-services</encapsulation>
- <unit>
- <name>11</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>11</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>12</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>12</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
<unit>
- <name>13</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>13</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>14</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>14</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
- </unit>
- <unit>
- <name>15</name>
+ <name>24</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>15</vlan-id>
+ <vlan-id>24</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -2842,9 +2813,9 @@
</output-vlan-map>
</unit>
<unit>
- <name>16</name>
+ <name>25</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>16</vlan-id>
+ <vlan-id>25</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -2853,9 +2824,9 @@
</output-vlan-map>
</unit>
<unit>
- <name>17</name>
+ <name>26</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>17</vlan-id>
+ <vlan-id>26</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -2864,9 +2835,9 @@
</output-vlan-map>
</unit>
<unit>
- <name>18</name>
+ <name>27</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>18</vlan-id>
+ <vlan-id>27</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -2875,9 +2846,9 @@
</output-vlan-map>
</unit>
<unit>
- <name>19</name>
+ <name>28</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>19</vlan-id>
+ <vlan-id>28</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -2886,9 +2857,9 @@
</output-vlan-map>
</unit>
<unit>
- <name>20</name>
+ <name>29</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>20</vlan-id>
+ <vlan-id>29</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -2897,9 +2868,9 @@
</output-vlan-map>
</unit>
<unit>
- <name>21</name>
+ <name>30</name>
<encapsulation>vlan-ccc</encapsulation>
- <vlan-id>21</vlan-id>
+ <vlan-id>30</vlan-id>
<input-vlan-map>
<pop/>
</input-vlan-map>
@@ -2907,17 +2878,28 @@
<push/>
</output-vlan-map>
</unit>
+ </interface>
+ <interface>
+ <name>xe-2/0/7</name>
+ <apply-groups>NO_TRAPS</apply-groups>
+ <description>PHY INFRASTRUCTURE GTS SRF0000001 | GTS link to Server 1</description>
+ <mtu>9000</mtu>
+ <encapsulation>ethernet-ccc</encapsulation>
<unit>
- <name>22</name>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-id>22</vlan-id>
- <input-vlan-map>
- <pop/>
- </input-vlan-map>
- <output-vlan-map>
- <push/>
- </output-vlan-map>
+ <name>0</name>
+ <family>
+ <ccc>
+ </ccc>
+ </family>
</unit>
+ </interface>
+ <interface>
+ <name>xe-2/0/8</name>
+ <apply-groups>NO_TRAPS</apply-groups>
+ <description>PHY INFRASTRUCTURE GTS SRF0000001 | GTS link to Server 2</description>
+ <flexible-vlan-tagging/>
+ <mtu>9000</mtu>
+ <encapsulation>flexible-ethernet-services</encapsulation>
<unit>
<name>28</name>
<encapsulation>vlan-ccc</encapsulation>
@@ -2978,7 +2960,7 @@
<name>xe-2/0/9</name>
<apply-groups>NO_TRAPS</apply-groups>
<description>PHY INFRASTRUCTURE GTS SRF0000001 | GTS link to Server 3</description>
- <mtu>9192</mtu>
+ <mtu>9000</mtu>
<encapsulation>ethernet-ccc</encapsulation>
<unit>
<name>0</name>
@@ -3763,6 +3745,9 @@
<clients>
<name>83.97.93.196/32</name>
</clients>
+ <clients>
+ <name>83.97.93.238/32</name>
+ </clients>
</community>
<community>
<name>As4n0gN!</name>
@@ -4254,13 +4239,13 @@
<import-rib>IAS.inet6.0</import-rib>
<import-policy>rtbh-policy</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias</name>
<import-rib>IAS.inet.0</import-rib>
<import-rib>CLEAN_IAS.inet.0</import-rib>
<import-policy>ps-into-clean-ias-import</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias-v6</name>
<import-rib>IAS.inet6.0</import-rib>
<import-rib>CLEAN_IAS.inet6.0</import-rib>
@@ -4325,141 +4310,108 @@
<ipv6-tunneling/>
<icmp-tunneling/>
<label-switched-path>
- <name>T-par.cc-F-bra.cc-mpls2</name>
- <no-install-to-address/>
- <to>62.40.97.13</to>
+ <name>T-ham.cc-F-bra.cc-mpls5</name>
+ <to>62.40.96.26</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-par.cc-F-bra.cc-mpls1</name>
- <no-install-to-address/>
- <to>62.40.97.13</to>
+ <name>T-prg.cc-F-bra.cc-mpls6</name>
+ <to>62.40.97.2</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-lon.cc-F-bra.cc-mpls4</name>
- <no-install-to-address/>
+ <name>T-lon.cc-F-bra.cc-mpls7</name>
<to>62.40.96.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-lon.cc-F-bra.cc-mpls3</name>
- <no-install-to-address/>
- <to>62.40.96.15</to>
+ <name>T-mil.cc-F-bra.cc-mpls5</name>
+ <to>62.40.97.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-lon.cc-F-bra.cc-mpls1</name>
- <no-install-to-address/>
- <to>62.40.96.15</to>
+ <name>T-ams.cc-F-bra.cc-mpls4</name>
+ <to>62.40.97.11</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-lon.cc-F-bra.cc-mpls2</name>
- <no-install-to-address/>
- <to>62.40.96.15</to>
+ <name>T-par.cc-F-bra.cc-mpls3</name>
+ <to>62.40.97.13</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-prg.cc-F-bra.cc-mpls1</name>
- <no-install-to-address/>
- <to>62.40.97.2</to>
+ <name>T-lon.cc-F-bra.cc-mpls5</name>
+ <to>62.40.96.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-prg.cc-F-bra.cc-mpls2</name>
- <no-install-to-address/>
+ <name>T-prg.cc-F-bra.cc-mpls3</name>
<to>62.40.97.2</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-mil.cc-F-bra.cc-mpls5</name>
- <no-install-to-address/>
+ <name>T-mil.cc-F-bra.cc-mpls1</name>
<to>62.40.97.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-lon.cc-F-bra.cc-mpls7</name>
- <no-install-to-address/>
- <to>62.40.96.15</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-ham.cc-F-bra.cc-mpls5</name>
- <no-install-to-address/>
- <to>62.40.96.26</to>
- <no-cspf/>
- </label-switched-path>
- <label-switched-path>
- <name>T-ams.cc-F-bra.cc-mpls4</name>
- <no-install-to-address/>
+ <name>T-ams.cc-F-bra.cc-mpls1</name>
<to>62.40.97.11</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-prg.cc-F-bra.cc-mpls6</name>
- <no-install-to-address/>
- <to>62.40.97.2</to>
+ <name>T-mad.cc-F-bra.cc-mpls1</name>
+ <to>62.40.97.16</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-lon.cc-F-bra.cc-mpls5</name>
- <no-install-to-address/>
- <to>62.40.96.15</to>
+ <name>T-ham.cc-F-bra.cc-mpls1</name>
+ <to>62.40.96.26</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-mad.cc-F-bra.cc-mpls1</name>
- <no-install-to-address/>
- <to>62.40.97.16</to>
+ <name>T-prg.cc-F-bra.cc-mpls4</name>
+ <to>62.40.97.2</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-ham.cc-F-bra.cc-mpls1</name>
- <no-install-to-address/>
+ <name>T-ham.cc-F-bra.cc-mpls2</name>
<to>62.40.96.26</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-mil.cc-F-bra.cc-mpls1</name>
- <no-install-to-address/>
+ <name>T-mil.cc-F-bra.cc-mpls2</name>
<to>62.40.97.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-prg.cc-F-bra.cc-mpls3</name>
- <no-install-to-address/>
- <to>62.40.97.2</to>
+ <name>T-lon.cc-F-bra.cc-mpls1</name>
+ <to>62.40.96.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-par.cc-F-bra.cc-mpls3</name>
- <no-install-to-address/>
- <to>62.40.97.13</to>
+ <name>T-ham.cc-F-bra.cc-mpls3</name>
+ <to>62.40.96.26</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-ams.cc-F-bra.cc-mpls1</name>
- <no-install-to-address/>
- <to>62.40.97.11</to>
+ <name>T-lon.cc-F-bra.cc-mpls2</name>
+ <to>62.40.96.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-ham.cc-F-bra.cc-mpls2</name>
- <no-install-to-address/>
+ <name>T-ham.cc-F-bra.cc-mpls4</name>
<to>62.40.96.26</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-prg.cc-F-bra.cc-mpls4</name>
- <no-install-to-address/>
- <to>62.40.97.2</to>
+ <name>T-mil.cc-F-bra.cc-mpls3</name>
+ <to>62.40.97.15</to>
<no-cspf/>
</label-switched-path>
<label-switched-path>
- <name>T-mil.cc-F-bra.cc-mpls2</name>
- <no-install-to-address/>
- <to>62.40.97.15</to>
+ <name>T-mad.cc-F-bra.cc-mpls2</name>
+ <to>62.40.97.16</to>
<no-cspf/>
</label-switched-path>
<interface>
@@ -5255,188 +5207,158 @@
</pim>
<connections>
<interface-switch>
- <name>GTS-local-BR-e95bf3461d</name>
- <interface>
- <name>xe-2/0/8.13</name>
- </interface>
- <interface>
- <name>xe-2/0/8.18</name>
- </interface>
- </interface-switch>
- <interface-switch>
- <name>GTS-local-BR-8426b893de</name>
+ <name>NSI-BR-60e893fb46</name>
<interface>
- <name>xe-2/0/8.20</name>
- </interface>
- <interface>
- <name>xe-2/0/8.22</name>
- </interface>
- </interface-switch>
- <interface-switch>
- <name>GTS-local-BR-bd25484bb7</name>
- <interface>
- <name>xe-2/0/8.15</name>
+ <name>xe-2/0/7.0</name>
</interface>
<interface>
- <name>xe-2/0/8.21</name>
+ <name>xe-2/0/6.16</name>
</interface>
</interface-switch>
<interface-switch>
- <name>GTS-local-BR-60e893fb46</name>
+ <name>NSI-BR-d337e5515a</name>
<interface>
- <name>xe-2/0/7.0</name>
+ <name>xe-2/0/9.0</name>
</interface>
<interface>
- <name>xe-2/0/6.16</name>
+ <name>xe-2/0/6.11</name>
</interface>
</interface-switch>
<interface-switch>
- <name>GTS-local-BR-d337e5515a</name>
+ <name>NSI-BR-8537dc5ba1</name>
<interface>
- <name>xe-2/0/9.0</name>
+ <name>xe-2/0/6.12</name>
</interface>
<interface>
- <name>xe-2/0/6.11</name>
+ <name>xe-2/0/6.27</name>
</interface>
</interface-switch>
<remote-interface-switch>
- <name>GTS-local-BR-95665e7661</name>
- <interface>xe-2/0/8.14</interface>
- <transmit-lsp>T-par.cc-F-bra.cc-mpls2</transmit-lsp>
- <receive-lsp>T-bra.cc-F-par.cc-mpls2</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-BR-2ad50f433c</name>
- <interface>xe-2/0/8.19</interface>
- <transmit-lsp>T-par.cc-F-bra.cc-mpls1</transmit-lsp>
- <receive-lsp>T-bra.cc-F-par.cc-mpls1</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-BR-255033577c</name>
- <interface>xe-2/0/8.17</interface>
- <transmit-lsp>T-lon.cc-F-bra.cc-mpls4</transmit-lsp>
- <receive-lsp>T-bra.cc-F-lon.cc-mpls4</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-BR-7868392102</name>
- <interface>xe-2/0/8.12</interface>
- <transmit-lsp>T-lon.cc-F-bra.cc-mpls3</transmit-lsp>
- <receive-lsp>T-bra.cc-F-lon.cc-mpls3</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-BR-84730f9bdd</name>
- <interface>xe-2/0/8.11</interface>
- <transmit-lsp>T-lon.cc-F-bra.cc-mpls1</transmit-lsp>
- <receive-lsp>T-bra.cc-F-lon.cc-mpls1</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-BR-147b3cbe38</name>
- <interface>xe-2/0/8.16</interface>
- <transmit-lsp>T-lon.cc-F-bra.cc-mpls2</transmit-lsp>
- <receive-lsp>T-bra.cc-F-lon.cc-mpls2</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-BR-bc0ebd0bfb</name>
- <interface>ge-0/3/2.1303</interface>
- <transmit-lsp>T-prg.cc-F-bra.cc-mpls1</transmit-lsp>
- <receive-lsp>T-bra.cc-F-prg.cc-mpls1</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-BR-9948f6c780</name>
- <interface>ge-0/3/2.1301</interface>
- <transmit-lsp>T-prg.cc-F-bra.cc-mpls2</transmit-lsp>
- <receive-lsp>T-bra.cc-F-prg.cc-mpls2</receive-lsp>
+ <name>BR-86ad78e34c</name>
+ <interface>xe-2/0/8.32</interface>
+ <transmit-lsp>T-ham.cc-F-bra.cc-mpls5</transmit-lsp>
+ <receive-lsp>T-bra.cc-F-ham.cc-mpls5</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-BR-26b90205d8</name>
- <interface>xe-2/0/8.29</interface>
- <transmit-lsp>T-mil.cc-F-bra.cc-mpls5</transmit-lsp>
- <receive-lsp>T-bra.cc-F-mil.cc-mpls5</receive-lsp>
+ <name>BR-f5c8417c71</name>
+ <interface>xe-2/0/8.28</interface>
+ <transmit-lsp>T-prg.cc-F-bra.cc-mpls6</transmit-lsp>
+ <receive-lsp>T-bra.cc-F-prg.cc-mpls6</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-BR-0e98e4229d</name>
+ <name>BR-0e98e4229d</name>
<interface>xe-2/0/8.31</interface>
<transmit-lsp>T-lon.cc-F-bra.cc-mpls7</transmit-lsp>
<receive-lsp>T-bra.cc-F-lon.cc-mpls7</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-BR-86ad78e34c</name>
- <interface>xe-2/0/8.32</interface>
- <transmit-lsp>T-ham.cc-F-bra.cc-mpls5</transmit-lsp>
- <receive-lsp>T-bra.cc-F-ham.cc-mpls5</receive-lsp>
+ <name>BR-26b90205d8</name>
+ <interface>xe-2/0/8.29</interface>
+ <transmit-lsp>T-mil.cc-F-bra.cc-mpls5</transmit-lsp>
+ <receive-lsp>T-bra.cc-F-mil.cc-mpls5</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-BR-4e76ed1ed8</name>
+ <name>BR-4e76ed1ed8</name>
<interface>xe-2/0/8.30</interface>
<transmit-lsp>T-ams.cc-F-bra.cc-mpls4</transmit-lsp>
<receive-lsp>T-bra.cc-F-ams.cc-mpls4</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-BR-f5c8417c71</name>
- <interface>xe-2/0/8.28</interface>
- <transmit-lsp>T-prg.cc-F-bra.cc-mpls6</transmit-lsp>
- <receive-lsp>T-bra.cc-F-prg.cc-mpls6</receive-lsp>
+ <name>BR-99016f9226</name>
+ <interface>xe-2/0/6.14</interface>
+ <transmit-lsp>T-par.cc-F-bra.cc-mpls3</transmit-lsp>
+ <receive-lsp>T-bra.cc-F-par.cc-mpls3</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-BR-5e30d5ce2d</name>
+ <name>BR-5e30d5ce2d</name>
<interface>xe-2/0/6.18</interface>
<transmit-lsp>T-lon.cc-F-bra.cc-mpls5</transmit-lsp>
<receive-lsp>T-bra.cc-F-lon.cc-mpls5</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-BR-9df41572d0</name>
- <interface>xe-2/0/6.17</interface>
- <transmit-lsp>T-mad.cc-F-bra.cc-mpls1</transmit-lsp>
- <receive-lsp>T-bra.cc-F-mad.cc-mpls1</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-BR-a80fa0fa35</name>
- <interface>xe-2/0/6.19</interface>
- <transmit-lsp>T-ham.cc-F-bra.cc-mpls1</transmit-lsp>
- <receive-lsp>T-bra.cc-F-ham.cc-mpls1</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-BR-b6b453915d</name>
- <interface>xe-2/0/6.15</interface>
- <transmit-lsp>T-mil.cc-F-bra.cc-mpls1</transmit-lsp>
- <receive-lsp>T-bra.cc-F-mil.cc-mpls1</receive-lsp>
- </remote-interface-switch>
- <remote-interface-switch>
- <name>GTS-local-BR-8b48ae0241</name>
+ <name>BR-8b48ae0241</name>
<interface>xe-2/0/6.13</interface>
<transmit-lsp>T-prg.cc-F-bra.cc-mpls3</transmit-lsp>
<receive-lsp>T-bra.cc-F-prg.cc-mpls3</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-BR-99016f9226</name>
- <interface>xe-2/0/6.14</interface>
- <transmit-lsp>T-par.cc-F-bra.cc-mpls3</transmit-lsp>
- <receive-lsp>T-bra.cc-F-par.cc-mpls3</receive-lsp>
+ <name>BR-b6b453915d</name>
+ <interface>xe-2/0/6.15</interface>
+ <transmit-lsp>T-mil.cc-F-bra.cc-mpls1</transmit-lsp>
+ <receive-lsp>T-bra.cc-F-mil.cc-mpls1</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-BR-99fa48c5a5</name>
+ <name>BR-99fa48c5a5</name>
<interface>xe-2/0/6.20</interface>
<transmit-lsp>T-ams.cc-F-bra.cc-mpls1</transmit-lsp>
<receive-lsp>T-bra.cc-F-ams.cc-mpls1</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-BR-ff23972f2a</name>
- <interface>xe-2/0/6.22</interface>
- <transmit-lsp>T-ham.cc-F-bra.cc-mpls2</transmit-lsp>
- <receive-lsp>T-bra.cc-F-ham.cc-mpls2</receive-lsp>
+ <name>BR-9df41572d0</name>
+ <interface>xe-2/0/6.17</interface>
+ <transmit-lsp>T-mad.cc-F-bra.cc-mpls1</transmit-lsp>
+ <receive-lsp>T-bra.cc-F-mad.cc-mpls1</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>BR-a80fa0fa35</name>
+ <interface>xe-2/0/6.19</interface>
+ <transmit-lsp>T-ham.cc-F-bra.cc-mpls1</transmit-lsp>
+ <receive-lsp>T-bra.cc-F-ham.cc-mpls1</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-BR-cd215b3c4f</name>
+ <name>BR-cd215b3c4f</name>
<interface>xe-2/0/6.23</interface>
<transmit-lsp>T-prg.cc-F-bra.cc-mpls4</transmit-lsp>
<receive-lsp>T-bra.cc-F-prg.cc-mpls4</receive-lsp>
</remote-interface-switch>
<remote-interface-switch>
- <name>GTS-local-BR-99c99bfb66</name>
+ <name>BR-ff23972f2a</name>
+ <interface>xe-2/0/6.22</interface>
+ <transmit-lsp>T-ham.cc-F-bra.cc-mpls2</transmit-lsp>
+ <receive-lsp>T-bra.cc-F-ham.cc-mpls2</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>BR-99c99bfb66</name>
<interface>xe-2/0/6.21</interface>
<transmit-lsp>T-mil.cc-F-bra.cc-mpls2</transmit-lsp>
<receive-lsp>T-bra.cc-F-mil.cc-mpls2</receive-lsp>
</remote-interface-switch>
+ <remote-interface-switch>
+ <name>BR-7b04cd639c</name>
+ <interface>xe-2/0/6.25</interface>
+ <transmit-lsp>T-lon.cc-F-bra.cc-mpls1</transmit-lsp>
+ <receive-lsp>T-bra.cc-F-lon.cc-mpls1</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>BR-5e2d6bc359</name>
+ <interface>xe-2/0/6.28</interface>
+ <transmit-lsp>T-ham.cc-F-bra.cc-mpls3</transmit-lsp>
+ <receive-lsp>T-bra.cc-F-ham.cc-mpls3</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>BR-da472475c2</name>
+ <interface>xe-2/0/6.29</interface>
+ <transmit-lsp>T-lon.cc-F-bra.cc-mpls2</transmit-lsp>
+ <receive-lsp>T-bra.cc-F-lon.cc-mpls2</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>BR-3ba8cb7c4d</name>
+ <interface>xe-2/0/6.24</interface>
+ <transmit-lsp>T-ham.cc-F-bra.cc-mpls4</transmit-lsp>
+ <receive-lsp>T-bra.cc-F-ham.cc-mpls4</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>BR-8276c03b83</name>
+ <interface>xe-2/0/6.30</interface>
+ <transmit-lsp>T-mil.cc-F-bra.cc-mpls3</transmit-lsp>
+ <receive-lsp>T-bra.cc-F-mil.cc-mpls3</receive-lsp>
+ </remote-interface-switch>
+ <remote-interface-switch>
+ <name>BR-be2115ff67</name>
+ <interface>xe-2/0/6.26</interface>
+ <transmit-lsp>T-mad.cc-F-bra.cc-mpls2</transmit-lsp>
+ <receive-lsp>T-bra.cc-F-mad.cc-mpls2</receive-lsp>
+ </remote-interface-switch>
</connections>
<l2circuit>
<traceoptions>
@@ -5753,16 +5675,13 @@
</prefix-list>
<prefix-list>
<name>geantncc-address-space</name>
- <comment>/* NCC DR VPN LAN */</comment>
+ <comment>/* NCC DR VPN */</comment>
<prefix-list-item>
- <name>62.40.108.192/26</name>
+ <name>62.40.108.192/27</name>
</prefix-list-item>
<prefix-list-item>
<name>62.40.119.0/24</name>
</prefix-list-item>
- <prefix-list-item>
- <name>62.40.119.134/32</name>
- </prefix-list-item>
<prefix-list-item>
<name>62.40.125.250/32</name>
</prefix-list-item>
@@ -9392,6 +9311,14 @@
</prefix-list>
<prefix-list>
<name>corporate-address-space</name>
+ <comment>/* LON2 CORP VPN (MAC) */</comment>
+ <prefix-list-item>
+ <name>62.40.99.194/32</name>
+ </prefix-list-item>
+ <comment>/* LON2 CORP VPN */</comment>
+ <prefix-list-item>
+ <name>62.40.99.201/32</name>
+ </prefix-list-item>
<prefix-list-item>
<name>62.40.119.128/25</name>
</prefix-list-item>
@@ -9513,6 +9440,18 @@
<name>2001:798::/32</name>
</prefix-list-item>
</prefix-list>
+ <prefix-list>
+ <name>opennsa-servers</name>
+ <prefix-list-item>
+ <name>83.97.93.92/32</name>
+ </prefix-list-item>
+ </prefix-list>
+ <prefix-list>
+ <name>opennsa-servers-v6</name>
+ <prefix-list-item>
+ <name>2001:798:3::15f/128</name>
+ </prefix-list-item>
+ </prefix-list>
<policy-statement>
<name>ASM-Allow</name>
<term>
@@ -10007,6 +9946,10 @@
<address>185.1.68.0/24</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>193.188.137.0/24</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -10128,6 +10071,10 @@
<address>2001:7f8:a0::/64</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>2001:7f8:35::/64</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -12514,13 +12461,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -12536,14 +12476,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp>
<name>backbone-classifier</name>
@@ -12555,18 +12487,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -12574,195 +12494,16 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>iperf-classifier</name>
- <import>default</import>
<forwarding-class>
<name>expedited-forwarding</name>
<loss-priority>
<name>low</name>
- <code-points>af12</code-points>
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>backbone-classifier</name>
@@ -12774,18 +12515,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -12793,13 +12522,7 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -12822,13 +12545,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -12844,205 +12560,12 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>iperf-classifier</name>
- <import>default</import>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>af12</code-points>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-access-classifier</name>
<import>default</import>
<forwarding-class>
<name>be</name>
- <loss-priority>
- <name>low</name>
- <code-points>000</code-points>
- <code-points>001</code-points>
- <code-points>010</code-points>
- <code-points>011</code-points>
- <code-points>110</code-points>
- <code-points>111</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
<loss-priority>
<name>low</name>
<code-points>100</code-points>
@@ -13053,26 +12576,16 @@
<exp>
<name>mpls-backbone-classifier</name>
<import>default</import>
+ <forwarding-class>
+ <name>be</name>
+ <loss-priority>
+ <name>low</name>
+ <code-points>100</code-points>
+ <code-points>101</code-points>
+ </loss-priority>
+ </forwarding-class>
</exp>
</classifiers>
- <code-point-aliases>
- <dscp>
- <name>ix</name>
- <bits>101001</bits>
- </dscp>
- <dscp>
- <name>dws</name>
- <bits>100000</bits>
- </dscp>
- <dscp-ipv6>
- <name>dws</name>
- <bits>100000</bits>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix</name>
- <bits>101001</bits>
- </dscp-ipv6>
- </code-point-aliases>
<drop-profiles>
<name>be-drop-profile</name>
<fill-level>
@@ -13092,70 +12605,44 @@
<drop-probability>50</drop-probability>
</fill-level>
</drop-profiles>
- <drop-profiles>
- <name>less-than-be-drop-profile</name>
- <fill-level>
- <name>25</name>
- <drop-probability>30</drop-probability>
- </fill-level>
- <fill-level>
- <name>30</name>
- <drop-probability>50</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>70</drop-probability>
- </fill-level>
- <fill-level>
- <name>50</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
- <drop-profiles>
- <name>dws-drop-profile</name>
- <fill-level>
- <name>35</name>
- <drop-probability>10</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<forwarding-classes>
<class>
<name>be</name>
<queue-num>0</queue-num>
</class>
- <class>
- <name>be-ix</name>
- <queue-num>0</queue-num>
- </class>
<class>
<name>expedited-forwarding</name>
<queue-num>1</queue-num>
</class>
- <class>
- <name>less-than-best-effort</name>
- <queue-num>2</queue-num>
- </class>
<class>
<name>network-control</name>
<queue-num>3</queue-num>
</class>
- <class>
- <name>be-dws</name>
- <queue-num>0</queue-num>
- </class>
- <class>
- <name>be-bleach</name>
- <queue-num>0</queue-num>
- </class>
</forwarding-classes>
<interfaces>
+ <interface>
+ <name>et-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>ge-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>so-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>xe-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>ae*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
<interface>
<name>ae0</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -13173,17 +12660,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -13193,7 +12672,7 @@
</interface>
<interface>
<name>ae1</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -13220,7 +12699,7 @@
</interface>
<interface>
<name>ae2</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -13247,7 +12726,7 @@
</interface>
<interface>
<name>ae3</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -13265,17 +12744,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -13285,7 +12756,7 @@
</interface>
<interface>
<name>ae10</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -13316,7 +12787,7 @@
</interface>
<interface>
<name>ae13</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>420</name>
<classifiers>
@@ -13349,73 +12820,6 @@
<rewrite-rules>
<dscp>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -13430,17 +12834,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -13452,97 +12845,9 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -13557,17 +12862,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -13579,13 +12873,6 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
@@ -13593,35 +12880,19 @@
</exp>
</rewrite-rules>
<scheduler-maps>
- <name>MAP-BASIC-IQ2</name>
+ <name>GEANT-BASIC</name>
<forwarding-class>
<name>expedited-forwarding</name>
<scheduler>sch-expedited-forwarding</scheduler>
</forwarding-class>
<forwarding-class>
<name>network-control</name>
- <scheduler>sch-network-ctrl-iq2</scheduler>
+ <scheduler>sch-network-ctrl-geant</scheduler>
</forwarding-class>
<forwarding-class>
<name>be</name>
<scheduler>sch-be</scheduler>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <scheduler>sch-less-than-best-effort</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
</scheduler-maps>
<schedulers>
<name>sch-be</name>
@@ -13641,27 +12912,7 @@
<priority>strict-high</priority>
</schedulers>
<schedulers>
- <name>sch-less-than-best-effort</name>
- <transmit-rate>
- <percent>10</percent>
- </transmit-rate>
- <buffer-size>
- <percent>10</percent>
- </buffer-size>
- <priority>low</priority>
- <drop-profile-map>
- <loss-priority>low</loss-priority>
- <protocol>any</protocol>
- <drop-profile>less-than-be-drop-profile</drop-profile>
- </drop-profile-map>
- <drop-profile-map>
- <loss-priority>high</loss-priority>
- <protocol>any</protocol>
- <drop-profile>be-drop-profile</drop-profile>
- </drop-profile-map>
- </schedulers>
- <schedulers>
- <name>sch-network-ctrl</name>
+ <name>sch-network-ctrl-geant</name>
<transmit-rate>
<percent>5</percent>
</transmit-rate>
@@ -13670,15 +12921,6 @@
</buffer-size>
<priority>high</priority>
</schedulers>
- <schedulers>
- <name>sch-network-ctrl-iq2</name>
- <transmit-rate>
- <percent>5</percent>
- </transmit-rate>
- <buffer-size>
- <percent>5</percent>
- </buffer-size>
- </schedulers>
</class-of-service>
<firewall>
<family>
@@ -16645,6 +15887,24 @@
<accept/>
</then>
</term>
+ <term>
+ <name>IT_RDP_Access</name>
+ <from>
+ <source-address>
+ <name>62.40.99.194/32</name>
+ </source-address>
+ <source-address>
+ <name>62.40.99.201/32</name>
+ </source-address>
+ <destination-address>
+ <name>62.40.108.98/32</name>
+ </destination-address>
+ <port>3389</port>
+ </from>
+ <then>
+ <accept/>
+ </then>
+ </term>
<term>
<name>Mail-Accept</name>
<from>
@@ -16897,6 +16157,9 @@
<source-prefix-list>
<name>dashboard-servers</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers</name>
+ </source-prefix-list>
<protocol>tcp</protocol>
<destination-port>ssh</destination-port>
</from>
@@ -18783,6 +18046,9 @@
<source-prefix-list>
<name>dashboard-servers-v6</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers-v6</name>
+ </source-prefix-list>
<next-header>tcp</next-header>
<port>ssh</port>
</from>
@@ -19570,7 +18836,7 @@
</policer>
</firewall>
<routing-instances>
- <instance>
+ <instance inactive="inactive">
<name>CLEAN_IAS</name>
<description>Clean IAS VRF traffic returned from scrubber</description>
<instance-type>vrf</instance-type>
@@ -20110,7 +19376,10 @@
<prefix-limit>
<maximum>1000</maximum>
<teardown>
- <limit-threshold>50</limit-threshold>
+ <limit-threshold>90</limit-threshold>
+ <idle-timeout>
+ <timeout>15</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</labeled-unicast>
diff --git a/test/data/mx2.bru.be.geant.net-netconf.xml b/test/data/mx2.bru.be.geant.net-netconf.xml
index d610a1b9d52b040f1e41bd3c3f77f7a904752343..75e775b07e88821149785ee8d3e399250b6bdd79 100644
--- a/test/data/mx2.bru.be.geant.net-netconf.xml
+++ b/test/data/mx2.bru.be.geant.net-netconf.xml
@@ -1,4 +1,4 @@
-<configuration changed-seconds="1545214012" changed-localtime="2018-12-19 10:06:52 UTC">
+<configuration changed-seconds="1549111642" changed-localtime="2019-02-02 12:47:22 UTC">
<version>15.1F6-S10.9</version>
<groups>
<name>re0</name>
@@ -250,6 +250,38 @@
<allow-commands>show .*</allow-commands>
<deny-commands>(ssh .*|telnet .*)</deny-commands>
</class>
+ <class>
+ <name>opennsa</name>
+ <idle-timeout>5</idle-timeout>
+ <permissions>configure</permissions>
+ <deny-commands>(file.*)|(load.*)|(op.*)|(request.*)|(save.*)|(start.*)|(test.*)|(set cli.*)|(set date.*)|(clear.*)|(help.*)|(telnet.*)|(ssh.*)|(traceroute.*)|(mtrace.*)|(monitor.*)|(ping.*)|(show.*)|(set.*)</deny-commands>
+ <allow-configuration-regexps>interfaces .*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections remote-interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols mpls label-switched-path.*</allow-configuration-regexps>
+ <deny-configuration-regexps>vmhost .*</deny-configuration-regexps>
+ <deny-configuration-regexps>session-limit-group .*</deny-configuration-regexps>
+ <deny-configuration-regexps>multi-chassis .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc-partition .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc .*</deny-configuration-regexps>
+ <deny-configuration-regexps>groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>dynamic-profiles .*</deny-configuration-regexps>
+ <deny-configuration-regexps>diameter .*</deny-configuration-regexps>
+ <deny-configuration-regexps>apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>access-profile .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces traceoptions .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-set .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-range .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups-except .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lt-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces ms-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces si-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces gr-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lo.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces dsc.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces irb.*</deny-configuration-regexps>
+ </class>
<class>
<name>readonly-permissions</name>
<permissions>view</permissions>
@@ -556,6 +588,22 @@
<encrypted-password>/* SECRET-DATA */</encrypted-password>
</authentication>
</user>
+ <user>
+ <name>opennsa</name>
+ <uid>2053</uid>
+ <class>opennsa</class>
+ <authentication>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ </authentication>
+ </user>
<user>
<name>opnet</name>
<full-name>OPNET NEOP Planning system @ 62.40.105.114</full-name>
@@ -2134,66 +2182,6 @@
<encapsulation>vlan-ccc</encapsulation>
<vlan-id-range>1100-1124</vlan-id-range>
</unit>
- <unit>
- <name>1275</name>
- <description>SRV_L2CIRCUIT CUSTOMER BELNET REDIRIS SRF9915017 | bru-mar_iMinds-RedIRIS_I2CAT_15017_687</description>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-tags>
- <outer>1275</outer>
- </vlan-tags>
- <input-vlan-map>
- <swap/>
- <vlan-id>687</vlan-id>
- </input-vlan-map>
- </unit>
- <unit>
- <name>1276</name>
- <description>SRV_L2CIRCUIT CUSTOMER BELNET REDIRIS SRF9915017 | bru-mar_iMinds-RedIRIS_I2CAT_15017_688</description>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-tags>
- <outer>1276</outer>
- </vlan-tags>
- <input-vlan-map>
- <swap/>
- <vlan-id>688</vlan-id>
- </input-vlan-map>
- </unit>
- <unit>
- <name>1277</name>
- <description>SRV_L2CIRCUIT CUSTOMER BELNET REDIRIS SRF9915017 | bru-mar_iMinds-RedIRIS_I2CAT_15017_690</description>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-tags>
- <outer>1277</outer>
- </vlan-tags>
- <input-vlan-map>
- <swap/>
- <vlan-id>690</vlan-id>
- </input-vlan-map>
- </unit>
- <unit>
- <name>1278</name>
- <description>SRV_L2CIRCUIT CUSTOMER BELNET REDIRIS SRF9915017 | bru-mar_iMinds-RedIRIS_I2CAT_15017_693</description>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-tags>
- <outer>1278</outer>
- </vlan-tags>
- <input-vlan-map>
- <swap/>
- <vlan-id>693</vlan-id>
- </input-vlan-map>
- </unit>
- <unit>
- <name>1279</name>
- <description>SRV_L2CIRCUIT CUSTOMER BELNET REDIRIS SRF9915017 | bru-mar_iMinds-RedIRIS_I2CAT_15017_694</description>
- <encapsulation>vlan-ccc</encapsulation>
- <vlan-tags>
- <outer>1279</outer>
- </vlan-tags>
- <input-vlan-map>
- <swap/>
- <vlan-id>694</vlan-id>
- </input-vlan-map>
- </unit>
<unit>
<name>1280</name>
<description>SRV_L2CIRCUIT CUSTOMER BELNET REDIRIS SRF9915033 |bru-mar_iMinds_iMinds-RedIRIS_15033_1</description>
@@ -2841,24 +2829,6 @@
</inet>
</family>
</unit>
- <unit>
- <name>2505</name>
- <description>SRV_L3VPN LHCONE CUSTOMER BELNET SRF9934179 | ASN2611 |</description>
- <vlan-id>2505</vlan-id>
- <family>
- <inet>
- <mtu>9000</mtu>
- <filter>
- <input>
- <filter-name>LHCONE-in</filter-name>
- </input>
- </filter>
- <address>
- <name>62.40.126.181/30</name>
- </address>
- </inet>
- </family>
- </unit>
<unit>
<name>4081</name>
<description>bru_ams_BoD_urn_uuid_36a46158_e905_4ea_3144263152</description>
@@ -3204,6 +3174,9 @@
<clients>
<name>83.97.93.196/32</name>
</clients>
+ <clients>
+ <name>83.97.93.238/32</name>
+ </clients>
</community>
<community>
<name>As4n0gN!</name>
@@ -3675,13 +3648,13 @@
<import-rib>IAS.inet6.0</import-rib>
<import-policy>rtbh-policy</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias</name>
<import-rib>IAS.inet.0</import-rib>
<import-rib>CLEAN_IAS.inet.0</import-rib>
<import-policy>ps-into-clean-ias-import</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias-v6</name>
<import-rib>IAS.inet6.0</import-rib>
<import-rib>CLEAN_IAS.inet6.0</import-rib>
@@ -4881,41 +4854,11 @@
<no-control-word/>
<ignore-mtu-mismatch/>
</interface>
- <interface>
- <name>ge-0/2/2.1279</name>
- <virtual-circuit-id>150175</virtual-circuit-id>
- <no-control-word/>
- <ignore-mtu-mismatch/>
- </interface>
- <interface>
- <name>ge-0/2/2.1278</name>
- <virtual-circuit-id>150174</virtual-circuit-id>
- <no-control-word/>
- <ignore-mtu-mismatch/>
- </interface>
- <interface>
- <name>ge-0/2/2.1277</name>
- <virtual-circuit-id>150173</virtual-circuit-id>
- <no-control-word/>
- <ignore-mtu-mismatch/>
- </interface>
- <interface>
- <name>ge-0/2/2.1276</name>
- <virtual-circuit-id>150172</virtual-circuit-id>
- <no-control-word/>
- <ignore-mtu-mismatch/>
- </interface>
<interface>
<name>ge-0/2/2.1004</name>
<virtual-circuit-id>14013</virtual-circuit-id>
<ignore-mtu-mismatch/>
</interface>
- <interface>
- <name>ge-0/2/2.1275</name>
- <virtual-circuit-id>150171</virtual-circuit-id>
- <no-control-word/>
- <ignore-mtu-mismatch/>
- </interface>
</neighbor>
<neighbor>
<name>62.40.96.11</name>
@@ -10599,16 +10542,13 @@
</prefix-list>
<prefix-list>
<name>geantncc-address-space</name>
- <comment>/* NCC DR VPN LAN */</comment>
+ <comment>/* NCC DR VPN */</comment>
<prefix-list-item>
- <name>62.40.108.192/26</name>
+ <name>62.40.108.192/27</name>
</prefix-list-item>
<prefix-list-item>
<name>62.40.119.0/24</name>
</prefix-list-item>
- <prefix-list-item>
- <name>62.40.119.134/32</name>
- </prefix-list-item>
<prefix-list-item>
<name>62.40.125.250/32</name>
</prefix-list-item>
@@ -11616,6 +11556,14 @@
</prefix-list>
<prefix-list>
<name>corporate-address-space</name>
+ <comment>/* LON2 CORP VPN (MAC) */</comment>
+ <prefix-list-item>
+ <name>62.40.99.194/32</name>
+ </prefix-list-item>
+ <comment>/* LON2 CORP VPN */</comment>
+ <prefix-list-item>
+ <name>62.40.99.201/32</name>
+ </prefix-list-item>
<prefix-list-item>
<name>62.40.119.128/25</name>
</prefix-list-item>
@@ -11728,6 +11676,18 @@
<name>2001:798::/32</name>
</prefix-list-item>
</prefix-list>
+ <prefix-list>
+ <name>opennsa-servers</name>
+ <prefix-list-item>
+ <name>83.97.93.92/32</name>
+ </prefix-list-item>
+ </prefix-list>
+ <prefix-list>
+ <name>opennsa-servers-v6</name>
+ <prefix-list-item>
+ <name>2001:798:3::15f/128</name>
+ </prefix-list-item>
+ </prefix-list>
<policy-statement>
<name>ASM-Allow</name>
<term>
@@ -12197,6 +12157,10 @@
<address>185.1.68.0/24</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>193.188.137.0/24</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -12318,6 +12282,10 @@
<address>2001:7f8:a0::/64</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>2001:7f8:35::/64</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -12936,45 +12904,6 @@
</then>
</term>
</policy-statement>
- <policy-statement>
- <name>ps-to-BELNET-LHCONE-TE</name>
- <term>
- <name>BLOCK</name>
- <from>
- <community>LHCONE-BLOCK-BELNET-2611</community>
- </from>
- <then>
- <reject/>
- </then>
- </term>
- <term>
- <name>PREPEND_x1</name>
- <from>
- <community>LHCONE-PREPEND-BELNET-2611-x1</community>
- </from>
- <then>
- <as-path-prepend>20965</as-path-prepend>
- </then>
- </term>
- <term>
- <name>PREPEND_x2</name>
- <from>
- <community>LHCONE-PREPEND-BELNET-2611-x2</community>
- </from>
- <then>
- <as-path-prepend>20965 20965</as-path-prepend>
- </then>
- </term>
- <term>
- <name>PREPEND_x3</name>
- <from>
- <community>LHCONE-PREPEND-BELNET-2611-x3</community>
- </from>
- <then>
- <as-path-prepend>20965 20965 20965</as-path-prepend>
- </then>
- </term>
- </policy-statement>
<policy-statement>
<name>ps-to-BELNET-V6-nren</name>
<term>
@@ -13371,22 +13300,6 @@
<name>L2-VPN-PSNC-I2CAT-1</name>
<members>2:622</members>
</community>
- <community>
- <name>LHCONE-BLOCK-BELNET-2611</name>
- <members>65010:2611</members>
- </community>
- <community>
- <name>LHCONE-PREPEND-BELNET-2611-x1</name>
- <members>65001:2611</members>
- </community>
- <community>
- <name>LHCONE-PREPEND-BELNET-2611-x2</name>
- <members>65002:2611</members>
- </community>
- <community>
- <name>LHCONE-PREPEND-BELNET-2611-x3</name>
- <members>65003:2611</members>
- </community>
<community>
<name>TE_ANNOUNCE_ALL_PUBLIC_PEERS_2</name>
<members>64712:65532</members>
@@ -13930,13 +13843,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -13952,14 +13858,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp>
<name>backbone-classifier</name>
@@ -13971,18 +13869,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -13990,195 +13876,16 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>iperf-classifier</name>
- <import>default</import>
<forwarding-class>
<name>expedited-forwarding</name>
<loss-priority>
<name>low</name>
- <code-points>af12</code-points>
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>backbone-classifier</name>
@@ -14190,18 +13897,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -14209,13 +13904,7 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -14238,13 +13927,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -14260,246 +13942,32 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
- <dscp-ipv6>
- <name>iperf-classifier</name>
+ <exp>
+ <name>mpls-access-classifier</name>
<import>default</import>
<forwarding-class>
- <name>expedited-forwarding</name>
+ <name>be</name>
<loss-priority>
<name>low</name>
- <code-points>af12</code-points>
- <code-points>ef</code-points>
+ <code-points>100</code-points>
+ <code-points>101</code-points>
</loss-priority>
</forwarding-class>
+ </exp>
+ <exp>
+ <name>mpls-backbone-classifier</name>
+ <import>default</import>
<forwarding-class>
- <name>less-than-best-effort</name>
+ <name>be</name>
<loss-priority>
<name>low</name>
- <code-points>cs1</code-points>
+ <code-points>100</code-points>
+ <code-points>101</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <exp>
- <name>mpls-access-classifier</name>
- <import>default</import>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>low</name>
- <code-points>000</code-points>
- <code-points>001</code-points>
- <code-points>010</code-points>
- <code-points>011</code-points>
- <code-points>110</code-points>
- <code-points>111</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>100</code-points>
- <code-points>101</code-points>
- </loss-priority>
- </forwarding-class>
- </exp>
- <exp>
- <name>mpls-backbone-classifier</name>
- <import>default</import>
</exp>
</classifiers>
- <code-point-aliases>
- <dscp>
- <name>ix</name>
- <bits>101001</bits>
- </dscp>
- <dscp>
- <name>dws</name>
- <bits>100000</bits>
- </dscp>
- <dscp-ipv6>
- <name>dws</name>
- <bits>100000</bits>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix</name>
- <bits>101001</bits>
- </dscp-ipv6>
- </code-point-aliases>
- <drop-profiles>
- <name>dws-drop-profile</name>
- <fill-level>
- <name>35</name>
- <drop-probability>10</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<drop-profiles>
<name>be-drop-profile</name>
<fill-level>
@@ -14519,59 +13987,44 @@
<drop-probability>100</drop-probability>
</fill-level>
</drop-profiles>
- <drop-profiles>
- <name>less-than-be-drop-profile</name>
- <fill-level>
- <name>25</name>
- <drop-probability>30</drop-probability>
- </fill-level>
- <fill-level>
- <name>30</name>
- <drop-probability>50</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>70</drop-probability>
- </fill-level>
- <fill-level>
- <name>50</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<forwarding-classes>
<class>
<name>be</name>
<queue-num>0</queue-num>
</class>
- <class>
- <name>be-ix</name>
- <queue-num>0</queue-num>
- </class>
<class>
<name>expedited-forwarding</name>
<queue-num>1</queue-num>
</class>
- <class>
- <name>less-than-best-effort</name>
- <queue-num>2</queue-num>
- </class>
<class>
<name>network-control</name>
<queue-num>3</queue-num>
</class>
- <class>
- <name>be-dws</name>
- <queue-num>0</queue-num>
- </class>
- <class>
- <name>be-bleach</name>
- <queue-num>0</queue-num>
- </class>
</forwarding-classes>
<interfaces>
+ <interface>
+ <name>et-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>ge-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>so-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>xe-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>ae*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
<interface>
<name>ae0</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -14589,17 +14042,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -14609,7 +14054,7 @@
</interface>
<interface>
<name>ae1</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -14627,17 +14072,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -14647,7 +14084,7 @@
</interface>
<interface>
<name>ae12</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -14669,73 +14106,6 @@
<rewrite-rules>
<dscp>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -14750,17 +14120,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -14772,97 +14131,9 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -14877,17 +14148,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -14899,13 +14159,6 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
@@ -14913,35 +14166,19 @@
</exp>
</rewrite-rules>
<scheduler-maps>
- <name>MAP-BASIC-IQ2</name>
- <forwarding-class>
- <name>be-dws</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
+ <name>GEANT-BASIC</name>
<forwarding-class>
<name>expedited-forwarding</name>
<scheduler>sch-expedited-forwarding</scheduler>
</forwarding-class>
<forwarding-class>
<name>network-control</name>
- <scheduler>sch-network-ctrl-iq2</scheduler>
+ <scheduler>sch-network-ctrl-geant</scheduler>
</forwarding-class>
<forwarding-class>
<name>be</name>
<scheduler>sch-be</scheduler>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <scheduler>sch-less-than-best-effort</scheduler>
- </forwarding-class>
</scheduler-maps>
<schedulers>
<name>sch-be</name>
@@ -14961,27 +14198,7 @@
<priority>strict-high</priority>
</schedulers>
<schedulers>
- <name>sch-less-than-best-effort</name>
- <transmit-rate>
- <percent>10</percent>
- </transmit-rate>
- <buffer-size>
- <percent>10</percent>
- </buffer-size>
- <priority>low</priority>
- <drop-profile-map>
- <loss-priority>low</loss-priority>
- <protocol>any</protocol>
- <drop-profile>less-than-be-drop-profile</drop-profile>
- </drop-profile-map>
- <drop-profile-map>
- <loss-priority>high</loss-priority>
- <protocol>any</protocol>
- <drop-profile>be-drop-profile</drop-profile>
- </drop-profile-map>
- </schedulers>
- <schedulers>
- <name>sch-network-ctrl</name>
+ <name>sch-network-ctrl-geant</name>
<transmit-rate>
<percent>5</percent>
</transmit-rate>
@@ -14990,15 +14207,6 @@
</buffer-size>
<priority>high</priority>
</schedulers>
- <schedulers>
- <name>sch-network-ctrl-iq2</name>
- <transmit-rate>
- <percent>5</percent>
- </transmit-rate>
- <buffer-size>
- <percent>5</percent>
- </buffer-size>
- </schedulers>
</class-of-service>
<firewall>
<family>
@@ -15902,6 +15110,9 @@
<source-prefix-list>
<name>dashboard-servers</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers</name>
+ </source-prefix-list>
<protocol>tcp</protocol>
<destination-port>ssh</destination-port>
</from>
@@ -17066,6 +16277,9 @@
<source-prefix-list>
<name>dashboard-servers-v6</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers-v6</name>
+ </source-prefix-list>
<next-header>tcp</next-header>
<port>ssh</port>
</from>
@@ -17409,7 +16623,7 @@
</policer>
</firewall>
<routing-instances>
- <instance>
+ <instance inactive="inactive">
<name>CLEAN_IAS</name>
<description>Clean IAS VRF traffic returned from scrubber</description>
<instance-type>vrf</instance-type>
@@ -17723,9 +16937,6 @@
<name>lhcone-l3vpn</name>
<description>L3 BGP/MPLS VPN for LHCONE</description>
<instance-type>vrf</instance-type>
- <interface>
- <name>ae12.2505</name>
- </interface>
<route-distinguisher>
<rd-type>62.40.96.20:111</rd-type>
</route-distinguisher>
@@ -17787,33 +16998,6 @@
<export>ps-BOGONS</export>
<export>ps-PRIVATE-AS-BLOCK</export>
<export>ps-to-lhcone-nren</export>
- <neighbor>
- <name>62.40.126.182</name>
- <description>BELNET LHCONE IP VPN</description>
- <out-delay>10</out-delay>
- <import>ps-BOGONS</import>
- <import>ps-PRIVATE-AS-BLOCK</import>
- <import>ps-from-lhcone-nren</import>
- <family>
- <inet>
- <any>
- <prefix-limit>
- <maximum>100</maximum>
- <teardown>
- <idle-timeout>
- <timeout>30</timeout>
- </idle-timeout>
- </teardown>
- </prefix-limit>
- </any>
- </inet>
- </family>
- <export>ps-BOGONS</export>
- <export>ps-PRIVATE-AS-BLOCK</export>
- <export>ps-to-BELNET-LHCONE-TE</export>
- <export>ps-to-lhcone-nren</export>
- <peer-as>2611</peer-as>
- </neighbor>
</group>
<group>
<name>lhcone-peers</name>
@@ -17877,6 +17061,9 @@
<maximum>1000</maximum>
<teardown>
<limit-threshold>90</limit-threshold>
+ <idle-timeout>
+ <timeout>15</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</labeled-unicast>
diff --git a/test/data/mx2.kau.lt.geant.net-netconf.xml b/test/data/mx2.kau.lt.geant.net-netconf.xml
index 3205b1eaa6769ed321b0319902374ae6fc278131..258b504a00eb150634b1bfef8f3de11ff462ec33 100644
--- a/test/data/mx2.kau.lt.geant.net-netconf.xml
+++ b/test/data/mx2.kau.lt.geant.net-netconf.xml
@@ -1,4 +1,4 @@
-<configuration changed-seconds="1545214011" changed-localtime="2018-12-19 10:06:51 UTC">
+<configuration changed-seconds="1549111684" changed-localtime="2019-02-02 12:48:04 UTC">
<version>15.1F6-S10.9</version>
<groups>
<name>re0</name>
@@ -252,6 +252,38 @@
<allow-commands>show .*</allow-commands>
<deny-commands>(ssh .*|telnet .*)</deny-commands>
</class>
+ <class>
+ <name>opennsa</name>
+ <idle-timeout>5</idle-timeout>
+ <permissions>configure</permissions>
+ <deny-commands>(file.*)|(load.*)|(op.*)|(request.*)|(save.*)|(start.*)|(test.*)|(set cli.*)|(set date.*)|(clear.*)|(help.*)|(telnet.*)|(ssh.*)|(traceroute.*)|(mtrace.*)|(monitor.*)|(ping.*)|(show.*)|(set.*)</deny-commands>
+ <allow-configuration-regexps>interfaces .*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections remote-interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols mpls label-switched-path.*</allow-configuration-regexps>
+ <deny-configuration-regexps>vmhost .*</deny-configuration-regexps>
+ <deny-configuration-regexps>session-limit-group .*</deny-configuration-regexps>
+ <deny-configuration-regexps>multi-chassis .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc-partition .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc .*</deny-configuration-regexps>
+ <deny-configuration-regexps>groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>dynamic-profiles .*</deny-configuration-regexps>
+ <deny-configuration-regexps>diameter .*</deny-configuration-regexps>
+ <deny-configuration-regexps>apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>access-profile .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces traceoptions .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-set .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-range .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups-except .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lt-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces ms-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces si-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces gr-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lo.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces dsc.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces irb.*</deny-configuration-regexps>
+ </class>
<class>
<name>readonly-permissions</name>
<idle-timeout>15</idle-timeout>
@@ -555,6 +587,22 @@
<encrypted-password>/* SECRET-DATA */</encrypted-password>
</authentication>
</user>
+ <user>
+ <name>opennsa</name>
+ <uid>2002</uid>
+ <class>opennsa</class>
+ <authentication>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ </authentication>
+ </user>
<user>
<name>opnet</name>
<full-name>OPNET NEOP Planning system @ 62.40.105.114</full-name>
@@ -1592,10 +1640,10 @@
<apply-groups>re1</apply-groups>
<interface>
<name>lt-0/0/0</name>
- <description>TUN INFRASTRUCTURE</description>
+ <description>TUN INFRASTRUCTURE ACCESS SRF0000001 </description>
<unit>
<name>16</name>
- <description>SRV_GLOBAL INFRASTRUCTURE 20965_TO_21320 IAS | BGP Peering - RE Side</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS IAS SRF0000001 | BGP Peering - RE Side</description>
<encapsulation>ethernet</encapsulation>
<peer-unit>61</peer-unit>
<family>
@@ -1629,7 +1677,7 @@
</unit>
<unit>
<name>61</name>
- <description>SRV_IAS INFRASTRUCTURE 20965_TO_21320 IAS | BGP Peering - IAS Side</description>
+ <description>SRV_IAS INFRASTRUCTURE ACCESS GLOBAL SRF0000001 | BGP Peering - IAS Side</description>
<encapsulation>ethernet</encapsulation>
<peer-unit>16</peer-unit>
<family>
@@ -1648,7 +1696,7 @@
</interface>
<interface>
<name>xe-0/0/0</name>
- <description>PHY INFRASTRUCTURE BACKBONE P_ae0 | Lattelecom ID: SPTN8000162</description>
+ <description>PHY INFRASTRUCTURE BACKBONE P_AE0 SRF0000001 | Lattelecom ID: SPTN8000162</description>
<framing>
<wan-phy/>
</framing>
@@ -1660,7 +1708,7 @@
</interface>
<interface>
<name>xe-0/0/1</name>
- <description>PHY INFRASTRUCTURE BACKBONE P_ae1 |</description>
+ <description>PHY INFRASTRUCTURE BACKBONE P_AE1 SRF0000001 |</description>
<undocumented><enable/></undocumented>
<framing>
<lan-phy/>
@@ -1673,17 +1721,17 @@
</interface>
<interface>
<name>xe-0/1/0</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>xe-0/1/1</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>xe-1/0/0</name>
- <description>PHY INFRASTRUCTURE BACKBONE P_ae1 |</description>
+ <description>PHY INFRASTRUCTURE BACKBONE P_AE1 SRF0000001 |</description>
<framing>
<lan-phy/>
</framing>
@@ -1701,7 +1749,7 @@
<encapsulation>flexible-ethernet-services</encapsulation>
<unit>
<name>100</name>
- <description>SRV_GLOBAL CUSTOMER LITNET AP_B SRF9912971 | ASN2847 |</description>
+ <description>SRV_GLOBAL CUSTOMER LITNET AP2 SRF9912971 | ASN2847 |</description>
<vlan-id>100</vlan-id>
<family>
<inet>
@@ -1785,12 +1833,12 @@
</interface>
<interface>
<name>xe-1/1/0</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>xe-1/1/1</name>
- <description>PHY INFRASTRUCTURE BACKBONE P_ae0 |</description>
+ <description>PHY INFRASTRUCTURE BACKBONE P_AE0 SRF0000001 |</description>
<undocumented><enable/></undocumented>
<framing>
<wan-phy/>
@@ -1827,7 +1875,7 @@
</interface>
<interface>
<name>ae0</name>
- <description>LAG INFRASTRUCTURE BACKBONE | kau-rig</description>
+ <description>LAG INFRASTRUCTURE BACKBONE SRF0000001 | kau-rig</description>
<mtu>9192</mtu>
<aggregated-ether-options>
<load-balance>
@@ -1842,7 +1890,7 @@
</aggregated-ether-options>
<unit>
<name>0</name>
- <description>SRV_GLOBAL INFRASTRUCTURE BACKBONE | kau-rig</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE BACKBONE SRF0000001 | kau-rig</description>
<family>
<inet>
<accounting>
@@ -1886,7 +1934,7 @@
</interface>
<interface>
<name>ae1</name>
- <description>LAG INFRASTRUCTURE BACKBONE | kau-kau</description>
+ <description>LAG INFRASTRUCTURE BACKBONE SRF0000001 | kau-kau</description>
<mtu>9192</mtu>
<aggregated-ether-options>
<load-balance>
@@ -1901,7 +1949,7 @@
</aggregated-ether-options>
<unit>
<name>0</name>
- <description>SRV_GLOBAL INFRASTRUCTURE BACKBONE | kau-kau</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE BACKBONE SRF0000001 | kau-kau</description>
<family>
<inet>
<accounting>
@@ -2194,6 +2242,9 @@
<clients>
<name>83.97.93.196/32</name>
</clients>
+ <clients>
+ <name>83.97.93.238/32</name>
+ </clients>
</community>
<community>
<name>As4n0gN!</name>
@@ -2756,13 +2807,13 @@
<import-rib>IAS.inet6.0</import-rib>
<import-policy>rtbh-policy</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias</name>
<import-rib>IAS.inet.0</import-rib>
<import-rib>CLEAN_IAS.inet.0</import-rib>
<import-policy>ps-into-clean-ias-import</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias-v6</name>
<import-rib>IAS.inet6.0</import-rib>
<import-rib>CLEAN_IAS.inet6.0</import-rib>
@@ -6034,16 +6085,13 @@
</prefix-list>
<prefix-list>
<name>geantncc-address-space</name>
- <comment>/* NCC DR VPN LAN */</comment>
+ <comment>/* NCC DR VPN */</comment>
<prefix-list-item>
- <name>62.40.108.192/26</name>
+ <name>62.40.108.192/27</name>
</prefix-list-item>
<prefix-list-item>
<name>62.40.119.0/24</name>
</prefix-list-item>
- <prefix-list-item>
- <name>62.40.119.134/32</name>
- </prefix-list-item>
<prefix-list-item>
<name>62.40.125.250/32</name>
</prefix-list-item>
@@ -7042,6 +7090,14 @@
</prefix-list>
<prefix-list>
<name>corporate-address-space</name>
+ <comment>/* LON2 CORP VPN (MAC) */</comment>
+ <prefix-list-item>
+ <name>62.40.99.194/32</name>
+ </prefix-list-item>
+ <comment>/* LON2 CORP VPN */</comment>
+ <prefix-list-item>
+ <name>62.40.99.201/32</name>
+ </prefix-list-item>
<prefix-list-item>
<name>62.40.119.128/25</name>
</prefix-list-item>
@@ -7148,6 +7204,18 @@
<name>2001:798::/32</name>
</prefix-list-item>
</prefix-list>
+ <prefix-list>
+ <name>opennsa-servers</name>
+ <prefix-list-item>
+ <name>83.97.93.92/32</name>
+ </prefix-list-item>
+ </prefix-list>
+ <prefix-list>
+ <name>opennsa-servers-v6</name>
+ <prefix-list-item>
+ <name>2001:798:3::15f/128</name>
+ </prefix-list-item>
+ </prefix-list>
<policy-statement>
<name>ASM-Allow</name>
<term>
@@ -7560,6 +7628,10 @@
<address>185.1.68.0/24</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>193.188.137.0/24</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -7681,6 +7753,10 @@
<address>2001:7f8:a0::/64</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>2001:7f8:35::/64</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -9255,13 +9331,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -9277,14 +9346,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp>
<name>backbone-classifier</name>
@@ -9296,18 +9357,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -9315,195 +9364,16 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>iperf-classifier</name>
- <import>default</import>
<forwarding-class>
<name>expedited-forwarding</name>
<loss-priority>
<name>low</name>
- <code-points>af12</code-points>
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>backbone-classifier</name>
@@ -9515,18 +9385,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -9534,13 +9392,7 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -9563,13 +9415,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -9585,187 +9430,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>iperf-classifier</name>
- <import>default</import>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>af12</code-points>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-access-classifier</name>
@@ -9774,16 +9438,16 @@
<name>be</name>
<loss-priority>
<name>low</name>
- <code-points>000</code-points>
- <code-points>001</code-points>
- <code-points>010</code-points>
- <code-points>011</code-points>
- <code-points>110</code-points>
- <code-points>111</code-points>
+ <code-points>100</code-points>
+ <code-points>101</code-points>
</loss-priority>
</forwarding-class>
+ </exp>
+ <exp>
+ <name>mpls-backbone-classifier</name>
+ <import>default</import>
<forwarding-class>
- <name>less-than-best-effort</name>
+ <name>be</name>
<loss-priority>
<name>low</name>
<code-points>100</code-points>
@@ -9791,40 +9455,7 @@
</loss-priority>
</forwarding-class>
</exp>
- <exp>
- <name>mpls-backbone-classifier</name>
- <import>default</import>
- </exp>
</classifiers>
- <code-point-aliases>
- <dscp>
- <name>ix</name>
- <bits>101001</bits>
- </dscp>
- <dscp>
- <name>dws</name>
- <bits>100000</bits>
- </dscp>
- <dscp-ipv6>
- <name>dws</name>
- <bits>100000</bits>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix</name>
- <bits>101001</bits>
- </dscp-ipv6>
- </code-point-aliases>
- <drop-profiles>
- <name>dws-drop-profile</name>
- <fill-level>
- <name>35</name>
- <drop-probability>10</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<drop-profiles>
<name>be-drop-profile</name>
<fill-level>
@@ -9844,59 +9475,40 @@
<drop-probability>100</drop-probability>
</fill-level>
</drop-profiles>
- <drop-profiles>
- <name>less-than-be-drop-profile</name>
- <fill-level>
- <name>25</name>
- <drop-probability>30</drop-probability>
- </fill-level>
- <fill-level>
- <name>30</name>
- <drop-probability>50</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>70</drop-probability>
- </fill-level>
- <fill-level>
- <name>50</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<forwarding-classes>
<class>
<name>be</name>
<queue-num>0</queue-num>
</class>
- <class>
- <name>be-ix</name>
- <queue-num>0</queue-num>
- </class>
<class>
<name>expedited-forwarding</name>
<queue-num>1</queue-num>
</class>
- <class>
- <name>less-than-best-effort</name>
- <queue-num>2</queue-num>
- </class>
<class>
<name>network-control</name>
<queue-num>3</queue-num>
</class>
- <class>
- <name>be-dws</name>
- <queue-num>0</queue-num>
- </class>
- <class>
- <name>be-bleach</name>
- <queue-num>0</queue-num>
- </class>
</forwarding-classes>
<interfaces>
+ <interface>
+ <name>et-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>ge-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>so-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>xe-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
<interface>
<name>xe-1/0/1</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -9925,9 +9537,13 @@
</classifiers>
</unit>
</interface>
+ <interface>
+ <name>ae*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
<interface>
<name>ae0</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -9945,17 +9561,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -9965,7 +9573,7 @@
</interface>
<interface>
<name>ae1</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -9983,17 +9591,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -10003,7 +9603,7 @@
</interface>
<interface>
<name>ae2</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -10032,13 +9632,6 @@
<rewrite-rules>
<dscp>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -10053,17 +9646,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -10075,157 +9657,9 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -10240,17 +9674,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -10262,13 +9685,6 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
@@ -10276,35 +9692,19 @@
</exp>
</rewrite-rules>
<scheduler-maps>
- <name>MAP-BASIC-IQ2</name>
- <forwarding-class>
- <name>be-dws</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
+ <name>GEANT-BASIC</name>
<forwarding-class>
<name>expedited-forwarding</name>
<scheduler>sch-expedited-forwarding</scheduler>
</forwarding-class>
<forwarding-class>
<name>network-control</name>
- <scheduler>sch-network-ctrl-iq2</scheduler>
+ <scheduler>sch-network-ctrl-geant</scheduler>
</forwarding-class>
<forwarding-class>
<name>be</name>
<scheduler>sch-be</scheduler>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <scheduler>sch-less-than-best-effort</scheduler>
- </forwarding-class>
</scheduler-maps>
<schedulers>
<name>sch-be</name>
@@ -10324,27 +9724,7 @@
<priority>strict-high</priority>
</schedulers>
<schedulers>
- <name>sch-less-than-best-effort</name>
- <transmit-rate>
- <percent>10</percent>
- </transmit-rate>
- <buffer-size>
- <percent>10</percent>
- </buffer-size>
- <priority>low</priority>
- <drop-profile-map>
- <loss-priority>low</loss-priority>
- <protocol>any</protocol>
- <drop-profile>less-than-be-drop-profile</drop-profile>
- </drop-profile-map>
- <drop-profile-map>
- <loss-priority>high</loss-priority>
- <protocol>any</protocol>
- <drop-profile>be-drop-profile</drop-profile>
- </drop-profile-map>
- </schedulers>
- <schedulers>
- <name>sch-network-ctrl</name>
+ <name>sch-network-ctrl-geant</name>
<transmit-rate>
<percent>5</percent>
</transmit-rate>
@@ -10353,15 +9733,6 @@
</buffer-size>
<priority>high</priority>
</schedulers>
- <schedulers>
- <name>sch-network-ctrl-iq2</name>
- <transmit-rate>
- <percent>5</percent>
- </transmit-rate>
- <buffer-size>
- <percent>5</percent>
- </buffer-size>
- </schedulers>
</class-of-service>
<firewall>
<family>
@@ -11336,6 +10707,9 @@
<source-prefix-list>
<name>dashboard-servers</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers</name>
+ </source-prefix-list>
<protocol>tcp</protocol>
<destination-port>ssh</destination-port>
</from>
@@ -12389,6 +11763,9 @@
<source-prefix-list>
<name>dashboard-servers-v6</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers-v6</name>
+ </source-prefix-list>
<next-header>tcp</next-header>
<port>ssh</port>
</from>
@@ -12680,7 +12057,7 @@
</policer>
</firewall>
<routing-instances>
- <instance>
+ <instance inactive="inactive">
<name>CLEAN_IAS</name>
<description>Clean IAS VRF traffic returned from scrubber</description>
<instance-type>vrf</instance-type>
diff --git a/test/data/mx2.lis.pt.geant.net-netconf.xml b/test/data/mx2.lis.pt.geant.net-netconf.xml
index 6f128e83c8931f4b49600d47340ca9f93e71a816..43dfaa008d822938049d7eff52e7be789f08977e 100644
--- a/test/data/mx2.lis.pt.geant.net-netconf.xml
+++ b/test/data/mx2.lis.pt.geant.net-netconf.xml
@@ -1,4 +1,4 @@
-<configuration changed-seconds="1545214011" changed-localtime="2018-12-19 10:06:51 UTC">
+<configuration changed-seconds="1549111721" changed-localtime="2019-02-02 12:48:41 UTC">
<version>15.1F6-S10.9</version>
<groups>
<name>re0</name>
@@ -250,6 +250,38 @@
<allow-commands>show .*</allow-commands>
<deny-commands>(ssh .*|telnet .*)</deny-commands>
</class>
+ <class>
+ <name>opennsa</name>
+ <idle-timeout>5</idle-timeout>
+ <permissions>configure</permissions>
+ <deny-commands>(file.*)|(load.*)|(op.*)|(request.*)|(save.*)|(start.*)|(test.*)|(set cli.*)|(set date.*)|(clear.*)|(help.*)|(telnet.*)|(ssh.*)|(traceroute.*)|(mtrace.*)|(monitor.*)|(ping.*)|(show.*)|(set.*)</deny-commands>
+ <allow-configuration-regexps>interfaces .*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections remote-interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols mpls label-switched-path.*</allow-configuration-regexps>
+ <deny-configuration-regexps>vmhost .*</deny-configuration-regexps>
+ <deny-configuration-regexps>session-limit-group .*</deny-configuration-regexps>
+ <deny-configuration-regexps>multi-chassis .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc-partition .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc .*</deny-configuration-regexps>
+ <deny-configuration-regexps>groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>dynamic-profiles .*</deny-configuration-regexps>
+ <deny-configuration-regexps>diameter .*</deny-configuration-regexps>
+ <deny-configuration-regexps>apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>access-profile .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces traceoptions .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-set .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-range .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups-except .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lt-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces ms-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces si-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces gr-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lo.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces dsc.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces irb.*</deny-configuration-regexps>
+ </class>
<class>
<name>readonly-permissions</name>
<idle-timeout>15</idle-timeout>
@@ -553,6 +585,22 @@
<encrypted-password>/* SECRET-DATA */</encrypted-password>
</authentication>
</user>
+ <user>
+ <name>opennsa</name>
+ <uid>2047</uid>
+ <class>opennsa</class>
+ <authentication>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ </authentication>
+ </user>
<user>
<name>opnet</name>
<full-name>OPNET NEOP Planning system @ 62.40.105.114</full-name>
@@ -1585,10 +1633,10 @@
<apply-groups>re1</apply-groups>
<interface>
<name>lt-0/0/0</name>
- <description>TUN INFRASTRUCTURE</description>
+ <description>TUN INFRASTRUCTURE ACCESS SRF0000001 </description>
<unit>
<name>16</name>
- <description>SRV_GLOBAL INFRASTRUCTURE 20965_TO_21320 IAS | BGP Peering - RE Side</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS IAS SRF0000001 | BGP Peering - RE Side</description>
<encapsulation>ethernet</encapsulation>
<peer-unit>61</peer-unit>
<family>
@@ -1622,7 +1670,7 @@
</unit>
<unit>
<name>61</name>
- <description>SRV_IAS INFRASTRUCTURE 20965_TO_21320 IAS | BGP Peering - IAS Side</description>
+ <description>SRV_IAS INFRASTRUCTURE ACCESS GLOBAL SRF0000001 | BGP Peering - IAS Side</description>
<encapsulation>ethernet</encapsulation>
<peer-unit>16</peer-unit>
<family>
@@ -1641,7 +1689,7 @@
</interface>
<interface>
<name>xe-0/0/0</name>
- <description>PHY CUSTOMER FCCN P_AE10 SRF9928597 | FCCN AP #2, part of ae10</description>
+ <description>PHY CUSTOMER FCCN P_AE10 SRF9928597 | FCCN AP1 link#2, part of ae10</description>
<gigether-options>
<ieee-802.3ad>
<bundle>ae10</bundle>
@@ -1650,7 +1698,7 @@
</interface>
<interface>
<name>xe-0/0/1</name>
- <description>PHY INFRASTRUCTURE BACKBONE P_ae1 |</description>
+ <description>PHY INFRASTRUCTURE BACKBONE P_AE1 SRF0000001 |</description>
<gigether-options>
<ieee-802.3ad>
<bundle>ae1</bundle>
@@ -1659,7 +1707,7 @@
</interface>
<interface>
<name>xe-0/1/0</name>
- <description>PHY INFRASTRUCTURE BACKBONE P_ae0 | FCCN ID: CIRC-CIRC-CBF-GEANT-LISBON-MADRID</description>
+ <description>PHY INFRASTRUCTURE BACKBONE P_AE0 SRF0000001 | FCCN ID: CIRC-CIRC-CBF-GEANT-LISBON-MADRID</description>
<framing>
<wan-phy/>
</framing>
@@ -1671,16 +1719,18 @@
</interface>
<interface>
<name>xe-0/1/1</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
- <disable/>
+ <description>PHY SPARE |Reserved for LIS-MAD Upgrade</description>
+ <framing>
+ <wan-phy/>
+ </framing>
</interface>
<interface>
<name>ge-0/2/0</name>
- <description>PHY INFRASTRUCTURE LAN | lis pt POP LAN</description>
+ <description>PHY INFRASTRUCTURE ACCESS LAN SRF0000001 | lis pt POP LAN</description>
<vlan-tagging/>
<unit>
<name>10</name>
- <description>SRV_GLOBAL INFRASTRUCTURE VLAN10 | -- VLAN 10 --</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS SRF0000001 | -- VLAN 10 --</description>
<vlan-id>10</vlan-id>
<family>
<inet>
@@ -1697,7 +1747,7 @@
</unit>
<unit>
<name>20</name>
- <description>SRV_GLOBAL INFRASTRUCTURE VLAN20 | C1N1 iDRAC CONTACT: allen.kong@geant.org IMPLEMENTED: 20161027</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS SRF0000001 | C1N1 iDRAC CONTACT: allen.kong@geant.org IMPLEMENTED: 20161027</description>
<vlan-id>20</vlan-id>
<family>
<inet>
@@ -1715,7 +1765,7 @@
</unit>
<unit>
<name>23</name>
- <description>SRV_GLOBAL INFRASTRUCTURE VLAN23 SRF99??? | perfSONAR iDRAC</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS SRF0000001 | perfSONAR iDRAC</description>
<vlan-id>23</vlan-id>
<family>
<inet>
@@ -1750,7 +1800,7 @@
</unit>
<unit>
<name>24</name>
- <description>SRV_GLOBAL INFRASTRUCTURE VLAN24 SRF99??? | perfSONAR MGMT</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS SRF0000001 | perfSONAR MGMT</description>
<vlan-id>24</vlan-id>
<family>
<inet>
@@ -1785,7 +1835,7 @@
</unit>
<unit>
<name>30</name>
- <description>SRV_GLOBAL INFRASTRUCTURE VLAN30 | -- VLAN 30 --</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS SRF0000001 | -- VLAN 30 --</description>
<vlan-id>30</vlan-id>
<family>
<inet>
@@ -1814,7 +1864,7 @@
</unit>
<unit>
<name>110</name>
- <description>SRV_GLOBAL INFRASTRUCTURE VLAN110 | Tableau Server - Connect to T/U/P Data Warehouse Machines - IT-645 | CONTACT:IT@geant.org IMPLEMENTED:20151008</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS SRF0000001 | Tableau Server - Connect to T/U/P Data Warehouse Machines - IT-645 | CONTACT:IT@geant.org IMPLEMENTED:20151008</description>
<vlan-id>110</vlan-id>
<family>
<inet>
@@ -1839,7 +1889,7 @@
</unit>
<unit>
<name>140</name>
- <description>SRV_GLOBAL INFRASTRUCTURE VLAN140 SRF99??? | RPKI Validator | CONTACT:nm@geant.org IMPLEMENTED:20160629</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS SRF0000001 | RPKI Validator | CONTACT:nm@geant.org IMPLEMENTED:20160629</description>
<vlan-id>140</vlan-id>
<family>
<inet>
@@ -1874,7 +1924,7 @@
</unit>
<unit>
<name>190</name>
- <description>SRV_GLOBAL INFRASTRUCTURE VLAN190 | OPS VM</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS SRF0000001 | OPS VM</description>
<vlan-id>190</vlan-id>
<family>
<inet>
@@ -1899,7 +1949,7 @@
</unit>
<unit>
<name>210</name>
- <description>SRV_GLOBAL INFRASTRUCTURE VLAN210 | Test security alerting software | CONTACT:IT@geant.org IMPLEMENTED:20150714</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS SRF0000001 | Test security alerting software | CONTACT:IT@geant.org IMPLEMENTED:20150714</description>
<vlan-id>210</vlan-id>
<family>
<inet>
@@ -1933,7 +1983,7 @@
<unit>
<name>220</name>
<disable/>
- <description>SRV_GLOBAL INFRASTRUCTURE VLAN220 | Test VM for SA8 Task 1/Educonf - IT-830 | CONTACT:IT@geant.org IMPLEMENTED:20150721</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS SRF0000001 | Test VM for SA8 Task 1/Educonf - IT-830 | CONTACT:IT@geant.org IMPLEMENTED:20150721</description>
<vlan-id>220</vlan-id>
<family>
<inet>
@@ -1966,7 +2016,7 @@
</unit>
<unit>
<name>230</name>
- <description>SRV_GLOBAL INFRASTRUCTURE VLAN230 | GEANT Server for perfSONAR UI VM | CONTACT: IT@geant.org IMPLEMENTED:20150925</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS SRF0000001 | GEANT Server for perfSONAR UI VM | CONTACT: IT@geant.org IMPLEMENTED:20150925</description>
<vlan-id>230</vlan-id>
<family>
<inet>
@@ -1999,7 +2049,7 @@
</unit>
<unit>
<name>240</name>
- <description>SRV_GLOBAL INFRASTRUCTURE VLAN240 | GEANT VLAN for Indico Servers | CONTACT: IT@geant.org IMPLEMENTED:20170803</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS SRF0000001 | GEANT VLAN for Indico Servers | CONTACT: IT@geant.org IMPLEMENTED:20170803</description>
<vlan-id>240</vlan-id>
<family>
<inet>
@@ -2039,100 +2089,100 @@
</interface>
<interface>
<name>ge-0/2/1</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/2/2</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/2/3</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/2/4</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/2/5</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/2/6</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/2/7</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/2/8</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/2/9</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/3/0</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/3/1</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/3/2</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/3/3</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/3/4</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/3/5</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/3/6</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/3/7</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/3/8</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/3/9</name>
- <description>PHY INFRASTRUCTURE PERFSONAR SRF99??? | PSMP OWAMP</description>
+ <description>PHY INFRASTRUCTURE ACCESS PERFSONAR SRF0000001 | PSMP OWAMP</description>
<unit>
<name>0</name>
- <description>SRV_GLOBAL INFRASTRUCTURE PERFSONAR SRF99??? | OWAMP CONTACT: ivan.garnizov@fau.de IMPLEMENTED: 20160618</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS PERFSONAR SRF0000001 | OWAMP CONTACT: ivan.garnizov@fau.de IMPLEMENTED: 20160618</description>
<family>
<inet>
<filter>
@@ -2167,7 +2217,7 @@
</interface>
<interface>
<name>xe-1/0/0</name>
- <description>PHY INFRASTRUCTURE BACKBONE P_ae1 |</description>
+ <description>PHY INFRASTRUCTURE BACKBONE P_AE1 SRF0000001 |</description>
<gigether-options>
<ieee-802.3ad>
<bundle>ae1</bundle>
@@ -2176,7 +2226,7 @@
</interface>
<interface>
<name>xe-1/0/1</name>
- <description>PHY CUSTOMER FCCN P_AE10 SRF9914183 | FCCN AP #1, part of ae10</description>
+ <description>PHY CUSTOMER FCCN P_AE10 SRF9928597 | FCCN AP1 link#1, part of ae10</description>
<gigether-options>
<ieee-802.3ad>
<bundle>ae10</bundle>
@@ -2185,7 +2235,7 @@
</interface>
<interface>
<name>xe-1/1/0</name>
- <description>PHY INFRASTRUCTURE BACKBONE P_ae0 | FCCN ID: CIRC-CIRC-CBF-GEANT-LISBON-MADRID2</description>
+ <description>PHY INFRASTRUCTURE BACKBONE P_AE0 SRF0000001 | FCCN ID: CIRC-CIRC-CBF-GEANT-LISBON-MADRID2</description>
<framing>
<wan-phy/>
</framing>
@@ -2197,11 +2247,11 @@
</interface>
<interface>
<name>xe-1/1/1</name>
- <description>PHY INFRASTRUCTURE PERFSONAR SRF99??? | PSMP BWCTL</description>
+ <description>PHY INFRASTRUCTURE ACCESS PERFSONAR SRF0000001 | PSMP BWCTL</description>
<mtu>9192</mtu>
<unit>
<name>0</name>
- <description>SRV_GLOBAL INFRASTRUCTURE PERFSONAR SRF99??? | BWCTL CONTACT: ivan.garnizov@fau.de IMPLEMENTED: 20160618</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS PERFSONAR SRF0000001 | BWCTL CONTACT: ivan.garnizov@fau.de IMPLEMENTED: 20160618</description>
<family>
<inet>
<filter>
@@ -2258,9 +2308,37 @@
</family>
</unit>
</interface>
+ <interface>
+ <name>xe-2/0/0</name>
+ <description>PHY SPARE |Reserved for LIS1-LIS2 Upgrade</description>
+ </interface>
+ <interface>
+ <name>xe-2/0/1</name>
+ <description>PHY SPARE |Reserved for FCCN AP1 Upgrade</description>
+ <unit>
+ <name>0</name>
+ <family>
+ <inet>
+ <address>
+ <name>192.168.50.1/24</name>
+ </address>
+ </inet>
+ </family>
+ </unit>
+ </interface>
+ <interface>
+ <name>xe-2/1/0</name>
+ <description>PHY SPARE</description>
+ <disable/>
+ </interface>
+ <interface>
+ <name>xe-2/1/1</name>
+ <description>PHY SPARE</description>
+ <disable/>
+ </interface>
<interface>
<name>ae0</name>
- <description>LAG INFRASTRUCTURE BACKBONE | lis-mad</description>
+ <description>LAG INFRASTRUCTURE BACKBONE SRF0000001 | lis-mad</description>
<mtu>9192</mtu>
<aggregated-ether-options>
<load-balance>
@@ -2276,7 +2354,7 @@
</aggregated-ether-options>
<unit>
<name>0</name>
- <description>SRV_GLOBAL INFRASTRUCTURE BACKBONE | lis-mad</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE BACKBONE SRF0000001 | lis-mad</description>
<family>
<inet>
<accounting>
@@ -2320,7 +2398,7 @@
</interface>
<interface>
<name>ae1</name>
- <description>LAG INFRASTRUCTURE BACKBONE | lis-lis</description>
+ <description>LAG INFRASTRUCTURE BACKBONE SRF0000001 | lis-lis</description>
<mtu>9192</mtu>
<aggregated-ether-options>
<load-balance>
@@ -2336,7 +2414,7 @@
</aggregated-ether-options>
<unit>
<name>0</name>
- <description>SRV_GLOBAL INFRASTRUCTURE BACKBONE | lis-lis</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE BACKBONE SRF0000001 | lis-lis</description>
<family>
<inet>
<accounting>
@@ -2434,7 +2512,7 @@
</unit>
<unit>
<name>1930</name>
- <description>SRV_GLOBAL CUSTOMER FCCN AP_P SRF9914185 | ASN1930 |</description>
+ <description>SRV_GLOBAL CUSTOMER FCCN AP2 SRF9914185 | ASN1930 |</description>
<vlan-id>1930</vlan-id>
<family>
<inet>
@@ -2744,6 +2822,9 @@
<clients>
<name>83.97.93.196/32</name>
</clients>
+ <clients>
+ <name>83.97.93.238/32</name>
+ </clients>
</community>
<community>
<name>As4n0gN!</name>
@@ -3224,13 +3305,13 @@
<import-rib>IAS.inet6.0</import-rib>
<import-policy>rtbh-policy</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias</name>
<import-rib>IAS.inet.0</import-rib>
<import-rib>CLEAN_IAS.inet.0</import-rib>
<import-policy>ps-into-clean-ias-import</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias-v6</name>
<import-rib>IAS.inet6.0</import-rib>
<import-rib>CLEAN_IAS.inet6.0</import-rib>
@@ -4200,10 +4281,10 @@
<disable/>
</interface>
<interface>
- <name>xe-0/1/0</name>
+ <name>xe-1/1/0</name>
</interface>
<interface>
- <name>xe-1/1/0</name>
+ <name>xe-0/1/0</name>
</interface>
<interface>
<name>xe-0/0/1</name>
@@ -6721,16 +6802,13 @@
</prefix-list>
<prefix-list>
<name>geantncc-address-space</name>
- <comment>/* NCC DR VPN LAN */</comment>
+ <comment>/* NCC DR VPN */</comment>
<prefix-list-item>
- <name>62.40.108.192/26</name>
+ <name>62.40.108.192/27</name>
</prefix-list-item>
<prefix-list-item>
<name>62.40.119.0/24</name>
</prefix-list-item>
- <prefix-list-item>
- <name>62.40.119.134/32</name>
- </prefix-list-item>
<prefix-list-item>
<name>62.40.125.250/32</name>
</prefix-list-item>
@@ -7927,6 +8005,14 @@
</prefix-list>
<prefix-list>
<name>corporate-address-space</name>
+ <comment>/* LON2 CORP VPN (MAC) */</comment>
+ <prefix-list-item>
+ <name>62.40.99.194/32</name>
+ </prefix-list-item>
+ <comment>/* LON2 CORP VPN */</comment>
+ <prefix-list-item>
+ <name>62.40.99.201/32</name>
+ </prefix-list-item>
<prefix-list-item>
<name>62.40.119.128/25</name>
</prefix-list-item>
@@ -8024,6 +8110,18 @@
<name>2001:798::/32</name>
</prefix-list-item>
</prefix-list>
+ <prefix-list>
+ <name>opennsa-servers</name>
+ <prefix-list-item>
+ <name>83.97.93.92/32</name>
+ </prefix-list-item>
+ </prefix-list>
+ <prefix-list>
+ <name>opennsa-servers-v6</name>
+ <prefix-list-item>
+ <name>2001:798:3::15f/128</name>
+ </prefix-list-item>
+ </prefix-list>
<policy-statement>
<name>ASM-Allow</name>
<term>
@@ -8485,6 +8583,10 @@
<address>185.1.68.0/24</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>193.188.137.0/24</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -8606,6 +8708,10 @@
<address>2001:7f8:a0::/64</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>2001:7f8:35::/64</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -10476,13 +10582,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -10498,14 +10597,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp>
<name>backbone-classifier</name>
@@ -10517,18 +10608,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -10536,13 +10615,7 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -10553,179 +10626,6 @@
</loss-priority>
</forwarding-class>
</dscp>
- <dscp>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>iperf-classifier</name>
- <import>default</import>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>af12</code-points>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
<dscp-ipv6>
<name>backbone-classifier</name>
<import>default</import>
@@ -10736,18 +10636,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -10755,13 +10643,7 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -10784,13 +10666,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -10806,187 +10681,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>iperf-classifier</name>
- <import>default</import>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>af12</code-points>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-access-classifier</name>
@@ -10995,16 +10689,16 @@
<name>be</name>
<loss-priority>
<name>low</name>
- <code-points>000</code-points>
- <code-points>001</code-points>
- <code-points>010</code-points>
- <code-points>011</code-points>
- <code-points>110</code-points>
- <code-points>111</code-points>
+ <code-points>100</code-points>
+ <code-points>101</code-points>
</loss-priority>
</forwarding-class>
+ </exp>
+ <exp>
+ <name>mpls-backbone-classifier</name>
+ <import>default</import>
<forwarding-class>
- <name>less-than-best-effort</name>
+ <name>be</name>
<loss-priority>
<name>low</name>
<code-points>100</code-points>
@@ -11012,40 +10706,7 @@
</loss-priority>
</forwarding-class>
</exp>
- <exp>
- <name>mpls-backbone-classifier</name>
- <import>default</import>
- </exp>
</classifiers>
- <code-point-aliases>
- <dscp>
- <name>ix</name>
- <bits>101001</bits>
- </dscp>
- <dscp>
- <name>dws</name>
- <bits>100000</bits>
- </dscp>
- <dscp-ipv6>
- <name>dws</name>
- <bits>100000</bits>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix</name>
- <bits>101001</bits>
- </dscp-ipv6>
- </code-point-aliases>
- <drop-profiles>
- <name>dws-drop-profile</name>
- <fill-level>
- <name>35</name>
- <drop-probability>10</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<drop-profiles>
<name>be-drop-profile</name>
<fill-level>
@@ -11065,59 +10726,44 @@
<drop-probability>100</drop-probability>
</fill-level>
</drop-profiles>
- <drop-profiles>
- <name>less-than-be-drop-profile</name>
- <fill-level>
- <name>25</name>
- <drop-probability>30</drop-probability>
- </fill-level>
- <fill-level>
- <name>30</name>
- <drop-probability>50</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>70</drop-probability>
- </fill-level>
- <fill-level>
- <name>50</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<forwarding-classes>
<class>
<name>be</name>
<queue-num>0</queue-num>
</class>
- <class>
- <name>be-ix</name>
- <queue-num>0</queue-num>
- </class>
<class>
<name>expedited-forwarding</name>
<queue-num>1</queue-num>
</class>
- <class>
- <name>less-than-best-effort</name>
- <queue-num>2</queue-num>
- </class>
<class>
<name>network-control</name>
<queue-num>3</queue-num>
</class>
- <class>
- <name>be-dws</name>
- <queue-num>0</queue-num>
- </class>
- <class>
- <name>be-bleach</name>
- <queue-num>0</queue-num>
- </class>
</forwarding-classes>
<interfaces>
+ <interface>
+ <name>et-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>ge-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>so-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>xe-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>ae*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
<interface>
<name>ae0</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -11135,17 +10781,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -11155,7 +10793,7 @@
</interface>
<interface>
<name>ae1</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -11173,17 +10811,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -11193,8 +10823,8 @@
</interface>
<interface>
<name>ae10</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
- <unit inactive="inactive">
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ <unit>
<name>333</name>
<classifiers>
<dscp>
@@ -11234,13 +10864,6 @@
<rewrite-rules>
<dscp>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -11255,17 +10878,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -11277,97 +10889,9 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -11382,17 +10906,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -11404,73 +10917,6 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
@@ -11478,35 +10924,19 @@
</exp>
</rewrite-rules>
<scheduler-maps>
- <name>MAP-BASIC-IQ2</name>
- <forwarding-class>
- <name>be-dws</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
+ <name>GEANT-BASIC</name>
<forwarding-class>
<name>expedited-forwarding</name>
<scheduler>sch-expedited-forwarding</scheduler>
</forwarding-class>
<forwarding-class>
<name>network-control</name>
- <scheduler>sch-network-ctrl-iq2</scheduler>
+ <scheduler>sch-network-ctrl-geant</scheduler>
</forwarding-class>
<forwarding-class>
<name>be</name>
<scheduler>sch-be</scheduler>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <scheduler>sch-less-than-best-effort</scheduler>
- </forwarding-class>
</scheduler-maps>
<schedulers>
<name>sch-be</name>
@@ -11526,27 +10956,7 @@
<priority>strict-high</priority>
</schedulers>
<schedulers>
- <name>sch-less-than-best-effort</name>
- <transmit-rate>
- <percent>10</percent>
- </transmit-rate>
- <buffer-size>
- <percent>10</percent>
- </buffer-size>
- <priority>low</priority>
- <drop-profile-map>
- <loss-priority>low</loss-priority>
- <protocol>any</protocol>
- <drop-profile>less-than-be-drop-profile</drop-profile>
- </drop-profile-map>
- <drop-profile-map>
- <loss-priority>high</loss-priority>
- <protocol>any</protocol>
- <drop-profile>be-drop-profile</drop-profile>
- </drop-profile-map>
- </schedulers>
- <schedulers>
- <name>sch-network-ctrl</name>
+ <name>sch-network-ctrl-geant</name>
<transmit-rate>
<percent>5</percent>
</transmit-rate>
@@ -11555,15 +10965,6 @@
</buffer-size>
<priority>high</priority>
</schedulers>
- <schedulers>
- <name>sch-network-ctrl-iq2</name>
- <transmit-rate>
- <percent>5</percent>
- </transmit-rate>
- <buffer-size>
- <percent>5</percent>
- </buffer-size>
- </schedulers>
</class-of-service>
<firewall>
<family>
@@ -13664,6 +13065,9 @@
<source-prefix-list>
<name>dashboard-servers</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers</name>
+ </source-prefix-list>
<protocol>tcp</protocol>
<destination-port>ssh</destination-port>
</from>
@@ -15022,6 +14426,9 @@
<source-prefix-list>
<name>dashboard-servers-v6</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers-v6</name>
+ </source-prefix-list>
<next-header>tcp</next-header>
<port>ssh</port>
</from>
@@ -15901,7 +15308,7 @@
</policer>
</firewall>
<routing-instances>
- <instance>
+ <instance inactive="inactive">
<name>CLEAN_IAS</name>
<description>Clean IAS VRF traffic returned from scrubber</description>
<instance-type>vrf</instance-type>
@@ -16350,6 +15757,9 @@
<maximum>1000</maximum>
<teardown>
<limit-threshold>90</limit-threshold>
+ <idle-timeout>
+ <timeout>15</timeout>
+ </idle-timeout>
</teardown>
</prefix-limit>
</labeled-unicast>
diff --git a/test/data/mx2.lju.si.geant.net-netconf.xml b/test/data/mx2.lju.si.geant.net-netconf.xml
index 9518aace609036bcc1da39604ef4a6f7fb3128d0..27561547a7abca0638dbb1df582fc4916cedd0dc 100644
--- a/test/data/mx2.lju.si.geant.net-netconf.xml
+++ b/test/data/mx2.lju.si.geant.net-netconf.xml
@@ -1,4 +1,4 @@
-<configuration changed-seconds="1545214010" changed-localtime="2018-12-19 10:06:50 UTC">
+<configuration changed-seconds="1549111760" changed-localtime="2019-02-02 12:49:20 UTC">
<version>15.1F6-S10.9</version>
<groups>
<name>re0</name>
@@ -251,6 +251,38 @@
<allow-commands>show .*</allow-commands>
<deny-commands>(ssh .*|telnet .*)</deny-commands>
</class>
+ <class>
+ <name>opennsa</name>
+ <idle-timeout>5</idle-timeout>
+ <permissions>configure</permissions>
+ <deny-commands>(file.*)|(load.*)|(op.*)|(request.*)|(save.*)|(start.*)|(test.*)|(set cli.*)|(set date.*)|(clear.*)|(help.*)|(telnet.*)|(ssh.*)|(traceroute.*)|(mtrace.*)|(monitor.*)|(ping.*)|(show.*)|(set.*)</deny-commands>
+ <allow-configuration-regexps>interfaces .*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections remote-interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols mpls label-switched-path.*</allow-configuration-regexps>
+ <deny-configuration-regexps>vmhost .*</deny-configuration-regexps>
+ <deny-configuration-regexps>session-limit-group .*</deny-configuration-regexps>
+ <deny-configuration-regexps>multi-chassis .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc-partition .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc .*</deny-configuration-regexps>
+ <deny-configuration-regexps>groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>dynamic-profiles .*</deny-configuration-regexps>
+ <deny-configuration-regexps>diameter .*</deny-configuration-regexps>
+ <deny-configuration-regexps>apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>access-profile .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces traceoptions .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-set .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-range .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups-except .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lt-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces ms-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces si-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces gr-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lo.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces dsc.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces irb.*</deny-configuration-regexps>
+ </class>
<class>
<name>readonly-permissions</name>
<idle-timeout>15</idle-timeout>
@@ -562,6 +594,22 @@
<encrypted-password>/* SECRET-DATA */</encrypted-password>
</authentication>
</user>
+ <user>
+ <name>opennsa</name>
+ <uid>2002</uid>
+ <class>opennsa</class>
+ <authentication>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ </authentication>
+ </user>
<user>
<name>opnet</name>
<full-name>OPNET NEOP Planning system @ 62.40.105.114</full-name>
@@ -2192,10 +2240,10 @@
<apply-groups>re1</apply-groups>
<interface>
<name>lt-0/0/0</name>
- <description>TUN INFRASTRUCTURE</description>
+ <description>TUN INFRASTRUCTURE ACCESS SRF0000001 </description>
<unit>
<name>16</name>
- <description>SRV_GLOBAL INFRASTRUCTURE 20965_TO_21320 IAS | BGP Peering - RE Side</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS IAS SRF0000001 | BGP Peering - RE Side</description>
<encapsulation>ethernet</encapsulation>
<peer-unit>61</peer-unit>
<family>
@@ -2229,7 +2277,7 @@
</unit>
<unit>
<name>61</name>
- <description>SRV_IAS INFRASTRUCTURE 20965_TO_21320 IAS | BGP Peering - IAS Side</description>
+ <description>SRV_IAS INFRASTRUCTURE ACCESS GLOBAL SRF0000001 | BGP Peering - IAS Side</description>
<encapsulation>ethernet</encapsulation>
<peer-unit>16</peer-unit>
<family>
@@ -2257,7 +2305,7 @@
</interface>
<interface>
<name>xe-0/0/1</name>
- <description>PHY INFRASTRUCTURE BACKBONE P_ae1 | lju-vie</description>
+ <description>PHY INFRASTRUCTURE BACKBONE P_AE1 SRF0000001 |</description>
<framing>
<wan-phy/>
</framing>
@@ -2269,7 +2317,7 @@
</interface>
<interface>
<name>xe-0/1/0</name>
- <description>PHY INFRASTRUCTURE BACKBONE P_ae1 | lju-vie</description>
+ <description>PHY INFRASTRUCTURE BACKBONE P_AE1 SRF0000001 |</description>
<framing>
<wan-phy/>
</framing>
@@ -2290,12 +2338,12 @@
</interface>
<interface>
<name>ge-0/2/0</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/2/1</name>
- <description>PHY INFRASTRUCTURE INFINERA SRF9913669 | LJU01-DTNX4-1 XCM 1</description>
+ <description>PHY INFRASTRUCTURE ACCESS INFINERA SRF9913669 | LJU01-DTNX4-1 XCM 1</description>
<unit>
<name>0</name>
<family>
@@ -2308,50 +2356,50 @@
</interface>
<interface>
<name>ge-0/2/2</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/2/3</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/2/4</name>
- <description>PHY SPARE NON-OPERATIONAL |</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/2/5</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/2/6</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/2/7</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/2/8</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/2/9</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>lt-0/2/10</name>
- <description>TUN INFRASTRUCTURE BACKBONE | MDVPN VRR</description>
+ <description>TUN INFRASTRUCTURE BACKBONE SRF0000001 | MDVPN VRR</description>
<unit>
<name>13</name>
- <description>SRV_GLOBAL INFRASTRUCTURE BACKBONE | MDVPN VRR</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE BACKBONE SRF0000001 | MDVPN VRR</description>
<encapsulation>ethernet</encapsulation>
<peer-unit>31</peer-unit>
<family>
@@ -2367,7 +2415,7 @@
</interface>
<interface>
<name>ge-0/3/0</name>
- <description>PHY INFRASTRUCTURE INFINERA SRF??? | LJU01-DTNX4-1 XCM 2</description>
+ <description>PHY INFRASTRUCTURE ACCESS INFINERA SRF0000001 | LJU01-DTNX4-1 XCM 2</description>
<unit>
<name>0</name>
<family>
@@ -2380,52 +2428,52 @@
</interface>
<interface>
<name>ge-0/3/1</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/3/2</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/3/3</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/3/4</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/3/5</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/3/6</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/3/7</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/3/8</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/3/9</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>xe-1/0/0</name>
- <description>PHY INFRASTRUCTURE BACKBONE P_ae2 | bud-lju</description>
+ <description>PHY INFRASTRUCTURE BACKBONE P_AE2 SRF0000001 | bud-lju</description>
<framing>
<wan-phy/>
</framing>
@@ -2488,7 +2536,7 @@
</interface>
<interface>
<name>xe-2/0/0</name>
- <description>PHY INFRASTRUCTURE BACKBONE P_ae2 | bud-lju</description>
+ <description>PHY INFRASTRUCTURE BACKBONE P_AE2 SRF0000001 | bud-lju</description>
<framing>
<wan-phy/>
</framing>
@@ -2500,7 +2548,7 @@
</interface>
<interface>
<name>xe-2/0/1</name>
- <description>PHY INFRASTRUCTURE BACKBONE P_ae1 | lju-vie</description>
+ <description>PHY INFRASTRUCTURE BACKBONE P_AE1 SRF0000001 | lju-vie</description>
<framing>
<wan-phy/>
</framing>
@@ -2521,7 +2569,7 @@
</interface>
<interface>
<name>xe-2/1/1</name>
- <description>PHY INFRASTRUCTURE BACKBONE P_ae2 | bud-lju</description>
+ <description>PHY INFRASTRUCTURE BACKBONE P_AE2 SRF0000001 | bud-lju</description>
<framing>
<wan-phy/>
</framing>
@@ -2583,7 +2631,7 @@
</interface>
<interface>
<name>ae1</name>
- <description>LAG INFRASTRUCTURE BACKBONE | lju-vie</description>
+ <description>LAG INFRASTRUCTURE BACKBONE SRF0000001 | lju-vie</description>
<mtu>9192</mtu>
<aggregated-ether-options>
<load-balance>
@@ -2599,7 +2647,7 @@
</aggregated-ether-options>
<unit>
<name>0</name>
- <description>SRV_GLOBAL INFRASTRUCTURE BACKBONE | lju-vie</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE BACKBONE SRF0000001 | lju-vie</description>
<family>
<inet>
<accounting>
@@ -2643,7 +2691,7 @@
</interface>
<interface>
<name>ae2</name>
- <description>LAG INFRASTRUCTURE BACKBONE | bud-lju</description>
+ <description>LAG INFRASTRUCTURE BACKBONE SRF0000001 | bud-lju</description>
<mtu>9192</mtu>
<aggregated-ether-options>
<load-balance>
@@ -2658,7 +2706,7 @@
</aggregated-ether-options>
<unit>
<name>0</name>
- <description>SRV_GLOBAL INFRASTRUCTURE BACKBONE | bud-lju</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE BACKBONE SRF0000001 | bud-lju</description>
<family>
<inet>
<accounting>
@@ -2715,7 +2763,7 @@
</aggregated-ether-options>
<unit>
<name>100</name>
- <description>SRV_GLOBAL CUSTOMER ARNES AP_P SRF9923655 | ASN2107 | ARNES AP</description>
+ <description>SRV_GLOBAL CUSTOMER ARNES AP1 SRF9923655 | ASN2107 | ARNES AP</description>
<vlan-id>100</vlan-id>
<family>
<inet>
@@ -2797,6 +2845,19 @@
</inet6>
</family>
</unit>
+ <unit>
+ <name>550</name>
+ <description>SRV_L2CIRCUIT CUSTOMER GARR ARNES TEST| TT#2019010934000713 </description>
+ <encapsulation>vlan-ccc</encapsulation>
+ <vlan-id>550</vlan-id>
+ <family>
+ <ccc>
+ <filter>
+ <input>filter_in_ae10_550</input>
+ </filter>
+ </ccc>
+ </family>
+ </unit>
</interface>
<interface>
<name>ae11</name>
@@ -2814,7 +2875,7 @@
</aggregated-ether-options>
<unit>
<name>111</name>
- <description>SRV_L3VPN CUSTOMER ARNES LHCONE SRF15171 | LHCONE AP_P ASN2107</description>
+ <description>SRV_L3VPN LHCONE CUSTOMER ARNES SRF9915171 | LHCONE AP_P ASN2107</description>
<vlan-id>111</vlan-id>
<family>
<inet>
@@ -2863,7 +2924,7 @@
<name>irb</name>
<unit>
<name>999</name>
- <description>SRV_GLOBAL INFRASTRUCTURE INFINERA |</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS INFINERA SRF0000001 |</description>
<family>
<inet>
<address>
@@ -3110,6 +3171,9 @@
<clients>
<name>83.97.93.196/32</name>
</clients>
+ <clients>
+ <name>83.97.93.238/32</name>
+ </clients>
</community>
<community>
<name>As4n0gN!</name>
@@ -3587,13 +3651,13 @@
<import-rib>IAS.inet6.0</import-rib>
<import-policy>rtbh-policy</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias</name>
<import-rib>IAS.inet.0</import-rib>
<import-rib>CLEAN_IAS.inet.0</import-rib>
<import-policy>ps-into-clean-ias-import</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias-v6</name>
<import-rib>IAS.inet6.0</import-rib>
<import-rib>CLEAN_IAS.inet6.0</import-rib>
@@ -4398,6 +4462,13 @@
</neighbor>
<neighbor>
<name>62.40.97.15</name>
+ <interface>
+ <name>ae10.550</name>
+ <virtual-circuit-id>4000713</virtual-circuit-id>
+ <no-control-word/>
+ <mtu>9000</mtu>
+ <ignore-mtu-mismatch/>
+ </interface>
</neighbor>
</l2circuit>
<neighbor-discovery>
@@ -4616,6 +4687,9 @@
<interface>
<name>xe-2/3/0</name>
</interface>
+ <interface>
+ <name>xe-2/2/1</name>
+ </interface>
<interface>
<name>xe-1/0/0</name>
</interface>
@@ -6924,16 +6998,13 @@
</prefix-list>
<prefix-list>
<name>geantncc-address-space</name>
- <comment>/* NCC DR VPN LAN */</comment>
+ <comment>/* NCC DR VPN */</comment>
<prefix-list-item>
- <name>62.40.108.192/26</name>
+ <name>62.40.108.192/27</name>
</prefix-list-item>
<prefix-list-item>
<name>62.40.119.0/24</name>
</prefix-list-item>
- <prefix-list-item>
- <name>62.40.119.134/32</name>
- </prefix-list-item>
<prefix-list-item>
<name>62.40.125.250/32</name>
</prefix-list-item>
@@ -7941,6 +8012,14 @@
</prefix-list>
<prefix-list>
<name>corporate-address-space</name>
+ <comment>/* LON2 CORP VPN (MAC) */</comment>
+ <prefix-list-item>
+ <name>62.40.99.194/32</name>
+ </prefix-list-item>
+ <comment>/* LON2 CORP VPN */</comment>
+ <prefix-list-item>
+ <name>62.40.99.201/32</name>
+ </prefix-list-item>
<prefix-list-item>
<name>62.40.119.128/25</name>
</prefix-list-item>
@@ -8047,6 +8126,18 @@
<name>2001:798::/32</name>
</prefix-list-item>
</prefix-list>
+ <prefix-list>
+ <name>opennsa-servers</name>
+ <prefix-list-item>
+ <name>83.97.93.92/32</name>
+ </prefix-list-item>
+ </prefix-list>
+ <prefix-list>
+ <name>opennsa-servers-v6</name>
+ <prefix-list-item>
+ <name>2001:798:3::15f/128</name>
+ </prefix-list-item>
+ </prefix-list>
<policy-statement>
<name>ASM-Allow</name>
<term>
@@ -8459,6 +8550,10 @@
<address>185.1.68.0/24</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>193.188.137.0/24</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -8580,6 +8675,10 @@
<address>2001:7f8:a0::/64</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>2001:7f8:35::/64</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -10855,13 +10954,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -10877,14 +10969,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp>
<name>backbone-classifier</name>
@@ -10896,18 +10980,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -10915,13 +10987,7 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -10932,179 +10998,6 @@
</loss-priority>
</forwarding-class>
</dscp>
- <dscp>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>iperf-classifier</name>
- <import>default</import>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>af12</code-points>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
<dscp-ipv6>
<name>backbone-classifier</name>
<import>default</import>
@@ -11115,18 +11008,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -11134,13 +11015,7 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -11163,13 +11038,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -11185,187 +11053,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>iperf-classifier</name>
- <import>default</import>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>af12</code-points>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-access-classifier</name>
@@ -11374,16 +11061,16 @@
<name>be</name>
<loss-priority>
<name>low</name>
- <code-points>000</code-points>
- <code-points>001</code-points>
- <code-points>010</code-points>
- <code-points>011</code-points>
- <code-points>110</code-points>
- <code-points>111</code-points>
+ <code-points>100</code-points>
+ <code-points>101</code-points>
</loss-priority>
</forwarding-class>
+ </exp>
+ <exp>
+ <name>mpls-backbone-classifier</name>
+ <import>default</import>
<forwarding-class>
- <name>less-than-best-effort</name>
+ <name>be</name>
<loss-priority>
<name>low</name>
<code-points>100</code-points>
@@ -11391,40 +11078,7 @@
</loss-priority>
</forwarding-class>
</exp>
- <exp>
- <name>mpls-backbone-classifier</name>
- <import>default</import>
- </exp>
</classifiers>
- <code-point-aliases>
- <dscp>
- <name>ix</name>
- <bits>101001</bits>
- </dscp>
- <dscp>
- <name>dws</name>
- <bits>100000</bits>
- </dscp>
- <dscp-ipv6>
- <name>dws</name>
- <bits>100000</bits>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix</name>
- <bits>101001</bits>
- </dscp-ipv6>
- </code-point-aliases>
- <drop-profiles>
- <name>dws-drop-profile</name>
- <fill-level>
- <name>35</name>
- <drop-probability>10</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<drop-profiles>
<name>be-drop-profile</name>
<fill-level>
@@ -11444,59 +11098,44 @@
<drop-probability>100</drop-probability>
</fill-level>
</drop-profiles>
- <drop-profiles>
- <name>less-than-be-drop-profile</name>
- <fill-level>
- <name>25</name>
- <drop-probability>30</drop-probability>
- </fill-level>
- <fill-level>
- <name>30</name>
- <drop-probability>50</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>70</drop-probability>
- </fill-level>
- <fill-level>
- <name>50</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<forwarding-classes>
<class>
<name>be</name>
<queue-num>0</queue-num>
</class>
- <class>
- <name>be-ix</name>
- <queue-num>0</queue-num>
- </class>
<class>
<name>expedited-forwarding</name>
<queue-num>1</queue-num>
</class>
- <class>
- <name>less-than-best-effort</name>
- <queue-num>2</queue-num>
- </class>
<class>
<name>network-control</name>
<queue-num>3</queue-num>
</class>
- <class>
- <name>be-dws</name>
- <queue-num>0</queue-num>
- </class>
- <class>
- <name>be-bleach</name>
- <queue-num>0</queue-num>
- </class>
</forwarding-classes>
<interfaces>
+ <interface>
+ <name>et-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>ge-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>so-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>xe-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>ae*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
<interface>
<name>ae1</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -11514,17 +11153,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -11534,7 +11165,7 @@
</interface>
<interface>
<name>ae2</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -11552,17 +11183,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -11572,7 +11195,7 @@
</interface>
<interface>
<name>ae10</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>100</name>
<classifiers>
@@ -11605,73 +11228,6 @@
<rewrite-rules>
<dscp>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -11686,17 +11242,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -11708,37 +11253,9 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -11753,77 +11270,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -11835,13 +11281,6 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
@@ -11849,35 +11288,19 @@
</exp>
</rewrite-rules>
<scheduler-maps>
- <name>MAP-BASIC-IQ2</name>
- <forwarding-class>
- <name>be-dws</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
+ <name>GEANT-BASIC</name>
<forwarding-class>
<name>expedited-forwarding</name>
<scheduler>sch-expedited-forwarding</scheduler>
</forwarding-class>
<forwarding-class>
<name>network-control</name>
- <scheduler>sch-network-ctrl-iq2</scheduler>
+ <scheduler>sch-network-ctrl-geant</scheduler>
</forwarding-class>
<forwarding-class>
<name>be</name>
<scheduler>sch-be</scheduler>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <scheduler>sch-less-than-best-effort</scheduler>
- </forwarding-class>
</scheduler-maps>
<schedulers>
<name>sch-be</name>
@@ -11897,27 +11320,7 @@
<priority>strict-high</priority>
</schedulers>
<schedulers>
- <name>sch-less-than-best-effort</name>
- <transmit-rate>
- <percent>10</percent>
- </transmit-rate>
- <buffer-size>
- <percent>10</percent>
- </buffer-size>
- <priority>low</priority>
- <drop-profile-map>
- <loss-priority>low</loss-priority>
- <protocol>any</protocol>
- <drop-profile>less-than-be-drop-profile</drop-profile>
- </drop-profile-map>
- <drop-profile-map>
- <loss-priority>high</loss-priority>
- <protocol>any</protocol>
- <drop-profile>be-drop-profile</drop-profile>
- </drop-profile-map>
- </schedulers>
- <schedulers>
- <name>sch-network-ctrl</name>
+ <name>sch-network-ctrl-geant</name>
<transmit-rate>
<percent>5</percent>
</transmit-rate>
@@ -11926,15 +11329,6 @@
</buffer-size>
<priority>high</priority>
</schedulers>
- <schedulers>
- <name>sch-network-ctrl-iq2</name>
- <transmit-rate>
- <percent>5</percent>
- </transmit-rate>
- <buffer-size>
- <percent>5</percent>
- </buffer-size>
- </schedulers>
</class-of-service>
<firewall>
<family>
@@ -13389,6 +12783,9 @@
<source-prefix-list>
<name>dashboard-servers</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers</name>
+ </source-prefix-list>
<protocol>tcp</protocol>
<destination-port>ssh</destination-port>
</from>
@@ -14737,6 +14134,9 @@
<source-prefix-list>
<name>dashboard-servers-v6</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers-v6</name>
+ </source-prefix-list>
<next-header>tcp</next-header>
<port>ssh</port>
</from>
@@ -14961,6 +14361,19 @@
</term>
</filter>
</inet6>
+ <ccc>
+ <filter>
+ <name>filter_in_ae10_550</name>
+ <interface-specific/>
+ <term>
+ <name>1</name>
+ <then>
+ <policer>policer_in_ae10_550</policer>
+ <accept/>
+ </then>
+ </term>
+ </filter>
+ </ccc>
</family>
<policer>
<name>pol-DWS-in</name>
@@ -15012,9 +14425,19 @@
<discard/>
</then>
</policer>
+ <policer>
+ <name>policer_in_ae10_550</name>
+ <if-exceeding>
+ <bandwidth-limit>5g</bandwidth-limit>
+ <burst-size-limit>3125000</burst-size-limit>
+ </if-exceeding>
+ <then>
+ <discard/>
+ </then>
+ </policer>
</firewall>
<routing-instances>
- <instance>
+ <instance inactive="inactive">
<name>CLEAN_IAS</name>
<description>Clean IAS VRF traffic returned from scrubber</description>
<instance-type>vrf</instance-type>
diff --git a/test/data/mx2.rig.lv.geant.net-netconf.xml b/test/data/mx2.rig.lv.geant.net-netconf.xml
index 2d24f18663f39075e0419fc6fad614368480fde5..6993fae4dfadc9deaacfb666780d92e0afdc05e2 100644
--- a/test/data/mx2.rig.lv.geant.net-netconf.xml
+++ b/test/data/mx2.rig.lv.geant.net-netconf.xml
@@ -1,4 +1,4 @@
-<configuration changed-seconds="1545214010" changed-localtime="2018-12-19 10:06:50 UTC">
+<configuration changed-seconds="1549111784" changed-localtime="2019-02-02 12:49:44 UTC">
<version>15.1F6-S10.9</version>
<groups>
<name>re0</name>
@@ -215,6 +215,38 @@
<allow-commands>show .*</allow-commands>
<deny-commands>(ssh .*|telnet .*)</deny-commands>
</class>
+ <class>
+ <name>opennsa</name>
+ <idle-timeout>5</idle-timeout>
+ <permissions>configure</permissions>
+ <deny-commands>(file.*)|(load.*)|(op.*)|(request.*)|(save.*)|(start.*)|(test.*)|(set cli.*)|(set date.*)|(clear.*)|(help.*)|(telnet.*)|(ssh.*)|(traceroute.*)|(mtrace.*)|(monitor.*)|(ping.*)|(show.*)|(set.*)</deny-commands>
+ <allow-configuration-regexps>interfaces .*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections remote-interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols mpls label-switched-path.*</allow-configuration-regexps>
+ <deny-configuration-regexps>vmhost .*</deny-configuration-regexps>
+ <deny-configuration-regexps>session-limit-group .*</deny-configuration-regexps>
+ <deny-configuration-regexps>multi-chassis .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc-partition .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc .*</deny-configuration-regexps>
+ <deny-configuration-regexps>groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>dynamic-profiles .*</deny-configuration-regexps>
+ <deny-configuration-regexps>diameter .*</deny-configuration-regexps>
+ <deny-configuration-regexps>apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>access-profile .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces traceoptions .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-set .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-range .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups-except .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lt-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces ms-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces si-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces gr-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lo.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces dsc.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces irb.*</deny-configuration-regexps>
+ </class>
<class>
<name>readonly-permissions</name>
<idle-timeout>15</idle-timeout>
@@ -517,6 +549,22 @@
<encrypted-password>/* SECRET-DATA */</encrypted-password>
</authentication>
</user>
+ <user>
+ <name>opennsa</name>
+ <uid>2002</uid>
+ <class>opennsa</class>
+ <authentication>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ </authentication>
+ </user>
<user>
<name>opnet</name>
<full-name>OPNET NEOP Planning system @ 62.40.105.114</full-name>
@@ -1563,10 +1611,10 @@
<apply-groups>re1</apply-groups>
<interface>
<name>lt-0/0/0</name>
- <description>TUN INFRASTRUCTURE</description>
+ <description>TUN INFRASTRUCTURE ACCESS SRF0000001 </description>
<unit>
<name>16</name>
- <description>SRV_GLOBAL INFRASTRUCTURE 20965_TO_21320 IAS | BGP Peering - RE Side</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS IAS SRF0000001 | BGP Peering - RE Side</description>
<encapsulation>ethernet</encapsulation>
<peer-unit>61</peer-unit>
<family>
@@ -1600,7 +1648,7 @@
</unit>
<unit>
<name>61</name>
- <description>SRV_IAS INFRASTRUCTURE 20965_TO_21320 IAS | BGP Peering - IAS Side</description>
+ <description>SRV_IAS INFRASTRUCTURE ACCESS GLOBAL SRF0000001 | BGP Peering - IAS Side</description>
<encapsulation>ethernet</encapsulation>
<peer-unit>16</peer-unit>
<family>
@@ -1619,12 +1667,12 @@
</interface>
<interface>
<name>xe-0/0/0</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>xe-0/0/1</name>
- <description>PHY INFRASTRUCTURE BACKBONE P_ae0 | Lattelecom ID: SPTN8000162</description>
+ <description>PHY INFRASTRUCTURE BACKBONE P_AE0 SRF0000001 | Lattelecom ID: SPTN8000162</description>
<undocumented><enable/></undocumented>
<framing>
<wan-phy/>
@@ -1637,12 +1685,12 @@
</interface>
<interface>
<name>xe-0/1/0</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>xe-0/1/1</name>
- <description>PHY INFRASTRUCTURE BACKBONE P_ae0 | Lattelecom ID: SPTN8000274</description>
+ <description>PHY INFRASTRUCTURE BACKBONE P_AE0 SRF0000001 | Lattelecom ID: SPTN8000274</description>
<undocumented><enable/></undocumented>
<framing>
<wan-phy/>
@@ -1655,11 +1703,11 @@
</interface>
<interface>
<name>ge-0/2/0</name>
- <description>PHY INFRASTRUCTURE LAN | rig lv POP LAN</description>
+ <description>PHY INFRASTRUCTURE ACCESS LAN SRF0000001 | rig lv POP LAN</description>
<vlan-tagging/>
<unit>
<name>10</name>
- <description>SRV_GLOBAL INFRASTRUCTURE VLAN10 HYPERVISOR | C1N1 TRUNK</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS HYPERVISOR SRF0000001 | C1N1 TRUNK</description>
<vlan-id>10</vlan-id>
<family>
<inet>
@@ -1686,7 +1734,7 @@
</unit>
<unit>
<name>20</name>
- <description>SRV_GLOBAL INFRASTRUCTURE VLAN20 HYPERVISOR DRAC LOM | C1N1 iDRAC CONTACT: allen.kong@geant.org IMPLEMENTED: 20161027</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS HYPERVISOR SRF0000001 | C1N1 iDRAC CONTACT: allen.kong@geant.org IMPLEMENTED: 20161027</description>
<vlan-id>20</vlan-id>
<family>
<inet>
@@ -1706,7 +1754,7 @@
</unit>
<unit>
<name>21</name>
- <description>SRV_GLOBAL INFRASTRUCTURE VLAN21 PERFSONAR DRAC LOM | Hades DRAC</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS PERFSONAR SRF0000001 | Hades DRAC</description>
<vlan-id>21</vlan-id>
<family>
<inet>
@@ -1726,7 +1774,7 @@
</unit>
<unit>
<name>30</name>
- <description>SRV_GLOBAL INFRASTRUCTURE VLAN30 HYPERVISOR | C1N1 MAN</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS HYPERVISOR SRF0000001 | C1N1 MAN</description>
<vlan-id>30</vlan-id>
<family>
<inet>
@@ -1757,7 +1805,7 @@
</unit>
<unit inactive="inactive">
<name>120</name>
- <description>SRV_GLOBAL INFRASTRUCTURE VLAN120 | Dashboard-backend VM</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS SRF0000001 | Dashboard-backend VM</description>
<vlan-id>120</vlan-id>
<family inactive="inactive">
<inet>
@@ -1790,7 +1838,7 @@
</unit>
<unit inactive="inactive">
<name>121</name>
- <description>SRV_GLOBAL INFRASTRUCTURE VLAN121 | Corr Servers VM</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS SRF0000001 | Corr Servers VM</description>
<vlan-id>121</vlan-id>
<family inactive="inactive">
<inet>
@@ -1823,7 +1871,7 @@
</unit>
<unit inactive="inactive">
<name>122</name>
- <description>SRV_GLOBAL INFRASTRUCTURE VLAN122 | Enterprise Servers VM</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS SRF0000001 | Enterprise Servers VM</description>
<vlan-id>122</vlan-id>
<family inactive="inactive">
<inet>
@@ -1856,7 +1904,7 @@
</unit>
<unit inactive="inactive">
<name>123</name>
- <description>SRV_GLOBAL INFRASTRUCTURE VLAN123 | Trap Servers VM</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS SRF0000001 | Trap Servers VM</description>
<vlan-id>123</vlan-id>
<family inactive="inactive">
<inet>
@@ -1889,7 +1937,7 @@
</unit>
<unit>
<name>190</name>
- <description>SRV_GLOBAL INFRASTRUCTURE VLAN190 | OPSVM</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS SRF0000001 | OPSVM</description>
<vlan-id>190</vlan-id>
<family>
<inet>
@@ -1962,7 +2010,7 @@
</unit>
<unit>
<name>83</name>
- <description>SRV_GLOBAL CUSTOMER SIGMANET AP_B SRF9912923 | ASN5538 |</description>
+ <description>SRV_GLOBAL CUSTOMER SIGMANET AP2 SRF9912923 | ASN5538 |</description>
<vlan-id>83</vlan-id>
<family>
<inet>
@@ -2004,11 +2052,11 @@
</interface>
<interface>
<name>ge-0/2/2</name>
- <description>PHY INFRASTRUCTURE PERFSONAR SRF9918957 | BWCTL CONTACT: ivan.garnizov@fau.de IMPLEMENTED: 20150806</description>
+ <description>PHY INFRASTRUCTURE ACCESS PERFSONAR SRF9918957 | BWCTL CONTACT: ivan.garnizov@fau.de IMPLEMENTED: 20150806</description>
<mtu>9192</mtu>
<unit>
<name>0</name>
- <description>SRV_GLOBAL INFRASTRUCTURE PERFSONAR SRF9918957 | BWCTL CONTACT: ivan.garnizov@fau.de IMPLEMENTED: 20150806</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS PERFSONAR SRF9918957 | BWCTL CONTACT: ivan.garnizov@fau.de IMPLEMENTED: 20150806</description>
<family>
<inet>
<filter>
@@ -2041,10 +2089,10 @@
</interface>
<interface>
<name>ge-0/2/3</name>
- <description>PHY INFRASTRUCTURE PERFSONAR SRF9918953 | OWAMP CONTACT: ivan.garnizov@fau.de IMPLEMENTED: 20150806</description>
+ <description>PHY INFRASTRUCTURE ACCESS PERFSONAR SRF9918953 | OWAMP CONTACT: ivan.garnizov@fau.de IMPLEMENTED: 20150806</description>
<unit>
<name>0</name>
- <description>SRV_GLOBAL INFRASTRUCTURE PERFSONAR SRF9918953 | OWAMP CONTACT: ivan.garnizov@fau.de IMPLEMENTED: 20150806</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS PERFSONAR SRF9918953 | OWAMP CONTACT: ivan.garnizov@fau.de IMPLEMENTED: 20150806</description>
<family>
<inet>
<filter>
@@ -2077,87 +2125,87 @@
</interface>
<interface>
<name>ge-0/2/4</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/2/5</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/2/6</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/2/7</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/2/8</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/2/9</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/3/0</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/3/1</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/3/2</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/3/3</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/3/4</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/3/5</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/3/6</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/3/7</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/3/8</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/3/9</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>xe-1/0/0</name>
- <description>PHY INFRASTRUCTURE BACKBONE P_ae2 | RETN ID: WL-903369-2</description>
+ <description>PHY INFRASTRUCTURE BACKBONE P_AE2 SRF0000001 | RETN ID: WL-903369-2</description>
<undocumented><enable/></undocumented>
<framing>
<wan-phy/>
@@ -2170,12 +2218,12 @@
</interface>
<interface>
<name>xe-1/0/1</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>xe-1/1/0</name>
- <description>PHY INFRASTRUCTURE BACKBONE P_ae2 | RETN ID: WL-903369-1</description>
+ <description>PHY INFRASTRUCTURE BACKBONE P_AE2 SRF0000001 | RETN ID: WL-903369-1</description>
<undocumented><enable/></undocumented>
<framing>
<wan-phy/>
@@ -2235,7 +2283,7 @@
</unit>
<unit>
<name>83</name>
- <description>SRV_GLOBAL CUSTOMER SIGMANET AP_P SRF9912943 | ASN5538 | SIGMAnet Primary</description>
+ <description>SRV_GLOBAL CUSTOMER SIGMANET AP1 SRF9912943 | ASN5538 | SIGMAnet Primary</description>
<vlan-id>83</vlan-id>
<family>
<inet>
@@ -2276,7 +2324,7 @@
</unit>
<unit>
<name>3003</name>
- <description>SRV_L2CIRCUIT CUSTOMER SIGMANET SRF15056_1 | ams-rig_EVLBI-JIVE_SURFNET-SIGMANET_15056</description>
+ <description>SRV_L2CIRCUIT CUSTOMER SIGMANET SRF9915056 | ams-rig_EVLBI-JIVE_SURFNET-SIGMANET_15056</description>
<encapsulation>vlan-ccc</encapsulation>
<vlan-id>3003</vlan-id>
</unit>
@@ -2307,7 +2355,7 @@
</interface>
<interface>
<name>ae0</name>
- <description>LAG INFRASTRUCTURE BACKBONE | kau-rig</description>
+ <description>LAG INFRASTRUCTURE BACKBONE SRF0000001 | kau-rig</description>
<mtu>9192</mtu>
<aggregated-ether-options>
<load-balance>
@@ -2322,7 +2370,7 @@
</aggregated-ether-options>
<unit>
<name>0</name>
- <description>SRV_GLOBAL INFRASTRUCTURE BACKBONE | kau-rig</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE BACKBONE SRF0000001 | kau-rig</description>
<family>
<inet>
<accounting>
@@ -2366,7 +2414,7 @@
</interface>
<interface>
<name>ae2</name>
- <description>LAG INFRASTRUCTURE BACKBONE | tal-rig</description>
+ <description>LAG INFRASTRUCTURE BACKBONE SRF0000001 | tal-rig</description>
<mtu>9192</mtu>
<aggregated-ether-options>
<load-balance>
@@ -2381,7 +2429,7 @@
</aggregated-ether-options>
<unit>
<name>0</name>
- <description>SRV_GLOBAL INFRASTRUCTURE BACKBONE | tal-rig</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE BACKBONE SRF0000001 | tal-rig</description>
<family>
<inet>
<accounting>
@@ -2674,6 +2722,9 @@
<clients>
<name>83.97.93.196/32</name>
</clients>
+ <clients>
+ <name>83.97.93.238/32</name>
+ </clients>
</community>
<community>
<name>As4n0gN!</name>
@@ -3148,13 +3199,13 @@
<import-rib>IAS.inet6.0</import-rib>
<import-policy>rtbh-policy</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias</name>
<import-rib>IAS.inet.0</import-rib>
<import-rib>CLEAN_IAS.inet.0</import-rib>
<import-policy>ps-into-clean-ias-import</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias-v6</name>
<import-rib>IAS.inet6.0</import-rib>
<import-rib>CLEAN_IAS.inet6.0</import-rib>
@@ -6877,16 +6928,13 @@
</prefix-list>
<prefix-list>
<name>geantncc-address-space</name>
- <comment>/* NCC DR VPN LAN */</comment>
+ <comment>/* NCC DR VPN */</comment>
<prefix-list-item>
- <name>62.40.108.192/26</name>
+ <name>62.40.108.192/27</name>
</prefix-list-item>
<prefix-list-item>
<name>62.40.119.0/24</name>
</prefix-list-item>
- <prefix-list-item>
- <name>62.40.119.134/32</name>
- </prefix-list-item>
<prefix-list-item>
<name>62.40.125.250/32</name>
</prefix-list-item>
@@ -8017,6 +8065,14 @@
</prefix-list>
<prefix-list>
<name>corporate-address-space</name>
+ <comment>/* LON2 CORP VPN (MAC) */</comment>
+ <prefix-list-item>
+ <name>62.40.99.194/32</name>
+ </prefix-list-item>
+ <comment>/* LON2 CORP VPN */</comment>
+ <prefix-list-item>
+ <name>62.40.99.201/32</name>
+ </prefix-list-item>
<prefix-list-item>
<name>62.40.119.128/25</name>
</prefix-list-item>
@@ -8114,6 +8170,18 @@
<name>2001:798::/32</name>
</prefix-list-item>
</prefix-list>
+ <prefix-list>
+ <name>opennsa-servers</name>
+ <prefix-list-item>
+ <name>83.97.93.92/32</name>
+ </prefix-list-item>
+ </prefix-list>
+ <prefix-list>
+ <name>opennsa-servers-v6</name>
+ <prefix-list-item>
+ <name>2001:798:3::15f/128</name>
+ </prefix-list-item>
+ </prefix-list>
<policy-statement>
<name>ASM-Allow</name>
<term>
@@ -8528,6 +8596,10 @@
<address>185.1.68.0/24</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>193.188.137.0/24</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -8649,6 +8721,10 @@
<address>2001:7f8:a0::/64</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>2001:7f8:35::/64</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -11410,13 +11486,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -11432,14 +11501,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp>
<name>backbone-classifier</name>
@@ -11451,18 +11512,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -11470,195 +11519,16 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>iperf-classifier</name>
- <import>default</import>
<forwarding-class>
<name>expedited-forwarding</name>
<loss-priority>
<name>low</name>
- <code-points>af12</code-points>
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>backbone-classifier</name>
@@ -11670,18 +11540,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -11689,13 +11547,7 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -11718,13 +11570,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -11740,187 +11585,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>iperf-classifier</name>
- <import>default</import>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>af12</code-points>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-access-classifier</name>
@@ -11929,16 +11593,16 @@
<name>be</name>
<loss-priority>
<name>low</name>
- <code-points>000</code-points>
- <code-points>001</code-points>
- <code-points>010</code-points>
- <code-points>011</code-points>
- <code-points>110</code-points>
- <code-points>111</code-points>
+ <code-points>100</code-points>
+ <code-points>101</code-points>
</loss-priority>
</forwarding-class>
+ </exp>
+ <exp>
+ <name>mpls-backbone-classifier</name>
+ <import>default</import>
<forwarding-class>
- <name>less-than-best-effort</name>
+ <name>be</name>
<loss-priority>
<name>low</name>
<code-points>100</code-points>
@@ -11946,40 +11610,7 @@
</loss-priority>
</forwarding-class>
</exp>
- <exp>
- <name>mpls-backbone-classifier</name>
- <import>default</import>
- </exp>
</classifiers>
- <code-point-aliases>
- <dscp>
- <name>ix</name>
- <bits>101001</bits>
- </dscp>
- <dscp>
- <name>dws</name>
- <bits>100000</bits>
- </dscp>
- <dscp-ipv6>
- <name>dws</name>
- <bits>100000</bits>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix</name>
- <bits>101001</bits>
- </dscp-ipv6>
- </code-point-aliases>
- <drop-profiles>
- <name>dws-drop-profile</name>
- <fill-level>
- <name>35</name>
- <drop-probability>10</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<drop-profiles>
<name>be-drop-profile</name>
<fill-level>
@@ -11999,59 +11630,40 @@
<drop-probability>100</drop-probability>
</fill-level>
</drop-profiles>
- <drop-profiles>
- <name>less-than-be-drop-profile</name>
- <fill-level>
- <name>25</name>
- <drop-probability>30</drop-probability>
- </fill-level>
- <fill-level>
- <name>30</name>
- <drop-probability>50</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>70</drop-probability>
- </fill-level>
- <fill-level>
- <name>50</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<forwarding-classes>
<class>
<name>be</name>
<queue-num>0</queue-num>
</class>
- <class>
- <name>be-ix</name>
- <queue-num>0</queue-num>
- </class>
<class>
<name>expedited-forwarding</name>
<queue-num>1</queue-num>
</class>
- <class>
- <name>less-than-best-effort</name>
- <queue-num>2</queue-num>
- </class>
<class>
<name>network-control</name>
<queue-num>3</queue-num>
</class>
- <class>
- <name>be-dws</name>
- <queue-num>0</queue-num>
- </class>
- <class>
- <name>be-bleach</name>
- <queue-num>0</queue-num>
- </class>
</forwarding-classes>
<interfaces>
+ <interface>
+ <name>et-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>ge-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>so-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>xe-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
<interface>
<name>ge-0/2/1</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -12082,7 +11694,7 @@
</interface>
<interface>
<name>xe-1/1/1</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -12111,9 +11723,13 @@
</classifiers>
</unit>
</interface>
+ <interface>
+ <name>ae*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
<interface>
<name>ae0</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -12131,17 +11747,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -12151,7 +11759,7 @@
</interface>
<interface>
<name>ae1</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -12178,7 +11786,7 @@
</interface>
<interface>
<name>ae2</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -12196,17 +11804,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -12218,13 +11818,6 @@
<rewrite-rules>
<dscp>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -12239,17 +11832,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -12261,157 +11843,9 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -12426,17 +11860,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -12448,13 +11871,6 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
@@ -12462,35 +11878,19 @@
</exp>
</rewrite-rules>
<scheduler-maps>
- <name>MAP-BASIC-IQ2</name>
- <forwarding-class>
- <name>be-dws</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
+ <name>GEANT-BASIC</name>
<forwarding-class>
<name>expedited-forwarding</name>
<scheduler>sch-expedited-forwarding</scheduler>
</forwarding-class>
<forwarding-class>
<name>network-control</name>
- <scheduler>sch-network-ctrl-iq2</scheduler>
+ <scheduler>sch-network-ctrl-geant</scheduler>
</forwarding-class>
<forwarding-class>
<name>be</name>
<scheduler>sch-be</scheduler>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <scheduler>sch-less-than-best-effort</scheduler>
- </forwarding-class>
</scheduler-maps>
<schedulers>
<name>sch-be</name>
@@ -12510,27 +11910,7 @@
<priority>strict-high</priority>
</schedulers>
<schedulers>
- <name>sch-less-than-best-effort</name>
- <transmit-rate>
- <percent>10</percent>
- </transmit-rate>
- <buffer-size>
- <percent>10</percent>
- </buffer-size>
- <priority>low</priority>
- <drop-profile-map>
- <loss-priority>low</loss-priority>
- <protocol>any</protocol>
- <drop-profile>less-than-be-drop-profile</drop-profile>
- </drop-profile-map>
- <drop-profile-map>
- <loss-priority>high</loss-priority>
- <protocol>any</protocol>
- <drop-profile>be-drop-profile</drop-profile>
- </drop-profile-map>
- </schedulers>
- <schedulers>
- <name>sch-network-ctrl</name>
+ <name>sch-network-ctrl-geant</name>
<transmit-rate>
<percent>5</percent>
</transmit-rate>
@@ -12539,15 +11919,6 @@
</buffer-size>
<priority>high</priority>
</schedulers>
- <schedulers>
- <name>sch-network-ctrl-iq2</name>
- <transmit-rate>
- <percent>5</percent>
- </transmit-rate>
- <buffer-size>
- <percent>5</percent>
- </buffer-size>
- </schedulers>
</class-of-service>
<firewall>
<family>
@@ -14795,6 +14166,9 @@
<source-prefix-list>
<name>dashboard-servers</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers</name>
+ </source-prefix-list>
<protocol>tcp</protocol>
<destination-port>ssh</destination-port>
</from>
@@ -16402,6 +15776,9 @@
<source-prefix-list>
<name>dashboard-servers-v6</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers-v6</name>
+ </source-prefix-list>
<next-header>tcp</next-header>
<port>ssh</port>
</from>
@@ -16822,7 +16199,7 @@
</policer>
</firewall>
<routing-instances>
- <instance>
+ <instance inactive="inactive">
<name>CLEAN_IAS</name>
<description>Clean IAS VRF traffic returned from scrubber</description>
<instance-type>vrf</instance-type>
diff --git a/test/data/mx2.tal.ee.geant.net-netconf.xml b/test/data/mx2.tal.ee.geant.net-netconf.xml
index cb7b0e025564e2323ceb37b29cbf00b39ae27a4d..6608b3390f550a3c6863ef1a106f14dbbe78ba93 100644
--- a/test/data/mx2.tal.ee.geant.net-netconf.xml
+++ b/test/data/mx2.tal.ee.geant.net-netconf.xml
@@ -1,4 +1,4 @@
-<configuration changed-seconds="1545214013" changed-localtime="2018-12-19 10:06:53 UTC">
+<configuration changed-seconds="1549111811" changed-localtime="2019-02-02 12:50:11 UTC">
<version>15.1F6-S10.9</version>
<groups>
<name>re0</name>
@@ -252,6 +252,38 @@
<allow-commands>show .*</allow-commands>
<deny-commands>(ssh .*|telnet .*)</deny-commands>
</class>
+ <class>
+ <name>opennsa</name>
+ <idle-timeout>5</idle-timeout>
+ <permissions>configure</permissions>
+ <deny-commands>(file.*)|(load.*)|(op.*)|(request.*)|(save.*)|(start.*)|(test.*)|(set cli.*)|(set date.*)|(clear.*)|(help.*)|(telnet.*)|(ssh.*)|(traceroute.*)|(mtrace.*)|(monitor.*)|(ping.*)|(show.*)|(set.*)</deny-commands>
+ <allow-configuration-regexps>interfaces .*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections remote-interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols mpls label-switched-path.*</allow-configuration-regexps>
+ <deny-configuration-regexps>vmhost .*</deny-configuration-regexps>
+ <deny-configuration-regexps>session-limit-group .*</deny-configuration-regexps>
+ <deny-configuration-regexps>multi-chassis .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc-partition .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc .*</deny-configuration-regexps>
+ <deny-configuration-regexps>groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>dynamic-profiles .*</deny-configuration-regexps>
+ <deny-configuration-regexps>diameter .*</deny-configuration-regexps>
+ <deny-configuration-regexps>apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>access-profile .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces traceoptions .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-set .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-range .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups-except .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lt-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces ms-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces si-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces gr-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lo.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces dsc.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces irb.*</deny-configuration-regexps>
+ </class>
<class>
<name>readonly-permissions</name>
<idle-timeout>15</idle-timeout>
@@ -555,6 +587,22 @@
<encrypted-password>/* SECRET-DATA */</encrypted-password>
</authentication>
</user>
+ <user>
+ <name>opennsa</name>
+ <uid>2047</uid>
+ <class>opennsa</class>
+ <authentication>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ </authentication>
+ </user>
<user>
<name>opnet</name>
<full-name>OPNET NEOP Planning system @ 62.40.105.114</full-name>
@@ -1587,10 +1635,10 @@
<apply-groups>re1</apply-groups>
<interface>
<name>lt-0/0/0</name>
- <description>TUN INFRASTRUCTURE</description>
+ <description>TUN INFRASTRUCTURE ACCESS SRF0000001 </description>
<unit>
<name>16</name>
- <description>SRV_GLOBAL INFRASTRUCTURE 20965_TO_21320 IAS | BGP Peering - RE Side</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS IAS SRF0000001 | BGP Peering - RE Side</description>
<encapsulation>ethernet</encapsulation>
<peer-unit>61</peer-unit>
<family>
@@ -1624,7 +1672,7 @@
</unit>
<unit>
<name>61</name>
- <description>SRV_IAS INFRASTRUCTURE 20965_TO_21320 IAS | BGP Peering - IAS Side</description>
+ <description>SRV_IAS INFRASTRUCTURE ACCESS GLOBAL SRF0000001 | BGP Peering - IAS Side</description>
<encapsulation>ethernet</encapsulation>
<peer-unit>16</peer-unit>
<family>
@@ -1643,7 +1691,7 @@
</interface>
<interface>
<name>xe-0/0/0</name>
- <description>PHY INFRASTRUCTURE BACKBONE P_ae0 | RETN ID: WL-903369-1</description>
+ <description>PHY INFRASTRUCTURE BACKBONE P_AE0 SRF0000001 | RETN ID: WL-903369-1</description>
<undocumented><enable/></undocumented>
<framing>
<wan-phy/>
@@ -1661,7 +1709,7 @@
<mtu>9192</mtu>
<unit>
<name>100</name>
- <description>SRV_GLOBAL CUSTOMER EENET AP_B SRF997950 | ASN3221 |</description>
+ <description>SRV_GLOBAL CUSTOMER EENET AP2 SRF997950 | ASN3221 |</description>
<vlan-id>100</vlan-id>
<family>
<inet>
@@ -1746,7 +1794,7 @@
</interface>
<interface>
<name>xe-0/1/0</name>
- <description>PHY INFRASTRUCTURE BACKBONE P_ae0 | RETN ID: WL-903369-2</description>
+ <description>PHY INFRASTRUCTURE BACKBONE P_AE0 SRF0000001 | RETN ID: WL-903369-2</description>
<undocumented><enable/></undocumented>
<framing>
<wan-phy/>
@@ -1759,7 +1807,7 @@
</interface>
<interface>
<name>xe-0/1/1</name>
- <description>PHY INFRASTRUCTURE BACKBONE P_ae1 |</description>
+ <description>PHY INFRASTRUCTURE BACKBONE P_AE1 SRF0000001 |</description>
<undocumented><enable/></undocumented>
<framing>
<wan-phy/>
@@ -1772,11 +1820,11 @@
</interface>
<interface>
<name>ge-0/2/0</name>
- <description>PHY INFRASTRUCTURE LAN | tal ee POP LAN</description>
+ <description>PHY INFRASTRUCTURE ACCESS LAN SRF0000001 | tal ee POP LAN</description>
<vlan-tagging/>
<unit>
<name>10</name>
- <description>SRV_GLOBAL INFRASTRUCTURE VLAN10 | -- VLAN 10 TEST ---</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS SRF0000001 | -- VLAN 10 TEST ---</description>
<vlan-id>10</vlan-id>
<family>
<inet>
@@ -1803,7 +1851,7 @@
</unit>
<unit>
<name>20</name>
- <description>SRV_GLOBAL INFRASTRUCTURE VLAN20 | C1N1 iDRAC CONTACT: allen.kong@geant.org IMPLEMENTED: 20161027</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS SRF0000001 | C1N1 iDRAC CONTACT: allen.kong@geant.org IMPLEMENTED: 20161027</description>
<vlan-id>20</vlan-id>
<family>
<inet>
@@ -1823,7 +1871,7 @@
</unit>
<unit>
<name>21</name>
- <description>SRV_GLOBAL INFRASTRUCTURE PERFSONAR DRAC LOM VLAN21 | Hades - drac.psmp</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS PERFSONAR SRF0000001 | Hades - drac.psmp</description>
<vlan-id>21</vlan-id>
<family>
<inet>
@@ -1845,7 +1893,7 @@
</unit>
<unit>
<name>22</name>
- <description>SRV_GLOBAL INFRASTRUCTURE PERFSONAR VLAN22 | OWAMP CONTACT: ivan.garnizov@fau.de IMPLEMENTED: 20150811</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS PERFSONAR SRF0000001 | OWAMP CONTACT: ivan.garnizov@fau.de IMPLEMENTED: 20150811</description>
<vlan-id>22</vlan-id>
<family>
<inet>
@@ -1880,7 +1928,7 @@
</unit>
<unit>
<name>30</name>
- <description>SRV_GLOBAL INFRASTRUCTURE VLAN30 | C1N1 MAN</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS SRF0000001 | C1N1 MAN</description>
<vlan-id>30</vlan-id>
<family>
<inet>
@@ -1911,7 +1959,7 @@
</unit>
<unit>
<name>40</name>
- <description>SRV_GLOBAL INFRASTRUCTURE VLAN40 HYPERVISOR | C1N1 Server - Live migration</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS HYPERVISOR SRF0000001 | C1N1 Server - Live migration</description>
<vlan-id>40</vlan-id>
<family>
<inet>
@@ -1940,7 +1988,7 @@
</unit>
<unit>
<name>190</name>
- <description>SRV_GLOBAL INFRASTRUCTURE VLAN190 | OPSVM</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS SRF0000001 | OPSVM</description>
<vlan-id>190</vlan-id>
<family>
<inet>
@@ -1965,7 +2013,7 @@
</unit>
<unit>
<name>200</name>
- <description>SRV_GLOBAL INFRASTRUCTURE VLAN200 | Compendium CONTACT: michael.haller@geant.org IMPLEMENTED: 20170421</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS SRF0000001 | Compendium CONTACT: michael.haller@geant.org IMPLEMENTED: 20170421</description>
<vlan-id>200</vlan-id>
<family>
<inet>
@@ -2004,96 +2052,96 @@
</interface>
<interface>
<name>ge-0/2/2</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/2/3</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/2/4</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/2/5</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/2/6</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/2/7</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/2/8</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/2/9</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/3/0</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/3/1</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/3/2</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/3/3</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/3/4</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/3/5</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/3/6</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/3/7</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/3/8</name>
- <description>PHY INFRASTRUCTURE PERFSONAR SRF9919023 | HADES - Additional OWD interface, AK 8/6/15</description>
+ <description>PHY INFRASTRUCTURE ACCESS PERFSONAR SRF9919023 | HADES - Additional OWD interface, AK 8/6/15</description>
</interface>
<interface>
<name>ge-0/3/9</name>
- <description>PHY INFRASTRUCTURE PERFSONAR SRF9919023 | BWCTL CONTACT: ivan.garnizov@fau.de IMPLEMENTED: 20150811</description>
+ <description>PHY INFRASTRUCTURE ACCESS PERFSONAR SRF9919023 | BWCTL CONTACT: ivan.garnizov@fau.de IMPLEMENTED: 20150811</description>
<speed>1g</speed>
<mtu>9192</mtu>
<unit>
<name>0</name>
- <description>SRV_GLOBAL INFRASTRUCTURE PERFSONAR SRF99??? | BWCTL CONTACT: ivan.garnizov@fau.de IMPLEMENTED: 20150811</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS PERFSONAR SRF0000001 | BWCTL CONTACT: ivan.garnizov@fau.de IMPLEMENTED: 20150811</description>
<family>
<inet>
<filter>
@@ -2128,7 +2176,7 @@
</interface>
<interface>
<name>xe-1/0/0</name>
- <description>PHY INFRASTRUCTURE BACKBONE P_ae1 |</description>
+ <description>PHY INFRASTRUCTURE BACKBONE P_AE1 SRF0000001 |</description>
<framing>
<wan-phy/>
</framing>
@@ -2140,17 +2188,17 @@
</interface>
<interface>
<name>xe-1/0/1</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>xe-1/1/0</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>xe-1/1/1</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
@@ -2189,7 +2237,7 @@
</interface>
<interface>
<name>ae0</name>
- <description>LAG INFRASTRUCTURE BACKBONE | rig-tal</description>
+ <description>LAG INFRASTRUCTURE BACKBONE SRF0000001 | rig-tal</description>
<mtu>9192</mtu>
<aggregated-ether-options>
<load-balance>
@@ -2204,7 +2252,7 @@
</aggregated-ether-options>
<unit>
<name>0</name>
- <description>SRV_GLOBAL INFRASTRUCTURE BACKBONE | rig-tal</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE BACKBONE SRF0000001 | rig-tal</description>
<family>
<inet>
<accounting>
@@ -2248,7 +2296,7 @@
</interface>
<interface>
<name>ae1</name>
- <description>LAG INFRASTRUCTURE BACKBONE | tal-tal</description>
+ <description>LAG INFRASTRUCTURE BACKBONE SRF0000001 | tal-tal</description>
<mtu>9192</mtu>
<aggregated-ether-options>
<load-balance>
@@ -2263,7 +2311,7 @@
</aggregated-ether-options>
<unit>
<name>0</name>
- <description>SRV_GLOBAL INFRASTRUCTURE BACKBONE | tal-tal</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE BACKBONE SRF0000001 | tal-tal</description>
<family>
<inet>
<accounting>
@@ -2556,6 +2604,9 @@
<clients>
<name>83.97.93.196/32</name>
</clients>
+ <clients>
+ <name>83.97.93.238/32</name>
+ </clients>
</community>
<community>
<name>As4n0gN!</name>
@@ -3036,13 +3087,13 @@
<import-rib>IAS.inet6.0</import-rib>
<import-policy>rtbh-policy</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias</name>
<import-rib>IAS.inet.0</import-rib>
<import-rib>CLEAN_IAS.inet.0</import-rib>
<import-policy>ps-into-clean-ias-import</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias-v6</name>
<import-rib>IAS.inet6.0</import-rib>
<import-rib>CLEAN_IAS.inet6.0</import-rib>
@@ -4233,18 +4284,14 @@
</prefix-list>
<prefix-list>
<name>geantncc-address-space</name>
- <comment>/* NCC DR VPN LAN */</comment>
+ <comment>/* NCC DR VPN */</comment>
<prefix-list-item>
- <name>62.40.108.192/26</name>
+ <name>62.40.108.192/27</name>
</prefix-list-item>
<comment>/* NCC TRUSTED SERVER VLAN */</comment>
<prefix-list-item>
<name>62.40.119.0/24</name>
</prefix-list-item>
- <comment>/* NCC Remote Users */</comment>
- <prefix-list-item>
- <name>62.40.119.134/32</name>
- </prefix-list-item>
<comment>/* NCC Router - Interface to London */</comment>
<prefix-list-item>
<name>62.40.125.250/32</name>
@@ -7424,6 +7471,14 @@
</prefix-list>
<prefix-list>
<name>corporate-address-space</name>
+ <comment>/* LON2 CORP VPN (MAC) */</comment>
+ <prefix-list-item>
+ <name>62.40.99.194/32</name>
+ </prefix-list-item>
+ <comment>/* LON2 CORP VPN */</comment>
+ <prefix-list-item>
+ <name>62.40.99.201/32</name>
+ </prefix-list-item>
<prefix-list-item>
<name>62.40.119.128/25</name>
</prefix-list-item>
@@ -7521,6 +7576,18 @@
<name>2001:798::/32</name>
</prefix-list-item>
</prefix-list>
+ <prefix-list>
+ <name>opennsa-servers</name>
+ <prefix-list-item>
+ <name>83.97.93.92/32</name>
+ </prefix-list-item>
+ </prefix-list>
+ <prefix-list>
+ <name>opennsa-servers-v6</name>
+ <prefix-list-item>
+ <name>2001:798:3::15f/128</name>
+ </prefix-list-item>
+ </prefix-list>
<policy-statement>
<name>ASM-Allow</name>
<term>
@@ -7933,6 +8000,10 @@
<address>185.1.68.0/24</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>193.188.137.0/24</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -8054,6 +8125,10 @@
<address>2001:7f8:a0::/64</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>2001:7f8:35::/64</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -10227,13 +10302,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -10242,13 +10310,6 @@
<code-points>nc2</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>expedited-forwarding</name>
<loss-priority>
@@ -10267,18 +10328,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -10286,195 +10335,16 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>iperf-classifier</name>
- <import>default</import>
<forwarding-class>
<name>expedited-forwarding</name>
<loss-priority>
<name>low</name>
- <code-points>af12</code-points>
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>backbone-classifier</name>
@@ -10486,18 +10356,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -10505,13 +10363,7 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -10534,13 +10386,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -10549,13 +10394,6 @@
<code-points>nc2</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>expedited-forwarding</name>
<loss-priority>
@@ -10564,179 +10402,6 @@
</loss-priority>
</forwarding-class>
</dscp-ipv6>
- <dscp-ipv6>
- <name>iperf-classifier</name>
- <import>default</import>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>af12</code-points>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
<exp>
<name>mpls-access-classifier</name>
<import>default</import>
@@ -10744,16 +10409,16 @@
<name>be</name>
<loss-priority>
<name>low</name>
- <code-points>000</code-points>
- <code-points>001</code-points>
- <code-points>010</code-points>
- <code-points>011</code-points>
- <code-points>110</code-points>
- <code-points>111</code-points>
+ <code-points>100</code-points>
+ <code-points>101</code-points>
</loss-priority>
</forwarding-class>
+ </exp>
+ <exp>
+ <name>mpls-backbone-classifier</name>
+ <import>default</import>
<forwarding-class>
- <name>less-than-best-effort</name>
+ <name>be</name>
<loss-priority>
<name>low</name>
<code-points>100</code-points>
@@ -10761,40 +10426,17 @@
</loss-priority>
</forwarding-class>
</exp>
- <exp>
- <name>mpls-backbone-classifier</name>
- <import>default</import>
- </exp>
</classifiers>
<code-point-aliases>
<dscp>
<name>ix</name>
<bits>101001</bits>
</dscp>
- <dscp>
- <name>dws</name>
- <bits>100000</bits>
- </dscp>
- <dscp-ipv6>
- <name>dws</name>
- <bits>100000</bits>
- </dscp-ipv6>
<dscp-ipv6>
<name>ix</name>
<bits>101001</bits>
</dscp-ipv6>
</code-point-aliases>
- <drop-profiles>
- <name>dws-drop-profile</name>
- <fill-level>
- <name>35</name>
- <drop-probability>10</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<drop-profiles>
<name>be-drop-profile</name>
<fill-level>
@@ -10814,58 +10456,59 @@
<drop-probability>100</drop-probability>
</fill-level>
</drop-profiles>
- <drop-profiles>
- <name>less-than-be-drop-profile</name>
- <fill-level>
- <name>25</name>
- <drop-probability>30</drop-probability>
- </fill-level>
- <fill-level>
- <name>30</name>
- <drop-probability>50</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>70</drop-probability>
- </fill-level>
- <fill-level>
- <name>50</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<forwarding-classes>
<class>
<name>be</name>
<queue-num>0</queue-num>
</class>
- <class>
- <name>be-ix</name>
- <queue-num>0</queue-num>
- </class>
<class>
<name>expedited-forwarding</name>
<queue-num>1</queue-num>
</class>
- <class>
- <name>less-than-best-effort</name>
- <queue-num>2</queue-num>
- </class>
<class>
<name>network-control</name>
<queue-num>3</queue-num>
</class>
- <class>
- <name>be-dws</name>
- <queue-num>0</queue-num>
- </class>
- <class>
- <name>be-bleach</name>
- <queue-num>0</queue-num>
- </class>
</forwarding-classes>
<interfaces>
+ <interface>
+ <name>et-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>ge-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>so-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>xe-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
<interface>
<name>xe-0/0/1</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ <unit>
+ <name>100</name>
+ <classifiers>
+ <dscp>
+ <name>access-classifier</name>
+ </dscp>
+ <dscp-ipv6>
+ <name>access-classifier</name>
+ </dscp-ipv6>
+ </classifiers>
+ <rewrite-rules>
+ <dscp>
+ <name>basic-rewrite-rules</name>
+ </dscp>
+ <dscp-ipv6>
+ <name>basic-rewrite-rules</name>
+ </dscp-ipv6>
+ </rewrite-rules>
+ </unit>
<unit>
<name>200</name>
<classifiers>
@@ -10876,11 +10519,19 @@
<name>access-classifier</name>
</dscp-ipv6>
</classifiers>
+ <rewrite-rules>
+ <dscp>
+ <name>basic-rewrite-rules</name>
+ </dscp>
+ <dscp-ipv6>
+ <name>basic-rewrite-rules</name>
+ </dscp-ipv6>
+ </rewrite-rules>
</unit>
</interface>
<interface>
<name>ge-2/0/1</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -10895,9 +10546,13 @@
</rewrite-rules>
</unit>
</interface>
+ <interface>
+ <name>ae*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
<interface>
<name>ae0</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -10915,17 +10570,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -10935,7 +10582,7 @@
</interface>
<interface>
<name>ae1</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -10953,17 +10600,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -10975,66 +10614,6 @@
<rewrite-rules>
<dscp>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -11049,17 +10628,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -11071,90 +10639,9 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -11169,17 +10656,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -11191,13 +10667,6 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
@@ -11205,9 +10674,17 @@
</exp>
</rewrite-rules>
<scheduler-maps>
- <name>MAP-BASIC-IQ2</name>
+ <name>GEANT-BASIC</name>
+ <forwarding-class>
+ <name>expedited-forwarding</name>
+ <scheduler>sch-expedited-forwarding</scheduler>
+ </forwarding-class>
+ <forwarding-class>
+ <name>network-control</name>
+ <scheduler>sch-network-ctrl-geant</scheduler>
+ </forwarding-class>
<forwarding-class>
- <name>be-dws</name>
+ <name>be</name>
<scheduler>sch-be</scheduler>
</forwarding-class>
</scheduler-maps>
@@ -11229,27 +10706,7 @@
<priority>strict-high</priority>
</schedulers>
<schedulers>
- <name>sch-less-than-best-effort</name>
- <transmit-rate>
- <percent>10</percent>
- </transmit-rate>
- <buffer-size>
- <percent>10</percent>
- </buffer-size>
- <priority>low</priority>
- <drop-profile-map>
- <loss-priority>low</loss-priority>
- <protocol>any</protocol>
- <drop-profile>less-than-be-drop-profile</drop-profile>
- </drop-profile-map>
- <drop-profile-map>
- <loss-priority>high</loss-priority>
- <protocol>any</protocol>
- <drop-profile>be-drop-profile</drop-profile>
- </drop-profile-map>
- </schedulers>
- <schedulers>
- <name>sch-network-ctrl</name>
+ <name>sch-network-ctrl-geant</name>
<transmit-rate>
<percent>5</percent>
</transmit-rate>
@@ -12903,6 +12360,9 @@
<source-prefix-list>
<name>dashboard-servers</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers</name>
+ </source-prefix-list>
<protocol>tcp</protocol>
<destination-port>ssh</destination-port>
</from>
@@ -14314,6 +13774,9 @@
<source-prefix-list>
<name>dashboard-servers-v6</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers-v6</name>
+ </source-prefix-list>
<next-header>tcp</next-header>
<port>ssh</port>
</from>
@@ -14782,7 +14245,7 @@
</policer>
</firewall>
<routing-instances>
- <instance>
+ <instance inactive="inactive">
<name>CLEAN_IAS</name>
<description>Clean IAS VRF traffic returned from scrubber</description>
<instance-type>vrf</instance-type>
diff --git a/test/data/mx2.zag.hr.geant.net-netconf.xml b/test/data/mx2.zag.hr.geant.net-netconf.xml
index aa4fa9a8230b6a32eac016be3e32b85c4c6dafe3..0679b03b4badc9a2436e52f93dd66defd72b9afe 100644
--- a/test/data/mx2.zag.hr.geant.net-netconf.xml
+++ b/test/data/mx2.zag.hr.geant.net-netconf.xml
@@ -1,4 +1,4 @@
-<configuration changed-seconds="1545214011" changed-localtime="2018-12-19 10:06:51 UTC">
+<configuration changed-seconds="1549111872" changed-localtime="2019-02-02 12:51:12 UTC">
<version>15.1F6-S10.9</version>
<groups>
<name>re0</name>
@@ -256,6 +256,38 @@
<allow-commands>show .*</allow-commands>
<deny-commands>(ssh .*|telnet .*)</deny-commands>
</class>
+ <class>
+ <name>opennsa</name>
+ <idle-timeout>5</idle-timeout>
+ <permissions>configure</permissions>
+ <deny-commands>(file.*)|(load.*)|(op.*)|(request.*)|(save.*)|(start.*)|(test.*)|(set cli.*)|(set date.*)|(clear.*)|(help.*)|(telnet.*)|(ssh.*)|(traceroute.*)|(mtrace.*)|(monitor.*)|(ping.*)|(show.*)|(set.*)</deny-commands>
+ <allow-configuration-regexps>interfaces .*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections remote-interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols connections interface-switch.*</allow-configuration-regexps>
+ <allow-configuration-regexps>protocols mpls label-switched-path.*</allow-configuration-regexps>
+ <deny-configuration-regexps>vmhost .*</deny-configuration-regexps>
+ <deny-configuration-regexps>session-limit-group .*</deny-configuration-regexps>
+ <deny-configuration-regexps>multi-chassis .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc-partition .*</deny-configuration-regexps>
+ <deny-configuration-regexps>jsrc .*</deny-configuration-regexps>
+ <deny-configuration-regexps>groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>dynamic-profiles .*</deny-configuration-regexps>
+ <deny-configuration-regexps>diameter .*</deny-configuration-regexps>
+ <deny-configuration-regexps>apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>access-profile .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces traceoptions .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-set .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces interface-range .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces apply-groups-except .*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lt-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces ms-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces si-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces gr-.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces lo.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces dsc.*</deny-configuration-regexps>
+ <deny-configuration-regexps>interfaces irb.*</deny-configuration-regexps>
+ </class>
<class>
<name>readonly-permissions</name>
<idle-timeout>15</idle-timeout>
@@ -566,6 +598,22 @@
<encrypted-password>/* SECRET-DATA */</encrypted-password>
</authentication>
</user>
+ <user>
+ <name>opennsa</name>
+ <uid>2049</uid>
+ <class>opennsa</class>
+ <authentication>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ <ssh-rsa>
+ <name>/* SECRET-DATA */</name>
+ </ssh-rsa>
+ </authentication>
+ </user>
<user>
<name>opnet</name>
<full-name>OPNET NEOP Planning system @ 62.40.105.114</full-name>
@@ -1597,10 +1645,10 @@
<apply-groups>re1</apply-groups>
<interface>
<name>lt-0/0/0</name>
- <description>TUN INFRASTRUCTURE</description>
+ <description>TUN INFRASTRUCTURE ACCESS SRF0000001 </description>
<unit>
<name>16</name>
- <description>SRV_GLOBAL INFRASTRUCTURE 20965_TO_21320 IAS | BGP Peering - RE Side</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS IAS SRF0000001 | BGP Peering - RE Side</description>
<encapsulation>ethernet</encapsulation>
<peer-unit>61</peer-unit>
<family>
@@ -1634,7 +1682,7 @@
</unit>
<unit>
<name>61</name>
- <description>SRV_IAS INFRASTRUCTURE 20965_TO_21320 IAS | BGP Peering - IAS Side</description>
+ <description>SRV_IAS INFRASTRUCTURE ACCESS GLOBAL SRF0000001 | BGP Peering - IAS Side</description>
<encapsulation>ethernet</encapsulation>
<peer-unit>16</peer-unit>
<family>
@@ -1653,7 +1701,7 @@
</interface>
<interface>
<name>xe-0/0/0</name>
- <description>PHY INFRASTRUCTURE BACKBONE P_ae2 |</description>
+ <description>PHY INFRASTRUCTURE BACKBONE P_AE2 SRF0000001 |</description>
<framing>
<wan-phy/>
</framing>
@@ -1665,7 +1713,7 @@
</interface>
<interface>
<name>xe-0/0/1</name>
- <description>PHY INFRASTRUCTURE BACKBONE P_ae4 |</description>
+ <description>PHY INFRASTRUCTURE BACKBONE P_AE4 SRF0000001 |</description>
<framing>
<wan-phy/>
</framing>
@@ -1677,7 +1725,7 @@
</interface>
<interface>
<name>xe-0/1/0</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
@@ -1691,11 +1739,11 @@
</interface>
<interface>
<name>ge-0/2/0</name>
- <description>PHY INFRASTRUCTURE LAN | to ge1.hr.geant.net - a Cisco 3524 in Rack 10</description>
+ <description>PHY INFRASTRUCTURE ACCESS LAN SRF0000001 | to ge1.hr.geant.net - a Cisco 3524 in Rack 10</description>
</interface>
<interface>
<name>ge-0/2/1</name>
- <description>PHY INFRASTRUCTURE LAN | c1n1-zag-hr Geth 2 - VM trunk</description>
+ <description>PHY INFRASTRUCTURE ACCESS LAN SRF0000001 | c1n1-zag-hr Geth 2 - VM trunk</description>
<gigether-options>
<ieee-802.3ad>
<bundle>ae10</bundle>
@@ -1704,7 +1752,7 @@
</interface>
<interface>
<name>ge-0/2/2</name>
- <description>PHY INFRASTRUCTURE LAN | c1n1-zag-hr Geth 1 - VM trunk</description>
+ <description>PHY INFRASTRUCTURE ACCESS LAN SRF0000001 | c1n1-zag-hr Geth 1 - VM trunk</description>
<disable/>
<gigether-options>
<ieee-802.3ad>
@@ -1714,7 +1762,7 @@
</interface>
<interface>
<name>ge-0/2/3</name>
- <description>PHY INFRASTRUCTURE INFINERA | ZAG01-DTNX10-1 XCM 1</description>
+ <description>PHY INFRASTRUCTURE ACCESS INFINERA SRF0000001 | ZAG01-DTNX10-1 XCM 1</description>
<unit>
<name>0</name>
<family>
@@ -1727,7 +1775,7 @@
</interface>
<interface>
<name>ge-0/2/4</name>
- <description>PHY INFRASTRUCTURE HYPERVISOR | c1n1-zag-hr Geth 3 - Cluster/heartbeat</description>
+ <description>PHY INFRASTRUCTURE ACCESS HYPERVISOR SRF0000001 | c1n1-zag-hr Geth 3 - Cluster/heartbeat</description>
<unit>
<name>0</name>
<family>
@@ -1762,7 +1810,7 @@
</interface>
<interface>
<name>ge-0/2/5</name>
- <description>PHY INFRASTRUCTURE HYPERVISOR | c1n1-zag-hr - Live migration</description>
+ <description>PHY INFRASTRUCTURE ACCESS HYPERVISOR SRF0000001 | c1n1-zag-hr - Live migration</description>
<unit>
<name>0</name>
<family>
@@ -1794,27 +1842,27 @@
</interface>
<interface>
<name>ge-0/2/6</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/2/7</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/2/8</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/2/9</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/3/0</name>
- <description>PHY INFRASTRUCTURE INFINERA | ZAG01-DTNX10-1 XCM 2</description>
+ <description>PHY INFRASTRUCTURE ACCESS INFINERA SRF0000001 | ZAG01-DTNX10-1 XCM 2</description>
<unit>
<name>0</name>
<family>
@@ -1832,17 +1880,17 @@
</interface>
<interface>
<name>ge-0/3/2</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/3/3</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/3/4</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
@@ -1886,25 +1934,25 @@
</interface>
<interface>
<name>ge-0/3/6</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/3/7</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/3/8</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>ge-0/3/9</name>
- <description>PHY INFRASTRUCTURE HYPERVISOR DRAC LOM | C1N1 iDRAC CONTACT: allen.kong@geant.org IMPLEMENTED: 20161027</description>
+ <description>PHY INFRASTRUCTURE ACCESS HYPERVISOR SRF0000001 | C1N1 iDRAC CONTACT: allen.kong@geant.org IMPLEMENTED: 20161027</description>
<unit>
<name>0</name>
- <description>SRV_GLOBAL INFRASTRUCTURE | C1N1 iDRAC CONTACT: allen.kong@geant.org IMPLEMENTED: 20161027</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS SRF0000001 | C1N1 iDRAC CONTACT: allen.kong@geant.org IMPLEMENTED: 20161027</description>
<family>
<inet>
<filter>
@@ -1931,7 +1979,7 @@
</interface>
<interface>
<name>xe-1/0/1</name>
- <description>PHY INFRASTRUCTURE BACKBONE P_ae4 |</description>
+ <description>PHY INFRASTRUCTURE BACKBONE P_AE4 SRF0000001 |</description>
<framing>
<wan-phy/>
</framing>
@@ -1943,12 +1991,12 @@
</interface>
<interface>
<name>xe-1/1/0</name>
- <description>PHY SPARE NON-OPERATIONAL</description>
+ <description>PHY SPARE</description>
<disable/>
</interface>
<interface>
<name>xe-1/1/1</name>
- <description>PHY INFRASTRUCTURE BACKBONE P_ae2 |</description>
+ <description>PHY INFRASTRUCTURE BACKBONE P_AE2 SRF0000001 |</description>
<framing>
<wan-phy/>
</framing>
@@ -1984,7 +2032,7 @@
</interface>
<interface>
<name>ae2</name>
- <description>LAG INFRASTRUCTURE BACKBONE | vie-zag</description>
+ <description>LAG INFRASTRUCTURE BACKBONE SRF0000001 | vie-zag</description>
<mtu>9192</mtu>
<aggregated-ether-options>
<load-balance>
@@ -1998,7 +2046,7 @@
</aggregated-ether-options>
<unit>
<name>0</name>
- <description>SRV_GLOBAL INFRASTRUCTURE BACKBONE | vie-zag</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE BACKBONE SRF0000001 | vie-zag</description>
<family>
<inet>
<accounting>
@@ -2042,7 +2090,7 @@
</interface>
<interface>
<name>ae4</name>
- <description>LAG INFRASTRUCTURE BACKBONE | bud-zag</description>
+ <description>LAG INFRASTRUCTURE BACKBONE SRF0000001 | bud-zag</description>
<mtu>9192</mtu>
<aggregated-ether-options>
<load-balance>
@@ -2056,7 +2104,7 @@
</aggregated-ether-options>
<unit>
<name>0</name>
- <description>SRV_GLOBAL INFRASTRUCTURE BACKBONE | bud-zag</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE BACKBONE SRF0000001 | bud-zag</description>
<family>
<inet>
<accounting>
@@ -2100,11 +2148,11 @@
</interface>
<interface>
<name>ae10</name>
- <description>LAG INFRASTRUCTURE LAN | zag hr POP LAN</description>
+ <description>LAG INFRASTRUCTURE ACCESS LAN SRF0000001 | zag hr POP LAN</description>
<vlan-tagging/>
<unit>
<name>2</name>
- <description>SRV_GLOBAL INFRASTRUCTURE VLAN2 | OPNET/SteelCentral </description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS SRF0000001 | OPNET/SteelCentral </description>
<vlan-id>2</vlan-id>
<family>
<inet>
@@ -2140,7 +2188,7 @@
</unit>
<unit inactive="inactive">
<name>120</name>
- <description>SRV_GLOBAL INFRASTRUCTURE VLAN120 | Dashboard-backend VM</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS SRF0000001 | Dashboard-backend VM</description>
<vlan-id>120</vlan-id>
<family inactive="inactive">
<inet>
@@ -2173,7 +2221,7 @@
</unit>
<unit inactive="inactive">
<name>121</name>
- <description>SRV_GLOBAL INFRASTRUCTURE VLAN121 | Corr Servers VM</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS SRF0000001 | Corr Servers VM</description>
<vlan-id>121</vlan-id>
<family inactive="inactive">
<inet>
@@ -2206,7 +2254,7 @@
</unit>
<unit inactive="inactive">
<name>122</name>
- <description>SRV_GLOBAL INFRASTRUCTURE VLAN122 | Enterprise Servers VM</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS SRF0000001 | Enterprise Servers VM</description>
<vlan-id>122</vlan-id>
<family inactive="inactive">
<inet>
@@ -2239,7 +2287,7 @@
</unit>
<unit inactive="inactive">
<name>123</name>
- <description>SRV_GLOBAL INFRASTRUCTURE VLAN123 | Trap Servers VM</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS SRF0000001 | Trap Servers VM</description>
<vlan-id>123</vlan-id>
<family inactive="inactive">
<inet>
@@ -2272,7 +2320,7 @@
</unit>
<unit>
<name>190</name>
- <description>SRV_GLOBAL INFRASTRUCTURE VLAN190 | OPS VM</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS SRF0000001 | OPS VM</description>
<vlan-id>190</vlan-id>
<family>
<inet>
@@ -2311,7 +2359,7 @@
</aggregated-ether-options>
<unit>
<name>36</name>
- <description>SRV_GLOBAL CUSTOMER CARNET AP_B SRF9926181 | ASN2108 |</description>
+ <description>SRV_GLOBAL CUSTOMER CARNET AP2 SRF9926181 | ASN2108 |</description>
<vlan-id>36</vlan-id>
<family>
<inet>
@@ -2356,7 +2404,7 @@
</unit>
<unit>
<name>37</name>
- <description>SRV_MDVPN CUSTOMER CARNET AP_B SRF9927503 | MD VPN CoC - NREN</description>
+ <description>SRV_MDVPN CUSTOMER CARNET AP2 SRF9927503 | MD VPN CoC - NREN</description>
<vlan-id>37</vlan-id>
<family>
<inet>
@@ -2432,7 +2480,7 @@
<name>irb</name>
<unit>
<name>999</name>
- <description>SRV_GLOBAL INFRASTRUCTURE INFINERA |</description>
+ <description>SRV_GLOBAL INFRASTRUCTURE ACCESS INFINERA SRF0000001 |</description>
<family>
<inet>
<address>
@@ -2679,6 +2727,9 @@
<clients>
<name>83.97.93.196/32</name>
</clients>
+ <clients>
+ <name>83.97.93.238/32</name>
+ </clients>
</community>
<community>
<name>As4n0gN!</name>
@@ -3157,13 +3208,13 @@
<import-rib>IAS.inet6.0</import-rib>
<import-policy>rtbh-policy</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias</name>
<import-rib>IAS.inet.0</import-rib>
<import-rib>CLEAN_IAS.inet.0</import-rib>
<import-policy>ps-into-clean-ias-import</import-policy>
</rib-groups>
- <rib-groups>
+ <rib-groups inactive="inactive">
<name>ias-to-clean-ias-v6</name>
<import-rib>IAS.inet6.0</import-rib>
<import-rib>CLEAN_IAS.inet6.0</import-rib>
@@ -6453,16 +6504,13 @@
</prefix-list>
<prefix-list>
<name>geantncc-address-space</name>
- <comment>/* NCC DR VPN LAN */</comment>
+ <comment>/* NCC DR VPN */</comment>
<prefix-list-item>
- <name>62.40.108.192/26</name>
+ <name>62.40.108.192/27</name>
</prefix-list-item>
<prefix-list-item>
<name>62.40.119.0/24</name>
</prefix-list-item>
- <prefix-list-item>
- <name>62.40.119.134/32</name>
- </prefix-list-item>
<prefix-list-item>
<name>62.40.125.250/32</name>
</prefix-list-item>
@@ -7611,6 +7659,14 @@
</prefix-list>
<prefix-list>
<name>corporate-address-space</name>
+ <comment>/* LON2 CORP VPN (MAC) */</comment>
+ <prefix-list-item>
+ <name>62.40.99.194/32</name>
+ </prefix-list-item>
+ <comment>/* LON2 CORP VPN */</comment>
+ <prefix-list-item>
+ <name>62.40.99.201/32</name>
+ </prefix-list-item>
<prefix-list-item>
<name>62.40.119.128/25</name>
</prefix-list-item>
@@ -7708,6 +7764,18 @@
<name>2001:798::/32</name>
</prefix-list-item>
</prefix-list>
+ <prefix-list>
+ <name>opennsa-servers</name>
+ <prefix-list-item>
+ <name>83.97.93.92/32</name>
+ </prefix-list-item>
+ </prefix-list>
+ <prefix-list>
+ <name>opennsa-servers-v6</name>
+ <prefix-list-item>
+ <name>2001:798:3::15f/128</name>
+ </prefix-list-item>
+ </prefix-list>
<policy-statement>
<name>ASM-Allow</name>
<term>
@@ -8242,6 +8310,10 @@
<address>185.1.68.0/24</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>193.188.137.0/24</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -8363,6 +8435,10 @@
<address>2001:7f8:a0::/64</address>
<orlonger/>
</route-filter>
+ <route-filter>
+ <address>2001:7f8:35::/64</address>
+ <orlonger/>
+ </route-filter>
</from>
<then>
<reject/>
@@ -10786,13 +10862,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -10808,14 +10877,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp>
<name>backbone-classifier</name>
@@ -10827,18 +10888,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -10846,195 +10895,16 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>iperf-classifier</name>
- <import>default</import>
<forwarding-class>
<name>expedited-forwarding</name>
<loss-priority>
<name>low</name>
- <code-points>af12</code-points>
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>backbone-classifier</name>
@@ -11046,18 +10916,6 @@
<code-points>af11</code-points>
<code-points>af12</code-points>
<code-points>af13</code-points>
- <code-points>nc1</code-points>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-points>cs4</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -11065,13 +10923,7 @@
<loss-priority>
<name>low</name>
<code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
+ <code-points>nc1</code-points>
</loss-priority>
</forwarding-class>
<forwarding-class>
@@ -11094,13 +10946,6 @@
<code-points>af13</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -11116,187 +10961,6 @@
<code-points>ef</code-points>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>high</name>
- <code-points>ix</code-points>
- <code-points>dws</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>iperf-classifier</name>
- <import>default</import>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-points>af12</code-points>
- <code-points>ef</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-points>cs1</code-points>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>high</name>
- <code-points>nc1</code-points>
- <code-points>nc2</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dws-access-classifier</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix-access-classifier</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-points>000000</code-points>
- <code-points>000001</code-points>
- <code-points>000010</code-points>
- <code-points>000011</code-points>
- <code-points>000100</code-points>
- <code-points>000101</code-points>
- <code-points>000110</code-points>
- <code-points>000111</code-points>
- <code-points>001000</code-points>
- <code-points>001001</code-points>
- <code-points>001010</code-points>
- <code-points>001011</code-points>
- <code-points>001100</code-points>
- <code-points>001101</code-points>
- <code-points>001110</code-points>
- <code-points>001111</code-points>
- <code-points>010000</code-points>
- <code-points>010001</code-points>
- <code-points>010010</code-points>
- <code-points>010011</code-points>
- <code-points>010100</code-points>
- <code-points>010101</code-points>
- <code-points>010110</code-points>
- <code-points>010111</code-points>
- <code-points>011000</code-points>
- <code-points>011001</code-points>
- <code-points>011010</code-points>
- <code-points>011011</code-points>
- <code-points>011100</code-points>
- <code-points>011101</code-points>
- <code-points>011110</code-points>
- <code-points>011111</code-points>
- <code-points>100000</code-points>
- <code-points>100001</code-points>
- <code-points>100010</code-points>
- <code-points>100011</code-points>
- <code-points>100100</code-points>
- <code-points>100101</code-points>
- <code-points>100110</code-points>
- <code-points>100111</code-points>
- <code-points>101000</code-points>
- <code-points>101001</code-points>
- <code-points>101010</code-points>
- <code-points>101011</code-points>
- <code-points>101100</code-points>
- <code-points>101101</code-points>
- <code-points>101110</code-points>
- <code-points>101111</code-points>
- <code-points>110000</code-points>
- <code-points>110001</code-points>
- <code-points>110010</code-points>
- <code-points>110011</code-points>
- <code-points>110100</code-points>
- <code-points>110101</code-points>
- <code-points>110110</code-points>
- <code-points>110111</code-points>
- <code-points>111000</code-points>
- <code-points>111001</code-points>
- <code-points>111010</code-points>
- <code-points>111011</code-points>
- <code-points>111100</code-points>
- <code-points>111101</code-points>
- <code-points>111110</code-points>
- <code-points>111111</code-points>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-access-classifier</name>
@@ -11305,16 +10969,16 @@
<name>be</name>
<loss-priority>
<name>low</name>
- <code-points>000</code-points>
- <code-points>001</code-points>
- <code-points>010</code-points>
- <code-points>011</code-points>
- <code-points>110</code-points>
- <code-points>111</code-points>
+ <code-points>100</code-points>
+ <code-points>101</code-points>
</loss-priority>
</forwarding-class>
+ </exp>
+ <exp>
+ <name>mpls-backbone-classifier</name>
+ <import>default</import>
<forwarding-class>
- <name>less-than-best-effort</name>
+ <name>be</name>
<loss-priority>
<name>low</name>
<code-points>100</code-points>
@@ -11322,40 +10986,7 @@
</loss-priority>
</forwarding-class>
</exp>
- <exp>
- <name>mpls-backbone-classifier</name>
- <import>default</import>
- </exp>
</classifiers>
- <code-point-aliases>
- <dscp>
- <name>ix</name>
- <bits>101001</bits>
- </dscp>
- <dscp>
- <name>dws</name>
- <bits>100000</bits>
- </dscp>
- <dscp-ipv6>
- <name>dws</name>
- <bits>100000</bits>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>ix</name>
- <bits>101001</bits>
- </dscp-ipv6>
- </code-point-aliases>
- <drop-profiles>
- <name>dws-drop-profile</name>
- <fill-level>
- <name>35</name>
- <drop-probability>10</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<drop-profiles>
<name>be-drop-profile</name>
<fill-level>
@@ -11375,74 +11006,44 @@
<drop-probability>100</drop-probability>
</fill-level>
</drop-profiles>
- <drop-profiles>
- <name>less-than-be-drop-profile</name>
- <fill-level>
- <name>25</name>
- <drop-probability>30</drop-probability>
- </fill-level>
- <fill-level>
- <name>30</name>
- <drop-probability>50</drop-probability>
- </fill-level>
- <fill-level>
- <name>40</name>
- <drop-probability>70</drop-probability>
- </fill-level>
- <fill-level>
- <name>50</name>
- <drop-probability>100</drop-probability>
- </fill-level>
- </drop-profiles>
<forwarding-classes>
<class>
<name>be</name>
<queue-num>0</queue-num>
</class>
- <class>
- <name>be-ix</name>
- <queue-num>0</queue-num>
- </class>
<class>
<name>expedited-forwarding</name>
<queue-num>1</queue-num>
</class>
- <class>
- <name>less-than-best-effort</name>
- <queue-num>2</queue-num>
- </class>
<class>
<name>network-control</name>
<queue-num>3</queue-num>
</class>
- <class>
- <name>be-dws</name>
- <queue-num>0</queue-num>
- </class>
- <class>
- <name>be-bleach</name>
- <queue-num>0</queue-num>
- </class>
</forwarding-classes>
<interfaces>
- <interface inactive="inactive">
- <name>ge-0/3/5</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
- <unit>
- <name>0</name>
- <classifiers>
- <dscp>
- <name>ix-access-classifier</name>
- </dscp>
- <dscp-ipv6>
- <name>ix-access-classifier</name>
- </dscp-ipv6>
- </classifiers>
- </unit>
+ <interface>
+ <name>et-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>ge-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>so-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>xe-*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
+ </interface>
+ <interface>
+ <name>ae*</name>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
</interface>
<interface>
<name>ae2</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -11460,17 +11061,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -11480,7 +11073,7 @@
</interface>
<interface>
<name>ae4</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>0</name>
<classifiers>
@@ -11498,17 +11091,9 @@
<dscp>
<name>basic-rewrite-rules</name>
</dscp>
- <dscp inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
</dscp-ipv6>
- <dscp-ipv6 inactive="inactive">
- <name>dscp-mpls-rewrite-rules</name>
- <protocol>mpls</protocol>
- </dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
<protocol>mpls-any</protocol>
@@ -11518,7 +11103,7 @@
</interface>
<interface>
<name>ae11</name>
- <scheduler-map>MAP-BASIC-IQ2</scheduler-map>
+ <scheduler-map>GEANT-BASIC</scheduler-map>
<unit>
<name>36</name>
<classifiers>
@@ -11551,13 +11136,6 @@
<rewrite-rules>
<dscp>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -11572,17 +11150,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -11594,157 +11161,9 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp>
- <dscp>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp>
<dscp-ipv6>
<name>basic-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be</name>
- <loss-priority>
- <name>high</name>
- <code-point>cs4</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>expedited-forwarding</name>
- <loss-priority>
- <name>low</name>
- <code-point>ef</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>network-control</name>
- <loss-priority>
- <name>low</name>
- <code-point>nc2</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>nc1</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
- </dscp-ipv6>
- <dscp-ipv6>
- <name>dscp-mpls-rewrite-rules</name>
- <forwarding-class>
- <name>be-dws</name>
- <loss-priority>
- <name>high</name>
- <code-point>dws</code-point>
- </loss-priority>
- </forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <loss-priority>
- <name>high</name>
- <code-point>ix</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>be</name>
<loss-priority>
@@ -11759,17 +11178,6 @@
<code-point>ef</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <loss-priority>
- <name>low</name>
- <code-point>cs1</code-point>
- </loss-priority>
- <loss-priority>
- <name>high</name>
- <code-point>be</code-point>
- </loss-priority>
- </forwarding-class>
<forwarding-class>
<name>network-control</name>
<loss-priority>
@@ -11781,13 +11189,6 @@
<code-point>nc1</code-point>
</loss-priority>
</forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <loss-priority>
- <name>low</name>
- <code-point>000000</code-point>
- </loss-priority>
- </forwarding-class>
</dscp-ipv6>
<exp>
<name>mpls-rewrite-rules</name>
@@ -11795,35 +11196,19 @@
</exp>
</rewrite-rules>
<scheduler-maps>
- <name>MAP-BASIC-IQ2</name>
- <forwarding-class>
- <name>be-dws</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>be-bleach</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
+ <name>GEANT-BASIC</name>
<forwarding-class>
<name>expedited-forwarding</name>
<scheduler>sch-expedited-forwarding</scheduler>
</forwarding-class>
<forwarding-class>
<name>network-control</name>
- <scheduler>sch-network-ctrl-iq2</scheduler>
+ <scheduler>sch-network-ctrl-geant</scheduler>
</forwarding-class>
<forwarding-class>
<name>be</name>
<scheduler>sch-be</scheduler>
</forwarding-class>
- <forwarding-class>
- <name>be-ix</name>
- <scheduler>sch-be</scheduler>
- </forwarding-class>
- <forwarding-class>
- <name>less-than-best-effort</name>
- <scheduler>sch-less-than-best-effort</scheduler>
- </forwarding-class>
</scheduler-maps>
<schedulers>
<name>sch-be</name>
@@ -11843,27 +11228,7 @@
<priority>strict-high</priority>
</schedulers>
<schedulers>
- <name>sch-less-than-best-effort</name>
- <transmit-rate>
- <percent>10</percent>
- </transmit-rate>
- <buffer-size>
- <percent>10</percent>
- </buffer-size>
- <priority>low</priority>
- <drop-profile-map>
- <loss-priority>low</loss-priority>
- <protocol>any</protocol>
- <drop-profile>less-than-be-drop-profile</drop-profile>
- </drop-profile-map>
- <drop-profile-map>
- <loss-priority>high</loss-priority>
- <protocol>any</protocol>
- <drop-profile>be-drop-profile</drop-profile>
- </drop-profile-map>
- </schedulers>
- <schedulers>
- <name>sch-network-ctrl</name>
+ <name>sch-network-ctrl-geant</name>
<transmit-rate>
<percent>5</percent>
</transmit-rate>
@@ -11872,15 +11237,6 @@
</buffer-size>
<priority>high</priority>
</schedulers>
- <schedulers>
- <name>sch-network-ctrl-iq2</name>
- <transmit-rate>
- <percent>5</percent>
- </transmit-rate>
- <buffer-size>
- <percent>5</percent>
- </buffer-size>
- </schedulers>
</class-of-service>
<firewall>
<family>
@@ -15808,6 +15164,9 @@
<source-prefix-list>
<name>dashboard-servers</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers</name>
+ </source-prefix-list>
<protocol>tcp</protocol>
<destination-port>ssh</destination-port>
</from>
@@ -18063,6 +17422,9 @@
<source-prefix-list>
<name>dashboard-servers-v6</name>
</source-prefix-list>
+ <source-prefix-list>
+ <name>opennsa-servers-v6</name>
+ </source-prefix-list>
<next-header>tcp</next-header>
<port>ssh</port>
</from>
@@ -18589,7 +17951,7 @@
</policer>
</firewall>
<routing-instances>
- <instance>
+ <instance inactive="inactive">
<name>CLEAN_IAS</name>
<description>Clean IAS VRF traffic returned from scrubber</description>
<instance-type>vrf</instance-type>
@@ -19174,17 +18536,17 @@
<type>external</type>
<neighbor>
<name>62.40.102.23</name>
- <description>MD VPN CoC - NREN</description>
+ <description>MD VPN CoC - CARNET</description>
<out-delay>10</out-delay>
<family>
<inet>
<labeled-unicast>
<prefix-limit>
- <maximum>10</maximum>
+ <maximum>1000</maximum>
<teardown>
- <limit-threshold>80</limit-threshold>
+ <limit-threshold>90</limit-threshold>
<idle-timeout>
- <timeout>30</timeout>
+ <timeout>15</timeout>
</idle-timeout>
</teardown>
</prefix-limit>