From 10afc73abda29f4c2bcb25d4d83fc0f112c7c8f0 Mon Sep 17 00:00:00 2001 From: sinavir Date: Thu, 5 Feb 2026 09:44:25 +0100 Subject: [PATCH] revamp configs --- serve/all_config.txt | 13 +++----- serve/all_uplink_config.txt | 13 +++----- serve/all_uplink_no_room_config.txt | 5 --- serve/base_config.txt | 5 --- serve/no_room_config.txt | 5 --- serve/no_rstp.txt | 50 ----------------------------- 6 files changed, 8 insertions(+), 83 deletions(-) diff --git a/serve/all_config.txt b/serve/all_config.txt index c0d6494..0e683ec 100644 --- a/serve/all_config.txt +++ b/serve/all_config.txt @@ -536,12 +536,11 @@ interfaces { } ge-0/0/44 { description AP_IR4_1; - native-vlan-id 2000; unit 0 { family ethernet-switching { interface-mode trunk; vlan { - members [ admin-ap apro wifi-user ]; + members [ all ]; } storm-control default; } @@ -549,12 +548,11 @@ interfaces { } ge-0/0/45 { description AP_IR4_2; - native-vlan-id 2000; unit 0 { family ethernet-switching { interface-mode trunk; vlan { - members [ admin-ap apro wifi-user ]; + members [ all ]; } storm-control default; } @@ -562,12 +560,11 @@ interfaces { } ge-0/0/46 { description AP_IR4_3; - native-vlan-id 2000; unit 0 { family ethernet-switching { interface-mode trunk; vlan { - members [ admin-ap apro wifi-user ]; + members [ all ]; } storm-control default; } @@ -575,12 +572,11 @@ interfaces { } ge-0/0/47 { description AP_IR4_4; - native-vlan-id 2000; unit 0 { family ethernet-switching { interface-mode trunk; vlan { - members [ admin-ap apro wifi-user ]; + members [ all ]; } storm-control default; } @@ -627,7 +623,6 @@ interfaces { } xe-0/2/0 { description netcore03; - native-vlan-id 2000; unit 0 { family ethernet-switching { interface-mode trunk; diff --git a/serve/all_uplink_config.txt b/serve/all_uplink_config.txt index 9cc891e..fbb2da0 100644 --- a/serve/all_uplink_config.txt +++ b/serve/all_uplink_config.txt @@ -536,12 +536,11 @@ interfaces { } ge-0/0/44 { description AP_IR4_1; - native-vlan-id 2000; unit 0 { family ethernet-switching { interface-mode trunk; vlan { - members [ admin-ap apro wifi-user ]; + members [ all ]; } storm-control default; } @@ -549,12 +548,11 @@ interfaces { } ge-0/0/45 { description AP_IR4_2; - native-vlan-id 2000; unit 0 { family ethernet-switching { interface-mode trunk; vlan { - members [ admin-ap apro wifi-user ]; + members [ all ]; } storm-control default; } @@ -562,12 +560,11 @@ interfaces { } ge-0/0/46 { description AP_IR4_3; - native-vlan-id 2000; unit 0 { family ethernet-switching { interface-mode trunk; vlan { - members [ admin-ap apro wifi-user ]; + members [ all ]; } storm-control default; } @@ -575,12 +572,11 @@ interfaces { } ge-0/0/47 { description AP_IR4_4; - native-vlan-id 2000; unit 0 { family ethernet-switching { interface-mode trunk; vlan { - members [ admin-ap apro wifi-user ]; + members [ all ]; } storm-control default; } @@ -627,7 +623,6 @@ interfaces { } xe-0/2/0 { description netcore03; - native-vlan-id 2000; unit 0 { family ethernet-switching { interface-mode trunk; diff --git a/serve/all_uplink_no_room_config.txt b/serve/all_uplink_no_room_config.txt index 9452a35..27c8b16 100644 --- a/serve/all_uplink_no_room_config.txt +++ b/serve/all_uplink_no_room_config.txt @@ -194,7 +194,6 @@ interfaces { } ge-0/0/44 { description AP_IR4_1; - native-vlan-id 2000; unit 0 { family ethernet-switching { interface-mode trunk; @@ -207,7 +206,6 @@ interfaces { } ge-0/0/45 { description AP_IR4_2; - native-vlan-id 2000; unit 0 { family ethernet-switching { interface-mode trunk; @@ -220,7 +218,6 @@ interfaces { } ge-0/0/46 { description AP_IR4_3; - native-vlan-id 2000; unit 0 { family ethernet-switching { interface-mode trunk; @@ -233,7 +230,6 @@ interfaces { } ge-0/0/47 { description AP_IR4_4; - native-vlan-id 2000; unit 0 { family ethernet-switching { interface-mode trunk; @@ -285,7 +281,6 @@ interfaces { } xe-0/2/0 { description netcore03; - native-vlan-id 2000; unit 0 { family ethernet-switching { interface-mode trunk; diff --git a/serve/base_config.txt b/serve/base_config.txt index c0d6494..803a154 100644 --- a/serve/base_config.txt +++ b/serve/base_config.txt @@ -536,7 +536,6 @@ interfaces { } ge-0/0/44 { description AP_IR4_1; - native-vlan-id 2000; unit 0 { family ethernet-switching { interface-mode trunk; @@ -549,7 +548,6 @@ interfaces { } ge-0/0/45 { description AP_IR4_2; - native-vlan-id 2000; unit 0 { family ethernet-switching { interface-mode trunk; @@ -562,7 +560,6 @@ interfaces { } ge-0/0/46 { description AP_IR4_3; - native-vlan-id 2000; unit 0 { family ethernet-switching { interface-mode trunk; @@ -575,7 +572,6 @@ interfaces { } ge-0/0/47 { description AP_IR4_4; - native-vlan-id 2000; unit 0 { family ethernet-switching { interface-mode trunk; @@ -627,7 +623,6 @@ interfaces { } xe-0/2/0 { description netcore03; - native-vlan-id 2000; unit 0 { family ethernet-switching { interface-mode trunk; diff --git a/serve/no_room_config.txt b/serve/no_room_config.txt index d438767..bafa47d 100644 --- a/serve/no_room_config.txt +++ b/serve/no_room_config.txt @@ -194,7 +194,6 @@ interfaces { } ge-0/0/44 { description AP_IR4_1; - native-vlan-id 2000; unit 0 { family ethernet-switching { interface-mode trunk; @@ -207,7 +206,6 @@ interfaces { } ge-0/0/45 { description AP_IR4_2; - native-vlan-id 2000; unit 0 { family ethernet-switching { interface-mode trunk; @@ -220,7 +218,6 @@ interfaces { } ge-0/0/46 { description AP_IR4_3; - native-vlan-id 2000; unit 0 { family ethernet-switching { interface-mode trunk; @@ -233,7 +230,6 @@ interfaces { } ge-0/0/47 { description AP_IR4_4; - native-vlan-id 2000; unit 0 { family ethernet-switching { interface-mode trunk; @@ -285,7 +281,6 @@ interfaces { } xe-0/2/0 { description netcore03; - native-vlan-id 2000; unit 0 { family ethernet-switching { interface-mode trunk; diff --git a/serve/no_rstp.txt b/serve/no_rstp.txt index c0d6494..99c774d 100644 --- a/serve/no_rstp.txt +++ b/serve/no_rstp.txt @@ -536,7 +536,6 @@ interfaces { } ge-0/0/44 { description AP_IR4_1; - native-vlan-id 2000; unit 0 { family ethernet-switching { interface-mode trunk; @@ -549,7 +548,6 @@ interfaces { } ge-0/0/45 { description AP_IR4_2; - native-vlan-id 2000; unit 0 { family ethernet-switching { interface-mode trunk; @@ -562,7 +560,6 @@ interfaces { } ge-0/0/46 { description AP_IR4_3; - native-vlan-id 2000; unit 0 { family ethernet-switching { interface-mode trunk; @@ -575,7 +572,6 @@ interfaces { } ge-0/0/47 { description AP_IR4_4; - native-vlan-id 2000; unit 0 { family ethernet-switching { interface-mode trunk; @@ -627,7 +623,6 @@ interfaces { } xe-0/2/0 { description netcore03; - native-vlan-id 2000; unit 0 { family ethernet-switching { interface-mode trunk; @@ -701,51 +696,6 @@ protocols { igmp-snooping { vlan default; } - rstp { - interface ge-0/0/0; - interface ge-0/0/1; - interface ge-0/0/2; - interface ge-0/0/3; - interface ge-0/0/4; - interface ge-0/0/5; - interface ge-0/0/6; - interface ge-0/0/7; - interface ge-0/0/8; - interface ge-0/0/9; - interface ge-0/0/10; - interface ge-0/0/11; - interface ge-0/0/12; - interface ge-0/0/13; - interface ge-0/0/14; - interface ge-0/0/15; - interface ge-0/0/16; - interface ge-0/0/17; - interface ge-0/0/18; - interface ge-0/0/24; - interface ge-0/0/25; - interface ge-0/0/26; - interface ge-0/0/27; - interface ge-0/0/28; - interface ge-0/0/29; - interface ge-0/0/30; - interface ge-0/0/31; - interface ge-0/0/32; - interface ge-0/0/33; - interface ge-0/0/34; - interface ge-0/0/35; - interface ge-0/0/36; - interface ge-0/0/37; - interface ge-0/0/38; - interface ge-0/0/39; - interface ge-0/0/40; - interface ge-0/0/41; - interface ge-0/0/42; - interface ge-0/0/44; - interface ge-0/0/45; - interface ge-0/0/46; - interface ge-0/0/47; - interface xe-0/2/0; - } } poe { interface ge-0/0/0 {