latest version

fixed APKBUILD file


fixed APKBUILD

wrong dependencies
version 0.2


version 0.3

acf-app/openpdu-boardsconf-html.lsp

@@ -0,0 +1 @@
+../expert-html.lsp

acf-app/openpdu-controller.lua

@@ -16,4 +16,12 @@ mymodule.poweroff = function(self)
 	return self.handle_form(self, self.model.get_setpower, self.model.setpoweroff, self.clientdata, "commitpower", "Action result")
 end
 
+function mymodule.outletsconf(self)
+	return self.handle_form(self, self.model.get_outletsFiledetails, self.model.update_outletsFiledetails, self.clientdata, "Save", "Edit Outlets Config File", "Configuration Set")
+end
+
+function mymodule.boardsconf(self)
+	return self.handle_form(self, self.model.get_boardsFiledetails, self.model.update_boardsFiledetails, self.clientdata, "Save", "Edit Boards Config File", "Configuration Set")
+end
+
 return mymodule

acf-app/openpdu-model.lua

@@ -2,87 +2,66 @@ local mymodule = {}
 
 posix = require("posix")
 fs = require("acf.fs")
+json = require('cjson')
+modelfunctions = require("modelfunctions")
 
-local configpath = "/etc/openpdu/"
+local outletsConfigfile = "/etc/openpdu/outlets.conf"
+local boardsConfigfile = "/etc/openpdu/boards.conf"
+local s = modelfunctions.run_executable({"/usr/bin/openpdu", "outlets", "-j"})
+local o = json.decode(s)
+local outlets = {}
 
-local config = {}
-for i=1,8 do
-	config[i]={socket=i,status="unknown",description="Socket " .. tostring(i),actions={"on","off"}}
+for Index, Value in pairs( o.outlets ) do
+	if (Value.powerstatus) then
+		s = "On"
+	else
+	  s = "Off"
+	end
+  outlets[Value.outlet+1] = {outlet=Value.outlet,status=s,description=Value.description,actions={"on","off"}}
 end
-config[1].gpio=1
-config[2].gpio=2
-config[3].gpio=3
-config[4].gpio=7
-config[5].gpio=8
-config[6].gpio=9
-config[7].gpio=11
-config[8].gpio=12
+
+
+
 
 mymodule.status = function()
-  mymodule.updatestatus()
-	return cfe({ type="structure", value=config, label="Outlets" })
+	return cfe({ type="structure", value=outlets, label="Outlets" })
 end
 
-mymodule.updatestatus = function()
-	for i=1,8 do
-	  f = "/sys/class/gpio/gpio" .. tostring(config[i].gpio) .. "/value"
-		v = fs.read_file(f)
-		if (tonumber(v) == 0) then
-			s = "On"
-		elseif (tonumber(v) == 1) then
-			s = "Off"
-		else
-			s = "unknown (" .. v .. ")"
-		end
-		config[i].status = s
-	end
-end
-
-
-mymodule.setpower = function(socket, power, ret)
-  -- Check to make sure the socket is valid
-  if (socket == nil) then
-          ret.errtxt = "Socket cannot be nil"
-  elseif (not type(socket) == "number") then
-          ret.errtxt = "Socket must be a number"
-	elseif (tonumber(socket) < 0) then
-          ret.errtxt = "Socket must be >0"
-	elseif (tonumber(socket) > 8) then
-          ret.errtxt = "Socket must be <=8"
-  end
-
-  -- If it is, poweron the socket
-  if (ret.errtxt == nil ) then
-		f = "/sys/class/gpio/gpio" .. tostring(config[tonumber(socket)].gpio) .. "/value"
-		if (power == 1) then
-			ret.descr = "Socket " .. tostring(socket) .. " Powered ON"
-			p = "0"
-		else
-  		ret.descr = "Socket " .. tostring(socket) .. " Powered OFF"
-			p = "1"
-		end
-		v = fs.write_file(f, p)
-	  return ret
-  end
-
-	return ret
+mymodule.setpower = function(outlet, power, ret)
+	return modelfunctions.run_executable({"/usr/bin/openpdu", "setpower", outlet, power})
 end
 
 
 
 mymodule.get_setpower = function(self, clientdata)
-  local socket = cfe({label="Socket", value=clientdata.socket or ""})
-	return cfe({ type="group", label="Set Socket Power state", value={socket=socket} })
+  local outlet = cfe({label="Outlet", value=clientdata.outlet or ""})
+	return cfe({ type="group", label="Set Outlet Power state", value={outlet=outlet} })
 end
 
 mymodule.setpoweron = function(self, r)
-  mymodule.setpower(r.value.socket.value, 1, r)
+  mymodule.setpower(r.value.outlet.value, 1, r)
 	return r
 end
 
 mymodule.setpoweroff = function(self, r)
-  mymodule.setpower(r.value.socket.value, 0, r)
+  mymodule.setpower(r.value.outlet.value, 0, r)
 	return r
 end
 
+function mymodule.get_outletsFiledetails()
+	return modelfunctions.getfiledetails(outletsConfigfile)
+end
+
+function mymodule.update_outletsFiledetails(self, filedetails)
+	return modelfunctions.setfiledetails(self, filedetails, {outletsConfigfile})
+end
+
+function mymodule.get_boardsFiledetails()
+	return modelfunctions.getfiledetails(boardsConfigfile)
+end
+
+function mymodule.update_boardsFiledetails(self, filedetails)
+	return modelfunctions.setfiledetails(self, filedetails, {boardsConfigfile})
+end
+
 return mymodule

acf-app/openpdu-outletsconf-html.lsp

@@ -0,0 +1 @@
+../expert-html.lsp

acf-app/openpdu-status-html.lsp

@@ -25,7 +25,7 @@
 <% local header_level = htmlviewfunctions.displaysectionstart(view, page_info) %>
 <table id="list" class="tablesorter"><thead>
 	<tr>
-		<th>Socket #</th>
+		<th>Outlet #</th>
 		<th>Status</th>
 		<th>Description</th>
     <% if viewlibrary.check_permission("edit") or viewlibrary.check_permission("power") then %>
@@ -37,18 +37,18 @@
 local redir = cfe({type="hidden", value=page_info.orig_action})
 for i,item in ipairs(view.value) do %>
 	<tr>
-    <td><%= html.html_escape(item.socket) %></td>
+    <td><%= html.html_escape(item.outlet) %></td>
     <td><%= html.html_escape(item.status) %></td>
     <td><%= html.html_escape(item.description) %></td>
 		<% if viewlibrary.check_permission("edit") or viewlibrary.check_permission("power") then %>
 		<td>
-      <% local socket = cfe({type="hidden", value=item.socket}) %>
+      <% local outlet = cfe({type="hidden", value=item.outlet}) %>
   		<% if viewlibrary.check_permission("edit") then
-  			htmlviewfunctions.displayitem(cfe({type="link", value={socket=socket, redir=redir}, label="", option="Edit", action="edit" }), page_info, -1)
+  			htmlviewfunctions.displayitem(cfe({type="link", value={outlet=outlet, redir=redir}, label="", option="Edit", action="edit" }), page_info, -1)
   		end %>
       <% if viewlibrary.check_permission("poweron") or viewlibrary.check_permission("poweroff") then
-        htmlviewfunctions.displayitem(cfe({type="form", value={socket=socket, redir=redir}, label="", option="Power ON", action="poweron" }), page_info, -1)
-        htmlviewfunctions.displayitem(cfe({type="form", value={socket=socket, redir=redir}, label="", option="Power OFF", action="poweroff" }), page_info, -1)
+        htmlviewfunctions.displayitem(cfe({type="form", value={outlet=outlet, redir=redir}, label="", option="Power ON", action="poweron" }), page_info, -1)
+        htmlviewfunctions.displayitem(cfe({type="form", value={outlet=outlet, redir=redir}, label="", option="Power OFF", action="poweroff" }), page_info, -1)
   		end %>
 		</td>
 		<% end %>

acf-app/openpdu.menu

@@ -1,2 +1,4 @@
 #CAT  		GROUP/DESC		TAB		ACTION
 Applications 	20OpenPDU		Status		status
+Applications 	20OpenPDU		Outlets		outletsconf
+Applications 	20OpenPDU		Boards		boardsconf

acf-app/openpdu.roles

@@ -1,4 +1,4 @@
 USER=openpdu:status
 EDITOR=openpdu:status
-EXPERT=openpdu:status
-ADMIN=openpdu:status,openpdu:edit,openpdu:power,openpdu:poweron,openpdu:poweroff
+EXPERT=openpdu:status,openpdu:outletsconf,openpdu:boardsconf
+ADMIN=openpdu:status,openpdu:edit,openpdu:outletsconf,openpdu:boardsconf,openpdu:power,openpdu:poweron,openpdu:poweroff