* Mon Mar 03 2025 Brian Read <brianr@koozali.org> 11.0.0-6.sme

- Add in SM2 NutUPS configuration and status panel [SME: 12949]

root/etc/e-smith/db/configuration/defaults/nut/MasterUPS

@@ -0,0 +1 @@
+ups@localhost

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

@@ -0,0 +1,261 @@
+#
+# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-01-20 16:21:33 
+#
+#
+# Routines to be edited by the developer to provide content and validation for parameters
+# and provison of the control data for table(s)
+#
+use esmith::util;
+use esmith::util::network;
+use esmith::ConfigDB;
+use esmith::HostsDB;
+use esmith::AccountsDB;
+use esmith::NetworksDB;
+use esmith::DomainsDB;
+
+use constant FALSE => 0;
+use constant TRUE  => 1;
+
+
+#The most common ones
+my $cdb = esmith::ConfigDB->open()   || die("Couldn't open config db");
+#our $adb = esmith::AccountsDB->open() || die("Couldn't open Accounts db");
+#our $ndb = esmith::NetworksDB->open() || die("Couldn't open Network db");
+#our $hdb = esmith::HostsDB->open() 	  || die("Couldn't open Hosts db");
+#our $ddb = esmith::DomainsDB->open()  || die("Couldn't open Domains db");
+
+# Validation routines - parameters for each panel
+
+	sub validate_STATUS {
+		my $c = shift;
+		my $prefix_data = shift; #Data hash as parameter
+		# Validation for each field 
+		my $ret = "";
+		
+		if (! TRUE) #validate $c->param('UPSStatus')
+			{$ret .= 'Validation for UPSStatus failed';}	
+		if ($ret eq "") {$ret = 'ok';}
+		return $ret;
+	}
+
+	sub validate_CONFIG {
+		#return "ok";
+		my $c = shift;
+		my $prefix_data = shift; #Data hash as parameter
+		# Validation for each field 
+		my $ret = "";
+		
+		if (! TRUE) #validate $c->param('status')
+			{$ret .= 'Validation for status failed';}	
+		if (! TRUE) #validate $c->param('Nutmode')
+			{$ret .= 'Validation for Nutmode failed';}	
+		if (! TRUE) #validate $c->param('SlaveUPS_Name')
+			{$ret .= 'Validation for SlaveUPS_Name failed';}	
+		if (! TRUE) #validate $c->param('MasterUPS_Name')
+			{$ret .= 'Validation for MasterUPS_Name failed';}	
+		if (! TRUE) #validate $c->param('UPS_Model')
+			{$ret .= 'Validation for UPS_Model failed';}	
+		if (! TRUE) #validate $c->param('UPS_Device')
+			{$ret .= 'Validation for UPS_Device failed';}	
+		if (! TRUE) #validate $c->param('UPS_gen_Type')
+			{$ret .= 'Validation for UPS_gen_Type failed';}	
+		if (! TRUE) #validate $c->param('UPS_gen_Mfr')
+			{$ret .= 'Validation for UPS_gen_Mfr failed';}	
+		if (! TRUE) #validate $c->param('UPS_gen_Model')
+			{$ret .= 'Validation for UPS_gen_Model failed';}	
+		if ($ret eq "") {$ret = 'ok';}
+		return $ret;
+	}
+
+
+# Get singleton data for each panel
+
+	sub get_data_for_panel_STATUS {
+		# Return a hash with the fields required which will be loaded into the shared data 
+		my $c = shift;
+		my %ret = (
+			#'Data1'=>'Data for STATUS', #Example
+			# fields from Inputs in STATUS $fields['STATUS']
+			'UPSStatus'=>$c->get_ups_status(),
+			
+		);
+		return %ret;
+	}
+
+	sub get_data_for_panel_CONFIG {
+		# Return a hash with the fields required which will be loaded into the shared data 
+		my $c = shift;
+		$cdb = esmith::ConfigDB->open()   || die("Couldn't open config db");
+		my %ret = (
+			'Data1'=>'Data for CONFIG', #Example
+			# 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'),
+			'UPS_gen_Type'=>$cdb->get_prop('nut', 'Type', ''),
+			'UPS_gen_Mfr'=>$cdb->get_prop('nut', 'mfr', ''),
+			'UPS_gen_Model'=>$cdb->get_prop('nut', 'mdl', ''),
+		);
+		return %ret;
+	}
+
+
+
+# Get control data for table(s)
+
+
+
+# Return hash with values from row in which link clicked on table
+
+	sub get_selected_STATUS {
+		my $c = shift;
+		my $selected = shift; #Parameter is name of selected row.
+		my $is_new_record = shift; #Indicates new record required (defaults)
+		my %ret = {};
+		return $ret;
+	}
+
+	sub get_selected_CONFIG {
+		my $c = shift;
+		my $selected = shift; #Parameter is name of selected row.
+		my $is_new_record = shift; #Indicates new record required (defaults)
+		my %ret = {};
+		return $ret;
+	}
+
+
+#after sucessful modify or create or whatever and submit then perfom (if the params validate)
+
+	sub perform_STATUS {
+		my $c = shift;
+		my $prefix_data = shift; #Data hash as parameter
+		my $ret = "";
+		my $db = $cdb; #maybe one of the others
+		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'))
+			{$ret .= 'Perform/save failed for UPSStatus';}
+		if ($ret eq "") {$ret = 'ok';}
+		return $ret;
+	}
+
+	sub perform_CONFIG {
+		my $c = shift;
+		my $prefix_data = shift; #Data hash as parameter
+		my $ret = "";
+		$cdb = esmith::ConfigDB->open()   || die("Couldn't open config db");
+		my $db = $cdb; #maybe one of the others
+		my $dbkey = 'nut';
+		# 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'))
+			{$ret .= 'Perform/save failed for status';}
+		if (!$db->set_prop($dbkey,'mode',$c->param('Nutmode'),type=>'service'))
+			{$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'))
+			{$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'))
+			{$ret .= 'Perform/save failed for UPS_Model';}
+		if (! $db->set_prop($dbkey,'Device',$c->param('UPS_Device'),type=>'service'))
+			{$ret .= 'Perform/save failed for UPS_Device';}
+		if (! $db->set_prop($dbkey,'Type',$c->param('UPS_gen_Type'),type=>'service'))
+			{$ret .= 'Perform/save failed for UPS_gen_Type';}
+		if (! $db->set_prop($dbkey,'mfr',$c->param('UPS_gen_Mfr'),type=>'service'))
+			{$ret .= 'Perform/save failed for UPS_gen_Mfr';}
+		if (! $db->set_prop($dbkey,'mdl',$c->param('UPS_gen_Model'),type=>'service'))
+			{$ret .= 'Perform/save failed for UPS_gen_Model';}
+		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');
+			} else {
+				$db->set_prop($dbkey,'Master','yes',type=>'service');
+			}
+			if ($db->get_prop($dbkey,"mode",'standalone') eq 'netserver'){
+				$db->set_prop($dbkey,'access','private',type=>'service');
+			} else {
+				$db->set_prop($dbkey,'access','localhost',type=>'service');
+			}
+			#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};
+			if ($? != 0) {
+				warn "Error executing signal-event: $!";
+				return "Signal-event Error occurred $!";
+			}
+		}
+		return $ret;
+	}
+
+
+sub create_link{
+	# WIP
+	my ($c,$route, $panel, $index) = @_;
+	my $link = "$route?trt=$panel&Selected=$index";
+	return $link;
+}
+
+sub get_model_options {
+
+    # Execute the RPM command and capture the output
+    my @output = qx{rpm -ql nut | grep /usr/sbin};
+
+    # Check for errors
+    if ($? != 0) {
+        warn "Error executing command: $!";
+        return ['Error occurred'];
+    }
+
+    # Remove "/usr/sbin/" from the front of each line
+    s{^/usr/sbin/}{} for @output;
+
+    # Trim whitespace from each element and return the array
+    chomp(@output);  # Remove newline characters from each line
+    return @output;  # Return the array of modified output lines
+}
+
+sub get_ups_status {
+	my $c = shift;
+	$cdb = esmith::ConfigDB->open()   || die("Couldn't open config db");
+	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'));
+	} else {
+		return $c->get_status_from_device($cdb->get_prop('nut','SlaveUPS','apc@192.168.1.99'));
+	}
+}
+
+sub get_status_from_device {
+	my ($c,$device) = @_;
+	my $command = '/usr/bin/upsc';
+
+    # Check if the file exists and is executable
+    return ["$command Not allowed"] unless (-e $command && -x $command) ;
+
+	$result = qx{$command $device};
+	if ($? != 0) {
+		warn "Error executing $command command: $!";
+		return ["$command $device Error occurred $!"];
+	}
+	chomp($result);
+	$result  = $result || 'No results';
+	$result = "Status from $device\n\n".$result;
+	return $result;
+}
+
+
+1;

root/usr/share/smanager/lib/SrvMngr/Controller/Nutups.pm

@@ -0,0 +1,312 @@
+package SrvMngr::Controller::Nutups;
+#
+# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-01-20 16:21:33 
+#
+#----------------------------------------------------------------------
+# heading     : System
+# description : NutUPS configuration
+# navigation  : 4000 700
+#
+# name : nutups,    method : get,   url : /nutups,   ctlact : Nutups#main
+# name : nutupsu,   method : post,  url : /nutupsu,  ctlact : Nutups#do_update
+# name : nutupsd,   method : get,   url : /nutupsd,  ctlact : Nutups#do_display
+#
+# routes : end
+#
+# Documentation: https://wiki.contribs.org/Nutups
+#----------------------------------------------------------------------
+
+#
+# Scheme of things:
+#
+# TBA!!
+
+use strict;
+use warnings;
+use Mojo::Base 'Mojolicious::Controller';
+
+use constant FALSE => 0;
+use constant TRUE  => 1;
+
+use Locale::gettext;
+use SrvMngr::I18N;
+use SrvMngr qw(theme_list init_session);
+
+use Data::Dumper;
+
+use esmith::util;
+use esmith::util::network;
+use esmith::ConfigDB;
+use esmith::AccountsDB;
+use esmith::NetworksDB;
+use esmith::HostsDB;
+use esmith::DomainsDB;
+
+
+
+require '/usr/share/smanager/lib/SrvMngr/Controller/Nutups-Custom.pm';  #The code that is to be added by the developer
+
+sub main {
+#
+# Initial entry - route is "/<whatever>"
+#
+#set initial panel
+#for initial panel:
+	#Specifiy panel to enter
+	#load up _data hash with DB fields
+	#load up stash with pointer(s) to control fields hash(= get-))
+		#and a pointer to the prefix_data hash
+#render initial panel
+
+    my $c = shift;
+    $c->app->log->info( $c->log_req );
+
+	#The most common ones
+	my $cdb = esmith::ConfigDB->open()   || die("Couldn't open config db");
+	my $adb = esmith::AccountsDB->open() || die("Couldn't open Accounts db");
+	my $ndb = esmith::NetworksDB->open() || die("Couldn't open Network db");
+	my $hdb = esmith::HostsDB->open() 	  || die("Couldn't open Hosts db");
+	my $ddb = esmith::DomainsDB->open()  || die("Couldn't open Domains db");
+
+    my %nut_data = ();
+    my $title = $c->l('nut_NutUPS_configuration');
+    my $modul = '';
+
+    $nut_data{'trt'} = 'STATUS';
+    
+    #Load any DB entries into the <prefix>_data area so as they are preset in the form
+    # which DB - this only really works if the initial panel is a PARAMS type panel and not a TABLE
+    my $db = $cdb; #pickup local or global db or Default to config
+    
+	
+	$c->do_display($nut_data{'trt'});
+	
+}
+
+# Post request with params - submit from the form 
+sub do_update {
+#
+# Return after submit pushed on panel (this is a post) - route is "/<whatever>u"
+# parameters in the params hash.
+#
+#load up all params into prefix_data hash:
+#By panel (series of if statements - only one executed):
+		#call validate-PANEL() - return ret = ok or error message
+			
+#if validation not ok:
+	#render back to current panel with error message in stash
+#otherwise:
+	#By panel (series of if statements - only one executed):
+		#do whatever is required: call perform-PANEL() - return "ok" or Error Message
+			#call signal-event for any global actions specified (check it exists - error and continue?)
+			#if action smeserver-<whatever>-update exists
+				#signal_event smeserver-<whatever>-update
+			#call signal-event for any specific actions for thids panel (check it exists first - error and continue)
+		#set success in stash
+		#if no "nextpanel" entry:
+			#set firstpanel
+		#else 
+			#set nextpanel
+		#call render
+	
+    my $c = shift;
+    $c->app->log->info($c->log_req);
+	my $modul = '';
+
+	#The most common ones - you might want to comment out any not used.
+	my $cdb = esmith::ConfigDB->open()   || die("Couldn't open config db");
+	my $adb = esmith::AccountsDB->open() || die("Couldn't open Accounts db");
+	my $ndb = esmith::NetworksDB->open() || die("Couldn't open Network db");
+	my $hdb = esmith::HostsDB->open() 	  || die("Couldn't open Hosts db");
+	my $ddb = esmith::DomainsDB->open()  || die("Couldn't open Domains db");
+
+    my %nut_data = ();
+    my $title = $c->l('nut_NutUPS_configuration');
+
+	# Accessing all POST parameters
+    my %params = $c->req->params->to_hash;
+
+    # Get number of POST parameters
+    my $num_params = keys %params;
+    
+    #Params are available in the hash "params" - copy to the prefix_data hash
+    #while (my ($key, $value) = each %{$c->req->params->to_hash}) {
+    #    $nut_data{$key} = $value;
+    #}
+
+    # the value of trt will tell you which panel has returned    
+    my $trt = $c->param('trt') || 'STATUS'; #hidden control on every form.
+    my $ret = 'ok';
+
+    #Validate the parameters in a custom sub one for each panel (although only one of these will be executed)
+    my $thispanel;
+    
+		if ($trt eq 'STATUS'){
+			#Validate form parameters for panel STATUS
+			$ret = $c->validate_STATUS(\%nut_data);
+			$thispanel = 'STATUS';
+		}
+	
+		if ($trt eq 'CONFIG'){
+			#Validate form parameters for panel CONFIG
+			$ret = $c->validate_CONFIG(\%nut_data);
+			$thispanel = 'CONFIG';
+		}
+	
+	if ($ret ne "ok"){
+		$c->warn($ret);
+		$c->do_display($thispanel);
+	} else {
+		#Do whatever is needed, including writing values to the DB
+		
+		
+			if ($trt eq 'STATUS'){
+				#do whatever is required ...
+				$ret = $c->perform_STATUS(\%nut_data);
+				if ($ret ne "ok") {
+					# return to the panel with error message
+					$c->stash(error => $c->l($ret));
+					$c->stash( 
+						title => $title, 
+						modul => $modul,
+						nut_data  => \%nut_data
+					);
+					$c->render(template => "nutups");	
+				} else {
+					$c->stash( success => $c->l('nut_STATUS_panel_action_was_successful')); #A bit bland - edit it in the lex file
+				}
+			}
+		
+			if ($trt eq 'CONFIG'){
+				#do whatever is required ...
+				$ret = $c->perform_CONFIG(\%nut_data);
+				if ($ret ne "ok") {
+					# return to the panel with error message
+					$c->stash(error => $c->l($ret));
+					$c->stash( 
+						title => $title, 
+						modul => $modul,
+						nut_data  => \%nut_data
+					);
+					$c->render(template => "nutups");	
+				} else {
+					$c->stash( success => $c->l('nut_CONFIG_panel_action_was_successful')); #A bit bland - edit it in the lex file
+				}
+			}
+		
+		# and call any signal-events needed
+		#TBD
+		# Setup shared data and call panel
+		if ('none' eq 'none') {
+			$nut_data{'trt'} = 'STATUS';
+		} else {
+			$nut_data{'trt'} = 'none';
+		}	
+		$c->do_display($nut_data{'trt'});
+	} 
+}
+
+sub do_display {
+#
+# Return after link clicked in table (this is a get) - route is "/<whatever>d"
+# Expects ?trt=PANEL&selected="TableRowName" plus any other required
+#
+# OR it maybe a post from the main panel to add a new record 
+#
+#load up all supplied params into prefix_data hash
+#call get-selected-PANEL() - returns hash of all relevent parameters
+#load up returned hash into prefix_data
+#render - to called panel
+
+    my ($c,$trt) = @_;
+    $c->app->log->info($c->log_req);
+
+	#The most common ones - you might want to comment out any not used.
+	my $cdb = esmith::ConfigDB->open()   || die("Couldn't open config db");
+	my $adb = esmith::AccountsDB->open() || die("Couldn't open Accounts db");
+	my $ndb = esmith::NetworksDB->open() || die("Couldn't open Network db");
+	my $hdb = esmith::HostsDB->open() 	  || die("Couldn't open Hosts db");
+	my $ddb = esmith::DomainsDB->open()  || die("Couldn't open Domains db");
+    
+    my %nut_data = ();
+    my $title = $c->l('nut_NutUPS_configuration');
+    my $modul = "";
+
+	# Accessing all parameters
+    #my %params = $c->req->params->to_hash;
+
+    # Get number of parameters
+    #my $num_params = keys %params;
+    
+    #Tag as Post or Get (ie. create new entry or edit existing one
+    my $is_new_record = ($c->req->method() eq 'POST');
+    
+    #Params are available in the hash "params" - copy to the prefix_data hash
+    #while (my ($key, $value) = each %{$c->req->params->to_hash}) {
+    #    $nut_data{$key} = $value;
+    #}
+
+    # the value of trt will tell you which panel has returned   
+    if (! $trt){ 
+		$trt = $c->param('trt') || 'STATUS'; #Indicates where to go now
+	}
+ 
+    # Now add in the params from the selected row from the table
+		
+    my %selectedrow;
+    
+		if ($trt eq 'STATUS'){
+			#Validate Get selected row (if applicable)  STATUS
+				%selectedrow = $c->get_selected_STATUS($nut_data{'Selected'},$is_new_record);
+		}
+	
+		if ($trt eq 'CONFIG'){
+			#Validate Get selected row (if applicable)  CONFIG
+				%selectedrow = $c->get_selected_CONFIG($nut_data{'Selected'},$is_new_record);
+		}
+	
+ 
+	#Copy in the selected row params to the prefix_data hash to pass to the panel
+	while (my ($key, $value) = each %selectedrow){
+        $nut_data{$key} = $value;
+    }
+	# Where to go now
+	$nut_data{'trt'} = $trt;
+	
+	# Set up other shared data according to the panel to go to
+    
+		if ($trt eq 'STATUS'){
+			# pickup any other contents needed and load them into hash shared with panel
+			my %returned_hash;
+			# subroutine returns a hash directly
+			%returned_hash = $c->get_data_for_panel_STATUS();
+			# Copy each key-value pair from the returned hash to the prefix data hash
+			while (my ($key, $value) = each %returned_hash) {
+				$nut_data{$key} = $value;
+			}
+		}
+	
+		if ($trt eq 'CONFIG'){
+			# pickup any other contents needed and load them into hash shared with panel
+			my %returned_hash;
+			# subroutine returns a hash directly
+			%returned_hash = $c->get_data_for_panel_CONFIG();
+			# Copy each key-value pair from the returned hash to the prefix data hash
+			while (my ($key, $value) = each %returned_hash) {
+				$nut_data{$key} = $value;
+			}
+		}
+	
+	
+	# and table control fields
+     
+	
+	# Data for panel
+	$c->stash( 
+		title 			=> $title, 
+		modul => $modul,
+		nut_data  => \%nut_data
+	);
+	$c->render(template => "nutups");
+}    
+1;

root/usr/share/smanager/lib/SrvMngr/I18N/Modules/Nutups/nutups_en.lex

@@ -0,0 +1,30 @@
+#
+# Generated by SM2Gen version: SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-01-20 16:21:33
+#
+'nut_UPS_Generic_Model' => 'UPS Generic Model',
+'nut_UPS_Model' => 'UPS Model',
+'nut_Manage_Nutups-config_settings:' => 'Manage Nutups-config settings',
+'nut_Descriptive_paragraph' => 'Descriptive paragraph',
+'nut_MasterUPS_UPSNAME@IP' => 'UPS name@localhost',
+'nut_SlaveUPS_UPSNAME@IP' => 'Slave->Master UPSNAME@IP',
+'nut_MasterUPS_Password' => Local server password',
+'nut_SlaveUPS_Password' => 'Slaves Password ->Server',
+'nut_Nut_status' => 'Nut status',
+'nut_Configure_NutUPS' => 'Configure NutUPS',
+'nut_CONFIG_panel_action_was_successful' => 'CONFIG panel action was successful',
+'nut_UPS_Generic_Type' => 'UPS Generic Type',
+'nut_Status_(from_upsc)' => 'Status (from running upsc)',
+'nut_Error_Status_Report' => 'Error Status Report',
+'nut_if_Net_Server' => 'Net Server details',
+'nut_if_genericups' => 'Generic UPS details',
+'nut_if_Net_Client' => 'Net Client details',
+'nut_STATUS_panel_action_was_successful' => 'STATUS panel action was successful',
+'nut_Nut_mode' => 'Nut mode',
+'nut_Status_Report' => 'Status Report',
+'nut_NutUPS_configuration' => 'NutUPS configuration',
+'nut_APPLY' => 'Apply',
+'nut_UPS_Device' => 'UPS Device',
+'nut_UPS_Generic_Manufacturer' => 'UPS Generic Manufacturer',
+'nut_Status_of_the_controlled_UPS' => 'Status of the controlled UPS',
+'nut_Save' => 'Save',
+'nut_status_is_disabled' => 'Nut disabled',

root/usr/share/smanager/themes/default/public/css/nut_ups-status-page.css

@@ -0,0 +1,44 @@
+.ups-status-page {
+    font-family: Arial, sans-serif;
+    line-height: 1.6;
+    color: #333;
+    max-width: 1200px;
+    margin: 0 auto;
+    padding: 20px;
+}
+
+.ups-status-page h1 {
+    color: #2c3e50;
+}
+
+.ups-status-page .grid {
+    display: grid;
+    grid-template-columns: repeat(auto-fit, minmax(300px, 1fr));
+    gap: 20px;
+}
+
+.ups-status-page .card {
+    background: #f9f9f9;
+    border-radius: 5px;
+    padding: 20px;
+    box-shadow: 0 2px 5px rgba(0,0,0,0.1);
+}
+
+.ups-status-page h2 {
+    color: #3498db;
+    margin-top: 0;
+}
+
+.ups-status-page table {
+    width: 100%;
+    border-collapse: collapse;
+}
+
+.ups-status-page td {
+    padding: 8px 0;
+    border-bottom: 1px solid #ddd;
+}
+
+.ups-status-page td:first-child {
+    font-weight: bold;
+}

root/usr/share/smanager/themes/default/public/css/nutups.css

@@ -0,0 +1,69 @@
+/*
+Generated by: SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-01-20 16:09:58
+*/
+.Nutups-panel {}
+.name {}
+.rout {}
+.grou1 {}
+.link1 {}
+.endg1 {}
+.subh1 {}
+.para1 {}
+.text1 {}
+.name {}
+.rout {}
+.subh2 {}
+.sele1 {}
+.sele2 {}
+.grou2 {}
+.subh3 {}
+.text3 {}
+.pass4 {}
+.endg2 {}
+.grou3 {}
+.subh4 {}
+.text5 {}
+.pass6 {}
+.endg3 {}
+.text7 {}
+.text8 {}
+.subh5 {}
+.text9 {}
+.text10 {}
+.text11 {}
+.subm12 {}
+.inline-buttons {
+    display: flex; /* Use flexbox to arrange items horizontally */
+    gap: 10px;     /* Optional: Add space between buttons */
+  }
+
+  .inline-buttons .link {
+    /* Additional styling can be added here if needed */
+  }
+  
+  
+  .inline-buttons .link {
+    display: inline-block; /* Keep links as inline-block for button shape */
+    padding: 7px 14px;     /* Adjusted padding to approximate 70% of the original */
+    margin: 0;             /* Remove margin */
+    background-color: #efefef; /* Light gray background color */
+    color: black;          /* Text color */
+    text-decoration: none; /* Remove underline */
+    border: 2px solid #bbb; /* Thin, light gray border */
+    border-radius: 3px;    /* Slightly rounded corners */
+    font-size: 11.2px;     /* Adjusted font size to approximate 70% of the original */
+    text-align: center;    /* Center the text */
+    cursor: pointer;       /* Pointer cursor on hover */  }
+
+  /* Hover and active effects for better interaction */
+  .inline-buttons .link:hover {
+    background-color: #d9d9d9; /* Darker shade on hover */
+  }
+
+  .inline-buttons .link:active {
+    background-color: #c0c0c0; /* Even darker shade on click */
+  }
+  
+  span .label {
+	padding-top:13em;
+  }

root/usr/share/smanager/themes/default/public/js/nutups.js

@@ -0,0 +1,28 @@
+$(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
+        $('.slaveups').toggle(selectedOption === 'netclient'); // Show/Hide slaveups based on Net Client
+        
+        // Enable/Disable inputs based on the selected option
+        $('.masterups input').prop('disabled', !(selectedOption === 'netserver' || selectedOption === 'standalone')); 
+        $('.slaveups input').prop('disabled', selectedOption !== 'netclient'); 
+    }
+
+    function toggleGenerics() {
+        var upsModelValue = $('#UPS_Model_select').val().toLowerCase(); // Get the current value from UPS_Model
+        var isGenericUps = upsModelValue === 'genericups'; // Check if it's 'genericups'
+
+        // Show/Hide generics section and enable/disable inputs
+        $('.generics').toggle(isGenericUps); 
+        $('.generics input').prop('disabled', !isGenericUps); // Enable/Disable inputs based on the value
+    }
+
+    // Event listener for the selections
+    $('#Nutmode_select').change(toggleUPSClasses);
+    $('#UPS_Model_select').change(toggleGenerics); // Listen for changes in the UPS_Model dropdown
+
+    // Set the initial state based on current selections
+    toggleGenerics();
+    toggleUPSClasses();
+});

root/usr/share/smanager/themes/default/templates/nutups.html.ep

@@ -0,0 +1,60 @@
+%#
+%# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-01-20 16:21:33 
+%#
+% layout 'default', title => "Sme server 2 - NutUPS configuration", share_dir => './';
+%# css specific to this panel:
+% content_for 'module' => begin
+%= stylesheet '/css/nutups.css'
+%= javascript '/js/nutups.js'
+<div id="module" class="module Nutups-panel">
+
+    % if (config->{debug} == 1) {
+	<pre>
+		%= dumper $c->current_route
+		%= dumper $nut_data->{trt}
+	</pre>
+    % }
+    
+    <h1><%=$title%></h1>
+
+    % if ( stash('modul')) {
+	%= $c->render_to_string(inline => stash('modul') );
+    % }
+
+   	%if ($c->stash('first')) {
+	    <br><p>
+		%=$c->render_to_string(inline =>$c->l($c->stash('first')))
+		</p>
+
+	%} elsif ($c->stash('success')) {
+		<div class='success '>
+	       <h2><%=$c->l('nut_Status_Report') %></h2><p>
+			%= $c->l($c->stash('success'));
+			</p>
+		</div>
+		<br />
+
+	%} elsif ($c->stash('error')) { 
+	   <div class='sme-error'>
+	       <h2><%=$c->l('nut_Error_Status_Report') %></h2><p>
+			%= $c->l($c->stash('error'));
+			</p>
+    	</div>
+		<br />
+	%}
+
+	%#Routing to partials according to trt parameter.
+	%#This ought to be cascading if/then/elsif, but is easier to just stack the if/then's rather like a case statement'
+	
+	% if ($nut_data->{trt} eq "STATUS") {
+		%= include 'partials/_nut_STATUS'
+	%}
+	
+	% if ($nut_data->{trt} eq "CONFIG") {
+		%= include 'partials/_nut_CONFIG'
+	%}
+	
+
+
+</div>
+%end

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

@@ -0,0 +1,124 @@
+%#
+%# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-01-20 16:21:33 
+%#
+<div id="Nutups-CONFIG" class="partial Nutups-CONFIG">
+	<script>
+		window.onload = function() {
+		SelectInput(); 
+	};
+	</script>
+	% if (config->{debug} == 1) {
+		<pre>
+			%= dumper $nut_data
+		</pre>
+	% }
+	% my $btn = l('nut_APPLY');
+	%= form_for "nutupsu" => (method => 'POST') => begin
+		% param 'trt' => $nut_data->{trt} unless param 'trt';
+		%= hidden_field 'trt' => $nut_data->{trt}
+		%# Inputs etc in here.
+
+		<h2 class='subh2'><%=l('nut_Manage_Nutups-config_settings:')%></h2>
+	
+		<p><span class=label>
+			%=l('nut_Nut_status')
+		</span><span class=data>
+			%# my @status_options = [['Disabled' => 'disabled'], ['Enabled' => 'enabled']];
+			%# param 'status' => $nut_data->{status} unless param 'status';
+
+			% my @status_options = selected_field([['Disabled' => 'disabled'], ['Enabled' => 'enabled']], $nut_data->{status});
+			%= select_field 'status' => @status_options, class => 'input', id => 'status_select'
+		<br></span>	</p>
+	
+		<p><span class=label>
+			%=l('nut_Nut_mode')
+		</span><span class=data>
+			% my @Nutmode_options = [['Standalone' => 'standalone'], ['Net Server' => 'netserver'], ['Net Client ' => 'netclient']];
+			% param 'Nutmode' => $nut_data->{Nutmode} unless param 'Nutmode';
+			%= select_field 'Nutmode' => @Nutmode_options, class => 'input', id => 'Nutmode_select'
+		<br></span>	</p>
+	
+		<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>
+			
+			<p><span class=label>
+				%=l('nut_UPS_Model')
+			</span><span class=data>
+				% my @UPS_Model_options = $c->get_model_options();
+				% param 'UPS_Model' => $nut_data->{UPS_Model} unless param 'UPS_Model';
+				%= select_field 'UPS_Model' => \@UPS_Model_options, class => 'input', id => 'UPS_Model_select'
+			<br></span>	</p>
+		
+			<p><span class=label>
+				%=l('nut_UPS_Device')
+			</span><span class=data>
+				% param 'UPS_Device' => $nut_data->{UPS_Device} unless param 'UPS_Device';
+				%= text_field 'UPS_Device', size => '50', class => 'textinput UPS_Device' , pattern=>'.*' , placeholder=>'auto (for usb)'
+			<br></span></p>
+		</div>
+		
+		<div class=slaveups>
+			<h2 class='subh4'><%=l('nut_if_Net_Client')%></h2>
+			<p><span class=label>
+				%=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'
+			<br></span></p>
+		
+			<p><span class='label'>
+				%=l('nut_SlaveUPS_Password')
+			</span><span class=data>
+				% param 'SlaveUPS_Password' => $nut_data->{SlaveUPS_Password} unless param 'SlaveUPS_Password';
+				%=password_field 'SlaveUPS_Password', class => 'pass4 sme-password'
+			</span></p>
+		</div>
+	
+		<div class=generics>
+`			<h2 class='subh5'><%=l('nut_if_genericups')%></h2>
+			<p><span class=label>
+				%=l('nut_UPS_Generic_Type')
+			</span><span class=data>
+				% param 'UPS_gen_Type' => $nut_data->{UPS_gen_Type} unless param 'UPS_gen_Type';
+				%= text_field 'UPS_gen_Type', size => '50', class => 'textinput UPS_gen_Type' , pattern=>'.*' , placeholder=>'UPS_gen_Type'
+			<br></span></p>
+		
+			<p><span class=label>
+				%=l('nut_UPS_Generic_Manufacturer')
+			</span><span class=data>
+				% param 'UPS_gen_Mfr' => $nut_data->{UPS_gen_Mfr} unless param 'UPS_gen_Mfr';
+				%= text_field 'UPS_gen_Mfr', size => '50', class => 'textinput UPS_gen_Mfr' , pattern=>'.*' , placeholder=>'UPS_gen_Mfr'
+			<br></span></p>
+		
+			<p><span class=label>
+				%=l('nut_UPS_Generic_Model')
+			</span><span class=data>
+				% param 'UPS_gen_Model' => $nut_data->{UPS_gen_Model} unless param 'UPS_gen_Model';
+				%= text_field 'UPS_gen_Model', size => '50', class => 'textinput UPS_gen_Model' , pattern=>'.*' , placeholder=>'UPS_gen_Model'
+			<br></span></p>
+`		</div>
+			
+		<span class='data'>
+			%= submit_button l('nut_Save'), class => 'action subm12'
+		</span>
+	
+
+		
+	
+		%# Probably finally by a submit.
+	%end    
+</div>

root/usr/share/smanager/themes/default/templates/partials/_nut_STATUS.html.ep

@@ -0,0 +1,48 @@
+%#
+%# Generated by SM2Gen version:0.9(20Jan2025) Chameleon version:4.5.4 On Python:3.12.3 at 2025-01-20 16:21:33 
+%#
+<div id="Nutups-STATUS" class="partial Nutups-STATUS">
+	<script>
+		window.onload = function() {
+		SelectInput(); 
+	};
+	</script>
+	% if (config->{debug} == 1) {
+		<pre>
+			%= dumper $nut_data
+		</pre>
+	% }
+	% my $btn = l('nut_APPLY');
+	%= form_for "nutupsu" => (method => 'POST') => begin
+		% param 'trt' => $nut_data->{trt} unless param 'trt';
+		%= hidden_field 'trt' => $nut_data->{trt}
+		%# Inputs etc in here.
+
+		<div class=inline-buttons>
+		
+	
+		<a href='nutupsd?trt=CONFIG' class='link link1'>
+			%= l('nut_Configure_NutUPS')
+		</a>
+		%#= link_to l('nut_Configure_NutUPS'), 'nutupsd?trt=CONFIG' , class=>'link link1'
+	
+	
+		</div>
+		
+	
+		<h2 class='subh1'><%=l('nut_Status_of_the_controlled_UPS')%></h2>
+	
+		<p class='paragraph para1'>
+			%=l('nut_Descriptive_paragraph')
+		</p>
+	
+		<span class=label>
+			%=l('nut_Status_(from_upsc)')
+		</span><span class=data>
+			% param 'UPSStatus' => $nut_data->{UPSStatus} unless param 'UPSStatus';
+			%= text_area 'UPSStatus', cols=>55, rows=>35, Readonly=>'true'
+		</span><br>
+	
+		%# Probably finally by a submit.
+	%end    
+</div>

root/usr/share/smanager/themes/default/templates/partials/_nut_UPS_STATUS.html.ep

@@ -0,0 +1,50 @@
+% layout 'default';
+% title 'UPS Status';
+
+<h1>UPS Status</h1>
+%= stylesheet '/css/nut_ups-status-page.css'
+<div class="ups-status-page">
+	<div class="grid">
+		<div class="card">
+			<h2>Device Information</h2>
+			<table>
+				<tr><td>Manufacturer:</td><td><%= $ups_data->{'device.mfr'} %></td></tr>
+				<tr><td>Model:</td><td><%= $ups_data->{'device.model'} %></td></tr>
+				<tr><td>Serial:</td><td><%= $ups_data->{'device.serial'} %></td></tr>
+				<tr><td>Type:</td><td><%= $ups_data->{'device.type'} %></td></tr>
+			</table>
+		</div>
+		
+		<div class="card">
+			<h2>Battery Status</h2>
+			<table>
+				<tr><td>Charge:</td><td><%= $ups_data->{'battery.charge'} %>%</td></tr>
+				<tr><td>Runtime:</td><td><%= sprintf("%.2f", $ups_data->{'battery.runtime'} / 60) %> minutes</td></tr>
+				<tr><td>Voltage:</td><td><%= $ups_data->{'battery.voltage'} %>V</td></tr>
+				<tr><td>Type:</td><td><%= $ups_data->{'battery.type'} %></td></tr>
+			</table>
+		</div>
+		
+		<div class="card">
+			<h2>Input Power</h2>
+			<table>
+				<tr><td>Voltage:</td><td><%= $ups_data->{'input.voltage'} %>V</td></tr>
+				<tr><td>Nominal Voltage:</td><td><%= $ups_data->{'input.voltage.nominal'} %>V</td></tr>
+				<tr><td>Sensitivity:</td><td><%= $ups_data->{'input.sensitivity'} %></td></tr>
+				<tr><td>Transfer High:</td><td><%= $ups_data->{'input.transfer.high'} %>V</td></tr>
+				<tr><td>Transfer Low:</td><td><%= $ups_data->{'input.transfer.low'} %>V</td></tr>
+			</table>
+		</div>
+		
+		<div class="card">
+			<h2>UPS Status</h2>
+			<table>
+				<tr><td>Status:</td><td><%= $ups_data->{'ups.status'} %></td></tr>
+				<tr><td>Load:</td><td><%= $ups_data->{'ups.load'} %>%</td></tr>
+				<tr><td>Beeper:</td><td><%= $ups_data->{'ups.beeper.status'} %></td></tr>
+				<tr><td>Firmware:</td><td><%= $ups_data->{'ups.firmware'} %></td></tr>
+				<tr><td>Test Result:</td><td><%= $ups_data->{'ups.test.result'} %></td></tr>
+			</table>
+		</div>
+	</div>
+</div>

smeserver-nutUPS.spec

@@ -4,7 +4,7 @@ Summary: SME server - nut UPS interaction module
 %define name smeserver-nutUPS
 Name: %{name}
 %define version 11.0.0
-%define release 5
+%define release 6
 Version: %{version}
 Release: %{release}%{?dist}
 License: GPL
@@ -25,6 +25,9 @@ A module which configures the Network UPS Tools suite for operation with
 the SME server software.
 
 %changelog
+* Mon Mar 03 2025 Brian Read <brianr@koozali.org> 11.0.0-6.sme
+- Add in SM2 NutUPS configuration and status panel [SME: 12949]
+
 * Wed Jan 15 2025 Jean-Philippe Pialasse <jpp@koozali.org> 11.0.0-5.sme
 - remove Requires daemontools [SME: 12566]