MT#63479 Remove deprecated CLI options

These were for backwards compatibility to provide a smooth upgrade path,
which happened long time ago. Time to remove.

Change-Id: I07052ff0394f3ab33bb7141a5e387004739a5e27
master
Guillem Jover 1 week ago
parent d33c3a27a3
commit a456eb20c5

@ -15,14 +15,6 @@ my $opts = {
verbose => 0, verbose => 0,
}; };
# XXX: Remove after mr10.5.
sub old_option {
my ($name, $value) = @_;
my $newname = $name =~ tr/_/-/r;
$opts->{$name} = $value;
warn "$0: option --$name is deprecated; use --$newname instead\n";
}
sub parse_option { sub parse_option {
my ($name, $value) = @_; my ($name, $value) = @_;
$name =~ tr/-/_/; $name =~ tr/-/_/;
@ -35,25 +27,15 @@ GetOptions($opts,
'login=s', 'login=s',
'password=s', 'password=s',
'email=s', 'email=s',
'reseller_id=i' => \&old_option,
'reseller-id=i' => \&parse_option, 'reseller-id=i' => \&parse_option,
'is_system=i' => \&old_option,
'is-system=i' => \&parse_option, 'is-system=i' => \&parse_option,
'is_master=i' => \&old_option,
'is-master=i' => \&parse_option, 'is-master=i' => \&parse_option,
'is_superuser=i' => \&old_option,
'is-superuser=i' => \&parse_option, 'is-superuser=i' => \&parse_option,
'is_ccare=i' => \&old_option,
'is-ccare=i' => \&parse_option, 'is-ccare=i' => \&parse_option,
'read_only=i' => \&old_option,
'read-only=i' => \&parse_option, 'read-only=i' => \&parse_option,
'show_paswords=i' => \&old_option,
'show-paswords=i' => \&parse_option, 'show-paswords=i' => \&parse_option,
'call_data=i' => \&old_option,
'call-data=i' => \&parse_option, 'call-data=i' => \&parse_option,
'billing_data=i' => \&old_option,
'billing-data=i' => \&parse_option, 'billing-data=i' => \&parse_option,
'lawful_intercept=i' => \&old_option,
'lawful-intercept=i' => \&parse_option, 'lawful-intercept=i' => \&parse_option,
'verbose', 'verbose',
) or usage(); ) or usage();

@ -17,14 +17,6 @@ my $opts = {
verbose => 0, verbose => 0,
}; };
# XXX: Remove after mr10.5.
sub old_option {
my ($name, $value) = @_;
my $newname = $name =~ tr/_/-/r;
$opts->{$name} = $value;
warn "$0: option --$name is deprecated; use --$newname instead\n";
}
sub parse_option { sub parse_option {
my ($name, $value) = @_; my ($name, $value) = @_;
$name =~ tr/-/_/; $name =~ tr/-/_/;
@ -33,9 +25,7 @@ sub parse_option {
GetOptions($opts, GetOptions($opts,
'help|h' => sub { usage() }, 'help|h' => sub { usage() },
'billing_profile_id=i' => \&old_option,
'billing-profile-id=i' => \&parse_option, 'billing-profile-id=i' => \&parse_option,
'contact_id=i' => \&old_option,
'contact-id=i' => \&parse_option, 'contact-id=i' => \&parse_option,
'type=s', 'type=s',
'verbose', 'verbose',

@ -18,14 +18,6 @@ my $opts = {
verbose => 0, verbose => 0,
}; };
# XXX: Remove after mr10.5.
sub old_option {
my ($name, $value) = @_;
my $newname = $name =~ tr/_/-/r;
$opts->{$name} = $value;
warn "$0: option --$name is deprecated; use --$newname instead\n";
}
sub parse_option { sub parse_option {
my ($name, $value) = @_; my ($name, $value) = @_;
$name =~ tr/-/_/; $name =~ tr/-/_/;
@ -35,11 +27,8 @@ sub parse_option {
GetOptions($opts, GetOptions($opts,
'help|h' => sub { usage() }, 'help|h' => sub { usage() },
'domain=s', 'domain=s',
'reseller_id=i' => \&old_option,
'reseller-id=i' => \&parse_option, 'reseller-id=i' => \&parse_option,
'skip_xmpp' => \&old_option,
'skip-xmpp' => \&parse_option, 'skip-xmpp' => \&parse_option,
'skip_sip' => \&old_option,
'skip-sip' => \&parse_option, 'skip-sip' => \&parse_option,
'verbose', 'verbose',
) or usage(); ) or usage();

@ -17,14 +17,6 @@ my $opts = {
pbx_pilot => 0, pbx_pilot => 0,
}; };
# XXX: Remove after mr10.5.
sub old_option {
my ($name, $value) = @_;
my $newname = $name =~ tr/_/-/r;
$opts->{$name} = $value;
warn "$0: option --$name is deprecated; use --$newname instead\n";
}
sub parse_option { sub parse_option {
my ($name, $value) = @_; my ($name, $value) = @_;
$name =~ tr/-/_/; $name =~ tr/-/_/;
@ -33,7 +25,6 @@ sub parse_option {
GetOptions($opts, GetOptions($opts,
'help|h' => sub { usage() }, 'help|h' => sub { usage() },
'customer_id=i' => \&old_option,
'customer-id=i' => \&parse_option, 'customer-id=i' => \&parse_option,
'username|u=s', 'username|u=s',
'password|p=s', 'password|p=s',
@ -43,12 +34,9 @@ GetOptions($opts,
'ac|a=s', 'ac|a=s',
'sn|n=s', 'sn|n=s',
'aliases=s@', 'aliases=s@',
'display_name=s' => \&old_option,
'display-name=s' => \&parse_option, 'display-name=s' => \&parse_option,
'webpassword|w=s', 'webpassword|w=s',
'pbx_pilot' => \&old_option,
'pbx-pilot' => \&parse_option, 'pbx-pilot' => \&parse_option,
'pbx_extension=s' => \&old_option,
'pbx-extension=s' => \&parse_option, 'pbx-extension=s' => \&parse_option,
'verbose', 'verbose',
) or usage(); ) or usage();

@ -18,14 +18,6 @@ my $opts = {
verbose => 0, verbose => 0,
}; };
# XXX: Remove after mr10.5.
sub old_option {
my ($name, $value) = @_;
my $newname = $name =~ tr/_/-/r;
$opts->{$name} = $value;
warn "$0: option --$name is deprecated; use --$newname instead\n";
}
sub parse_option { sub parse_option {
my ($name, $value) = @_; my ($name, $value) = @_;
$name =~ tr/-/_/; $name =~ tr/-/_/;
@ -35,9 +27,7 @@ sub parse_option {
GetOptions($opts, GetOptions($opts,
'help|h' => sub { usage() }, 'help|h' => sub { usage() },
'domain=s', 'domain=s',
'skip_xmpp' => \&old_option,
'skip-xmpp' => \&parse_option, 'skip-xmpp' => \&parse_option,
'skip_sip' => \&old_option,
'skip-sip' => \&parse_option, 'skip-sip' => \&parse_option,
'verbose', 'verbose',
) or usage(); ) or usage();

@ -15,14 +15,6 @@ my $opts = {
verbose => 0, verbose => 0,
}; };
# XXX: Remove after mr10.5.
sub old_option {
my ($name, $value) = @_;
my $newname = $name =~ tr/_/-/r;
$opts->{$name} = $value;
warn "$0: option --$name is deprecated; use --$newname instead\n";
}
sub parse_option { sub parse_option {
my ($name, $value) = @_; my ($name, $value) = @_;
$name =~ tr/-/_/; $name =~ tr/-/_/;
@ -31,7 +23,6 @@ sub parse_option {
GetOptions($opts, GetOptions($opts,
'help|h' => sub { usage() }, 'help|h' => sub { usage() },
'customer_id=i' => \&old_option,
'customer-id=i' => \&parse_option, 'customer-id=i' => \&parse_option,
'verbose', 'verbose',
) or usage(); ) or usage();

@ -15,14 +15,6 @@ my $opts = {
verbose => 0, verbose => 0,
}; };
# XXX: Remove after mr10.5.
sub old_option {
my ($name, $value) = @_;
my $newname = $name =~ tr/_/-/r;
$opts->{$name} = $value;
warn "$0: option --$name is deprecated; use --$newname instead\n";
}
sub parse_option { sub parse_option {
my ($name, $value) = @_; my ($name, $value) = @_;
$name =~ tr/-/_/; $name =~ tr/-/_/;
@ -31,7 +23,6 @@ sub parse_option {
GetOptions($opts, GetOptions($opts,
'help|h' => sub { usage() }, 'help|h' => sub { usage() },
'customer_id=i' => \&old_option,
'customer-id=i' => \&parse_option, 'customer-id=i' => \&parse_option,
'verbose', 'verbose',
) or usage(); ) or usage();

Loading…
Cancel
Save