Merge from main branch.

diff --git a/clients/ciscong.pl b/clients/ciscong.pl
index 277dfcf13dc7ebc712983633ac614ddb259705d0..1a9c6182ab73bf52366472d4ca866ca25a42d4a6 100644 (file)
--- a/clients/ciscong.pl
+++ b/clients/ciscong.pl
@@ -12,10 +12,10 @@ use Net::Ping;
 
 use Data::Dumper;
 
-my $patchlist = "/root/patchlist.txt";
-my $switches = "/root/switches.txt";
-#my $patchlist = "/home/eirikn/patchlist.txt.eirik";
-#my $switches = "/home/eirikn/switches.txt.eirik";
+#my $patchlist = "/root/patchlist.txt";
+#my $switches = "/root/switches.txt";
+my $patchlist = "/home/eirikn/patchlist.txt.eirik";
+my $switches = "/home/eirikn/switches.txt.eirik";
 
 BEGIN {
        require "../include/config.pm";
@@ -62,7 +62,7 @@ sub stop_vlan {
 
 
 sub do_distro {
-       my ($dip, $newip, $vlan) = @_;
+       my ($dip, $newip, $vlan, $switchname) = @_;
 
        my $ios = Net::Telnet::Cisco->new(Host => $dip,
                        Errmode => 'return',
@@ -110,7 +110,7 @@ sub do_distro {
        print "Zyxel is alive..\n";
        $p->close();
 
-       system("perl ./zyxelng.pl 192.168.1.1 $newip");
+       system("perl ./zyxelng.pl 192.168.1.1 $newip $switchname");
 
 ####
 
@@ -129,7 +129,6 @@ open(SWITCHES, $switches) or die "Unable to open switches";
 while(<SWITCHES>) {
        my ($ip, $net, $name) = split;
 
-       print $name."\n";
        if ($name =~ /e\d+-\d/) {
                die "We only support /26 nets for now you wanted $net" if ($net ne "26");
                $switchips{$name} = $ip;
@@ -154,7 +153,7 @@ sub first_run {
                print "Ip: $ip\n";
                my $dip = $distro.".net.tg07.gathering.org";
 
-               do_distro($dip, $ip, $vlan);
+               do_distro($dip, $ip, $vlan, $switch);
 #      my ($dip, $newip, $vlan) = @_;
        }
        close(PATCHLIST);

diff --git a/clients/zyxelng.pl b/clients/zyxelng.pl
index e41f6578dba08d016ae93be1d764ce39cb6f7795..3d029967e80903ec2b6d41c73e1bb019c356eb24 100644 (file)
--- a/clients/zyxelng.pl
+++ b/clients/zyxelng.pl
@@ -16,14 +16,13 @@ use nms qw(switch_connect switch_exec);
 
 #nms::ios_close($t);
 
-my $oldip;
-my $newip;
 if ($#ARGV < 1) {
-       die "Foo $#ARGV";
+       die "Not enough arguments to zyxelng.pl $#ARGV";
 }
 
-$oldip = $ARGV[0];
-$newip = $ARGV[1];
+my $oldip = $ARGV[0];
+my $newip = $ARGV[1];
+#$switchname = $ARGV[2];
 
 my $one = 0;
 
@@ -38,39 +37,9 @@ my $switch = switch_connect($switchip)
 my $cmds1 = <<EOF
 sys hostname es-3024
 ip igmpsnoop enable
-
-sys sw vlan type 802.1q
-sys sw vlan1q svlan setentry MNGT 248 25 fixed tag
-sys sw vlan1q svlan active 248
-sys sw vlan1q svlan setentry e01-1sw 1 25 fixed untag
-
-sys sw vlan1q svlan setentry MNGT 248 1 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 2 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 3 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 4 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 5 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 6 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 7 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 8 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 9 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 10 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 11 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 12 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 13 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 14 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 15 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 16 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 17 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 18 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 19 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 20 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 21 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 22 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 23 forbidden tag
-sys sw vlan1q svlan setentry MNGT 248 24 forbidden tag
 EOF
 ;
-#
+
 foreach (split(/\n+/, $cmds1)) {
        print "Sending: '$_'\n";
        switch_exec($_, $switch);

diff --git a/include/config.pm b/include/config.pm
index e79f68847859eb1a68505a49b765aae8046c5acc..cd6e3e41e057ad527d285825af2a6bb3c33c812f 100644 (file)
--- a/include/config.pm
+++ b/include/config.pm
@@ -14,4 +14,7 @@ our $db_password = "nms";
 our $zyxel_password = "removed";
 our $telnet_timeout = 15;
 
+our $ios_user = "foo";
+our $ios_pass = "bar";  
+
 1;