SolarManager unter Versionsverwaltung
Erster Stand der Hintergrundprozesse, die auf der Synology unter /volume1/homes/wagner/SolarManager laufen: der Manager selbst, die Sammler je Geraet, die MQTT-Bruecke, der Wecker und - neu hinzugezogen - der AutoAction-Runner, der als Hintergrundprozess hierher gehoert und nicht ins Web-Verzeichnis. Zugangsdaten stehen nicht mehr im Quelltext, sondern in config.ini, die nicht mit eingecheckt wird. Vorlage ist config.ini.example, gelesen wird sie von konfig.py. Betroffen waren solarManager.py (Datenbank und Wattpilot), zeit.py, gatherWaterData.py, wecker.py und skoda_testdaten.py, das sich das Passwort bisher aus dem Quelltext eines anderen Moduls herausgesucht hat. Die Kia-Anbindung ist mit dem Fahrzeug entfallen: kiaTest.py, gatherCarData.py und hyundai_kia_connect_api sind nicht mehr dabei, ebenso gatherInverterData.py, auf das nur noch eine auskommentierte Zeile zeigte. Die mitgelieferten Bibliotheken bleiben im Repository - die NAS hat kein pip, sie muessen neben den Skripten liegen. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
Claude Opus 5
@@ -0,0 +1,217 @@
|
||||
import sunspec2.smdx as smdx
|
||||
import sunspec2.mdef as mdef
|
||||
import xml.etree.ElementTree as ET
|
||||
import pytest
|
||||
import copy
|
||||
|
||||
|
||||
def test_to_smdx_filename():
|
||||
assert smdx.to_smdx_filename(77) == 'smdx_00077.xml'
|
||||
|
||||
|
||||
def test_model_filename_to_id():
|
||||
assert smdx.model_filename_to_id('smdx_00077.xml') == 77
|
||||
with pytest.raises(Exception) as exc:
|
||||
smdx.model_filename_to_id('smdx_abc.xml')
|
||||
assert 'Error extracting model id from filename' in str(exc.value)
|
||||
|
||||
|
||||
def test_from_smdx_file():
|
||||
smdx_304 = {'id': 304, 'group': {'name': 'inclinometer', 'type': 'group', 'points': [
|
||||
{'name': 'ID', 'value': 304, 'desc': 'Model identifier', 'label': 'Model ID', 'size': 1, 'mandatory': 'M',
|
||||
'static': 'S', 'type': 'uint16'},
|
||||
{'name': 'L', 'desc': 'Model length', 'label': 'Model Length', 'size': 1, 'mandatory': 'M', 'static': 'S',
|
||||
'type': 'uint16'}], 'groups': [{'name': 'incl', 'type': 'group', 'count': 0, 'points': [
|
||||
{'name': 'Inclx', 'type': 'int32', 'size': 2, 'mandatory': 'M', 'units': 'Degrees', 'sf': -2, 'label': 'X',
|
||||
'desc': 'X-Axis inclination'},
|
||||
{'name': 'Incly', 'type': 'int32', 'size': 2, 'units': 'Degrees', 'sf': -2, 'label': 'Y',
|
||||
'desc': 'Y-Axis inclination'},
|
||||
{'name': 'Inclz', 'type': 'int32', 'size': 2, 'units': 'Degrees', 'sf': -2, 'label': 'Z',
|
||||
'desc': 'Z-Axis inclination'}]}], 'label': 'Inclinometer Model',
|
||||
'desc': 'Include to support orientation measurements'}}
|
||||
assert smdx.from_smdx_file('./sunspec2/models/smdx/smdx_00304.xml') == smdx_304
|
||||
|
||||
|
||||
def test_from_smdx_file_symbols():
|
||||
mdef = smdx.from_smdx_file('sunspec2/models/smdx/smdx_00803.xml')
|
||||
for point_def in mdef["group"]["groups"][0]["points"]:
|
||||
if point_def["name"] != "StrSt":
|
||||
continue
|
||||
symbol = point_def["symbols"][1]
|
||||
assert symbol["name"] == "CONTACTOR_STATUS"
|
||||
assert symbol["label"] == "Contactor Status"
|
||||
assert symbol["desc"].startswith("String")
|
||||
assert symbol["detail"]
|
||||
break
|
||||
else:
|
||||
pytest.fail("Point not found")
|
||||
|
||||
|
||||
def test_from_smdx():
|
||||
tree = ET.parse('./sunspec2/models/smdx/smdx_00304.xml')
|
||||
root = tree.getroot()
|
||||
|
||||
mdef_not_found = copy.deepcopy(root)
|
||||
mdef_not_found.remove(mdef_not_found.find('model'))
|
||||
with pytest.raises(mdef.ModelDefinitionError):
|
||||
smdx.from_smdx(mdef_not_found)
|
||||
|
||||
duplicate_fixed_btype_str = '''
|
||||
<sunSpecModels v="1">
|
||||
|
||||
<model id="63001" len="13">
|
||||
<block len="4">
|
||||
<point id="sunssf_1" offset="0" type="sunssf" />
|
||||
<point id="sunssf_2" offset="1" type="sunssf" />
|
||||
<point id="sunssf_3" offset="2" type="sunssf" />
|
||||
<point id="sunssf_4" offset="3" type="sunssf" />
|
||||
</block>
|
||||
<block len="6">
|
||||
<point id="int16_1" offset="0" type="int16" sf="sunssf_1" />
|
||||
<point id="int16_2" offset="1" type="int16" sf="sunssf_2" />
|
||||
<point id="int16_3" offset="2" type="int16" sf="sunssf_3" />
|
||||
<point id="int16_4" offset="3" type="int16" sf="sunssf_4" access="rw" />
|
||||
<point id="int16_5" offset="4" type="int16" />
|
||||
<point id="int16_u" offset="5" type="int16" />
|
||||
</block>
|
||||
<block type="repeating" len="3">
|
||||
<point id="sunssf_8" offset="0" type="sunssf" />
|
||||
<point id="int16_11" offset="1" type="int16" sf="sunssf_8" access="rw" />
|
||||
<point id="int16_12" offset="2" type="int16" sf="sunssf_9" />
|
||||
</block>
|
||||
</model>
|
||||
<strings id="63001" locale="en">
|
||||
<model>
|
||||
<label>SunSpec Test Model 1</label>
|
||||
</model>
|
||||
</strings>
|
||||
</sunSpecModels>
|
||||
'''
|
||||
duplicate_fixed_btype_xml = ET.fromstring(duplicate_fixed_btype_str)
|
||||
with pytest.raises(mdef.ModelDefinitionError):
|
||||
smdx.from_smdx(duplicate_fixed_btype_xml)
|
||||
|
||||
dup_repeating_btype_str = '''
|
||||
<sunSpecModels v="1">
|
||||
<model id="63001" len="12">
|
||||
<block len="4">
|
||||
<point id="sunssf_1" offset="0" type="sunssf" />
|
||||
<point id="sunssf_2" offset="1" type="sunssf" />
|
||||
<point id="sunssf_3" offset="2" type="sunssf" />
|
||||
<point id="sunssf_4" offset="3" type="sunssf" />
|
||||
</block>
|
||||
<block type="repeating" len="3">
|
||||
<point id="sunssf_8" offset="0" type="sunssf" />
|
||||
<point id="int16_11" offset="1" type="int16" sf="sunssf_8" access="rw" />
|
||||
<point id="int16_12" offset="2" type="int16" sf="sunssf_9" />
|
||||
</block>
|
||||
<block type="repeating" len="5">
|
||||
<point id="int32_u" offset="0" type="int32" />
|
||||
<point id="uint32" offset="1" type="uint32" sf="sunssf_9" access="rw"/>
|
||||
<point id="uint32_u" offset="2" type="uint32" />
|
||||
<point id="sunssf_9" offset="3" type="sunssf" />
|
||||
<point id="pad_2" offset="4" type="pad" />
|
||||
</block>
|
||||
</model>
|
||||
<strings id="63001" locale="en">
|
||||
<model>
|
||||
<label>SunSpec Test Model 1</label>
|
||||
</model>
|
||||
</strings>
|
||||
</sunSpecModels>
|
||||
'''
|
||||
dup_repeating_btype_xml = ET.fromstring(dup_repeating_btype_str)
|
||||
with pytest.raises(mdef.ModelDefinitionError):
|
||||
smdx.from_smdx(dup_repeating_btype_xml)
|
||||
|
||||
invalid_btype_root = copy.deepcopy(root)
|
||||
invalid_btype_root.find('model').find('block').set('type', 'abc')
|
||||
with pytest.raises(mdef.ModelDefinitionError):
|
||||
smdx.from_smdx(invalid_btype_root)
|
||||
|
||||
dup_fixed_p_def_str = '''
|
||||
<sunSpecModels v="1">
|
||||
<model id="63001" len="4">
|
||||
<block len="4">
|
||||
<point id="sunssf_1" offset="0" type="sunssf" />
|
||||
<point id="sunssf_2" offset="1" type="sunssf" />
|
||||
<point id="sunssf_1" offset="2" type="sunssf" />
|
||||
<point id="sunssf_4" offset="3" type="sunssf" />
|
||||
</block>
|
||||
</model>
|
||||
<strings id="63001" locale="en">
|
||||
<model>
|
||||
<label>SunSpec Test Model 1</label>
|
||||
</model>
|
||||
</strings>
|
||||
</sunSpecModels>
|
||||
'''
|
||||
dup_fixed_p_def_xml = ET.fromstring(dup_fixed_p_def_str)
|
||||
with pytest.raises(mdef.ModelDefinitionError):
|
||||
smdx.from_smdx(dup_fixed_p_def_xml)
|
||||
|
||||
dup_repeating_p_def_str = '''
|
||||
<sunSpecModels v="1">
|
||||
<model id="63001" len="7">
|
||||
<block len="4">
|
||||
<point id="sunssf_1" offset="0" type="sunssf" />
|
||||
<point id="sunssf_2" offset="1" type="sunssf" />
|
||||
<point id="sunssf_3" offset="2" type="sunssf" />
|
||||
<point id="sunssf_4" offset="3" type="sunssf" />
|
||||
</block>
|
||||
<block type="repeating" len="3">
|
||||
<point id="sunssf_8" offset="0" type="sunssf" />
|
||||
<point id="sunssf_8" offset="1" type="int16" sf="sunssf_8" access="rw" />
|
||||
<point id="int16_12" offset="2" type="int16" sf="sunssf_9" />
|
||||
</block>
|
||||
</model>
|
||||
<strings id="63001" locale="en">
|
||||
<model>
|
||||
<label>SunSpec Test Model 1</label>
|
||||
</model>
|
||||
</strings>
|
||||
</sunSpecModels>
|
||||
'''
|
||||
dup_repeating_p_def_xml = ET.fromstring(dup_repeating_p_def_str)
|
||||
with pytest.raises(mdef.ModelDefinitionError):
|
||||
smdx.from_smdx(dup_repeating_p_def_xml)
|
||||
|
||||
|
||||
def test_from_smdx_point():
|
||||
smdx_point_str = """<point id="Mn" offset="0" type="string" len="16" mandatory="true" />"""
|
||||
smdx_point_xml = ET.fromstring(smdx_point_str)
|
||||
assert smdx.from_smdx_point(smdx_point_xml) == {'name': 'Mn', 'type': 'string', 'size': 16, 'mandatory': 'M'}
|
||||
|
||||
missing_pid_xml = copy.deepcopy(smdx_point_xml)
|
||||
del missing_pid_xml.attrib['id']
|
||||
with pytest.raises(mdef.ModelDefinitionError):
|
||||
smdx.from_smdx_point(missing_pid_xml)
|
||||
|
||||
missing_ptype = copy.deepcopy(smdx_point_xml)
|
||||
del missing_ptype.attrib['type']
|
||||
with pytest.raises(mdef.ModelDefinitionError):
|
||||
smdx.from_smdx_point(missing_ptype)
|
||||
|
||||
unk_ptype = copy.deepcopy(smdx_point_xml)
|
||||
unk_ptype.attrib['type'] = 'abc'
|
||||
with pytest.raises(mdef.ModelDefinitionError):
|
||||
smdx.from_smdx_point(unk_ptype)
|
||||
|
||||
missing_len = copy.deepcopy(smdx_point_xml)
|
||||
del missing_len.attrib['len']
|
||||
with pytest.raises(mdef.ModelDefinitionError):
|
||||
smdx.from_smdx_point(missing_len)
|
||||
|
||||
unk_mand_type = copy.deepcopy(smdx_point_xml)
|
||||
unk_mand_type.attrib['mandatory'] = 'abc'
|
||||
with pytest.raises(mdef.ModelDefinitionError):
|
||||
smdx.from_smdx_point(unk_mand_type)
|
||||
|
||||
unk_access_type = copy.deepcopy(smdx_point_xml)
|
||||
unk_access_type.attrib['access'] = 'abc'
|
||||
with pytest.raises(mdef.ModelDefinitionError):
|
||||
smdx.from_smdx_point(unk_access_type)
|
||||
|
||||
|
||||
def test_indent():
|
||||
pass
|
||||
Reference in New Issue
Block a user