diff --git a/iom-dc/LEAF-C1-SW1.cfg b/iom-dc/LEAF-C1-SW1.cfg index ab2bdd6..7899045 100644 --- a/iom-dc/LEAF-C1-SW1.cfg +++ b/iom-dc/LEAF-C1-SW1.cfg @@ -14,25 +14,25 @@ system { encrypted-password "$6$rounds=656000$XVfZXO9yn5j3bKx/$fHSTXI.LRWtIRUHlMZ3VPduBVNu9WZh.sn3r3R6kgqnpEp16hQpKUKiO24869c8cxXHeQrlytI7/u95FhPYf30"; ## SECRET-DATA } } - user h0barton { + user d0micilium { uid 2002; class super-user; + authentication { + encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + } + } + user h0barton { + uid 2003; + class super-user; authentication { encrypted-password "$6$rounds=656000$j52X8PoXRueVJyfV$oRjcRKT49MfPSuZ5NCPy0fLwGLCcbTO5Hzzk.sIg0YWtCXqc/Cx09PFYVroF6C5BvvHPuIjDeM5wR499ifT8W0"; ## SECRET-DATA } } user hobadmin { - uid 2003; - class super-user; - authentication { - encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA - } - } - user d0micilium { uid 2004; class super-user; authentication { - encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA } } } @@ -72,36 +72,6 @@ chassis { } } interfaces { - et-0/0/48 { - mtu 9216; - } - et-0/0/49 { - mtu 9216; - } - et-0/0/50 { - mtu 9216; - } - et-0/0/51 { - mtu 9216; - } - et-0/0/52 { - description "Link to SPINE-C7-SW1 et-0/0/0"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.1/31; - } - } - } - et-0/0/53 { - description "Link to SPINE-C7-SW2 et-0/0/0"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.3/31; - } - } - } xe-0/0/0 { ether-options { 802.3ad ae0; @@ -454,6 +424,36 @@ interfaces { } } } + et-0/0/48 { + mtu 9216; + } + et-0/0/49 { + mtu 9216; + } + et-0/0/50 { + mtu 9216; + } + et-0/0/51 { + mtu 9216; + } + et-0/0/52 { + description "Link to SPINE-C7-SW1 et-0/0/0"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.1/31; + } + } + } + et-0/0/53 { + description "Link to SPINE-C7-SW2 et-0/0/0"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.3/31; + } + } + } ae0 { mtu 9216; esi { @@ -1251,6 +1251,19 @@ interfaces { } } } +snmp { + location "Domicilium Datacentre RS2 C1"; + contact "isg@dataprocessors.com.au"; + community sbr1t1s0k { + authorization read-only; + clients { + 10.44.37.25/32; + 10.16.15.14/32; + 10.44.37.39/32; + 10.16.15.19/32; + } + } +} forwarding-options { storm-control-profiles default { all; @@ -1272,22 +1285,12 @@ policy-options { } } } -snmp { - location "Domicilium Datacentre RS2 C1"; - contact "isg@dataprocessors.com.au"; - community sbr1t1s0k { - authorization read-only; - clients { - 10.44.37.25/32; - 10.16.15.14/32; - 10.44.37.39/32; - 10.16.15.19/32; - } - } -} routing-options { router-id 172.31.255.3; autonomous-system 4200000000; + static { + route 0.0.0.0/0 next-hop 10.44.255.254; + } forwarding-table { export PFE-ECMP; chained-composite-next-hop { @@ -1299,7 +1302,6 @@ routing-options { } protocols { bgp { - log-updown; group OVERLAY { type internal; local-address 172.31.255.3; @@ -1332,6 +1334,7 @@ protocols { peer-as 4200000002; } } + log-updown; } evpn { encapsulation vxlan; @@ -1350,139 +1353,20 @@ switch-options { } } vlans { - vl1 { - vlan-id 1; - description "default"; - vxlan { - vni 1; - } - } - vl10 { - vlan-id 10; - description "Hurricane networks WAN MPLS end point"; - vxlan { - vni 10; - } - } - vl11 { - vlan-id 11; - description "VLAN for 2nd Internet link via Domicilium Transit"; - vxlan { - vni 11; - } - } - vl28 { - vlan-id 28; - description "New vlan for the 4G link to old network"; - vxlan { - vni 28; - } - } vl44 { - vlan-id 44; description "Main Data Vlan"; + vlan-id 44; l3-interface irb.44; vxlan { vni 44; } } - vl47 { - vlan-id 47; - description "New DMZ vlan"; - vxlan { - vni 47; - } - } vl48 { - vlan-id 48; description "DMZ VLAN"; + vlan-id 48; l3-interface irb.48; vxlan { vni 48; } } - vl54 { - vlan-id 54; - description "VLAN54"; - vxlan { - vni 54; - } - } - vl126 { - vlan-id 126; - description "Managed WAN services to Clarendon House"; - vxlan { - vni 126; - } - } - vl127 { - vlan-id 127; - description "Vlan for Second Fibre Link to Clarendon house"; - vxlan { - vni 127; - } - } - vl128 { - vlan-id 128; - description "Vlan for Clarendon house link"; - vxlan { - vni 128; - } - } - vl166 { - vlan-id 166; - description "LAN connection vlan for X1700 Cato sockets"; - vxlan { - vni 166; - } - } - vl193 { - vlan-id 193; - description "Cato connection for WAN 1 via Hurricane Networks"; - vxlan { - vni 193; - } - } - vl194 { - vlan-id 194; - description "Cato connection for WAN 2 via Domicilium Transit Internet"; - vxlan { - vni 194; - } - } - vl211 { - vlan-id 211; - description "PGI-NEW"; - vxlan { - vni 211; - } - } - vl2526 { - vlan-id 2526; - description "AWS Cross-Connect to London via London"; - vxlan { - vni 2526; - } - } - vl2527 { - vlan-id 2527; - description "OCI Cross-Connect to London via Manchester"; - vxlan { - vni 2527; - } - } - vl2528 { - vlan-id 2528; - description "OCI Fast connect via London"; - vxlan { - vni 2528; - } - } - vl2529 { - vlan-id 2529; - description "AWS Cross-Connect to Manchester"; - vxlan { - vni 2529; - } - } } diff --git a/iom-dc/LEAF-C1-SW2.cfg b/iom-dc/LEAF-C1-SW2.cfg index ab5290e..de8507a 100644 --- a/iom-dc/LEAF-C1-SW2.cfg +++ b/iom-dc/LEAF-C1-SW2.cfg @@ -14,25 +14,25 @@ system { encrypted-password "$6$rounds=656000$XVfZXO9yn5j3bKx/$fHSTXI.LRWtIRUHlMZ3VPduBVNu9WZh.sn3r3R6kgqnpEp16hQpKUKiO24869c8cxXHeQrlytI7/u95FhPYf30"; ## SECRET-DATA } } - user h0barton { + user d0micilium { uid 2002; class super-user; + authentication { + encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + } + } + user h0barton { + uid 2003; + class super-user; authentication { encrypted-password "$6$rounds=656000$j52X8PoXRueVJyfV$oRjcRKT49MfPSuZ5NCPy0fLwGLCcbTO5Hzzk.sIg0YWtCXqc/Cx09PFYVroF6C5BvvHPuIjDeM5wR499ifT8W0"; ## SECRET-DATA } } user hobadmin { - uid 2003; - class super-user; - authentication { - encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA - } - } - user d0micilium { uid 2004; class super-user; authentication { - encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA } } } @@ -72,32 +72,6 @@ chassis { } } interfaces { - et-0/0/48 { - } - et-0/0/49 { - } - et-0/0/50 { - } - et-0/0/51 { - } - et-0/0/52 { - description "Link to SPINE-C7-SW1 et-0/0/1"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.5/31; - } - } - } - et-0/0/53 { - description "Link to SPINE-C7-SW2 et-0/0/1"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.7/31; - } - } - } xe-0/0/0 { ether-options { 802.3ad ae0; @@ -434,6 +408,32 @@ interfaces { } } } + et-0/0/48 { + } + et-0/0/49 { + } + et-0/0/50 { + } + et-0/0/51 { + } + et-0/0/52 { + description "Link to SPINE-C7-SW1 et-0/0/1"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.5/31; + } + } + } + et-0/0/53 { + description "Link to SPINE-C7-SW2 et-0/0/1"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.7/31; + } + } + } ae0 { mtu 9216; esi { @@ -1231,6 +1231,19 @@ interfaces { } } } +snmp { + location "Domicilium Datacentre RS2 C1"; + contact "isg@dataprocessors.com.au"; + community sbr1t1s0k { + authorization read-only; + clients { + 10.44.37.25/32; + 10.16.15.14/32; + 10.44.37.39/32; + 10.16.15.19/32; + } + } +} forwarding-options { storm-control-profiles default { all; @@ -1252,22 +1265,12 @@ policy-options { } } } -snmp { - location "Domicilium Datacentre RS2 C1"; - contact "isg@dataprocessors.com.au"; - community sbr1t1s0k { - authorization read-only; - clients { - 10.44.37.25/32; - 10.16.15.14/32; - 10.44.37.39/32; - 10.16.15.19/32; - } - } -} routing-options { router-id 172.31.255.4; autonomous-system 4200000000; + static { + route 0.0.0.0/0 next-hop 10.44.255.254; + } forwarding-table { export PFE-ECMP; chained-composite-next-hop { @@ -1279,7 +1282,6 @@ routing-options { } protocols { bgp { - log-updown; group OVERLAY { type internal; local-address 172.31.255.4; @@ -1312,6 +1314,7 @@ protocols { peer-as 4200000002; } } + log-updown; } evpn { encapsulation vxlan; @@ -1330,139 +1333,20 @@ switch-options { } } vlans { - vl1 { - vlan-id 1; - description "default"; - vxlan { - vni 1; - } - } - vl10 { - vlan-id 10; - description "Hurricane networks WAN MPLS end point"; - vxlan { - vni 10; - } - } - vl11 { - vlan-id 11; - description "VLAN for 2nd Internet link via Domicilium Transit"; - vxlan { - vni 11; - } - } - vl28 { - vlan-id 28; - description "New vlan for the 4G link to old network"; - vxlan { - vni 28; - } - } vl44 { - vlan-id 44; description "Main Data Vlan"; + vlan-id 44; l3-interface irb.44; vxlan { vni 44; } } - vl47 { - vlan-id 47; - description "New DMZ vlan"; - vxlan { - vni 47; - } - } vl48 { - vlan-id 48; description "DMZ VLAN"; + vlan-id 48; l3-interface irb.48; vxlan { vni 48; } } - vl54 { - vlan-id 54; - description "VLAN54"; - vxlan { - vni 54; - } - } - vl126 { - vlan-id 126; - description "Managed WAN services to Clarendon House"; - vxlan { - vni 126; - } - } - vl127 { - vlan-id 127; - description "Vlan for Second Fibre Link to Clarendon house"; - vxlan { - vni 127; - } - } - vl128 { - vlan-id 128; - description "Vlan for Clarendon house link"; - vxlan { - vni 128; - } - } - vl166 { - vlan-id 166; - description "LAN connection vlan for X1700 Cato sockets"; - vxlan { - vni 166; - } - } - vl193 { - vlan-id 193; - description "Cato connection for WAN 1 via Hurricane Networks"; - vxlan { - vni 193; - } - } - vl194 { - vlan-id 194; - description "Cato connection for WAN 2 via Domicilium Transit Internet"; - vxlan { - vni 194; - } - } - vl211 { - vlan-id 211; - description "PGI-NEW"; - vxlan { - vni 211; - } - } - vl2526 { - vlan-id 2526; - description "AWS Cross-Connect to London via London"; - vxlan { - vni 2526; - } - } - vl2527 { - vlan-id 2527; - description "OCI Cross-Connect to London via Manchester"; - vxlan { - vni 2527; - } - } - vl2528 { - vlan-id 2528; - description "OCI Fast connect via London"; - vxlan { - vni 2528; - } - } - vl2529 { - vlan-id 2529; - description "AWS Cross-Connect to Manchester"; - vxlan { - vni 2529; - } - } } diff --git a/iom-dc/LEAF-C10-SW1.cfg b/iom-dc/LEAF-C10-SW1.cfg index 7d5b5d2..3dcf5e7 100644 --- a/iom-dc/LEAF-C10-SW1.cfg +++ b/iom-dc/LEAF-C10-SW1.cfg @@ -14,25 +14,25 @@ system { encrypted-password "$6$rounds=656000$XVfZXO9yn5j3bKx/$fHSTXI.LRWtIRUHlMZ3VPduBVNu9WZh.sn3r3R6kgqnpEp16hQpKUKiO24869c8cxXHeQrlytI7/u95FhPYf30"; ## SECRET-DATA } } - user h0barton { + user d0micilium { uid 2002; class super-user; + authentication { + encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + } + } + user h0barton { + uid 2003; + class super-user; authentication { encrypted-password "$6$rounds=656000$j52X8PoXRueVJyfV$oRjcRKT49MfPSuZ5NCPy0fLwGLCcbTO5Hzzk.sIg0YWtCXqc/Cx09PFYVroF6C5BvvHPuIjDeM5wR499ifT8W0"; ## SECRET-DATA } } user hobadmin { - uid 2003; - class super-user; - authentication { - encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA - } - } - user d0micilium { uid 2004; class super-user; authentication { - encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA } } } @@ -72,32 +72,6 @@ chassis { } } interfaces { - et-0/0/48 { - } - et-0/0/49 { - } - et-0/0/50 { - } - et-0/0/51 { - } - et-0/0/52 { - description "Link to SPINE-C7-SW1 et-0/0/16"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.65/31; - } - } - } - et-0/0/53 { - description "Link to SPINE-C7-SW2 et-0/0/16"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.67/31; - } - } - } xe-0/0/0 { ether-options { 802.3ad ae0; @@ -434,6 +408,32 @@ interfaces { } } } + et-0/0/48 { + } + et-0/0/49 { + } + et-0/0/50 { + } + et-0/0/51 { + } + et-0/0/52 { + description "Link to SPINE-C7-SW1 et-0/0/16"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.65/31; + } + } + } + et-0/0/53 { + description "Link to SPINE-C7-SW2 et-0/0/16"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.67/31; + } + } + } ae0 { mtu 9216; esi { @@ -1225,6 +1225,19 @@ interfaces { } } } +snmp { + location "Domicilium Datacentre RS2 C10"; + contact "isg@dataprocessors.com.au"; + community sbr1t1s0k { + authorization read-only; + clients { + 10.44.37.25/32; + 10.16.15.14/32; + 10.44.37.39/32; + 10.16.15.19/32; + } + } +} forwarding-options { storm-control-profiles default { all; @@ -1246,22 +1259,12 @@ policy-options { } } } -snmp { - location "Domicilium Datacentre RS2 C10"; - contact "isg@dataprocessors.com.au"; - community sbr1t1s0k { - authorization read-only; - clients { - 10.44.37.25/32; - 10.16.15.14/32; - 10.44.37.39/32; - 10.16.15.19/32; - } - } -} routing-options { router-id 172.31.255.19; autonomous-system 4200000000; + static { + route 0.0.0.0/0 next-hop 10.44.255.254; + } forwarding-table { export PFE-ECMP; chained-composite-next-hop { @@ -1273,7 +1276,6 @@ routing-options { } protocols { bgp { - log-updown; group OVERLAY { type internal; local-address 172.31.255.19; @@ -1306,6 +1308,7 @@ protocols { peer-as 4200000002; } } + log-updown; } evpn { encapsulation vxlan; @@ -1324,138 +1327,12 @@ switch-options { } } vlans { - vl1 { - vlan-id 1; - description "default"; - vxlan { - vni 1; - } - } - vl10 { - vlan-id 10; - description "Hurricane networks WAN MPLS end point"; - vxlan { - vni 10; - } - } - vl11 { - vlan-id 11; - description "VLAN for 2nd Internet link via Domicilium Transit"; - vxlan { - vni 11; - } - } - vl28 { - vlan-id 28; - description "New vlan for the 4G link to old network"; - vxlan { - vni 28; - } - } vl44 { - vlan-id 44; description "Main Data Vlan"; + vlan-id 44; l3-interface irb.44; vxlan { vni 44; } } - vl47 { - vlan-id 47; - description "New DMZ vlan"; - vxlan { - vni 47; - } - } - vl48 { - vlan-id 48; - description "DMZ VLAN"; - vxlan { - vni 48; - } - } - vl54 { - vlan-id 54; - description "VLAN54"; - vxlan { - vni 54; - } - } - vl126 { - vlan-id 126; - description "Managed WAN services to Clarendon House"; - vxlan { - vni 126; - } - } - vl127 { - vlan-id 127; - description "Vlan for Second Fibre Link to Clarendon house"; - vxlan { - vni 127; - } - } - vl128 { - vlan-id 128; - description "Vlan for Clarendon house link"; - vxlan { - vni 128; - } - } - vl166 { - vlan-id 166; - description "LAN connection vlan for X1700 Cato sockets"; - vxlan { - vni 166; - } - } - vl193 { - vlan-id 193; - description "Cato connection for WAN 1 via Hurricane Networks"; - vxlan { - vni 193; - } - } - vl194 { - vlan-id 194; - description "Cato connection for WAN 2 via Domicilium Transit Internet"; - vxlan { - vni 194; - } - } - vl211 { - vlan-id 211; - description "PGI-NEW"; - vxlan { - vni 211; - } - } - vl2526 { - vlan-id 2526; - description "AWS Cross-Connect to London via London"; - vxlan { - vni 2526; - } - } - vl2527 { - vlan-id 2527; - description "OCI Cross-Connect to London via Manchester"; - vxlan { - vni 2527; - } - } - vl2528 { - vlan-id 2528; - description "OCI Fast connect via London"; - vxlan { - vni 2528; - } - } - vl2529 { - vlan-id 2529; - description "AWS Cross-Connect to Manchester"; - vxlan { - vni 2529; - } - } } diff --git a/iom-dc/LEAF-C10-SW2.cfg b/iom-dc/LEAF-C10-SW2.cfg index f40b89f..eb8e697 100644 --- a/iom-dc/LEAF-C10-SW2.cfg +++ b/iom-dc/LEAF-C10-SW2.cfg @@ -14,25 +14,25 @@ system { encrypted-password "$6$rounds=656000$XVfZXO9yn5j3bKx/$fHSTXI.LRWtIRUHlMZ3VPduBVNu9WZh.sn3r3R6kgqnpEp16hQpKUKiO24869c8cxXHeQrlytI7/u95FhPYf30"; ## SECRET-DATA } } - user h0barton { + user d0micilium { uid 2002; class super-user; + authentication { + encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + } + } + user h0barton { + uid 2003; + class super-user; authentication { encrypted-password "$6$rounds=656000$j52X8PoXRueVJyfV$oRjcRKT49MfPSuZ5NCPy0fLwGLCcbTO5Hzzk.sIg0YWtCXqc/Cx09PFYVroF6C5BvvHPuIjDeM5wR499ifT8W0"; ## SECRET-DATA } } user hobadmin { - uid 2003; - class super-user; - authentication { - encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA - } - } - user d0micilium { uid 2004; class super-user; authentication { - encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA } } } @@ -72,32 +72,6 @@ chassis { } } interfaces { - et-0/0/48 { - } - et-0/0/49 { - } - et-0/0/50 { - } - et-0/0/51 { - } - et-0/0/52 { - description "Link to SPINE-C7-SW1 et-0/0/17"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.69/31; - } - } - } - et-0/0/53 { - description "Link to SPINE-C7-SW2 et-0/0/17"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.71/31; - } - } - } xe-0/0/0 { ether-options { 802.3ad ae0; @@ -434,6 +408,32 @@ interfaces { } } } + et-0/0/48 { + } + et-0/0/49 { + } + et-0/0/50 { + } + et-0/0/51 { + } + et-0/0/52 { + description "Link to SPINE-C7-SW1 et-0/0/17"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.69/31; + } + } + } + et-0/0/53 { + description "Link to SPINE-C7-SW2 et-0/0/17"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.71/31; + } + } + } ae0 { mtu 9216; esi { @@ -1225,6 +1225,19 @@ interfaces { } } } +snmp { + location "Domicilium Datacentre RS2 C10"; + contact "isg@dataprocessors.com.au"; + community sbr1t1s0k { + authorization read-only; + clients { + 10.44.37.25/32; + 10.16.15.14/32; + 10.44.37.39/32; + 10.16.15.19/32; + } + } +} forwarding-options { storm-control-profiles default { all; @@ -1246,22 +1259,12 @@ policy-options { } } } -snmp { - location "Domicilium Datacentre RS2 C10"; - contact "isg@dataprocessors.com.au"; - community sbr1t1s0k { - authorization read-only; - clients { - 10.44.37.25/32; - 10.16.15.14/32; - 10.44.37.39/32; - 10.16.15.19/32; - } - } -} routing-options { router-id 172.31.255.20; autonomous-system 4200000000; + static { + route 0.0.0.0/0 next-hop 10.44.255.254; + } forwarding-table { export PFE-ECMP; chained-composite-next-hop { @@ -1273,7 +1276,6 @@ routing-options { } protocols { bgp { - log-updown; group OVERLAY { type internal; local-address 172.31.255.20; @@ -1306,6 +1308,7 @@ protocols { peer-as 4200000002; } } + log-updown; } evpn { encapsulation vxlan; @@ -1324,138 +1327,12 @@ switch-options { } } vlans { - vl1 { - vlan-id 1; - description "default"; - vxlan { - vni 1; - } - } - vl10 { - vlan-id 10; - description "Hurricane networks WAN MPLS end point"; - vxlan { - vni 10; - } - } - vl11 { - vlan-id 11; - description "VLAN for 2nd Internet link via Domicilium Transit"; - vxlan { - vni 11; - } - } - vl28 { - vlan-id 28; - description "New vlan for the 4G link to old network"; - vxlan { - vni 28; - } - } vl44 { - vlan-id 44; description "Main Data Vlan"; + vlan-id 44; l3-interface irb.44; vxlan { vni 44; } } - vl47 { - vlan-id 47; - description "New DMZ vlan"; - vxlan { - vni 47; - } - } - vl48 { - vlan-id 48; - description "DMZ VLAN"; - vxlan { - vni 48; - } - } - vl54 { - vlan-id 54; - description "VLAN54"; - vxlan { - vni 54; - } - } - vl126 { - vlan-id 126; - description "Managed WAN services to Clarendon House"; - vxlan { - vni 126; - } - } - vl127 { - vlan-id 127; - description "Vlan for Second Fibre Link to Clarendon house"; - vxlan { - vni 127; - } - } - vl128 { - vlan-id 128; - description "Vlan for Clarendon house link"; - vxlan { - vni 128; - } - } - vl166 { - vlan-id 166; - description "LAN connection vlan for X1700 Cato sockets"; - vxlan { - vni 166; - } - } - vl193 { - vlan-id 193; - description "Cato connection for WAN 1 via Hurricane Networks"; - vxlan { - vni 193; - } - } - vl194 { - vlan-id 194; - description "Cato connection for WAN 2 via Domicilium Transit Internet"; - vxlan { - vni 194; - } - } - vl211 { - vlan-id 211; - description "PGI-NEW"; - vxlan { - vni 211; - } - } - vl2526 { - vlan-id 2526; - description "AWS Cross-Connect to London via London"; - vxlan { - vni 2526; - } - } - vl2527 { - vlan-id 2527; - description "OCI Cross-Connect to London via Manchester"; - vxlan { - vni 2527; - } - } - vl2528 { - vlan-id 2528; - description "OCI Fast connect via London"; - vxlan { - vni 2528; - } - } - vl2529 { - vlan-id 2529; - description "AWS Cross-Connect to Manchester"; - vxlan { - vni 2529; - } - } } diff --git a/iom-dc/LEAF-C11-SW1.cfg b/iom-dc/LEAF-C11-SW1.cfg index 21efd3d..ef1a817 100644 --- a/iom-dc/LEAF-C11-SW1.cfg +++ b/iom-dc/LEAF-C11-SW1.cfg @@ -14,25 +14,25 @@ system { encrypted-password "$6$rounds=656000$XVfZXO9yn5j3bKx/$fHSTXI.LRWtIRUHlMZ3VPduBVNu9WZh.sn3r3R6kgqnpEp16hQpKUKiO24869c8cxXHeQrlytI7/u95FhPYf30"; ## SECRET-DATA } } - user h0barton { + user d0micilium { uid 2002; class super-user; + authentication { + encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + } + } + user h0barton { + uid 2003; + class super-user; authentication { encrypted-password "$6$rounds=656000$j52X8PoXRueVJyfV$oRjcRKT49MfPSuZ5NCPy0fLwGLCcbTO5Hzzk.sIg0YWtCXqc/Cx09PFYVroF6C5BvvHPuIjDeM5wR499ifT8W0"; ## SECRET-DATA } } user hobadmin { - uid 2003; - class super-user; - authentication { - encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA - } - } - user d0micilium { uid 2004; class super-user; authentication { - encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA } } } @@ -72,32 +72,6 @@ chassis { } } interfaces { - et-0/0/48 { - } - et-0/0/49 { - } - et-0/0/50 { - } - et-0/0/51 { - } - et-0/0/52 { - description "Link to SPINE-C7-SW1 et-0/0/18"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.73/31; - } - } - } - et-0/0/53 { - description "Link to SPINE-C7-SW2 et-0/0/18"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.75/31; - } - } - } xe-0/0/0 { ether-options { 802.3ad ae0; @@ -434,6 +408,32 @@ interfaces { } } } + et-0/0/48 { + } + et-0/0/49 { + } + et-0/0/50 { + } + et-0/0/51 { + } + et-0/0/52 { + description "Link to SPINE-C7-SW1 et-0/0/18"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.73/31; + } + } + } + et-0/0/53 { + description "Link to SPINE-C7-SW2 et-0/0/18"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.75/31; + } + } + } ae0 { mtu 9216; esi { @@ -1225,6 +1225,19 @@ interfaces { } } } +snmp { + location "Domicilium Datacentre RS2 C11"; + contact "isg@dataprocessors.com.au"; + community sbr1t1s0k { + authorization read-only; + clients { + 10.44.37.25/32; + 10.16.15.14/32; + 10.44.37.39/32; + 10.16.15.19/32; + } + } +} forwarding-options { storm-control-profiles default { all; @@ -1246,22 +1259,12 @@ policy-options { } } } -snmp { - location "Domicilium Datacentre RS2 C11"; - contact "isg@dataprocessors.com.au"; - community sbr1t1s0k { - authorization read-only; - clients { - 10.44.37.25/32; - 10.16.15.14/32; - 10.44.37.39/32; - 10.16.15.19/32; - } - } -} routing-options { router-id 172.31.255.21; autonomous-system 4200000000; + static { + route 0.0.0.0/0 next-hop 10.44.255.254; + } forwarding-table { export PFE-ECMP; chained-composite-next-hop { @@ -1273,7 +1276,6 @@ routing-options { } protocols { bgp { - log-updown; group OVERLAY { type internal; local-address 172.31.255.21; @@ -1306,6 +1308,7 @@ protocols { peer-as 4200000002; } } + log-updown; } evpn { encapsulation vxlan; @@ -1324,138 +1327,12 @@ switch-options { } } vlans { - vl1 { - vlan-id 1; - description "default"; - vxlan { - vni 1; - } - } - vl10 { - vlan-id 10; - description "Hurricane networks WAN MPLS end point"; - vxlan { - vni 10; - } - } - vl11 { - vlan-id 11; - description "VLAN for 2nd Internet link via Domicilium Transit"; - vxlan { - vni 11; - } - } - vl28 { - vlan-id 28; - description "New vlan for the 4G link to old network"; - vxlan { - vni 28; - } - } vl44 { - vlan-id 44; description "Main Data Vlan"; + vlan-id 44; l3-interface irb.44; vxlan { vni 44; } } - vl47 { - vlan-id 47; - description "New DMZ vlan"; - vxlan { - vni 47; - } - } - vl48 { - vlan-id 48; - description "DMZ VLAN"; - vxlan { - vni 48; - } - } - vl54 { - vlan-id 54; - description "VLAN54"; - vxlan { - vni 54; - } - } - vl126 { - vlan-id 126; - description "Managed WAN services to Clarendon House"; - vxlan { - vni 126; - } - } - vl127 { - vlan-id 127; - description "Vlan for Second Fibre Link to Clarendon house"; - vxlan { - vni 127; - } - } - vl128 { - vlan-id 128; - description "Vlan for Clarendon house link"; - vxlan { - vni 128; - } - } - vl166 { - vlan-id 166; - description "LAN connection vlan for X1700 Cato sockets"; - vxlan { - vni 166; - } - } - vl193 { - vlan-id 193; - description "Cato connection for WAN 1 via Hurricane Networks"; - vxlan { - vni 193; - } - } - vl194 { - vlan-id 194; - description "Cato connection for WAN 2 via Domicilium Transit Internet"; - vxlan { - vni 194; - } - } - vl211 { - vlan-id 211; - description "PGI-NEW"; - vxlan { - vni 211; - } - } - vl2526 { - vlan-id 2526; - description "AWS Cross-Connect to London via London"; - vxlan { - vni 2526; - } - } - vl2527 { - vlan-id 2527; - description "OCI Cross-Connect to London via Manchester"; - vxlan { - vni 2527; - } - } - vl2528 { - vlan-id 2528; - description "OCI Fast connect via London"; - vxlan { - vni 2528; - } - } - vl2529 { - vlan-id 2529; - description "AWS Cross-Connect to Manchester"; - vxlan { - vni 2529; - } - } } diff --git a/iom-dc/LEAF-C11-SW2.cfg b/iom-dc/LEAF-C11-SW2.cfg index c64cd4c..af63f5d 100644 --- a/iom-dc/LEAF-C11-SW2.cfg +++ b/iom-dc/LEAF-C11-SW2.cfg @@ -14,25 +14,25 @@ system { encrypted-password "$6$rounds=656000$XVfZXO9yn5j3bKx/$fHSTXI.LRWtIRUHlMZ3VPduBVNu9WZh.sn3r3R6kgqnpEp16hQpKUKiO24869c8cxXHeQrlytI7/u95FhPYf30"; ## SECRET-DATA } } - user h0barton { + user d0micilium { uid 2002; class super-user; + authentication { + encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + } + } + user h0barton { + uid 2003; + class super-user; authentication { encrypted-password "$6$rounds=656000$j52X8PoXRueVJyfV$oRjcRKT49MfPSuZ5NCPy0fLwGLCcbTO5Hzzk.sIg0YWtCXqc/Cx09PFYVroF6C5BvvHPuIjDeM5wR499ifT8W0"; ## SECRET-DATA } } user hobadmin { - uid 2003; - class super-user; - authentication { - encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA - } - } - user d0micilium { uid 2004; class super-user; authentication { - encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA } } } @@ -72,32 +72,6 @@ chassis { } } interfaces { - et-0/0/48 { - } - et-0/0/49 { - } - et-0/0/50 { - } - et-0/0/51 { - } - et-0/0/52 { - description "Link to SPINE-C7-SW1 et-0/0/19"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.77/31; - } - } - } - et-0/0/53 { - description "Link to SPINE-C7-SW2 et-0/0/19"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.79/31; - } - } - } xe-0/0/0 { ether-options { 802.3ad ae0; @@ -434,6 +408,32 @@ interfaces { } } } + et-0/0/48 { + } + et-0/0/49 { + } + et-0/0/50 { + } + et-0/0/51 { + } + et-0/0/52 { + description "Link to SPINE-C7-SW1 et-0/0/19"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.77/31; + } + } + } + et-0/0/53 { + description "Link to SPINE-C7-SW2 et-0/0/19"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.79/31; + } + } + } ae0 { mtu 9216; esi { @@ -1225,6 +1225,19 @@ interfaces { } } } +snmp { + location "Domicilium Datacentre RS2 C11"; + contact "isg@dataprocessors.com.au"; + community sbr1t1s0k { + authorization read-only; + clients { + 10.44.37.25/32; + 10.16.15.14/32; + 10.44.37.39/32; + 10.16.15.19/32; + } + } +} forwarding-options { storm-control-profiles default { all; @@ -1246,22 +1259,12 @@ policy-options { } } } -snmp { - location "Domicilium Datacentre RS2 C11"; - contact "isg@dataprocessors.com.au"; - community sbr1t1s0k { - authorization read-only; - clients { - 10.44.37.25/32; - 10.16.15.14/32; - 10.44.37.39/32; - 10.16.15.19/32; - } - } -} routing-options { router-id 172.31.255.22; autonomous-system 4200000000; + static { + route 0.0.0.0/0 next-hop 10.44.255.254; + } forwarding-table { export PFE-ECMP; chained-composite-next-hop { @@ -1273,7 +1276,6 @@ routing-options { } protocols { bgp { - log-updown; group OVERLAY { type internal; local-address 172.31.255.22; @@ -1306,6 +1308,7 @@ protocols { peer-as 4200000002; } } + log-updown; } evpn { encapsulation vxlan; @@ -1324,138 +1327,12 @@ switch-options { } } vlans { - vl1 { - vlan-id 1; - description "default"; - vxlan { - vni 1; - } - } - vl10 { - vlan-id 10; - description "Hurricane networks WAN MPLS end point"; - vxlan { - vni 10; - } - } - vl11 { - vlan-id 11; - description "VLAN for 2nd Internet link via Domicilium Transit"; - vxlan { - vni 11; - } - } - vl28 { - vlan-id 28; - description "New vlan for the 4G link to old network"; - vxlan { - vni 28; - } - } vl44 { - vlan-id 44; description "Main Data Vlan"; + vlan-id 44; l3-interface irb.44; vxlan { vni 44; } } - vl47 { - vlan-id 47; - description "New DMZ vlan"; - vxlan { - vni 47; - } - } - vl48 { - vlan-id 48; - description "DMZ VLAN"; - vxlan { - vni 48; - } - } - vl54 { - vlan-id 54; - description "VLAN54"; - vxlan { - vni 54; - } - } - vl126 { - vlan-id 126; - description "Managed WAN services to Clarendon House"; - vxlan { - vni 126; - } - } - vl127 { - vlan-id 127; - description "Vlan for Second Fibre Link to Clarendon house"; - vxlan { - vni 127; - } - } - vl128 { - vlan-id 128; - description "Vlan for Clarendon house link"; - vxlan { - vni 128; - } - } - vl166 { - vlan-id 166; - description "LAN connection vlan for X1700 Cato sockets"; - vxlan { - vni 166; - } - } - vl193 { - vlan-id 193; - description "Cato connection for WAN 1 via Hurricane Networks"; - vxlan { - vni 193; - } - } - vl194 { - vlan-id 194; - description "Cato connection for WAN 2 via Domicilium Transit Internet"; - vxlan { - vni 194; - } - } - vl211 { - vlan-id 211; - description "PGI-NEW"; - vxlan { - vni 211; - } - } - vl2526 { - vlan-id 2526; - description "AWS Cross-Connect to London via London"; - vxlan { - vni 2526; - } - } - vl2527 { - vlan-id 2527; - description "OCI Cross-Connect to London via Manchester"; - vxlan { - vni 2527; - } - } - vl2528 { - vlan-id 2528; - description "OCI Fast connect via London"; - vxlan { - vni 2528; - } - } - vl2529 { - vlan-id 2529; - description "AWS Cross-Connect to Manchester"; - vxlan { - vni 2529; - } - } } diff --git a/iom-dc/LEAF-C12-SW1.cfg b/iom-dc/LEAF-C12-SW1.cfg index 93840f6..afbbd3c 100644 --- a/iom-dc/LEAF-C12-SW1.cfg +++ b/iom-dc/LEAF-C12-SW1.cfg @@ -14,25 +14,25 @@ system { encrypted-password "$6$rounds=656000$XVfZXO9yn5j3bKx/$fHSTXI.LRWtIRUHlMZ3VPduBVNu9WZh.sn3r3R6kgqnpEp16hQpKUKiO24869c8cxXHeQrlytI7/u95FhPYf30"; ## SECRET-DATA } } - user h0barton { + user d0micilium { uid 2002; class super-user; + authentication { + encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + } + } + user h0barton { + uid 2003; + class super-user; authentication { encrypted-password "$6$rounds=656000$j52X8PoXRueVJyfV$oRjcRKT49MfPSuZ5NCPy0fLwGLCcbTO5Hzzk.sIg0YWtCXqc/Cx09PFYVroF6C5BvvHPuIjDeM5wR499ifT8W0"; ## SECRET-DATA } } user hobadmin { - uid 2003; - class super-user; - authentication { - encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA - } - } - user d0micilium { uid 2004; class super-user; authentication { - encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA } } } @@ -72,32 +72,6 @@ chassis { } } interfaces { - et-0/0/48 { - } - et-0/0/49 { - } - et-0/0/50 { - } - et-0/0/51 { - } - et-0/0/52 { - description "Link to SPINE-C7-SW1 et-0/0/20"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.81/31; - } - } - } - et-0/0/53 { - description "Link to SPINE-C7-SW2 et-0/0/20"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.83/31; - } - } - } xe-0/0/0 { ether-options { 802.3ad ae0; @@ -434,6 +408,32 @@ interfaces { } } } + et-0/0/48 { + } + et-0/0/49 { + } + et-0/0/50 { + } + et-0/0/51 { + } + et-0/0/52 { + description "Link to SPINE-C7-SW1 et-0/0/20"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.81/31; + } + } + } + et-0/0/53 { + description "Link to SPINE-C7-SW2 et-0/0/20"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.83/31; + } + } + } ae0 { mtu 9216; esi { @@ -1225,6 +1225,19 @@ interfaces { } } } +snmp { + location "Domicilium Datacentre RS2 C12"; + contact "isg@dataprocessors.com.au"; + community sbr1t1s0k { + authorization read-only; + clients { + 10.44.37.25/32; + 10.16.15.14/32; + 10.44.37.39/32; + 10.16.15.19/32; + } + } +} forwarding-options { storm-control-profiles default { all; @@ -1246,22 +1259,12 @@ policy-options { } } } -snmp { - location "Domicilium Datacentre RS2 C12"; - contact "isg@dataprocessors.com.au"; - community sbr1t1s0k { - authorization read-only; - clients { - 10.44.37.25/32; - 10.16.15.14/32; - 10.44.37.39/32; - 10.16.15.19/32; - } - } -} routing-options { router-id 172.31.255.23; autonomous-system 4200000000; + static { + route 0.0.0.0/0 next-hop 10.44.255.254; + } forwarding-table { export PFE-ECMP; chained-composite-next-hop { @@ -1273,7 +1276,6 @@ routing-options { } protocols { bgp { - log-updown; group OVERLAY { type internal; local-address 172.31.255.23; @@ -1306,6 +1308,7 @@ protocols { peer-as 4200000002; } } + log-updown; } evpn { encapsulation vxlan; @@ -1324,138 +1327,12 @@ switch-options { } } vlans { - vl1 { - vlan-id 1; - description "default"; - vxlan { - vni 1; - } - } - vl10 { - vlan-id 10; - description "Hurricane networks WAN MPLS end point"; - vxlan { - vni 10; - } - } - vl11 { - vlan-id 11; - description "VLAN for 2nd Internet link via Domicilium Transit"; - vxlan { - vni 11; - } - } - vl28 { - vlan-id 28; - description "New vlan for the 4G link to old network"; - vxlan { - vni 28; - } - } vl44 { - vlan-id 44; description "Main Data Vlan"; + vlan-id 44; l3-interface irb.44; vxlan { vni 44; } } - vl47 { - vlan-id 47; - description "New DMZ vlan"; - vxlan { - vni 47; - } - } - vl48 { - vlan-id 48; - description "DMZ VLAN"; - vxlan { - vni 48; - } - } - vl54 { - vlan-id 54; - description "VLAN54"; - vxlan { - vni 54; - } - } - vl126 { - vlan-id 126; - description "Managed WAN services to Clarendon House"; - vxlan { - vni 126; - } - } - vl127 { - vlan-id 127; - description "Vlan for Second Fibre Link to Clarendon house"; - vxlan { - vni 127; - } - } - vl128 { - vlan-id 128; - description "Vlan for Clarendon house link"; - vxlan { - vni 128; - } - } - vl166 { - vlan-id 166; - description "LAN connection vlan for X1700 Cato sockets"; - vxlan { - vni 166; - } - } - vl193 { - vlan-id 193; - description "Cato connection for WAN 1 via Hurricane Networks"; - vxlan { - vni 193; - } - } - vl194 { - vlan-id 194; - description "Cato connection for WAN 2 via Domicilium Transit Internet"; - vxlan { - vni 194; - } - } - vl211 { - vlan-id 211; - description "PGI-NEW"; - vxlan { - vni 211; - } - } - vl2526 { - vlan-id 2526; - description "AWS Cross-Connect to London via London"; - vxlan { - vni 2526; - } - } - vl2527 { - vlan-id 2527; - description "OCI Cross-Connect to London via Manchester"; - vxlan { - vni 2527; - } - } - vl2528 { - vlan-id 2528; - description "OCI Fast connect via London"; - vxlan { - vni 2528; - } - } - vl2529 { - vlan-id 2529; - description "AWS Cross-Connect to Manchester"; - vxlan { - vni 2529; - } - } } diff --git a/iom-dc/LEAF-C12-SW2.cfg b/iom-dc/LEAF-C12-SW2.cfg index fa8fd1b..1bbb296 100644 --- a/iom-dc/LEAF-C12-SW2.cfg +++ b/iom-dc/LEAF-C12-SW2.cfg @@ -14,25 +14,25 @@ system { encrypted-password "$6$rounds=656000$XVfZXO9yn5j3bKx/$fHSTXI.LRWtIRUHlMZ3VPduBVNu9WZh.sn3r3R6kgqnpEp16hQpKUKiO24869c8cxXHeQrlytI7/u95FhPYf30"; ## SECRET-DATA } } - user h0barton { + user d0micilium { uid 2002; class super-user; + authentication { + encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + } + } + user h0barton { + uid 2003; + class super-user; authentication { encrypted-password "$6$rounds=656000$j52X8PoXRueVJyfV$oRjcRKT49MfPSuZ5NCPy0fLwGLCcbTO5Hzzk.sIg0YWtCXqc/Cx09PFYVroF6C5BvvHPuIjDeM5wR499ifT8W0"; ## SECRET-DATA } } user hobadmin { - uid 2003; - class super-user; - authentication { - encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA - } - } - user d0micilium { uid 2004; class super-user; authentication { - encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA } } } @@ -72,32 +72,6 @@ chassis { } } interfaces { - et-0/0/48 { - } - et-0/0/49 { - } - et-0/0/50 { - } - et-0/0/51 { - } - et-0/0/52 { - description "Link to SPINE-C7-SW1 et-0/0/21"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.85/31; - } - } - } - et-0/0/53 { - description "Link to SPINE-C7-SW2 et-0/0/21"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.87/31; - } - } - } xe-0/0/0 { ether-options { 802.3ad ae0; @@ -434,6 +408,32 @@ interfaces { } } } + et-0/0/48 { + } + et-0/0/49 { + } + et-0/0/50 { + } + et-0/0/51 { + } + et-0/0/52 { + description "Link to SPINE-C7-SW1 et-0/0/21"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.85/31; + } + } + } + et-0/0/53 { + description "Link to SPINE-C7-SW2 et-0/0/21"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.87/31; + } + } + } ae0 { mtu 9216; esi { @@ -1225,6 +1225,19 @@ interfaces { } } } +snmp { + location "Domicilium Datacentre RS2 C12"; + contact "isg@dataprocessors.com.au"; + community sbr1t1s0k { + authorization read-only; + clients { + 10.44.37.25/32; + 10.16.15.14/32; + 10.44.37.39/32; + 10.16.15.19/32; + } + } +} forwarding-options { storm-control-profiles default { all; @@ -1246,22 +1259,12 @@ policy-options { } } } -snmp { - location "Domicilium Datacentre RS2 C12"; - contact "isg@dataprocessors.com.au"; - community sbr1t1s0k { - authorization read-only; - clients { - 10.44.37.25/32; - 10.16.15.14/32; - 10.44.37.39/32; - 10.16.15.19/32; - } - } -} routing-options { router-id 172.31.255.24; autonomous-system 4200000000; + static { + route 0.0.0.0/0 next-hop 10.44.255.254; + } forwarding-table { export PFE-ECMP; chained-composite-next-hop { @@ -1273,7 +1276,6 @@ routing-options { } protocols { bgp { - log-updown; group OVERLAY { type internal; local-address 172.31.255.24; @@ -1306,6 +1308,7 @@ protocols { peer-as 4200000002; } } + log-updown; } evpn { encapsulation vxlan; @@ -1324,138 +1327,12 @@ switch-options { } } vlans { - vl1 { - vlan-id 1; - description "default"; - vxlan { - vni 1; - } - } - vl10 { - vlan-id 10; - description "Hurricane networks WAN MPLS end point"; - vxlan { - vni 10; - } - } - vl11 { - vlan-id 11; - description "VLAN for 2nd Internet link via Domicilium Transit"; - vxlan { - vni 11; - } - } - vl28 { - vlan-id 28; - description "New vlan for the 4G link to old network"; - vxlan { - vni 28; - } - } vl44 { - vlan-id 44; description "Main Data Vlan"; + vlan-id 44; l3-interface irb.44; vxlan { vni 44; } } - vl47 { - vlan-id 47; - description "New DMZ vlan"; - vxlan { - vni 47; - } - } - vl48 { - vlan-id 48; - description "DMZ VLAN"; - vxlan { - vni 48; - } - } - vl54 { - vlan-id 54; - description "VLAN54"; - vxlan { - vni 54; - } - } - vl126 { - vlan-id 126; - description "Managed WAN services to Clarendon House"; - vxlan { - vni 126; - } - } - vl127 { - vlan-id 127; - description "Vlan for Second Fibre Link to Clarendon house"; - vxlan { - vni 127; - } - } - vl128 { - vlan-id 128; - description "Vlan for Clarendon house link"; - vxlan { - vni 128; - } - } - vl166 { - vlan-id 166; - description "LAN connection vlan for X1700 Cato sockets"; - vxlan { - vni 166; - } - } - vl193 { - vlan-id 193; - description "Cato connection for WAN 1 via Hurricane Networks"; - vxlan { - vni 193; - } - } - vl194 { - vlan-id 194; - description "Cato connection for WAN 2 via Domicilium Transit Internet"; - vxlan { - vni 194; - } - } - vl211 { - vlan-id 211; - description "PGI-NEW"; - vxlan { - vni 211; - } - } - vl2526 { - vlan-id 2526; - description "AWS Cross-Connect to London via London"; - vxlan { - vni 2526; - } - } - vl2527 { - vlan-id 2527; - description "OCI Cross-Connect to London via Manchester"; - vxlan { - vni 2527; - } - } - vl2528 { - vlan-id 2528; - description "OCI Fast connect via London"; - vxlan { - vni 2528; - } - } - vl2529 { - vlan-id 2529; - description "AWS Cross-Connect to Manchester"; - vxlan { - vni 2529; - } - } } diff --git a/iom-dc/LEAF-C13-SW1.cfg b/iom-dc/LEAF-C13-SW1.cfg index f414c1f..6a37d45 100644 --- a/iom-dc/LEAF-C13-SW1.cfg +++ b/iom-dc/LEAF-C13-SW1.cfg @@ -14,25 +14,25 @@ system { encrypted-password "$6$rounds=656000$XVfZXO9yn5j3bKx/$fHSTXI.LRWtIRUHlMZ3VPduBVNu9WZh.sn3r3R6kgqnpEp16hQpKUKiO24869c8cxXHeQrlytI7/u95FhPYf30"; ## SECRET-DATA } } - user h0barton { + user d0micilium { uid 2002; class super-user; + authentication { + encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + } + } + user h0barton { + uid 2003; + class super-user; authentication { encrypted-password "$6$rounds=656000$j52X8PoXRueVJyfV$oRjcRKT49MfPSuZ5NCPy0fLwGLCcbTO5Hzzk.sIg0YWtCXqc/Cx09PFYVroF6C5BvvHPuIjDeM5wR499ifT8W0"; ## SECRET-DATA } } user hobadmin { - uid 2003; - class super-user; - authentication { - encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA - } - } - user d0micilium { uid 2004; class super-user; authentication { - encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA } } } @@ -72,32 +72,6 @@ chassis { } } interfaces { - et-0/0/48 { - } - et-0/0/49 { - } - et-0/0/50 { - } - et-0/0/51 { - } - et-0/0/52 { - description "Link to SPINE-C7-SW1 et-0/0/22"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.89/31; - } - } - } - et-0/0/53 { - description "Link to SPINE-C7-SW2 et-0/0/22"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.91/31; - } - } - } xe-0/0/0 { ether-options { 802.3ad ae0; @@ -434,6 +408,32 @@ interfaces { } } } + et-0/0/48 { + } + et-0/0/49 { + } + et-0/0/50 { + } + et-0/0/51 { + } + et-0/0/52 { + description "Link to SPINE-C7-SW1 et-0/0/22"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.89/31; + } + } + } + et-0/0/53 { + description "Link to SPINE-C7-SW2 et-0/0/22"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.91/31; + } + } + } ae0 { mtu 9216; esi { @@ -1225,6 +1225,19 @@ interfaces { } } } +snmp { + location "Domicilium Datacentre RS2 C13"; + contact "isg@dataprocessors.com.au"; + community sbr1t1s0k { + authorization read-only; + clients { + 10.44.37.25/32; + 10.16.15.14/32; + 10.44.37.39/32; + 10.16.15.19/32; + } + } +} forwarding-options { storm-control-profiles default { all; @@ -1246,22 +1259,12 @@ policy-options { } } } -snmp { - location "Domicilium Datacentre RS2 C13"; - contact "isg@dataprocessors.com.au"; - community sbr1t1s0k { - authorization read-only; - clients { - 10.44.37.25/32; - 10.16.15.14/32; - 10.44.37.39/32; - 10.16.15.19/32; - } - } -} routing-options { router-id 172.31.255.25; autonomous-system 4200000000; + static { + route 0.0.0.0/0 next-hop 10.44.255.254; + } forwarding-table { export PFE-ECMP; chained-composite-next-hop { @@ -1273,7 +1276,6 @@ routing-options { } protocols { bgp { - log-updown; group OVERLAY { type internal; local-address 172.31.255.25; @@ -1306,6 +1308,7 @@ protocols { peer-as 4200000002; } } + log-updown; } evpn { encapsulation vxlan; @@ -1324,138 +1327,12 @@ switch-options { } } vlans { - vl1 { - vlan-id 1; - description "default"; - vxlan { - vni 1; - } - } - vl10 { - vlan-id 10; - description "Hurricane networks WAN MPLS end point"; - vxlan { - vni 10; - } - } - vl11 { - vlan-id 11; - description "VLAN for 2nd Internet link via Domicilium Transit"; - vxlan { - vni 11; - } - } - vl28 { - vlan-id 28; - description "New vlan for the 4G link to old network"; - vxlan { - vni 28; - } - } vl44 { - vlan-id 44; description "Main Data Vlan"; + vlan-id 44; l3-interface irb.44; vxlan { vni 44; } } - vl47 { - vlan-id 47; - description "New DMZ vlan"; - vxlan { - vni 47; - } - } - vl48 { - vlan-id 48; - description "DMZ VLAN"; - vxlan { - vni 48; - } - } - vl54 { - vlan-id 54; - description "VLAN54"; - vxlan { - vni 54; - } - } - vl126 { - vlan-id 126; - description "Managed WAN services to Clarendon House"; - vxlan { - vni 126; - } - } - vl127 { - vlan-id 127; - description "Vlan for Second Fibre Link to Clarendon house"; - vxlan { - vni 127; - } - } - vl128 { - vlan-id 128; - description "Vlan for Clarendon house link"; - vxlan { - vni 128; - } - } - vl166 { - vlan-id 166; - description "LAN connection vlan for X1700 Cato sockets"; - vxlan { - vni 166; - } - } - vl193 { - vlan-id 193; - description "Cato connection for WAN 1 via Hurricane Networks"; - vxlan { - vni 193; - } - } - vl194 { - vlan-id 194; - description "Cato connection for WAN 2 via Domicilium Transit Internet"; - vxlan { - vni 194; - } - } - vl211 { - vlan-id 211; - description "PGI-NEW"; - vxlan { - vni 211; - } - } - vl2526 { - vlan-id 2526; - description "AWS Cross-Connect to London via London"; - vxlan { - vni 2526; - } - } - vl2527 { - vlan-id 2527; - description "OCI Cross-Connect to London via Manchester"; - vxlan { - vni 2527; - } - } - vl2528 { - vlan-id 2528; - description "OCI Fast connect via London"; - vxlan { - vni 2528; - } - } - vl2529 { - vlan-id 2529; - description "AWS Cross-Connect to Manchester"; - vxlan { - vni 2529; - } - } } diff --git a/iom-dc/LEAF-C13-SW2.cfg b/iom-dc/LEAF-C13-SW2.cfg index 6863862..b667c3c 100644 --- a/iom-dc/LEAF-C13-SW2.cfg +++ b/iom-dc/LEAF-C13-SW2.cfg @@ -14,25 +14,25 @@ system { encrypted-password "$6$rounds=656000$XVfZXO9yn5j3bKx/$fHSTXI.LRWtIRUHlMZ3VPduBVNu9WZh.sn3r3R6kgqnpEp16hQpKUKiO24869c8cxXHeQrlytI7/u95FhPYf30"; ## SECRET-DATA } } - user h0barton { + user d0micilium { uid 2002; class super-user; + authentication { + encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + } + } + user h0barton { + uid 2003; + class super-user; authentication { encrypted-password "$6$rounds=656000$j52X8PoXRueVJyfV$oRjcRKT49MfPSuZ5NCPy0fLwGLCcbTO5Hzzk.sIg0YWtCXqc/Cx09PFYVroF6C5BvvHPuIjDeM5wR499ifT8W0"; ## SECRET-DATA } } user hobadmin { - uid 2003; - class super-user; - authentication { - encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA - } - } - user d0micilium { uid 2004; class super-user; authentication { - encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA } } } @@ -72,32 +72,6 @@ chassis { } } interfaces { - et-0/0/48 { - } - et-0/0/49 { - } - et-0/0/50 { - } - et-0/0/51 { - } - et-0/0/52 { - description "Link to SPINE-C7-SW1 et-0/0/23"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.93/31; - } - } - } - et-0/0/53 { - description "Link to SPINE-C7-SW2 et-0/0/23"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.95/31; - } - } - } xe-0/0/0 { ether-options { 802.3ad ae0; @@ -434,6 +408,32 @@ interfaces { } } } + et-0/0/48 { + } + et-0/0/49 { + } + et-0/0/50 { + } + et-0/0/51 { + } + et-0/0/52 { + description "Link to SPINE-C7-SW1 et-0/0/23"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.93/31; + } + } + } + et-0/0/53 { + description "Link to SPINE-C7-SW2 et-0/0/23"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.95/31; + } + } + } ae0 { mtu 9216; esi { @@ -1225,6 +1225,19 @@ interfaces { } } } +snmp { + location "Domicilium Datacentre RS2 C13"; + contact "isg@dataprocessors.com.au"; + community sbr1t1s0k { + authorization read-only; + clients { + 10.44.37.25/32; + 10.16.15.14/32; + 10.44.37.39/32; + 10.16.15.19/32; + } + } +} forwarding-options { storm-control-profiles default { all; @@ -1246,22 +1259,12 @@ policy-options { } } } -snmp { - location "Domicilium Datacentre RS2 C13"; - contact "isg@dataprocessors.com.au"; - community sbr1t1s0k { - authorization read-only; - clients { - 10.44.37.25/32; - 10.16.15.14/32; - 10.44.37.39/32; - 10.16.15.19/32; - } - } -} routing-options { router-id 172.31.255.26; autonomous-system 4200000000; + static { + route 0.0.0.0/0 next-hop 10.44.255.254; + } forwarding-table { export PFE-ECMP; chained-composite-next-hop { @@ -1273,7 +1276,6 @@ routing-options { } protocols { bgp { - log-updown; group OVERLAY { type internal; local-address 172.31.255.26; @@ -1306,6 +1308,7 @@ protocols { peer-as 4200000002; } } + log-updown; } evpn { encapsulation vxlan; @@ -1324,138 +1327,12 @@ switch-options { } } vlans { - vl1 { - vlan-id 1; - description "default"; - vxlan { - vni 1; - } - } - vl10 { - vlan-id 10; - description "Hurricane networks WAN MPLS end point"; - vxlan { - vni 10; - } - } - vl11 { - vlan-id 11; - description "VLAN for 2nd Internet link via Domicilium Transit"; - vxlan { - vni 11; - } - } - vl28 { - vlan-id 28; - description "New vlan for the 4G link to old network"; - vxlan { - vni 28; - } - } vl44 { - vlan-id 44; description "Main Data Vlan"; + vlan-id 44; l3-interface irb.44; vxlan { vni 44; } } - vl47 { - vlan-id 47; - description "New DMZ vlan"; - vxlan { - vni 47; - } - } - vl48 { - vlan-id 48; - description "DMZ VLAN"; - vxlan { - vni 48; - } - } - vl54 { - vlan-id 54; - description "VLAN54"; - vxlan { - vni 54; - } - } - vl126 { - vlan-id 126; - description "Managed WAN services to Clarendon House"; - vxlan { - vni 126; - } - } - vl127 { - vlan-id 127; - description "Vlan for Second Fibre Link to Clarendon house"; - vxlan { - vni 127; - } - } - vl128 { - vlan-id 128; - description "Vlan for Clarendon house link"; - vxlan { - vni 128; - } - } - vl166 { - vlan-id 166; - description "LAN connection vlan for X1700 Cato sockets"; - vxlan { - vni 166; - } - } - vl193 { - vlan-id 193; - description "Cato connection for WAN 1 via Hurricane Networks"; - vxlan { - vni 193; - } - } - vl194 { - vlan-id 194; - description "Cato connection for WAN 2 via Domicilium Transit Internet"; - vxlan { - vni 194; - } - } - vl211 { - vlan-id 211; - description "PGI-NEW"; - vxlan { - vni 211; - } - } - vl2526 { - vlan-id 2526; - description "AWS Cross-Connect to London via London"; - vxlan { - vni 2526; - } - } - vl2527 { - vlan-id 2527; - description "OCI Cross-Connect to London via Manchester"; - vxlan { - vni 2527; - } - } - vl2528 { - vlan-id 2528; - description "OCI Fast connect via London"; - vxlan { - vni 2528; - } - } - vl2529 { - vlan-id 2529; - description "AWS Cross-Connect to Manchester"; - vxlan { - vni 2529; - } - } } diff --git a/iom-dc/LEAF-C14-SW1.cfg b/iom-dc/LEAF-C14-SW1.cfg index 2fa0fbc..b485191 100644 --- a/iom-dc/LEAF-C14-SW1.cfg +++ b/iom-dc/LEAF-C14-SW1.cfg @@ -14,25 +14,25 @@ system { encrypted-password "$6$rounds=656000$XVfZXO9yn5j3bKx/$fHSTXI.LRWtIRUHlMZ3VPduBVNu9WZh.sn3r3R6kgqnpEp16hQpKUKiO24869c8cxXHeQrlytI7/u95FhPYf30"; ## SECRET-DATA } } - user h0barton { + user d0micilium { uid 2002; class super-user; + authentication { + encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + } + } + user h0barton { + uid 2003; + class super-user; authentication { encrypted-password "$6$rounds=656000$j52X8PoXRueVJyfV$oRjcRKT49MfPSuZ5NCPy0fLwGLCcbTO5Hzzk.sIg0YWtCXqc/Cx09PFYVroF6C5BvvHPuIjDeM5wR499ifT8W0"; ## SECRET-DATA } } user hobadmin { - uid 2003; - class super-user; - authentication { - encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA - } - } - user d0micilium { uid 2004; class super-user; authentication { - encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA } } } @@ -72,32 +72,6 @@ chassis { } } interfaces { - et-0/0/48 { - } - et-0/0/49 { - } - et-0/0/50 { - } - et-0/0/51 { - } - et-0/0/52 { - description "Link to SPINE-C7-SW1 et-0/0/24"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.97/31; - } - } - } - et-0/0/53 { - description "Link to SPINE-C7-SW2 et-0/0/24"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.99/31; - } - } - } xe-0/0/0 { ether-options { 802.3ad ae0; @@ -434,6 +408,32 @@ interfaces { } } } + et-0/0/48 { + } + et-0/0/49 { + } + et-0/0/50 { + } + et-0/0/51 { + } + et-0/0/52 { + description "Link to SPINE-C7-SW1 et-0/0/24"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.97/31; + } + } + } + et-0/0/53 { + description "Link to SPINE-C7-SW2 et-0/0/24"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.99/31; + } + } + } ae0 { mtu 9216; esi { @@ -1225,6 +1225,19 @@ interfaces { } } } +snmp { + location "Domicilium Datacentre RS2 C14"; + contact "isg@dataprocessors.com.au"; + community sbr1t1s0k { + authorization read-only; + clients { + 10.44.37.25/32; + 10.16.15.14/32; + 10.44.37.39/32; + 10.16.15.19/32; + } + } +} forwarding-options { storm-control-profiles default { all; @@ -1246,22 +1259,12 @@ policy-options { } } } -snmp { - location "Domicilium Datacentre RS2 C14"; - contact "isg@dataprocessors.com.au"; - community sbr1t1s0k { - authorization read-only; - clients { - 10.44.37.25/32; - 10.16.15.14/32; - 10.44.37.39/32; - 10.16.15.19/32; - } - } -} routing-options { router-id 172.31.255.27; autonomous-system 4200000000; + static { + route 0.0.0.0/0 next-hop 10.44.255.254; + } forwarding-table { export PFE-ECMP; chained-composite-next-hop { @@ -1273,7 +1276,6 @@ routing-options { } protocols { bgp { - log-updown; group OVERLAY { type internal; local-address 172.31.255.27; @@ -1306,6 +1308,7 @@ protocols { peer-as 4200000002; } } + log-updown; } evpn { encapsulation vxlan; @@ -1324,138 +1327,12 @@ switch-options { } } vlans { - vl1 { - vlan-id 1; - description "default"; - vxlan { - vni 1; - } - } - vl10 { - vlan-id 10; - description "Hurricane networks WAN MPLS end point"; - vxlan { - vni 10; - } - } - vl11 { - vlan-id 11; - description "VLAN for 2nd Internet link via Domicilium Transit"; - vxlan { - vni 11; - } - } - vl28 { - vlan-id 28; - description "New vlan for the 4G link to old network"; - vxlan { - vni 28; - } - } vl44 { - vlan-id 44; description "Main Data Vlan"; + vlan-id 44; l3-interface irb.44; vxlan { vni 44; } } - vl47 { - vlan-id 47; - description "New DMZ vlan"; - vxlan { - vni 47; - } - } - vl48 { - vlan-id 48; - description "DMZ VLAN"; - vxlan { - vni 48; - } - } - vl54 { - vlan-id 54; - description "VLAN54"; - vxlan { - vni 54; - } - } - vl126 { - vlan-id 126; - description "Managed WAN services to Clarendon House"; - vxlan { - vni 126; - } - } - vl127 { - vlan-id 127; - description "Vlan for Second Fibre Link to Clarendon house"; - vxlan { - vni 127; - } - } - vl128 { - vlan-id 128; - description "Vlan for Clarendon house link"; - vxlan { - vni 128; - } - } - vl166 { - vlan-id 166; - description "LAN connection vlan for X1700 Cato sockets"; - vxlan { - vni 166; - } - } - vl193 { - vlan-id 193; - description "Cato connection for WAN 1 via Hurricane Networks"; - vxlan { - vni 193; - } - } - vl194 { - vlan-id 194; - description "Cato connection for WAN 2 via Domicilium Transit Internet"; - vxlan { - vni 194; - } - } - vl211 { - vlan-id 211; - description "PGI-NEW"; - vxlan { - vni 211; - } - } - vl2526 { - vlan-id 2526; - description "AWS Cross-Connect to London via London"; - vxlan { - vni 2526; - } - } - vl2527 { - vlan-id 2527; - description "OCI Cross-Connect to London via Manchester"; - vxlan { - vni 2527; - } - } - vl2528 { - vlan-id 2528; - description "OCI Fast connect via London"; - vxlan { - vni 2528; - } - } - vl2529 { - vlan-id 2529; - description "AWS Cross-Connect to Manchester"; - vxlan { - vni 2529; - } - } } diff --git a/iom-dc/LEAF-C14-SW2.cfg b/iom-dc/LEAF-C14-SW2.cfg index 56895ba..09ad806 100644 --- a/iom-dc/LEAF-C14-SW2.cfg +++ b/iom-dc/LEAF-C14-SW2.cfg @@ -14,25 +14,25 @@ system { encrypted-password "$6$rounds=656000$XVfZXO9yn5j3bKx/$fHSTXI.LRWtIRUHlMZ3VPduBVNu9WZh.sn3r3R6kgqnpEp16hQpKUKiO24869c8cxXHeQrlytI7/u95FhPYf30"; ## SECRET-DATA } } - user h0barton { + user d0micilium { uid 2002; class super-user; + authentication { + encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + } + } + user h0barton { + uid 2003; + class super-user; authentication { encrypted-password "$6$rounds=656000$j52X8PoXRueVJyfV$oRjcRKT49MfPSuZ5NCPy0fLwGLCcbTO5Hzzk.sIg0YWtCXqc/Cx09PFYVroF6C5BvvHPuIjDeM5wR499ifT8W0"; ## SECRET-DATA } } user hobadmin { - uid 2003; - class super-user; - authentication { - encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA - } - } - user d0micilium { uid 2004; class super-user; authentication { - encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA } } } @@ -72,32 +72,6 @@ chassis { } } interfaces { - et-0/0/48 { - } - et-0/0/49 { - } - et-0/0/50 { - } - et-0/0/51 { - } - et-0/0/52 { - description "Link to SPINE-C7-SW1 et-0/0/25"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.101/31; - } - } - } - et-0/0/53 { - description "Link to SPINE-C7-SW2 et-0/0/25"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.103/31; - } - } - } xe-0/0/0 { ether-options { 802.3ad ae0; @@ -434,6 +408,32 @@ interfaces { } } } + et-0/0/48 { + } + et-0/0/49 { + } + et-0/0/50 { + } + et-0/0/51 { + } + et-0/0/52 { + description "Link to SPINE-C7-SW1 et-0/0/25"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.101/31; + } + } + } + et-0/0/53 { + description "Link to SPINE-C7-SW2 et-0/0/25"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.103/31; + } + } + } ae0 { mtu 9216; esi { @@ -1225,6 +1225,19 @@ interfaces { } } } +snmp { + location "Domicilium Datacentre RS2 C14"; + contact "isg@dataprocessors.com.au"; + community sbr1t1s0k { + authorization read-only; + clients { + 10.44.37.25/32; + 10.16.15.14/32; + 10.44.37.39/32; + 10.16.15.19/32; + } + } +} forwarding-options { storm-control-profiles default { all; @@ -1246,22 +1259,12 @@ policy-options { } } } -snmp { - location "Domicilium Datacentre RS2 C14"; - contact "isg@dataprocessors.com.au"; - community sbr1t1s0k { - authorization read-only; - clients { - 10.44.37.25/32; - 10.16.15.14/32; - 10.44.37.39/32; - 10.16.15.19/32; - } - } -} routing-options { router-id 172.31.255.28; autonomous-system 4200000000; + static { + route 0.0.0.0/0 next-hop 10.44.255.254; + } forwarding-table { export PFE-ECMP; chained-composite-next-hop { @@ -1273,7 +1276,6 @@ routing-options { } protocols { bgp { - log-updown; group OVERLAY { type internal; local-address 172.31.255.28; @@ -1306,6 +1308,7 @@ protocols { peer-as 4200000002; } } + log-updown; } evpn { encapsulation vxlan; @@ -1324,138 +1327,12 @@ switch-options { } } vlans { - vl1 { - vlan-id 1; - description "default"; - vxlan { - vni 1; - } - } - vl10 { - vlan-id 10; - description "Hurricane networks WAN MPLS end point"; - vxlan { - vni 10; - } - } - vl11 { - vlan-id 11; - description "VLAN for 2nd Internet link via Domicilium Transit"; - vxlan { - vni 11; - } - } - vl28 { - vlan-id 28; - description "New vlan for the 4G link to old network"; - vxlan { - vni 28; - } - } vl44 { - vlan-id 44; description "Main Data Vlan"; + vlan-id 44; l3-interface irb.44; vxlan { vni 44; } } - vl47 { - vlan-id 47; - description "New DMZ vlan"; - vxlan { - vni 47; - } - } - vl48 { - vlan-id 48; - description "DMZ VLAN"; - vxlan { - vni 48; - } - } - vl54 { - vlan-id 54; - description "VLAN54"; - vxlan { - vni 54; - } - } - vl126 { - vlan-id 126; - description "Managed WAN services to Clarendon House"; - vxlan { - vni 126; - } - } - vl127 { - vlan-id 127; - description "Vlan for Second Fibre Link to Clarendon house"; - vxlan { - vni 127; - } - } - vl128 { - vlan-id 128; - description "Vlan for Clarendon house link"; - vxlan { - vni 128; - } - } - vl166 { - vlan-id 166; - description "LAN connection vlan for X1700 Cato sockets"; - vxlan { - vni 166; - } - } - vl193 { - vlan-id 193; - description "Cato connection for WAN 1 via Hurricane Networks"; - vxlan { - vni 193; - } - } - vl194 { - vlan-id 194; - description "Cato connection for WAN 2 via Domicilium Transit Internet"; - vxlan { - vni 194; - } - } - vl211 { - vlan-id 211; - description "PGI-NEW"; - vxlan { - vni 211; - } - } - vl2526 { - vlan-id 2526; - description "AWS Cross-Connect to London via London"; - vxlan { - vni 2526; - } - } - vl2527 { - vlan-id 2527; - description "OCI Cross-Connect to London via Manchester"; - vxlan { - vni 2527; - } - } - vl2528 { - vlan-id 2528; - description "OCI Fast connect via London"; - vxlan { - vni 2528; - } - } - vl2529 { - vlan-id 2529; - description "AWS Cross-Connect to Manchester"; - vxlan { - vni 2529; - } - } } diff --git a/iom-dc/LEAF-C2-SW1.cfg b/iom-dc/LEAF-C2-SW1.cfg index 08db817..9673a1a 100644 --- a/iom-dc/LEAF-C2-SW1.cfg +++ b/iom-dc/LEAF-C2-SW1.cfg @@ -14,25 +14,25 @@ system { encrypted-password "$6$rounds=656000$XVfZXO9yn5j3bKx/$fHSTXI.LRWtIRUHlMZ3VPduBVNu9WZh.sn3r3R6kgqnpEp16hQpKUKiO24869c8cxXHeQrlytI7/u95FhPYf30"; ## SECRET-DATA } } - user h0barton { + user d0micilium { uid 2002; class super-user; + authentication { + encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + } + } + user h0barton { + uid 2003; + class super-user; authentication { encrypted-password "$6$rounds=656000$j52X8PoXRueVJyfV$oRjcRKT49MfPSuZ5NCPy0fLwGLCcbTO5Hzzk.sIg0YWtCXqc/Cx09PFYVroF6C5BvvHPuIjDeM5wR499ifT8W0"; ## SECRET-DATA } } user hobadmin { - uid 2003; - class super-user; - authentication { - encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA - } - } - user d0micilium { uid 2004; class super-user; authentication { - encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA } } } @@ -72,32 +72,6 @@ chassis { } } interfaces { - et-0/0/48 { - } - et-0/0/49 { - } - et-0/0/50 { - } - et-0/0/51 { - } - et-0/0/52 { - description "Link to SPINE-C7-SW1 et-0/0/2"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.9/31; - } - } - } - et-0/0/53 { - description "Link to SPINE-C7-SW2 et-0/0/2"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.11/31; - } - } - } xe-0/0/0 { ether-options { 802.3ad ae0; @@ -434,6 +408,32 @@ interfaces { } } } + et-0/0/48 { + } + et-0/0/49 { + } + et-0/0/50 { + } + et-0/0/51 { + } + et-0/0/52 { + description "Link to SPINE-C7-SW1 et-0/0/2"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.9/31; + } + } + } + et-0/0/53 { + description "Link to SPINE-C7-SW2 et-0/0/2"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.11/31; + } + } + } ae0 { mtu 9216; esi { @@ -1231,6 +1231,19 @@ interfaces { } } } +snmp { + location "Domicilium Datacentre RS2 C2"; + contact "isg@dataprocessors.com.au"; + community sbr1t1s0k { + authorization read-only; + clients { + 10.44.37.25/32; + 10.16.15.14/32; + 10.44.37.39/32; + 10.16.15.19/32; + } + } +} forwarding-options { storm-control-profiles default { all; @@ -1252,22 +1265,12 @@ policy-options { } } } -snmp { - location "Domicilium Datacentre RS2 C2"; - contact "isg@dataprocessors.com.au"; - community sbr1t1s0k { - authorization read-only; - clients { - 10.44.37.25/32; - 10.16.15.14/32; - 10.44.37.39/32; - 10.16.15.19/32; - } - } -} routing-options { router-id 172.31.255.5; autonomous-system 4200000000; + static { + route 0.0.0.0/0 next-hop 10.44.255.254; + } forwarding-table { export PFE-ECMP; chained-composite-next-hop { @@ -1279,7 +1282,6 @@ routing-options { } protocols { bgp { - log-updown; group OVERLAY { type internal; local-address 172.31.255.5; @@ -1312,6 +1314,7 @@ protocols { peer-as 4200000002; } } + log-updown; } evpn { encapsulation vxlan; @@ -1330,139 +1333,20 @@ switch-options { } } vlans { - vl1 { - vlan-id 1; - description "default"; - vxlan { - vni 1; - } - } - vl10 { - vlan-id 10; - description "Hurricane networks WAN MPLS end point"; - vxlan { - vni 10; - } - } - vl11 { - vlan-id 11; - description "VLAN for 2nd Internet link via Domicilium Transit"; - vxlan { - vni 11; - } - } - vl28 { - vlan-id 28; - description "New vlan for the 4G link to old network"; - vxlan { - vni 28; - } - } vl44 { - vlan-id 44; description "Main Data Vlan"; + vlan-id 44; l3-interface irb.44; vxlan { vni 44; } } - vl47 { - vlan-id 47; - description "New DMZ vlan"; - vxlan { - vni 47; - } - } vl48 { - vlan-id 48; description "DMZ VLAN"; + vlan-id 48; l3-interface irb.48; vxlan { vni 48; } } - vl54 { - vlan-id 54; - description "VLAN54"; - vxlan { - vni 54; - } - } - vl126 { - vlan-id 126; - description "Managed WAN services to Clarendon House"; - vxlan { - vni 126; - } - } - vl127 { - vlan-id 127; - description "Vlan for Second Fibre Link to Clarendon house"; - vxlan { - vni 127; - } - } - vl128 { - vlan-id 128; - description "Vlan for Clarendon house link"; - vxlan { - vni 128; - } - } - vl166 { - vlan-id 166; - description "LAN connection vlan for X1700 Cato sockets"; - vxlan { - vni 166; - } - } - vl193 { - vlan-id 193; - description "Cato connection for WAN 1 via Hurricane Networks"; - vxlan { - vni 193; - } - } - vl194 { - vlan-id 194; - description "Cato connection for WAN 2 via Domicilium Transit Internet"; - vxlan { - vni 194; - } - } - vl211 { - vlan-id 211; - description "PGI-NEW"; - vxlan { - vni 211; - } - } - vl2526 { - vlan-id 2526; - description "AWS Cross-Connect to London via London"; - vxlan { - vni 2526; - } - } - vl2527 { - vlan-id 2527; - description "OCI Cross-Connect to London via Manchester"; - vxlan { - vni 2527; - } - } - vl2528 { - vlan-id 2528; - description "OCI Fast connect via London"; - vxlan { - vni 2528; - } - } - vl2529 { - vlan-id 2529; - description "AWS Cross-Connect to Manchester"; - vxlan { - vni 2529; - } - } } diff --git a/iom-dc/LEAF-C2-SW2.cfg b/iom-dc/LEAF-C2-SW2.cfg index be213f0..ef6ad0e 100644 --- a/iom-dc/LEAF-C2-SW2.cfg +++ b/iom-dc/LEAF-C2-SW2.cfg @@ -14,25 +14,25 @@ system { encrypted-password "$6$rounds=656000$XVfZXO9yn5j3bKx/$fHSTXI.LRWtIRUHlMZ3VPduBVNu9WZh.sn3r3R6kgqnpEp16hQpKUKiO24869c8cxXHeQrlytI7/u95FhPYf30"; ## SECRET-DATA } } - user h0barton { + user d0micilium { uid 2002; class super-user; + authentication { + encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + } + } + user h0barton { + uid 2003; + class super-user; authentication { encrypted-password "$6$rounds=656000$j52X8PoXRueVJyfV$oRjcRKT49MfPSuZ5NCPy0fLwGLCcbTO5Hzzk.sIg0YWtCXqc/Cx09PFYVroF6C5BvvHPuIjDeM5wR499ifT8W0"; ## SECRET-DATA } } user hobadmin { - uid 2003; - class super-user; - authentication { - encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA - } - } - user d0micilium { uid 2004; class super-user; authentication { - encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA } } } @@ -72,32 +72,6 @@ chassis { } } interfaces { - et-0/0/48 { - } - et-0/0/49 { - } - et-0/0/50 { - } - et-0/0/51 { - } - et-0/0/52 { - description "Link to SPINE-C7-SW1 et-0/0/3"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.13/31; - } - } - } - et-0/0/53 { - description "Link to SPINE-C7-SW2 et-0/0/3"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.15/31; - } - } - } xe-0/0/0 { ether-options { 802.3ad ae0; @@ -434,6 +408,32 @@ interfaces { } } } + et-0/0/48 { + } + et-0/0/49 { + } + et-0/0/50 { + } + et-0/0/51 { + } + et-0/0/52 { + description "Link to SPINE-C7-SW1 et-0/0/3"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.13/31; + } + } + } + et-0/0/53 { + description "Link to SPINE-C7-SW2 et-0/0/3"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.15/31; + } + } + } ae0 { mtu 9216; esi { @@ -1231,6 +1231,19 @@ interfaces { } } } +snmp { + location "Domicilium Datacentre RS2 C2"; + contact "isg@dataprocessors.com.au"; + community sbr1t1s0k { + authorization read-only; + clients { + 10.44.37.25/32; + 10.16.15.14/32; + 10.44.37.39/32; + 10.16.15.19/32; + } + } +} forwarding-options { storm-control-profiles default { all; @@ -1252,22 +1265,12 @@ policy-options { } } } -snmp { - location "Domicilium Datacentre RS2 C2"; - contact "isg@dataprocessors.com.au"; - community sbr1t1s0k { - authorization read-only; - clients { - 10.44.37.25/32; - 10.16.15.14/32; - 10.44.37.39/32; - 10.16.15.19/32; - } - } -} routing-options { router-id 172.31.255.6; autonomous-system 4200000000; + static { + route 0.0.0.0/0 next-hop 10.44.255.254; + } forwarding-table { export PFE-ECMP; chained-composite-next-hop { @@ -1279,7 +1282,6 @@ routing-options { } protocols { bgp { - log-updown; group OVERLAY { type internal; local-address 172.31.255.6; @@ -1312,6 +1314,7 @@ protocols { peer-as 4200000002; } } + log-updown; } evpn { encapsulation vxlan; @@ -1330,139 +1333,20 @@ switch-options { } } vlans { - vl1 { - vlan-id 1; - description "default"; - vxlan { - vni 1; - } - } - vl10 { - vlan-id 10; - description "Hurricane networks WAN MPLS end point"; - vxlan { - vni 10; - } - } - vl11 { - vlan-id 11; - description "VLAN for 2nd Internet link via Domicilium Transit"; - vxlan { - vni 11; - } - } - vl28 { - vlan-id 28; - description "New vlan for the 4G link to old network"; - vxlan { - vni 28; - } - } vl44 { - vlan-id 44; description "Main Data Vlan"; + vlan-id 44; l3-interface irb.44; vxlan { vni 44; } } - vl47 { - vlan-id 47; - description "New DMZ vlan"; - vxlan { - vni 47; - } - } vl48 { - vlan-id 48; description "DMZ VLAN"; + vlan-id 48; l3-interface irb.48; vxlan { vni 48; } } - vl54 { - vlan-id 54; - description "VLAN54"; - vxlan { - vni 54; - } - } - vl126 { - vlan-id 126; - description "Managed WAN services to Clarendon House"; - vxlan { - vni 126; - } - } - vl127 { - vlan-id 127; - description "Vlan for Second Fibre Link to Clarendon house"; - vxlan { - vni 127; - } - } - vl128 { - vlan-id 128; - description "Vlan for Clarendon house link"; - vxlan { - vni 128; - } - } - vl166 { - vlan-id 166; - description "LAN connection vlan for X1700 Cato sockets"; - vxlan { - vni 166; - } - } - vl193 { - vlan-id 193; - description "Cato connection for WAN 1 via Hurricane Networks"; - vxlan { - vni 193; - } - } - vl194 { - vlan-id 194; - description "Cato connection for WAN 2 via Domicilium Transit Internet"; - vxlan { - vni 194; - } - } - vl211 { - vlan-id 211; - description "PGI-NEW"; - vxlan { - vni 211; - } - } - vl2526 { - vlan-id 2526; - description "AWS Cross-Connect to London via London"; - vxlan { - vni 2526; - } - } - vl2527 { - vlan-id 2527; - description "OCI Cross-Connect to London via Manchester"; - vxlan { - vni 2527; - } - } - vl2528 { - vlan-id 2528; - description "OCI Fast connect via London"; - vxlan { - vni 2528; - } - } - vl2529 { - vlan-id 2529; - description "AWS Cross-Connect to Manchester"; - vxlan { - vni 2529; - } - } } diff --git a/iom-dc/LEAF-C3-SW1.cfg b/iom-dc/LEAF-C3-SW1.cfg index b187559..2084bea 100644 --- a/iom-dc/LEAF-C3-SW1.cfg +++ b/iom-dc/LEAF-C3-SW1.cfg @@ -14,25 +14,25 @@ system { encrypted-password "$6$rounds=656000$XVfZXO9yn5j3bKx/$fHSTXI.LRWtIRUHlMZ3VPduBVNu9WZh.sn3r3R6kgqnpEp16hQpKUKiO24869c8cxXHeQrlytI7/u95FhPYf30"; ## SECRET-DATA } } - user h0barton { + user d0micilium { uid 2002; class super-user; + authentication { + encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + } + } + user h0barton { + uid 2003; + class super-user; authentication { encrypted-password "$6$rounds=656000$j52X8PoXRueVJyfV$oRjcRKT49MfPSuZ5NCPy0fLwGLCcbTO5Hzzk.sIg0YWtCXqc/Cx09PFYVroF6C5BvvHPuIjDeM5wR499ifT8W0"; ## SECRET-DATA } } user hobadmin { - uid 2003; - class super-user; - authentication { - encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA - } - } - user d0micilium { uid 2004; class super-user; authentication { - encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA } } } @@ -72,32 +72,6 @@ chassis { } } interfaces { - et-0/0/48 { - } - et-0/0/49 { - } - et-0/0/50 { - } - et-0/0/51 { - } - et-0/0/52 { - description "Link to SPINE-C7-SW1 et-0/0/4"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.17/31; - } - } - } - et-0/0/53 { - description "Link to SPINE-C7-SW2 et-0/0/4"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.19/31; - } - } - } xe-0/0/0 { ether-options { 802.3ad ae0; @@ -434,6 +408,32 @@ interfaces { } } } + et-0/0/48 { + } + et-0/0/49 { + } + et-0/0/50 { + } + et-0/0/51 { + } + et-0/0/52 { + description "Link to SPINE-C7-SW1 et-0/0/4"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.17/31; + } + } + } + et-0/0/53 { + description "Link to SPINE-C7-SW2 et-0/0/4"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.19/31; + } + } + } ae0 { mtu 9216; esi { @@ -1225,6 +1225,19 @@ interfaces { } } } +snmp { + location "Domicilium Datacentre RS2 C3"; + contact "isg@dataprocessors.com.au"; + community sbr1t1s0k { + authorization read-only; + clients { + 10.44.37.25/32; + 10.16.15.14/32; + 10.44.37.39/32; + 10.16.15.19/32; + } + } +} forwarding-options { storm-control-profiles default { all; @@ -1246,22 +1259,12 @@ policy-options { } } } -snmp { - location "Domicilium Datacentre RS2 C3"; - contact "isg@dataprocessors.com.au"; - community sbr1t1s0k { - authorization read-only; - clients { - 10.44.37.25/32; - 10.16.15.14/32; - 10.44.37.39/32; - 10.16.15.19/32; - } - } -} routing-options { router-id 172.31.255.7; autonomous-system 4200000000; + static { + route 0.0.0.0/0 next-hop 10.44.255.254; + } forwarding-table { export PFE-ECMP; chained-composite-next-hop { @@ -1273,7 +1276,6 @@ routing-options { } protocols { bgp { - log-updown; group OVERLAY { type internal; local-address 172.31.255.7; @@ -1306,6 +1308,7 @@ protocols { peer-as 4200000002; } } + log-updown; } evpn { encapsulation vxlan; @@ -1324,138 +1327,12 @@ switch-options { } } vlans { - vl1 { - vlan-id 1; - description "default"; - vxlan { - vni 1; - } - } - vl10 { - vlan-id 10; - description "Hurricane networks WAN MPLS end point"; - vxlan { - vni 10; - } - } - vl11 { - vlan-id 11; - description "VLAN for 2nd Internet link via Domicilium Transit"; - vxlan { - vni 11; - } - } - vl28 { - vlan-id 28; - description "New vlan for the 4G link to old network"; - vxlan { - vni 28; - } - } vl44 { - vlan-id 44; description "Main Data Vlan"; + vlan-id 44; l3-interface irb.44; vxlan { vni 44; } } - vl47 { - vlan-id 47; - description "New DMZ vlan"; - vxlan { - vni 47; - } - } - vl48 { - vlan-id 48; - description "DMZ VLAN"; - vxlan { - vni 48; - } - } - vl54 { - vlan-id 54; - description "VLAN54"; - vxlan { - vni 54; - } - } - vl126 { - vlan-id 126; - description "Managed WAN services to Clarendon House"; - vxlan { - vni 126; - } - } - vl127 { - vlan-id 127; - description "Vlan for Second Fibre Link to Clarendon house"; - vxlan { - vni 127; - } - } - vl128 { - vlan-id 128; - description "Vlan for Clarendon house link"; - vxlan { - vni 128; - } - } - vl166 { - vlan-id 166; - description "LAN connection vlan for X1700 Cato sockets"; - vxlan { - vni 166; - } - } - vl193 { - vlan-id 193; - description "Cato connection for WAN 1 via Hurricane Networks"; - vxlan { - vni 193; - } - } - vl194 { - vlan-id 194; - description "Cato connection for WAN 2 via Domicilium Transit Internet"; - vxlan { - vni 194; - } - } - vl211 { - vlan-id 211; - description "PGI-NEW"; - vxlan { - vni 211; - } - } - vl2526 { - vlan-id 2526; - description "AWS Cross-Connect to London via London"; - vxlan { - vni 2526; - } - } - vl2527 { - vlan-id 2527; - description "OCI Cross-Connect to London via Manchester"; - vxlan { - vni 2527; - } - } - vl2528 { - vlan-id 2528; - description "OCI Fast connect via London"; - vxlan { - vni 2528; - } - } - vl2529 { - vlan-id 2529; - description "AWS Cross-Connect to Manchester"; - vxlan { - vni 2529; - } - } } diff --git a/iom-dc/LEAF-C3-SW2.cfg b/iom-dc/LEAF-C3-SW2.cfg index 3021a97..d2e0889 100644 --- a/iom-dc/LEAF-C3-SW2.cfg +++ b/iom-dc/LEAF-C3-SW2.cfg @@ -14,25 +14,25 @@ system { encrypted-password "$6$rounds=656000$XVfZXO9yn5j3bKx/$fHSTXI.LRWtIRUHlMZ3VPduBVNu9WZh.sn3r3R6kgqnpEp16hQpKUKiO24869c8cxXHeQrlytI7/u95FhPYf30"; ## SECRET-DATA } } - user h0barton { + user d0micilium { uid 2002; class super-user; + authentication { + encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + } + } + user h0barton { + uid 2003; + class super-user; authentication { encrypted-password "$6$rounds=656000$j52X8PoXRueVJyfV$oRjcRKT49MfPSuZ5NCPy0fLwGLCcbTO5Hzzk.sIg0YWtCXqc/Cx09PFYVroF6C5BvvHPuIjDeM5wR499ifT8W0"; ## SECRET-DATA } } user hobadmin { - uid 2003; - class super-user; - authentication { - encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA - } - } - user d0micilium { uid 2004; class super-user; authentication { - encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA } } } @@ -72,32 +72,6 @@ chassis { } } interfaces { - et-0/0/48 { - } - et-0/0/49 { - } - et-0/0/50 { - } - et-0/0/51 { - } - et-0/0/52 { - description "Link to SPINE-C7-SW1 et-0/0/5"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.21/31; - } - } - } - et-0/0/53 { - description "Link to SPINE-C7-SW2 et-0/0/5"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.23/31; - } - } - } xe-0/0/0 { ether-options { 802.3ad ae0; @@ -434,6 +408,32 @@ interfaces { } } } + et-0/0/48 { + } + et-0/0/49 { + } + et-0/0/50 { + } + et-0/0/51 { + } + et-0/0/52 { + description "Link to SPINE-C7-SW1 et-0/0/5"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.21/31; + } + } + } + et-0/0/53 { + description "Link to SPINE-C7-SW2 et-0/0/5"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.23/31; + } + } + } ae0 { mtu 9216; esi { @@ -1225,6 +1225,19 @@ interfaces { } } } +snmp { + location "Domicilium Datacentre RS2 C3"; + contact "isg@dataprocessors.com.au"; + community sbr1t1s0k { + authorization read-only; + clients { + 10.44.37.25/32; + 10.16.15.14/32; + 10.44.37.39/32; + 10.16.15.19/32; + } + } +} forwarding-options { storm-control-profiles default { all; @@ -1246,22 +1259,12 @@ policy-options { } } } -snmp { - location "Domicilium Datacentre RS2 C3"; - contact "isg@dataprocessors.com.au"; - community sbr1t1s0k { - authorization read-only; - clients { - 10.44.37.25/32; - 10.16.15.14/32; - 10.44.37.39/32; - 10.16.15.19/32; - } - } -} routing-options { router-id 172.31.255.8; autonomous-system 4200000000; + static { + route 0.0.0.0/0 next-hop 10.44.255.254; + } forwarding-table { export PFE-ECMP; chained-composite-next-hop { @@ -1273,7 +1276,6 @@ routing-options { } protocols { bgp { - log-updown; group OVERLAY { type internal; local-address 172.31.255.8; @@ -1306,6 +1308,7 @@ protocols { peer-as 4200000002; } } + log-updown; } evpn { encapsulation vxlan; @@ -1324,138 +1327,12 @@ switch-options { } } vlans { - vl1 { - vlan-id 1; - description "default"; - vxlan { - vni 1; - } - } - vl10 { - vlan-id 10; - description "Hurricane networks WAN MPLS end point"; - vxlan { - vni 10; - } - } - vl11 { - vlan-id 11; - description "VLAN for 2nd Internet link via Domicilium Transit"; - vxlan { - vni 11; - } - } - vl28 { - vlan-id 28; - description "New vlan for the 4G link to old network"; - vxlan { - vni 28; - } - } vl44 { - vlan-id 44; description "Main Data Vlan"; + vlan-id 44; l3-interface irb.44; vxlan { vni 44; } } - vl47 { - vlan-id 47; - description "New DMZ vlan"; - vxlan { - vni 47; - } - } - vl48 { - vlan-id 48; - description "DMZ VLAN"; - vxlan { - vni 48; - } - } - vl54 { - vlan-id 54; - description "VLAN54"; - vxlan { - vni 54; - } - } - vl126 { - vlan-id 126; - description "Managed WAN services to Clarendon House"; - vxlan { - vni 126; - } - } - vl127 { - vlan-id 127; - description "Vlan for Second Fibre Link to Clarendon house"; - vxlan { - vni 127; - } - } - vl128 { - vlan-id 128; - description "Vlan for Clarendon house link"; - vxlan { - vni 128; - } - } - vl166 { - vlan-id 166; - description "LAN connection vlan for X1700 Cato sockets"; - vxlan { - vni 166; - } - } - vl193 { - vlan-id 193; - description "Cato connection for WAN 1 via Hurricane Networks"; - vxlan { - vni 193; - } - } - vl194 { - vlan-id 194; - description "Cato connection for WAN 2 via Domicilium Transit Internet"; - vxlan { - vni 194; - } - } - vl211 { - vlan-id 211; - description "PGI-NEW"; - vxlan { - vni 211; - } - } - vl2526 { - vlan-id 2526; - description "AWS Cross-Connect to London via London"; - vxlan { - vni 2526; - } - } - vl2527 { - vlan-id 2527; - description "OCI Cross-Connect to London via Manchester"; - vxlan { - vni 2527; - } - } - vl2528 { - vlan-id 2528; - description "OCI Fast connect via London"; - vxlan { - vni 2528; - } - } - vl2529 { - vlan-id 2529; - description "AWS Cross-Connect to Manchester"; - vxlan { - vni 2529; - } - } } diff --git a/iom-dc/LEAF-C4-SW1.cfg b/iom-dc/LEAF-C4-SW1.cfg index 6a1a654..50de0c3 100644 --- a/iom-dc/LEAF-C4-SW1.cfg +++ b/iom-dc/LEAF-C4-SW1.cfg @@ -14,25 +14,25 @@ system { encrypted-password "$6$rounds=656000$XVfZXO9yn5j3bKx/$fHSTXI.LRWtIRUHlMZ3VPduBVNu9WZh.sn3r3R6kgqnpEp16hQpKUKiO24869c8cxXHeQrlytI7/u95FhPYf30"; ## SECRET-DATA } } - user h0barton { + user d0micilium { uid 2002; class super-user; + authentication { + encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + } + } + user h0barton { + uid 2003; + class super-user; authentication { encrypted-password "$6$rounds=656000$j52X8PoXRueVJyfV$oRjcRKT49MfPSuZ5NCPy0fLwGLCcbTO5Hzzk.sIg0YWtCXqc/Cx09PFYVroF6C5BvvHPuIjDeM5wR499ifT8W0"; ## SECRET-DATA } } user hobadmin { - uid 2003; - class super-user; - authentication { - encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA - } - } - user d0micilium { uid 2004; class super-user; authentication { - encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA } } } @@ -82,32 +82,6 @@ chassis { } } interfaces { - et-0/0/48 { - } - et-0/0/49 { - } - et-0/0/50 { - } - et-0/0/51 { - } - et-0/0/52 { - description "Link to SPINE-C7-SW1 et-0/0/6"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.25/31; - } - } - } - et-0/0/53 { - description "Link to SPINE-C7-SW2 et-0/0/6"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.27/31; - } - } - } xe-0/0/0 { ether-options { 802.3ad ae0; @@ -456,6 +430,32 @@ interfaces { 802.3ad ae71; } } + et-0/0/48 { + } + et-0/0/49 { + } + et-0/0/50 { + } + et-0/0/51 { + } + et-0/0/52 { + description "Link to SPINE-C7-SW1 et-0/0/6"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.25/31; + } + } + } + et-0/0/53 { + description "Link to SPINE-C7-SW2 et-0/0/6"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.27/31; + } + } + } ae0 { mtu 9216; esi { @@ -1309,6 +1309,19 @@ interfaces { } } } +snmp { + location "Domicilium Datacentre RS2 C4"; + contact "isg@dataprocessors.com.au"; + community sbr1t1s0k { + authorization read-only; + clients { + 10.44.37.25/32; + 10.16.15.14/32; + 10.44.37.39/32; + 10.16.15.19/32; + } + } +} forwarding-options { storm-control-profiles default { all; @@ -1330,22 +1343,12 @@ policy-options { } } } -snmp { - location "Domicilium Datacentre RS2 C4"; - contact "isg@dataprocessors.com.au"; - community sbr1t1s0k { - authorization read-only; - clients { - 10.44.37.25/32; - 10.16.15.14/32; - 10.44.37.39/32; - 10.16.15.19/32; - } - } -} routing-options { router-id 172.31.255.9; autonomous-system 4200000000; + static { + route 0.0.0.0/0 next-hop 10.44.255.254; + } forwarding-table { export PFE-ECMP; chained-composite-next-hop { @@ -1357,7 +1360,6 @@ routing-options { } protocols { bgp { - log-updown; group OVERLAY { type internal; local-address 172.31.255.9; @@ -1390,6 +1392,7 @@ protocols { peer-as 4200000002; } } + log-updown; } evpn { encapsulation vxlan; @@ -1408,140 +1411,28 @@ switch-options { } } vlans { - vl1 { - vlan-id 1; - description "default"; - vxlan { - vni 1; - } - } - vl10 { - vlan-id 10; - description "Hurricane networks WAN MPLS end point"; - vxlan { - vni 10; - } - } - vl11 { - vlan-id 11; - description "VLAN for 2nd Internet link via Domicilium Transit"; - vxlan { - vni 11; - } - } - vl28 { - vlan-id 28; - description "New vlan for the 4G link to old network"; - vxlan { - vni 28; - } - } vl44 { - vlan-id 44; description "Main Data Vlan"; + vlan-id 44; l3-interface irb.44; vxlan { vni 44; } } - vl47 { - vlan-id 47; - description "New DMZ vlan"; - vxlan { - vni 47; - } - } - vl48 { - vlan-id 48; - description "DMZ VLAN"; - vxlan { - vni 48; - } - } - vl54 { - vlan-id 54; - description "VLAN54"; - vxlan { - vni 54; - } - } - vl126 { - vlan-id 126; - description "Managed WAN services to Clarendon House"; - vxlan { - vni 126; - } - } - vl127 { - vlan-id 127; - description "Vlan for Second Fibre Link to Clarendon house"; - vxlan { - vni 127; - } - } - vl128 { - vlan-id 128; - description "Vlan for Clarendon house link"; - vxlan { - vni 128; - } - } - vl166 { - vlan-id 166; - description "LAN connection vlan for X1700 Cato sockets"; - vxlan { - vni 166; - } - } - vl193 { - vlan-id 193; - description "Cato connection for WAN 1 via Hurricane Networks"; - vxlan { - vni 193; - } - } - vl194 { - vlan-id 194; - description "Cato connection for WAN 2 via Domicilium Transit Internet"; - vxlan { - vni 194; - } - } - vl211 { - vlan-id 211; - description "PGI-NEW"; - vxlan { - vni 211; - } - } - vl2526 { - vlan-id 2526; - description "AWS Cross-Connect to London via London"; - vxlan { - vni 2526; - } - } vl2527 { - vlan-id 2527; description "OCI Cross-Connect to London via Manchester"; + vlan-id 2527; l3-interface irb.2527; vxlan { vni 2527; } } vl2528 { - vlan-id 2528; description "OCI Fast connect via London"; + vlan-id 2528; l3-interface irb.2528; vxlan { vni 2528; } } - vl2529 { - vlan-id 2529; - description "AWS Cross-Connect to Manchester"; - vxlan { - vni 2529; - } - } } diff --git a/iom-dc/LEAF-C4-SW2.cfg b/iom-dc/LEAF-C4-SW2.cfg index 024ea8a..46cf38f 100644 --- a/iom-dc/LEAF-C4-SW2.cfg +++ b/iom-dc/LEAF-C4-SW2.cfg @@ -14,25 +14,25 @@ system { encrypted-password "$6$rounds=656000$XVfZXO9yn5j3bKx/$fHSTXI.LRWtIRUHlMZ3VPduBVNu9WZh.sn3r3R6kgqnpEp16hQpKUKiO24869c8cxXHeQrlytI7/u95FhPYf30"; ## SECRET-DATA } } - user h0barton { + user d0micilium { uid 2002; class super-user; + authentication { + encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + } + } + user h0barton { + uid 2003; + class super-user; authentication { encrypted-password "$6$rounds=656000$j52X8PoXRueVJyfV$oRjcRKT49MfPSuZ5NCPy0fLwGLCcbTO5Hzzk.sIg0YWtCXqc/Cx09PFYVroF6C5BvvHPuIjDeM5wR499ifT8W0"; ## SECRET-DATA } } user hobadmin { - uid 2003; - class super-user; - authentication { - encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA - } - } - user d0micilium { uid 2004; class super-user; authentication { - encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA } } } @@ -82,32 +82,6 @@ chassis { } } interfaces { - et-0/0/48 { - } - et-0/0/49 { - } - et-0/0/50 { - } - et-0/0/51 { - } - et-0/0/52 { - description "Link to SPINE-C7-SW1 et-0/0/7"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.29/31; - } - } - } - et-0/0/53 { - description "Link to SPINE-C7-SW2 et-0/0/7"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.31/31; - } - } - } xe-0/0/0 { ether-options { 802.3ad ae0; @@ -456,6 +430,32 @@ interfaces { 802.3ad ae71; } } + et-0/0/48 { + } + et-0/0/49 { + } + et-0/0/50 { + } + et-0/0/51 { + } + et-0/0/52 { + description "Link to SPINE-C7-SW1 et-0/0/7"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.29/31; + } + } + } + et-0/0/53 { + description "Link to SPINE-C7-SW2 et-0/0/7"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.31/31; + } + } + } ae0 { mtu 9216; esi { @@ -1297,6 +1297,19 @@ interfaces { } } } +snmp { + location "Domicilium Datacentre RS2 C4"; + contact "isg@dataprocessors.com.au"; + community sbr1t1s0k { + authorization read-only; + clients { + 10.44.37.25/32; + 10.16.15.14/32; + 10.44.37.39/32; + 10.16.15.19/32; + } + } +} forwarding-options { storm-control-profiles default { all; @@ -1318,22 +1331,12 @@ policy-options { } } } -snmp { - location "Domicilium Datacentre RS2 C4"; - contact "isg@dataprocessors.com.au"; - community sbr1t1s0k { - authorization read-only; - clients { - 10.44.37.25/32; - 10.16.15.14/32; - 10.44.37.39/32; - 10.16.15.19/32; - } - } -} routing-options { router-id 172.31.255.10; autonomous-system 4200000000; + static { + route 0.0.0.0/0 next-hop 10.44.255.254; + } forwarding-table { export PFE-ECMP; chained-composite-next-hop { @@ -1345,7 +1348,6 @@ routing-options { } protocols { bgp { - log-updown; group OVERLAY { type internal; local-address 172.31.255.10; @@ -1378,6 +1380,7 @@ protocols { peer-as 4200000002; } } + log-updown; } evpn { encapsulation vxlan; @@ -1396,138 +1399,12 @@ switch-options { } } vlans { - vl1 { - vlan-id 1; - description "default"; - vxlan { - vni 1; - } - } - vl10 { - vlan-id 10; - description "Hurricane networks WAN MPLS end point"; - vxlan { - vni 10; - } - } - vl11 { - vlan-id 11; - description "VLAN for 2nd Internet link via Domicilium Transit"; - vxlan { - vni 11; - } - } - vl28 { - vlan-id 28; - description "New vlan for the 4G link to old network"; - vxlan { - vni 28; - } - } vl44 { - vlan-id 44; description "Main Data Vlan"; + vlan-id 44; l3-interface irb.44; vxlan { vni 44; } } - vl47 { - vlan-id 47; - description "New DMZ vlan"; - vxlan { - vni 47; - } - } - vl48 { - vlan-id 48; - description "DMZ VLAN"; - vxlan { - vni 48; - } - } - vl54 { - vlan-id 54; - description "VLAN54"; - vxlan { - vni 54; - } - } - vl126 { - vlan-id 126; - description "Managed WAN services to Clarendon House"; - vxlan { - vni 126; - } - } - vl127 { - vlan-id 127; - description "Vlan for Second Fibre Link to Clarendon house"; - vxlan { - vni 127; - } - } - vl128 { - vlan-id 128; - description "Vlan for Clarendon house link"; - vxlan { - vni 128; - } - } - vl166 { - vlan-id 166; - description "LAN connection vlan for X1700 Cato sockets"; - vxlan { - vni 166; - } - } - vl193 { - vlan-id 193; - description "Cato connection for WAN 1 via Hurricane Networks"; - vxlan { - vni 193; - } - } - vl194 { - vlan-id 194; - description "Cato connection for WAN 2 via Domicilium Transit Internet"; - vxlan { - vni 194; - } - } - vl211 { - vlan-id 211; - description "PGI-NEW"; - vxlan { - vni 211; - } - } - vl2526 { - vlan-id 2526; - description "AWS Cross-Connect to London via London"; - vxlan { - vni 2526; - } - } - vl2527 { - vlan-id 2527; - description "OCI Cross-Connect to London via Manchester"; - vxlan { - vni 2527; - } - } - vl2528 { - vlan-id 2528; - description "OCI Fast connect via London"; - vxlan { - vni 2528; - } - } - vl2529 { - vlan-id 2529; - description "AWS Cross-Connect to Manchester"; - vxlan { - vni 2529; - } - } } diff --git a/iom-dc/LEAF-C5-SW1.cfg b/iom-dc/LEAF-C5-SW1.cfg index c19fb19..10d9d95 100644 --- a/iom-dc/LEAF-C5-SW1.cfg +++ b/iom-dc/LEAF-C5-SW1.cfg @@ -72,32 +72,6 @@ chassis { } } interfaces { - et-0/0/48 { - } - et-0/0/49 { - } - et-0/0/50 { - } - et-0/0/51 { - } - et-0/0/52 { - description "Link to SPINE-C7-SW1 et-0/0/8"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.33/31; - } - } - } - et-0/0/53 { - description "Link to SPINE-C7-SW2 et-0/0/8"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.35/31; - } - } - } xe-0/0/0 { ether-options { 802.3ad ae0; @@ -434,6 +408,32 @@ interfaces { } } } + et-0/0/48 { + } + et-0/0/49 { + } + et-0/0/50 { + } + et-0/0/51 { + } + et-0/0/52 { + description "Link to SPINE-C7-SW1 et-0/0/8"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.33/31; + } + } + } + et-0/0/53 { + description "Link to SPINE-C7-SW2 et-0/0/8"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.35/31; + } + } + } ae0 { mtu 9216; esi { @@ -1225,6 +1225,19 @@ interfaces { } } } +snmp { + location "Domicilium Datacentre RS2 C5"; + contact "isg@dataprocessors.com.au"; + community sbr1t1s0k { + authorization read-only; + clients { + 10.44.37.25/32; + 10.16.15.14/32; + 10.44.37.39/32; + 10.16.15.19/32; + } + } +} forwarding-options { storm-control-profiles default { all; @@ -1246,22 +1259,12 @@ policy-options { } } } -snmp { - location "Domicilium Datacentre RS2 C5"; - contact "isg@dataprocessors.com.au"; - community sbr1t1s0k { - authorization read-only; - clients { - 10.44.37.25/32; - 10.16.15.14/32; - 10.44.37.39/32; - 10.16.15.19/32; - } - } -} routing-options { router-id 172.31.255.11; autonomous-system 4200000000; + static { + route 0.0.0.0/0 next-hop 10.44.255.254; + } forwarding-table { export PFE-ECMP; chained-composite-next-hop { @@ -1273,7 +1276,6 @@ routing-options { } protocols { bgp { - log-updown; group OVERLAY { type internal; local-address 172.31.255.11; @@ -1306,6 +1308,7 @@ protocols { peer-as 4200000002; } } + log-updown; } evpn { encapsulation vxlan; @@ -1324,138 +1327,12 @@ switch-options { } } vlans { - vl1 { - vlan-id 1; - description "default"; - vxlan { - vni 1; - } - } - vl10 { - vlan-id 10; - description "Hurricane networks WAN MPLS end point"; - vxlan { - vni 10; - } - } - vl11 { - vlan-id 11; - description "VLAN for 2nd Internet link via Domicilium Transit"; - vxlan { - vni 11; - } - } - vl28 { - vlan-id 28; - description "New vlan for the 4G link to old network"; - vxlan { - vni 28; - } - } vl44 { - vlan-id 44; description "Main Data Vlan"; + vlan-id 44; l3-interface irb.44; vxlan { vni 44; } } - vl47 { - vlan-id 47; - description "New DMZ vlan"; - vxlan { - vni 47; - } - } - vl48 { - vlan-id 48; - description "DMZ VLAN"; - vxlan { - vni 48; - } - } - vl54 { - vlan-id 54; - description "VLAN54"; - vxlan { - vni 54; - } - } - vl126 { - vlan-id 126; - description "Managed WAN services to Clarendon House"; - vxlan { - vni 126; - } - } - vl127 { - vlan-id 127; - description "Vlan for Second Fibre Link to Clarendon house"; - vxlan { - vni 127; - } - } - vl128 { - vlan-id 128; - description "Vlan for Clarendon house link"; - vxlan { - vni 128; - } - } - vl166 { - vlan-id 166; - description "LAN connection vlan for X1700 Cato sockets"; - vxlan { - vni 166; - } - } - vl193 { - vlan-id 193; - description "Cato connection for WAN 1 via Hurricane Networks"; - vxlan { - vni 193; - } - } - vl194 { - vlan-id 194; - description "Cato connection for WAN 2 via Domicilium Transit Internet"; - vxlan { - vni 194; - } - } - vl211 { - vlan-id 211; - description "PGI-NEW"; - vxlan { - vni 211; - } - } - vl2526 { - vlan-id 2526; - description "AWS Cross-Connect to London via London"; - vxlan { - vni 2526; - } - } - vl2527 { - vlan-id 2527; - description "OCI Cross-Connect to London via Manchester"; - vxlan { - vni 2527; - } - } - vl2528 { - vlan-id 2528; - description "OCI Fast connect via London"; - vxlan { - vni 2528; - } - } - vl2529 { - vlan-id 2529; - description "AWS Cross-Connect to Manchester"; - vxlan { - vni 2529; - } - } } diff --git a/iom-dc/LEAF-C5-SW2.cfg b/iom-dc/LEAF-C5-SW2.cfg index 8050d28..8a94e14 100644 --- a/iom-dc/LEAF-C5-SW2.cfg +++ b/iom-dc/LEAF-C5-SW2.cfg @@ -72,32 +72,6 @@ chassis { } } interfaces { - et-0/0/48 { - } - et-0/0/49 { - } - et-0/0/50 { - } - et-0/0/51 { - } - et-0/0/52 { - description "Link to SPINE-C7-SW1 et-0/0/9"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.37/31; - } - } - } - et-0/0/53 { - description "Link to SPINE-C7-SW2 et-0/0/9"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.39/31; - } - } - } xe-0/0/0 { ether-options { 802.3ad ae0; @@ -434,6 +408,32 @@ interfaces { } } } + et-0/0/48 { + } + et-0/0/49 { + } + et-0/0/50 { + } + et-0/0/51 { + } + et-0/0/52 { + description "Link to SPINE-C7-SW1 et-0/0/9"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.37/31; + } + } + } + et-0/0/53 { + description "Link to SPINE-C7-SW2 et-0/0/9"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.39/31; + } + } + } ae0 { mtu 9216; esi { @@ -1225,6 +1225,19 @@ interfaces { } } } +snmp { + location "Domicilium Datacentre RS2 C5"; + contact "isg@dataprocessors.com.au"; + community sbr1t1s0k { + authorization read-only; + clients { + 10.44.37.25/32; + 10.16.15.14/32; + 10.44.37.39/32; + 10.16.15.19/32; + } + } +} forwarding-options { storm-control-profiles default { all; @@ -1246,22 +1259,12 @@ policy-options { } } } -snmp { - location "Domicilium Datacentre RS2 C5"; - contact "isg@dataprocessors.com.au"; - community sbr1t1s0k { - authorization read-only; - clients { - 10.44.37.25/32; - 10.16.15.14/32; - 10.44.37.39/32; - 10.16.15.19/32; - } - } -} routing-options { router-id 172.31.255.12; autonomous-system 4200000000; + static { + route 0.0.0.0/0 next-hop 10.44.255.254; + } forwarding-table { export PFE-ECMP; chained-composite-next-hop { @@ -1273,7 +1276,6 @@ routing-options { } protocols { bgp { - log-updown; group OVERLAY { type internal; local-address 172.31.255.12; @@ -1306,6 +1308,7 @@ protocols { peer-as 4200000002; } } + log-updown; } evpn { encapsulation vxlan; @@ -1324,138 +1327,12 @@ switch-options { } } vlans { - vl1 { - vlan-id 1; - description "default"; - vxlan { - vni 1; - } - } - vl10 { - vlan-id 10; - description "Hurricane networks WAN MPLS end point"; - vxlan { - vni 10; - } - } - vl11 { - vlan-id 11; - description "VLAN for 2nd Internet link via Domicilium Transit"; - vxlan { - vni 11; - } - } - vl28 { - vlan-id 28; - description "New vlan for the 4G link to old network"; - vxlan { - vni 28; - } - } vl44 { - vlan-id 44; description "Main Data Vlan"; + vlan-id 44; l3-interface irb.44; vxlan { vni 44; } } - vl47 { - vlan-id 47; - description "New DMZ vlan"; - vxlan { - vni 47; - } - } - vl48 { - vlan-id 48; - description "DMZ VLAN"; - vxlan { - vni 48; - } - } - vl54 { - vlan-id 54; - description "VLAN54"; - vxlan { - vni 54; - } - } - vl126 { - vlan-id 126; - description "Managed WAN services to Clarendon House"; - vxlan { - vni 126; - } - } - vl127 { - vlan-id 127; - description "Vlan for Second Fibre Link to Clarendon house"; - vxlan { - vni 127; - } - } - vl128 { - vlan-id 128; - description "Vlan for Clarendon house link"; - vxlan { - vni 128; - } - } - vl166 { - vlan-id 166; - description "LAN connection vlan for X1700 Cato sockets"; - vxlan { - vni 166; - } - } - vl193 { - vlan-id 193; - description "Cato connection for WAN 1 via Hurricane Networks"; - vxlan { - vni 193; - } - } - vl194 { - vlan-id 194; - description "Cato connection for WAN 2 via Domicilium Transit Internet"; - vxlan { - vni 194; - } - } - vl211 { - vlan-id 211; - description "PGI-NEW"; - vxlan { - vni 211; - } - } - vl2526 { - vlan-id 2526; - description "AWS Cross-Connect to London via London"; - vxlan { - vni 2526; - } - } - vl2527 { - vlan-id 2527; - description "OCI Cross-Connect to London via Manchester"; - vxlan { - vni 2527; - } - } - vl2528 { - vlan-id 2528; - description "OCI Fast connect via London"; - vxlan { - vni 2528; - } - } - vl2529 { - vlan-id 2529; - description "AWS Cross-Connect to Manchester"; - vxlan { - vni 2529; - } - } } diff --git a/iom-dc/LEAF-C6-SW1.cfg b/iom-dc/LEAF-C6-SW1.cfg index 0c498eb..67568dd 100644 --- a/iom-dc/LEAF-C6-SW1.cfg +++ b/iom-dc/LEAF-C6-SW1.cfg @@ -14,25 +14,25 @@ system { encrypted-password "$6$rounds=656000$XVfZXO9yn5j3bKx/$fHSTXI.LRWtIRUHlMZ3VPduBVNu9WZh.sn3r3R6kgqnpEp16hQpKUKiO24869c8cxXHeQrlytI7/u95FhPYf30"; ## SECRET-DATA } } - user h0barton { + user d0micilium { uid 2002; class super-user; + authentication { + encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + } + } + user h0barton { + uid 2003; + class super-user; authentication { encrypted-password "$6$rounds=656000$j52X8PoXRueVJyfV$oRjcRKT49MfPSuZ5NCPy0fLwGLCcbTO5Hzzk.sIg0YWtCXqc/Cx09PFYVroF6C5BvvHPuIjDeM5wR499ifT8W0"; ## SECRET-DATA } } user hobadmin { - uid 2003; - class super-user; - authentication { - encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA - } - } - user d0micilium { uid 2004; class super-user; authentication { - encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA } } } @@ -72,32 +72,6 @@ chassis { } } interfaces { - et-0/0/48 { - } - et-0/0/49 { - } - et-0/0/50 { - } - et-0/0/51 { - } - et-0/0/52 { - description "Link to SPINE-C7-SW1 et-0/0/10"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.41/31; - } - } - } - et-0/0/53 { - description "Link to SPINE-C7-SW2 et-0/0/10"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.43/31; - } - } - } xe-0/0/0 { ether-options { 802.3ad ae0; @@ -434,6 +408,32 @@ interfaces { } } } + et-0/0/48 { + } + et-0/0/49 { + } + et-0/0/50 { + } + et-0/0/51 { + } + et-0/0/52 { + description "Link to SPINE-C7-SW1 et-0/0/10"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.41/31; + } + } + } + et-0/0/53 { + description "Link to SPINE-C7-SW2 et-0/0/10"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.43/31; + } + } + } ae0 { mtu 9216; esi { @@ -1243,6 +1243,19 @@ interfaces { } } } +snmp { + location "Domicilium Datacentre RS2 C6"; + contact "isg@dataprocessors.com.au"; + community sbr1t1s0k { + authorization read-only; + clients { + 10.44.37.25/32; + 10.16.15.14/32; + 10.44.37.39/32; + 10.16.15.19/32; + } + } +} forwarding-options { storm-control-profiles default { all; @@ -1264,22 +1277,12 @@ policy-options { } } } -snmp { - location "Domicilium Datacentre RS2 C6"; - contact "isg@dataprocessors.com.au"; - community sbr1t1s0k { - authorization read-only; - clients { - 10.44.37.25/32; - 10.16.15.14/32; - 10.44.37.39/32; - 10.16.15.19/32; - } - } -} routing-options { router-id 172.31.255.13; autonomous-system 4200000000; + static { + route 0.0.0.0/0 next-hop 10.44.255.254; + } forwarding-table { export PFE-ECMP; chained-composite-next-hop { @@ -1291,7 +1294,6 @@ routing-options { } protocols { bgp { - log-updown; group OVERLAY { type internal; local-address 172.31.255.13; @@ -1324,6 +1326,7 @@ protocols { peer-as 4200000002; } } + log-updown; } evpn { encapsulation vxlan; @@ -1342,141 +1345,36 @@ switch-options { } } vlans { - vl1 { - vlan-id 1; - description "default"; - vxlan { - vni 1; - } - } - vl10 { - vlan-id 10; - description "Hurricane networks WAN MPLS end point"; - vxlan { - vni 10; - } - } - vl11 { - vlan-id 11; - description "VLAN for 2nd Internet link via Domicilium Transit"; - vxlan { - vni 11; - } - } - vl28 { - vlan-id 28; - description "New vlan for the 4G link to old network"; - vxlan { - vni 28; - } - } vl44 { - vlan-id 44; description "Main Data Vlan"; + vlan-id 44; l3-interface irb.44; vxlan { vni 44; } } vl47 { - vlan-id 47; description "New DMZ vlan"; + vlan-id 47; l3-interface irb.47; vxlan { vni 47; } } - vl48 { - vlan-id 48; - description "DMZ VLAN"; - vxlan { - vni 48; - } - } vl54 { - vlan-id 54; description "VLAN54"; + vlan-id 54; l3-interface irb.54; vxlan { vni 54; } } - vl126 { - vlan-id 126; - description "Managed WAN services to Clarendon House"; - vxlan { - vni 126; - } - } vl127 { - vlan-id 127; description "Vlan for Second Fibre Link to Clarendon house"; + vlan-id 127; l3-interface irb.127; vxlan { vni 127; } } - vl128 { - vlan-id 128; - description "Vlan for Clarendon house link"; - vxlan { - vni 128; - } - } - vl166 { - vlan-id 166; - description "LAN connection vlan for X1700 Cato sockets"; - vxlan { - vni 166; - } - } - vl193 { - vlan-id 193; - description "Cato connection for WAN 1 via Hurricane Networks"; - vxlan { - vni 193; - } - } - vl194 { - vlan-id 194; - description "Cato connection for WAN 2 via Domicilium Transit Internet"; - vxlan { - vni 194; - } - } - vl211 { - vlan-id 211; - description "PGI-NEW"; - vxlan { - vni 211; - } - } - vl2526 { - vlan-id 2526; - description "AWS Cross-Connect to London via London"; - vxlan { - vni 2526; - } - } - vl2527 { - vlan-id 2527; - description "OCI Cross-Connect to London via Manchester"; - vxlan { - vni 2527; - } - } - vl2528 { - vlan-id 2528; - description "OCI Fast connect via London"; - vxlan { - vni 2528; - } - } - vl2529 { - vlan-id 2529; - description "AWS Cross-Connect to Manchester"; - vxlan { - vni 2529; - } - } } diff --git a/iom-dc/LEAF-C6-SW2.cfg b/iom-dc/LEAF-C6-SW2.cfg index b5bf3ab..0f07581 100644 --- a/iom-dc/LEAF-C6-SW2.cfg +++ b/iom-dc/LEAF-C6-SW2.cfg @@ -14,25 +14,25 @@ system { encrypted-password "$6$rounds=656000$XVfZXO9yn5j3bKx/$fHSTXI.LRWtIRUHlMZ3VPduBVNu9WZh.sn3r3R6kgqnpEp16hQpKUKiO24869c8cxXHeQrlytI7/u95FhPYf30"; ## SECRET-DATA } } - user h0barton { + user d0micilium { uid 2002; class super-user; + authentication { + encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + } + } + user h0barton { + uid 2003; + class super-user; authentication { encrypted-password "$6$rounds=656000$j52X8PoXRueVJyfV$oRjcRKT49MfPSuZ5NCPy0fLwGLCcbTO5Hzzk.sIg0YWtCXqc/Cx09PFYVroF6C5BvvHPuIjDeM5wR499ifT8W0"; ## SECRET-DATA } } user hobadmin { - uid 2003; - class super-user; - authentication { - encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA - } - } - user d0micilium { uid 2004; class super-user; authentication { - encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA } } } @@ -79,36 +79,6 @@ chassis { } } interfaces { - et-0/0/48 { - } - et-0/0/49 { - } - et-0/0/50 { - } - et-0/0/51 { - description "Temporary link to Dell S2-C1-S4K-SW2"; - ether-options { - 802.3ad ae51; - } - } - et-0/0/52 { - description "Link to SPINE-C7-SW1 et-0/0/11"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.45/31; - } - } - } - et-0/0/53 { - description "Link to SPINE-C7-SW2 et-0/0/11"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.47/31; - } - } - } xe-0/0/0 { ether-options { 802.3ad ae0; @@ -469,6 +439,36 @@ interfaces { 802.3ad ae61; } } + et-0/0/48 { + } + et-0/0/49 { + } + et-0/0/50 { + } + et-0/0/51 { + description "Temporary link to Dell S2-C1-S4K-SW2"; + ether-options { + 802.3ad ae51; + } + } + et-0/0/52 { + description "Link to SPINE-C7-SW1 et-0/0/11"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.45/31; + } + } + } + et-0/0/53 { + description "Link to SPINE-C7-SW2 et-0/0/11"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.47/31; + } + } + } ae0 { mtu 9216; esi { @@ -1349,6 +1349,19 @@ interfaces { } } } +snmp { + location "Domicilium Datacentre RS2 C6"; + contact "isg@dataprocessors.com.au"; + community sbr1t1s0k { + authorization read-only; + clients { + 10.44.37.25/32; + 10.16.15.14/32; + 10.44.37.39/32; + 10.16.15.19/32; + } + } +} forwarding-options { storm-control-profiles default { all; @@ -1370,22 +1383,12 @@ policy-options { } } } -snmp { - location "Domicilium Datacentre RS2 C6"; - contact "isg@dataprocessors.com.au"; - community sbr1t1s0k { - authorization read-only; - clients { - 10.44.37.25/32; - 10.16.15.14/32; - 10.44.37.39/32; - 10.16.15.19/32; - } - } -} routing-options { router-id 172.31.255.14; autonomous-system 4200000000; + static { + route 0.0.0.0/0 next-hop 10.44.255.254; + } forwarding-table { export PFE-ECMP; chained-composite-next-hop { @@ -1397,7 +1400,6 @@ routing-options { } protocols { bgp { - log-updown; group OVERLAY { type internal; local-address 172.31.255.14; @@ -1430,6 +1432,7 @@ protocols { peer-as 4200000002; } } + log-updown; } evpn { encapsulation vxlan; @@ -1448,141 +1451,36 @@ switch-options { } } vlans { - vl1 { - vlan-id 1; - description "default"; - vxlan { - vni 1; - } - } - vl10 { - vlan-id 10; - description "Hurricane networks WAN MPLS end point"; - vxlan { - vni 10; - } - } - vl11 { - vlan-id 11; - description "VLAN for 2nd Internet link via Domicilium Transit"; - vxlan { - vni 11; - } - } - vl28 { - vlan-id 28; - description "New vlan for the 4G link to old network"; - vxlan { - vni 28; - } - } vl44 { - vlan-id 44; description "Main Data Vlan"; + vlan-id 44; l3-interface irb.44; vxlan { vni 44; } } vl47 { - vlan-id 47; description "New DMZ vlan"; + vlan-id 47; l3-interface irb.47; vxlan { vni 47; } } - vl48 { - vlan-id 48; - description "DMZ VLAN"; - vxlan { - vni 48; - } - } vl54 { - vlan-id 54; description "VLAN54"; + vlan-id 54; l3-interface irb.54; vxlan { vni 54; } } - vl126 { - vlan-id 126; - description "Managed WAN services to Clarendon House"; - vxlan { - vni 126; - } - } vl127 { - vlan-id 127; description "Vlan for Second Fibre Link to Clarendon house"; + vlan-id 127; l3-interface irb.127; vxlan { vni 127; } } - vl128 { - vlan-id 128; - description "Vlan for Clarendon house link"; - vxlan { - vni 128; - } - } - vl166 { - vlan-id 166; - description "LAN connection vlan for X1700 Cato sockets"; - vxlan { - vni 166; - } - } - vl193 { - vlan-id 193; - description "Cato connection for WAN 1 via Hurricane Networks"; - vxlan { - vni 193; - } - } - vl194 { - vlan-id 194; - description "Cato connection for WAN 2 via Domicilium Transit Internet"; - vxlan { - vni 194; - } - } - vl211 { - vlan-id 211; - description "PGI-NEW"; - vxlan { - vni 211; - } - } - vl2526 { - vlan-id 2526; - description "AWS Cross-Connect to London via London"; - vxlan { - vni 2526; - } - } - vl2527 { - vlan-id 2527; - description "OCI Cross-Connect to London via Manchester"; - vxlan { - vni 2527; - } - } - vl2528 { - vlan-id 2528; - description "OCI Fast connect via London"; - vxlan { - vni 2528; - } - } - vl2529 { - vlan-id 2529; - description "AWS Cross-Connect to Manchester"; - vxlan { - vni 2529; - } - } } diff --git a/iom-dc/LEAF-C8-SW1.cfg b/iom-dc/LEAF-C8-SW1.cfg index a48af88..df71209 100644 --- a/iom-dc/LEAF-C8-SW1.cfg +++ b/iom-dc/LEAF-C8-SW1.cfg @@ -14,25 +14,25 @@ system { encrypted-password "$6$rounds=656000$XVfZXO9yn5j3bKx/$fHSTXI.LRWtIRUHlMZ3VPduBVNu9WZh.sn3r3R6kgqnpEp16hQpKUKiO24869c8cxXHeQrlytI7/u95FhPYf30"; ## SECRET-DATA } } - user h0barton { + user d0micilium { uid 2002; class super-user; + authentication { + encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + } + } + user h0barton { + uid 2003; + class super-user; authentication { encrypted-password "$6$rounds=656000$j52X8PoXRueVJyfV$oRjcRKT49MfPSuZ5NCPy0fLwGLCcbTO5Hzzk.sIg0YWtCXqc/Cx09PFYVroF6C5BvvHPuIjDeM5wR499ifT8W0"; ## SECRET-DATA } } user hobadmin { - uid 2003; - class super-user; - authentication { - encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA - } - } - user d0micilium { uid 2004; class super-user; authentication { - encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA } } } @@ -72,32 +72,6 @@ chassis { } } interfaces { - et-0/0/48 { - } - et-0/0/49 { - } - et-0/0/50 { - } - et-0/0/51 { - } - et-0/0/52 { - description "Link to SPINE-C7-SW1 et-0/0/12"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.49/31; - } - } - } - et-0/0/53 { - description "Link to SPINE-C7-SW2 et-0/0/12"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.51/31; - } - } - } xe-0/0/0 { ether-options { 802.3ad ae0; @@ -449,6 +423,32 @@ interfaces { } } } + et-0/0/48 { + } + et-0/0/49 { + } + et-0/0/50 { + } + et-0/0/51 { + } + et-0/0/52 { + description "Link to SPINE-C7-SW1 et-0/0/12"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.49/31; + } + } + } + et-0/0/53 { + description "Link to SPINE-C7-SW2 et-0/0/12"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.51/31; + } + } + } ae0 { mtu 9216; esi { @@ -1225,6 +1225,19 @@ interfaces { } } } +snmp { + location "Domicilium Datacentre RS2 C8"; + contact "isg@dataprocessors.com.au"; + community sbr1t1s0k { + authorization read-only; + clients { + 10.44.37.25/32; + 10.16.15.14/32; + 10.44.37.39/32; + 10.16.15.19/32; + } + } +} forwarding-options { storm-control-profiles default { all; @@ -1246,22 +1259,12 @@ policy-options { } } } -snmp { - location "Domicilium Datacentre RS2 C8"; - contact "isg@dataprocessors.com.au"; - community sbr1t1s0k { - authorization read-only; - clients { - 10.44.37.25/32; - 10.16.15.14/32; - 10.44.37.39/32; - 10.16.15.19/32; - } - } -} routing-options { router-id 172.31.255.15; autonomous-system 4200000000; + static { + route 0.0.0.0/0 next-hop 10.44.255.254; + } forwarding-table { export PFE-ECMP; chained-composite-next-hop { @@ -1273,7 +1276,6 @@ routing-options { } protocols { bgp { - log-updown; group OVERLAY { type internal; local-address 172.31.255.15; @@ -1306,6 +1308,7 @@ protocols { peer-as 4200000002; } } + log-updown; } evpn { encapsulation vxlan; @@ -1324,143 +1327,52 @@ switch-options { } } vlans { - vl1 { - vlan-id 1; - description "default"; - vxlan { - vni 1; - } - } - vl10 { - vlan-id 10; - description "Hurricane networks WAN MPLS end point"; - vxlan { - vni 10; - } - } - vl11 { - vlan-id 11; - description "VLAN for 2nd Internet link via Domicilium Transit"; - vxlan { - vni 11; - } - } vl28 { - vlan-id 28; description "New vlan for the 4G link to old network"; + vlan-id 28; l3-interface irb.28; vxlan { vni 28; } } vl44 { - vlan-id 44; description "Main Data Vlan"; + vlan-id 44; l3-interface irb.44; vxlan { vni 44; } } - vl47 { - vlan-id 47; - description "New DMZ vlan"; - vxlan { - vni 47; - } - } vl48 { - vlan-id 48; description "DMZ VLAN"; + vlan-id 48; l3-interface irb.48; vxlan { vni 48; } } - vl54 { - vlan-id 54; - description "VLAN54"; - vxlan { - vni 54; - } - } - vl126 { - vlan-id 126; - description "Managed WAN services to Clarendon House"; - vxlan { - vni 126; - } - } - vl127 { - vlan-id 127; - description "Vlan for Second Fibre Link to Clarendon house"; - vxlan { - vni 127; - } - } - vl128 { - vlan-id 128; - description "Vlan for Clarendon house link"; - vxlan { - vni 128; - } - } vl166 { - vlan-id 166; description "LAN connection vlan for X1700 Cato sockets"; + vlan-id 166; l3-interface irb.166; vxlan { vni 166; } } vl193 { - vlan-id 193; description "Cato connection for WAN 1 via Hurricane Networks"; + vlan-id 193; l3-interface irb.193; vxlan { vni 193; } } vl194 { - vlan-id 194; description "Cato connection for WAN 2 via Domicilium Transit Internet"; + vlan-id 194; l3-interface irb.194; vxlan { vni 194; } } - vl211 { - vlan-id 211; - description "PGI-NEW"; - vxlan { - vni 211; - } - } - vl2526 { - vlan-id 2526; - description "AWS Cross-Connect to London via London"; - vxlan { - vni 2526; - } - } - vl2527 { - vlan-id 2527; - description "OCI Cross-Connect to London via Manchester"; - vxlan { - vni 2527; - } - } - vl2528 { - vlan-id 2528; - description "OCI Fast connect via London"; - vxlan { - vni 2528; - } - } - vl2529 { - vlan-id 2529; - description "AWS Cross-Connect to Manchester"; - vxlan { - vni 2529; - } - } } diff --git a/iom-dc/LEAF-C8-SW2.cfg b/iom-dc/LEAF-C8-SW2.cfg index 2b0e0ee..bc0a82a 100644 --- a/iom-dc/LEAF-C8-SW2.cfg +++ b/iom-dc/LEAF-C8-SW2.cfg @@ -14,25 +14,25 @@ system { encrypted-password "$6$rounds=656000$XVfZXO9yn5j3bKx/$fHSTXI.LRWtIRUHlMZ3VPduBVNu9WZh.sn3r3R6kgqnpEp16hQpKUKiO24869c8cxXHeQrlytI7/u95FhPYf30"; ## SECRET-DATA } } - user h0barton { + user d0micilium { uid 2002; class super-user; + authentication { + encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + } + } + user h0barton { + uid 2003; + class super-user; authentication { encrypted-password "$6$rounds=656000$j52X8PoXRueVJyfV$oRjcRKT49MfPSuZ5NCPy0fLwGLCcbTO5Hzzk.sIg0YWtCXqc/Cx09PFYVroF6C5BvvHPuIjDeM5wR499ifT8W0"; ## SECRET-DATA } } user hobadmin { - uid 2003; - class super-user; - authentication { - encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA - } - } - user d0micilium { uid 2004; class super-user; authentication { - encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA } } } @@ -79,36 +79,6 @@ chassis { } } interfaces { - et-0/0/48 { - } - et-0/0/49 { - } - et-0/0/50 { - } - et-0/0/51 { - description "Temporary link to Dell S2-C1-S4K-SW1"; - ether-options { - 802.3ad ae51; - } - } - et-0/0/52 { - description "Link to SPINE-C7-SW1 et-0/0/13"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.53/31; - } - } - } - et-0/0/53 { - description "Link to SPINE-C7-SW2 et-0/0/13"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.55/31; - } - } - } xe-0/0/0 { ether-options { 802.3ad ae0; @@ -484,6 +454,36 @@ interfaces { 802.3ad ae61; } } + et-0/0/48 { + } + et-0/0/49 { + } + et-0/0/50 { + } + et-0/0/51 { + description "Temporary link to Dell S2-C1-S4K-SW1"; + ether-options { + 802.3ad ae51; + } + } + et-0/0/52 { + description "Link to SPINE-C7-SW1 et-0/0/13"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.53/31; + } + } + } + et-0/0/53 { + description "Link to SPINE-C7-SW2 et-0/0/13"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.55/31; + } + } + } ae0 { mtu 9216; esi { @@ -1331,6 +1331,19 @@ interfaces { } } } +snmp { + location "Domicilium Datacentre RS2 C8"; + contact "isg@dataprocessors.com.au"; + community sbr1t1s0k { + authorization read-only; + clients { + 10.44.37.25/32; + 10.16.15.14/32; + 10.44.37.39/32; + 10.16.15.19/32; + } + } +} forwarding-options { storm-control-profiles default { all; @@ -1352,22 +1365,12 @@ policy-options { } } } -snmp { - location "Domicilium Datacentre RS2 C8"; - contact "isg@dataprocessors.com.au"; - community sbr1t1s0k { - authorization read-only; - clients { - 10.44.37.25/32; - 10.16.15.14/32; - 10.44.37.39/32; - 10.16.15.19/32; - } - } -} routing-options { router-id 172.31.255.16; autonomous-system 4200000000; + static { + route 0.0.0.0/0 next-hop 10.44.255.254; + } forwarding-table { export PFE-ECMP; chained-composite-next-hop { @@ -1379,7 +1382,6 @@ routing-options { } protocols { bgp { - log-updown; group OVERLAY { type internal; local-address 172.31.255.16; @@ -1412,6 +1414,7 @@ protocols { peer-as 4200000002; } } + log-updown; } evpn { encapsulation vxlan; @@ -1430,143 +1433,52 @@ switch-options { } } vlans { - vl1 { - vlan-id 1; - description "default"; - vxlan { - vni 1; - } - } - vl10 { - vlan-id 10; - description "Hurricane networks WAN MPLS end point"; - vxlan { - vni 10; - } - } - vl11 { - vlan-id 11; - description "VLAN for 2nd Internet link via Domicilium Transit"; - vxlan { - vni 11; - } - } vl28 { - vlan-id 28; description "New vlan for the 4G link to old network"; + vlan-id 28; l3-interface irb.28; vxlan { vni 28; } } vl44 { - vlan-id 44; description "Main Data Vlan"; + vlan-id 44; l3-interface irb.44; vxlan { vni 44; } } - vl47 { - vlan-id 47; - description "New DMZ vlan"; - vxlan { - vni 47; - } - } vl48 { - vlan-id 48; description "DMZ VLAN"; + vlan-id 48; l3-interface irb.48; vxlan { vni 48; } } - vl54 { - vlan-id 54; - description "VLAN54"; - vxlan { - vni 54; - } - } - vl126 { - vlan-id 126; - description "Managed WAN services to Clarendon House"; - vxlan { - vni 126; - } - } - vl127 { - vlan-id 127; - description "Vlan for Second Fibre Link to Clarendon house"; - vxlan { - vni 127; - } - } - vl128 { - vlan-id 128; - description "Vlan for Clarendon house link"; - vxlan { - vni 128; - } - } vl166 { - vlan-id 166; description "LAN connection vlan for X1700 Cato sockets"; + vlan-id 166; l3-interface irb.166; vxlan { vni 166; } } vl193 { - vlan-id 193; description "Cato connection for WAN 1 via Hurricane Networks"; + vlan-id 193; l3-interface irb.193; vxlan { vni 193; } } vl194 { - vlan-id 194; description "Cato connection for WAN 2 via Domicilium Transit Internet"; + vlan-id 194; l3-interface irb.194; vxlan { vni 194; } } - vl211 { - vlan-id 211; - description "PGI-NEW"; - vxlan { - vni 211; - } - } - vl2526 { - vlan-id 2526; - description "AWS Cross-Connect to London via London"; - vxlan { - vni 2526; - } - } - vl2527 { - vlan-id 2527; - description "OCI Cross-Connect to London via Manchester"; - vxlan { - vni 2527; - } - } - vl2528 { - vlan-id 2528; - description "OCI Fast connect via London"; - vxlan { - vni 2528; - } - } - vl2529 { - vlan-id 2529; - description "AWS Cross-Connect to Manchester"; - vxlan { - vni 2529; - } - } } diff --git a/iom-dc/LEAF-C9-SW1.cfg b/iom-dc/LEAF-C9-SW1.cfg index d39a6ca..09398c0 100644 --- a/iom-dc/LEAF-C9-SW1.cfg +++ b/iom-dc/LEAF-C9-SW1.cfg @@ -14,25 +14,25 @@ system { encrypted-password "$6$rounds=656000$XVfZXO9yn5j3bKx/$fHSTXI.LRWtIRUHlMZ3VPduBVNu9WZh.sn3r3R6kgqnpEp16hQpKUKiO24869c8cxXHeQrlytI7/u95FhPYf30"; ## SECRET-DATA } } - user h0barton { + user d0micilium { uid 2002; class super-user; + authentication { + encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + } + } + user h0barton { + uid 2003; + class super-user; authentication { encrypted-password "$6$rounds=656000$j52X8PoXRueVJyfV$oRjcRKT49MfPSuZ5NCPy0fLwGLCcbTO5Hzzk.sIg0YWtCXqc/Cx09PFYVroF6C5BvvHPuIjDeM5wR499ifT8W0"; ## SECRET-DATA } } user hobadmin { - uid 2003; - class super-user; - authentication { - encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA - } - } - user d0micilium { uid 2004; class super-user; authentication { - encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA } } } @@ -72,32 +72,6 @@ chassis { } } interfaces { - et-0/0/48 { - } - et-0/0/49 { - } - et-0/0/50 { - } - et-0/0/51 { - } - et-0/0/52 { - description "Link to SPINE-C7-SW1 et-0/0/14"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.57/31; - } - } - } - et-0/0/53 { - description "Link to SPINE-C7-SW2 et-0/0/14"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.59/31; - } - } - } xe-0/0/0 { ether-options { 802.3ad ae0; @@ -434,6 +408,32 @@ interfaces { } } } + et-0/0/48 { + } + et-0/0/49 { + } + et-0/0/50 { + } + et-0/0/51 { + } + et-0/0/52 { + description "Link to SPINE-C7-SW1 et-0/0/14"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.57/31; + } + } + } + et-0/0/53 { + description "Link to SPINE-C7-SW2 et-0/0/14"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.59/31; + } + } + } ae0 { mtu 9216; esi { @@ -1225,6 +1225,19 @@ interfaces { } } } +snmp { + location "Domicilium Datacentre RS2 C9"; + contact "isg@dataprocessors.com.au"; + community sbr1t1s0k { + authorization read-only; + clients { + 10.44.37.25/32; + 10.16.15.14/32; + 10.44.37.39/32; + 10.16.15.19/32; + } + } +} forwarding-options { storm-control-profiles default { all; @@ -1246,22 +1259,12 @@ policy-options { } } } -snmp { - location "Domicilium Datacentre RS2 C9"; - contact "isg@dataprocessors.com.au"; - community sbr1t1s0k { - authorization read-only; - clients { - 10.44.37.25/32; - 10.16.15.14/32; - 10.44.37.39/32; - 10.16.15.19/32; - } - } -} routing-options { router-id 172.31.255.17; autonomous-system 4200000000; + static { + route 0.0.0.0/0 next-hop 10.44.255.254; + } forwarding-table { export PFE-ECMP; chained-composite-next-hop { @@ -1273,7 +1276,6 @@ routing-options { } protocols { bgp { - log-updown; group OVERLAY { type internal; local-address 172.31.255.17; @@ -1306,6 +1308,7 @@ protocols { peer-as 4200000002; } } + log-updown; } evpn { encapsulation vxlan; @@ -1324,138 +1327,12 @@ switch-options { } } vlans { - vl1 { - vlan-id 1; - description "default"; - vxlan { - vni 1; - } - } - vl10 { - vlan-id 10; - description "Hurricane networks WAN MPLS end point"; - vxlan { - vni 10; - } - } - vl11 { - vlan-id 11; - description "VLAN for 2nd Internet link via Domicilium Transit"; - vxlan { - vni 11; - } - } - vl28 { - vlan-id 28; - description "New vlan for the 4G link to old network"; - vxlan { - vni 28; - } - } vl44 { - vlan-id 44; description "Main Data Vlan"; + vlan-id 44; l3-interface irb.44; vxlan { vni 44; } } - vl47 { - vlan-id 47; - description "New DMZ vlan"; - vxlan { - vni 47; - } - } - vl48 { - vlan-id 48; - description "DMZ VLAN"; - vxlan { - vni 48; - } - } - vl54 { - vlan-id 54; - description "VLAN54"; - vxlan { - vni 54; - } - } - vl126 { - vlan-id 126; - description "Managed WAN services to Clarendon House"; - vxlan { - vni 126; - } - } - vl127 { - vlan-id 127; - description "Vlan for Second Fibre Link to Clarendon house"; - vxlan { - vni 127; - } - } - vl128 { - vlan-id 128; - description "Vlan for Clarendon house link"; - vxlan { - vni 128; - } - } - vl166 { - vlan-id 166; - description "LAN connection vlan for X1700 Cato sockets"; - vxlan { - vni 166; - } - } - vl193 { - vlan-id 193; - description "Cato connection for WAN 1 via Hurricane Networks"; - vxlan { - vni 193; - } - } - vl194 { - vlan-id 194; - description "Cato connection for WAN 2 via Domicilium Transit Internet"; - vxlan { - vni 194; - } - } - vl211 { - vlan-id 211; - description "PGI-NEW"; - vxlan { - vni 211; - } - } - vl2526 { - vlan-id 2526; - description "AWS Cross-Connect to London via London"; - vxlan { - vni 2526; - } - } - vl2527 { - vlan-id 2527; - description "OCI Cross-Connect to London via Manchester"; - vxlan { - vni 2527; - } - } - vl2528 { - vlan-id 2528; - description "OCI Fast connect via London"; - vxlan { - vni 2528; - } - } - vl2529 { - vlan-id 2529; - description "AWS Cross-Connect to Manchester"; - vxlan { - vni 2529; - } - } } diff --git a/iom-dc/LEAF-C9-SW2.cfg b/iom-dc/LEAF-C9-SW2.cfg index e7d7f49..13d25d0 100644 --- a/iom-dc/LEAF-C9-SW2.cfg +++ b/iom-dc/LEAF-C9-SW2.cfg @@ -14,25 +14,25 @@ system { encrypted-password "$6$rounds=656000$XVfZXO9yn5j3bKx/$fHSTXI.LRWtIRUHlMZ3VPduBVNu9WZh.sn3r3R6kgqnpEp16hQpKUKiO24869c8cxXHeQrlytI7/u95FhPYf30"; ## SECRET-DATA } } - user h0barton { + user d0micilium { uid 2002; class super-user; + authentication { + encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + } + } + user h0barton { + uid 2003; + class super-user; authentication { encrypted-password "$6$rounds=656000$j52X8PoXRueVJyfV$oRjcRKT49MfPSuZ5NCPy0fLwGLCcbTO5Hzzk.sIg0YWtCXqc/Cx09PFYVroF6C5BvvHPuIjDeM5wR499ifT8W0"; ## SECRET-DATA } } user hobadmin { - uid 2003; - class super-user; - authentication { - encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA - } - } - user d0micilium { uid 2004; class super-user; authentication { - encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA } } } @@ -72,32 +72,6 @@ chassis { } } interfaces { - et-0/0/48 { - } - et-0/0/49 { - } - et-0/0/50 { - } - et-0/0/51 { - } - et-0/0/52 { - description "Link to SPINE-C7-SW1 et-0/0/15"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.61/31; - } - } - } - et-0/0/53 { - description "Link to SPINE-C7-SW2 et-0/0/15"; - mtu 9216; - unit 0 { - family inet { - address 172.31.0.63/31; - } - } - } xe-0/0/0 { ether-options { 802.3ad ae0; @@ -434,6 +408,32 @@ interfaces { } } } + et-0/0/48 { + } + et-0/0/49 { + } + et-0/0/50 { + } + et-0/0/51 { + } + et-0/0/52 { + description "Link to SPINE-C7-SW1 et-0/0/15"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.61/31; + } + } + } + et-0/0/53 { + description "Link to SPINE-C7-SW2 et-0/0/15"; + mtu 9216; + unit 0 { + family inet { + address 172.31.0.63/31; + } + } + } ae0 { mtu 9216; esi { @@ -1225,6 +1225,19 @@ interfaces { } } } +snmp { + location "Domicilium Datacentre RS2 C9"; + contact "isg@dataprocessors.com.au"; + community sbr1t1s0k { + authorization read-only; + clients { + 10.44.37.25/32; + 10.16.15.14/32; + 10.44.37.39/32; + 10.16.15.19/32; + } + } +} forwarding-options { storm-control-profiles default { all; @@ -1246,22 +1259,12 @@ policy-options { } } } -snmp { - location "Domicilium Datacentre RS2 C9"; - contact "isg@dataprocessors.com.au"; - community sbr1t1s0k { - authorization read-only; - clients { - 10.44.37.25/32; - 10.16.15.14/32; - 10.44.37.39/32; - 10.16.15.19/32; - } - } -} routing-options { router-id 172.31.255.18; autonomous-system 4200000000; + static { + route 0.0.0.0/0 next-hop 10.44.255.254; + } forwarding-table { export PFE-ECMP; chained-composite-next-hop { @@ -1273,7 +1276,6 @@ routing-options { } protocols { bgp { - log-updown; group OVERLAY { type internal; local-address 172.31.255.18; @@ -1306,6 +1308,7 @@ protocols { peer-as 4200000002; } } + log-updown; } evpn { encapsulation vxlan; @@ -1324,138 +1327,12 @@ switch-options { } } vlans { - vl1 { - vlan-id 1; - description "default"; - vxlan { - vni 1; - } - } - vl10 { - vlan-id 10; - description "Hurricane networks WAN MPLS end point"; - vxlan { - vni 10; - } - } - vl11 { - vlan-id 11; - description "VLAN for 2nd Internet link via Domicilium Transit"; - vxlan { - vni 11; - } - } - vl28 { - vlan-id 28; - description "New vlan for the 4G link to old network"; - vxlan { - vni 28; - } - } vl44 { - vlan-id 44; description "Main Data Vlan"; + vlan-id 44; l3-interface irb.44; vxlan { vni 44; } } - vl47 { - vlan-id 47; - description "New DMZ vlan"; - vxlan { - vni 47; - } - } - vl48 { - vlan-id 48; - description "DMZ VLAN"; - vxlan { - vni 48; - } - } - vl54 { - vlan-id 54; - description "VLAN54"; - vxlan { - vni 54; - } - } - vl126 { - vlan-id 126; - description "Managed WAN services to Clarendon House"; - vxlan { - vni 126; - } - } - vl127 { - vlan-id 127; - description "Vlan for Second Fibre Link to Clarendon house"; - vxlan { - vni 127; - } - } - vl128 { - vlan-id 128; - description "Vlan for Clarendon house link"; - vxlan { - vni 128; - } - } - vl166 { - vlan-id 166; - description "LAN connection vlan for X1700 Cato sockets"; - vxlan { - vni 166; - } - } - vl193 { - vlan-id 193; - description "Cato connection for WAN 1 via Hurricane Networks"; - vxlan { - vni 193; - } - } - vl194 { - vlan-id 194; - description "Cato connection for WAN 2 via Domicilium Transit Internet"; - vxlan { - vni 194; - } - } - vl211 { - vlan-id 211; - description "PGI-NEW"; - vxlan { - vni 211; - } - } - vl2526 { - vlan-id 2526; - description "AWS Cross-Connect to London via London"; - vxlan { - vni 2526; - } - } - vl2527 { - vlan-id 2527; - description "OCI Cross-Connect to London via Manchester"; - vxlan { - vni 2527; - } - } - vl2528 { - vlan-id 2528; - description "OCI Fast connect via London"; - vxlan { - vni 2528; - } - } - vl2529 { - vlan-id 2529; - description "AWS Cross-Connect to Manchester"; - vxlan { - vni 2529; - } - } } diff --git a/iom-dc/SPINE-C7-SW1.cfg b/iom-dc/SPINE-C7-SW1.cfg index 747c1ac..bcf9c9b 100644 --- a/iom-dc/SPINE-C7-SW1.cfg +++ b/iom-dc/SPINE-C7-SW1.cfg @@ -14,25 +14,25 @@ system { encrypted-password "$6$rounds=656000$XVfZXO9yn5j3bKx/$fHSTXI.LRWtIRUHlMZ3VPduBVNu9WZh.sn3r3R6kgqnpEp16hQpKUKiO24869c8cxXHeQrlytI7/u95FhPYf30"; ## SECRET-DATA } } - user h0barton { + user d0micilium { uid 2002; class super-user; + authentication { + encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + } + } + user h0barton { + uid 2003; + class super-user; authentication { encrypted-password "$6$rounds=656000$j52X8PoXRueVJyfV$oRjcRKT49MfPSuZ5NCPy0fLwGLCcbTO5Hzzk.sIg0YWtCXqc/Cx09PFYVroF6C5BvvHPuIjDeM5wR499ifT8W0"; ## SECRET-DATA } } user hobadmin { - uid 2003; - class super-user; - authentication { - encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA - } - } - user d0micilium { uid 2004; class super-user; authentication { - encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA } } } @@ -326,6 +326,19 @@ interfaces { } } } +snmp { + location "Domicilium Datacentre RS2 C7"; + contact "isg@dataprocessors.com.au"; + community sbr1t1s0k { + authorization read-only; + clients { + 10.44.37.25/32; + 10.16.15.14/32; + 10.44.37.39/32; + 10.16.15.19/32; + } + } +} policy-options { policy-statement BGP_LOOPBACK0 { term TERM1 { @@ -342,22 +355,12 @@ policy-options { } } } -snmp { - location "Domicilium Datacentre RS2 C7"; - contact "isg@dataprocessors.com.au"; - community sbr1t1s0k { - authorization read-only; - clients { - 10.44.37.25/32; - 10.16.15.14/32; - 10.44.37.39/32; - 10.16.15.19/32; - } - } -} routing-options { router-id 172.31.255.1; autonomous-system 4200000000; + static { + route 0.0.0.0/0 next-hop 10.44.255.254; + } forwarding-table { export PFE-ECMP; chained-composite-next-hop { @@ -369,7 +372,6 @@ routing-options { } protocols { bgp { - log-updown; group OVERLAY { type internal; local-address 172.31.255.1; @@ -512,6 +514,7 @@ protocols { peer-as 4200000028; } } + log-updown; } lldp { interface all; diff --git a/iom-dc/SPINE-C7-SW2.cfg b/iom-dc/SPINE-C7-SW2.cfg index 613d55e..bb03c4f 100644 --- a/iom-dc/SPINE-C7-SW2.cfg +++ b/iom-dc/SPINE-C7-SW2.cfg @@ -14,25 +14,25 @@ system { encrypted-password "$6$rounds=656000$XVfZXO9yn5j3bKx/$fHSTXI.LRWtIRUHlMZ3VPduBVNu9WZh.sn3r3R6kgqnpEp16hQpKUKiO24869c8cxXHeQrlytI7/u95FhPYf30"; ## SECRET-DATA } } - user h0barton { + user d0micilium { uid 2002; class super-user; + authentication { + encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + } + } + user h0barton { + uid 2003; + class super-user; authentication { encrypted-password "$6$rounds=656000$j52X8PoXRueVJyfV$oRjcRKT49MfPSuZ5NCPy0fLwGLCcbTO5Hzzk.sIg0YWtCXqc/Cx09PFYVroF6C5BvvHPuIjDeM5wR499ifT8W0"; ## SECRET-DATA } } user hobadmin { - uid 2003; - class super-user; - authentication { - encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA - } - } - user d0micilium { uid 2004; class super-user; authentication { - encrypted-password "$6$iPvA1pyL$ZY3781EMZrhLO.fm3Msqm12NSb6Cm4AnNh4Jc73uAMqYeoRZOoEuO806Wjd3mOQCop0am8DiFahvPxR6mrDt5/"; ## SECRET-DATA + encrypted-password "$6$rounds=656000$Faes5cVxNkOha.dT$wS5mkeugsPVLgliXaJGPRY16uM1P4oaXSKshy28M5VwzWNSxbaQxBUqb23Ywvl1o79/BjBE5LD1KoW94Xe9g5."; ## SECRET-DATA } } } @@ -326,6 +326,19 @@ interfaces { } } } +snmp { + location "Domicilium Datacentre RS2 C7"; + contact "isg@dataprocessors.com.au"; + community sbr1t1s0k { + authorization read-only; + clients { + 10.44.37.25/32; + 10.16.15.14/32; + 10.44.37.39/32; + 10.16.15.19/32; + } + } +} policy-options { policy-statement BGP_LOOPBACK0 { term TERM1 { @@ -342,22 +355,12 @@ policy-options { } } } -snmp { - location "Domicilium Datacentre RS2 C7"; - contact "isg@dataprocessors.com.au"; - community sbr1t1s0k { - authorization read-only; - clients { - 10.44.37.25/32; - 10.16.15.14/32; - 10.44.37.39/32; - 10.16.15.19/32; - } - } -} routing-options { router-id 172.31.255.2; autonomous-system 4200000000; + static { + route 0.0.0.0/0 next-hop 10.44.255.254; + } forwarding-table { export PFE-ECMP; chained-composite-next-hop { @@ -369,7 +372,6 @@ routing-options { } protocols { bgp { - log-updown; group OVERLAY { type internal; local-address 172.31.255.2; @@ -512,6 +514,7 @@ protocols { peer-as 4200000028; } } + log-updown; } lldp { interface all;