smeserver/smeserver-nutUPS
6
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Tue Mar 18 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-9.sme

Browse Source 
- update config for Nut 2.8.2 [SME: 12657]
  TODO review master/slave mode
  TODO convert master/slave to primary/secondary
  TODO convert to new config data + migrate
  TODO event and action
This commit is contained in:
Jean-Philippe Pialasse
2025-05-14 23:06:09 -04:00
parent 30dcc4861f
commit a768594f0f
34 changed files with 292 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
root/usr/share/smanager/lib/SrvMngr/Controller/Nutups-Custom.pm
View File

@@ -48,9 +48,12 @@ my $cdb = esmith::ConfigDB->open() || die("Couldn't open config db");
if (! TRUE) #validate $c->param('status')
{$ret .= 'Validation for status failed';}
if (! TRUE) #validate $c->param('Nutmode')
{$ret .= 'Validation for Nutmode failed';}
{$ret .= 'Validation for Nutmode failed';}
#do we want the Slave validated ? we should just display read only
if (! TRUE) #validate $c->param('SlaveUPS_Name')
{$ret .= 'Validation for SlaveUPS_Name failed';}
{$ret .= 'Validation for SlaveUPS_Name failed';}
if (! TRUE) #validate $c->param('ClientUPS_Name')
{$ret .= 'Validation for ClientUPS_Name failed';}
if (! TRUE) #validate $c->param('MasterUPS_Name')
{$ret .= 'Validation for MasterUPS_Name failed';}
if (! TRUE) #validate $c->param('UPS_Model')
@@ -88,13 +91,19 @@ my $cdb = esmith::ConfigDB->open() || die("Couldn't open config db");
$cdb = esmith::ConfigDB->open() || die("Couldn't open config db");
my %ret = (
'Data1'=>'Data for CONFIG', #Example
'localip'=>$cdb->get_value('LocalIP'),
# fields from Inputs in CONFIG $fields['CONFIG']
'status'=>$cdb->get_prop('nut', 'status', 'disabled'),
'Nutmode'=>$cdb->get_prop('nut', 'mode', 'standalone'),
'SlaveUPS_Name'=>$cdb->get_prop('nut', 'SlaveUPS', 'ups@IPaddress'),
'MasterUPS_Name'=>$cdb->get_prop('nut', 'MasterUPS', 'ups@localhost'),
'UPS_Model'=>$cdb->get_prop('nut', 'Model', 'usbhid-ups'),
'UPS_Device'=>$cdb->get_prop('nut', 'Device', 'auto'),
#'SlaveUPS_Name'=>$cdb->get_prop('nut', 'SlaveUPS'),
'ClientUPS_Name'=>$cdb->get_prop('nut', 'ClientUPS'),
'ClientUPS_User'=>$cdb->get_prop('nut', 'ClientUser'),
'ClientUPS_Pass'=>$cdb->get_prop('nut', 'ClientPass'),
'SlaveUPS_Pass'=>$cdb->get_prop('nut', 'SlavePass'),
'MasterUPS_Name'=>$cdb->get_prop('nut', 'MasterUPS'),
# TODO migrate to nut-driver@ups entry
'UPS_Model'=>$cdb->get_prop('nut', 'Model') || 'usbhid-ups',
'UPS_Device'=>$cdb->get_prop('nut', 'Device')|| 'auto',
'UPS_gen_Type'=>$cdb->get_prop('nut', 'Type', ''),
'UPS_gen_Mfr'=>$cdb->get_prop('nut', 'mfr', ''),
'UPS_gen_Model'=>$cdb->get_prop('nut', 'mdl', ''),
@@ -137,7 +146,7 @@ my $cdb = esmith::ConfigDB->open() || die("Couldn't open config db");
my $dbkey = 'ChangeThis';
# To make it write to DB as comment, delete this (regex) string in each if statement "TRUE\) \#copy or perform with value: .* e.g."
if (! TRUE) #copy or perform with value: UPSStatus e.g. $db->set_prop($dbkey,'UPSStatus',$c->param('UPSStatus'),type=>'service'))
if (! TRUE) #copy or perform with value: UPSStatus e.g. $db->set_prop($dbkey,'UPSStatus',$c->param('UPSStatus')))
{$ret .= 'Perform/save failed for UPSStatus';}
if ($ret eq "") {$ret = 'ok';}
return $ret;
@@ -150,42 +159,61 @@ my $cdb = esmith::ConfigDB->open() || die("Couldn't open config db");
$cdb = esmith::ConfigDB->open() || die("Couldn't open config db");
my $db = $cdb; #maybe one of the others
my $dbkey = 'nut';
my $driverkey = 'nut-driver@UPS';
# To make it write to DB as comment, delete this (regex) string in each if statement "TRUE\) \#copy or perform with value: .* e.g."
if (!$db->set_prop($dbkey,'status',$c->param('status'),type=>'service'))
if (!$db->set_prop($dbkey,'status',$c->param('status')))
{$ret .= 'Perform/save failed for status';}
if (!$db->set_prop($dbkey,'mode',$c->param('Nutmode'),type=>'service'))
if (!$db->set_prop($dbkey,'mode',$c->param('Nutmode')))
{$ret .= 'Perform/save failed for Nutmode';}
if (! $db->set_prop($dbkey,'SlaveUPS',$c->param('SlaveUPS_Name'),type=>'service'))
{$ret .= 'Perform/save failed for SlaveUPS_Name';}
if (! $db->set_prop($dbkey,'MasterUPS',$c->param('MasterUPS_Name'),type=>'service'))
# let only save info regarding the current mode
# if client mode
if (! $db->set_prop($dbkey,'ClientUPS',$c->param('ClientUPS_Name')))
{$ret .= 'Perform/save failed for ClientUPS_Name';}
if (! $db->set_prop($dbkey,'MasterUPS',$c->param('MasterUPS_Name')))
{$ret .= 'Perform/save failed for MasterUPS_Name';}
if (! $db->set_prop($dbkey,'SlavePass',$c->param('SlaveUPS_Pass'),type=>'service'))
{$ret .= 'Perform/save failed for SlaveUPS_Pass';}
if (! $db->set_prop($dbkey,'MasterPass',$c->param('MasterUPS_Pass'),type=>'service'))
{$ret .= 'Perform/save failed for MasterUPS_Pass';}
if (! $db->set_prop($dbkey,'Model',$c->param('UPS_Model'),type=>'service'))
if (! $db->set_prop($dbkey,'ClientUser',$c->param('ClientUPS_User')))
{$ret .= 'Perform/save failed for ClientUPS_USer';}
if (! $db->set_prop($dbkey,'ClientPass',$c->param('ClientUPS_Pass')))
{$ret .= 'Perform/save failed for ClientUPS_Pass';}
# if not client mode
if (! $db->set_prop($dbkey,'Model',$c->param('UPS_Model')))
{$ret .= 'Perform/save failed for UPS_Model';}
if (! $db->set_prop($dbkey,'Device',$c->param('UPS_Device'),type=>'service'))
if (! $db->set_prop($dbkey,'Device',$c->param('UPS_Device')))
{$ret .= 'Perform/save failed for UPS_Device';}
if (! $db->set_prop($dbkey,'Type',$c->param('UPS_gen_Type'),type=>'service'))
if (! $db->set_prop($dbkey,'Type',$c->param('UPS_gen_Type')))
{$ret .= 'Perform/save failed for UPS_gen_Type';}
if (! $db->set_prop($dbkey,'mfr',$c->param('UPS_gen_Mfr'),type=>'service'))
if (! $db->set_prop($dbkey,'mfr',$c->param('UPS_gen_Mfr')))
{$ret .= 'Perform/save failed for UPS_gen_Mfr';}
if (! $db->set_prop($dbkey,'mdl',$c->param('UPS_gen_Model'),type=>'service'))
if (! $db->set_prop($dbkey,'mdl',$c->param('UPS_gen_Model')))
{$ret .= 'Perform/save failed for UPS_gen_Model';}
#changes from sme10 to sme11
# slave/master is changed to secondary/primary (upstream) should bite the bullet rather sooner than latter
# we move most properties from nut to nut-driver@UPS, nut-driver@UPS1 (we only handle nut-driver@UPS in panel)
# we remove Master property (redundant)
# we add mode property, we have 3 modes :
# standalone uses primary pass
# nethserver uses primary pass
# netclient uses secondary pass
#TODO check if still needed :
if ($ret eq "") {
$ret = 'ok';
#and set Master and access properties according to values
if ($db->get_prop($dbkey,"mode",'standalone') eq 'netclient'){
$db->set_prop($dbkey,'Master','no',type=>'service');
$db->set_prop($dbkey,'Master','no');
} else {
$db->set_prop($dbkey,'Master','yes',type=>'service');
$db->set_prop($dbkey,'Master','yes');
}
if ($db->get_prop($dbkey,"mode",'standalone') eq 'netserver'){
$db->set_prop($dbkey,'access','private',type=>'service');
$db->set_prop($dbkey,'access','private');
} else {
$db->set_prop($dbkey,'access','localhost',type=>'service');
$db->set_prop($dbkey,'access','localhost');
}
#And run signal-event to apply templates for config files and start task.
my @result = qx{/usr/sbin/e-smith/signal-event smeserver-nutUPS-update};
@@ -230,12 +258,10 @@ sub get_ups_status {
my $nutmode = $cdb->get_prop('nut', 'mode','standalone');
if ($cdb->get_prop('nut', 'status', 'disabled') eq 'disabled'){
return $c->l('nut_status_is_disabled')
} elsif ($nutmode eq 'standalone'){
return $c->get_status_from_device($cdb->get_prop('nut','MasterUPS','ups@localhost'));
} elsif ($nutmode eq 'netserver'){
return $c->get_status_from_device($cdb->get_prop('nut','MasterUPS','ups@localhost'));
} elsif ($nutmode eq 'netclient'){
return $c->get_status_from_device($cdb->get_prop('nut','ClientUPS'));
} else {
return $c->get_status_from_device($cdb->get_prop('nut','SlaveUPS','apc@192.168.1.99'));
return $c->get_status_from_device($cdb->get_prop('nut','MasterUPS'));
}
}
@@ -268,4 +294,4 @@ sub get_status_from_device {
}
1;
1;

3
root/usr/share/smanager/themes/default/public/js/nutups.js
View File

@@ -2,6 +2,7 @@ $(document).ready(function() {
function toggleUPSClasses() {
var selectedOption = $('#Nutmode_select').val();
$('.masterups').toggle(selectedOption === 'netserver' || selectedOption === 'standalone'); // Show/Hide masterups based on Net Server or Standalone
$('.secondaryups').toggle(selectedOption === 'netserver' ); // Show/Hide Secondary logins for net server
$('.slaveups').toggle(selectedOption === 'netclient'); // Show/Hide slaveups based on Net Client
// Enable/Disable inputs based on the selected option
@@ -25,4 +26,4 @@ $(document).ready(function() {
// Set the initial state based on current selections
toggleGenerics();
toggleUPSClasses();
});
});

55
root/usr/share/smanager/themes/default/templates/partials/_nut_CONFIG.html.ep
View File

@@ -13,7 +13,7 @@
</pre>
% }
% my $btn = l('nut_APPLY');
%= form_for "nutupsu" => (method => 'POST') => begin
%= form_for "nutupsu" => (method => 'POST') => (autocomplete => "off" ) => begin
% param 'trt' => $nut_data->{trt} unless param 'trt';
%= hidden_field 'trt' => $nut_data->{trt}
%# Inputs etc in here.
@@ -40,20 +40,28 @@
<div class=masterups>
<h2 class='subh3'><%=l('nut_if_Net_Server')%></h2>
<p><span class=label>
%=l('nut_MasterUPS_UPSNAME@IP')
</span><span class=data>
% param 'MasterUPS_Name' => $nut_data->{MasterUPS_Name} unless param 'MasterUPS_Name';
%= text_field 'MasterUPS_Name', size => '50', class => 'textinput MasterUPS_Name' , pattern=>'.*' , placeholder=>'ups@localhost'
<br></span></p>
<p><span class='label'>
%=l('nut_MasterUPS_Password')
</span><span class=data>
% param 'MasterUPS_Password' => $nut_data->{MasterUPS_Password} unless param 'MasterUPS_Password';
%=password_field 'MasterUPS_Password', class => 'pass6 sme-password'
</span></p>
<div class=secondaryups>
<p><span class=label>
%=l('nut_MasterUPS_UPSNAME@IP')
</span><span class=data>
% param 'MasterUPS_Name' => $nut_data->{MasterUPS_Name} unless param 'MasterUPS_Name';
%= 'ups@'. $nut_data->{'localip'}
<br></span></p>
<p><span class='label'>
%=l('nut_SlaveUPS_User')
</span><span class=data>
%= 'upssecondary'
</span></p>
<p><span class='label'>
%=l('nut_SlaveUPS_Password')
</span><span class=data>
<%= $nut_data->{'SlaveUPS_Pass'}%>
</span></p>
</div>
<p><span class=label>
%=l('nut_UPS_Model')
@@ -77,14 +85,21 @@
%=l('nut_SlaveUPS_UPSNAME@IP')
</span><span class=data>
% param 'SlaveUPS_Name' => $nut_data->{SlaveUPS_Name} unless param 'SlaveUPS_Name';
%= text_field 'SlaveUPS_Name', size => '50', class => 'textinput SlaveUPS_Name' , pattern=>'.*' , placeholder=>'upsname@IP'
%= text_field 'SlaveUPS_Name', size => '50', class => 'textinput SlaveUPS_Name' , pattern=>'.*' , placeholder=>'upsname@IP[:port]'
<br></span></p>
<p><span class='label'>
%=l('nut_ClientUPS_Username')
</span><span class=data>
% param 'ClientUPS_User' => $nut_data->{ClientUPS_User} unless param 'ClientUPS_User';
%=text_field 'ClientUPS_User', class => 'textinput'
</span></p>
<p><span class='label'>
%=l('nut_SlaveUPS_Password')
%=l('nut_ClientUPS_Password')
</span><span class=data>
% param 'SlaveUPS_Password' => $nut_data->{SlaveUPS_Password} unless param 'SlaveUPS_Password';
%=password_field 'SlaveUPS_Password', class => 'pass4 sme-password'
% param 'ClientUPS_Pass' => $nut_data->{ClientUPS_Pass} unless param 'ClientUPS_Pass';
%=password_field 'ClientUPS_Pass', class => 'pass4 sme-password', autocomplete => 'off'
</span></p>
</div>
@@ -121,4 +136,4 @@
%# Probably finally by a submit.
%end
</div>
</div>