Skip to content

Commit b054c75

Browse files
loesimmensloesimmens
committed
Merge branch 'development' into feature/FDP-1629-web-operator-models
2 parents 53da13d + ceebb71 commit b054c75

File tree

221 files changed

+6214
-1225
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

221 files changed

+6214
-1225
lines changed

‎integration-tests/cucumber-tests-core/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ SPDX-License-Identifier: Apache-2.0
1212
<parent>
1313
<groupId>org.opensmartgridplatform</groupId>
1414
<artifactId>parent-integration-tests</artifactId>
15-
<version>5.47.0-SNAPSHOT</version>
15+
<version>5.48.0-SNAPSHOT</version>
1616
<relativePath>../parent-integration-tests/pom.xml</relativePath>
1717
</parent>
1818

‎integration-tests/cucumber-tests-execution/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ SPDX-License-Identifier: Apache-2.0
1212
<parent>
1313
<groupId>org.opensmartgridplatform</groupId>
1414
<artifactId>parent-integration-tests</artifactId>
15-
<version>5.47.0-SNAPSHOT</version>
15+
<version>5.48.0-SNAPSHOT</version>
1616
<relativePath>../parent-integration-tests/pom.xml</relativePath>
1717
</parent>
1818

‎integration-tests/cucumber-tests-platform-common/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ SPDX-License-Identifier: Apache-2.0
1313
<parent>
1414
<groupId>org.opensmartgridplatform</groupId>
1515
<artifactId>parent-integration-tests</artifactId>
16-
<version>5.47.0-SNAPSHOT</version>
16+
<version>5.48.0-SNAPSHOT</version>
1717
<relativePath>../parent-integration-tests/pom.xml</relativePath>
1818
</parent>
1919

‎integration-tests/cucumber-tests-platform-distributionautomation/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ SPDX-License-Identifier: Apache-2.0
1313
<parent>
1414
<groupId>org.opensmartgridplatform</groupId>
1515
<artifactId>parent-integration-tests</artifactId>
16-
<version>5.47.0-SNAPSHOT</version>
16+
<version>5.48.0-SNAPSHOT</version>
1717
<relativePath>../parent-integration-tests/pom.xml</relativePath>
1818
</parent>
1919

‎integration-tests/cucumber-tests-platform-microgrids/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ SPDX-License-Identifier: Apache-2.0
1313
<parent>
1414
<groupId>org.opensmartgridplatform</groupId>
1515
<artifactId>parent-integration-tests</artifactId>
16-
<version>5.47.0-SNAPSHOT</version>
16+
<version>5.48.0-SNAPSHOT</version>
1717
<relativePath>../parent-integration-tests/pom.xml</relativePath>
1818
</parent>
1919

‎integration-tests/cucumber-tests-platform-publiclighting/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ SPDX-License-Identifier: Apache-2.0
1212
<parent>
1313
<groupId>org.opensmartgridplatform</groupId>
1414
<artifactId>parent-integration-tests</artifactId>
15-
<version>5.47.0-SNAPSHOT</version>
15+
<version>5.48.0-SNAPSHOT</version>
1616
<relativePath>../parent-integration-tests/pom.xml</relativePath>
1717
</parent>
1818

‎integration-tests/cucumber-tests-platform-smartmetering/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ SPDX-License-Identifier: Apache-2.0
1313
<parent>
1414
<groupId>org.opensmartgridplatform</groupId>
1515
<artifactId>parent-integration-tests</artifactId>
16-
<version>5.47.0-SNAPSHOT</version>
16+
<version>5.48.0-SNAPSHOT</version>
1717
<relativePath>../parent-integration-tests/pom.xml</relativePath>
1818
</parent>
1919

‎integration-tests/cucumber-tests-platform-smartmetering/src/test/resources/features/osgp-adapter-ws-smartmetering/ad-hoc/TestAlarmScheduler.feature‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,32 @@
11
# SPDX-FileCopyrightText: Contributors to the GXF project
22
#
33
# SPDX-License-Identifier: Apache-2.0
4-
54
@SmartMetering @Platform @SmartMeteringAdHoc @NightlyBuildOnly
65
Feature: SmartMetering schedule test alarms
76
As a grid operator
87
I want to be able to set a test alarm on a device
98
So scheduled alarms will be sent
109

11-
Scenario: Set test alarm PARTIAL_POWER_OUTAGE on a device
10+
Scenario Outline: Set test alarm PARTIAL_POWER_OUTAGE on a <protocol> <version> device
1211
Given a dlms device
1312
| DeviceIdentification | TEST1027000000001 |
1413
| DeviceType | SMART_METER_E |
15-
| Protocol | SMR |
16-
| ProtocolVersion | 5.0.0 |
17-
| Port | 1027 |
14+
| Protocol | <protocol> |
15+
| ProtocolVersion | <version> |
1816
When receiving a test alarm scheduler request
1917
| DeviceIdentification | TEST1027000000001 |
2018
| TestAlarmType | PARTIAL_POWER_OUTAGE |
2119
| Time | 2088-01-01T00:00:00Z |
2220
Then a response is received
2321
| DeviceIdentification | TEST1027000000001 |
2422

23+
Examples:
24+
| protocol | version |
25+
| SMR | 5.1 |
26+
| SMR | 5.2 |
27+
| SMR | 5.5 |
2528

26-
Scenario: Set test alarm LAST_GASP on a device
29+
Scenario: Set test alarm LAST_GASP on a SMR 5.5 device
2730
Given a dlms device
2831
| DeviceIdentification | TEST1030000000001 |
2932
| DeviceType | SMART_METER_E |

‎integration-tests/cucumber-tests-platform-smartmetering/src/test/resources/features/osgp-adapter-ws-smartmetering/bundle/BundledSetActivityCalendar.feature‎

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ Feature: SmartMetering Bundle - SetActivityCalendar
77
As a grid operator
88
I want to be able to set activity calendar on a meter via a bundle request
99

10-
Background:
10+
Scenario Outline: Set activity calendar on a device in a bundle request
1111
Given a dlms device
12-
| DeviceIdentification | TEST1024000000001 |
13-
| DeviceType | SMART_METER_E |
14-
15-
Scenario: Set activity calendar on a device in a bundle request
16-
Given a bundle request
17-
| DeviceIdentification | TEST1024000000001 |
12+
| DeviceIdentification | <deviceIdentification> |
13+
| DeviceType | SMART_METER_E |
14+
| Protocol | <protocol> |
15+
| ProtocolVersion | <version> |
16+
And a bundle request
17+
| DeviceIdentification | <deviceIdentification> |
1818
And an activity calendar
1919
| ActivityCalendarName | CALENDAR |
2020
| ActivatePassiveCalendarTime | FFFFFFFEFFFFFFFFFF000000 |
@@ -71,3 +71,13 @@ Feature: SmartMetering Bundle - SetActivityCalendar
7171
When the bundle request is received
7272
Then the bundle response should contain a set special days response with values
7373
| Result | OK |
74+
75+
Examples:
76+
| deviceIdentification | protocol | version |
77+
| TEST1024000000002 | DSMR | 2.2 |
78+
| TEST1024000000002 | DSMR | 4.2.2 |
79+
| TEST1031000000002 | SMR | 4.3 |
80+
| TEST1027000000002 | SMR | 5.0.0 |
81+
| TEST1028000000002 | SMR | 5.1 |
82+
| TEST1028000000002 | SMR | 5.2 |
83+
| TEST1028000000002 | SMR | 5.5 |

‎integration-tests/cucumber-tests-platform-smartmetering/src/test/resources/features/osgp-adapter-ws-smartmetering/configuration/SetActivityCalendar.feature‎

Lines changed: 17 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,23 @@ Feature: SmartMetering Configuration - Set Activity Calendar
88
I want to be able to set the activity calendar on a device
99
In order to ensure proper tarriffication on the device
1010

11-
Scenario: Use wildcards for set activity calendar
11+
Scenario Outline: Use wildcards for set activity calendar
1212
Given a dlms device
13-
| DeviceIdentification | TEST1024000000001 |
14-
| DeviceType | SMART_METER_E |
13+
| DeviceIdentification | <deviceIdentification> |
14+
| DeviceType | SMART_METER_E |
15+
| Protocol | <protocol> |
16+
| ProtocolVersion | <version> |
1517
When the set activity calendar request is received
16-
| DeviceIdentification | TEST1024000000001 |
18+
| DeviceIdentification | <deviceIdentification> |
1719
Then the activity calendar profiles are set on the device
18-
| DeviceIdentification | TEST1024000000001 |
20+
| DeviceIdentification | <deviceIdentification> |
21+
22+
Examples:
23+
| deviceIdentification | protocol | version |
24+
| TEST1024000000002 | DSMR | 2.2 |
25+
| TEST1024000000002 | DSMR | 4.2.2 |
26+
| TEST1031000000002 | SMR | 4.3 |
27+
| TEST1027000000002 | SMR | 5.0.0 |
28+
| TEST1028000000002 | SMR | 5.1 |
29+
| TEST1028000000002 | SMR | 5.2 |
30+
| TEST1028000000002 | SMR | 5.5 |

0 commit comments

Comments
 (0)