diff --git a/load_config.sh b/load_config.sh new file mode 100755 index 0000000..4d892a9 --- /dev/null +++ b/load_config.sh @@ -0,0 +1,19 @@ +#!/usr/bin/env bash + +SSH_OPTS="-o StrictHostKeyChecking=no" + +scp $SSH_OPTS $1 root@192.168.42.6:/tmp/config.txt +ssh $SSH_OPTS root@192.168.42.6 'cli -c "edit; load override /tmp/config.txt; commit and-quit"' + +echo "collecting logs" + +dir="./logs/$(date +"%Y%m%d_%H%M%S")-load_config" + +mkdir -p "$dir" + +touch "$dir/load-config" + +cp "$1" "$dir/config.txt" +cp ./load_config.sh "$dir" + +echo "finished" diff --git a/serve/all_config.txt b/serve/all_config.txt index c0d6494..b339ce1 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; @@ -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 { diff --git a/serve/all_uplink_config.txt b/serve/all_uplink_config.txt index 9cc891e..d82eafd 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; @@ -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 { diff --git a/serve/all_uplink_no_room_config.txt b/serve/all_uplink_no_room_config.txt index 9452a35..1862dfc 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; @@ -359,51 +354,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 { diff --git a/serve/base_config.txt b/serve/base_config.txt index c0d6494..99c774d 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; @@ -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 { diff --git a/serve/no_room_config.txt b/serve/no_room_config.txt index d438767..3f1dde8 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; @@ -359,13 +354,6 @@ protocols { igmp-snooping { vlan default; } - rstp { - 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 { diff --git a/serve/no_rstp.txt b/serve/no_rstp.txt deleted file mode 100644 index c0d6494..0000000 --- a/serve/no_rstp.txt +++ /dev/null @@ -1,890 +0,0 @@ -system { - host-name Taccess00; - root-authentication { - encrypted-password "$2b$05$3h26h8rJ5yks1vJYXZG.fuHagYBwrVMlGR7iFmsV1FTJlMUj97fl2"; ## SECRET-DATA - ssh-rsa "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDcEkYM1r8QVNM/G5CxJInEdoBCWjEHHDdHlzDYNSUIdHHsn04QY+XI67AdMCm8w30GZnLUIj5RiJEWXREUApby0GrfxGGcy8otforygfgtmuUKAUEHdU2MMwrQI7RtTZ8oQ0USRGuqvmegxz3l5caVU7qGvBllJ4NUHXrkZSja2/51vq80RF4MKkDGiz7xUTixI2UcBwQBCA/kQedKV9G28EH+1XfvePqmMivZjl+7VyHsgUVj9eRGA1XWFw59UPZG8a7VkxO/Eb3K9NF297HUAcFMcbY6cPFi9AaBgu3VC4eetDnoN/+xT1owiHi7BReQhGAy/6cdf7C/my5ehZwD foo@bar"; ## SECRET-DATA - ssh-ed25519 "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFfIJ8BToZ9EDxBsEJXQhUju7gm+rUDjGCNMvFSZCl1o openpgp:0x5CADCA1B"; ## SECRET-DATA - ssh-ed25519 "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICdOxx4I8BSbYPdouvuzDepwTwzQzGSBCNIV8TB5dduT openpgp:0xF6018131"; ## SECRET-DATA - ssh-ed25519 "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIL+EZXYziiaynJX99EW8KesnmRTZMof3BoIs3mdEl8L3 foo@bar"; ## SECRET-DATA - ssh-ed25519 "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHL4M4HKjs4cjRAYRk9pmmI8U0R4+T/jQh6Fxp/i1Eoy foo@bar"; ## SECRET-DATA - ssh-ed25519 "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPM1jpXR7BWQa7Sed7ii3SbvIPRRlKb3G91qC0vOwfJn foo@bar"; ## SECRET-DATA - ssh-ed25519 "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE0xMwWedkKosax9+7D2OlnMxFL/eV4CvFZLsbLptpXr foo@bar"; ## SECRET-DATA - ssh-ed25519 "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKiXXYkhRh+s7ixZ8rvG8ntIqd6FELQ9hh7HoaHQJRPU foo@bar"; ## SECRET-DATA - ssh-ed25519 "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEpwF+XD3HgX64kqD42pcEZRNYAWoO4YNiOm5KO4tH6o maurice@polaris"; ## SECRET-DATA - ssh-ed25519 "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFdDnSl3cyWil+S5JiyGqOvBR3wVh+lduw58S5WvraoL maurice@fekda"; ## SECRET-DATA - ssh-ed25519 "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIGmU7yEOCGuGNt4PlQbzd0Cms1RePpo8yEA7Ij/+TdA foo@bar"; ## SECRET-DATA - ssh-ed25519 "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDz9zePZXeH96RotT+xl4ux2kOh3qIp94txtcMjsf3vx foo@bar"; ## SECRET-DATA - ssh-ed25519 "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIBicEt7xV6tjMURJO/dXbxF0VGE3RtxuFaE7ba+1qSN root@elnath"; ## SECRET-DATA - } - services { - netconf { - ssh { - port 830; - } - rfc-compliant; - yang-compliant; - } - ssh { - root-login deny-password; - allow-tcp-forwarding; - sftp-server; - } - } - auto-snapshot; - syslog { - file interactive-commands { - interactive-commands any; - } - file messages { - any notice; - authorization info; - } - } - processes { - dhcp-service { - traceoptions { - file dhcp_logfile size 10m; - level all; - flag packet; - } - } - } - phone-home { - server https://redirect.juniper.net; - rfc-compliant; - } -} -chassis { - redundancy { - graceful-switchover; - } -} -interfaces { - ge-0/0/0 { - description IR203; - unit 0 { - family ethernet-switching { - interface-mode access; - vlan { - members 2566; - } - storm-control default; - } - } - } - ge-0/0/1 { - description IR205; - unit 0 { - family ethernet-switching { - interface-mode access; - vlan { - members 2567; - } - storm-control default; - } - } - } - ge-0/0/2 { - description IR207; - unit 0 { - family ethernet-switching { - interface-mode access; - vlan { - members 2568; - } - storm-control default; - } - } - } - ge-0/0/3 { - description IR209; - unit 0 { - family ethernet-switching { - interface-mode access; - vlan { - members 2569; - } - storm-control default; - } - } - } - ge-0/0/4 { - description IR211; - unit 0 { - family ethernet-switching { - interface-mode access; - vlan { - members 2570; - } - storm-control default; - } - } - } - ge-0/0/5 { - description IR213; - unit 0 { - family ethernet-switching { - interface-mode access; - vlan { - members 2571; - } - storm-control default; - } - } - } - ge-0/0/6 { - description IR215; - unit 0 { - family ethernet-switching { - interface-mode access; - vlan { - members 2572; - } - storm-control default; - } - } - } - ge-0/0/7 { - description IR217; - unit 0 { - family ethernet-switching { - interface-mode access; - vlan { - members 2573; - } - storm-control default; - } - } - } - ge-0/0/8 { - description IR219; - unit 0 { - family ethernet-switching { - interface-mode access; - vlan { - members 2574; - } - storm-control default; - } - } - } - ge-0/0/9 { - description IR221; - unit 0 { - family ethernet-switching { - interface-mode access; - vlan { - members 2575; - } - storm-control default; - } - } - } - ge-0/0/10 { - description IR223; - unit 0 { - family ethernet-switching { - interface-mode access; - vlan { - members 2576; - } - storm-control default; - } - } - } - ge-0/0/11 { - description IR225; - unit 0 { - family ethernet-switching { - interface-mode access; - vlan { - members 2577; - } - storm-control default; - } - } - } - ge-0/0/12 { - description IR227; - unit 0 { - family ethernet-switching { - interface-mode access; - vlan { - members 2578; - } - storm-control default; - } - } - } - ge-0/0/13 { - description IR229; - unit 0 { - family ethernet-switching { - interface-mode access; - vlan { - members 2579; - } - storm-control default; - } - } - } - ge-0/0/14 { - description IR231; - unit 0 { - family ethernet-switching { - interface-mode access; - vlan { - members 2580; - } - storm-control default; - } - } - } - ge-0/0/15 { - description IR233; - unit 0 { - family ethernet-switching { - interface-mode access; - vlan { - members 2581; - } - storm-control default; - } - } - } - ge-0/0/16 { - description IR235; - unit 0 { - family ethernet-switching { - interface-mode access; - vlan { - members 2582; - } - storm-control default; - } - } - } - ge-0/0/17 { - description IR237; - unit 0 { - family ethernet-switching { - interface-mode access; - vlan { - members 2583; - } - storm-control default; - } - } - } - ge-0/0/18 { - description IR239; - unit 0 { - family ethernet-switching { - interface-mode access; - vlan { - members 2584; - } - storm-control default; - } - } - } - ge-0/0/19 { - disable; - } - ge-0/0/20 { - disable; - } - ge-0/0/21 { - disable; - } - ge-0/0/22 { - disable; - } - ge-0/0/23 { - disable; - } - ge-0/0/24 { - description IR301; - unit 0 { - family ethernet-switching { - interface-mode access; - vlan { - members 2585; - } - storm-control default; - } - } - } - ge-0/0/25 { - description IR303; - unit 0 { - family ethernet-switching { - interface-mode access; - vlan { - members 2586; - } - storm-control default; - } - } - } - ge-0/0/26 { - description IR305; - unit 0 { - family ethernet-switching { - interface-mode access; - vlan { - members 2587; - } - storm-control default; - } - } - } - ge-0/0/27 { - description IR307; - unit 0 { - family ethernet-switching { - interface-mode access; - vlan { - members 2588; - } - storm-control default; - } - } - } - ge-0/0/28 { - description IR309; - unit 0 { - family ethernet-switching { - interface-mode access; - vlan { - members 2589; - } - storm-control default; - } - } - } - ge-0/0/29 { - description IR311; - unit 0 { - family ethernet-switching { - interface-mode access; - vlan { - members 2590; - } - storm-control default; - } - } - } - ge-0/0/30 { - description IR313; - unit 0 { - family ethernet-switching { - interface-mode access; - vlan { - members 2591; - } - storm-control default; - } - } - } - ge-0/0/31 { - description IR315; - unit 0 { - family ethernet-switching { - interface-mode access; - vlan { - members 2592; - } - storm-control default; - } - } - } - ge-0/0/32 { - description IR317; - unit 0 { - family ethernet-switching { - interface-mode access; - vlan { - members 2593; - } - storm-control default; - } - } - } - ge-0/0/33 { - description IR319; - unit 0 { - family ethernet-switching { - interface-mode access; - vlan { - members 2594; - } - storm-control default; - } - } - } - ge-0/0/34 { - description IR323; - unit 0 { - family ethernet-switching { - interface-mode access; - vlan { - members 2595; - } - storm-control default; - } - } - } - ge-0/0/35 { - description IR325; - unit 0 { - family ethernet-switching { - interface-mode access; - vlan { - members 2596; - } - storm-control default; - } - } - } - ge-0/0/36 { - description IR327; - unit 0 { - family ethernet-switching { - interface-mode access; - vlan { - members 2597; - } - storm-control default; - } - } - } - ge-0/0/37 { - description IR329; - unit 0 { - family ethernet-switching { - interface-mode access; - vlan { - members 2598; - } - storm-control default; - } - } - } - ge-0/0/38 { - description IR331; - unit 0 { - family ethernet-switching { - interface-mode access; - vlan { - members 2599; - } - storm-control default; - } - } - } - ge-0/0/39 { - description IR333; - unit 0 { - family ethernet-switching { - interface-mode access; - vlan { - members 2600; - } - storm-control default; - } - } - } - ge-0/0/40 { - description IR335; - unit 0 { - family ethernet-switching { - interface-mode access; - vlan { - members 2601; - } - storm-control default; - } - } - } - ge-0/0/41 { - description IR337; - unit 0 { - family ethernet-switching { - interface-mode access; - vlan { - members 2602; - } - storm-control default; - } - } - } - ge-0/0/42 { - description IR339; - unit 0 { - family ethernet-switching { - interface-mode access; - vlan { - members 2603; - } - storm-control default; - } - } - } - ge-0/0/43 { - disable; - } - 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 ]; - } - storm-control default; - } - } - } - 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 ]; - } - storm-control default; - } - } - } - 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 ]; - } - storm-control default; - } - } - } - 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 ]; - } - storm-control default; - } - } - } - et-0/1/0 { - disable; - } - ge-0/1/0 { - disable; - } - xe-0/1/0 { - disable; - } - et-0/1/1 { - disable; - } - ge-0/1/1 { - disable; - } - xe-0/1/1 { - disable; - } - et-0/1/2 { - disable; - } - ge-0/1/2 { - disable; - } - xe-0/1/2 { - disable; - } - et-0/1/3 { - disable; - } - ge-0/1/3 { - disable; - } - xe-0/1/3 { - disable; - } - ge-0/2/0 { - disable; - } - xe-0/2/0 { - description netcore03; - native-vlan-id 2000; - unit 0 { - family ethernet-switching { - interface-mode trunk; - vlan { - members [ IR2-rooms IR3-rooms admin admin-ap apro wifi-user ]; - } - storm-control default; - } - } - } - ge-0/2/1 { - disable; - } - xe-0/2/1 { - disable; - } - ge-0/2/2 { - disable; - } - xe-0/2/2 { - disable; - } - ge-0/2/3 { - disable; - } - xe-0/2/3 { - disable; - } - irb { - unit 0 { - description Admin; - family inet { - address 10.0.255.158/24; - } - } - } - me0 { - unit 0 { - family inet { - address 192.168.42.6/24; - } - } - } -} -snmp { - filter-interfaces; - community public { - authorization read-only; - } -} -forwarding-options { - storm-control-profiles default { - all; - } -} -protocols { - router-advertisement { - interface vme.0 { - managed-configuration; - } - interface irb.0 { - managed-configuration; - } - } - lldp { - interface all; - } - lldp-med { - interface all; - } - 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 { - disable; - } - interface ge-0/0/1 { - disable; - } - interface ge-0/0/10 { - disable; - } - interface ge-0/0/11 { - disable; - } - interface ge-0/0/12 { - disable; - } - interface ge-0/0/13 { - disable; - } - interface ge-0/0/14 { - disable; - } - interface ge-0/0/15 { - disable; - } - interface ge-0/0/16 { - disable; - } - interface ge-0/0/17 { - disable; - } - interface ge-0/0/18 { - disable; - } - interface ge-0/0/2 { - disable; - } - interface ge-0/0/24 { - disable; - } - interface ge-0/0/25 { - disable; - } - interface ge-0/0/26 { - disable; - } - interface ge-0/0/27 { - disable; - } - interface ge-0/0/28 { - disable; - } - interface ge-0/0/29 { - disable; - } - interface ge-0/0/3 { - disable; - } - interface ge-0/0/30 { - disable; - } - interface ge-0/0/31 { - disable; - } - interface ge-0/0/32 { - disable; - } - interface ge-0/0/33 { - disable; - } - interface ge-0/0/34 { - disable; - } - interface ge-0/0/35 { - disable; - } - interface ge-0/0/36 { - disable; - } - interface ge-0/0/37 { - disable; - } - interface ge-0/0/38 { - disable; - } - interface ge-0/0/39 { - disable; - } - interface ge-0/0/4 { - disable; - } - interface ge-0/0/40 { - disable; - } - interface ge-0/0/41 { - disable; - } - interface ge-0/0/42 { - disable; - } - interface ge-0/0/44; - interface ge-0/0/45; - interface ge-0/0/46; - interface ge-0/0/47; - interface ge-0/0/5 { - disable; - } - interface ge-0/0/6 { - disable; - } - interface ge-0/0/7 { - disable; - } - interface ge-0/0/8 { - disable; - } - interface ge-0/0/9 { - disable; - } -} -vlans { - IR2-rooms { - vlan-id-list 2566-2584; - } - IR3-rooms { - vlan-id-list 2585-2603; - } - admin { - vlan-id 3000; - l3-interface irb.0; - } - admin-ap { - vlan-id 3001; - } - apro { - vlan-id 2000; - } - wifi-user { - vlan-id-list 3245-4094; - } -} diff --git a/script.py b/test_all_vlans.py similarity index 87% rename from script.py rename to test_all_vlans.py index eda71e9..e842e3f 100644 --- a/script.py +++ b/test_all_vlans.py @@ -4,7 +4,10 @@ from scapy.all import ICMP, IP, Dot1Q, Ether, sendp, AsyncSniffer, wrpcap from tqdm import tqdm a = AsyncSniffer(iface="enp5s0d1", filter="icmp") +b = AsyncSniffer(iface="enp2s0", filter="icmp") a.start() +b.start() + for i in tqdm(range(0, 4095)): sendp( Ether(dst="00:02:c9:27:10:73", src="00:f0:cb:ef:e0:3b") @@ -16,7 +19,9 @@ for i in tqdm(range(0, 4095)): ) print("Wrapping up and waiting for last packets") sleep(1) + plist = a.stop() +plist_ingress = b.stop() seen = [False for i in range(4095)] icmpid = [False for i in range(4095)] @@ -56,8 +61,9 @@ import subprocess from datetime import datetime from pathlib import Path import shutil +import sys -timestamp = datetime.now().strftime("%Y%m%d_%H%M%S") + "-test" +timestamp = datetime.now().strftime("%Y%m%d_%H%M%S") + "-test_all_vlans" log_dir = Path("./logs") / timestamp log_dir.mkdir(parents=True, exist_ok=True) @@ -67,13 +73,16 @@ with open(log_dir / "seen_vlans.txt", "w") as f: with open(log_dir / "seen_icmp_ids.txt", "w") as f: f.write(pprint(icmpid)) -shutil.copy(Path("./script.py"), log_dir / "script.py") +shutil.copy(Path(sys.argv[0]), log_dir / sys.argv[0]) print(" - [x] script.py") with open(log_dir / "egress.pcap", "wb") as file: wrpcap(file, plist) +with open(log_dir / "ingress.pcap", "wb") as file: + wrpcap(file, plist_ingress) + print(" - [x] pcap") cmd_config = ["ssh", "-o", "StrictHostKeyChecking=no", "root@192.168.42.6", "cli show config"]