bin/ovh-api

diff --git a/bin/ovh-api b/bin/ovh-api
index 29d9bb979411e9d9aa624a09afc87f5a4d21ca02..b20432eff41d82dba1f7c8aca442e2b0dad75ee3 100755 (executable)
--- a/bin/ovh-api
+++ b/bin/ovh-api
@@ -21,6 +21,12 @@ my %ALIASES = (
   '/dns' => '/domain/zone',
 );
 
+my %EXIT_ROUTED = (
+  'master' => 0,
+  'none'   => 1,
+  'slave'  => 2,
+);
+
 #################################################################################
 #
 # ARGS
@@ -63,29 +69,16 @@ if ($Opt{'ip-routed'}) {
 }
 
 if ($Opt{'ip-is-routed'}) {
-  my %ex = (
-    'master' => 0,
-    'none'   => 1,
-    'slave'  => 2,
-  );
   my $localhost = hostname();
-  #my @routed = grep { $_->[1] ne 'down' } ip_routed($Opt{'ip-is-routed'});
-# NB 10.07.17   my @routed = grep { $_->[0] eq $localhost } ip_routed($Opt{'ip-is-routed'});
   my @routed = ip_routed($Opt{'ip-is-routed'});
 
-  #print $routed[0][0]."\n" and exit 0 if @routed==1 and $routed[0][0] eq $localhost;
-# NB 10.07.17   if (@routed==1) {
-# NB 10.07.17     print $routed[0][0]."\n";
-# NB 10.07.17     exit ( $routed[0][0] eq $localhost ? 0 : 2 );
-# NB 10.07.17   }
-
-  print $_[0]."\n" and exit $ex{master} if @_ = grep {$_ eq $localhost} map {$_->[0]} grep {$_->[1] eq 'master'} @routed;
+  print $_[0]."\n" and exit $EXIT_ROUTED{master} if @_ = grep {$_ eq $localhost} map {$_->[0]} grep {$_->[1] eq 'master'} @routed;
 
-  print $_[0]."\n" and exit $ex{slave} if @_ = grep {$_ eq $localhost} map {$_->[0]} grep {$_->[1] eq 'slave'} @routed;
+  print $_[0]."\n" and exit $EXIT_ROUTED{slave} if @_ = grep {$_ eq $localhost} map {$_->[0]} grep {$_->[1] eq 'slave'} @routed;
 
-  print $_[0]."\n" and exit $ex{slave} if @_ = grep {$_ eq $localhost} map {$_->[0]} grep {$_->[1] eq 'down'} @routed;
+  print $_[0]."\n" and exit $EXIT_ROUTED{slave} if @_ = grep {$_ eq $localhost} map {$_->[0]} grep {$_->[1] eq 'down'} @routed;
 
-  exit $ex{none};
+  exit $EXIT_ROUTED{none};
 }
 
 # Query
@@ -567,7 +560,7 @@ $NAME - Script to query ovh's api
 
  option[ip-move=s]   Move IP to local
  option[ip-routed=s] Print where is routed an ip
- option[ip-is-routed=s] Exit 0 if ip is routed to this host
+ option[ip-is-routed=s] Exit 0 if ip is routed to this host, 2 if slave
  option[sql]         Produce sql to update a database
 
  option[verbose|v+] Verbose mode: increase the verbosity level.