<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/13621">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">powersupply: Add support for Intellinet PDU<br><br>Based on original pdutool code from Joachim Steiger.<br><br>Change-Id: Iab4f7aec1c50f47da4cd734441bb36fa09d171a3<br>---<br>M check_dependencies.py<br>M src/osmo_gsm_tester/powersupply.py<br>A src/osmo_gsm_tester/powersupply_intellinet.py<br>3 files changed, 103 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/check_dependencies.py b/check_dependencies.py</span><br><span>index 83df7a9..28bfdf7 100755</span><br><span>--- a/check_dependencies.py</span><br><span>+++ b/check_dependencies.py</span><br><span>@@ -26,5 +26,7 @@</span><br><span> import sqlite3</span><br><span> import sispm</span><br><span> import smpplib</span><br><span style="color: hsl(120, 100%, 40%);">+import urllib.request</span><br><span style="color: hsl(120, 100%, 40%);">+import xml.etree.ElementTree</span><br><span> </span><br><span> print('dependencies ok')</span><br><span>diff --git a/src/osmo_gsm_tester/powersupply.py b/src/osmo_gsm_tester/powersupply.py</span><br><span>index 86fc010..1cf7106 100644</span><br><span>--- a/src/osmo_gsm_tester/powersupply.py</span><br><span>+++ b/src/osmo_gsm_tester/powersupply.py</span><br><span>@@ -1,6 +1,6 @@</span><br><span> # osmo_gsm_tester: class defining a Power Supply object</span><br><span> #</span><br><span style="color: hsl(0, 100%, 40%);">-# Copyright (C) 2018 by sysmocom - s.f.m.c. GmbH</span><br><span style="color: hsl(120, 100%, 40%);">+# Copyright (C) 2018-2019 by sysmocom - s.f.m.c. GmbH</span><br><span> #</span><br><span> # Author: Pau Espin Pedrol <pespin@sysmocom.de></span><br><span> #</span><br><span>@@ -51,10 +51,11 @@</span><br><span> self.power_set(True)</span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-from . import powersupply_sispm</span><br><span style="color: hsl(120, 100%, 40%);">+from . import powersupply_sispm, powersupply_intellinet</span><br><span> </span><br><span> KNOWN_PWSUPPLY_TYPES = {</span><br><span> 'sispm' : powersupply_sispm.PowerSupplySispm,</span><br><span style="color: hsl(120, 100%, 40%);">+ 'intellinet' : powersupply_intellinet.PowerSupplyIntellinet,</span><br><span> }</span><br><span> </span><br><span> def register_type(name, clazz):</span><br><span>diff --git a/src/osmo_gsm_tester/powersupply_intellinet.py b/src/osmo_gsm_tester/powersupply_intellinet.py</span><br><span>new file mode 100644</span><br><span>index 0000000..c2bf2c8</span><br><span>--- /dev/null</span><br><span>+++ b/src/osmo_gsm_tester/powersupply_intellinet.py</span><br><span>@@ -0,0 +1,98 @@</span><br><span style="color: hsl(120, 100%, 40%);">+# osmo_gsm_tester: class defining a Power Supply object</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# Copyright (C) 2019 by sysmocom - s.f.m.c. GmbH</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# Author: Pau Espin Pedrol <pespin@sysmocom.de></span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# This program is free software: you can redistribute it and/or modify</span><br><span style="color: hsl(120, 100%, 40%);">+# it under the terms of the GNU General Public License as</span><br><span style="color: hsl(120, 100%, 40%);">+# published by the Free Software Foundation, either version 3 of the</span><br><span style="color: hsl(120, 100%, 40%);">+# License, or (at your option) any later version.</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# This program is distributed in the hope that it will be useful,</span><br><span style="color: hsl(120, 100%, 40%);">+# but WITHOUT ANY WARRANTY; without even the implied warranty of</span><br><span style="color: hsl(120, 100%, 40%);">+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the</span><br><span style="color: hsl(120, 100%, 40%);">+# GNU General Public License for more details.</span><br><span style="color: hsl(120, 100%, 40%);">+#</span><br><span style="color: hsl(120, 100%, 40%);">+# You should have received a copy of the GNU General Public License</span><br><span style="color: hsl(120, 100%, 40%);">+# along with this program. If not, see <http://www.gnu.org/licenses/>.</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+import urllib.request</span><br><span style="color: hsl(120, 100%, 40%);">+import xml.etree.ElementTree as ET</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+from . import log</span><br><span style="color: hsl(120, 100%, 40%);">+from .powersupply import PowerSupply</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+class PowerSupplyIntellinet(PowerSupply):</span><br><span style="color: hsl(120, 100%, 40%);">+ """PowerSupply implementation to controll Intellinet devices."""</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ # HTTP request timeout, in seconds</span><br><span style="color: hsl(120, 100%, 40%);">+ PDU_TIMEOUT = 5</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ PDU_CMD_ON = 0</span><br><span style="color: hsl(120, 100%, 40%);">+ PDU_CMD_OFF = 1</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def _url_prefix(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ return 'http://' + self.device_ip</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def _url_status(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ return self._url_prefix() + '/status.xml'</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def _url_set_port_status(self, pdu_cmd):</span><br><span style="color: hsl(120, 100%, 40%);">+ return self._url_prefix() + "/control_outlet.htm?" + "outlet" + str(self.port - 1) + "=1" + "&op=" + str(pdu_cmd) + "&submit=Anwenden"</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def _port_stat_name(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ # Names start with idx 0, while in ogt we count sockets starting from 1.</span><br><span style="color: hsl(120, 100%, 40%);">+ return 'outletStat' + str(self.port - 1)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def _fetch_status(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ data = urllib.request.urlopen(self._url_status(), timeout = self.PDU_TIMEOUT).read()</span><br><span style="color: hsl(120, 100%, 40%);">+ if not data:</span><br><span style="color: hsl(120, 100%, 40%);">+ raise log.Error('empty status xml')</span><br><span style="color: hsl(120, 100%, 40%);">+ return data</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def _get_port_status(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ data = self._fetch_status()</span><br><span style="color: hsl(120, 100%, 40%);">+ root = ET.fromstring(data)</span><br><span style="color: hsl(120, 100%, 40%);">+ for child in root:</span><br><span style="color: hsl(120, 100%, 40%);">+ if child.tag == self._port_stat_name():</span><br><span style="color: hsl(120, 100%, 40%);">+ return child.text</span><br><span style="color: hsl(120, 100%, 40%);">+ raise log.Error('no state for %s' % self._port_stat_name())</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def _set_port_status(self, pdu_cmd):</span><br><span style="color: hsl(120, 100%, 40%);">+ urllib.request.urlopen(self._url_set_port_status(pdu_cmd),timeout = self.PDU_TIMEOUT).read()</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+########################</span><br><span style="color: hsl(120, 100%, 40%);">+# PUBLIC - INTERNAL API</span><br><span style="color: hsl(120, 100%, 40%);">+########################</span><br><span style="color: hsl(120, 100%, 40%);">+ def __init__(self, conf):</span><br><span style="color: hsl(120, 100%, 40%);">+ super().__init__(conf, 'intellinet')</span><br><span style="color: hsl(120, 100%, 40%);">+ mydevid = conf.get('device')</span><br><span style="color: hsl(120, 100%, 40%);">+ if mydevid is None:</span><br><span style="color: hsl(120, 100%, 40%);">+ raise log.Error('No "device" attribute provided in supply conf!')</span><br><span style="color: hsl(120, 100%, 40%);">+ self.set_name('intellinet-'+mydevid)</span><br><span style="color: hsl(120, 100%, 40%);">+ myport = conf.get('port')</span><br><span style="color: hsl(120, 100%, 40%);">+ if myport is None:</span><br><span style="color: hsl(120, 100%, 40%);">+ raise log.Error('No "port" attribute provided in power_supply conf!')</span><br><span style="color: hsl(120, 100%, 40%);">+ if not int(myport):</span><br><span style="color: hsl(120, 100%, 40%);">+ raise log.Error('Wrong non numeric "port" attribute provided in power_supply conf!')</span><br><span style="color: hsl(120, 100%, 40%);">+ self.set_name('intellinet-'+mydevid+'-'+myport)</span><br><span style="color: hsl(120, 100%, 40%);">+ self.device_ip = mydevid</span><br><span style="color: hsl(120, 100%, 40%);">+ self.port = int(myport)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def is_powered(self):</span><br><span style="color: hsl(120, 100%, 40%);">+ """Get whether the device is powered on or off."""</span><br><span style="color: hsl(120, 100%, 40%);">+ return self._get_port_status() == 'on'</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ def power_set(self, onoff):</span><br><span style="color: hsl(120, 100%, 40%);">+ """Turn on (onoff=True) or off (onoff=False) the device."""</span><br><span style="color: hsl(120, 100%, 40%);">+ if onoff:</span><br><span style="color: hsl(120, 100%, 40%);">+ self.dbg('switchon')</span><br><span style="color: hsl(120, 100%, 40%);">+ self._set_port_status(self.PDU_CMD_ON)</span><br><span style="color: hsl(120, 100%, 40%);">+ else:</span><br><span style="color: hsl(120, 100%, 40%);">+ self.dbg('switchoff')</span><br><span style="color: hsl(120, 100%, 40%);">+ self._set_port_status(self.PDU_CMD_OFF)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+# vim: expandtab tabstop=4 shiftwidth=4</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13621">change 13621</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/13621"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-gsm-tester </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Iab4f7aec1c50f47da4cd734441bb36fa09d171a3 </div>
<div style="display:none"> Gerrit-Change-Number: 13621 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>