From 606809eff0474066fc291fc7ac16072f3c7b6db1 Mon Sep 17 00:00:00 2001
From: Robert Latta <robert.latta@geant.org>
Date: Wed, 26 Mar 2025 15:08:43 +0000
Subject: [PATCH] updated snmp info with full oid and updated tests. RE
 DBOARD3-1152

---
 inventory_provider/nokia.py                   |   148 +-
 inventory_provider/routes/classifier.py       |     2 +
 inventory_provider/snmp.py                    |    10 +
 inventory_provider/tasks/worker.py            |    80 +-
 .../nokia/rt0.lon2.uk.geant.net-netconf.xml   | 10625 +++++++++++++++-
 test/per_router/test_snmp_handling.py         |     1 +
 test/test_nokia.py                            |    97 +-
 7 files changed, 10373 insertions(+), 590 deletions(-)

diff --git a/inventory_provider/nokia.py b/inventory_provider/nokia.py
index 564c28ab..b9b5371b 100644
--- a/inventory_provider/nokia.py
+++ b/inventory_provider/nokia.py
@@ -1,5 +1,4 @@
 import ipaddress
-import itertools
 import logging
 import re
 from functools import lru_cache
@@ -7,6 +6,7 @@ from functools import lru_cache
 from lxml import etree
 from ncclient import manager, xml_
 
+from inventory_provider import snmp
 from inventory_provider.tasks.common import asn_to_int
 
 logger = logging.getLogger(__name__)
@@ -191,71 +191,115 @@ def load_docs(hostname, ssh_params):
     return remove_xml_namespaces(running), remove_xml_namespaces(state)
 
 
-def get_ports_state(state_doc):
-    def _port_info(e):
-        pi = {
-            'port-id': e.find('port-id').text,
-            'oper-state': e.find('oper-state').text,
-            'port-state': e.find('port-state').text,
-            'type': e.find('type').text,
-            'if-index': e.find('if-index').text,
-        }
-        down_reason = e.find('down-reason')
-        if down_reason is not None:
-            pi['down-reason'] = down_reason.text
-        return pi
+def get_port_interfaces_snmp_info(state_doc, communities):
     for port in state_doc.xpath('./state/port'):
-        yield _port_info(port)
+        details = {
+            'port-id': port.find('port-id').text,
+            'if-index': port.find('if-index').text,
+        }
+        yield _default_snmp_interface_info(details, 'port-id', communities)
 
 
-def get_lags_state(state_doc):
-    def _lag_info(e):
-        _name = e.find('lag-name').text
-        _state = e.find('oper-state').text
-        _if_index = e.find('if-index').text
-        _number_port_up = e.find('number-port-up').text
-        ports = [p.find('port-id').text for p in e.findall('port')]
-        return {
-            'name': _name,
-            'oper-state': _state,
-            'if-index': _if_index,
-            'number-port-up': _number_port_up,
-            'ports': ports,
-        }
+def get_lag_interfaces_snmp_info(state_doc, communities):
     for lag in state_doc.findall('./state/lag'):
-        yield _lag_info(lag)
+        details = {
+            'lag-name': lag.find('lag-name').text,
+            'if-index': lag.find('if-index').text,
+        }
+        yield _default_snmp_interface_info(details, 'lag-name', communities)
 
 
-def get_interfaces_state(state_doc):
-    for interface_ in itertools.chain(
-        state_doc.findall("./state/router/interface"),
-        state_doc.findall("./state/service/ies/interface"),
-        state_doc.findall("./state/service/vprn/interface"),
-    ):
+def get_router_interfaces_snmp_info(state_doc, communities):
+    interfaces = state_doc.findall('./state/router/interface')
+    for interface_ in interfaces:
         details = {
-            "interface-name": interface_.find('interface-name').text,
-            "if-index": int(interface_.find('if-index').text),
-            "oper-state": interface_.find('oper-state').text,
+            'interface-name': interface_.find('interface-name').text,
+            'if-index': int(interface_.find('if-index').text),
         }
-        ipv4 = interface_.find('ipv4')
-        if ipv4 is not None:
-            details['ipv4-state'] = ipv4.find('oper-state').text
-        ipv6 = interface_.find('ipv6')
-        if ipv6 is not None:
-            details['ipv6-state'] = ipv6.find('oper-state').text
-        yield details
+
+        yield _default_snmp_interface_info(details, 'interface-name', communities)
+
+
+def _default_snmp_interface_info(interface_, name_field, communities):
+    index = int(interface_['if-index'])
+    return {
+        'name': interface_[name_field],
+        'index': index,
+        'oid': f'{snmp.IF_OPER_STATUS}.{index}',
+        'communities': communities
+    }
+
+
+def get_vprn_services_snmp_info(netconf_doc, state_doc, communities):
+    service_elements = netconf_doc.findall('./configure/service/vprn')
+    interface_state_elements = state_doc.findall('./state/service/vprn/interface')
+    return get_services_snmp_info(service_elements, interface_state_elements, communities)
+
+
+def get_ies_services_snmp_info(netconf_doc, state_doc, communities):
+    service_elements = netconf_doc.findall('./configure/service/ies')
+    interface_state_elements = state_doc.findall('./state/service/ies/interface')
+    return get_services_snmp_info(service_elements, interface_state_elements, communities)
+
+
+def get_services_snmp_info(service_elements, interface_state_elements, communities):
+
+    # get the ies interface to service id mappings
+    interface_service_id_mappings = dict(get_interfaces_service_id_mapping(service_elements))
+
+    # get the ies interface to index mappings
+    interface_index_mappings = dict(get_interfaces_index_mapping(interface_state_elements))
+
+    interfaces_info = get_service_interfaces_info(interface_service_id_mappings, interface_index_mappings)
+
+    for interface_info in interfaces_info:
+        yield {
+            'name': interface_info['interface-name'],
+            'index': interface_info['if-index'],
+            'oid': f'{snmp.NOKIA_IES_IF_OPER_STATUS}.{interface_info["service-id"]}.{interface_info["if-index"]}',
+            'communities': communities
+        }
+
+
+def get_interfaces_service_id_mapping(service_elements):
+    for element in service_elements:
+        service_id = element.find('service-id').text
+        for interface in element.findall('interface'):
+            interface_name = interface.find('interface-name').text
+            yield interface_name, service_id
+
+
+def get_interfaces_index_mapping(interface_state_elements):
+    for interface in interface_state_elements:
+        interface_name = interface.find('interface-name').text
+        if_index = interface.find('if-index').text
+        yield interface_name, if_index
+
+
+def get_service_interfaces_info(interface_service_id_mappings, interface_index_mappings):
+    for interface_name in interface_service_id_mappings:
+        if_index = interface_index_mappings.get(interface_name)
+        service_id = interface_service_id_mappings.get(interface_name)
+        if if_index is not None and service_id is not None:
+            yield {
+                'interface-name': interface_name,
+                'service-id': service_id,
+                'if-index': if_index
+            }
 
 
-def get_epipes_state(state_doc):
-    for epipe in state_doc.findall('./state/service/epipe'):
+def get_epipe_services_snmp_info(netconf_doc, communities):
+    service_info = get_epipe_services_details(netconf_doc)
+    for service in service_info:
         yield {
-            "name": epipe.find('sap/sap-id').text,
-            "oper-state": epipe.find('oper-state').text,
-            "if-index": -1
+            'name': service['sap-id'],
+            'index': -1,
+            'oid': f'{snmp.NOKIA_SVC_OPER_STATUS}.{service["service-id"]}',
+            'communities': communities
         }
 
 
-def get_epipe_sap_details(netconf_config):
+def get_epipe_services_details(netconf_config):
     for epipe in netconf_config.xpath('configure/service/epipe'):
         service_id = epipe.find('service-id')
         if service_id is None:
diff --git a/inventory_provider/routes/classifier.py b/inventory_provider/routes/classifier.py
index 47c4e888..8c136897 100644
--- a/inventory_provider/routes/classifier.py
+++ b/inventory_provider/routes/classifier.py
@@ -287,6 +287,8 @@ def _link_interface_info(r, hostname, interface):
         ifc_info['snmp'] = {
             'index': int(snmp_info['index'])
         }
+        if 'oid' in snmp_info:
+            ifc_info['snmp']['oid'] = snmp_info['oid']
         if 'communities' in snmp_info:
             ifc_info['snmp']['community'] = snmp_info['communities']['dashboard']
         else:
diff --git a/inventory_provider/snmp.py b/inventory_provider/snmp.py
index 2bbbf1d4..a5058765 100644
--- a/inventory_provider/snmp.py
+++ b/inventory_provider/snmp.py
@@ -11,6 +11,9 @@ from pysnmp.error import PySnmpError
 # from pysnmp.smi import view, rfc1902
 
 
+# IF-MIB::ifOperStatus
+IF_OPER_STATUS = '1.3.6.1.2.1.2.2.1.8'
+
 RFC1213_MIB_IFDESC = '1.3.6.1.2.1.2.2.1.2'
 # BGP4-V2-MIB-JUNIPER::jnxBgpM2PeerState
 JNX_BGP_M2_PEER_STATE = '1.3.6.1.4.1.2636.5.1.1.2.1.1.1.2'
@@ -18,6 +21,12 @@ JNX_BGP_M2_PEER_STATE = '1.3.6.1.4.1.2636.5.1.1.2.1.1.1.2'
 # tBgpPeerNgOperLastState
 NOKIA_BGP_PEER_STATE = '1.3.6.1.4.1.6527.3.1.2.14.4.8.1.11'
 
+# TIMETRA-SERV-MIB::svcOperStatus
+NOKIA_SVC_OPER_STATUS = '1.3.6.1.4.1.6527.3.1.2.4.2.2.1.9'
+
+# TIMETRA-SERV-MIB::iesIfOperStatus
+NOKIA_IES_IF_OPER_STATUS = '1.3.6.1.4.1.6527.3.1.2.4.2.5.1.6'
+
 
 # In th oids certain values are used to indicate the IP version
 # This is consistent for Juniper and Nokia (possibly industry standard/convention)
@@ -153,6 +162,7 @@ def _get_router_snmp_indexes(hostname, community):
         yield {
             'name': ifc['value'],
             'index': int(m.group(1)),
+            'oid': ifc['oid'],
             'community': community
         }
 
diff --git a/inventory_provider/tasks/worker.py b/inventory_provider/tasks/worker.py
index 90a1cb86..3d88bf00 100644
--- a/inventory_provider/tasks/worker.py
+++ b/inventory_provider/tasks/worker.py
@@ -610,33 +610,30 @@ def _reload_router_config_nokia(
         hostname, lab=False,
         info_callback=lambda s: None,
         warning_callback=lambda s: None):
+
     info_callback(
         f'loading netconf data for {"lab " if lab else ""} {hostname}')
+
+    communities = _nokia_community_strings(InventoryTask.config)
     netconf_doc, state_doc = retrieve_and_persist_config_nokia(
         hostname, lab, warning_callback)
     if netconf_doc is None or state_doc is None:
         return
-    r = get_next_redis(InventoryTask.config)
-    refresh_nokia_interface_list(hostname, netconf_doc, r, lab)
-    refresh_epipe_to_sap_mappings(hostname, netconf_doc, r)
-    communities = _nokia_community_strings(InventoryTask.config)
-    snmp_refresh_interfaces_nokia(hostname, state_doc, communities, r, info_callback)
-    refresh_nokia_bgp_peers(hostname, netconf_doc)
+
+    redis = get_next_redis(InventoryTask.config)
+
+    refresh_nokia_interface_list(hostname, netconf_doc, redis, lab)
+    snmp_refresh_interfaces_nokia(hostname, netconf_doc, state_doc, communities, redis, info_callback)
+    refresh_nokia_bgp_peers(hostname, netconf_doc, redis)
+    refresh_epipe_to_sap_mappings(hostname, netconf_doc, redis)
     snmp_refresh_peerings_nokia(hostname, communities)
 
 
-def refresh_epipe_to_sap_mappings(hostname, netconf, redis):
+def refresh_epipe_to_sap_mappings(hostname, netconf_doc, redis):
     epipe_to_saps_key_base = f'ims:epipe-sapid_mappings:{hostname}'
-
-    # clear cached epipe to sap mappings
-    logger.debug(f'removing cached epipe to sap mappings for {hostname}')
-    rp = redis.pipeline()
-    for k in redis.scan_iter(f'{epipe_to_saps_key_base}:*', count=1000):
-        rp.delete(k)
-    rp.execute()
-    epipe_saps = nokia.get_epipe_sap_details(netconf)
+    epipes = nokia.get_epipe_services_details(netconf_doc)
     rp = redis.pipeline()
-    for details in epipe_saps:
+    for details in epipes:
         key = f'{details["service-id"]}:{details["vpn-id"]}'
         rp.set(
             f'{epipe_to_saps_key_base}:{key}',
@@ -735,41 +732,41 @@ def retrieve_and_persist_config_nokia(
 
 @log_task_entry_and_exit
 def snmp_refresh_interfaces_nokia(
-        hostname, state_doc, communities, redis, update_callback=lambda s: None):
+        hostname, netconf_doc, state_doc, communities, redis, update_callback=lambda s: None):
 
-    def _interface_info(interface_, name_field):
-        return {
-            'name': interface_[name_field],
-            'index': int(interface_['if-index']),
-            'communities': communities
-        }
-
-    interfaces = (
-        _interface_info(ifc, "interface-name")
-        for ifc in nokia.get_interfaces_state(state_doc)
-    )
-
-    ports = (
-        _interface_info(port, "port-id") for port in nokia.get_ports_state(state_doc)
-    )
-    lags = (_interface_info(lag, "name") for lag in nokia.get_lags_state(state_doc))
-    epipes = (_interface_info(epipe, "name") for epipe in nokia.get_epipes_state(state_doc))
-    all_interfaces = list(itertools.chain(interfaces, ports, lags, epipes))
+    interfaces = get_snmp_interfaces_nokia(netconf_doc, state_doc, communities)
 
     rp = redis.pipeline()
-    rp.set(f'snmp-interfaces:{hostname}', json.dumps(all_interfaces))
-
-    for ifc in all_interfaces:
+    rp.set(f'snmp-interfaces:{hostname}', json.dumps(interfaces))
+    for ifc in interfaces:
         ifc['hostname'] = hostname
         rp.set(
             f'snmp-interfaces-single:{hostname}:{ifc["name"]}',
             json.dumps(ifc))
-
     rp.execute()
 
     update_callback(f'snmp interface info loaded from {hostname}')
 
 
+def get_snmp_interfaces_nokia(netconf_doc, state_doc, communities):
+    router_interfaces_snmp_info = nokia.get_router_interfaces_snmp_info(state_doc, communities)
+    port_interfaces_snmp_info = nokia.get_port_interfaces_snmp_info(state_doc, communities)
+    lag_interfaces_snmp_info = nokia.get_lag_interfaces_snmp_info(state_doc, communities)
+    ies_interfaces_snmp_info = nokia.get_ies_services_snmp_info(netconf_doc, state_doc, communities)
+    vprn_interfaces_snmp_info = nokia.get_vprn_services_snmp_info(netconf_doc, state_doc, communities)
+    epipes_snmp_info = nokia.get_epipe_services_snmp_info(netconf_doc, communities)
+
+    all_interfaces = list(
+        itertools.chain(
+            router_interfaces_snmp_info,
+            ies_interfaces_snmp_info,
+            port_interfaces_snmp_info,
+            lag_interfaces_snmp_info,
+            vprn_interfaces_snmp_info,
+            epipes_snmp_info))
+    return all_interfaces
+
+
 def refresh_nokia_interface_list(hostname, netconf_config, redis, lab=False):
     bundles_keybase = f'netconf-interface-bundles:{hostname}'
     interfaces_all_key = f'netconf-interfaces-hosts:{hostname}'
@@ -880,10 +877,9 @@ def refresh_nokia_interface_list(hostname, netconf_config, redis, lab=False):
 
 
 @log_task_entry_and_exit
-def refresh_nokia_bgp_peers(hostname, netconf):
+def refresh_nokia_bgp_peers(hostname, netconf, redis):
     host_peerings = list(nokia.get_all_bgp_peers(netconf))
-    r = get_next_redis(InventoryTask.config)
-    r.set(f'nokia-peerings:hosts:{hostname}', json.dumps(host_peerings))
+    redis.set(f'nokia-peerings:hosts:{hostname}', json.dumps(host_peerings))
 
 
 @app.task(base=InventoryTask, bind=True, name='reload_lab_router_juniper')
diff --git a/test/data/nokia/rt0.lon2.uk.geant.net-netconf.xml b/test/data/nokia/rt0.lon2.uk.geant.net-netconf.xml
index 752ef0ca..9687b56c 100644
--- a/test/data/nokia/rt0.lon2.uk.geant.net-netconf.xml
+++ b/test/data/nokia/rt0.lon2.uk.geant.net-netconf.xml
@@ -10,6 +10,42 @@
                     <mda-type>x2-s36-800g-qsfpdd-12.0t</mda-type>
                     <level>cr9600g</level>
                 </mda>
+                <fp>
+                    <fp-number>1</fp-number>
+                    <ingress>
+                        <policy-accounting>
+                            <policers>1000</policers>
+                            <classes>10000</classes>
+                        </policy-accounting>
+                    </ingress>
+                </fp>
+                <fp>
+                    <fp-number>2</fp-number>
+                    <ingress>
+                        <policy-accounting>
+                            <policers>1000</policers>
+                            <classes>10000</classes>
+                        </policy-accounting>
+                    </ingress>
+                </fp>
+                <fp>
+                    <fp-number>3</fp-number>
+                    <ingress>
+                        <policy-accounting>
+                            <policers>1000</policers>
+                            <classes>10000</classes>
+                        </policy-accounting>
+                    </ingress>
+                </fp>
+                <fp>
+                    <fp-number>4</fp-number>
+                    <ingress>
+                        <policy-accounting>
+                            <policers>1000</policers>
+                            <classes>10000</classes>
+                        </policy-accounting>
+                    </ingress>
+                </fp>
             </card>
             <card>
                 <slot-number>2</slot-number>
@@ -21,7 +57,76 @@
                     <mda-type>x2-s36-800g-qsfpdd-12.0t</mda-type>
                     <level>cr9600g</level>
                 </mda>
+                <fp>
+                    <fp-number>1</fp-number>
+                    <ingress>
+                        <policy-accounting>
+                            <policers>1000</policers>
+                            <classes>10000</classes>
+                        </policy-accounting>
+                    </ingress>
+                </fp>
+                <fp>
+                    <fp-number>2</fp-number>
+                    <ingress>
+                        <policy-accounting>
+                            <policers>1000</policers>
+                            <classes>10000</classes>
+                        </policy-accounting>
+                    </ingress>
+                </fp>
+                <fp>
+                    <fp-number>3</fp-number>
+                    <ingress>
+                        <policy-accounting>
+                            <policers>1000</policers>
+                            <classes>10000</classes>
+                        </policy-accounting>
+                    </ingress>
+                </fp>
+                <fp>
+                    <fp-number>4</fp-number>
+                    <ingress>
+                        <policy-accounting>
+                            <policers>1000</policers>
+                            <classes>10000</classes>
+                        </policy-accounting>
+                    </ingress>
+                </fp>
             </card>
+            <cflowd>
+                <cache-size>1000000</cache-size>
+                <enhanced-distribution>true</enhanced-distribution>
+                <overflow>1</overflow>
+                <template-retransmit>300</template-retransmit>
+                <active-flow-timeout>60</active-flow-timeout>
+                <inactive-flow-timeout>60</inactive-flow-timeout>
+                <sample-profile>
+                    <profile-id>1</profile-id>
+                    <sample-rate>300</sample-rate>
+                </sample-profile>
+                <collector>
+                    <ip-address>62.40.100.166</ip-address>
+                    <port>7711</port>
+                    <description>flowmon1</description>
+                    <template-set>mpls-ip</template-set>
+                    <version>10</version>
+                </collector>
+                <collector>
+                    <ip-address>62.40.106.182</ip-address>
+                    <port>7712</port>
+                    <description>flowmon2</description>
+                    <template-set>mpls-ip</template-set>
+                    <version>10</version>
+                </collector>
+                <collector>
+                    <ip-address>193.177.129.27</ip-address>
+                    <port>20013</port>
+                    <description>Kentik-flow</description>
+                    <template-set>mpls-ip</template-set>
+                    <version>10</version>
+                </collector>
+            </cflowd>
             <chassis>
                 <chassis-class>router</chassis-class>
                 <chassis-number>1</chassis-number>
@@ -82,7 +187,25 @@
                 </power-shelf>
             </chassis>
             <filter>
+                <log>
+                    <log-id>102</log-id>
+                    <description>CPM_FW_DROP</description>
+                    <destination>
+                        <syslog>
+                            <name>1</name>
+                        </syslog>
+                    </destination>
+                </log>
                 <match-list>
+                    <protocol-list>
+                        <protocol-list-name>IP_EDGE_IN-TUNNELS-PROTO</protocol-list-name>
+                        <protocol>
+                            <protocol-id>94</protocol-id>
+                        </protocol>
+                        <protocol>
+                            <protocol-id>gre</protocol-id>
+                        </protocol>
+                    </protocol-list>
                     <ip-prefix-list>
                         <prefix-list-name>BGP_PEERS_BASE</prefix-list-name>
                         <description>BGP Peers configured under Base instance</description>
@@ -93,8 +216,62 @@
                                 <neighbor>.*</neighbor>
                                 <router-instance>Base</router-instance>
                             </bgp-peers>
+                            <bgp-peers>
+                                <criterion-index>2</criterion-index>
+                                <group>.*</group>
+                                <neighbor>.*</neighbor>
+                                <router-instance>IAS</router-instance>
+                            </bgp-peers>
+                            <bgp-peers>
+                                <criterion-index>3</criterion-index>
+                                <group>.*</group>
+                                <neighbor>.*</neighbor>
+                                <router-instance>LHCONE_L3VPN</router-instance>
+                            </bgp-peers>
                         </apply-path>
                     </ip-prefix-list>
+                    <ip-prefix-list>
+                        <prefix-list-name>BOGONS_LIST</prefix-list-name>
+                        <prefix>
+                            <ip-prefix>0.0.0.0/8</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>10.0.0.0/8</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>100.64.0.0/10</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>127.0.0.0/8</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>169.254.0.0/16</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>172.16.0.0/12</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>192.0.0.0/24</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>192.0.2.0/24</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>192.168.0.0/16</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>198.18.0.0/15</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>198.51.100.0/24</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>203.0.113.0/24</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>224.0.0.0/3</ip-prefix>
+                        </prefix>
+                    </ip-prefix-list>
                     <ip-prefix-list>
                         <prefix-list-name>COMMUNITY_NTP</prefix-list-name>
                         <description>Community hosted NTPs</description>
@@ -114,6 +291,18 @@
                             <ip-prefix>195.113.144.201/32</ip-prefix>
                         </prefix>
                     </ip-prefix-list>
+                    <ip-prefix-list>
+                        <prefix-list-name>EXTERNAL_GRE</prefix-list-name>
+                        <prefix>
+                            <ip-prefix>0.0.0.0/32</ip-prefix>
+                        </prefix>
+                    </ip-prefix-list>
+                    <ip-prefix-list>
+                        <prefix-list-name>EXTERNAL_IGMP</prefix-list-name>
+                        <prefix>
+                            <ip-prefix>0.0.0.0/32</ip-prefix>
+                        </prefix>
+                    </ip-prefix-list>
                     <ip-prefix-list>
                         <prefix-list-name>GEANT_ADDRESS_SPACE</prefix-list-name>
                         <description>GEANT address space for traceroute and rsvp in CPM filters</description>
@@ -152,6 +341,15 @@
                             <ip-prefix>83.97.95.12/32</ip-prefix>
                         </prefix>
                     </ip-prefix-list>
+                    <ip-prefix-list>
+                        <prefix-list-name>GEANT_CORE</prefix-list-name>
+                        <prefix>
+                            <ip-prefix>62.40.96.0/23</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.98.0/24</ip-prefix>
+                        </prefix>
+                    </ip-prefix-list>
                     <ip-prefix-list>
                         <prefix-list-name>GEANT_DASHBOARD</prefix-list-name>
                         <description>Geant dashboard hosts</description>
@@ -238,6 +436,12 @@
                             <ip-prefix>83.97.94.130/32</ip-prefix>
                         </prefix>
                     </ip-prefix-list>
+                    <ip-prefix-list>
+                        <prefix-list-name>GEANT_DC_VRRP</prefix-list-name>
+                        <prefix>
+                            <ip-prefix>224.0.0.18/32</ip-prefix>
+                        </prefix>
+                    </ip-prefix-list>
                     <ip-prefix-list>
                         <prefix-list-name>GEANT_DNS</prefix-list-name>
                         <description>GEANT DNS SERVERS for use in CPM filters</description>
@@ -258,510 +462,1889 @@
                         </prefix>
                     </ip-prefix-list>
                     <ip-prefix-list>
-                        <prefix-list-name>GEANT_GAP</prefix-list-name>
-                        <description>Geant GAP hosts</description>
+                        <prefix-list-name>GEANT_EXTERNAL_PROJECT</prefix-list-name>
+                        <description>GEANT IPv4 addresses that require access from the outside</description>
                         <prefix>
-                            <ip-prefix>83.97.92.243/32</ip-prefix>
+                            <ip-prefix>62.40.96.18/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.92.251/32</ip-prefix>
+                            <ip-prefix>62.40.96.41/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.93.7/32</ip-prefix>
+                            <ip-prefix>62.40.96.44/32</ip-prefix>
                         </prefix>
-                    </ip-prefix-list>
-                    <ip-prefix-list>
-                        <prefix-list-name>GEANT_IMS</prefix-list-name>
-                        <description>Geant IMS hosts</description>
                         <prefix>
-                            <ip-prefix>83.97.94.123/32</ip-prefix>
+                            <ip-prefix>62.40.98.71/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.94.124/32</ip-prefix>
+                            <ip-prefix>62.40.99.0/29</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.94.125/32</ip-prefix>
+                            <ip-prefix>62.40.99.8/31</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.95.109/32</ip-prefix>
+                            <ip-prefix>62.40.99.32/28</ip-prefix>
                         </prefix>
-                    </ip-prefix-list>
-                    <ip-prefix-list>
-                        <prefix-list-name>GEANT_JUMP_SERVERS</prefix-list-name>
-                        <description>Geant Jump Servers hosts</description>
                         <prefix>
-                            <ip-prefix>83.97.94.114/32</ip-prefix>
+                            <ip-prefix>62.40.99.48/28</ip-prefix>
                         </prefix>
-                    </ip-prefix-list>
-                    <ip-prefix-list>
-                        <prefix-list-name>GEANT_LIBRENMS</prefix-list-name>
-                        <description>Geant LibreNMS hosts</description>
                         <prefix>
-                            <ip-prefix>83.97.95.37/32</ip-prefix>
+                            <ip-prefix>62.40.99.129/32</ip-prefix>
                         </prefix>
-                    </ip-prefix-list>
-                    <ip-prefix-list>
-                        <prefix-list-name>GEANT_LOOKING_GLASS</prefix-list-name>
-                        <description>Geant looking-glass hosts</description>
                         <prefix>
-                            <ip-prefix>83.97.92.82/32</ip-prefix>
+                            <ip-prefix>62.40.99.136/29</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.92.141/32</ip-prefix>
+                            <ip-prefix>62.40.99.144/29</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.93.39/32</ip-prefix>
+                            <ip-prefix>62.40.99.160/27</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.93.62/32</ip-prefix>
+                            <ip-prefix>62.40.99.192/26</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.94.134/32</ip-prefix>
+                            <ip-prefix>62.40.100.128/25</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.94.135/32</ip-prefix>
+                            <ip-prefix>62.40.101.0/24</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.94.136/32</ip-prefix>
+                            <ip-prefix>62.40.104.0/29</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.94.137/32</ip-prefix>
+                            <ip-prefix>62.40.104.8/29</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.94.138/32</ip-prefix>
+                            <ip-prefix>62.40.104.21/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.94.139/32</ip-prefix>
+                            <ip-prefix>62.40.104.23/32</ip-prefix>
                         </prefix>
-                    </ip-prefix-list>
-                    <ip-prefix-list>
-                        <prefix-list-name>GEANT_NE_SERVERS</prefix-list-name>
-                        <description>Geant NE Servers hosts</description>
                         <prefix>
-                            <ip-prefix>62.40.112.32/32</ip-prefix>
+                            <ip-prefix>62.40.104.32/29</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.92.136/32</ip-prefix>
+                            <ip-prefix>62.40.104.50/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.94.182/32</ip-prefix>
+                            <ip-prefix>62.40.104.56/29</ip-prefix>
                         </prefix>
-                    </ip-prefix-list>
-                    <ip-prefix-list>
-                        <prefix-list-name>GEANT_NTP</prefix-list-name>
-                        <description>Geant NTPs</description>
                         <prefix>
-                            <ip-prefix>62.40.97.11/32</ip-prefix>
+                            <ip-prefix>62.40.104.72/29</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>62.40.97.12/32</ip-prefix>
+                            <ip-prefix>62.40.104.80/29</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>62.40.97.14/32</ip-prefix>
+                            <ip-prefix>62.40.104.88/29</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>62.40.123.21/32</ip-prefix>
+                            <ip-prefix>62.40.104.98/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>62.40.123.23/32</ip-prefix>
+                            <ip-prefix>62.40.104.104/29</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>62.40.123.103/32</ip-prefix>
+                            <ip-prefix>62.40.104.112/29</ip-prefix>
                         </prefix>
-                    </ip-prefix-list>
-                    <ip-prefix-list>
-                        <prefix-list-name>GEANT_OC_SERVERS</prefix-list-name>
-                        <description>Geant OC Servers hosts</description>
                         <prefix>
-                            <ip-prefix>62.40.99.160/27</ip-prefix>
+                            <ip-prefix>62.40.104.132/31</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.92.61/32</ip-prefix>
+                            <ip-prefix>62.40.104.134/31</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.92.87/32</ip-prefix>
+                            <ip-prefix>62.40.104.136/29</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.92.92/32</ip-prefix>
+                            <ip-prefix>62.40.104.168/29</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.92.99/32</ip-prefix>
+                            <ip-prefix>62.40.104.176/30</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.93.23/32</ip-prefix>
+                            <ip-prefix>62.40.104.180/30</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.93.37/32</ip-prefix>
+                            <ip-prefix>62.40.104.184/29</ip-prefix>
                         </prefix>
-                    </ip-prefix-list>
-                    <ip-prefix-list>
-                        <prefix-list-name>GEANT_OFFICE_NETWORKS</prefix-list-name>
-                        <description>Amsterdam and Cambridge Networks</description>
                         <prefix>
-                            <ip-prefix>62.40.101.0/24</ip-prefix>
+                            <ip-prefix>62.40.104.192/29</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>195.169.24.128/25</ip-prefix>
+                            <ip-prefix>62.40.104.202/31</ip-prefix>
                         </prefix>
-                    </ip-prefix-list>
-                    <ip-prefix-list>
-                        <prefix-list-name>GEANT_RANCID</prefix-list-name>
-                        <description>Geant RANCID hosts</description>
                         <prefix>
-                            <ip-prefix>83.97.92.216/32</ip-prefix>
+                            <ip-prefix>62.40.104.205/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.92.217/32</ip-prefix>
+                            <ip-prefix>62.40.104.207/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.92.220/32</ip-prefix>
+                            <ip-prefix>62.40.104.210/32</ip-prefix>
                         </prefix>
-                    </ip-prefix-list>
-                    <ip-prefix-list>
-                        <prefix-list-name>GEANT_ROUTERS</prefix-list-name>
-                        <description>GEANT router-loopbacks and system address for use in CPM filters</description>
                         <prefix>
-                            <ip-prefix>62.40.96.0/23</ip-prefix>
+                            <ip-prefix>62.40.104.211/32</ip-prefix>
                         </prefix>
-                    </ip-prefix-list>
-                    <ip-prefix-list>
-                        <prefix-list-name>GEANT_SNMP</prefix-list-name>
-                        <description>GEANT SNMP HOSTS for use in CPM filters</description>
                         <prefix>
-                            <ip-prefix>62.40.100.166/32</ip-prefix>
+                            <ip-prefix>62.40.104.212/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>62.40.100.190/32</ip-prefix>
+                            <ip-prefix>62.40.104.224/27</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>62.40.100.198/32</ip-prefix>
+                            <ip-prefix>62.40.105.0/24</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>62.40.114.3/32</ip-prefix>
+                            <ip-prefix>62.40.106.0/24</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>62.40.114.18/32</ip-prefix>
+                            <ip-prefix>62.40.107.182/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>62.40.114.19/32</ip-prefix>
+                            <ip-prefix>62.40.107.194/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>62.40.120.90/32</ip-prefix>
+                            <ip-prefix>62.40.107.198/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>62.40.122.138/32</ip-prefix>
+                            <ip-prefix>62.40.107.206/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.92.61/32</ip-prefix>
+                            <ip-prefix>62.40.107.214/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.92.79/32</ip-prefix>
+                            <ip-prefix>62.40.107.221/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.92.92/32</ip-prefix>
+                            <ip-prefix>62.40.107.222/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.92.94/32</ip-prefix>
+                            <ip-prefix>62.40.107.223/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.92.99/32</ip-prefix>
+                            <ip-prefix>62.40.107.230/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.92.183/32</ip-prefix>
+                            <ip-prefix>62.40.107.238/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.92.219/32</ip-prefix>
+                            <ip-prefix>62.40.107.246/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.92.228/32</ip-prefix>
+                            <ip-prefix>62.40.107.248/29</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.93.39/32</ip-prefix>
+                            <ip-prefix>62.40.108.50/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.93.52/32</ip-prefix>
+                            <ip-prefix>62.40.108.58/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.93.53/32</ip-prefix>
+                            <ip-prefix>62.40.108.73/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.93.59/32</ip-prefix>
+                            <ip-prefix>62.40.108.98/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.93.122/32</ip-prefix>
+                            <ip-prefix>62.40.108.102/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.93.123/32</ip-prefix>
+                            <ip-prefix>62.40.108.135/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.93.137/32</ip-prefix>
+                            <ip-prefix>62.40.108.140/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.93.151/32</ip-prefix>
+                            <ip-prefix>62.40.108.192/26</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.93.152/32</ip-prefix>
+                            <ip-prefix>62.40.109.0/24</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.93.153/32</ip-prefix>
+                            <ip-prefix>62.40.110.0/27</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.93.154/32</ip-prefix>
+                            <ip-prefix>62.40.110.32/27</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.93.155/32</ip-prefix>
+                            <ip-prefix>62.40.110.64/27</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.93.204/32</ip-prefix>
+                            <ip-prefix>62.40.110.96/27</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.93.239/32</ip-prefix>
+                            <ip-prefix>62.40.110.128/27</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.93.244/32</ip-prefix>
+                            <ip-prefix>62.40.111.0/24</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.93.248/32</ip-prefix>
+                            <ip-prefix>62.40.112.0/24</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.93.249/32</ip-prefix>
+                            <ip-prefix>62.40.113.29/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.93.251/32</ip-prefix>
+                            <ip-prefix>62.40.113.56/29</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.94.1/32</ip-prefix>
+                            <ip-prefix>62.40.113.88/29</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.94.2/32</ip-prefix>
+                            <ip-prefix>62.40.113.104/29</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.94.9/32</ip-prefix>
+                            <ip-prefix>62.40.113.115/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.94.14/32</ip-prefix>
+                            <ip-prefix>62.40.113.128/25</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.94.15/32</ip-prefix>
+                            <ip-prefix>62.40.114.0/28</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.94.51/32</ip-prefix>
+                            <ip-prefix>62.40.114.16/28</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.94.52/32</ip-prefix>
+                            <ip-prefix>62.40.114.33/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.94.97/32</ip-prefix>
+                            <ip-prefix>62.40.114.35/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.94.98/32</ip-prefix>
+                            <ip-prefix>62.40.114.37/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.94.181/32</ip-prefix>
+                            <ip-prefix>62.40.114.39/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.94.185/32</ip-prefix>
+                            <ip-prefix>62.40.114.41/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.94.188/32</ip-prefix>
+                            <ip-prefix>62.40.114.43/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.94.245/32</ip-prefix>
+                            <ip-prefix>62.40.114.45/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.94.246/32</ip-prefix>
+                            <ip-prefix>62.40.114.47/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.95.9/32</ip-prefix>
+                            <ip-prefix>62.40.114.49/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.95.10/32</ip-prefix>
+                            <ip-prefix>62.40.114.51/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.95.11/32</ip-prefix>
+                            <ip-prefix>62.40.114.53/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>83.97.95.12/32</ip-prefix>
+                            <ip-prefix>62.40.114.55/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>193.177.128.0/22</ip-prefix>
+                            <ip-prefix>62.40.114.57/32</ip-prefix>
                         </prefix>
-                    </ip-prefix-list>
-                    <ip-prefix-list>
-                        <prefix-list-name>GEANT_VPN_NETWORKS</prefix-list-name>
-                        <description>All VPN networks allowed</description>
                         <prefix>
-                            <ip-prefix>62.40.99.129/32</ip-prefix>
+                            <ip-prefix>62.40.114.59/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>62.40.99.160/27</ip-prefix>
+                            <ip-prefix>62.40.114.61/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>62.40.112.128/27</ip-prefix>
+                            <ip-prefix>62.40.114.63/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>195.169.24.28/32</ip-prefix>
+                            <ip-prefix>62.40.114.65/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>195.169.24.96/27</ip-prefix>
+                            <ip-prefix>62.40.114.67/32</ip-prefix>
                         </prefix>
-                    </ip-prefix-list>
-                    <ip-prefix-list>
-                        <prefix-list-name>GEANT_VULN_SCANNER</prefix-list-name>
-                        <description>Geant vulnerability scanners</description>
                         <prefix>
-                            <ip-prefix>83.97.93.49/32</ip-prefix>
+                            <ip-prefix>62.40.114.69/32</ip-prefix>
                         </prefix>
-                    </ip-prefix-list>
-                    <ip-prefix-list>
-                        <prefix-list-name>NOMIOS_SUPPORT</prefix-list-name>
-                        <description>Nomios hosts allowed for support</description>
                         <prefix>
-                            <ip-prefix>83.97.93.238/32</ip-prefix>
+                            <ip-prefix>62.40.114.71/32</ip-prefix>
                         </prefix>
-                    </ip-prefix-list>
-                    <ip-prefix-list>
-                        <prefix-list-name>PUBLIC_NTP</prefix-list-name>
-                        <description>Publicly available NTPs</description>
                         <prefix>
-                            <ip-prefix>216.239.35.0/32</ip-prefix>
+                            <ip-prefix>62.40.114.73/32</ip-prefix>
                         </prefix>
                         <prefix>
-                            <ip-prefix>216.239.35.4/32</ip-prefix>
+                            <ip-prefix>62.40.114.75/32</ip-prefix>
                         </prefix>
-                    </ip-prefix-list>
-                    <ip-prefix-list>
-                        <prefix-list-name>TWAMP_CLIENTS</prefix-list-name>
-                        <description>TWAMP Clients</description>
                         <prefix>
-                            <ip-prefix>62.40.98.0/24</ip-prefix>
+                            <ip-prefix>62.40.114.77/32</ip-prefix>
                         </prefix>
-                    </ip-prefix-list>
-                    <ipv6-prefix-list>
-                        <prefix-list-name>BGP_PEERS_BASE</prefix-list-name>
-                        <description>BGP Peers configured under Base instance</description>
-                        <apply-path>
-                            <bgp-peers>
-                                <criterion-index>1</criterion-index>
-                                <group>.*</group>
-                                <neighbor>.*</neighbor>
+                        <prefix>
+                            <ip-prefix>62.40.114.79/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.114.81/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.114.83/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.114.85/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.114.87/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.114.97/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.114.99/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.114.101/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.114.103/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.114.107/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.114.108/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.114.114/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.114.130/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.114.138/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.114.146/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.114.162/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.114.163/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.114.164/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.114.170/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.114.176/29</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.114.184/29</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.114.192/28</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.114.208/28</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.114.224/29</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.114.232/29</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.114.240/29</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.114.250/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.115.46/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.115.107/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.115.111/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.115.156/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.116.1/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.116.2/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.116.5/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.116.7/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.116.11/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.116.15/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.116.17/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.116.18/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.116.23/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.116.29/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.116.31/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.116.114/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.116.122/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.116.202/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.116.217/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.116.219/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.116.221/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.116.223/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.117.2/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.117.82/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.117.126/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.117.153/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.117.251/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.117.253/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.118.9/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.118.11/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.118.34/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.118.38/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.118.214/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.118.218/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.118.222/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.118.249/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.118.251/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.118.253/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.118.255/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.119.0/24</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.120.0/22</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.125.97/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.125.254/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.126.0/24</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.127.0/24</ip-prefix>
+                        </prefix>
+                    </ip-prefix-list>
+                    <ip-prefix-list>
+                        <prefix-list-name>GEANT_GAP</prefix-list-name>
+                        <description>Geant GAP hosts</description>
+                        <prefix>
+                            <ip-prefix>83.97.92.243/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.92.251/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.93.7/32</ip-prefix>
+                        </prefix>
+                    </ip-prefix-list>
+                    <ip-prefix-list>
+                        <prefix-list-name>GEANT_IMS</prefix-list-name>
+                        <description>Geant IMS hosts</description>
+                        <prefix>
+                            <ip-prefix>83.97.94.123/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.94.124/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.94.125/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.95.109/32</ip-prefix>
+                        </prefix>
+                    </ip-prefix-list>
+                    <ip-prefix-list>
+                        <prefix-list-name>GEANT_JUMP_SERVERS</prefix-list-name>
+                        <description>Geant Jump Servers hosts</description>
+                        <prefix>
+                            <ip-prefix>83.97.94.114/32</ip-prefix>
+                        </prefix>
+                    </ip-prefix-list>
+                    <ip-prefix-list>
+                        <prefix-list-name>GEANT_LIBRENMS</prefix-list-name>
+                        <description>Geant LibreNMS hosts</description>
+                        <prefix>
+                            <ip-prefix>83.97.95.37/32</ip-prefix>
+                        </prefix>
+                    </ip-prefix-list>
+                    <ip-prefix-list>
+                        <prefix-list-name>GEANT_LOOKING_GLASS</prefix-list-name>
+                        <description>Geant looking-glass hosts</description>
+                        <prefix>
+                            <ip-prefix>83.97.92.82/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.92.141/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.93.39/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.93.62/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.94.134/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.94.135/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.94.136/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.94.137/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.94.138/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.94.139/32</ip-prefix>
+                        </prefix>
+                    </ip-prefix-list>
+                    <ip-prefix-list>
+                        <prefix-list-name>GEANT_NE_SERVERS</prefix-list-name>
+                        <description>Geant NE Servers hosts</description>
+                        <prefix>
+                            <ip-prefix>62.40.112.32/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.92.136/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.94.182/32</ip-prefix>
+                        </prefix>
+                    </ip-prefix-list>
+                    <ip-prefix-list>
+                        <prefix-list-name>GEANT_NTP</prefix-list-name>
+                        <description>Geant NTPs</description>
+                        <prefix>
+                            <ip-prefix>62.40.97.11/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.97.12/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.97.14/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.123.21/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.123.23/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.123.103/32</ip-prefix>
+                        </prefix>
+                    </ip-prefix-list>
+                    <ip-prefix-list>
+                        <prefix-list-name>GEANT_OC_SERVERS</prefix-list-name>
+                        <description>Geant OC Servers hosts</description>
+                        <prefix>
+                            <ip-prefix>62.40.99.160/27</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.92.61/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.92.87/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.92.92/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.92.99/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.93.23/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.93.37/32</ip-prefix>
+                        </prefix>
+                    </ip-prefix-list>
+                    <ip-prefix-list>
+                        <prefix-list-name>GEANT_OFFICE_NETWORKS</prefix-list-name>
+                        <description>Amsterdam and Cambridge Networks</description>
+                        <prefix>
+                            <ip-prefix>62.40.101.0/24</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>195.169.24.128/25</ip-prefix>
+                        </prefix>
+                    </ip-prefix-list>
+                    <ip-prefix-list>
+                        <prefix-list-name>GEANT_RANCID</prefix-list-name>
+                        <description>Geant RANCID hosts</description>
+                        <prefix>
+                            <ip-prefix>83.97.92.216/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.92.217/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.92.220/32</ip-prefix>
+                        </prefix>
+                    </ip-prefix-list>
+                    <ip-prefix-list>
+                        <prefix-list-name>GEANT_ROUTERS</prefix-list-name>
+                        <description>GEANT router-loopbacks and system address for use in CPM filters</description>
+                        <prefix>
+                            <ip-prefix>62.40.96.0/23</ip-prefix>
+                        </prefix>
+                    </ip-prefix-list>
+                    <ip-prefix-list>
+                        <prefix-list-name>GEANT_RPKI</prefix-list-name>
+                        <prefix>
+                            <ip-prefix>83.97.94.48/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.94.49/32</ip-prefix>
+                        </prefix>
+                    </ip-prefix-list>
+                    <ip-prefix-list>
+                        <prefix-list-name>GEANT_SNMP</prefix-list-name>
+                        <description>GEANT SNMP HOSTS for use in CPM filters</description>
+                        <prefix>
+                            <ip-prefix>62.40.100.166/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.100.190/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.100.198/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.114.3/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.114.18/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.114.19/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.120.90/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.122.138/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.92.61/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.92.79/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.92.92/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.92.94/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.92.99/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.92.183/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.92.219/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.92.228/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.93.39/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.93.52/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.93.53/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.93.59/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.93.122/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.93.123/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.93.137/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.93.151/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.93.152/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.93.153/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.93.154/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.93.155/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.93.204/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.93.239/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.93.244/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.93.248/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.93.249/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.93.251/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.94.1/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.94.2/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.94.9/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.94.14/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.94.15/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.94.51/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.94.52/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.94.97/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.94.98/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.94.180/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.94.181/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.94.185/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.94.188/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.94.245/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.94.246/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.95.9/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.95.10/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.95.11/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.95.12/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.95.193/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.95.194/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>83.97.95.195/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>193.177.128.0/22</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>193.219.48.249/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>193.219.48.250/32</ip-prefix>
+                        </prefix>
+                    </ip-prefix-list>
+                    <ip-prefix-list>
+                        <prefix-list-name>GEANT_VPN_NETWORKS</prefix-list-name>
+                        <description>All VPN networks allowed</description>
+                        <prefix>
+                            <ip-prefix>62.40.99.129/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.99.160/27</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.112.128/27</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>195.169.24.28/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>195.169.24.96/27</ip-prefix>
+                        </prefix>
+                    </ip-prefix-list>
+                    <ip-prefix-list>
+                        <prefix-list-name>GEANT_VULN_SCANNER</prefix-list-name>
+                        <description>Geant vulnerability scanners</description>
+                        <prefix>
+                            <ip-prefix>83.97.93.49/32</ip-prefix>
+                        </prefix>
+                    </ip-prefix-list>
+                    <ip-prefix-list>
+                        <prefix-list-name>MOODI_SERVERS</prefix-list-name>
+                        <prefix>
+                            <ip-prefix>83.97.93.171/32</ip-prefix>
+                        </prefix>
+                    </ip-prefix-list>
+                    <ip-prefix-list>
+                        <prefix-list-name>MULTICAST_GROUP_RANGES</prefix-list-name>
+                        <prefix>
+                            <ip-prefix>224.0.0.0/4</ip-prefix>
+                        </prefix>
+                    </ip-prefix-list>
+                    <ip-prefix-list>
+                        <prefix-list-name>NOMIOS_SUPPORT</prefix-list-name>
+                        <description>Nomios hosts allowed for support</description>
+                        <prefix>
+                            <ip-prefix>83.97.93.238/32</ip-prefix>
+                        </prefix>
+                    </ip-prefix-list>
+                    <ip-prefix-list>
+                        <prefix-list-name>PUBLIC_NTP</prefix-list-name>
+                        <description>Publicly available NTPs</description>
+                        <prefix>
+                            <ip-prefix>216.239.35.0/32</ip-prefix>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>216.239.35.4/32</ip-prefix>
+                        </prefix>
+                    </ip-prefix-list>
+                    <ip-prefix-list>
+                        <prefix-list-name>TOOLS_KENTIK</prefix-list-name>
+                        <prefix>
+                            <ip-prefix>193.177.128.0/22</ip-prefix>
+                        </prefix>
+                    </ip-prefix-list>
+                    <ip-prefix-list>
+                        <prefix-list-name>TWAMP_CLIENTS</prefix-list-name>
+                        <description>TWAMP Clients</description>
+                        <prefix>
+                            <ip-prefix>62.40.98.0/24</ip-prefix>
+                        </prefix>
+                    </ip-prefix-list>
+                    <ipv6-prefix-list>
+                        <prefix-list-name>BGP_PEERS_BASE</prefix-list-name>
+                        <description>BGP Peers configured under Base instance</description>
+                        <apply-path>
+                            <bgp-peers>
+                                <criterion-index>1</criterion-index>
+                                <group>.*</group>
+                                <neighbor>.*</neighbor>
                                 <router-instance>Base</router-instance>
                             </bgp-peers>
+                            <bgp-peers>
+                                <criterion-index>2</criterion-index>
+                                <group>.*</group>
+                                <neighbor>.*</neighbor>
+                                <router-instance>IAS</router-instance>
+                            </bgp-peers>
+                            <bgp-peers>
+                                <criterion-index>3</criterion-index>
+                                <group>.*</group>
+                                <neighbor>.*</neighbor>
+                                <router-instance>LHCONE_L3VPN</router-instance>
+                            </bgp-peers>
                         </apply-path>
                     </ipv6-prefix-list>
+                    <ipv6-prefix-list>
+                        <prefix-list-name>BOGONS_LIST</prefix-list-name>
+                        <prefix>
+                            <ipv6-prefix>::/8</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>100::/8</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>200::/7</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>400::/7</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>600::/7</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>800::/5</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>1000::/4</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2000::/16</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>3fff::/16</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>4000::/3</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>6000::/3</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>8000::/3</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>a000::/3</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>c000::/3</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>e000::/4</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>f000::/5</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>f800::/6</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>fc00::/7</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>fe00::/9</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>fec0::/10</ipv6-prefix>
+                        </prefix>
+                    </ipv6-prefix-list>
                     <ipv6-prefix-list>
                         <prefix-list-name>GEANT_ADDRESS_SPACE</prefix-list-name>
                         <description>GEANT address space for traceroute and rsvp in CPM filters</description>
                         <prefix>
-                            <ipv6-prefix>2001:798::/32</ipv6-prefix>
+                            <ipv6-prefix>2001:798::/32</ipv6-prefix>
+                        </prefix>
+                    </ipv6-prefix-list>
+                    <ipv6-prefix-list>
+                        <prefix-list-name>GEANT_BRIAN</prefix-list-name>
+                        <description>Geant Brian hosts</description>
+                        <prefix>
+                            <ipv6-prefix>2001:798:3::11d/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:3::148/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:3::190/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:3::29e/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:3::29f/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:3::2b1/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:3::2b2/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:3::2b3/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:3::2b4/128</ipv6-prefix>
+                        </prefix>
+                    </ipv6-prefix-list>
+                    <ipv6-prefix-list>
+                        <prefix-list-name>GEANT_CORE</prefix-list-name>
+                        <prefix>
+                            <ipv6-prefix>2001:798:aa:1::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:cc::/48</ipv6-prefix>
+                        </prefix>
+                    </ipv6-prefix-list>
+                    <ipv6-prefix-list>
+                        <prefix-list-name>GEANT_DASHBOARD</prefix-list-name>
+                        <description>Geant dashboard hosts</description>
+                        <prefix>
+                            <ipv6-prefix>2001:798:3::18d/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:3::18e/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:3::18f/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:3::1d6/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:3::208/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:3::209/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:3::234/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:3::236/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:3::237/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:3::23f/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:3::245/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:3::248/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:3::272/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:3::277/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:3::278/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:3::279/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:3::27a/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2a::4/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2b::4/128</ipv6-prefix>
+                        </prefix>
+                    </ipv6-prefix-list>
+                    <ipv6-prefix-list>
+                        <prefix-list-name>GEANT_DNS</prefix-list-name>
+                        <description>GEANT DNS SERVERS for use in CPM filters</description>
+                        <prefix>
+                            <ipv6-prefix>2001:798:3::1ba/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:4d::2/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:ee:f::2/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:ee:10::2/128</ipv6-prefix>
+                        </prefix>
+                    </ipv6-prefix-list>
+                    <ipv6-prefix-list>
+                        <prefix-list-name>GEANT_EXTERNAL_PROJECT6</prefix-list-name>
+                        <description>GEANT IPv6 addresses that require access from the outside</description>
+                        <prefix>
+                            <ipv6-prefix>2001:798::2/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798::6/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798::a/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798::e/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:1:1::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:1:2::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:2::2/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:2:1::2/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:2:284d::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:3::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:4:1::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:4:2::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:4:3::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:4:5::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:4:6::1/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:4:6::2/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:4:6::3/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:4:6::4/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:4:8::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:4:10::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:7::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:8::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:9::/48</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:11::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:14:96::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:14:aa::2/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:14:aa::3/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:14:c8::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:18:96::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:18:99::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:22:16::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:28:50::11/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:28:59::7/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:28:99::3/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:1::e/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:1::16/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::6/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::a/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::16/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::1a/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::1b/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::1c/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::22/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::26/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::2a/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::2e/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::32/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::33/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::36/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::38/126</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::3a/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::3e/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::42/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::46/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::4a/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::4e/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::52/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::56/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::5a/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::5e/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::62/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::66/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::6a/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::6e/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::72/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::76/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::7a/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::7e/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::82/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::86/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::8a/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::8e/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::92/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::96/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::9a/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::9e/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::a2/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::a6/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::aa/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::ae/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::b2/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::ba/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::be/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::c2/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::ce/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::d2/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::d6/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2::da/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:5::2/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:c::2/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:c::3/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:d::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:1a::4/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:1b::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:1d::2/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:1e::2/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:1e::3/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:1e::4/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:23::4/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:25::2/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:25::4/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2a::2/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2a::3/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2a::4/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2b::2/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2b::3/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2b::4/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2e::3/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2e::4/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:2f::2/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:33::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:34::2/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:34::3/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:34::4/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:35::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:36::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:37::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:38::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:39::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:3a::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:41::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:42::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:43::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:49::2/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:bb:4d::2/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:dd:3::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:dd:6::4/126</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:dd:7::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:ee:b::32/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:ee:b::42/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:ee:b::46/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:ee:b::6e/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:ee:b::82/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:ee:b::86/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:ee:b::8a/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:ee:b::8e/128</ipv6-prefix>
                         </prefix>
-                    </ipv6-prefix-list>
-                    <ipv6-prefix-list>
-                        <prefix-list-name>GEANT_BRIAN</prefix-list-name>
-                        <description>Geant Brian hosts</description>
                         <prefix>
-                            <ipv6-prefix>2001:798:3::11d/128</ipv6-prefix>
+                            <ipv6-prefix>2001:798:ee:b::92/128</ipv6-prefix>
                         </prefix>
                         <prefix>
-                            <ipv6-prefix>2001:798:3::148/128</ipv6-prefix>
+                            <ipv6-prefix>2001:798:ee:b::96/128</ipv6-prefix>
                         </prefix>
                         <prefix>
-                            <ipv6-prefix>2001:798:3::190/128</ipv6-prefix>
+                            <ipv6-prefix>2001:798:ee:b::aa/128</ipv6-prefix>
                         </prefix>
                         <prefix>
-                            <ipv6-prefix>2001:798:3::29e/128</ipv6-prefix>
+                            <ipv6-prefix>2001:798:ee:b::ae/128</ipv6-prefix>
                         </prefix>
                         <prefix>
-                            <ipv6-prefix>2001:798:3::29f/128</ipv6-prefix>
+                            <ipv6-prefix>2001:798:ee:b::b2/128</ipv6-prefix>
                         </prefix>
                         <prefix>
-                            <ipv6-prefix>2001:798:3::2b1/128</ipv6-prefix>
+                            <ipv6-prefix>2001:798:ee:b::b6/128</ipv6-prefix>
                         </prefix>
                         <prefix>
-                            <ipv6-prefix>2001:798:3::2b2/128</ipv6-prefix>
+                            <ipv6-prefix>2001:798:ee:b::ba/128</ipv6-prefix>
                         </prefix>
                         <prefix>
-                            <ipv6-prefix>2001:798:3::2b3/128</ipv6-prefix>
+                            <ipv6-prefix>2001:798:ee:b::be/128</ipv6-prefix>
                         </prefix>
                         <prefix>
-                            <ipv6-prefix>2001:798:3::2b4/128</ipv6-prefix>
+                            <ipv6-prefix>2001:798:ee:b::c2/128</ipv6-prefix>
                         </prefix>
-                    </ipv6-prefix-list>
-                    <ipv6-prefix-list>
-                        <prefix-list-name>GEANT_DASHBOARD</prefix-list-name>
-                        <description>Geant dashboard hosts</description>
                         <prefix>
-                            <ipv6-prefix>2001:798:3::18d/128</ipv6-prefix>
+                            <ipv6-prefix>2001:798:ee:b::c6/128</ipv6-prefix>
                         </prefix>
                         <prefix>
-                            <ipv6-prefix>2001:798:3::18e/128</ipv6-prefix>
+                            <ipv6-prefix>2001:798:ee:b::ca/128</ipv6-prefix>
                         </prefix>
                         <prefix>
-                            <ipv6-prefix>2001:798:3::18f/128</ipv6-prefix>
+                            <ipv6-prefix>2001:798:ee:b::ce/128</ipv6-prefix>
                         </prefix>
                         <prefix>
-                            <ipv6-prefix>2001:798:3::1d6/128</ipv6-prefix>
+                            <ipv6-prefix>2001:798:ee:b::d2/128</ipv6-prefix>
                         </prefix>
                         <prefix>
-                            <ipv6-prefix>2001:798:3::208/128</ipv6-prefix>
+                            <ipv6-prefix>2001:798:ee:f::2/128</ipv6-prefix>
                         </prefix>
                         <prefix>
-                            <ipv6-prefix>2001:798:3::209/128</ipv6-prefix>
+                            <ipv6-prefix>2001:798:ee:10::2/128</ipv6-prefix>
                         </prefix>
                         <prefix>
-                            <ipv6-prefix>2001:798:3::234/128</ipv6-prefix>
+                            <ipv6-prefix>2001:798:ee:1c::2/128</ipv6-prefix>
                         </prefix>
                         <prefix>
-                            <ipv6-prefix>2001:798:3::236/128</ipv6-prefix>
+                            <ipv6-prefix>2001:798:ee:1d::2/128</ipv6-prefix>
                         </prefix>
                         <prefix>
-                            <ipv6-prefix>2001:798:3::237/128</ipv6-prefix>
+                            <ipv6-prefix>2001:798:ee:1e::2/128</ipv6-prefix>
                         </prefix>
                         <prefix>
-                            <ipv6-prefix>2001:798:3::23f/128</ipv6-prefix>
+                            <ipv6-prefix>2001:798:ee:21::/64</ipv6-prefix>
                         </prefix>
                         <prefix>
-                            <ipv6-prefix>2001:798:3::245/128</ipv6-prefix>
+                            <ipv6-prefix>2001:798:ee:22::/64</ipv6-prefix>
                         </prefix>
                         <prefix>
-                            <ipv6-prefix>2001:798:3::248/128</ipv6-prefix>
+                            <ipv6-prefix>2001:798:111:1::52/128</ipv6-prefix>
                         </prefix>
                         <prefix>
-                            <ipv6-prefix>2001:798:3::272/128</ipv6-prefix>
+                            <ipv6-prefix>2001:798:111:1::56/128</ipv6-prefix>
                         </prefix>
                         <prefix>
-                            <ipv6-prefix>2001:798:3::277/128</ipv6-prefix>
+                            <ipv6-prefix>2001:798:111:1::5a/128</ipv6-prefix>
                         </prefix>
                         <prefix>
-                            <ipv6-prefix>2001:798:3::278/128</ipv6-prefix>
+                            <ipv6-prefix>2001:798:111:1::5e/128</ipv6-prefix>
                         </prefix>
                         <prefix>
-                            <ipv6-prefix>2001:798:3::279/128</ipv6-prefix>
+                            <ipv6-prefix>2001:798:111:1::62/128</ipv6-prefix>
                         </prefix>
                         <prefix>
-                            <ipv6-prefix>2001:798:3::27a/128</ipv6-prefix>
+                            <ipv6-prefix>2001:798:111:1::66/128</ipv6-prefix>
                         </prefix>
                         <prefix>
-                            <ipv6-prefix>2001:798:bb:2a::4/128</ipv6-prefix>
+                            <ipv6-prefix>2001:798:111:1::6a/128</ipv6-prefix>
                         </prefix>
                         <prefix>
-                            <ipv6-prefix>2001:798:bb:2b::4/128</ipv6-prefix>
+                            <ipv6-prefix>2001:798:111:1::6e/128</ipv6-prefix>
                         </prefix>
-                    </ipv6-prefix-list>
-                    <ipv6-prefix-list>
-                        <prefix-list-name>GEANT_DNS</prefix-list-name>
-                        <description>GEANT DNS SERVERS for use in CPM filters</description>
                         <prefix>
-                            <ipv6-prefix>2001:798:3::1ba/128</ipv6-prefix>
+                            <ipv6-prefix>2001:798:111:1::72/128</ipv6-prefix>
                         </prefix>
                         <prefix>
-                            <ipv6-prefix>2001:798:bb:4d::2/128</ipv6-prefix>
+                            <ipv6-prefix>2001:798:111:1::76/128</ipv6-prefix>
                         </prefix>
                         <prefix>
-                            <ipv6-prefix>2001:798:ee:f::2/128</ipv6-prefix>
+                            <ipv6-prefix>2001:798:2001::/48</ipv6-prefix>
                         </prefix>
                         <prefix>
-                            <ipv6-prefix>2001:798:ee:10::2/128</ipv6-prefix>
+                            <ipv6-prefix>2001:798:2002::/48</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:2012:47::2/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:f27a:10::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:f27a:14::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:f27a:22::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:f27a:28::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:f27a:2d::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:f99a:22::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:f9a1:10::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:f9a2:10::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:f9a3:28::/125</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fa78:14::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fa78:22::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fa78:28::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fa78:2d01::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fa78:2d02::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fa79:10::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fa79:14::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fa79:22::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fa79:28::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fa79:2d01::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fa79:2d02::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fc00:10::2/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fc00:10::6/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fc00:12::2/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fc00:12::6/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fc00:13::2/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fc00:13::6/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fc00:14::2/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fc00:14::6/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fc00:14::a/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fc00:16::2/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fc00:16::6/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fc00:17::2/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fc00:17::6/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fc00:18::2/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fc00:18::6/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fc00:19::2/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fc00:19::6/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fc00:1b::2/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fc00:1b::6/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fc00:1e::2/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fc00:1e::6/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fc00:1f::2/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fc00:1f::6/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fc00:21::2/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fc00:21::6/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fc00:22::2/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fc00:22::6/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fc00:23::2/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fc00:23::6/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fc00:28::2/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fc00:28::6/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fc00:2b::2/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fc00:2b::6/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fc00:2c::2/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:fc00:2c::6/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:ff10:a5::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:ff17:11::2/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:ff23:28::2/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:ff32:2e::2/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:ff98:22::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:ff9b:18::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:ff9b:22::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:ff9d:14::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:ff9e:10::2/128</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:ff9e:14::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:ff9e:28::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:ffa4:14::/64</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:799:1ab::/48</ipv6-prefix>
+                        </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:799:cb2::/48</ipv6-prefix>
                         </prefix>
                     </ipv6-prefix-list>
                     <ipv6-prefix-list>
@@ -790,6 +2373,12 @@
                             <ipv6-prefix>2001:798:3::253/128</ipv6-prefix>
                         </prefix>
                     </ipv6-prefix-list>
+                    <ipv6-prefix-list>
+                        <prefix-list-name>GEANT_IPV6_DC_VRRP</prefix-list-name>
+                        <prefix>
+                            <ipv6-prefix>ff02::12/128</ipv6-prefix>
+                        </prefix>
+                    </ipv6-prefix-list>
                     <ipv6-prefix-list>
                         <prefix-list-name>GEANT_IPV6_NETWORKS</prefix-list-name>
                         <description>IPv6 networks for the use in CPM filters</description>
@@ -910,6 +2499,9 @@
                         <prefix>
                             <ipv6-prefix>2001:798:4:8::/112</ipv6-prefix>
                         </prefix>
+                        <prefix>
+                            <ipv6-prefix>2001:798:4:10::/64</ipv6-prefix>
+                        </prefix>
                         <prefix>
                             <ipv6-prefix>2001:799:cb2:6::/64</ipv6-prefix>
                         </prefix>
@@ -934,6 +2526,19 @@
                             <ipv6-prefix>ff02::1:ff00:0/104</ipv6-prefix>
                         </prefix>
                     </ipv6-prefix-list>
+                    <ipv6-prefix-list>
+                        <prefix-list-name>MULTICAST_GROUP_RANGES</prefix-list-name>
+                        <prefix>
+                            <ipv6-prefix>ff00::/8</ipv6-prefix>
+                        </prefix>
+                    </ipv6-prefix-list>
+                    <port-list>
+                        <port-list-name>CPMF_V4-BFD_EBGP-DST_PORT_RANGE</port-list-name>
+                        <range>
+                            <start>3784</start>
+                            <end>3785</end>
+                        </range>
+                    </port-list>
                     <port-list>
                         <port-list-name>CPMF_V4-BGP_PEERS_BASE-PORTS</port-list-name>
                         <port>
@@ -946,6 +2551,18 @@
                             <value>53</value>
                         </port>
                     </port-list>
+                    <port-list>
+                        <port-list-name>CPMF_V4-GNMI-DST_PORTS</port-list-name>
+                        <port>
+                            <value>57400</value>
+                        </port>
+                    </port-list>
+                    <port-list>
+                        <port-list-name>CPMF_V4-MH_BFD_EBGP-DST_PORTS</port-list-name>
+                        <port>
+                            <value>4784</value>
+                        </port>
+                    </port-list>
                     <port-list>
                         <port-list-name>CPMF_V4-MICRO_BFD-DST_PORTS</port-list-name>
                         <port>
@@ -971,6 +2588,12 @@
                             <end>1813</end>
                         </range>
                     </port-list>
+                    <port-list>
+                        <port-list-name>CPMF_V4-RPKI-PORTS</port-list-name>
+                        <port>
+                            <value>3323</value>
+                        </port>
+                    </port-list>
                     <port-list>
                         <port-list-name>CPMF_V4-SNMP-PORTS</port-list-name>
                         <port>
@@ -1004,31 +2627,464 @@
                         </port>
                     </port-list>
                     <port-list>
-                        <port-list-name>CPMF_V6-BGP_PEERS_BASE-PORTS</port-list-name>
+                        <port-list-name>CPMF_V4-T_LDP-DST_PORTS</port-list-name>
+                    </port-list>
+                    <port-list>
+                        <port-list-name>CPMF_V4-T_LDP-PORTS</port-list-name>
+                        <port>
+                            <value>646</value>
+                        </port>
+                    </port-list>
+                    <port-list>
+                        <port-list-name>CPMF_V6-BFD_EBGP-DST_PORT_RANGE</port-list-name>
+                        <range>
+                            <start>3784</start>
+                            <end>3785</end>
+                        </range>
+                    </port-list>
+                    <port-list>
+                        <port-list-name>CPMF_V6-BGP_PEERS_BASE-PORTS</port-list-name>
+                        <port>
+                            <value>179</value>
+                        </port>
+                    </port-list>
+                    <port-list>
+                        <port-list-name>CPMF_V6-MH_BFD_EBGP-DST_PORTS</port-list-name>
+                        <port>
+                            <value>4784</value>
+                        </port>
+                    </port-list>
+                    <port-list>
+                        <port-list-name>CPMF_V6-NETCONF-PORTS</port-list-name>
+                        <port>
+                            <value>830</value>
+                        </port>
+                    </port-list>
+                    <port-list>
+                        <port-list-name>CPMF_V6-SSH-DST_PORTS</port-list-name>
+                        <port>
+                            <value>22</value>
+                        </port>
+                    </port-list>
+                    <port-list>
+                        <port-list-name>CPMF_V6-TRACEROUTE-PORT_RANGE</port-list-name>
+                        <range>
+                            <start>33434</start>
+                            <end>33534</end>
+                        </range>
+                    </port-list>
+                    <port-list>
+                        <port-list-name>IP_EDGE_IN-BFD-DST_PORT_RANGE</port-list-name>
+                        <range>
+                            <start>3784</start>
+                            <end>3785</end>
+                        </range>
+                    </port-list>
+                    <port-list>
+                        <port-list-name>IP_EDGE_IN-BGP-PORTS</port-list-name>
                         <port>
                             <value>179</value>
                         </port>
                     </port-list>
                     <port-list>
-                        <port-list-name>CPMF_V6-NETCONF-PORTS</port-list-name>
-                        <port>
-                            <value>830</value>
-                        </port>
-                    </port-list>
-                    <port-list>
-                        <port-list-name>CPMF_V6-SSH-DST_PORTS</port-list-name>
+                        <port-list-name>IP_EDGE_IN-SNMP-PORTS</port-list-name>
                         <port>
-                            <value>22</value>
+                            <value>161</value>
                         </port>
                     </port-list>
                     <port-list>
-                        <port-list-name>CPMF_V6-TRACEROUTE-PORT_RANGE</port-list-name>
+                        <port-list-name>IP_EDGE_IN-TRACEROUTE-PORT_RANGE</port-list-name>
                         <range>
                             <start>33434</start>
                             <end>33534</end>
                         </range>
                     </port-list>
+                    <port-list>
+                        <port-list-name>IP_EDGE_IN_V6-BFD-DST_PORT_RANGE</port-list-name>
+                        <range>
+                            <start>3784</start>
+                            <end>3785</end>
+                        </range>
+                    </port-list>
+                    <port-list>
+                        <port-list-name>IP_EDGE_IN_V6-BGP-PORTS</port-list-name>
+                        <port>
+                            <value>179</value>
+                        </port>
+                    </port-list>
                 </match-list>
+                <ip-filter>
+                    <filter-name>IP_EDGE_IN</filter-name>
+                    <default-action>drop</default-action>
+                    <scope>embedded</scope>
+                    <entry>
+                        <entry-id>10</entry-id>
+                        <description>BOGONS</description>
+                        <match>
+                            <src-ip>
+                                <ip-prefix-list>BOGONS_LIST</ip-prefix-list>
+                            </src-ip>
+                        </match>
+                        <action>
+                            <drop/>
+                        </action>
+                    </entry>
+                    <entry>
+                        <entry-id>20</entry-id>
+                        <description>BGP</description>
+                        <match>
+                            <protocol>tcp</protocol>
+                            <src-ip>
+                                <ip-prefix-list>BGP_PEERS_BASE</ip-prefix-list>
+                            </src-ip>
+                            <port>
+                                <port-list>IP_EDGE_IN-BGP-PORTS</port-list>
+                            </port>
+                        </match>
+                        <action>
+                            <accept/>
+                        </action>
+                    </entry>
+                    <entry>
+                        <entry-id>30</entry-id>
+                        <description>BFD</description>
+                        <match>
+                            <protocol>udp</protocol>
+                            <src-ip>
+                                <ip-prefix-list>BGP_PEERS_BASE</ip-prefix-list>
+                            </src-ip>
+                            <dst-port>
+                                <port-list>IP_EDGE_IN-BFD-DST_PORT_RANGE</port-list>
+                            </dst-port>
+                        </match>
+                        <action>
+                            <accept/>
+                        </action>
+                    </entry>
+                    <entry>
+                        <entry-id>40</entry-id>
+                        <description>TUNNELS</description>
+                        <match>
+                            <protocol-list>IP_EDGE_IN-TUNNELS-PROTO</protocol-list>
+                            <dst-ip>
+                                <ip-prefix-list>GEANT_ADDRESS_SPACE</ip-prefix-list>
+                            </dst-ip>
+                        </match>
+                        <action>
+                            <accept/>
+                        </action>
+                    </entry>
+                    <entry>
+                        <entry-id>50</entry-id>
+                        <description>SNMP</description>
+                        <match>
+                            <protocol>udp</protocol>
+                            <dst-ip>
+                                <ip-prefix-list>GEANT_ADDRESS_SPACE</ip-prefix-list>
+                            </dst-ip>
+                            <port>
+                                <port-list>IP_EDGE_IN-SNMP-PORTS</port-list>
+                            </port>
+                        </match>
+                        <action>
+                            <accept/>
+                        </action>
+                    </entry>
+                    <entry>
+                        <entry-id>60</entry-id>
+                        <description>ICMP</description>
+                        <match>
+                            <protocol>icmp</protocol>
+                            <dst-ip>
+                                <ip-prefix-list>GEANT_ADDRESS_SPACE</ip-prefix-list>
+                            </dst-ip>
+                        </match>
+                        <action>
+                            <accept/>
+                            <rate-limit>
+                                <pir>10000</pir>
+                            </rate-limit>
+                        </action>
+                    </entry>
+                    <entry>
+                        <entry-id>70</entry-id>
+                        <description>TRACEROUTE</description>
+                        <match>
+                            <protocol>udp</protocol>
+                            <dst-ip>
+                                <ip-prefix-list>GEANT_ADDRESS_SPACE</ip-prefix-list>
+                            </dst-ip>
+                            <port>
+                                <port-list>IP_EDGE_IN-TRACEROUTE-PORT_RANGE</port-list>
+                            </port>
+                        </match>
+                        <action>
+                            <accept/>
+                            <rate-limit>
+                                <pir>10000</pir>
+                            </rate-limit>
+                        </action>
+                    </entry>
+                    <entry>
+                        <entry-id>80</entry-id>
+                        <description>CORE</description>
+                        <match>
+                            <dst-ip>
+                                <ip-prefix-list>GEANT_ADDRESS_SPACE</ip-prefix-list>
+                            </dst-ip>
+                        </match>
+                        <action>
+                            <drop/>
+                        </action>
+                    </entry>
+                </ip-filter>
+                <ip-filter>
+                    <filter-name>IP_EDGE_OUT</filter-name>
+                    <default-action>drop</default-action>
+                    <scope>embedded</scope>
+                    <entry>
+                        <entry-id>10</entry-id>
+                        <description>MULTICAST</description>
+                        <match>
+                            <dst-ip>
+                                <ip-prefix-list>MULTICAST_GROUP_RANGES</ip-prefix-list>
+                            </dst-ip>
+                        </match>
+                        <action>
+                            <accept/>
+                        </action>
+                    </entry>
+                </ip-filter>
+                <ip-filter>
+                    <filter-name>JISC_EDGE_IN</filter-name>
+                    <default-action>accept</default-action>
+                    <chain-to-system-filter>false</chain-to-system-filter>
+                    <entry>
+                        <entry-id>1075</entry-id>
+                        <description>EXTERNAL_PROJECT</description>
+                        <match>
+                            <dst-ip>
+                                <ip-prefix-list>GEANT_EXTERNAL_PROJECT</ip-prefix-list>
+                            </dst-ip>
+                        </match>
+                        <action>
+                            <accept/>
+                        </action>
+                    </entry>
+                    <embed>
+                        <filter>
+                            <name>IP_EDGE_IN</name>
+                            <offset>1000</offset>
+                        </filter>
+                        <flowspec>
+                            <offset>10000</offset>
+                            <router-instance>Base</router-instance>
+                        </flowspec>
+                    </embed>
+                </ip-filter>
+                <ip-filter>
+                    <filter-name>JISC_EDGE_OUT</filter-name>
+                    <default-action>accept</default-action>
+                    <chain-to-system-filter>false</chain-to-system-filter>
+                    <embed>
+                        <filter>
+                            <name>IP_EDGE_OUT</name>
+                            <offset>1000</offset>
+                        </filter>
+                    </embed>
+                </ip-filter>
+                <ip-filter>
+                    <filter-name>LHCONE_JISC_IN</filter-name>
+                    <default-action>accept</default-action>
+                    <chain-to-system-filter>false</chain-to-system-filter>
+                    <embed>
+                        <filter>
+                            <name>IP_EDGE_IN</name>
+                            <offset>1000</offset>
+                        </filter>
+                    </embed>
+                </ip-filter>
+                <ip-filter>
+                    <filter-name>LHCONE_JISC_OUT</filter-name>
+                    <default-action>accept</default-action>
+                    <chain-to-system-filter>false</chain-to-system-filter>
+                    <embed>
+                        <filter>
+                            <name>IP_EDGE_OUT</name>
+                            <offset>1000</offset>
+                        </filter>
+                    </embed>
+                </ip-filter>
+                <ipv6-filter>
+                    <filter-name>IP_EDGE_IN_V6</filter-name>
+                    <default-action>drop</default-action>
+                    <scope>embedded</scope>
+                    <entry>
+                        <entry-id>10</entry-id>
+                        <description>BOGONS</description>
+                        <match>
+                            <src-ip>
+                                <ipv6-prefix-list>BOGONS_LIST</ipv6-prefix-list>
+                            </src-ip>
+                        </match>
+                        <action>
+                            <drop/>
+                        </action>
+                    </entry>
+                    <entry>
+                        <entry-id>20</entry-id>
+                        <description>BGP</description>
+                        <match>
+                            <next-header>tcp</next-header>
+                            <src-ip>
+                                <ipv6-prefix-list>BGP_PEERS_BASE</ipv6-prefix-list>
+                            </src-ip>
+                            <port>
+                                <port-list>IP_EDGE_IN_V6-BGP-PORTS</port-list>
+                            </port>
+                        </match>
+                        <action>
+                            <accept/>
+                        </action>
+                    </entry>
+                    <entry>
+                        <entry-id>30</entry-id>
+                        <description>BFD</description>
+                        <match>
+                            <next-header>udp</next-header>
+                            <src-ip>
+                                <ipv6-prefix-list>BGP_PEERS_BASE</ipv6-prefix-list>
+                            </src-ip>
+                            <dst-port>
+                                <port-list>IP_EDGE_IN_V6-BFD-DST_PORT_RANGE</port-list>
+                            </dst-port>
+                        </match>
+                        <action>
+                            <accept/>
+                        </action>
+                    </entry>
+                    <entry>
+                        <entry-id>40</entry-id>
+                        <description>ICMP_V6</description>
+                        <match>
+                            <next-header>ipv6-icmp</next-header>
+                            <dst-ip>
+                                <ipv6-prefix-list>GEANT_ADDRESS_SPACE</ipv6-prefix-list>
+                            </dst-ip>
+                        </match>
+                        <action>
+                            <accept/>
+                            <rate-limit>
+                                <pir>10000</pir>
+                            </rate-limit>
+                        </action>
+                    </entry>
+                    <entry>
+                        <entry-id>50</entry-id>
+                        <description>TRACEROUTE</description>
+                        <match>
+                            <next-header>udp</next-header>
+                            <dst-ip>
+                                <ipv6-prefix-list>GEANT_ADDRESS_SPACE</ipv6-prefix-list>
+                            </dst-ip>
+                        </match>
+                        <action>
+                            <accept/>
+                            <rate-limit>
+                                <pir>10000</pir>
+                            </rate-limit>
+                        </action>
+                    </entry>
+                    <entry>
+                        <entry-id>60</entry-id>
+                        <description>CORE</description>
+                        <match>
+                            <dst-ip>
+                                <ipv6-prefix-list>GEANT_CORE</ipv6-prefix-list>
+                            </dst-ip>
+                        </match>
+                        <action>
+                            <drop/>
+                        </action>
+                    </entry>
+                </ipv6-filter>
+                <ipv6-filter>
+                    <filter-name>IP_EDGE_OUT_V6</filter-name>
+                    <default-action>drop</default-action>
+                    <scope>embedded</scope>
+                    <entry>
+                        <entry-id>10</entry-id>
+                        <description>MULTICAST</description>
+                        <match>
+                            <dst-ip>
+                                <ipv6-prefix-list>MULTICAST_GROUP_RANGES</ipv6-prefix-list>
+                            </dst-ip>
+                        </match>
+                        <action>
+                            <accept/>
+                        </action>
+                    </entry>
+                </ipv6-filter>
+                <ipv6-filter>
+                    <filter-name>JISC_EDGE_IN_V6</filter-name>
+                    <default-action>accept</default-action>
+                    <chain-to-system-filter>false</chain-to-system-filter>
+                    <entry>
+                        <entry-id>10055</entry-id>
+                        <description>EXTERNAL_PROJECT6</description>
+                        <match>
+                            <dst-ip>
+                                <ipv6-prefix-list>GEANT_EXTERNAL_PROJECT6</ipv6-prefix-list>
+                            </dst-ip>
+                        </match>
+                        <action>
+                            <accept/>
+                        </action>
+                    </entry>
+                    <embed>
+                        <filter>
+                            <name>IP_EDGE_IN_V6</name>
+                            <offset>10000</offset>
+                        </filter>
+                        <flowspec>
+                            <offset>20000</offset>
+                            <router-instance>Base</router-instance>
+                        </flowspec>
+                    </embed>
+                </ipv6-filter>
+                <ipv6-filter>
+                    <filter-name>JISC_EDGE_OUT_V6</filter-name>
+                    <default-action>accept</default-action>
+                    <chain-to-system-filter>false</chain-to-system-filter>
+                    <embed>
+                        <filter>
+                            <name>IP_EDGE_OUT_V6</name>
+                            <offset>2000</offset>
+                        </filter>
+                    </embed>
+                </ipv6-filter>
+                <ipv6-filter>
+                    <filter-name>LHCONE_JISC_IN_V6</filter-name>
+                    <default-action>accept</default-action>
+                    <chain-to-system-filter>false</chain-to-system-filter>
+                    <embed>
+                        <filter>
+                            <name>IP_EDGE_IN_V6</name>
+                            <offset>10000</offset>
+                        </filter>
+                    </embed>
+                </ipv6-filter>
+                <ipv6-filter>
+                    <filter-name>LHCONE_JISC_OUT_V6</filter-name>
+                    <default-action>accept</default-action>
+                    <chain-to-system-filter>false</chain-to-system-filter>
+                    <embed>
+                        <filter>
+                            <name>IP_EDGE_OUT_V6</name>
+                            <offset>2000</offset>
+                        </filter>
+                    </embed>
+                </ipv6-filter>
                 <md-auto-id>
                     <filter-id-range>
                         <start>10</start>
@@ -1046,13 +3102,297 @@
                     <administrative-key>1</administrative-key>
                 </lacp>
                 <port>
-                    <port-id>2/1/c2/1</port-id>
+                    <port-id>1/1/c19/1</port-id>
+                </port>
+                <port>
+                    <port-id>2/1/c19/1</port-id>
+                </port>
+            </lag>
+            <lag>
+                <lag-name>lag-2</lag-name>
+                <admin-state>enable</admin-state>
+                <description>LAG INFRASTRUCTURE BACKBONE $GA-01761 | LON-LON2</description>
+                <mode>network</mode>
+                <lacp>
+                    <mode>active</mode>
+                    <administrative-key>2</administrative-key>
+                </lacp>
+                <port>
+                    <port-id>1/1/c1/1</port-id>
+                </port>
+                <port>
+                    <port-id>1/1/c5/1</port-id>
+                </port>
+            </lag>
+            <lag>
+                <lag-name>lag-6</lag-name>
+                <admin-state>enable</admin-state>
+                <description>LAG INFRASTRUCTURE BACKBONE $GA-02388 | COR-LON2</description>
+                <mode>network</mode>
+                <lacp>
+                    <mode>active</mode>
+                    <administrative-key>6</administrative-key>
+                </lacp>
+                <bfd-liveness>
+                    <ipv4>
+                        <admin-state>enable</admin-state>
+                        <multiplier>3</multiplier>
+                        <receive-interval>3000</receive-interval>
+                        <transmit-interval>3000</transmit-interval>
+                        <local-ip-address>62.40.96.25</local-ip-address>
+                        <remote-ip-address>62.40.96.69</remote-ip-address>
+                    </ipv4>
+                </bfd-liveness>
+                <port>
+                    <port-id>1/1/c8/1</port-id>
+                </port>
+            </lag>
+            <lag>
+                <lag-name>lag-8</lag-name>
+                <admin-state>enable</admin-state>
+                <description>LAG INFRASTRUCTURE BACKBONE $GA-01762 | LON2-PAR</description>
+                <mode>network</mode>
+                <lacp>
+                    <mode>active</mode>
+                    <administrative-key>8</administrative-key>
+                </lacp>
+                <port>
+                    <port-id>1/1/c13/1</port-id>
+                </port>
+                <port>
+                    <port-id>1/1/c17/1</port-id>
+                </port>
+            </lag>
+            <lag>
+                <lag-name>lag-20</lag-name>
+                <admin-state>enable</admin-state>
+                <description>LAG CUSTOMER JISC | $GA-01760 | #JISC-AP2-LAG</description>
+                <encap-type>dot1q</encap-type>
+                <mode>access</mode>
+                <port-threshold>
+                    <value>3</value>
+                    <action>down</action>
+                </port-threshold>
+                <lacp>
+                    <mode>active</mode>
+                    <administrative-key>20</administrative-key>
+                </lacp>
+                <port>
+                    <port-id>1/1/c11/1</port-id>
+                </port>
+                <port>
+                    <port-id>1/1/c11/2</port-id>
                 </port>
                 <port>
-                    <port-id>2/1/c2/2</port-id>
+                    <port-id>1/1/c12/1</port-id>
+                </port>
+                <port>
+                    <port-id>1/1/c12/2</port-id>
                 </port>
             </lag>
             <log>
+                <log-events>
+                    <chassis>
+                        <event>tmnxEqOperStateChange</event>
+                        <generate>true</generate>
+                    </chassis>
+                    <chassis>
+                        <event>tmnxEqMdaXplError</event>
+                        <generate>true</generate>
+                    </chassis>
+                    <chassis>
+                        <event>tmnxEqCardPChipError</event>
+                        <generate>true</generate>
+                    </chassis>
+                    <chassis>
+                        <event>tmnxEqCardPChipMemoryEvent</event>
+                        <generate>true</generate>
+                    </chassis>
+                    <chassis>
+                        <event>tmnxEqCardQChipBufMemoryEvent</event>
+                        <generate>true</generate>
+                    </chassis>
+                    <chassis>
+                        <event>tmnxEqCardQChipStatsMemoryEvent</event>
+                        <generate>true</generate>
+                    </chassis>
+                    <chassis>
+                        <event>tmnxEqCardQChipIntMemoryEvent</event>
+                        <generate>true</generate>
+                    </chassis>
+                    <chassis>
+                        <event>tmnxEqCardChipIfDownEvent</event>
+                        <generate>true</generate>
+                    </chassis>
+                    <chassis>
+                        <event>tmnxEqCardChipIfCellEvent</event>
+                        <generate>true</generate>
+                    </chassis>
+                    <chassis>
+                        <event>tmnxEqLowSwitchFabricCap</event>
+                        <generate>true</generate>
+                    </chassis>
+                    <chassis>
+                        <event>tmnxEqLowSwitchFabricCapClear</event>
+                        <generate>true</generate>
+                    </chassis>
+                    <chassis>
+                        <event>tmnxEqCardTChipParityEvent</event>
+                        <generate>true</generate>
+                    </chassis>
+                    <chassis>
+                        <event>tmnxEqMdaIngrXplError</event>
+                        <generate>true</generate>
+                    </chassis>
+                    <chassis>
+                        <event>tmnxEqBpEpromWarning</event>
+                        <generate>true</generate>
+                    </chassis>
+                    <chassis>
+                        <event>tmnxEqBpEpromWarningClear</event>
+                        <generate>true</generate>
+                    </chassis>
+                    <chassis>
+                        <event>tmnxEqFpgaSoftError</event>
+                        <generate>true</generate>
+                    </chassis>
+                    <ldp>
+                        <event>vRtrLdpNgIfStateChange</event>
+                        <generate>true</generate>
+                    </ldp>
+                    <ldp>
+                        <event>vRtrLdpNgInetIfStateChange</event>
+                        <generate>true</generate>
+                    </ldp>
+                    <ldp>
+                        <event>vRtrLdpNgTargPeerStateChange</event>
+                        <generate>true</generate>
+                    </ldp>
+                    <mgmt-core>
+                        <event>mdConfigChange</event>
+                        <generate>true</generate>
+                    </mgmt-core>
+                    <mgmt-core>
+                        <event>mdOcConfigChange</event>
+                        <generate>true</generate>
+                    </mgmt-core>
+                    <mgmt-core>
+                        <event>mdBofConfigChange</event>
+                        <generate>true</generate>
+                    </mgmt-core>
+                    <mgmt-core>
+                        <event>mdDebugConfigChange</event>
+                        <generate>true</generate>
+                    </mgmt-core>
+                    <mgmt-core>
+                        <event>syncOperationStatusChange</event>
+                        <generate>true</generate>
+                    </mgmt-core>
+                    <mpls>
+                        <event>mplsTunnelRerouted</event>
+                        <generate>true</generate>
+                    </mpls>
+                    <mpls>
+                        <event>mplsTunnelReoptimized</event>
+                        <generate>true</generate>
+                    </mpls>
+                    <ntp>
+                        <event>tmnxNtpServerChange</event>
+                        <generate>true</generate>
+                    </ntp>
+                    <oam>
+                        <event>tmnxOamLdpTtraceFecPFailUpdate</event>
+                        <generate>true</generate>
+                    </oam>
+                    <ospf>
+                        <event>tmnxOspfAreaOriginateLsa</event>
+                        <generate>true</generate>
+                    </ospf>
+                    <ospf>
+                        <event>tmnxOspfAsOriginateLsa</event>
+                        <generate>true</generate>
+                    </ospf>
+                    <ospf>
+                        <event>tmnxOspfNgLinkOriginateLsa</event>
+                        <generate>true</generate>
+                    </ospf>
+                    <pim>
+                        <event>vRtrPimNgInvalidRegister</event>
+                        <generate>true</generate>
+                    </pim>
+                    <port>
+                        <event>tmnxPortAUIReset</event>
+                        <generate>true</generate>
+                    </port>
+                    <security>
+                        <event>md_cli_io</event>
+                        <generate>true</generate>
+                    </security>
+                    <security>
+                        <event>md_cli_unauth_io</event>
+                        <generate>true</generate>
+                    </security>
+                    <snmp>
+                        <event>authenticationFailure</event>
+                        <generate>true</generate>
+                    </snmp>
+                    <svcmgr>
+                        <event>tmnxSubBrgCreated</event>
+                        <generate>true</generate>
+                    </svcmgr>
+                    <svcmgr>
+                        <event>tmnxSubBrgDeleted</event>
+                        <generate>true</generate>
+                    </svcmgr>
+                    <system>
+                        <event>smScriptResult</event>
+                        <generate>true</generate>
+                    </system>
+                    <system>
+                        <event>smScriptException</event>
+                        <generate>true</generate>
+                    </system>
+                    <tls>
+                        <event>tmnxTlsInitiateSession</event>
+                        <generate>true</generate>
+                    </tls>
+                    <tls>
+                        <event>tmnxTlsTermination</event>
+                        <generate>true</generate>
+                    </tls>
+                    <tls>
+                        <event>tmnxTlsFailure</event>
+                        <generate>true</generate>
+                    </tls>
+                    <user>
+                        <event>cli_user_io</event>
+                        <generate>true</generate>
+                    </user>
+                    <user>
+                        <event>snmp_user_set</event>
+                        <generate>true</generate>
+                    </user>
+                    <user>
+                        <event>cli_unauth_user_io</event>
+                        <generate>true</generate>
+                    </user>
+                    <vrtr>
+                        <event>tmnxVRtrFibOccupancyThreshold</event>
+                        <generate>true</generate>
+                    </vrtr>
+                    <vrtr>
+                        <event>tmnxVRtrIfLdpSyncTimerStart</event>
+                        <generate>true</generate>
+                    </vrtr>
+                    <vrtr>
+                        <event>tmnxVRtrIfLdpSyncTimerStop</event>
+                        <generate>true</generate>
+                    </vrtr>
+                    <vrtr>
+                        <event>tmnxVRtrStaticRouteStatusChanged</event>
+                        <generate>true</generate>
+                    </vrtr>
+                </log-events>
                 <file>
                     <file-policy-name>20</file-policy-name>
                     <description>MESSAGES</description>
@@ -1290,6 +3630,4980 @@
                     <log-prefix>rt0.lon2.uk</log-prefix>
                 </syslog>
             </log>
+            <oam-pm>
+                <bin-group>
+                    <bin-group-id>2</bin-group-id>
+                    <admin-state>enable</admin-state>
+                </bin-group>
+                <session>
+                    <session-name>rt0.lon2.uk--rt0.lon.uk</session-name>
+                    <bin-group>2</bin-group>
+                    <ip>
+                        <destination>62.40.98.64</destination>
+                        <destination-udp-port>64364</destination-udp-port>
+                        <source>62.40.98.65</source>
+                        <twamp-light>
+                            <admin-state>enable</admin-state>
+                            <test-id>auto</test-id>
+                            <interval>1000</interval>
+                            <pad-size>10</pad-size>
+                            <record-stats>delay-and-loss</record-stats>
+                        </twamp-light>
+                    </ip>
+                </session>
+            </oam-pm>
+            <policy-options>
+                <as-path>
+                    <name>AS_COMMERCIAL_LOW_PREF</name>
+                    <expression>.* (702|703|3356|3549|5511|6762|6939|10026) .*</expression>
+                </as-path>
+                <as-path>
+                    <name>AS_COMMERCIAL_REJECT</name>
+                    <expression>.* (1|42|174|286|701|1239|1273|1299|2119|2551|2828|2856|2914|3257|3561|3856|4436|6453|6939|9002|12989|15412|19080|19151|12200|14294|16509|16839|18541|19793|22556|33011|26769|46786|22822|20940|8075|16265|19281|29748|16276|37958|38670|10310|30094|35415) .*</expression>
+                </as-path>
+                <as-path>
+                    <name>AS_PRIVATE</name>
+                    <expression>.* (0|64512-65535|4200000000-4294967295) .*</expression>
+                </as-path>
+                <as-path>
+                    <name>AS_SELF</name>
+                    <expression>.*(20965|21320).*</expression>
+                </as-path>
+                <community>
+                    <name>GEANT_ANYCAST</name>
+                    <member>
+                        <member>20965:2</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_DUMMY</name>
+                    <member>
+                        <member>20965:65000</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_FOD</name>
+                    <member>
+                        <member>20965:9</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_GOOGLE</name>
+                    <member>
+                        <member>20965:15169</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_GWS</name>
+                    <member>
+                        <member>20965:7777</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_IAS_NREN_AMS</name>
+                    <member>
+                        <member>21320:64913</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_IAS_NREN_ATH</name>
+                    <member>
+                        <member>21320:64914</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_IAS_NREN_BIL</name>
+                    <member>
+                        <member>21320:64947</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_IAS_NREN_BRA</name>
+                    <member>
+                        <member>21320:64915</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_IAS_NREN_BRU</name>
+                    <member>
+                        <member>21320:64916</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_IAS_NREN_BUC</name>
+                    <member>
+                        <member>21320:64917</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_IAS_NREN_BUD</name>
+                    <member>
+                        <member>21320:64918</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_IAS_NREN_CHI</name>
+                    <member>
+                        <member>21320:64945</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_IAS_NREN_COR</name>
+                    <member>
+                        <member>21320:64948</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_IAS_NREN_DUB</name>
+                    <member>
+                        <member>21320:64920</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_IAS_NREN_FRA</name>
+                    <member>
+                        <member>21320:64922</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_IAS_NREN_GEN</name>
+                    <member>
+                        <member>21320:64923</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_IAS_NREN_HAM</name>
+                    <member>
+                        <member>21320:64924</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_IAS_NREN_KAU</name>
+                    <member>
+                        <member>21320:64925</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_IAS_NREN_KIE</name>
+                    <member>
+                        <member>21320:64946</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_IAS_NREN_LIS</name>
+                    <member>
+                        <member>21320:64926</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_IAS_NREN_LJU</name>
+                    <member>
+                        <member>21320:64927</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_IAS_NREN_LON</name>
+                    <member>
+                        <member>21320:64928</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_IAS_NREN_MAD</name>
+                    <member>
+                        <member>21320:64930</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_IAS_NREN_MAR</name>
+                    <member>
+                        <member>21320:64931</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_IAS_NREN_MIL2</name>
+                    <member>
+                        <member>21320:64933</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_IAS_NREN_PAR</name>
+                    <member>
+                        <member>21320:64935</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_IAS_NREN_POR</name>
+                    <member>
+                        <member>21320:64944</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_IAS_NREN_POZ</name>
+                    <member>
+                        <member>21320:64936</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_IAS_NREN_PRA</name>
+                    <member>
+                        <member>21320:64937</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_IAS_NREN_RIG</name>
+                    <member>
+                        <member>21320:64938</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_IAS_NREN_SOF</name>
+                    <member>
+                        <member>21320:64939</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_IAS_NREN_TAR</name>
+                    <member>
+                        <member>21320:64949</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_IAS_NREN_THE</name>
+                    <member>
+                        <member>21320:64950</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_IAS_NREN_VIE</name>
+                    <member>
+                        <member>21320:64941</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_IAS_NREN_ZAG</name>
+                    <member>
+                        <member>21320:64942</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_INTERCO_BLOCK</name>
+                    <member>
+                        <member>20965:0</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_IXPEERS</name>
+                    <member>
+                        <member>20965:3</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_JISC</name>
+                    <member>
+                        <member>20965:786</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_JISC_BLOCK</name>
+                    <member>
+                        <member>64512:786</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_LOW_PREF</name>
+                    <member>
+                        <member>20965:1</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_NREN_AMS</name>
+                    <member>
+                        <member>20965:64913</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_NREN_ATH</name>
+                    <member>
+                        <member>20965:64914</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_NREN_BIL</name>
+                    <member>
+                        <member>20965:64947</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_NREN_BRA</name>
+                    <member>
+                        <member>20965:64915</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_NREN_BRU</name>
+                    <member>
+                        <member>20965:64916</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_NREN_BUC</name>
+                    <member>
+                        <member>20965:64917</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_NREN_BUD</name>
+                    <member>
+                        <member>20965:64918</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_NREN_CHI</name>
+                    <member>
+                        <member>20965:64945</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_NREN_COR</name>
+                    <member>
+                        <member>20965:64948</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_NREN_DUB</name>
+                    <member>
+                        <member>20965:64920</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_NREN_FRA</name>
+                    <member>
+                        <member>20965:64922</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_NREN_GEN</name>
+                    <member>
+                        <member>20965:64923</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_NREN_HAM</name>
+                    <member>
+                        <member>20965:64924</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_NREN_KAU</name>
+                    <member>
+                        <member>20965:64925</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_NREN_KIE</name>
+                    <member>
+                        <member>20965:64946</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_NREN_LIS</name>
+                    <member>
+                        <member>20965:64926</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_NREN_LJU</name>
+                    <member>
+                        <member>20965:64927</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_NREN_LON</name>
+                    <member>
+                        <member>20965:64928</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_NREN_LON2</name>
+                    <member>
+                        <member>20965:64929</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_NREN_MAD</name>
+                    <member>
+                        <member>20965:64930</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_NREN_MAR</name>
+                    <member>
+                        <member>20965:64931</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_NREN_MIL2</name>
+                    <member>
+                        <member>20965:64933</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_NREN_PAR</name>
+                    <member>
+                        <member>20965:64935</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_NREN_POR</name>
+                    <member>
+                        <member>20965:64944</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_NREN_POZ</name>
+                    <member>
+                        <member>20965:64936</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_NREN_PRA</name>
+                    <member>
+                        <member>20965:64937</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_NREN_RIG</name>
+                    <member>
+                        <member>20965:64938</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_NREN_SOF</name>
+                    <member>
+                        <member>20965:64939</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_NREN_TAR</name>
+                    <member>
+                        <member>20965:64949</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_NREN_THE</name>
+                    <member>
+                        <member>20965:64950</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_NREN_VIE</name>
+                    <member>
+                        <member>20965:64941</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_NREN_ZAG</name>
+                    <member>
+                        <member>20965:64942</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_NRN</name>
+                    <member>
+                        <member>20965:155</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_PEERS</name>
+                    <member>
+                        <member>20965:4</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_PEER_RE</name>
+                    <member>
+                        <member>20965:65530</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GEANT_RTBH</name>
+                    <member>
+                        <member>20965:8</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GLOBAL_ANYCAST_IAS</name>
+                    <member>
+                        <member>21320:7</member>
+                    </member>
+                </community>
+                <community>
+                    <name>GLOBAL_ANYCAST_RE</name>
+                    <member>
+                        <member>20965:7</member>
+                    </member>
+                </community>
+                <community>
+                    <name>IAS_AGGREGATE_ROUTES</name>
+                    <member>
+                        <member>21320:64912</member>
+                    </member>
+                </community>
+                <community>
+                    <name>LHCONE_BACKBONE</name>
+                    <member>
+                        <member>61339:60002</member>
+                    </member>
+                </community>
+                <community>
+                    <name>NO_EXPORT</name>
+                    <member>
+                        <member>65535:65281</member>
+                    </member>
+                </community>
+                <community>
+                    <name>ORIGIN_VALIDATION_STATE_INVALID</name>
+                    <member>
+                        <member>ext:4300:2</member>
+                    </member>
+                </community>
+                <community>
+                    <name>ORIGIN_VALIDATION_STATE_UNKNOWN</name>
+                    <member>
+                        <member>ext:4300:1</member>
+                    </member>
+                </community>
+                <community>
+                    <name>ORIGIN_VALIDATION_STATE_VALID</name>
+                    <member>
+                        <member>ext:4300:0</member>
+                    </member>
+                </community>
+                <community>
+                    <name>TE_BLOCK_ALL_PUBLIC_PEERS</name>
+                    <member>
+                        <member>64512:65532</member>
+                    </member>
+                </community>
+                <community>
+                    <name>TE_BLOCK_PEERS_2</name>
+                    <member>
+                        <member>64512:65533</member>
+                    </member>
+                </community>
+                <community>
+                    <name>TE_PRIVATE_COMMUNITIES</name>
+                    <member>
+                        <member>^(64[6-9][0-9][0-9]|65[0-4][0-9][0-9]|655[0-2][0-9]|6553[0-5]).*$</member>
+                    </member>
+                </community>
+                <prefix-list>
+                    <name>BOGONS</name>
+                    <prefix>
+                        <ip-prefix>0.0.0.0/0</ip-prefix>
+                        <type>exact</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>0.0.0.0/8</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>10.0.0.0/8</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>100.64.0.0/10</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>127.0.0.0/8</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>169.254.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>172.16.0.0/12</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.0.0.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.0.2.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.168.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>198.18.0.0/15</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>198.51.100.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>203.0.113.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>224.0.0.0/3</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>::/0</ip-prefix>
+                        <type>exact</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>::/96</ip-prefix>
+                        <type>exact</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>::1/128</ip-prefix>
+                        <type>exact</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>::ffff:0.0.0.0/96</ip-prefix>
+                        <type>exact</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>100::/64</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:10::/28</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:db8::/32</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>3ffe::/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>fc00::/7</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>fe80::/10</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>fec0::/10</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>ff00::/8</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                </prefix-list>
+                <prefix-list>
+                    <name>GEANT_ANYCAST</name>
+                    <prefix>
+                        <ip-prefix>192.33.14.0/24</ip-prefix>
+                        <type>exact</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.58.128.0/24</ip-prefix>
+                        <type>exact</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.0.1.0/24</ip-prefix>
+                        <type>exact</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.0.2.0/24</ip-prefix>
+                        <type>exact</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:678:4::/48</ip-prefix>
+                        <type>exact</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:678:5::/48</ip-prefix>
+                        <type>exact</type>
+                    </prefix>
+                </prefix-list>
+                <prefix-list>
+                    <name>GLOBAL_ANYCAST</name>
+                    <prefix>
+                        <ip-prefix>170.247.170.0/24</ip-prefix>
+                        <type>exact</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.5.5.0/24</ip-prefix>
+                        <type>exact</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.33.4.0/24</ip-prefix>
+                        <type>exact</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.33.14.0/24</ip-prefix>
+                        <type>exact</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.36.148.0/24</ip-prefix>
+                        <type>exact</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.58.128.0/24</ip-prefix>
+                        <type>exact</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.112.36.0/24</ip-prefix>
+                        <type>exact</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.203.230.0/24</ip-prefix>
+                        <type>exact</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.0.14.0/24</ip-prefix>
+                        <type>exact</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>198.41.0.0/24</ip-prefix>
+                        <type>exact</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>198.97.190.0/24</ip-prefix>
+                        <type>exact</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>199.7.83.0/24</ip-prefix>
+                        <type>exact</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>199.7.91.0/24</ip-prefix>
+                        <type>exact</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>202.12.27.0/24</ip-prefix>
+                        <type>exact</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:200:c000::/35</ip-prefix>
+                        <type>exact</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:500:1::/48</ip-prefix>
+                        <type>exact</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:500:2::/48</ip-prefix>
+                        <type>exact</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:500:12::/48</ip-prefix>
+                        <type>exact</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:500:2d::/48</ip-prefix>
+                        <type>exact</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:500:2f::/48</ip-prefix>
+                        <type>exact</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:500:9f::/48</ip-prefix>
+                        <type>exact</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:500:a8::/48</ip-prefix>
+                        <type>exact</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:503:c27::/48</ip-prefix>
+                        <type>exact</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:503:ba3e::/48</ip-prefix>
+                        <type>exact</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:7fd::/48</ip-prefix>
+                        <type>exact</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:7fe::/33</ip-prefix>
+                        <type>exact</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:dc3::/32</ip-prefix>
+                        <type>exact</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2801:1b8:10::/48</ip-prefix>
+                        <type>exact</type>
+                    </prefix>
+                </prefix-list>
+                <prefix-list>
+                    <name>IXPREFIXES</name>
+                    <prefix>
+                        <ip-prefix>80.81.192.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>80.249.208.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>91.210.16.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>185.1.47.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>185.1.192.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>185.6.36.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.65.185.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.188.137.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.203.0.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>195.66.224.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>217.29.66.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:7f8::/64</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:7f8:1::/64</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:7f8:4::/64</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:7f8:b:100::/64</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:7f8:14::/64</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:7f8:18::/64</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:7f8:1c:24a::/64</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:7f8:30::/64</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:7f8:35::/64</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:7f8:36::/64</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:7f8:a0::/64</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                </prefix-list>
+                <prefix-list>
+                    <name>JISC_NREN_PREFIXES_IPV4</name>
+                    <prefix>
+                        <ip-prefix>2.56.196.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2.57.200.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2.57.200.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>5.83.96.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>5.149.8.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>5.150.0.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>5.150.8.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>5.150.24.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>5.150.63.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>5.150.64.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>5.150.65.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>5.150.66.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>5.150.67.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>5.150.68.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>5.150.69.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>5.150.70.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>5.150.71.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>5.150.72.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>5.150.73.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>5.150.74.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>5.150.75.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>5.150.76.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>5.150.77.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>5.150.80.0/20</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>5.150.96.0/19</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>5.150.124.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>5.158.88.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>5.255.48.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>37.1.152.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>38.117.94.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>44.32.0.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>44.155.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>45.88.80.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>45.144.8.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>46.34.0.0/19</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>46.60.128.0/17</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>46.60.252.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>46.60.254.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>46.254.200.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>62.84.224.0/19</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>62.171.192.0/19</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>62.171.224.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>62.171.252.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>77.72.72.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>77.72.72.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>77.72.72.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>77.72.74.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>77.72.76.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>77.72.78.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>77.72.78.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>77.72.79.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>77.87.24.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>77.241.76.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>78.40.232.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>78.154.96.0/19</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>79.121.128.0/17</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>80.249.48.0/20</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>80.249.48.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>80.249.52.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>80.249.56.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>80.249.57.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>80.249.58.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>80.249.59.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>80.249.60.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>81.87.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>81.208.128.0/20</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>82.138.192.0/18</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>82.151.224.0/19</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>82.203.0.0/17</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>82.203.6.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>82.203.96.0/20</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>82.203.113.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>83.138.32.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>83.148.128.0/18</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>85.12.64.0/18</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>85.12.64.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>85.12.65.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>85.12.78.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>85.12.80.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>85.12.124.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>85.12.125.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>85.31.136.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>85.31.137.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>85.31.143.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>85.119.224.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>85.119.229.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>85.158.64.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>85.189.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>86.53.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>87.32.0.0/12</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>89.207.208.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>89.251.192.0/20</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>91.123.224.0/20</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>91.193.188.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>91.194.152.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>91.194.220.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>91.195.182.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>91.195.183.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>91.196.28.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>91.198.180.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>91.209.34.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>91.213.110.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>91.216.181.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>91.216.246.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>91.225.16.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>91.227.178.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>91.231.46.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>91.231.90.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>91.234.214.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>91.236.56.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>91.237.67.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>91.240.2.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>91.240.24.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>91.244.229.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>92.42.56.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>92.43.64.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>92.54.128.0/18</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>92.245.224.0/19</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>93.93.216.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>93.152.0.0/17</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>93.157.216.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>94.185.128.0/17</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>94.198.172.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>95.130.144.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>95.152.208.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>95.152.216.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>95.152.220.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>95.152.227.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>95.152.228.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>95.152.232.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>95.152.240.0/20</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>95.177.0.0/17</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>103.233.180.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>103.233.180.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>103.233.181.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>109.204.0.0/17</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>113.29.23.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>128.16.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>128.40.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>128.41.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>128.41.0.0/18</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>128.86.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>128.98.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>128.98.0.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>128.98.80.0/20</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>128.98.80.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>128.98.84.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>128.98.144.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>128.98.224.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>128.98.224.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>128.98.226.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>128.98.228.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>128.98.232.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>128.232.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>128.240.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>128.243.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>129.11.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>129.12.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>129.31.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>129.67.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>129.169.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>129.215.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>129.234.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>130.88.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>130.117.8.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>130.159.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>130.209.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>130.246.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>131.111.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>131.176.246.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>131.227.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>131.231.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>131.251.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>132.174.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>132.174.41.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>132.185.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>132.185.128.0/20</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>132.185.132.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>132.185.144.0/20</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>132.185.144.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>132.185.145.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>132.185.146.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>132.185.147.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>132.185.148.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>132.185.149.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>132.185.150.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>132.185.151.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>132.185.152.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>132.185.153.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>132.185.154.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>132.185.155.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>132.185.156.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>132.185.157.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>132.185.158.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>132.185.159.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>132.185.240.0/20</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>132.185.240.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>132.185.241.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>132.185.242.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>132.185.243.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>132.185.244.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>132.185.245.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>132.185.246.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>132.185.247.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>132.185.248.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>132.185.249.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>132.185.250.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>132.185.251.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>132.185.252.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>132.185.253.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>132.185.254.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>132.185.255.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>134.36.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>134.83.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>134.151.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>134.219.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>134.220.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>134.225.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>134.226.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>135.196.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>136.148.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>136.156.0.0/19</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>136.156.82.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>136.156.88.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>136.156.160.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>136.156.176.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>136.201.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>136.206.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>137.43.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>137.44.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>137.50.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>137.73.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>137.108.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>137.195.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>137.205.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>137.221.223.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>137.222.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>137.253.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>138.37.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>138.38.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>138.40.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>138.124.224.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>138.124.236.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>138.250.0.0/15</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>138.253.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>139.133.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>139.143.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>139.153.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>139.166.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>139.184.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>139.184.0.0/17</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>139.184.128.0/17</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>139.222.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>140.97.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>140.203.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>141.0.32.0/19</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>141.163.0.0/17</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>141.170.64.0/19</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>141.170.96.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>141.170.100.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>141.241.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>143.52.0.0/15</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>143.117.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>143.167.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>143.210.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>143.234.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>143.239.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>144.32.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>144.82.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>144.124.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>144.173.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>145.116.216.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>146.80.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>146.87.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>146.97.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>146.169.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>146.176.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>146.179.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>146.191.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>146.227.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>147.143.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>147.188.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>147.197.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>147.252.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>148.79.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>148.88.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>148.197.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>149.153.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>149.155.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>149.157.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>149.170.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>150.204.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>150.237.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>151.133.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>151.133.0.0/20</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>151.133.16.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>151.133.24.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>151.133.31.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>151.133.32.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>151.133.34.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>151.133.40.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>151.133.48.0/20</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>151.133.64.0/18</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>151.133.128.0/18</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>151.133.192.0/19</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>151.133.199.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>151.133.224.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>151.133.232.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>151.133.236.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>151.133.237.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>151.133.238.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>151.133.240.0/20</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>152.71.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>152.78.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>152.105.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>154.59.124.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>155.198.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>155.245.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>157.140.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>157.190.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>157.228.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>158.94.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>158.94.0.0/19</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>158.94.224.0/19</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>158.125.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>158.143.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>158.223.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>159.86.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>159.86.128.0/18</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>160.5.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>160.6.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>160.9.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>161.23.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>161.73.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>161.74.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>161.76.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>161.112.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>163.1.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>163.119.0.0/17</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>163.160.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>163.167.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>164.11.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>165.215.164.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>171.33.192.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>171.33.200.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>171.33.208.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>171.33.216.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>176.97.158.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>178.253.55.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>185.1.69.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>185.3.72.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>185.6.36.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>185.6.39.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>185.17.96.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>185.22.4.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>185.25.220.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>185.30.8.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>185.30.8.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>185.30.9.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>185.30.10.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>185.49.36.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>185.80.132.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>185.80.188.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>185.80.188.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>185.80.189.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>185.80.190.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>185.80.191.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>185.100.88.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>185.102.12.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>185.103.220.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>185.111.128.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>185.167.176.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>185.177.200.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>185.192.228.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>185.193.232.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>185.193.232.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>185.213.192.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>185.224.12.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>185.255.108.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.5.28.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.5.29.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.5.30.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.12.72.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.18.195.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.31.196.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.33.16.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.35.94.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.41.103.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.41.104.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.41.112.0/20</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.41.128.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.42.100.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.67.43.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.68.153.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.76.6.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.76.8.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.76.8.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.76.10.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.76.12.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.76.16.0/20</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.76.16.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.76.16.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.76.18.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.76.20.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.76.24.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.76.25.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.76.26.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.76.28.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.76.32.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.76.32.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.76.32.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.76.243.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.82.153.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.82.242.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.84.5.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.84.75.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.84.76.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.84.80.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.84.84.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.84.212.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.88.9.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.88.10.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.94.235.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.100.78.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.100.135.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.100.136.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.100.136.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.100.137.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.100.138.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.100.139.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.100.140.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.100.154.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.107.11.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.107.13.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.107.168.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.107.178.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.108.120.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.124.46.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.133.244.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.135.231.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.135.232.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.135.234.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.138.192.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.146.136.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.147.23.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.149.111.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.149.120.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.149.238.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.150.177.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.150.178.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.150.180.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.150.184.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.153.213.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.156.162.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.156.252.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.160.177.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.160.178.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.171.128.0/18</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.171.192.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.173.1.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.173.2.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.173.4.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.173.128.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.174.68.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.175.48.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.188.124.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.188.157.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.188.158.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.190.201.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.190.202.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.195.1.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.195.42.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.195.42.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.195.43.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.195.105.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.195.116.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>192.195.118.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.0.14.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.0.14.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.0.15.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.0.16.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.0.16.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.0.17.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.0.255.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.1.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.25.116.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.32.6.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.32.7.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.32.22.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.33.72.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.35.144.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.35.232.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.37.225.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.37.240.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.38.143.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.39.80.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.39.172.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.39.212.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.46.128.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.46.129.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.46.130.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.46.131.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.46.132.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.46.133.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.46.134.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.46.135.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.60.0.0/14</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.105.13.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.105.48.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.107.116.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.130.15.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.133.28.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.138.86.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.164.96.0/19</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.200.145.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.219.110.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.227.117.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.238.164.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.240.184.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>193.242.111.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.0.24.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.0.24.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.0.25.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.0.26.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.0.182.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.8.54.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.11.18.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.26.206.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.29.216.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.32.32.0/20</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.32.36.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.32.41.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.32.69.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.32.218.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.34.8.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.34.10.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.34.112.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.34.113.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.34.138.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.35.93.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.35.186.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.35.192.0/19</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.35.241.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.36.1.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.36.2.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.36.8.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.36.121.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.36.152.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.42.224.0/19</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.50.187.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.56.252.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.59.0.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.60.218.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.61.79.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.61.92.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.61.92.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.61.93.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.61.94.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.61.176.0/20</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.61.176.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.61.176.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.61.178.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.61.180.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.61.180.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.61.180.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.61.181.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.61.183.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.61.184.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.61.184.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.61.184.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.61.188.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.61.191.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.62.24.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.66.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.80.0.0/14</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.81.78.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.83.162.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.88.240.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.126.247.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.140.226.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.145.222.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.150.176.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.150.176.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.154.0.0/20</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.154.16.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.155.12.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.155.16.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.155.20.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.165.12.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.165.28.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.169.32.0/20</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.187.32.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.213.28.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.238.32.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.238.48.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.238.60.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.238.64.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>194.246.79.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>195.10.221.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>195.22.150.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>195.62.8.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>195.66.232.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>195.66.240.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>195.66.240.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>195.66.248.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>195.88.20.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>195.104.182.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>195.191.66.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>195.194.0.0/15</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>195.225.188.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>195.246.108.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>198.137.189.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>198.137.190.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>198.137.191.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>198.187.191.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>199.164.217.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>204.152.100.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>204.152.100.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>204.152.101.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>204.152.102.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>204.152.103.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>204.152.104.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>205.160.168.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>205.160.170.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>206.107.40.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>206.107.40.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>206.107.41.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>206.107.42.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>206.107.43.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>206.107.44.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>206.107.45.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>206.107.46.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>206.107.47.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>212.2.0.0/19</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>212.44.0.0/18</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>212.58.224.0/19</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>212.58.224.0/20</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>212.58.224.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>212.58.225.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>212.58.226.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>212.58.227.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>212.58.228.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>212.58.229.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>212.58.230.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>212.58.231.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>212.58.232.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>212.58.233.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>212.58.234.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>212.58.235.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>212.58.236.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>212.58.237.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>212.58.238.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>212.58.239.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>212.58.240.0/20</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>212.58.240.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>212.58.241.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>212.58.242.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>212.58.243.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>212.58.244.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>212.58.245.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>212.58.246.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>212.58.247.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>212.58.248.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>212.58.249.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>212.58.250.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>212.58.251.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>212.58.252.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>212.58.253.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>212.58.254.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>212.58.255.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>212.121.0.0/19</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>212.121.192.0/19</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>212.219.0.0/16</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>213.18.248.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>213.160.96.0/19</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>213.166.17.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>213.166.18.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>213.177.224.0/19</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>213.178.132.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>213.235.0.0/18</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>217.9.64.0/20</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>217.23.224.0/20</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>217.65.150.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>217.79.96.0/19</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>217.145.117.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>217.145.118.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>217.145.126.0/23</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>217.177.16.0/20</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>217.177.36.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>217.177.56.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>217.177.64.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>217.177.76.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>217.177.88.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>217.179.0.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>217.179.8.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>217.179.16.0/20</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>217.179.32.0/20</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>217.179.52.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>217.179.60.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>217.179.64.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>217.179.76.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>217.179.84.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>217.179.92.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>217.179.96.0/20</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>217.179.112.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>217.179.120.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>217.179.192.0/20</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>217.179.208.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>217.179.216.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>217.179.224.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>217.179.232.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>217.179.240.0/20</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>217.180.0.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>217.180.8.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>217.180.24.0/21</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>217.180.32.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>217.180.48.0/22</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>217.181.0.0/18</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                </prefix-list>
+                <prefix-list>
+                    <name>JISC_NREN_PREFIXES_IPV6</name>
+                    <prefix>
+                        <ip-prefix>2001:4:112::/48</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:630::/32</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:678:20::/48</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:678:24::/48</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:678:2dc::/48</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:678:718::/48</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:67c:1bc::/48</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:67c:f6c::/48</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:67c:10b8::/48</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:67c:10e0::/48</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:67c:20e8::/48</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:770::/32</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:7f8:18::/48</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:7fd::/32</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:7fd::/48</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:7fd:15::/48</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:7fd:16::/48</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:7fd:17::/48</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:7fd:ffff::/48</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:1678::/32</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:41c0::/32</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:41c0::/33</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:41c1::/32</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2401:1680::/32</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2620:4f:8000::/48</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a01:40::/32</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a01:98::/32</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a01:4b0::/32</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a01:4b0::/48</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a01:4b0:1::/48</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a01:4b0:2::/48</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a01:56c0::/32</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a01:56c0:4033::/64</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a01:56c1:10::/44</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a01:56c1:300::/40</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a01:8940::/32</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a01:9e60::/32</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a02:850:ffe0::/48</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a02:850:ffe1::/48</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a02:850:ffe2::/48</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a02:850:ffe3::/48</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a02:850:ffe4::/48</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a02:850:ffe5::/48</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a02:850:ffe6::/48</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a02:850:ffe7::/48</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a02:850:ffff::/48</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a02:fb0::/32</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a02:2b08::/32</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a02:6c00::/37</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a02:af40::/30</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a03:ac0::/29</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a03:ac0::/32</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a03:ac1::/32</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a03:aba0::/29</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a03:c500::/32</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a04:2b00:14cc::/48</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a04:2b00:14dd::/48</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a04:2b00:14ee::/48</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a05:7d00::/29</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a05:7f00::/29</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a05:7f00:188::/48</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a05:7f00:189::/48</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a05:7f00:190::/48</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a05:7f00:191::/48</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a05:b400::/32</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a09:9180:fd::/48</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a09:9180:ff::/48</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a09:c8c0::/29</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a09:de40::/32</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a0a:200::/29</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a0b:3b40::/29</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a0b:3b44::/48</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a0b:3b44:0:8000::/49</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a0b:8e00::/48</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a0b:8e00:1::/48</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2a0c:5bc0::/29</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                </prefix-list>
+                <prefix-list>
+                    <name>LHCONE_PTP_ALLOW_EXACT</name>
+                    <prefix>
+                        <ip-prefix>62.40.126.0/24</ip-prefix>
+                        <type>exact</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:798:111:1::/64</ip-prefix>
+                        <type>exact</type>
+                    </prefix>
+                </prefix-list>
+                <prefix-list>
+                    <name>PTP_ROUTES_DENY_SPECIFIC</name>
+                    <prefix>
+                        <ip-prefix>62.40.103.0/25</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>62.40.126.0/24</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                    <prefix>
+                        <ip-prefix>2001:798:111:1::/64</ip-prefix>
+                        <type>longer</type>
+                    </prefix>
+                </prefix-list>
+                <prefix-list>
+                    <name>REJECT_IAS_OUT_OF_BOUND_PREFIXES_V4</name>
+                    <prefix>
+                        <ip-prefix>0.0.0.0/0</ip-prefix>
+                        <type>range</type>
+                        <start-length>0</start-length>
+                        <end-length>7</end-length>
+                    </prefix>
+                </prefix-list>
+                <prefix-list>
+                    <name>REJECT_IAS_OUT_OF_BOUND_PREFIXES_V6</name>
+                    <prefix>
+                        <ip-prefix>::/0</ip-prefix>
+                        <type>range</type>
+                        <start-length>0</start-length>
+                        <end-length>7</end-length>
+                    </prefix>
+                </prefix-list>
+                <prefix-list>
+                    <name>REJECT_IAS_SMALL_PREFIXES_V4</name>
+                    <prefix>
+                        <ip-prefix>0.0.0.0/0</ip-prefix>
+                        <type>range</type>
+                        <start-length>25</start-length>
+                        <end-length>32</end-length>
+                    </prefix>
+                </prefix-list>
+                <prefix-list>
+                    <name>REJECT_IAS_SMALL_PREFIXES_V6</name>
+                    <prefix>
+                        <ip-prefix>::/0</ip-prefix>
+                        <type>range</type>
+                        <start-length>57</start-length>
+                        <end-length>128</end-length>
+                    </prefix>
+                </prefix-list>
+                <prefix-list>
+                    <name>REJECT_SMALL_PREFIXES_V4</name>
+                    <prefix>
+                        <ip-prefix>0.0.0.0/0</ip-prefix>
+                        <type>range</type>
+                        <start-length>28</start-length>
+                        <end-length>32</end-length>
+                    </prefix>
+                </prefix-list>
+                <prefix-list>
+                    <name>REJECT_SMALL_PREFIXES_V6</name>
+                    <prefix>
+                        <ip-prefix>::/0</ip-prefix>
+                        <type>range</type>
+                        <start-length>64</start-length>
+                        <end-length>128</end-length>
+                    </prefix>
+                </prefix-list>
+                <prefix-list>
+                    <name>RTBH_RANGES_V4</name>
+                    <prefix>
+                        <ip-prefix>0.0.0.0/0</ip-prefix>
+                        <type>range</type>
+                        <start-length>32</start-length>
+                        <end-length>32</end-length>
+                    </prefix>
+                </prefix-list>
+                <prefix-list>
+                    <name>RTBH_RANGES_V6</name>
+                    <prefix>
+                        <ip-prefix>::/0</ip-prefix>
+                        <type>range</type>
+                        <start-length>128</start-length>
+                        <end-length>128</end-length>
+                    </prefix>
+                </prefix-list>
+                <policy-statement>
+                    <name>BOGONS</name>
+                    <entry-type>named</entry-type>
+                    <named-entry>
+                        <entry-name>BOGONS</entry-name>
+                        <from>
+                            <prefix-list>BOGONS</prefix-list>
+                        </from>
+                        <action>
+                            <action-type>reject</action-type>
+                        </action>
+                    </named-entry>
+                    <named-entry>
+                        <entry-name>AS_PATH_LENGTH_LIMIT</entry-name>
+                        <from>
+                            <as-path>
+                                <length>
+                                    <value>41</value>
+                                </length>
+                            </as-path>
+                            <protocol>
+                                <name>bgp</name>
+                            </protocol>
+                        </from>
+                        <action>
+                            <action-type>reject</action-type>
+                        </action>
+                    </named-entry>
+                </policy-statement>
+                <policy-statement>
+                    <name>DEST_CLASS_USAGE</name>
+                    <entry-type>named</entry-type>
+                    <named-entry>
+                        <entry-name>GWS</entry-name>
+                        <from>
+                            <community>
+                                <name>GEANT_GWS</name>
+                            </community>
+                        </from>
+                        <action>
+                            <action-type>accept</action-type>
+                            <dest-class>1</dest-class>
+                        </action>
+                    </named-entry>
+                    <named-entry>
+                        <entry-name>PRIVATE_PEERS</entry-name>
+                        <from>
+                            <community>
+                                <name>GEANT_PEERS</name>
+                            </community>
+                        </from>
+                        <action>
+                            <action-type>accept</action-type>
+                            <dest-class>2</dest-class>
+                        </action>
+                    </named-entry>
+                    <named-entry>
+                        <entry-name>IX_PEERS</entry-name>
+                        <from>
+                            <community>
+                                <name>GEANT_IXPEERS</name>
+                            </community>
+                        </from>
+                        <action>
+                            <action-type>accept</action-type>
+                            <dest-class>3</dest-class>
+                        </action>
+                    </named-entry>
+                    <named-entry>
+                        <entry-name>END_ACTION</entry-name>
+                        <action>
+                            <action-type>next-policy</action-type>
+                        </action>
+                    </named-entry>
+                </policy-statement>
+                <policy-statement>
+                    <name>PS_AS_SELF_REJECT</name>
+                    <entry-type>named</entry-type>
+                    <named-entry>
+                        <entry-name>AS_SELF</entry-name>
+                        <from>
+                            <as-path>
+                                <name>AS_SELF</name>
+                            </as-path>
+                        </from>
+                        <action>
+                            <action-type>reject</action-type>
+                        </action>
+                    </named-entry>
+                </policy-statement>
+                <policy-statement>
+                    <name>PS_DENY_ALL</name>
+                    <entry-type>named</entry-type>
+                    <named-entry>
+                        <entry-name>PS_DENY_ALL</entry-name>
+                        <action>
+                            <action-type>reject</action-type>
+                        </action>
+                    </named-entry>
+                </policy-statement>
+                <policy-statement>
+                    <name>PS_FROM_JISC_NREN_V4</name>
+                    <entry-type>named</entry-type>
+                    <named-entry>
+                        <entry-name>RTBH</entry-name>
+                        <from>
+                            <prefix-list>JISC_NREN_PREFIXES_IPV4</prefix-list>
+                            <policy>PS_FROM_RTBH</policy>
+                            <community>
+                                <name>GEANT_RTBH</name>
+                            </community>
+                        </from>
+                        <action>
+                            <action-type>accept</action-type>
+                            <local-preference>200</local-preference>
+                            <next-hop>192.0.2.101</next-hop>
+                            <community>
+                                <add>GEANT_DUMMY</add>
+                                <add>NO_EXPORT</add>
+                            </community>
+                        </action>
+                    </named-entry>
+                    <named-entry>
+                        <entry-name>ANYCAST_PREFIXES</entry-name>
+                        <from>
+                            <prefix-list>GEANT_ANYCAST</prefix-list>
+                            <community>
+                                <name>GEANT_ANYCAST</name>
+                            </community>
+                        </from>
+                        <action>
+                            <action-type>accept</action-type>
+                            <local-preference>150</local-preference>
+                            <community>
+                                <add>GEANT_ANYCAST</add>
+                                <add>GEANT_JISC</add>
+                                <add>GEANT_NREN_LON2</add>
+                            </community>
+                        </action>
+                    </named-entry>
+                    <named-entry>
+                        <entry-name>REJECT_SMALL_PREFIXES</entry-name>
+                        <from>
+                            <prefix-list>REJECT_SMALL_PREFIXES_V4</prefix-list>
+                        </from>
+                        <action>
+                            <action-type>reject</action-type>
+                        </action>
+                    </named-entry>
+                    <named-entry>
+                        <entry-name>FROM_GEANTIP_JISC_ACCEPT</entry-name>
+                        <from>
+                            <prefix-list>JISC_NREN_PREFIXES_IPV4</prefix-list>
+                        </from>
+                        <action>
+                            <action-type>accept</action-type>
+                            <local-preference>150</local-preference>
+                            <community>
+                                <add>GEANT_NRN</add>
+                                <add>GEANT_JISC</add>
+                                <add>GEANT_NREN_LON2</add>
+                            </community>
+                        </action>
+                    </named-entry>
+                    <named-entry>
+                        <entry-name>END_ACTION</entry-name>
+                        <action>
+                            <action-type>reject</action-type>
+                        </action>
+                    </named-entry>
+                </policy-statement>
+                <policy-statement>
+                    <name>PS_FROM_JISC_NREN_V6</name>
+                    <entry-type>named</entry-type>
+                    <named-entry>
+                        <entry-name>RTBH</entry-name>
+                        <from>
+                            <prefix-list>JISC_NREN_PREFIXES_IPV6</prefix-list>
+                            <policy>PS_FROM_RTBH_V6</policy>
+                            <community>
+                                <name>GEANT_RTBH</name>
+                            </community>
+                        </from>
+                        <action>
+                            <action-type>accept</action-type>
+                            <local-preference>200</local-preference>
+                            <next-hop>100::</next-hop>
+                            <community>
+                                <add>GEANT_DUMMY</add>
+                                <add>NO_EXPORT</add>
+                            </community>
+                        </action>
+                    </named-entry>
+                    <named-entry>
+                        <entry-name>ANYCAST_PREFIXES</entry-name>
+                        <from>
+                            <prefix-list>GEANT_ANYCAST</prefix-list>
+                            <community>
+                                <name>GEANT_ANYCAST</name>
+                            </community>
+                        </from>
+                        <action>
+                            <action-type>accept</action-type>
+                            <local-preference>150</local-preference>
+                            <community>
+                                <add>GEANT_ANYCAST</add>
+                                <add>GEANT_JISC</add>
+                                <add>GEANT_NREN_LON2</add>
+                            </community>
+                        </action>
+                    </named-entry>
+                    <named-entry>
+                        <entry-name>REJECT_SMALL_PREFIXES</entry-name>
+                        <from>
+                            <prefix-list>REJECT_SMALL_PREFIXES_V6</prefix-list>
+                        </from>
+                        <action>
+                            <action-type>reject</action-type>
+                        </action>
+                    </named-entry>
+                    <named-entry>
+                        <entry-name>FROM_GEANTIP_JISC_ACCEPT</entry-name>
+                        <from>
+                            <prefix-list>JISC_NREN_PREFIXES_IPV6</prefix-list>
+                        </from>
+                        <action>
+                            <action-type>accept</action-type>
+                            <local-preference>150</local-preference>
+                            <community>
+                                <add>GEANT_NRN</add>
+                                <add>GEANT_JISC</add>
+                                <add>GEANT_NREN_LON2</add>
+                            </community>
+                        </action>
+                    </named-entry>
+                    <named-entry>
+                        <entry-name>END_ACTION</entry-name>
+                        <action>
+                            <action-type>reject</action-type>
+                        </action>
+                    </named-entry>
+                </policy-statement>
+                <policy-statement>
+                    <name>PS_FROM_LHCONE_NREN</name>
+                    <entry-type>named</entry-type>
+                    <named-entry>
+                        <entry-name>ADD_COMMUNITY</entry-name>
+                        <action>
+                            <action-type>accept</action-type>
+                            <community>
+                                <add>GEANT_NRN</add>
+                            </community>
+                        </action>
+                    </named-entry>
+                </policy-statement>
+                <policy-statement>
+                    <name>PS_FROM_RTBH</name>
+                    <entry-type>named</entry-type>
+                    <named-entry>
+                        <entry-name>RTBH_COMMUNITY</entry-name>
+                        <from>
+                            <prefix-list>RTBH_RANGES_V4</prefix-list>
+                            <community>
+                                <name>GEANT_RTBH</name>
+                            </community>
+                        </from>
+                        <action>
+                            <action-type>accept</action-type>
+                        </action>
+                    </named-entry>
+                </policy-statement>
+                <policy-statement>
+                    <name>PS_FROM_RTBH_V6</name>
+                    <entry-type>named</entry-type>
+                    <named-entry>
+                        <entry-name>RTBH_COMMUNITY</entry-name>
+                        <from>
+                            <prefix-list>RTBH_RANGES_V6</prefix-list>
+                            <community>
+                                <name>GEANT_RTBH</name>
+                            </community>
+                        </from>
+                        <action>
+                            <action-type>accept</action-type>
+                        </action>
+                    </named-entry>
+                </policy-statement>
+                <policy-statement>
+                    <name>PS_GLOBAL_ANYCAST_IAS</name>
+                    <entry-type>named</entry-type>
+                    <named-entry>
+                        <entry-name>GLOBAL_ANYCAST_PREFIXES</entry-name>
+                        <from>
+                            <prefix-list>GLOBAL_ANYCAST</prefix-list>
+                        </from>
+                        <action>
+                            <action-type>next-policy</action-type>
+                            <community>
+                                <add>GLOBAL_ANYCAST_IAS</add>
+                            </community>
+                        </action>
+                    </named-entry>
+                </policy-statement>
+                <policy-statement>
+                    <name>PS_GLOBAL_ANYCAST_RE</name>
+                    <entry-type>named</entry-type>
+                    <named-entry>
+                        <entry-name>GLOBAL_ANYCAST_PREFIXES</entry-name>
+                        <from>
+                            <prefix-list>GLOBAL_ANYCAST</prefix-list>
+                        </from>
+                        <action>
+                            <action-type>next-policy</action-type>
+                            <community>
+                                <add>GLOBAL_ANYCAST_RE</add>
+                                <add>GEANT_INTERCO_BLOCK</add>
+                            </community>
+                        </action>
+                    </named-entry>
+                </policy-statement>
+                <policy-statement>
+                    <name>PS_PRIVATE_AS_BLOCK</name>
+                    <entry-type>named</entry-type>
+                    <named-entry>
+                        <entry-name>BLOCK_PRIVATE_AS</entry-name>
+                        <from>
+                            <as-path>
+                                <name>AS_PRIVATE</name>
+                            </as-path>
+                        </from>
+                        <action>
+                            <action-type>reject</action-type>
+                        </action>
+                    </named-entry>
+                </policy-statement>
+                <policy-statement>
+                    <name>PS_REJECT_GLOBAL_ANYCAST</name>
+                    <entry-type>named</entry-type>
+                    <named-entry>
+                        <entry-name>GLOBAL_ANYCAST_PREFIXES</entry-name>
+                        <from>
+                            <prefix-list>GLOBAL_ANYCAST</prefix-list>
+                        </from>
+                        <action>
+                            <action-type>reject</action-type>
+                        </action>
+                    </named-entry>
+                </policy-statement>
+                <policy-statement>
+                    <name>PS_RPKI_IAS_NREN</name>
+                    <entry-type>named</entry-type>
+                    <named-entry>
+                        <entry-name>RTBH_BYPASS</entry-name>
+                        <from>
+                            <prefix-list>RTBH_RANGES_V4</prefix-list>
+                            <community>
+                                <name>GEANT_RTBH</name>
+                            </community>
+                            <protocol>
+                                <name>bgp</name>
+                            </protocol>
+                        </from>
+                        <action>
+                            <action-type>next-policy</action-type>
+                            <origin-validation-state>valid</origin-validation-state>
+                        </action>
+                    </named-entry>
+                    <named-entry>
+                        <entry-name>RTBH_BYPASS_V6</entry-name>
+                        <from>
+                            <prefix-list>RTBH_RANGES_V6</prefix-list>
+                            <community>
+                                <name>GEANT_RTBH</name>
+                            </community>
+                            <protocol>
+                                <name>bgp</name>
+                            </protocol>
+                        </from>
+                        <action>
+                            <action-type>next-policy</action-type>
+                            <origin-validation-state>valid</origin-validation-state>
+                        </action>
+                    </named-entry>
+                    <named-entry>
+                        <entry-name>UNKNOWN</entry-name>
+                        <from>
+                            <origin-validation-state>not-found</origin-validation-state>
+                            <protocol>
+                                <name>bgp</name>
+                            </protocol>
+                        </from>
+                        <action>
+                            <action-type>next-policy</action-type>
+                            <community>
+                                <add>ORIGIN_VALIDATION_STATE_UNKNOWN</add>
+                            </community>
+                        </action>
+                    </named-entry>
+                    <named-entry>
+                        <entry-name>VALID</entry-name>
+                        <from>
+                            <origin-validation-state>valid</origin-validation-state>
+                            <protocol>
+                                <name>bgp</name>
+                            </protocol>
+                        </from>
+                        <action>
+                            <action-type>next-policy</action-type>
+                            <community>
+                                <add>ORIGIN_VALIDATION_STATE_VALID</add>
+                            </community>
+                        </action>
+                    </named-entry>
+                    <named-entry>
+                        <entry-name>INVALID</entry-name>
+                        <from>
+                            <origin-validation-state>invalid</origin-validation-state>
+                            <protocol>
+                                <name>bgp</name>
+                            </protocol>
+                        </from>
+                        <action>
+                            <action-type>reject</action-type>
+                            <community>
+                                <add>ORIGIN_VALIDATION_STATE_INVALID</add>
+                            </community>
+                        </action>
+                    </named-entry>
+                </policy-statement>
+                <policy-statement>
+                    <name>PS_RPKI_IAS_PEER</name>
+                    <entry-type>named</entry-type>
+                    <named-entry>
+                        <entry-name>UNKNOWN</entry-name>
+                        <from>
+                            <origin-validation-state>not-found</origin-validation-state>
+                            <protocol>
+                                <name>bgp</name>
+                            </protocol>
+                        </from>
+                        <action>
+                            <action-type>next-policy</action-type>
+                            <community>
+                                <add>ORIGIN_VALIDATION_STATE_UNKNOWN</add>
+                            </community>
+                        </action>
+                    </named-entry>
+                    <named-entry>
+                        <entry-name>VALID</entry-name>
+                        <from>
+                            <origin-validation-state>valid</origin-validation-state>
+                            <protocol>
+                                <name>bgp</name>
+                            </protocol>
+                        </from>
+                        <action>
+                            <action-type>next-policy</action-type>
+                            <community>
+                                <add>ORIGIN_VALIDATION_STATE_VALID</add>
+                            </community>
+                        </action>
+                    </named-entry>
+                    <named-entry>
+                        <entry-name>INVALID</entry-name>
+                        <from>
+                            <origin-validation-state>invalid</origin-validation-state>
+                            <protocol>
+                                <name>bgp</name>
+                            </protocol>
+                        </from>
+                        <action>
+                            <action-type>reject</action-type>
+                            <community>
+                                <add>ORIGIN_VALIDATION_STATE_INVALID</add>
+                            </community>
+                        </action>
+                    </named-entry>
+                </policy-statement>
+                <policy-statement>
+                    <name>PS_RPKI_RE_NREN</name>
+                    <entry-type>named</entry-type>
+                    <named-entry>
+                        <entry-name>RTBH_BYPASS</entry-name>
+                        <from>
+                            <prefix-list>RTBH_RANGES_V4</prefix-list>
+                            <community>
+                                <name>GEANT_RTBH</name>
+                            </community>
+                            <protocol>
+                                <name>bgp</name>
+                            </protocol>
+                        </from>
+                        <action>
+                            <action-type>next-policy</action-type>
+                            <origin-validation-state>valid</origin-validation-state>
+                        </action>
+                    </named-entry>
+                    <named-entry>
+                        <entry-name>RTBH_BYPASS_V6</entry-name>
+                        <from>
+                            <prefix-list>RTBH_RANGES_V6</prefix-list>
+                            <community>
+                                <name>GEANT_RTBH</name>
+                            </community>
+                            <protocol>
+                                <name>bgp</name>
+                            </protocol>
+                        </from>
+                        <action>
+                            <action-type>next-policy</action-type>
+                            <origin-validation-state>valid</origin-validation-state>
+                        </action>
+                    </named-entry>
+                    <named-entry>
+                        <entry-name>UNKNOWN</entry-name>
+                        <from>
+                            <origin-validation-state>not-found</origin-validation-state>
+                            <protocol>
+                                <name>bgp</name>
+                            </protocol>
+                        </from>
+                        <action>
+                            <action-type>next-policy</action-type>
+                            <community>
+                                <add>ORIGIN_VALIDATION_STATE_UNKNOWN</add>
+                            </community>
+                        </action>
+                    </named-entry>
+                    <named-entry>
+                        <entry-name>VALID</entry-name>
+                        <from>
+                            <origin-validation-state>valid</origin-validation-state>
+                            <protocol>
+                                <name>bgp</name>
+                            </protocol>
+                        </from>
+                        <action>
+                            <action-type>next-policy</action-type>
+                            <community>
+                                <add>ORIGIN_VALIDATION_STATE_VALID</add>
+                            </community>
+                        </action>
+                    </named-entry>
+                    <named-entry>
+                        <entry-name>INVALID</entry-name>
+                        <from>
+                            <origin-validation-state>invalid</origin-validation-state>
+                            <protocol>
+                                <name>bgp</name>
+                            </protocol>
+                        </from>
+                        <action>
+                            <action-type>reject</action-type>
+                            <community>
+                                <add>ORIGIN_VALIDATION_STATE_INVALID</add>
+                            </community>
+                        </action>
+                    </named-entry>
+                </policy-statement>
+                <policy-statement>
+                    <name>PS_RPKI_iBGP</name>
+                    <entry-type>named</entry-type>
+                    <named-entry>
+                        <entry-name>UNKNOWN</entry-name>
+                        <from>
+                            <community>
+                                <name>ORIGIN_VALIDATION_STATE_UNKNOWN</name>
+                            </community>
+                        </from>
+                        <action>
+                            <action-type>accept</action-type>
+                            <origin-validation-state>not-found</origin-validation-state>
+                        </action>
+                    </named-entry>
+                    <named-entry>
+                        <entry-name>VALID</entry-name>
+                        <from>
+                            <community>
+                                <name>ORIGIN_VALIDATION_STATE_VALID</name>
+                            </community>
+                        </from>
+                        <action>
+                            <action-type>accept</action-type>
+                            <origin-validation-state>valid</origin-validation-state>
+                        </action>
+                    </named-entry>
+                    <named-entry>
+                        <entry-name>INVALID</entry-name>
+                        <from>
+                            <community>
+                                <name>ORIGIN_VALIDATION_STATE_INVALID</name>
+                            </community>
+                        </from>
+                        <action>
+                            <action-type>accept</action-type>
+                            <origin-validation-state>invalid</origin-validation-state>
+                        </action>
+                    </named-entry>
+                </policy-statement>
+                <policy-statement>
+                    <name>PS_RTBH_iBGP</name>
+                    <entry-type>named</entry-type>
+                    <named-entry>
+                        <entry-name>RTBP_V4</entry-name>
+                        <from>
+                            <prefix-list>RTBH_RANGES_V4</prefix-list>
+                            <community>
+                                <name>GEANT_RTBH</name>
+                            </community>
+                            <protocol>
+                                <name>bgp</name>
+                            </protocol>
+                        </from>
+                        <action>
+                            <action-type>accept</action-type>
+                            <next-hop>192.0.2.101</next-hop>
+                        </action>
+                    </named-entry>
+                    <named-entry>
+                        <entry-name>RTBP_V6</entry-name>
+                        <from>
+                            <prefix-list>RTBH_RANGES_V6</prefix-list>
+                            <community>
+                                <name>GEANT_RTBH</name>
+                            </community>
+                            <protocol>
+                                <name>bgp</name>
+                            </protocol>
+                        </from>
+                        <action>
+                            <action-type>accept</action-type>
+                            <next-hop>100::</next-hop>
+                        </action>
+                    </named-entry>
+                </policy-statement>
+                <policy-statement>
+                    <name>PS_TO_JISC_NREN_V4</name>
+                    <entry-type>named</entry-type>
+                    <named-entry>
+                        <entry-name>EXCEPTION_BLOCK</entry-name>
+                        <from>
+                            <community>
+                                <name>GEANT_DUMMY</name>
+                            </community>
+                        </from>
+                        <action>
+                            <action-type>reject</action-type>
+                        </action>
+                    </named-entry>
+                    <named-entry>
+                        <entry-name>TO_NREN_BLOCK</entry-name>
+                        <from>
+                            <community>
+                                <name>GEANT_JISC_BLOCK</name>
+                            </community>
+                        </from>
+                        <action>
+                            <action-type>reject</action-type>
+                        </action>
+                    </named-entry>
+                    <named-entry>
+                        <entry-name>TO_JISC_PEERS</entry-name>
+                        <from>
+                            <community>
+                                <name>GEANT_PEER_RE</name>
+                            </community>
+                        </from>
+                        <action>
+                            <action-type>accept</action-type>
+                            <bgp-med>
+                                <set>0</set>
+                            </bgp-med>
+                        </action>
+                    </named-entry>
+                    <named-entry>
+                        <entry-name>TO_JISC_NRENS</entry-name>
+                        <from>
+                            <community>
+                                <name>GEANT_NRN</name>
+                            </community>
+                        </from>
+                        <action>
+                            <action-type>accept</action-type>
+                            <bgp-med>
+                                <set>0</set>
+                            </bgp-med>
+                        </action>
+                    </named-entry>
+                    <named-entry>
+                        <entry-name>END_ACTION</entry-name>
+                        <action>
+                            <action-type>reject</action-type>
+                        </action>
+                    </named-entry>
+                </policy-statement>
+                <policy-statement>
+                    <name>PS_TO_JISC_NREN_V6</name>
+                    <entry-type>named</entry-type>
+                    <named-entry>
+                        <entry-name>EXCEPTION_BLOCK</entry-name>
+                        <from>
+                            <community>
+                                <name>GEANT_DUMMY</name>
+                            </community>
+                        </from>
+                        <action>
+                            <action-type>reject</action-type>
+                        </action>
+                    </named-entry>
+                    <named-entry>
+                        <entry-name>TO_NREN_BLOCK</entry-name>
+                        <from>
+                            <community>
+                                <name>GEANT_JISC_BLOCK</name>
+                            </community>
+                        </from>
+                        <action>
+                            <action-type>reject</action-type>
+                        </action>
+                    </named-entry>
+                    <named-entry>
+                        <entry-name>TO_JISC_PEER</entry-name>
+                        <from>
+                            <community>
+                                <name>GEANT_PEER_RE</name>
+                            </community>
+                        </from>
+                        <action>
+                            <action-type>accept</action-type>
+                            <bgp-med>
+                                <set>0</set>
+                            </bgp-med>
+                        </action>
+                    </named-entry>
+                    <named-entry>
+                        <entry-name>TO_JISC_NRENS</entry-name>
+                        <from>
+                            <community>
+                                <name>GEANT_NRN</name>
+                            </community>
+                        </from>
+                        <action>
+                            <action-type>accept</action-type>
+                            <bgp-med>
+                                <set>0</set>
+                            </bgp-med>
+                        </action>
+                    </named-entry>
+                    <named-entry>
+                        <entry-name>END_ACTION</entry-name>
+                        <action>
+                            <action-type>reject</action-type>
+                        </action>
+                    </named-entry>
+                </policy-statement>
+                <policy-statement>
+                    <name>PS_TO_LHCONE_NREN</name>
+                    <entry-type>named</entry-type>
+                    <named-entry>
+                        <entry-name>PTP_ROUTES</entry-name>
+                        <from>
+                            <prefix-list>LHCONE_PTP_ALLOW_EXACT</prefix-list>
+                        </from>
+                        <action>
+                            <action-type>accept</action-type>
+                            <community>
+                                <add>LHCONE_BACKBONE</add>
+                            </community>
+                        </action>
+                    </named-entry>
+                    <named-entry>
+                        <entry-name>PTP_ROUTES_DENY_SPECIFIC</entry-name>
+                        <from>
+                            <prefix-list>PTP_ROUTES_DENY_SPECIFIC</prefix-list>
+                        </from>
+                        <action>
+                            <action-type>reject</action-type>
+                        </action>
+                    </named-entry>
+                    <named-entry>
+                        <entry-name>END_ACCEPT</entry-name>
+                        <action>
+                            <action-type>accept</action-type>
+                        </action>
+                    </named-entry>
+                </policy-statement>
+            </policy-options>
             <port>
                 <port-id>1/1/c1</port-id>
                 <admin-state>enable</admin-state>
@@ -1300,6 +8614,23 @@
             <port>
                 <port-id>1/1/c1/1</port-id>
                 <admin-state>enable</admin-state>
+                <description>PHY INFRASTRUCTURE BACKBONE P_lag-2 | LON-LON2 | TO RT0.LON.UK-2/1/c1/1</description>
+                <ethernet>
+                    <mode>network</mode>
+                    <mtu>9212</mtu>
+                    <lldp>
+                        <dest-mac>
+                            <mac-type>nearest-bridge</mac-type>
+                            <receive>true</receive>
+                            <transmit>true</transmit>
+                            <tx-tlvs>
+                                <port-desc>true</port-desc>
+                                <sys-name>true</sys-name>
+                                <sys-cap>true</sys-cap>
+                            </tx-tlvs>
+                        </dest-mac>
+                    </lldp>
+                </ethernet>
             </port>
             <port>
                 <port-id>1/1/c2</port-id>
@@ -1395,6 +8726,23 @@
             <port>
                 <port-id>1/1/c5/1</port-id>
                 <admin-state>enable</admin-state>
+                <description>PHY INFRASTRUCTURE BACKBONE P_lag-2 | LON-LON2 | TO RT0.LON.UK-2/1/c5/1</description>
+                <ethernet>
+                    <mode>network</mode>
+                    <mtu>9212</mtu>
+                    <lldp>
+                        <dest-mac>
+                            <mac-type>nearest-bridge</mac-type>
+                            <receive>true</receive>
+                            <transmit>true</transmit>
+                            <tx-tlvs>
+                                <port-desc>true</port-desc>
+                                <sys-name>true</sys-name>
+                                <sys-cap>true</sys-cap>
+                            </tx-tlvs>
+                        </dest-mac>
+                    </lldp>
+                </ethernet>
             </port>
             <port>
                 <port-id>1/1/c6</port-id>
@@ -1421,6 +8769,23 @@
             <port>
                 <port-id>1/1/c8/1</port-id>
                 <admin-state>enable</admin-state>
+                <description>PHY INFRASTRUCTURE BACKBONE P_lag-6 | COR-LON2 | TO RT2.COR.IE-et-0/0/0</description>
+                <ethernet>
+                    <mode>network</mode>
+                    <mtu>9212</mtu>
+                    <lldp>
+                        <dest-mac>
+                            <mac-type>nearest-bridge</mac-type>
+                            <receive>true</receive>
+                            <transmit>true</transmit>
+                            <tx-tlvs>
+                                <port-desc>true</port-desc>
+                                <sys-name>true</sys-name>
+                                <sys-cap>true</sys-cap>
+                            </tx-tlvs>
+                        </dest-mac>
+                    </lldp>
+                </ethernet>
             </port>
             <port>
                 <port-id>1/1/c8/2</port-id>
@@ -1462,10 +8827,46 @@
             <port>
                 <port-id>1/1/c11/1</port-id>
                 <admin-state>enable</admin-state>
+                <description>PHY CUSTOMER JISC P_lag-20</description>
+                <ethernet>
+                    <mode>access</mode>
+                    <encap-type>dot1q</encap-type>
+                    <mtu>9192</mtu>
+                    <lldp>
+                        <dest-mac>
+                            <mac-type>nearest-bridge</mac-type>
+                            <receive>true</receive>
+                            <transmit>true</transmit>
+                            <tx-tlvs>
+                                <port-desc>true</port-desc>
+                                <sys-name>true</sys-name>
+                                <sys-cap>true</sys-cap>
+                            </tx-tlvs>
+                        </dest-mac>
+                    </lldp>
+                </ethernet>
             </port>
             <port>
                 <port-id>1/1/c11/2</port-id>
                 <admin-state>enable</admin-state>
+                <description>PHY CUSTOMER JISC P_lag-20</description>
+                <ethernet>
+                    <mode>access</mode>
+                    <encap-type>dot1q</encap-type>
+                    <mtu>9192</mtu>
+                    <lldp>
+                        <dest-mac>
+                            <mac-type>nearest-bridge</mac-type>
+                            <receive>true</receive>
+                            <transmit>true</transmit>
+                            <tx-tlvs>
+                                <port-desc>true</port-desc>
+                                <sys-name>true</sys-name>
+                                <sys-cap>true</sys-cap>
+                            </tx-tlvs>
+                        </dest-mac>
+                    </lldp>
+                </ethernet>
             </port>
             <port>
                 <port-id>1/1/c12</port-id>
@@ -1477,10 +8878,46 @@
             <port>
                 <port-id>1/1/c12/1</port-id>
                 <admin-state>enable</admin-state>
+                <description>PHY CUSTOMER JISC P_lag-20</description>
+                <ethernet>
+                    <mode>access</mode>
+                    <encap-type>dot1q</encap-type>
+                    <mtu>9192</mtu>
+                    <lldp>
+                        <dest-mac>
+                            <mac-type>nearest-bridge</mac-type>
+                            <receive>true</receive>
+                            <transmit>true</transmit>
+                            <tx-tlvs>
+                                <port-desc>true</port-desc>
+                                <sys-name>true</sys-name>
+                                <sys-cap>true</sys-cap>
+                            </tx-tlvs>
+                        </dest-mac>
+                    </lldp>
+                </ethernet>
             </port>
             <port>
                 <port-id>1/1/c12/2</port-id>
                 <admin-state>enable</admin-state>
+                <description>PHY CUSTOMER JISC P_lag-20</description>
+                <ethernet>
+                    <mode>access</mode>
+                    <encap-type>dot1q</encap-type>
+                    <mtu>9192</mtu>
+                    <lldp>
+                        <dest-mac>
+                            <mac-type>nearest-bridge</mac-type>
+                            <receive>true</receive>
+                            <transmit>true</transmit>
+                            <tx-tlvs>
+                                <port-desc>true</port-desc>
+                                <sys-name>true</sys-name>
+                                <sys-cap>true</sys-cap>
+                            </tx-tlvs>
+                        </dest-mac>
+                    </lldp>
+                </ethernet>
             </port>
             <port>
                 <port-id>1/1/c13</port-id>
@@ -1492,6 +8929,23 @@
             <port>
                 <port-id>1/1/c13/1</port-id>
                 <admin-state>enable</admin-state>
+                <description>PHY INFRASTRUCTURE BACKBONE P_lag-8 | LON2-PAR | TO RT0.PAR.FR-2/1/C1/1</description>
+                <ethernet>
+                    <mode>network</mode>
+                    <mtu>9212</mtu>
+                    <lldp>
+                        <dest-mac>
+                            <mac-type>nearest-bridge</mac-type>
+                            <receive>true</receive>
+                            <transmit>true</transmit>
+                            <tx-tlvs>
+                                <port-desc>true</port-desc>
+                                <sys-name>true</sys-name>
+                                <sys-cap>true</sys-cap>
+                            </tx-tlvs>
+                        </dest-mac>
+                    </lldp>
+                </ethernet>
             </port>
             <port>
                 <port-id>1/1/c14</port-id>
@@ -1553,6 +9007,23 @@
             <port>
                 <port-id>1/1/c17/1</port-id>
                 <admin-state>enable</admin-state>
+                <description>PHY INFRASTRUCTURE BACKBONE P_lag-8 | LON2-PAR | TO RT0.PAR.FR-2/1/C5/1</description>
+                <ethernet>
+                    <mode>network</mode>
+                    <mtu>9212</mtu>
+                    <lldp>
+                        <dest-mac>
+                            <mac-type>nearest-bridge</mac-type>
+                            <receive>true</receive>
+                            <transmit>true</transmit>
+                            <tx-tlvs>
+                                <port-desc>true</port-desc>
+                                <sys-name>true</sys-name>
+                                <sys-cap>true</sys-cap>
+                            </tx-tlvs>
+                        </dest-mac>
+                    </lldp>
+                </ethernet>
             </port>
             <port>
                 <port-id>1/1/c18</port-id>
@@ -1568,6 +9039,23 @@
             <port>
                 <port-id>1/1/c19/1</port-id>
                 <admin-state>enable</admin-state>
+                <description>PHY INFRASTRUCTURE BACKBONE P_lag-1 | LON2-LON2 | TO MX1.LON2.UK-et-3/0/4</description>
+                <ethernet>
+                    <mode>network</mode>
+                    <mtu>9212</mtu>
+                    <lldp>
+                        <dest-mac>
+                            <mac-type>nearest-bridge</mac-type>
+                            <receive>true</receive>
+                            <transmit>true</transmit>
+                            <tx-tlvs>
+                                <port-desc>true</port-desc>
+                                <sys-name>true</sys-name>
+                                <sys-cap>true</sys-cap>
+                            </tx-tlvs>
+                        </dest-mac>
+                    </lldp>
+                </ethernet>
             </port>
             <port>
                 <port-id>1/1/c20</port-id>
@@ -1737,44 +9225,12 @@
             <port>
                 <port-id>2/1/c2/1</port-id>
                 <admin-state>enable</admin-state>
-                <description>PHY INFRASTRUCTURE BACKBONE P_lag-1 | LON2-LON2 | to xe-1/2/9 MX1.LON2</description>
-                <ethernet>
-                    <mode>network</mode>
-                    <mtu>9212</mtu>
-                    <lldp>
-                        <dest-mac>
-                            <mac-type>nearest-bridge</mac-type>
-                            <receive>true</receive>
-                            <transmit>true</transmit>
-                            <tx-tlvs>
-                                <port-desc>true</port-desc>
-                                <sys-name>true</sys-name>
-                                <sys-cap>true</sys-cap>
-                            </tx-tlvs>
-                        </dest-mac>
-                    </lldp>
-                </ethernet>
+                <description>''</description>
             </port>
             <port>
                 <port-id>2/1/c2/2</port-id>
                 <admin-state>enable</admin-state>
-                <description>PHY INFRASTRUCTURE BACKBONE P_lag-1 | LON2-LON2 | to xe-2/1/3 MX1.LON2</description>
-                <ethernet>
-                    <mode>network</mode>
-                    <mtu>9212</mtu>
-                    <lldp>
-                        <dest-mac>
-                            <mac-type>nearest-bridge</mac-type>
-                            <receive>true</receive>
-                            <transmit>true</transmit>
-                            <tx-tlvs>
-                                <port-desc>true</port-desc>
-                                <sys-name>true</sys-name>
-                                <sys-cap>true</sys-cap>
-                            </tx-tlvs>
-                        </dest-mac>
-                    </lldp>
-                </ethernet>
+                <description>''</description>
             </port>
             <port>
                 <port-id>2/1/c2/3</port-id>
@@ -1970,6 +9426,23 @@
             <port>
                 <port-id>2/1/c19/1</port-id>
                 <admin-state>enable</admin-state>
+                <description>PHY INFRASTRUCTURE BACKBONE P_lag-1 | LON2-LON2 | TO MX1.LON2.UK-et-3/1/4</description>
+                <ethernet>
+                    <mode>network</mode>
+                    <mtu>9212</mtu>
+                    <lldp>
+                        <dest-mac>
+                            <mac-type>nearest-bridge</mac-type>
+                            <receive>true</receive>
+                            <transmit>true</transmit>
+                            <tx-tlvs>
+                                <port-desc>true</port-desc>
+                                <sys-name>true</sys-name>
+                                <sys-cap>true</sys-cap>
+                            </tx-tlvs>
+                        </dest-mac>
+                    </lldp>
+                </ethernet>
             </port>
             <port>
                 <port-id>2/1/c20</port-id>
@@ -2071,6 +9544,46 @@
                     <breakout>c10-10g</breakout>
                 </connector>
             </port>
+            <port>
+                <port-id>2/1/c34/1</port-id>
+                <admin-state>enable</admin-state>
+            </port>
+            <port>
+                <port-id>2/1/c34/2</port-id>
+                <admin-state>enable</admin-state>
+            </port>
+            <port>
+                <port-id>2/1/c34/3</port-id>
+                <admin-state>enable</admin-state>
+            </port>
+            <port>
+                <port-id>2/1/c34/4</port-id>
+                <admin-state>enable</admin-state>
+            </port>
+            <port>
+                <port-id>2/1/c34/5</port-id>
+                <admin-state>enable</admin-state>
+            </port>
+            <port>
+                <port-id>2/1/c34/6</port-id>
+                <admin-state>enable</admin-state>
+            </port>
+            <port>
+                <port-id>2/1/c34/7</port-id>
+                <admin-state>enable</admin-state>
+            </port>
+            <port>
+                <port-id>2/1/c34/8</port-id>
+                <admin-state>enable</admin-state>
+            </port>
+            <port>
+                <port-id>2/1/c34/9</port-id>
+                <admin-state>enable</admin-state>
+            </port>
+            <port>
+                <port-id>2/1/c34/10</port-id>
+                <admin-state>enable</admin-state>
+            </port>
             <port>
                 <port-id>2/1/c35</port-id>
                 <admin-state>enable</admin-state>
@@ -2322,27 +9835,121 @@
             </qos>
             <redundancy>
                 <rollback-sync>rollback-all</rollback-sync>
-                <synchronize>off</synchronize>
             </redundancy>
             <router>
                 <router-name>Base</router-name>
                 <autonomous-system>20965</autonomous-system>
+                <ecmp>2</ecmp>
                 <router-id>62.40.96.25</router-id>
                 <interface>
-                    <interface-name>lag-1.0</interface-name>
+                    <interface-name>lag-1.0</interface-name>
+                    <admin-state>enable</admin-state>
+                    <description>SRV_GLOBAL INFRASTRUCTURE BACKBONE #LON2-LON2-IPTRUNK $GS-02470 | LON2-LON2 | RT0.LON2-MX1.LON2</description>
+                    <ip-mtu>9000</ip-mtu>
+                    <port>lag-1</port>
+                    <ipv4>
+                        <icmp>
+                            <ttl-expired>
+                                <admin-state>enable</admin-state>
+                                <number>2000</number>
+                                <seconds>2</seconds>
+                            </ttl-expired>
+                        </icmp>
+                        <primary>
+                            <address>62.40.98.62</address>
+                            <prefix-length>31</prefix-length>
+                        </primary>
+                    </ipv4>
+                    <ipv6>
+                        <address>
+                            <ipv6-address>2001:798:cc::69</ipv6-address>
+                            <prefix-length>126</prefix-length>
+                        </address>
+                    </ipv6>
+                    <qos>
+                        <network-policy>GEANT_BASIC</network-policy>
+                    </qos>
+                </interface>
+                <interface>
+                    <interface-name>lag-2.0</interface-name>
                     <admin-state>enable</admin-state>
-                    <description>SRV_GLOBAL INFRASTRUCTURE BACKBONE #LON2-LON2-IPTRUNK $GS-02470| LON2-LON2 | RT0.LON2-MX1.LON2</description>
+                    <description>SRV_GLOBAL INFRASTRUCTURE BACKBONE #LON-LON2-IPTRUNK $GS-00052 | LON-LON2 | </description>
                     <ip-mtu>9000</ip-mtu>
-                    <port>lag-1</port>
+                    <port>lag-2</port>
                     <ipv4>
+                        <icmp>
+                            <ttl-expired>
+                                <admin-state>enable</admin-state>
+                                <number>2000</number>
+                                <seconds>2</seconds>
+                            </ttl-expired>
+                        </icmp>
                         <primary>
-                            <address>62.40.98.62</address>
+                            <address>62.40.98.65</address>
                             <prefix-length>31</prefix-length>
                         </primary>
                     </ipv4>
                     <ipv6>
                         <address>
-                            <ipv6-address>2001:798:cc::69</ipv6-address>
+                            <ipv6-address>2001:798:cc:1::2a</ipv6-address>
+                            <prefix-length>126</prefix-length>
+                        </address>
+                    </ipv6>
+                    <qos>
+                        <network-policy>GEANT_BASIC</network-policy>
+                    </qos>
+                </interface>
+                <interface>
+                    <interface-name>lag-6.0</interface-name>
+                    <admin-state>enable</admin-state>
+                    <description>SRV_GLOBAL INFRASTRUCTURE BACKBONE #COR-LON2-IPTRUNK $GS-02386 | COR-LON2 | </description>
+                    <ip-mtu>9000</ip-mtu>
+                    <port>lag-6</port>
+                    <ipv4>
+                        <icmp>
+                            <ttl-expired>
+                                <admin-state>enable</admin-state>
+                                <number>2000</number>
+                                <seconds>2</seconds>
+                            </ttl-expired>
+                        </icmp>
+                        <primary>
+                            <address>62.40.98.19</address>
+                            <prefix-length>31</prefix-length>
+                        </primary>
+                    </ipv4>
+                    <ipv6>
+                        <address>
+                            <ipv6-address>2001:798:cc::16</ipv6-address>
+                            <prefix-length>126</prefix-length>
+                        </address>
+                    </ipv6>
+                    <qos>
+                        <network-policy>GEANT_BASIC</network-policy>
+                    </qos>
+                </interface>
+                <interface>
+                    <interface-name>lag-8.0</interface-name>
+                    <admin-state>enable</admin-state>
+                    <description>SRV_GLOBAL INFRASTRUCTURE BACKBONE #LON2-PAR-IPTRUNK $GS-00053 | LON2-PAR | </description>
+                    <ip-mtu>9000</ip-mtu>
+                    <port>lag-8</port>
+                    <ipv4>
+                        <icmp>
+                            <ttl-expired>
+                                <admin-state>enable</admin-state>
+                                <number>2000</number>
+                                <seconds>2</seconds>
+                            </ttl-expired>
+                        </icmp>
+                        <primary>
+                            <address>62.40.98.106</address>
+                            <prefix-length>31</prefix-length>
+                        </primary>
+                    </ipv4>
+                    <ipv6>
+                        <address>
+                            <ipv6-address>2001:798:cc:1::b9</ipv6-address>
                             <prefix-length>126</prefix-length>
                         </address>
                     </ipv6>
@@ -2373,13 +9980,170 @@
                         <end>19999</end>
                     </sr-labels>
                 </mpls-labels>
+                <flowspec>
+                    <ip-filter-max-size>100</ip-filter-max-size>
+                    <ipv6-filter-max-size>100</ipv6-filter-max-size>
+                </flowspec>
                 <bgp>
                     <local-as>
                         <as-number>20965</as-number>
                     </local-as>
+                    <best-path-selection>
+                        <compare-origin-validation-state>true</compare-origin-validation-state>
+                        <origin-invalid-unusable>true</origin-invalid-unusable>
+                    </best-path-selection>
                     <error-handling>
                         <update-fault-tolerance>true</update-fault-tolerance>
                     </error-handling>
+                    <next-hop-resolution>
+                        <shortcut-tunnel>
+                            <family>
+                                <family-type>ipv4</family-type>
+                                <resolution>filter</resolution>
+                                <resolution-filter>
+                                    <sr-isis>true</sr-isis>
+                                </resolution-filter>
+                            </family>
+                            <family>
+                                <family-type>ipv6</family-type>
+                                <resolution>filter</resolution>
+                                <resolution-filter>
+                                    <sr-isis>true</sr-isis>
+                                </resolution-filter>
+                            </family>
+                        </shortcut-tunnel>
+                    </next-hop-resolution>
+                    <multipath>
+                        <ebgp>2</ebgp>
+                        <ibgp>1</ibgp>
+                        <family>
+                            <family-type>ipv4</family-type>
+                            <max-paths>2</max-paths>
+                        </family>
+                        <family>
+                            <family-type>ipv6</family-type>
+                            <max-paths>2</max-paths>
+                        </family>
+                    </multipath>
+                    <group>
+                        <group-name>EGEANT</group-name>
+                        <admin-state>enable</admin-state>
+                        <next-hop-self>false</next-hop-self>
+                        <type>external</type>
+                        <family>
+                            <ipv4>true</ipv4>
+                            <mcast-ipv4>true</mcast-ipv4>
+                        </family>
+                        <ebgp-default-reject-policy>
+                            <import>true</import>
+                            <export>true</export>
+                        </ebgp-default-reject-policy>
+                        <local-as>
+                            <as-number>20965</as-number>
+                        </local-as>
+                        <origin-validation>
+                            <ipv4>true</ipv4>
+                        </origin-validation>
+                        <send-communities>
+                            <extended>false</extended>
+                        </send-communities>
+                        <import>
+                            <policy>BOGONS</policy>
+                            <policy>PS_RPKI_RE_NREN</policy>
+                        </import>
+                        <export>
+                            <policy>BOGONS</policy>
+                        </export>
+                    </group>
+                    <group>
+                        <group-name>EGEANT6</group-name>
+                        <admin-state>enable</admin-state>
+                        <next-hop-self>false</next-hop-self>
+                        <type>external</type>
+                        <family>
+                            <ipv6>true</ipv6>
+                            <mcast-ipv6>true</mcast-ipv6>
+                        </family>
+                        <ebgp-default-reject-policy>
+                            <import>true</import>
+                            <export>true</export>
+                        </ebgp-default-reject-policy>
+                        <local-as>
+                            <as-number>20965</as-number>
+                        </local-as>
+                        <origin-validation>
+                            <ipv6>true</ipv6>
+                        </origin-validation>
+                        <send-communities>
+                            <extended>false</extended>
+                        </send-communities>
+                        <import>
+                            <policy>BOGONS</policy>
+                            <policy>PS_RPKI_RE_NREN</policy>
+                        </import>
+                        <export>
+                            <policy>BOGONS</policy>
+                        </export>
+                    </group>
+                    <group>
+                        <group-name>TOOLS</group-name>
+                        <admin-state>enable</admin-state>
+                        <next-hop-self>true</next-hop-self>
+                        <type>internal</type>
+                        <peer-as>20965</peer-as>
+                        <local-address>62.40.96.25</local-address>
+                        <hold-time>
+                            <seconds>180</seconds>
+                        </hold-time>
+                        <local-as>
+                            <as-number>20965</as-number>
+                        </local-as>
+                        <import>
+                            <policy>PS_DENY_ALL</policy>
+                        </import>
+                    </group>
+                    <group>
+                        <group-name>TOOLS6</group-name>
+                        <admin-state>enable</admin-state>
+                        <next-hop-self>true</next-hop-self>
+                        <type>internal</type>
+                        <peer-as>20965</peer-as>
+                        <local-address>2001:798:aa:1::b</local-address>
+                        <hold-time>
+                            <seconds>180</seconds>
+                        </hold-time>
+                        <local-as>
+                            <as-number>20965</as-number>
+                        </local-as>
+                        <import>
+                            <policy>PS_DENY_ALL</policy>
+                        </import>
+                    </group>
+                    <group>
+                        <group-name>iGEANT</group-name>
+                        <admin-state>enable</admin-state>
+                        <authentication-key>aX1kndQNDTAHyJttsnoyKZ+GjPOZBz7fLuk= hash2</authentication-key>
+                        <vpn-apply-import>true</vpn-apply-import>
+                        <next-hop-self>true</next-hop-self>
+                        <type>internal</type>
+                        <peer-as>20965</peer-as>
+                        <capability-negotiation>true</capability-negotiation>
+                        <local-address>62.40.96.25</local-address>
+                        <family>
+                            <ipv4>true</ipv4>
+                            <vpn-ipv4>true</vpn-ipv4>
+                            <mcast-ipv4>true</mcast-ipv4>
+                            <vpn-ipv6>true</vpn-ipv6>
+                            <l2-vpn>true</l2-vpn>
+                            <flow-ipv4>true</flow-ipv4>
+                            <flow-vpn-ipv4>true</flow-vpn-ipv4>
+                        </family>
+                        <import>
+                            <policy>DEST_CLASS_USAGE</policy>
+                            <policy>PS_RTBH_iBGP</policy>
+                            <policy>PS_RPKI_iBGP</policy>
+                        </import>
+                    </group>
                     <group>
                         <group-name>iGEANT-P-ONLY</group-name>
                         <admin-state>enable</admin-state>
@@ -2392,8 +10156,31 @@
                             <mcast-ipv4>true</mcast-ipv4>
                         </family>
                     </group>
+                    <group>
+                        <group-name>iGEANT6</group-name>
+                        <admin-state>enable</admin-state>
+                        <vpn-apply-import>true</vpn-apply-import>
+                        <next-hop-self>true</next-hop-self>
+                        <type>internal</type>
+                        <peer-as>20965</peer-as>
+                        <capability-negotiation>true</capability-negotiation>
+                        <local-address>2001:798:aa:1::b</local-address>
+                        <family>
+                            <ipv6>true</ipv6>
+                            <vpn-ipv6>true</vpn-ipv6>
+                            <flow-ipv6>true</flow-ipv6>
+                            <mcast-ipv6>true</mcast-ipv6>
+                            <flow-vpn-ipv6>true</flow-vpn-ipv6>
+                        </family>
+                        <import>
+                            <policy>DEST_CLASS_USAGE</policy>
+                            <policy>PS_RTBH_iBGP</policy>
+                            <policy>PS_RPKI_iBGP</policy>
+                        </import>
+                    </group>
                     <group>
                         <group-name>iGEANT6-P-ONLY</group-name>
+                        <admin-state>enable</admin-state>
                         <next-hop-self>true</next-hop-self>
                         <type>internal</type>
                         <peer-as>20965</peer-as>
@@ -2406,442 +10193,768 @@
                     <neighbor>
                         <ip-address>62.40.96.1</ip-address>
                         <description>rt1.kie.ua.geant.net</description>
-                        <group>iGEANT-P-ONLY</group>
+                        <group>iGEANT</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>62.40.96.2</ip-address>
                         <description>rt1.chi.md.geant.net</description>
-                        <group>iGEANT-P-ONLY</group>
+                        <group>iGEANT</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>62.40.96.3</ip-address>
                         <description>mx1.dub.ie.geant.net</description>
-                        <group>iGEANT-P-ONLY</group>
+                        <group>iGEANT</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>62.40.96.4</ip-address>
                         <description>rt2.chi.md.geant.net</description>
-                        <group>iGEANT-P-ONLY</group>
+                        <group>iGEANT</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>62.40.96.5</ip-address>
                         <description>rt1.mar.fr.geant.net</description>
-                        <group>iGEANT-P-ONLY</group>
+                        <group>iGEANT</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>62.40.96.6</ip-address>
                         <description>rt1.mil2.it.geant.net</description>
-                        <group>iGEANT-P-ONLY</group>
+                        <group>iGEANT</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>62.40.96.7</ip-address>
                         <description>rt1.buc.ro.geant.net</description>
-                        <group>iGEANT-P-ONLY</group>
+                        <group>iGEANT</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>62.40.96.8</ip-address>
                         <description>mx2.zag.hr.geant.net</description>
-                        <group>iGEANT-P-ONLY</group>
+                        <group>iGEANT</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>62.40.96.9</ip-address>
                         <description>rt2.the.gr.geant.net</description>
-                        <group>iGEANT-P-ONLY</group>
+                        <group>iGEANT</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>62.40.96.10</ip-address>
                         <description>rt1.the.gr.geant.net</description>
-                        <group>iGEANT-P-ONLY</group>
+                        <group>iGEANT</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>62.40.96.11</ip-address>
+                        <description>rt0.poz.pl.geant.net</description>
+                        <group>iGEANT</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>62.40.96.12</ip-address>
+                        <description>rt0.ham.de.geant.net</description>
+                        <group>iGEANT</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>62.40.96.13</ip-address>
                         <description>rt1.ath2.gr.geant.net</description>
-                        <group>iGEANT-P-ONLY</group>
+                        <group>iGEANT</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>62.40.96.14</ip-address>
                         <description>rt2.ath2.gr.geant.net</description>
-                        <group>iGEANT-P-ONLY</group>
+                        <group>iGEANT</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>62.40.96.15</ip-address>
                         <description>mx1.lon2.uk.geant.net</description>
-                        <group>iGEANT-P-ONLY</group>
+                        <group>iGEANT</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>62.40.96.16</ip-address>
+                        <description>rt0.ams.nl.geant.net</description>
+                        <group>iGEANT</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>62.40.96.17</ip-address>
                         <description>mx2.lis.pt.geant.net</description>
-                        <group>iGEANT-P-ONLY</group>
+                        <group>iGEANT</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>62.40.96.19</ip-address>
                         <description>mx1.buc.ro.geant.net</description>
-                        <group>iGEANT-P-ONLY</group>
+                        <group>iGEANT</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>62.40.96.20</ip-address>
                         <description>rt1.tar.ee.geant.net</description>
-                        <group>iGEANT-P-ONLY</group>
+                        <group>iGEANT</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>62.40.96.21</ip-address>
+                        <description>rt0.lon.uk.geant.net</description>
+                        <group>iGEANT</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>62.40.96.22</ip-address>
                         <description>rt1.fra.de.geant.net</description>
+                        <group>iGEANT</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>62.40.96.26</ip-address>
+                        <description>rt0.fra.de.geant.net</description>
+                        <group>iGEANT</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>62.40.96.28</ip-address>
+                        <description>rt0.par.fr.geant.net</description>
+                        <group>iGEANT</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>62.40.96.29</ip-address>
+                        <description>rt0.gen.ch.geant.net</description>
                         <group>iGEANT-P-ONLY</group>
                     </neighbor>
+                    <neighbor>
+                        <ip-address>62.40.96.30</ip-address>
+                        <description>rt0.pra.cz.geant.net</description>
+                        <group>iGEANT</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>62.40.96.31</ip-address>
+                        <description>rt0.mil2.it.geant.net</description>
+                        <group>iGEANT</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>62.40.96.32</ip-address>
+                        <description>rt0.vie.at.geant.net</description>
+                        <group>iGEANT</group>
+                    </neighbor>
                     <neighbor>
                         <ip-address>62.40.96.33</ip-address>
                         <description>rt1.bru.be.geant.net</description>
-                        <group>iGEANT-P-ONLY</group>
+                        <group>iGEANT</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>62.40.96.34</ip-address>
+                        <description>rt0.bru.be.geant.net</description>
+                        <group>iGEANT</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>62.40.96.35</ip-address>
+                        <description>rt0.por.pt.geant.net</description>
+                        <group>iGEANT</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>62.40.96.36</ip-address>
                         <description>rt1.por.pt.geant.net</description>
-                        <group>iGEANT-P-ONLY</group>
+                        <group>iGEANT</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>62.40.96.37</ip-address>
+                        <description>rt0.mar.fr.geant.net</description>
+                        <group>iGEANT</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>62.40.96.38</ip-address>
+                        <description>rt0.mad.es.geant.net</description>
+                        <group>iGEANT</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>62.40.96.39</ip-address>
+                        <description>rt0.bra.sk.geant.net</description>
+                        <group>iGEANT</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>62.40.96.40</ip-address>
+                        <description>rt0.bud.hu.geant.net</description>
+                        <group>iGEANT</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>62.40.96.42</ip-address>
                         <description>rt1.bil.es.geant.net</description>
-                        <group>iGEANT-P-ONLY</group>
+                        <group>iGEANT</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>62.40.96.43</ip-address>
+                        <description>rt0.rig.lv.geant.net</description>
+                        <group>iGEANT</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>62.40.96.45</ip-address>
+                        <description>rt0.dub.ie.geant.net</description>
+                        <group>iGEANT</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>62.40.96.46</ip-address>
+                        <description>rt0.cor.ie.geant.net</description>
+                        <group>iGEANT</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>62.40.96.47</ip-address>
                         <description>rt1.pra.cz.geant.net</description>
-                        <group>iGEANT-P-ONLY</group>
+                        <group>iGEANT</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>62.40.96.48</ip-address>
                         <description>rt2.bru.be.geant.net</description>
-                        <group>iGEANT-P-ONLY</group>
+                        <group>iGEANT</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>62.40.96.49</ip-address>
                         <description>rt2.tar.ee.geant.net</description>
-                        <group>iGEANT-P-ONLY</group>
+                        <group>iGEANT</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>62.40.96.50</ip-address>
                         <description>rt1.ham.de.geant.net</description>
-                        <group>iGEANT-P-ONLY</group>
+                        <group>iGEANT</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>62.40.96.51</ip-address>
+                        <description>rt0.the.gr.geant.net</description>
+                        <group>iGEANT</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>62.40.96.52</ip-address>
                         <description>rt1.kau.lt.geant.net</description>
-                        <group>iGEANT-P-ONLY</group>
+                        <group>iGEANT</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>62.40.96.53</ip-address>
                         <description>rt2.kau.lt.geant.net</description>
-                        <group>iGEANT-P-ONLY</group>
+                        <group>iGEANT</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>62.40.96.54</ip-address>
                         <description>rt1.bra.sk.geant.net</description>
-                        <group>iGEANT-P-ONLY</group>
+                        <group>iGEANT</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>62.40.96.55</ip-address>
                         <description>rt2.bra.sk.geant.net</description>
-                        <group>iGEANT-P-ONLY</group>
+                        <group>iGEANT</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>62.40.96.56</ip-address>
                         <description>rt1.sof.bg.geant.net</description>
-                        <group>iGEANT-P-ONLY</group>
+                        <group>iGEANT</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>62.40.96.57</ip-address>
                         <description>rt1.cor.ie.geant.net</description>
-                        <group>iGEANT-P-ONLY</group>
+                        <group>iGEANT</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>62.40.96.58</ip-address>
                         <description>rt1.rig.lv.geant.net</description>
-                        <group>iGEANT-P-ONLY</group>
+                        <group>iGEANT</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>62.40.96.59</ip-address>
                         <description>rt2.rig.lv.geant.net</description>
-                        <group>iGEANT-P-ONLY</group>
+                        <group>iGEANT</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>62.40.96.60</ip-address>
+                        <description>rt0.ath2.gr.geant.net</description>
+                        <group>iGEANT</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>62.40.96.61</ip-address>
+                        <description>rt0.tar.ee.geant.net</description>
+                        <group>iGEANT</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>62.40.96.62</ip-address>
                         <description>rt2.ams.nl.geant.net</description>
-                        <group>iGEANT-P-ONLY</group>
+                        <group>iGEANT</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>62.40.96.63</ip-address>
+                        <description>rt0.sof.bg.geant.net</description>
+                        <group>iGEANT</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>62.40.96.68</ip-address>
                         <description>rt2.kie.ua.geant.net</description>
-                        <group>iGEANT-P-ONLY</group>
+                        <group>iGEANT</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>62.40.96.69</ip-address>
                         <description>rt2.cor.ie.geant.net</description>
-                        <group>iGEANT-P-ONLY</group>
+                        <group>iGEANT</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>62.40.96.70</ip-address>
                         <description>rt1.lju.si.geant.net</description>
-                        <group>iGEANT-P-ONLY</group>
+                        <group>iGEANT</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>62.40.96.71</ip-address>
                         <description>rt1.ams.nl.geant.net</description>
-                        <group>iGEANT-P-ONLY</group>
+                        <group>iGEANT</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>62.40.97.1</ip-address>
                         <description>mx1.bud.hu.geant.net</description>
-                        <group>iGEANT-P-ONLY</group>
+                        <group>iGEANT</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>62.40.97.5</ip-address>
                         <description>mx1.lon.uk.geant.net</description>
-                        <group>iGEANT-P-ONLY</group>
+                        <group>iGEANT</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>62.40.97.7</ip-address>
                         <description>mx1.vie.at.geant.net</description>
-                        <group>iGEANT-P-ONLY</group>
+                        <group>iGEANT</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>62.40.97.10</ip-address>
                         <description>mx1.poz.pl.geant.net</description>
-                        <group>iGEANT-P-ONLY</group>
+                        <group>iGEANT</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>62.40.97.13</ip-address>
                         <description>mx1.par.fr.geant.net</description>
-                        <group>iGEANT-P-ONLY</group>
+                        <group>iGEANT</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>62.40.97.14</ip-address>
                         <description>mx1.gen.ch.geant.net</description>
-                        <group>iGEANT-P-ONLY</group>
+                        <group>iGEANT</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>62.40.97.16</ip-address>
                         <description>mx1.mad.es.geant.net</description>
-                        <group>iGEANT-P-ONLY</group>
+                        <group>iGEANT</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>62.40.125.58</ip-address>
+                        <admin-state>enable</admin-state>
+                        <description>-- Peering with JISC --</description>
+                        <group>EGEANT</group>
+                        <authentication-key>786vVMT3uNQzwib9l/X+/7xCc7OYTREmBQ== hash2</authentication-key>
+                        <local-address>62.40.125.57</local-address>
+                        <peer-as>786</peer-as>
+                        <family>
+                            <ipv4>true</ipv4>
+                            <mcast-ipv4>true</mcast-ipv4>
+                        </family>
+                        <import>
+                            <policy>BOGONS</policy>
+                            <policy>PS_RPKI_RE_NREN</policy>
+                            <policy>PS_FROM_JISC_NREN_V4</policy>
+                        </import>
+                        <export>
+                            <policy>BOGONS</policy>
+                            <policy>PS_TO_JISC_NREN_V4</policy>
+                        </export>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>83.97.93.247</ip-address>
+                        <description>EARL Netflow/BGP feed VM</description>
+                        <group>TOOLS</group>
+                        <family>
+                            <ipv4>true</ipv4>
+                            <vpn-ipv4>true</vpn-ipv4>
+                            <mcast-ipv4>true</mcast-ipv4>
+                        </family>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>193.177.129.61</ip-address>
+                        <description>Kentik EU</description>
+                        <group>TOOLS</group>
+                        <authentication-key>l/SEUuBUpKSr0KfFty+DgVhlqKGI7+MIzL7/PvkpMA== hash2</authentication-key>
+                        <hold-time>
+                            <seconds>720</seconds>
+                        </hold-time>
+                        <family>
+                            <ipv4>true</ipv4>
+                            <vpn-ipv4>true</vpn-ipv4>
+                        </family>
+                        <cluster>
+                            <cluster-id>62.40.96.25</cluster-id>
+                        </cluster>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>2001:798:3::1de</ip-address>
+                        <description>EARL Netflow/BGP feed VM</description>
+                        <group>TOOLS6</group>
+                        <family>
+                            <ipv6>true</ipv6>
+                            <vpn-ipv6>true</vpn-ipv6>
+                            <mcast-ipv6>true</mcast-ipv6>
+                        </family>
                     </neighbor>
                     <neighbor>
                         <ip-address>2001:798:10:20ff::1</ip-address>
                         <description>mx1.vie.at.geant.net</description>
-                        <group>iGEANT6-P-ONLY</group>
+                        <group>iGEANT6</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>2001:798:12:20ff::1</ip-address>
                         <description>mx1.gen.ch.geant.net</description>
-                        <group>iGEANT6-P-ONLY</group>
+                        <group>iGEANT6</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>2001:798:17:20ff::1</ip-address>
                         <description>mx1.mad.es.geant.net</description>
-                        <group>iGEANT6-P-ONLY</group>
+                        <group>iGEANT6</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>2001:798:18:20ff::3</ip-address>
                         <description>mx1.par.fr.geant.net</description>
-                        <group>iGEANT6-P-ONLY</group>
+                        <group>iGEANT6</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>2001:798:1b:20ff::1</ip-address>
                         <description>mx1.bud.hu.geant.net</description>
-                        <group>iGEANT6-P-ONLY</group>
+                        <group>iGEANT6</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>2001:798:23:20ff::1</ip-address>
                         <description>mx1.poz.pl.geant.net</description>
-                        <group>iGEANT6-P-ONLY</group>
+                        <group>iGEANT6</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>2001:798:28:20ff::1</ip-address>
                         <description>mx1.lon.uk.geant.net</description>
-                        <group>iGEANT6-P-ONLY</group>
+                        <group>iGEANT6</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>2001:798:2b:10ff::3</ip-address>
                         <description>mx1.buc.ro.geant.net</description>
-                        <group>iGEANT6-P-ONLY</group>
+                        <group>iGEANT6</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>2001:798:2d:20ff::2</ip-address>
                         <description>mx2.zag.hr.geant.net</description>
-                        <group>iGEANT6-P-ONLY</group>
+                        <group>iGEANT6</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>2001:798:2f:20ff::2</ip-address>
                         <description>mx2.lis.pt.geant.net</description>
-                        <group>iGEANT6-P-ONLY</group>
+                        <group>iGEANT6</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>2001:798:99:1::7e</ip-address>
+                        <admin-state>enable</admin-state>
+                        <description>-- IPv6 Peering with JISC --</description>
+                        <group>EGEANT6</group>
+                        <authentication-key>ZPfBXv+4VzukL749hR809cNE9XC76Baxudht hash2</authentication-key>
+                        <local-address>2001:798:99:1::7d</local-address>
+                        <peer-as>786</peer-as>
+                        <family>
+                            <ipv6>true</ipv6>
+                            <mcast-ipv6>true</mcast-ipv6>
+                        </family>
+                        <import>
+                            <policy>BOGONS</policy>
+                            <policy>PS_RPKI_RE_NREN</policy>
+                            <policy>PS_FROM_JISC_NREN_V6</policy>
+                        </import>
+                        <export>
+                            <policy>BOGONS</policy>
+                            <policy>PS_TO_JISC_NREN_V6</policy>
+                        </export>
                     </neighbor>
                     <neighbor>
                         <ip-address>2001:798:aa:1::1</ip-address>
                         <description>mx1.dub.ie.geant.net</description>
-                        <group>iGEANT6-P-ONLY</group>
+                        <group>iGEANT6</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>2001:798:aa:1::2</ip-address>
                         <description>rt1.ath2.gr.geant.net</description>
-                        <group>iGEANT6-P-ONLY</group>
+                        <group>iGEANT6</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>2001:798:aa:1::3</ip-address>
                         <description>rt2.ath2.gr.geant.net</description>
-                        <group>iGEANT6-P-ONLY</group>
+                        <group>iGEANT6</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>2001:798:aa:1::4</ip-address>
+                        <description>rt0.ham.de.geant.net</description>
+                        <group>iGEANT6</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>2001:798:aa:1::5</ip-address>
                         <description>mx1.lon2.uk.geant.net</description>
-                        <group>iGEANT6-P-ONLY</group>
+                        <group>iGEANT6</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>2001:798:aa:1::6</ip-address>
                         <description>rt2.the.gr.geant.net</description>
-                        <group>iGEANT6-P-ONLY</group>
+                        <group>iGEANT6</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>2001:798:aa:1::7</ip-address>
                         <description>rt1.the.gr.geant.net</description>
-                        <group>iGEANT6-P-ONLY</group>
+                        <group>iGEANT6</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>2001:798:aa:1::8</ip-address>
+                        <description>rt0.ams.nl.geant.net</description>
+                        <group>iGEANT6</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>2001:798:aa:1::9</ip-address>
+                        <description>rt0.lon.uk.geant.net</description>
+                        <group>iGEANT6</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>2001:798:aa:1::a</ip-address>
+                        <description>rt0.fra.de.geant.net</description>
+                        <group>iGEANT6</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>2001:798:aa:1::c</ip-address>
                         <description>rt2.ams.nl.geant.net</description>
-                        <group>iGEANT6-P-ONLY</group>
+                        <group>iGEANT6</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>2001:798:aa:1::d</ip-address>
                         <description>rt1.bil.es.geant.net</description>
-                        <group>iGEANT6-P-ONLY</group>
+                        <group>iGEANT6</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>2001:798:aa:1::e</ip-address>
                         <description>rt1.mil2.it.geant.net</description>
-                        <group>iGEANT6-P-ONLY</group>
+                        <group>iGEANT6</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>2001:798:aa:1::f</ip-address>
+                        <description>rt0.pra.cz.geant.net</description>
+                        <group>iGEANT6</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>2001:798:aa:1::10</ip-address>
+                        <description>rt0.par.fr.geant.net</description>
+                        <group>iGEANT6</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>2001:798:aa:1::13</ip-address>
+                        <description>rt0.mil2.it.geant.net</description>
+                        <group>iGEANT6</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>2001:798:aa:1::14</ip-address>
+                        <description>rt0.vie.at.geant.net</description>
+                        <group>iGEANT6</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>2001:798:aa:1::15</ip-address>
                         <description>rt1.pra.cz.geant.net</description>
-                        <group>iGEANT6-P-ONLY</group>
+                        <group>iGEANT6</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>2001:798:aa:1::17</ip-address>
                         <description>rt1.buc.ro.geant.net</description>
-                        <group>iGEANT6-P-ONLY</group>
+                        <group>iGEANT6</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>2001:798:aa:1::18</ip-address>
                         <description>rt1.kau.lt.geant.net</description>
-                        <group>iGEANT6-P-ONLY</group>
+                        <group>iGEANT6</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>2001:798:aa:1::19</ip-address>
                         <description>rt2.kau.lt.geant.net</description>
-                        <group>iGEANT6-P-ONLY</group>
+                        <group>iGEANT6</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>2001:798:aa:1::1a</ip-address>
                         <description>rt1.bra.sk.geant.net</description>
-                        <group>iGEANT6-P-ONLY</group>
+                        <group>iGEANT6</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>2001:798:aa:1::1b</ip-address>
                         <description>rt2.bra.sk.geant.net</description>
-                        <group>iGEANT6-P-ONLY</group>
+                        <group>iGEANT6</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>2001:798:aa:1::1c</ip-address>
                         <description>rt1.tar.ee.geant.net</description>
-                        <group>iGEANT6-P-ONLY</group>
+                        <group>iGEANT6</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>2001:798:aa:1::1d</ip-address>
                         <description>rt2.tar.ee.geant.net</description>
-                        <group>iGEANT6-P-ONLY</group>
+                        <group>iGEANT6</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>2001:798:aa:1::1e</ip-address>
                         <description>rt1.rig.lv.geant.net</description>
-                        <group>iGEANT6-P-ONLY</group>
+                        <group>iGEANT6</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>2001:798:aa:1::1f</ip-address>
                         <description>rt2.rig.lv.geant.net</description>
+                        <group>iGEANT6</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>2001:798:aa:1::20</ip-address>
+                        <description>rt0.gen.ch.geant.net</description>
                         <group>iGEANT6-P-ONLY</group>
                     </neighbor>
+                    <neighbor>
+                        <ip-address>2001:798:aa:1::21</ip-address>
+                        <description>rt0.poz.pl.geant.net</description>
+                        <group>iGEANT6</group>
+                    </neighbor>
                     <neighbor>
                         <ip-address>2001:798:aa:1::22</ip-address>
                         <description>rt1.por.pt.geant.net</description>
-                        <group>iGEANT6-P-ONLY</group>
+                        <group>iGEANT6</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>2001:798:aa:1::23</ip-address>
                         <description>rt1.kie.ua.geant.net</description>
-                        <group>iGEANT6-P-ONLY</group>
+                        <group>iGEANT6</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>2001:798:aa:1::24</ip-address>
                         <description>rt2.kie.ua.geant.net</description>
-                        <group>iGEANT6-P-ONLY</group>
+                        <group>iGEANT6</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>2001:798:aa:1::25</ip-address>
                         <description>rt1.chi.md.geant.net</description>
-                        <group>iGEANT6-P-ONLY</group>
+                        <group>iGEANT6</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>2001:798:aa:1::26</ip-address>
                         <description>rt2.chi.md.geant.net</description>
-                        <group>iGEANT6-P-ONLY</group>
+                        <group>iGEANT6</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>2001:798:aa:1::27</ip-address>
                         <description>rt1.mar.fr.geant.net</description>
-                        <group>iGEANT6-P-ONLY</group>
+                        <group>iGEANT6</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>2001:798:aa:1::28</ip-address>
                         <description>rt1.fra.de.geant.net</description>
-                        <group>iGEANT6-P-ONLY</group>
+                        <group>iGEANT6</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>2001:798:aa:1::29</ip-address>
                         <description>rt1.bru.be.geant.net</description>
-                        <group>iGEANT6-P-ONLY</group>
+                        <group>iGEANT6</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>2001:798:aa:1::2a</ip-address>
                         <description>rt2.bru.be.geant.net</description>
-                        <group>iGEANT6-P-ONLY</group>
+                        <group>iGEANT6</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>2001:798:aa:1::2b</ip-address>
                         <description>rt1.ham.de.geant.net</description>
-                        <group>iGEANT6-P-ONLY</group>
+                        <group>iGEANT6</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>2001:798:aa:1::2c</ip-address>
                         <description>rt1.sof.bg.geant.net</description>
-                        <group>iGEANT6-P-ONLY</group>
+                        <group>iGEANT6</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>2001:798:aa:1::2d</ip-address>
                         <description>rt1.cor.ie.geant.net</description>
-                        <group>iGEANT6-P-ONLY</group>
+                        <group>iGEANT6</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>2001:798:aa:1::2e</ip-address>
                         <description>rt2.cor.ie.geant.net</description>
-                        <group>iGEANT6-P-ONLY</group>
+                        <group>iGEANT6</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>2001:798:aa:1::2f</ip-address>
                         <description>rt1.lju.si.geant.net</description>
-                        <group>iGEANT6-P-ONLY</group>
+                        <group>iGEANT6</group>
                     </neighbor>
                     <neighbor>
                         <ip-address>2001:798:aa:1::30</ip-address>
                         <description>rt1.ams.nl.geant.net</description>
-                        <group>iGEANT6-P-ONLY</group>
+                        <group>iGEANT6</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>2001:798:aa:1::31</ip-address>
+                        <description>rt0.bru.be.geant.net</description>
+                        <group>iGEANT6</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>2001:798:aa:1::32</ip-address>
+                        <description>rt0.por.pt.geant.net</description>
+                        <group>iGEANT6</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>2001:798:aa:1::33</ip-address>
+                        <description>rt0.mar.fr.geant.net</description>
+                        <group>iGEANT6</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>2001:798:aa:1::34</ip-address>
+                        <description>rt0.mad.es.geant.net</description>
+                        <group>iGEANT6</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>2001:798:aa:1::35</ip-address>
+                        <description>rt0.bra.sk.geant.net</description>
+                        <group>iGEANT6</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>2001:798:aa:1::36</ip-address>
+                        <description>rt0.bud.hu.geant.net</description>
+                        <group>iGEANT6</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>2001:798:aa:1::37</ip-address>
+                        <description>rt0.rig.lv.geant.net</description>
+                        <group>iGEANT6</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>2001:798:aa:1::38</ip-address>
+                        <description>rt0.dub.ie.geant.net</description>
+                        <group>iGEANT6</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>2001:798:aa:1::39</ip-address>
+                        <description>rt0.cor.ie.geant.net</description>
+                        <group>iGEANT6</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>2001:798:aa:1::3a</ip-address>
+                        <description>rt0.the.gr.geant.net</description>
+                        <group>iGEANT6</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>2001:798:aa:1::3b</ip-address>
+                        <description>rt0.ath2.gr.geant.net</description>
+                        <group>iGEANT6</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>2001:798:aa:1::3c</ip-address>
+                        <description>rt0.tar.ee.geant.net</description>
+                        <group>iGEANT6</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>2001:798:aa:1::3d</ip-address>
+                        <description>rt0.sof.bg.geant.net</description>
+                        <group>iGEANT6</group>
+                    </neighbor>
+                    <neighbor>
+                        <ip-address>2a0c:dec0:f100:1::179</ip-address>
+                        <description>Kentik EU</description>
+                        <group>TOOLS6</group>
+                        <authentication-key>l/SEUuBUpKSr0KfFty+DgYlByTjI4B8Zdp2IjFD2SQ== hash2</authentication-key>
+                        <hold-time>
+                            <seconds>720</seconds>
+                        </hold-time>
+                        <family>
+                            <ipv6>true</ipv6>
+                            <vpn-ipv6>true</vpn-ipv6>
+                        </family>
+                        <cluster>
+                            <cluster-id>62.40.96.25</cluster-id>
+                        </cluster>
                     </neighbor>
                 </bgp>
                 <isis>
@@ -2878,7 +10991,37 @@
                         <level-capability>2</level-capability>
                         <level>
                             <level-number>2</level-number>
-                            <metric>99000</metric>
+                            <metric>5</metric>
+                        </level>
+                    </interface>
+                    <interface>
+                        <interface-name>lag-2.0</interface-name>
+                        <admin-state>enable</admin-state>
+                        <interface-type>point-to-point</interface-type>
+                        <level-capability>2</level-capability>
+                        <level>
+                            <level-number>2</level-number>
+                            <metric>180</metric>
+                        </level>
+                    </interface>
+                    <interface>
+                        <interface-name>lag-6.0</interface-name>
+                        <admin-state>enable</admin-state>
+                        <interface-type>point-to-point</interface-type>
+                        <level-capability>2</level-capability>
+                        <level>
+                            <level-number>2</level-number>
+                            <metric>7160</metric>
+                        </level>
+                    </interface>
+                    <interface>
+                        <interface-name>lag-8.0</interface-name>
+                        <admin-state>enable</admin-state>
+                        <interface-type>point-to-point</interface-type>
+                        <level-capability>2</level-capability>
+                        <level>
+                            <level-number>2</level-number>
+                            <metric>1866</metric>
                         </level>
                     </interface>
                     <interface>
@@ -2897,15 +11040,48 @@
                         <wide-metrics-only>true</wide-metrics-only>
                     </level>
                 </isis>
+                <ldp>
+                    <admin-state>enable</admin-state>
+                    <targeted-session>
+                        <sdp-auto-targeted-session>true</sdp-auto-targeted-session>
+                    </targeted-session>
+                </ldp>
                 <mpls>
                     <admin-state>enable</admin-state>
                     <interface>
                         <interface-name>lag-1.0</interface-name>
                     </interface>
+                    <interface>
+                        <interface-name>lag-2.0</interface-name>
+                    </interface>
+                    <interface>
+                        <interface-name>lag-6.0</interface-name>
+                    </interface>
+                    <interface>
+                        <interface-name>lag-8.0</interface-name>
+                    </interface>
                     <interface>
                         <interface-name>system</interface-name>
                     </interface>
                 </mpls>
+                <origin-validation>
+                    <rpki-session>
+                        <ip-address>83.97.94.48</ip-address>
+                        <admin-state>enable</admin-state>
+                        <connect-retry>30</connect-retry>
+                        <local-address>62.40.96.25</local-address>
+                        <port>3323</port>
+                        <stale-time>3600</stale-time>
+                    </rpki-session>
+                    <rpki-session>
+                        <ip-address>83.97.94.49</ip-address>
+                        <admin-state>enable</admin-state>
+                        <connect-retry>30</connect-retry>
+                        <local-address>62.40.96.25</local-address>
+                        <port>3323</port>
+                        <stale-time>3600</stale-time>
+                    </rpki-session>
+                </origin-validation>
                 <pim>
                     <ipv4>
                         <admin-state>enable</admin-state>
@@ -2918,6 +11094,24 @@
                     <interface>
                         <interface-name>lag-1.0</interface-name>
                     </interface>
+                    <interface>
+                        <interface-name>lag-2.0</interface-name>
+                    </interface>
+                    <interface>
+                        <interface-name>lag-6.0</interface-name>
+                    </interface>
+                    <interface>
+                        <interface-name>lag-8.0</interface-name>
+                    </interface>
+                    <interface>
+                        <interface-name>lag-20.1</interface-name>
+                        <ipv4>
+                            <multicast>true</multicast>
+                        </ipv4>
+                        <ipv6>
+                            <multicast>true</multicast>
+                        </ipv6>
+                    </interface>
                     <interface>
                         <interface-name>system</interface-name>
                     </interface>
@@ -2939,96 +11133,1342 @@
                 </pim>
                 <rsvp>
                     <admin-state>enable</admin-state>
-                    <interface>
-                        <interface-name>lag-1.0</interface-name>
-                    </interface>
-                    <interface>
-                        <interface-name>system</interface-name>
-                    </interface>
-                </rsvp>
-                <static-routes>
-                    <route>
-                        <ip-prefix>0.0.0.0/0</ip-prefix>
-                        <route-type>unicast</route-type>
-                        <indirect>
-                            <ip-address>62.40.96.15</ip-address>
-                            <admin-state>enable</admin-state>
-                            <description>mx1.lon2.uk.geant.net</description>
-                            <preference>25</preference>
-                        </indirect>
-                        <indirect>
-                            <ip-address>62.40.96.22</ip-address>
+                    <interface>
+                        <interface-name>lag-1.0</interface-name>
+                    </interface>
+                    <interface>
+                        <interface-name>lag-2.0</interface-name>
+                    </interface>
+                    <interface>
+                        <interface-name>lag-6.0</interface-name>
+                    </interface>
+                    <interface>
+                        <interface-name>lag-8.0</interface-name>
+                    </interface>
+                    <interface>
+                        <interface-name>system</interface-name>
+                    </interface>
+                </rsvp>
+                <static-routes>
+                    <route>
+                        <ip-prefix>62.40.96.0/19</ip-prefix>
+                        <route-type>unicast</route-type>
+                        <community>20965:155</community>
+                        <community>20965:65532</community>
+                        <community>20965:65533</community>
+                        <community>64700:65532</community>
+                        <community>64700:65533</community>
+                        <community>64700:65534</community>
+                        <blackhole>
+                            <admin-state>enable</admin-state>
+                        </blackhole>
+                    </route>
+                    <route>
+                        <ip-prefix>192.0.2.101/32</ip-prefix>
+                        <route-type>unicast</route-type>
+                        <blackhole>
+                            <admin-state>enable</admin-state>
+                            <description>Used for RTBH GLOBAL</description>
+                        </blackhole>
+                    </route>
+                    <route>
+                        <ip-prefix>100::/64</ip-prefix>
+                        <route-type>unicast</route-type>
+                        <blackhole>
+                            <admin-state>enable</admin-state>
+                            <description>Used for RTBH GLOBAL V6</description>
+                        </blackhole>
+                    </route>
+                    <route>
+                        <ip-prefix>2001:798::/32</ip-prefix>
+                        <route-type>unicast</route-type>
+                        <community>20965:155</community>
+                        <community>20965:65532</community>
+                        <community>20965:65533</community>
+                        <community>64700:65532</community>
+                        <community>64700:65533</community>
+                        <community>64700:65534</community>
+                        <blackhole>
+                            <admin-state>enable</admin-state>
+                        </blackhole>
+                    </route>
+                    <route>
+                        <ip-prefix>2001:799::/32</ip-prefix>
+                        <route-type>unicast</route-type>
+                        <community>20965:155</community>
+                        <community>20965:65532</community>
+                        <community>20965:65533</community>
+                        <community>64700:65532</community>
+                        <community>64700:65533</community>
+                        <community>64700:65534</community>
+                        <blackhole>
+                            <admin-state>enable</admin-state>
+                        </blackhole>
+                    </route>
+                </static-routes>
+                <twamp-light>
+                    <reflector>
+                        <admin-state>enable</admin-state>
+                        <udp-port>64364</udp-port>
+                        <prefix>
+                            <ip-prefix>62.40.98.0/24</ip-prefix>
+                        </prefix>
+                    </reflector>
+                </twamp-light>
+            </router>
+            <routing-options>
+                <policy-accounting>
+                    <policy-acct-template>
+                        <name>GEANT_DEST_CLASS_POL_TEMPLATE_01</name>
+                        <destination-class>
+                            <index>1</index>
+                        </destination-class>
+                        <destination-class>
+                            <index>2</index>
+                        </destination-class>
+                        <destination-class>
+                            <index>3</index>
+                        </destination-class>
+                    </policy-acct-template>
+                </policy-accounting>
+            </routing-options>
+            <service>
+                <md-auto-id>
+                    <service-id-range>
+                        <start>10001</start>
+                        <end>19999</end>
+                    </service-id-range>
+                </md-auto-id>
+                <ies>
+                    <service-name>GEANT_GLOBAL</service-name>
+                    <admin-state>enable</admin-state>
+                    <description>GEANT-IP Global RE service</description>
+                    <service-id>20965</service-id>
+                    <customer>1</customer>
+                    <interface>
+                        <interface-name>lag-20.1</interface-name>
+                        <description>SRV_GLOBAL CUSTOMER JISC #JISC-AP2 $GS-00480 | ASN786 | </description>
+                        <ip-mtu>9000</ip-mtu>
+                        <cflowd-parameters>
+                            <sampling>
+                                <sampling-type>unicast</sampling-type>
+                                <type>interface</type>
+                                <direction>ingress-only</direction>
+                                <sample-profile>1</sample-profile>
+                            </sampling>
+                        </cflowd-parameters>
+                        <sap>
+                            <sap-id>lag-20:1</sap-id>
+                            <admin-state>enable</admin-state>
+                            <ingress>
+                                <filter>
+                                    <ip>JISC_EDGE_IN</ip>
+                                    <ipv6>JISC_EDGE_IN_V6</ipv6>
+                                </filter>
+                            </ingress>
+                            <egress>
+                                <filter>
+                                    <ip>JISC_EDGE_OUT</ip>
+                                    <ipv6>JISC_EDGE_OUT_V6</ipv6>
+                                </filter>
+                            </egress>
+                        </sap>
+                        <ipv4>
+                            <primary>
+                                <address>62.40.125.57</address>
+                                <prefix-length>30</prefix-length>
+                            </primary>
+                        </ipv4>
+                        <ipv6>
+                            <address>
+                                <ipv6-address>2001:798:99:1::7d</ipv6-address>
+                                <prefix-length>126</prefix-length>
+                            </address>
+                        </ipv6>
+                    </interface>
+                </ies>
+                <sdp>
+                    <sdp-id>611</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_611</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.1</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>621</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_621</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.2</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>631</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_631</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.3</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>641</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_641</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.4</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>651</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_651</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.5</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>661</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_661</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.6</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>671</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_671</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.7</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>681</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_681</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.8</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>691</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_691</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.9</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>711</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_711</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.97.1</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>751</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_751</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.97.5</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>771</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_771</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.97.7</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6101</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6101</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.10</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6111</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6111</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.11</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6121</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6121</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.12</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6131</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6131</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.13</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6141</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6141</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.14</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6151</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6151</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.15</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6161</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6161</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.16</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6171</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6171</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.17</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6191</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6191</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.19</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6201</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6201</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.20</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6211</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6211</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.21</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6221</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6221</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.22</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6261</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6261</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.26</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6281</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6281</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.28</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6301</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6301</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.30</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6311</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6311</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.31</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6321</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6321</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.32</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6331</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6331</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.33</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6341</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6341</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.34</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6351</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6351</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.35</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6361</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6361</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.36</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6391</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6391</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.39</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6401</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6401</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.40</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6421</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6421</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.42</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6431</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6431</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.43</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6451</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6451</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.45</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6461</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6461</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.46</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6471</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6471</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.47</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6481</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6481</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.48</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6491</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6491</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.49</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6501</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6501</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.50</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6511</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6511</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.51</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6521</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6521</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.52</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6531</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6531</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.53</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6541</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6541</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.54</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6551</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6551</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.55</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6561</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6561</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.56</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6571</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6571</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.57</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6581</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6581</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.58</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6591</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6591</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.59</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6601</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6601</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.60</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6611</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6611</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.61</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6621</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6621</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.62</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6631</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6631</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.63</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6681</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6681</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.68</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6691</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6691</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.69</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6701</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6701</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.70</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>6711</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_6711</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.96.71</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>7101</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_7101</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.97.10</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>7131</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_7131</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.97.13</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>7141</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_7141</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.97.14</ip-address>
+                    </far-end>
+                </sdp>
+                <sdp>
+                    <sdp-id>7161</sdp-id>
+                    <admin-state>enable</admin-state>
+                    <description>SDP_7161</description>
+                    <delivery-type>mpls</delivery-type>
+                    <path-mtu>9200</path-mtu>
+                    <signaling>tldp</signaling>
+                    <sr-isis>true</sr-isis>
+                    <far-end>
+                        <ip-address>62.40.97.16</ip-address>
+                    </far-end>
+                </sdp>
+                <vprn>
+                    <service-name>IAS</service-name>
+                    <admin-state>enable</admin-state>
+                    <description>GEANT IAS Internet VRF</description>
+                    <service-id>21320</service-id>
+                    <customer>1</customer>
+                    <autonomous-system>21320</autonomous-system>
+                    <ecmp>2</ecmp>
+                    <bgp-ipvpn>
+                        <mpls>
                             <admin-state>enable</admin-state>
-                            <description>rt1.fra.de.geant.net</description>
-                            <preference>25</preference>
-                        </indirect>
-                        <indirect>
-                            <ip-address>62.40.96.71</ip-address>
+                            <route-distinguisher>20965:333</route-distinguisher>
+                            <vrf-target>
+                                <community>target:20965:333</community>
+                            </vrf-target>
+                            <auto-bind-tunnel>
+                                <resolution>filter</resolution>
+                                <resolution-filter>
+                                    <sr-isis>true</sr-isis>
+                                </resolution-filter>
+                            </auto-bind-tunnel>
+                        </mpls>
+                    </bgp-ipvpn>
+                    <bgp>
+                        <description>IAS</description>
+                        <family>
+                            <ipv4>true</ipv4>
+                            <ipv6>true</ipv6>
+                        </family>
+                        <best-path-selection>
+                            <compare-origin-validation-state>true</compare-origin-validation-state>
+                            <origin-invalid-unusable>true</origin-invalid-unusable>
+                        </best-path-selection>
+                        <error-handling>
+                            <update-fault-tolerance>true</update-fault-tolerance>
+                        </error-handling>
+                        <multipath>
+                            <ebgp>2</ebgp>
+                            <ibgp>1</ibgp>
+                            <family>
+                                <family-type>ipv4</family-type>
+                                <max-paths>2</max-paths>
+                            </family>
+                            <family>
+                                <family-type>ipv6</family-type>
+                                <max-paths>2</max-paths>
+                            </family>
+                        </multipath>
+                        <group>
+                            <group-name>GEANT_NRENS</group-name>
                             <admin-state>enable</admin-state>
-                            <description>rt1.ams.nl.geant.net</description>
-                            <preference>25</preference>
-                        </indirect>
-                        <indirect>
-                            <ip-address>62.40.97.5</ip-address>
+                            <type>external</type>
+                            <bfd-liveness>true</bfd-liveness>
+                            <family>
+                                <ipv4>true</ipv4>
+                            </family>
+                            <ebgp-default-reject-policy>
+                                <import>true</import>
+                                <export>true</export>
+                            </ebgp-default-reject-policy>
+                            <local-as>
+                                <as-number>21320</as-number>
+                                <prepend-global-as>false</prepend-global-as>
+                            </local-as>
+                            <send-communities>
+                                <extended>false</extended>
+                            </send-communities>
+                            <import>
+                                <policy>PS_RPKI_IAS_NREN</policy>
+                                <policy>BOGONS</policy>
+                                <policy>PS_PRIVATE_AS_BLOCK</policy>
+                            </import>
+                            <export>
+                                <policy>BOGONS</policy>
+                                <policy>PS_PRIVATE_AS_BLOCK</policy>
+                            </export>
+                        </group>
+                        <group>
+                            <group-name>GEANT_NRENS6</group-name>
                             <admin-state>enable</admin-state>
-                            <description>mx1.lon.uk.geant.net</description>
-                            <preference>5</preference>
-                        </indirect>
-                        <indirect>
-                            <ip-address>62.40.97.13</ip-address>
+                            <type>external</type>
+                            <bfd-liveness>true</bfd-liveness>
+                            <family>
+                                <ipv6>true</ipv6>
+                            </family>
+                            <ebgp-default-reject-policy>
+                                <import>true</import>
+                                <export>true</export>
+                            </ebgp-default-reject-policy>
+                            <local-as>
+                                <as-number>21320</as-number>
+                                <prepend-global-as>false</prepend-global-as>
+                            </local-as>
+                            <send-communities>
+                                <extended>false</extended>
+                            </send-communities>
+                            <import>
+                                <policy>PS_RPKI_IAS_NREN</policy>
+                                <policy>BOGONS</policy>
+                                <policy>PS_PRIVATE_AS_BLOCK</policy>
+                            </import>
+                            <export>
+                                <policy>BOGONS</policy>
+                                <policy>PS_PRIVATE_AS_BLOCK</policy>
+                            </export>
+                        </group>
+                        <group>
+                            <group-name>GEANT_PEERS</group-name>
                             <admin-state>enable</admin-state>
-                            <description>mx1.par.fr.geant.net</description>
-                            <preference>5</preference>
-                        </indirect>
-                        <indirect>
-                            <ip-address>62.40.97.14</ip-address>
+                            <type>external</type>
+                            <bfd-liveness>true</bfd-liveness>
+                            <family>
+                                <ipv4>true</ipv4>
+                            </family>
+                            <ebgp-default-reject-policy>
+                                <import>true</import>
+                                <export>true</export>
+                            </ebgp-default-reject-policy>
+                            <local-as>
+                                <as-number>21320</as-number>
+                                <prepend-global-as>false</prepend-global-as>
+                            </local-as>
+                            <send-communities>
+                                <extended>false</extended>
+                            </send-communities>
+                            <import>
+                                <policy>PS_RPKI_IAS_PEER</policy>
+                                <policy>BOGONS</policy>
+                                <policy>PS_PRIVATE_AS_BLOCK</policy>
+                            </import>
+                            <export>
+                                <policy>BOGONS</policy>
+                                <policy>PS_PRIVATE_AS_BLOCK</policy>
+                            </export>
+                        </group>
+                        <group>
+                            <group-name>GEANT_PEERS6</group-name>
                             <admin-state>enable</admin-state>
-                            <description>mx1.gen.ch.geant.net</description>
-                            <preference>5</preference>
-                        </indirect>
-                    </route>
-                    <route>
-                        <ip-prefix>::/0</ip-prefix>
-                        <route-type>unicast</route-type>
-                        <indirect>
-                            <ip-address>2001:798:12:20ff::1</ip-address>
+                            <type>external</type>
+                            <bfd-liveness>true</bfd-liveness>
+                            <family>
+                                <ipv6>true</ipv6>
+                            </family>
+                            <ebgp-default-reject-policy>
+                                <import>true</import>
+                                <export>true</export>
+                            </ebgp-default-reject-policy>
+                            <local-as>
+                                <as-number>21320</as-number>
+                                <prepend-global-as>false</prepend-global-as>
+                            </local-as>
+                            <send-communities>
+                                <extended>false</extended>
+                            </send-communities>
+                            <import>
+                                <policy>PS_RPKI_IAS_PEER</policy>
+                                <policy>BOGONS</policy>
+                                <policy>PS_PRIVATE_AS_BLOCK</policy>
+                            </import>
+                            <export>
+                                <policy>BOGONS</policy>
+                                <policy>PS_PRIVATE_AS_BLOCK</policy>
+                            </export>
+                        </group>
+                    </bgp>
+                    <static-routes>
+                        <route>
+                            <ip-prefix>0.0.0.0/0</ip-prefix>
+                            <route-type>unicast</route-type>
+                            <blackhole>
+                                <admin-state>enable</admin-state>
+                            </blackhole>
+                        </route>
+                        <route>
+                            <ip-prefix>83.97.88.0/21</ip-prefix>
+                            <route-type>unicast</route-type>
+                            <community>21320:64912</community>
+                            <community>64700:65532</community>
+                            <community>64700:65533</community>
+                            <community>64700:65534</community>
+                            <blackhole>
+                                <admin-state>enable</admin-state>
+                            </blackhole>
+                        </route>
+                        <route>
+                            <ip-prefix>192.0.2.101/32</ip-prefix>
+                            <route-type>unicast</route-type>
+                            <blackhole>
+                                <admin-state>enable</admin-state>
+                            </blackhole>
+                        </route>
+                        <route>
+                            <ip-prefix>::/0</ip-prefix>
+                            <route-type>unicast</route-type>
+                            <blackhole>
+                                <admin-state>enable</admin-state>
+                            </blackhole>
+                        </route>
+                        <route>
+                            <ip-prefix>100::/64</ip-prefix>
+                            <route-type>unicast</route-type>
+                            <blackhole>
+                                <admin-state>enable</admin-state>
+                            </blackhole>
+                        </route>
+                        <route>
+                            <ip-prefix>2001:798:1::/48</ip-prefix>
+                            <route-type>unicast</route-type>
+                            <community>21320:64912</community>
+                            <blackhole>
+                                <admin-state>enable</admin-state>
+                            </blackhole>
+                        </route>
+                    </static-routes>
+                    <flowspec>
+                        <ip-filter-max-size>100</ip-filter-max-size>
+                        <ipv6-filter-max-size>100</ipv6-filter-max-size>
+                    </flowspec>
+                </vprn>
+                <vprn>
+                    <service-name>LHCONE_L3VPN</service-name>
+                    <admin-state>enable</admin-state>
+                    <description>L3 BGP/MPLS VPN for LHCONE</description>
+                    <service-id>111</service-id>
+                    <customer>1</customer>
+                    <autonomous-system>20965</autonomous-system>
+                    <ecmp>2</ecmp>
+                    <bgp-ipvpn>
+                        <mpls>
                             <admin-state>enable</admin-state>
-                            <description>mx1.gen.ch.geant.net</description>
-                            <preference>5</preference>
-                        </indirect>
-                        <indirect>
-                            <ip-address>2001:798:18:20ff::3</ip-address>
+                            <route-distinguisher>20965:111</route-distinguisher>
+                            <vrf-target>
+                                <community>target:20965:111</community>
+                            </vrf-target>
+                            <auto-bind-tunnel>
+                                <resolution>filter</resolution>
+                                <resolution-filter>
+                                    <sr-isis>true</sr-isis>
+                                </resolution-filter>
+                            </auto-bind-tunnel>
+                        </mpls>
+                    </bgp-ipvpn>
+                    <aggregates>
+                        <aggregate>
+                            <ip-prefix>62.40.126.0/24</ip-prefix>
+                            <community>20965:155</community>
+                            <discard-component-communities>true</discard-component-communities>
+                        </aggregate>
+                        <aggregate>
+                            <ip-prefix>2001:798:111:1::/64</ip-prefix>
+                            <community>20965:155</community>
+                            <discard-component-communities>true</discard-component-communities>
+                        </aggregate>
+                    </aggregates>
+                    <bgp>
+                        <description>LHCONE_L3VPN</description>
+                        <family>
+                            <ipv4>true</ipv4>
+                            <ipv6>true</ipv6>
+                        </family>
+                        <error-handling>
+                            <update-fault-tolerance>true</update-fault-tolerance>
+                        </error-handling>
+                        <multipath>
+                            <ebgp>2</ebgp>
+                            <ibgp>1</ibgp>
+                            <family>
+                                <family-type>ipv4</family-type>
+                                <max-paths>2</max-paths>
+                            </family>
+                            <family>
+                                <family-type>ipv6</family-type>
+                                <max-paths>2</max-paths>
+                            </family>
+                        </multipath>
+                        <group>
+                            <group-name>LHCONE_NRENS</group-name>
                             <admin-state>enable</admin-state>
-                            <description>mx1.par.fr.geant.net</description>
-                            <preference>5</preference>
-                        </indirect>
-                        <indirect>
-                            <ip-address>2001:798:28:20ff::1</ip-address>
+                            <next-hop-self>false</next-hop-self>
+                            <family>
+                                <ipv4>true</ipv4>
+                                <ipv6>true</ipv6>
+                            </family>
+                            <ebgp-default-reject-policy>
+                                <import>true</import>
+                                <export>true</export>
+                            </ebgp-default-reject-policy>
+                            <local-as>
+                                <as-number>20965</as-number>
+                            </local-as>
+                            <send-communities>
+                                <extended>false</extended>
+                            </send-communities>
+                            <import>
+                                <policy>BOGONS</policy>
+                                <policy>PS_PRIVATE_AS_BLOCK</policy>
+                            </import>
+                            <export>
+                                <policy>BOGONS</policy>
+                                <policy>PS_PRIVATE_AS_BLOCK</policy>
+                            </export>
+                        </group>
+                        <group>
+                            <group-name>LHCONE_PEERS</group-name>
                             <admin-state>enable</admin-state>
-                            <description>mx1.lon.uk.geant.net</description>
-                            <preference>5</preference>
-                        </indirect>
-                        <indirect>
-                            <ip-address>2001:798:aa:1::5</ip-address>
+                            <family>
+                                <ipv4>true</ipv4>
+                                <ipv6>true</ipv6>
+                            </family>
+                            <ebgp-default-reject-policy>
+                                <import>true</import>
+                                <export>true</export>
+                            </ebgp-default-reject-policy>
+                            <local-as>
+                                <as-number>20965</as-number>
+                            </local-as>
+                            <send-communities>
+                                <extended>false</extended>
+                            </send-communities>
+                            <import>
+                                <policy>BOGONS</policy>
+                                <policy>PS_PRIVATE_AS_BLOCK</policy>
+                            </import>
+                            <export>
+                                <policy>BOGONS</policy>
+                                <policy>PS_PRIVATE_AS_BLOCK</policy>
+                            </export>
+                        </group>
+                        <neighbor>
+                            <ip-address>62.40.126.73</ip-address>
                             <admin-state>enable</admin-state>
-                            <description>mx1.lon2.uk.geant.net</description>
-                            <preference>25</preference>
-                        </indirect>
-                        <indirect>
-                            <ip-address>2001:798:aa:1::28</ip-address>
+                            <description>-- Peering with JISC --</description>
+                            <group>LHCONE_NRENS</group>
+                            <local-address>62.40.126.72</local-address>
+                            <peer-as>786</peer-as>
+                            <family>
+                                <ipv4>true</ipv4>
+                            </family>
+                            <import>
+                                <policy>BOGONS</policy>
+                                <policy>PS_PRIVATE_AS_BLOCK</policy>
+                                <policy>PS_FROM_LHCONE_NREN</policy>
+                            </import>
+                            <export>
+                                <policy>BOGONS</policy>
+                                <policy>PS_PRIVATE_AS_BLOCK</policy>
+                                <policy>PS_TO_LHCONE_NREN</policy>
+                            </export>
+                        </neighbor>
+                        <neighbor>
+                            <ip-address>2001:798:111:1::102</ip-address>
                             <admin-state>enable</admin-state>
-                            <description>rt1.fra.de.geant.net</description>
-                            <preference>25</preference>
-                        </indirect>
-                        <indirect>
-                            <ip-address>2001:798:aa:1::30</ip-address>
+                            <description>-- IPv6 Peering with JISC --</description>
+                            <group>LHCONE_NRENS</group>
+                            <local-address>2001:798:111:1::101</local-address>
+                            <peer-as>786</peer-as>
+                            <family>
+                                <ipv6>true</ipv6>
+                            </family>
+                            <import>
+                                <policy>BOGONS</policy>
+                                <policy>PS_PRIVATE_AS_BLOCK</policy>
+                                <policy>PS_FROM_LHCONE_NREN</policy>
+                            </import>
+                            <export>
+                                <policy>BOGONS</policy>
+                                <policy>PS_PRIVATE_AS_BLOCK</policy>
+                                <policy>PS_TO_LHCONE_NREN</policy>
+                            </export>
+                        </neighbor>
+                    </bgp>
+                    <interface>
+                        <interface-name>lag-20.111</interface-name>
+                        <description>SRV_L3VPN CUSTOMER JISC #JISC-AP2-LHCONE $GS-02474 | ASN786 | </description>
+                        <ip-mtu>9000</ip-mtu>
+                        <cflowd-parameters>
+                            <sampling>
+                                <sampling-type>unicast</sampling-type>
+                                <type>interface</type>
+                                <direction>ingress-only</direction>
+                                <sample-profile>1</sample-profile>
+                            </sampling>
+                        </cflowd-parameters>
+                        <ipv4>
+                            <primary>
+                                <address>62.40.126.72</address>
+                                <prefix-length>31</prefix-length>
+                            </primary>
+                        </ipv4>
+                        <sap>
+                            <sap-id>lag-20:111</sap-id>
                             <admin-state>enable</admin-state>
-                            <description>rt1.ams.nl.geant.net</description>
-                            <preference>25</preference>
-                        </indirect>
-                    </route>
-                </static-routes>
-            </router>
+                            <ingress>
+                                <filter>
+                                    <ip>LHCONE_JISC_IN</ip>
+                                    <ipv6>LHCONE_JISC_IN_V6</ipv6>
+                                </filter>
+                            </ingress>
+                            <egress>
+                                <filter>
+                                    <ip>LHCONE_JISC_OUT</ip>
+                                    <ipv6>LHCONE_JISC_OUT_V6</ipv6>
+                                </filter>
+                            </egress>
+                        </sap>
+                        <ipv6>
+                            <address>
+                                <ipv6-address>2001:798:111:1::101</ipv6-address>
+                                <prefix-length>126</prefix-length>
+                            </address>
+                        </ipv6>
+                    </interface>
+                </vprn>
+            </service>
             <sfm>
                 <sfm-slot>1</sfm-slot>
                 <admin-state>enable</admin-state>
@@ -3059,8 +12499,10 @@
                     <system-ip-load-balancing>true</system-ip-load-balancing>
                 </load-balancing>
                 <grpc>
+                    <admin-state>enable</admin-state>
+                    <allow-unsecure-connection/>
                     <gnmi>
-                        <auto-config-save>false</auto-config-save>
+                        <auto-config-save>true</auto-config-save>
                     </gnmi>
                 </grpc>
                 <management-interface>
@@ -3101,6 +12543,9 @@
                     <pre-login-message>
                         <message>---------------------------------------------------------\nUnauthorized access to this system/network is prohibited.\n---------------------------------------------------------\n</message>
                     </pre-login-message>
+                    <ssh>
+                        <inbound-max-sessions>15</inbound-max-sessions>
+                    </ssh>
                 </login-control>
                 <security>
                     <dist-cpu-protection>
@@ -3121,8 +12566,8 @@
                                 </exceed-action>
                                 <rate>
                                     <kbps>
-                                        <limit>10000</limit>
-                                        <mbs>100</mbs>
+                                        <limit>12000</limit>
+                                        <mbs>900000</mbs>
                                     </kbps>
                                 </rate>
                             </static-policer>
@@ -3149,6 +12594,10 @@
                             <application>ntp</application>
                             <interface-name>system</interface-name>
                         </ipv4>
+                        <ipv4>
+                            <application>cflowd</application>
+                            <interface-name>system</interface-name>
+                        </ipv4>
                     </source-address>
                     <aaa>
                         <health-check>none</health-check>
@@ -3311,7 +12760,7 @@
                                 </entry>
                                 <entry>
                                     <entry-id>140</entry-id>
-                                    <match>show port detail</match>
+                                    <match>show port</match>
                                     <action>permit</action>
                                 </entry>
                                 <entry>
@@ -3329,6 +12778,26 @@
                                     <match>show version</match>
                                     <action>permit</action>
                                 </entry>
+                                <entry>
+                                    <entry-id>180</entry-id>
+                                    <match>show system alarms</match>
+                                    <action>permit</action>
+                                </entry>
+                                <entry>
+                                    <entry-id>190</entry-id>
+                                    <match>show system license</match>
+                                    <action>permit</action>
+                                </entry>
+                                <entry>
+                                    <entry-id>200</entry-id>
+                                    <match>show debug</match>
+                                    <action>permit</action>
+                                </entry>
+                                <entry>
+                                    <entry-id>210</entry-id>
+                                    <match>show bof booted</match>
+                                    <action>permit</action>
+                                </entry>
                             </profile>
                             <profile>
                                 <user-profile-name>default</user-profile-name>
@@ -4162,6 +13631,154 @@
                                     <accept/>
                                 </action>
                             </entry>
+                            <entry>
+                                <entry-id>340</entry-id>
+                                <description>T_LDP</description>
+                                <match>
+                                    <protocol>tcp-udp</protocol>
+                                    <src-ip>
+                                        <ip-prefix-list>GEANT_ROUTERS</ip-prefix-list>
+                                    </src-ip>
+                                    <port>
+                                        <port-list>CPMF_V4-T_LDP-PORTS</port-list>
+                                    </port>
+                                </match>
+                                <action>
+                                    <accept/>
+                                </action>
+                            </entry>
+                            <entry>
+                                <entry-id>350</entry-id>
+                                <description>RPKI</description>
+                                <match>
+                                    <protocol>tcp</protocol>
+                                    <src-ip>
+                                        <ip-prefix-list>GEANT_RPKI</ip-prefix-list>
+                                    </src-ip>
+                                    <port>
+                                        <port-list>CPMF_V4-RPKI-PORTS</port-list>
+                                    </port>
+                                </match>
+                                <action>
+                                    <accept/>
+                                </action>
+                            </entry>
+                            <entry>
+                                <entry-id>360</entry-id>
+                                <description>BFD_EBGP</description>
+                                <match>
+                                    <protocol>udp</protocol>
+                                    <src-ip>
+                                        <ip-prefix-list>BGP_PEERS_BASE</ip-prefix-list>
+                                    </src-ip>
+                                    <dst-port>
+                                        <port-list>CPMF_V4-BFD_EBGP-DST_PORT_RANGE</port-list>
+                                    </dst-port>
+                                </match>
+                                <action>
+                                    <accept/>
+                                </action>
+                            </entry>
+                            <entry>
+                                <entry-id>370</entry-id>
+                                <description>MH_BFD_EBGP</description>
+                                <match>
+                                    <protocol>udp</protocol>
+                                    <src-ip>
+                                        <ip-prefix-list>BGP_PEERS_BASE</ip-prefix-list>
+                                    </src-ip>
+                                    <dst-port>
+                                        <port-list>CPMF_V4-MH_BFD_EBGP-DST_PORTS</port-list>
+                                    </dst-port>
+                                </match>
+                                <action>
+                                    <accept/>
+                                </action>
+                            </entry>
+                            <entry>
+                                <entry-id>380</entry-id>
+                                <description>SNMP</description>
+                                <match>
+                                    <protocol>udp</protocol>
+                                    <src-ip>
+                                        <ip-prefix-list>TOOLS_KENTIK</ip-prefix-list>
+                                    </src-ip>
+                                    <port>
+                                        <port-list>CPMF_V4-SNMP-PORTS</port-list>
+                                    </port>
+                                </match>
+                                <action>
+                                    <accept/>
+                                </action>
+                            </entry>
+                            <entry>
+                                <entry-id>390</entry-id>
+                                <description>GRE</description>
+                                <match>
+                                    <protocol>gre</protocol>
+                                    <src-ip>
+                                        <ip-prefix-list>EXTERNAL_GRE</ip-prefix-list>
+                                    </src-ip>
+                                </match>
+                                <action>
+                                    <accept/>
+                                </action>
+                            </entry>
+                            <entry>
+                                <entry-id>400</entry-id>
+                                <description>IGMP</description>
+                                <match>
+                                    <protocol>igmp</protocol>
+                                    <src-ip>
+                                        <ip-prefix-list>EXTERNAL_IGMP</ip-prefix-list>
+                                    </src-ip>
+                                </match>
+                                <action>
+                                    <accept/>
+                                </action>
+                            </entry>
+                            <entry>
+                                <entry-id>410</entry-id>
+                                <description>VRRP</description>
+                                <match>
+                                    <protocol>vrrp</protocol>
+                                    <src-ip>
+                                        <ip-prefix-list>GEANT_DC_VRRP</ip-prefix-list>
+                                    </src-ip>
+                                </match>
+                                <action>
+                                    <accept/>
+                                </action>
+                            </entry>
+                            <entry>
+                                <entry-id>420</entry-id>
+                                <description>GNMI</description>
+                                <match>
+                                    <protocol>tcp</protocol>
+                                    <src-ip>
+                                        <ip-prefix-list>MOODI_SERVERS</ip-prefix-list>
+                                    </src-ip>
+                                    <dst-port>
+                                        <port-list>CPMF_V4-GNMI-DST_PORTS</port-list>
+                                    </dst-port>
+                                </match>
+                                <action>
+                                    <accept/>
+                                </action>
+                            </entry>
+                            <entry>
+                                <entry-id>4000</entry-id>
+                                <description>DF_DENY</description>
+                                <log>102</log>
+                                <match>
+                                    <dst-ip>
+                                        <ip-prefix-list>GEANT_ROUTERS</ip-prefix-list>
+                                    </dst-ip>
+                                </match>
+                                <action>
+                                    <drop/>
+                                </action>
+                            </entry>
                         </ip-filter>
                         <ipv6-filter>
                             <admin-state>enable</admin-state>
@@ -4519,6 +14136,74 @@
                                     <accept/>
                                 </action>
                             </entry>
+                            <entry>
+                                <entry-id>250</entry-id>
+                                <description>BFD_EBGP</description>
+                                <match>
+                                    <next-header>udp</next-header>
+                                    <src-ip>
+                                        <ipv6-prefix-list>BGP_PEERS_BASE</ipv6-prefix-list>
+                                    </src-ip>
+                                    <dst-port>
+                                        <port-list>CPMF_V6-BFD_EBGP-DST_PORT_RANGE</port-list>
+                                    </dst-port>
+                                </match>
+                                <action>
+                                    <accept/>
+                                </action>
+                            </entry>
+                            <entry>
+                                <entry-id>260</entry-id>
+                                <description>MH_BFD_EBGP</description>
+                                <match>
+                                    <next-header>udp</next-header>
+                                    <src-ip>
+                                        <ipv6-prefix-list>BGP_PEERS_BASE</ipv6-prefix-list>
+                                    </src-ip>
+                                    <dst-port>
+                                        <port-list>CPMF_V6-MH_BFD_EBGP-DST_PORTS</port-list>
+                                    </dst-port>
+                                </match>
+                                <action>
+                                    <accept/>
+                                </action>
+                            </entry>
+                            <entry>
+                                <entry-id>270</entry-id>
+                                <description>VRRP</description>
+                                <match>
+                                    <next-header>vrrp</next-header>
+                                    <src-ip>
+                                        <ipv6-prefix-list>GEANT_IPV6_DC_VRRP</ipv6-prefix-list>
+                                    </src-ip>
+                                </match>
+                                <action>
+                                    <accept/>
+                                </action>
+                            </entry>
+                            <entry>
+                                <entry-id>280</entry-id>
+                                <description>MLD</description>
+                                <match>
+                                    <next-header>58</next-header>
+                                </match>
+                                <action>
+                                    <accept/>
+                                </action>
+                            </entry>
+                            <entry>
+                                <entry-id>4000</entry-id>
+                                <description>DF_DENY</description>
+                                <log>102</log>
+                                <match>
+                                    <dst-ip>
+                                        <ipv6-prefix-list>GEANT_ROUTERS</ipv6-prefix-list>
+                                    </dst-ip>
+                                </match>
+                                <action>
+                                    <drop/>
+                                </action>
+                            </entry>
                         </ipv6-filter>
                     </cpm-filter>
                     <snmp>
@@ -4529,6 +14214,11 @@
                             <security-level>no-auth-no-privacy</security-level>
                             <read>TIMEMAP_VIEW</read>
                         </access>
+                        <community>
+                            <community-string>fKmeUgu3e3Y3V86ojMHvRSC2juAhqvQ= hash2</community-string>
+                            <access-permissions>r</access-permissions>
+                            <version>v2c</version>
+                        </community>
                         <community>
                             <community-string>zQyAqg9SYWLrzLBYiTybvsQYcGBBMj1EMVQwJcml hash2</community-string>
                             <access-permissions>r</access-permissions>
@@ -4626,7 +14316,7 @@
                             <source-access-list>snmp_inprov</source-access-list>
                         </community>
                         <usm-community>
-                            <community-string>8SAN4EbsP7Og0Hhe40PyiXsCVaDd0PZXaf8= hash2</community-string>
+                            <community-string>SrVB4RtXTrvi8HXjFOlK/V0VPBm9L6Jy hash2</community-string>
                             <group>TIMEMAP_VIEW</group>
                             <source-access-list>snmp_3VfrNKak</source-access-list>
                         </usm-community>
@@ -4893,7 +14583,7 @@
                         </source-access-list>
                         <view>
                             <view-name>TIMEMAP_VIEW</view-name>
-                            <subtree>.1.3.6.1.4.1.6527.1.1.3.92</subtree>
+                            <subtree>.1.3.6.1.4.1.6527.3.1.2.92</subtree>
                             <type>included</type>
                         </view>
                     </snmp>
@@ -5027,6 +14717,14 @@
                                 <console>
                                     <member>config_backup</member>
                                 </console>
+                                <public-keys>
+                                    <ecdsa>
+                                        <ecdsa-key>
+                                            <ecdsa-public-key-id>1</ecdsa-public-key-id>
+                                            <key-value>AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBH8Qe7NoQCFnKnXRl2sPB1yUXf4hokYsN3HUbj6fKkeDCLDL9MWxXRh2Pbns/q1Y79Ab6GkjcnhxFIMT6Wj1i5E=</key-value>
+                                        </ecdsa-key>
+                                    </ecdsa>
+                                </public-keys>
                             </user>
                             <user>
                                 <user-name>admin</user-name>
@@ -5058,6 +14756,18 @@
                                     </ecdsa>
                                 </public-keys>
                             </user>
+                            <user>
+                                <user-name>gap-moodi-prod</user-name>
+                                <password>$2y$10$YHDA8urCflYe87qjNkx9I.NOauhMif4CytEai.hxa.gXd6qdylJlu</password>
+                                <access>
+                                    <console>true</console>
+                                    <netconf>true</netconf>
+                                    <grpc>true</grpc>
+                                </access>
+                                <console>
+                                    <member>administrative</member>
+                                </console>
+                            </user>
                             <user>
                                 <user-name>goc</user-name>
                                 <password>$2y$10$U.Zu3MWR4VUD2US4CVnnA.IYR7h2tMSLcM15fCg3sKcM7XwSv3eWS</password>
@@ -5228,9 +14938,26 @@
                 <twamp>
                     <server>
                         <admin-state>enable</admin-state>
+                        <prefix>
+                            <ip-prefix>62.40.98.18/31</ip-prefix>
+                            <description>rt2.cor.ie</description>
+                            <max-connections>1</max-connections>
+                            <max-sessions>1</max-sessions>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.98.62/31</ip-prefix>
+                            <description>mx1.lon2.uk</description>
+                            <max-connections>1</max-connections>
+                            <max-sessions>1</max-sessions>
+                        </prefix>
+                        <prefix>
+                            <ip-prefix>62.40.98.106/31</ip-prefix>
+                            <description>mx1.par.fr</description>
+                            <max-connections>1</max-connections>
+                            <max-sessions>1</max-sessions>
+                        </prefix>
                     </server>
                 </twamp>
             </test-oam>
         </configure>
     </data>
-
diff --git a/test/per_router/test_snmp_handling.py b/test/per_router/test_snmp_handling.py
index 215982b6..215d0069 100644
--- a/test/per_router/test_snmp_handling.py
+++ b/test/per_router/test_snmp_handling.py
@@ -68,6 +68,7 @@ def test_snmp_interfaces_juniper(mocker, netconf_doc):
             "properties": {
                 "name": {"type": "string"},
                 "index": {"type": "integer"},
+                "oid": {"type": "string"},
                 "community": {"type": "string"}
             },
             "required": ["name", "index", "community"],
diff --git a/test/test_nokia.py b/test/test_nokia.py
index faa8f070..217aebb4 100644
--- a/test/test_nokia.py
+++ b/test/test_nokia.py
@@ -57,7 +57,13 @@ def state_doc(load_nokia_state_doc):
     ('rt0.fra.de.geant.net', {'lag-1': ['1/1/c2/1', '1/1/c2/2']}),
     ('rt0.gen.ch.geant.net', {'lag-1': ['1/1/c2/1', '1/1/c2/2']}),
     ('rt0.lon.uk.geant.net', {'lag-1': ['1/1/c2/1', '1/1/c2/2']}),
-    ('rt0.lon2.uk.geant.net', {'lag-1': ['2/1/c2/1', '2/1/c2/2']}),
+    ('rt0.lon2.uk.geant.net', {
+        'lag-1': ['1/1/c19/1', '2/1/c19/1'],
+        'lag-2': ['1/1/c1/1', '1/1/c5/1'],
+        'lag-6': ['1/1/c8/1'],
+        'lag-8': ['1/1/c13/1', '1/1/c17/1'],
+        'lag-20': ['1/1/c11/1', '1/1/c11/2', '1/1/c12/1', '1/1/c12/2'],
+        }),
 ])
 def test_get_lags(hostname, expected_bundles, load_nokia_netconf_config):
     netconf_doc = load_nokia_netconf_config(hostname)
@@ -99,7 +105,12 @@ def test_get_lags(hostname, expected_bundles, load_nokia_netconf_config):
         )),
         ('rt0.lon2.uk.geant.net', (
                 ('lag-1.0', {'62.40.98.62/31'}, {'2001:798:cc::69/126'}),
+                ('lag-2.0', {'62.40.98.65/31'}, {'2001:798:cc:1::2a/126'}),
+                ('lag-6.0', {'62.40.98.19/31'}, {'2001:798:cc::16/126'}),
+                ('lag-8.0', {'62.40.98.106/31'}, {'2001:798:cc:1::b9/126'}),
                 ('system', {'62.40.96.25/32'}, {'2001:798:aa:1::b/128'}),
+                ('lag-20.1', {'62.40.125.57/30'}, {'2001:798:99:1::7d/126'}),
+                ('lag-20.111', {'62.40.126.72/31'}, {'2001:798:111:1::101/126'}),
         )),
     ])
 def test_interface_info(hostname, all_expected_data, load_nokia_netconf_config):
@@ -120,7 +131,7 @@ def test_interface_info(hostname, all_expected_data, load_nokia_netconf_config):
     ('rt0.fra.de.geant.net', 58),
     ('rt0.gen.ch.geant.net', 141),
     ('rt0.lon.uk.geant.net', 58),
-    ('rt0.lon2.uk.geant.net', 139),
+    ('rt0.lon2.uk.geant.net', 149),
 ])
 def test_get_ports(hostname, port_count, load_nokia_netconf_config):
     netconf_doc = load_nokia_netconf_config(hostname=hostname)
@@ -131,36 +142,53 @@ def test_get_ports(hostname, port_count, load_nokia_netconf_config):
         jsonschema.validate(port, PORT_SCHEMA)
 
 
-def test_get_port_state(state_doc):
-    ports = {p['port-id']: p for p in nokia.get_ports_state(state_doc)}
-    assert len(ports) == 197
-    found_port_ids = {p_id for p_id in ports}
+def test_get_port_interfaces_snmp_info(state_doc):
+    communities = {}
+    snmp_info = {s['name']: s for s in nokia.get_port_interfaces_snmp_info(state_doc, communities)}
+    assert len(snmp_info) == 197
+    found_port_ids = {p_id for p_id in snmp_info}
     ports_sample = {
         '1/1/c2', '1/1/c2/1', '1/1/c2/2', '1/1/c2/3', '1/1/c7', '1/1/c7/1',
         '1/1/c8', '1/1/c8/1', '1/1/c9', '1/1/c9/1', '1/1/c13', '1/1/c13/1',
         '2/1/c7', '2/1/c7/1', '2/1/c8', '2/1/c8/1', '2/1/c13', '2/1/c13/1',
     }
     assert found_port_ids > ports_sample
-    expected_up_ports = {
-        '1/1/c2', '1/1/c5', '1/1/c5/1', '1/1/c7', '1/1/c8', '1/1/c9', '1/1/c13',
-        '1/1/c13/1', '1/1/c19', '1/1/c26', '1/1/c26/1', '1/1/c27', '1/1/c27/1',
-        '1/1/c30', '2/1/c7', '2/1/c8', '2/1/c13', '2/1/c13/1', 'A/1', 'B/1'
-    }
-    assert {k for k, v in ports.items() if v['oper-state'] == 'up'} == expected_up_ports
 
 
-def test_get_lag_state(state_doc):
-    lags = {x['name']: x for x in nokia.get_lags_state(state_doc)}
+def test_get_lag_interfaces_snmp_info(state_doc):
+    communities = {}
+    lags = {x['name']: x for x in nokia.get_lag_interfaces_snmp_info(state_doc, communities)}
     found_names = {lag_name for lag_name in lags}
     expected_names = {'lag-1', 'lag-2', 'lag-3'}
     assert found_names == expected_names
-    expected_up_lags = {'lag-2'}
-    assert {k for k, v in lags.items() if v['oper-state'] == 'up'} == expected_up_lags
 
 
-def test_get_interface_state(load_nokia_state_doc):
+def test_get_vprn_services_snmp_info(load_nokia_netconf_config, load_nokia_state_doc):
+    netconf_doc = load_nokia_netconf_config("rt0.lon2.uk.geant.net")
+    state_doc = load_nokia_state_doc("rt0.lon2.uk.geant.net")
+    communities = {}
+    lags = {x['name']: x for x in nokia.get_vprn_services_snmp_info(netconf_doc, state_doc, communities)}
+    found_names = {lag_name for lag_name in lags}
+    expected_names = {'lag-20.111'}
+    assert found_names == expected_names
+
+
+def test_get_ies_services_snmp_info(load_nokia_netconf_config, load_nokia_state_doc):
+    netconf_doc = load_nokia_netconf_config("rt0.lon2.uk.geant.net")
+    state_doc = load_nokia_state_doc("rt0.lon2.uk.geant.net")
+    communities = {}
+    lags = {x['name']: x for x in nokia.get_ies_services_snmp_info(netconf_doc, state_doc, communities)}
+    found_names = {lag_name for lag_name in lags}
+    expected_names = {'lag-20.1'}
+    assert found_names == expected_names
+
+
+def test_get_router_interfaces_snmp_info(load_nokia_state_doc):
     state_doc = load_nokia_state_doc("rt0.lon2.uk.geant.net")
-    interfaces = {x["interface-name"]: x for x in nokia.get_interfaces_state(state_doc)}
+    communities = {}
+    router_interfaces = list(nokia.get_router_interfaces_snmp_info(state_doc, communities))
+
+    interfaces = {x["name"]: x for x in router_interfaces}
     found_names = {interface_name for interface_name in interfaces}
     expected_names = {
         "system",
@@ -168,44 +196,19 @@ def test_get_interface_state(load_nokia_state_doc):
         "lag-2.0",
         "lag-6.0",
         "lag-8.0",
-        "lag-20.1",
-        "lag-20.111",
         "management",
     }
     assert found_names == expected_names
-    expected_up_interfaces = {
-        "system",
-        "lag-1.0",
-        "lag-2.0",
-        "lag-8.0",
-        "lag-20.1",
-        "lag-20.111",
-        "management",
-    }
-    assert {
-        k for k, v in interfaces.items() if v["oper-state"] == "up"
-    } == expected_up_interfaces
-
-
-def test_get_epipe_state(load_nokia_state_doc):
-    state_doc = load_nokia_state_doc("rt0.ath.gr.lab.office.geant.net")
-    found_epipes = {(x["name"], x["oper-state"]) for x in nokia.get_epipes_state(state_doc)}
-    assert found_epipes == {("lag-14:505.cp-400", "up")}
-
 
-def test_snmp_index(state_doc):
-    interfaces = nokia.get_interfaces_state(state_doc)
     expected = {
         "system": 1,
         "lag-1.0": 2,
         "lag-2.0": 3,
-        "lag-3.0": 4,
-        "exfo400": 5,
-        "guy": 6,
-        "exfo400-100": 7,
+        "lag-6.0": 5,
+        "lag-8.0": 4,
         "management": 1280,
     }
-    assert {ifc["interface-name"]: ifc["if-index"] for ifc in interfaces} == expected
+    assert {ifc["name"]: ifc["index"] for ifc in router_interfaces} == expected
 
 
 @pytest.mark.parametrize('hostname', [
@@ -236,7 +239,7 @@ def test_get_peers(hostname, load_nokia_netconf_config):
 
 def test_get_epipe_sap_details(load_nokia_netconf_config):
     netconf_doc = load_nokia_netconf_config("rt0.dub.ie.lab.office.geant.net")
-    epipe_sap_details = list(nokia.get_epipe_sap_details(netconf_doc))
+    epipe_sap_details = list(nokia.get_epipe_services_details(netconf_doc))
     expected_details = [
         {
             'service-id': '123456',
-- 
GitLab