From d3bb350668d6819ca831e6ca7f7c511761a2c24c Mon Sep 17 00:00:00 2001 From: Digimer Date: Sat, 1 Feb 2020 19:05:39 -0500 Subject: [PATCH] * Filtered out 'delay' and 'plug' options from Striker->get_fence_data()'s options parsing. * Cleaned up striker's display of fence agent data. Signed-off-by: Digimer --- Anvil/Tools/Get.pm | 1 + Anvil/Tools/Striker.pm | 3 ++- cgi-bin/striker | 10 +++++++--- html/skins/alteeve/anvil.html | 8 ++++---- html/skins/alteeve/main.css | 6 +++--- notes | 10 ++++++++++ 6 files changed, 27 insertions(+), 11 deletions(-) diff --git a/Anvil/Tools/Get.pm b/Anvil/Tools/Get.pm index 9d731755..e86f82a5 100644 --- a/Anvil/Tools/Get.pm +++ b/Anvil/Tools/Get.pm @@ -771,6 +771,7 @@ sub switches } } } + # Clean up the initial space added to 'raw'. if ($anvil->data->{switches}{raw}) { diff --git a/Anvil/Tools/Striker.pm b/Anvil/Tools/Striker.pm index c5e6531b..21da324f 100644 --- a/Anvil/Tools/Striker.pm +++ b/Anvil/Tools/Striker.pm @@ -156,10 +156,11 @@ sub get_fence_data { # We ignore some parameters that are not useful parameters in our case. my $name = $hash_ref->{name}; + next if $name eq "delay"; next if $name eq "help"; next if $name eq "version"; - next if $name eq "delay"; next if $name eq "separator"; + next if $name eq "plug"; next if $name =~ /snmp(.*?)_path/; my $unique = exists $hash_ref->{unique} ? $hash_ref->{unique} : 0; diff --git a/cgi-bin/striker b/cgi-bin/striker index 4909aa5b..dd6ecedb 100755 --- a/cgi-bin/striker +++ b/cgi-bin/striker @@ -1592,6 +1592,7 @@ sub process_fences }}); # Set the cgi variable to the default, if not already set. + $anvil->data->{cgi}{$option_key}{alert} = "" if not defined $anvil->data->{cgi}{$option_key}{alert}; $anvil->data->{cgi}{$option_key}{value} = $default if not defined $anvil->data->{cgi}{$option_key}{value}; $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 2, list => { "cgi::".$option_key."::value" => $anvil->data->{cgi}{$option_key}{value}, @@ -1614,12 +1615,13 @@ sub process_fences blank => $required ? 0 : 1, 'sort' => 1, selected => $anvil->data->{cgi}{$option_key}{value}, - class => $required ? "input_required" : "input_clear", + class => $anvil->data->{cgi}{$option_key}{alert} ? "input_alert" : "input_clear", }); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { select_options => $select_options }}); # Build the entry my $select_form .= $anvil->Template->get({file => "anvil.html", name => "fence-agent-option-entry", variables => { + name_class => $required ? "say_required" : "", name => $name, option => $select_options, description => $description, @@ -1634,9 +1636,10 @@ sub process_fences # Build the entry my $checkbox_form .= $anvil->Template->get({file => "anvil.html", name => "fence-agent-checkbox-entry", variables => { name => $name, + name_class => $required ? "say_required" : "", checkbox_name => $option_key, checkbox_checked => $anvil->data->{cgi}{$option_key}{value} ? "checked" : "", - description => $description, + description => $description, }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { checkbox_form => $checkbox_form }}); @@ -1652,7 +1655,8 @@ sub process_fences key => $option_key, value => $anvil->data->{cgi}{$option_key}{value}, 'default' => $default, - class => $required ? "input_required" : "input_clear",, + name_class => $required ? "say_required" : "", + input_class => $anvil->data->{cgi}{$option_key}{alert} ? "input_alert" : "input_clear", description => $description, }}); $anvil->Log->variables({source => $THIS_FILE, line => __LINE__, level => 3, list => { string_options => $string_options }}); diff --git a/html/skins/alteeve/anvil.html b/html/skins/alteeve/anvil.html index 86b12573..0845e4e0 100644 --- a/html/skins/alteeve/anvil.html +++ b/html/skins/alteeve/anvil.html @@ -135,7 +135,7 @@ - + #!variable!name!#   @@ -149,7 +149,7 @@ - + #!variable!name!#   @@ -163,11 +163,11 @@ - + #!variable!name!#   - +   #!variable!description!# diff --git a/html/skins/alteeve/main.css b/html/skins/alteeve/main.css index ccdadafb..4f45d9f3 100644 --- a/html/skins/alteeve/main.css +++ b/html/skins/alteeve/main.css @@ -198,12 +198,12 @@ input[type=text].input_alert, input[type=number].input_alert, select.input_alert border: 1px solid #ff3f3f; } -input[type=text].input_required, input[type=number].input_required, select.input_required { - border: 1px solid #7f7fff; +.input_required { + color: 1px solid #3ed688; } .say_required { - color: #7f7fff; + color: #3ed688; } input[type=text].input_clear, input[type=number].input_clear, select.input_clear { diff --git a/notes b/notes index 3136bb83..3da186c3 100644 --- a/notes +++ b/notes @@ -1351,4 +1351,14 @@ Striker Version: 2.0.7 +# Attach a network interface: +virsh attach-interface win2019_test bridge ifn_bridge1 --live --model virtio +# Detach a network interface: +virsh detach-interface win2019_test bridge --mac 52:54:00:ee:b5:1d + +# Change the MTU of a device; +ip link set mtu 9000 + +# Change the MTU of an interface in windows (not tested yet - http://networking.nitecruzr.net/2007/11/setting-mtu-in-windows-vista.html) +netsh interface ipv4 set subinterface "Local Area Connection" mtu=nnnn store=persistent