Skip to content

Commit

Permalink
Merge branch 'development' into feature/FDP-2756-github-workflow-update
Browse files Browse the repository at this point in the history
  • Loading branch information
@JelleHoffman
JelleHoffman committed Dec 2, 2024
2 parents 8c1c6e2 + 1991569 commit 77f257e
Show file tree
Hide file tree
Showing 10 changed files with 440 additions and 20 deletions.
28 changes: 21 additions & 7 deletions ...rc/test/resources/features/osgp-adapter-ws-smartmetering/bundle/BundledGetOutages.feature
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,18 +7,32 @@ Feature: SmartMetering Bundle - GetOutages
As a grid operator
I want to retrieve the power outages from a meter via a bundle request

Background:
Scenario Outline: Retrieve power outages of a <protocol> <version> device in a bundle request
Given a dlms device
| DeviceIdentification | TEST1024000000001 |
| DeviceType | SMART_METER_E |

Scenario: Retrieve power outages of a device in a bundle request
Given a bundle request
| DeviceIdentification | TEST1024000000001 |
| DeviceIdentification | <deviceIdentification> |
| DeviceType | SMART_METER_E |
| Protocol | <protocol> |
| ProtocolVersion | <version> |
And a bundle request
| DeviceIdentification | <deviceIdentification> |
And the bundle request contains a get outages action
When the bundle request is received
Then the bundle response should contain a get outages response with 4 outages
| 2015-09-01T00:00:00.000+02:00 | 180 |
| 2015-08-31T00:00:00.000+02:00 | 360 |
| 2015-08-30T00:00:00.000+02:00 | 540 |
| 2015-08-29T00:00:00.000+02:00 | 720 |

Examples:
| deviceIdentification | protocol | version |
| TEST1024000000001 | DSMR | 4.2.2 |
@NightlyBuildOnly
Examples:
| deviceIdentification | protocol | version |
| TEST1024000000001 | DSMR | 2.2 |
| TEST1031000000001 | SMR | 4.3 |
| TEST1027000000001 | SMR | 5.0.0 |
| TEST1028000000001 | SMR | 5.1 |
| TEST1029000000001 | SMR | 5.2 |
| TEST1030000000001 | SMR | 5.5 |

2 changes: 2 additions & 0 deletions ...s/osgp-dlms/src/main/java/org/opensmartgridplatform/dlms/objectconfig/DlmsObjectType.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -146,6 +146,8 @@ public enum DlmsObjectType {
MAGNITUDE_OF_LAST_CURRENT_OVER_LIMIT_THD_IN_PHASE_L1,
MAGNITUDE_OF_LAST_CURRENT_OVER_LIMIT_THD_IN_PHASE_L2,
MAGNITUDE_OF_LAST_CURRENT_OVER_LIMIT_THD_IN_PHASE_L3,
POWER_FAILURE_EVENT_LOG,
DURATION_OF_LONG_POWER_FAILURES,
THD_VALUE_THRESHOLD,
THD_VALUE_HYSTERESIS,
THD_MIN_DURATION_NORMAL_TO_OVER,
Expand Down
94 changes: 94 additions & 0 deletions osgp/protocol-adapter-dlms/osgp-dlms/src/main/resources/dlmsprofiles/dlmsprofile-dsmr22.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1517,6 +1517,71 @@

]
},
{
"tag": "POWER_FAILURE_EVENT_LOG",
"description": "Event log containing Power Failure events",
"class-id": 7,
"version": 1,
"obis": "1.0.99.97.0.255",
"group": "ABSTRACT",
"meterTypes": ["SP","PP"],
"attributes": [
{
"id": 2,
"description": "buffer",
"datatype": "array",
"valuetype": "DYNAMIC",
"access": "R"
},
{
"id": 3,
"description": "capture objects",
"datatype": "array",
"valuetype": "FIXED_IN_PROFILE",
"value": "CLOCK,2|DURATION_OF_LONG_POWER_FAILURES,2",
"access": "R"
},
{
"id": 4,
"description": "capture period",
"datatype": "double-long-unsigned",
"valuetype": "FIXED_IN_PROFILE",
"value": "0",
"access": "R"
},
{
"id": 5,
"description": "sort method",
"datatype": "enum",
"valuetype": "FIXED_IN_PROFILE",
"value": "1",
"access": "R"
},
{
"id": 6,
"description": "sort object",
"datatype": "object_definition",
"valuetype": "FIXED_IN_METER",
"access": "R"
},
{
"id": 7,
"description": "entries in use",
"datatype": "double-long-unsigned",
"valuetype": "DYNAMIC",
"access": "R"
},
{
"id": 8,
"description": "profile entries",
"datatype": "double-long-unsigned",
"valuetype": "FIXED_IN_PROFILE",
"value": "10",
"access": "R"
}

]
},
{
"tag": "STANDARD_EVENT_CODE",
"description": "Standard event log code",
Expand Down Expand Up @@ -1571,6 +1636,35 @@
}
]
},
{
"tag": "DURATION_OF_LONG_POWER_FAILURES",
"description": "Duration of long power failures in any phase ",
"class-id": 3,
"version": 0,
"obis": "0.0.96.7.19.255",
"group": "ELECTRICITY",
"meterTypes": [
"SP",
"PP"
],
"attributes": [
{
"id": 2,
"description": "value",
"datatype": "double-long-unsigned",
"valuetype": "DYNAMIC",
"access": "R"
},
{
"id": 3,
"description": "scaler_unit",
"datatype": "scal_unit_type",
"valuetype": "FIXED_IN_PROFILE",
"value": "0, s",
"access": "R"
}
]
},
{
"tag": "MBUS_CLIENT_SETUP",
"description": "M-Bus client setup",
Expand Down
94 changes: 94 additions & 0 deletions .../protocol-adapter-dlms/osgp-dlms/src/main/resources/dlmsprofiles/dlmsprofile-dsmr422.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2756,6 +2756,71 @@

]
},
{
"tag": "POWER_FAILURE_EVENT_LOG",
"description": "Event log containing Power Failure events",
"class-id": 7,
"version": 1,
"obis": "1.0.99.97.0.255",
"group": "ABSTRACT",
"meterTypes": ["SP","PP"],
"attributes": [
{
"id": 2,
"description": "buffer",
"datatype": "array",
"valuetype": "DYNAMIC",
"access": "R"
},
{
"id": 3,
"description": "capture objects",
"datatype": "array",
"valuetype": "FIXED_IN_PROFILE",
"value": "CLOCK,2|DURATION_OF_LONG_POWER_FAILURES,2",
"access": "R"
},
{
"id": 4,
"description": "capture period",
"datatype": "double-long-unsigned",
"valuetype": "FIXED_IN_PROFILE",
"value": "0",
"access": "R"
},
{
"id": 5,
"description": "sort method",
"datatype": "enum",
"valuetype": "FIXED_IN_PROFILE",
"value": "1",
"access": "R"
},
{
"id": 6,
"description": "sort object",
"datatype": "object_definition",
"valuetype": "FIXED_IN_METER",
"access": "R"
},
{
"id": 7,
"description": "entries in use",
"datatype": "double-long-unsigned",
"valuetype": "DYNAMIC",
"access": "R"
},
{
"id": 8,
"description": "profile entries",
"datatype": "double-long-unsigned",
"valuetype": "FIXED_IN_PROFILE",
"value": "10",
"access": "R"
}

]
},
{
"tag": "STANDARD_EVENT_CODE",
"description": "Standard event log code",
Expand Down Expand Up @@ -2846,6 +2911,35 @@
}
]
},
{
"tag": "DURATION_OF_LONG_POWER_FAILURES",
"description": "Duration of long power failures in any phase ",
"class-id": 3,
"version": 0,
"obis": "0.0.96.7.19.255",
"group": "ELECTRICITY",
"meterTypes": [
"SP",
"PP"
],
"attributes": [
{
"id": 2,
"description": "value",
"datatype": "double-long-unsigned",
"valuetype": "DYNAMIC",
"access": "R"
},
{
"id": 3,
"description": "scaler_unit",
"datatype": "scal_unit_type",
"valuetype": "FIXED_IN_PROFILE",
"value": "0, s",
"access": "R"
}
]
},
{
"tag": "PUSH_SETUP_ALARM",
"description": "Push Setup Alarm",
Expand Down
94 changes: 94 additions & 0 deletions osgp/protocol-adapter-dlms/osgp-dlms/src/main/resources/dlmsprofiles/dlmsprofile-smr500.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3415,6 +3415,71 @@

]
},
{
"tag": "POWER_FAILURE_EVENT_LOG",
"description": "Event log containing Power Failure events",
"class-id": 7,
"version": 1,
"obis": "1.0.99.97.0.255",
"group": "ABSTRACT",
"meterTypes": ["SP","PP"],
"attributes": [
{
"id": 2,
"description": "buffer",
"datatype": "array",
"valuetype": "DYNAMIC",
"access": "R"
},
{
"id": 3,
"description": "capture objects",
"datatype": "array",
"valuetype": "FIXED_IN_PROFILE",
"value": "CLOCK,2|DURATION_OF_LONG_POWER_FAILURES,2",
"access": "R"
},
{
"id": 4,
"description": "capture period",
"datatype": "double-long-unsigned",
"valuetype": "FIXED_IN_PROFILE",
"value": "0",
"access": "R"
},
{
"id": 5,
"description": "sort method",
"datatype": "enum",
"valuetype": "FIXED_IN_PROFILE",
"value": "1",
"access": "R"
},
{
"id": 6,
"description": "sort object",
"datatype": "object_definition",
"valuetype": "FIXED_IN_METER",
"access": "R"
},
{
"id": 7,
"description": "entries in use",
"datatype": "double-long-unsigned",
"valuetype": "DYNAMIC",
"access": "R"
},
{
"id": 8,
"description": "profile entries",
"datatype": "double-long-unsigned",
"valuetype": "FIXED_IN_PROFILE",
"value": "10",
"access": "R"
}

]
},
{
"tag": "STANDARD_EVENT_CODE",
"description": "Standard event log code",
Expand Down Expand Up @@ -3523,6 +3588,35 @@
}
]
},
{
"tag": "DURATION_OF_LONG_POWER_FAILURES",
"description": "Duration of long power failures in any phase ",
"class-id": 3,
"version": 0,
"obis": "0.0.96.7.19.255",
"group": "ELECTRICITY",
"meterTypes": [
"SP",
"PP"
],
"attributes": [
{
"id": 2,
"description": "value",
"datatype": "double-long-unsigned",
"valuetype": "DYNAMIC",
"access": "R"
},
{
"id": 3,
"description": "scaler_unit",
"datatype": "scal_unit_type",
"valuetype": "FIXED_IN_PROFILE",
"value": "0, s",
"access": "R"
}
]
},
{
"tag": "PUSH_SETUP_ALARM",
"description": "Push Setup Alarm",
Expand Down
14 changes: 7 additions & 7 deletions ...dapter-dlms/osgp-dlms/src/test/java/org/opensmartgridplatform/dlms/services/Protocol.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,13 +11,13 @@

@Getter
public enum Protocol {
DSMR_2_2("DSMR", "2.2", 49, 2, 4, 6, 14, 0, 0, 0, 0, false, false),
DSMR_4_2_2("DSMR", "4.2.2", 86, 11, 27, 6, 14, 6, 13, 5, 6, true, false),
SMR_4_3("SMR", "4.3", 87, 11, 27, 6, 14, 6, 13, 6, 7, true, false),
SMR_5_0_0("SMR", "5.0.0", 103, 11, 27, 6, 14, 6, 15, 9, 14, true, true),
SMR_5_1("SMR", "5.1", 107, 11, 27, 6, 14, 6, 15, 9, 14, true, true),
SMR_5_2("SMR", "5.2", 146, 11, 27, 6, 14, 6, 15, 10, 15, true, true),
SMR_5_5("SMR", "5.5", 150, 11, 27, 6, 14, 6, 15, 10, 15, true, true);
DSMR_2_2("DSMR", "2.2", 51, 2, 4, 6, 14, 0, 0, 0, 0, false, false),
DSMR_4_2_2("DSMR", "4.2.2", 88, 11, 27, 6, 14, 6, 13, 5, 6, true, false),
SMR_4_3("SMR", "4.3", 89, 11, 27, 6, 14, 6, 13, 6, 7, true, false),
SMR_5_0_0("SMR", "5.0.0", 105, 11, 27, 6, 14, 6, 15, 9, 14, true, true),
SMR_5_1("SMR", "5.1", 109, 11, 27, 6, 14, 6, 15, 9, 14, true, true),
SMR_5_2("SMR", "5.2", 148, 11, 27, 6, 14, 6, 15, 10, 15, true, true),
SMR_5_5("SMR", "5.5", 152, 11, 27, 6, 14, 6, 15, 10, 15, true, true);

private final String name;
private final String version;
Expand Down
Loading

0 comments on commit 77f257e

Please sign in to comment.