Feature/smhe 1845 object config activity calendar

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

@@ -7,14 +7,14 @@ Feature: SmartMetering Bundle - SetActivityCalendar
   As a grid operator 
   I want to be able to set activity calendar on a meter via a bundle request
 
-  Background: 
+  Scenario Outline: Set activity calendar on a device in a bundle request
     Given a dlms device
-      | DeviceIdentification | TEST1024000000001 |
-      | DeviceType           | SMART_METER_E     |
-
-  Scenario: Set activity calendar on 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 an activity calendar
       | ActivityCalendarName        | CALENDAR                 |
       | ActivatePassiveCalendarTime | FFFFFFFEFFFFFFFFFF000000 |
@@ -71,3 +71,13 @@ Feature: SmartMetering Bundle - SetActivityCalendar
     When the bundle request is received
     Then the bundle response should contain a set special days response with values
       | Result | OK |
+
+    Examples:
+      | deviceIdentification  | protocol | version |
+      | TEST1024000000002     | DSMR     | 2.2     |
+      | TEST1024000000002     | DSMR     | 4.2.2   |
+      | TEST1031000000002     | SMR      | 4.3     |
+      | TEST1027000000002     | SMR      | 5.0.0   |
+      | TEST1028000000002     | SMR      | 5.1     |
+      | TEST1028000000002     | SMR      | 5.2     |
+      | TEST1028000000002     | SMR      | 5.5     |

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

@@ -8,11 +8,23 @@ Feature: SmartMetering Configuration - Set Activity Calendar
   I want to be able to set the activity calendar on a device
   In order to ensure proper tarriffication on the device
 
-  Scenario: Use wildcards for set activity calendar
+  Scenario Outline: Use wildcards for set activity calendar
     Given a dlms device
-      | DeviceIdentification | TEST1024000000001 |
-      | DeviceType           | SMART_METER_E     |
+      | DeviceIdentification | <deviceIdentification> |
+      | DeviceType           | SMART_METER_E          |
+      | Protocol             | <protocol>             |
+      | ProtocolVersion      | <version>              |
     When the set activity calendar request is received
-      | DeviceIdentification | TEST1024000000001 |
+      | DeviceIdentification | <deviceIdentification> |
     Then the activity calendar profiles are set on the device
-      | DeviceIdentification | TEST1024000000001 |
+      | DeviceIdentification | <deviceIdentification> |
+
+    Examples:
+      | deviceIdentification  | protocol | version |
+      | TEST1024000000002     | DSMR     | 2.2     |
+      | TEST1024000000002     | DSMR     | 4.2.2   |
+      | TEST1031000000002     | SMR      | 4.3     |
+      | TEST1027000000002     | SMR      | 5.0.0   |
+      | TEST1028000000002     | SMR      | 5.1     |
+      | TEST1028000000002     | SMR      | 5.2     |
+      | TEST1028000000002     | SMR      | 5.5     |

osgp/protocol-adapter-dlms/osgp-dlms/pom.xml

@@ -30,6 +30,13 @@ SPDX-License-Identifier: Apache-2.0
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>
         <version>${maven.jar.plugin.version}</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>test-jar</goal>
+            </goals>
+          </execution>
+        </executions>
       </plugin>
       <plugin>
         <artifactId>maven-surefire-plugin</artifactId>

osgp/protocol-adapter-dlms/osgp-dlms/src/main/java/org/opensmartgridplatform/dlms/objectconfig/CosemObject.java

@@ -24,18 +24,12 @@
 
 @Getter
 @NoArgsConstructor
-@JsonTypeInfo(use = Id.NAME, property = "class-id", visible = true)
+@JsonTypeInfo(use = Id.NAME, property = "class-id", visible = true, defaultImpl = CosemObject.class)
 @JsonSubTypes({
   @JsonSubTypes.Type(value = Data.class, name = "1"),
   @JsonSubTypes.Type(value = Register.class, name = "3"),
   @JsonSubTypes.Type(value = ExtendedRegister.class, name = "4"),
   @JsonSubTypes.Type(value = ProfileGeneric.class, name = "7"),
-  @JsonSubTypes.Type(value = CosemObject.class, name = "8"),
-  @JsonSubTypes.Type(value = CosemObject.class, name = "22"),
-  @JsonSubTypes.Type(value = CosemObject.class, name = "40"),
-  @JsonSubTypes.Type(value = CosemObject.class, name = "47"),
-  @JsonSubTypes.Type(value = CosemObject.class, name = "72"),
-  @JsonSubTypes.Type(value = CosemObject.class, name = "77")
 })
 public class CosemObject {
   protected String tag;

osgp/protocol-adapter-dlms/osgp-dlms/src/main/java/org/opensmartgridplatform/dlms/objectconfig/DlmsObjectType.java

@@ -82,7 +82,8 @@ public enum DlmsObjectType {
   READ_MBUS_STATUS,
   CLEAR_MBUS_STATUS,
   PHASE_OUTAGE_TEST,
-  LAST_GASP_TEST;
+  LAST_GASP_TEST,
+  ACTIVITY_CALENDAR;
 
   public String value() {
     return this.name();

osgp/protocol-adapter-dlms/osgp-dlms/src/main/resources/dlmsprofiles/dlmsprofile-dsmr22.json

@@ -989,6 +989,81 @@
           "access": "R"
         }
       ]
+    },
+    {
+      "tag": "ACTIVITY_CALENDAR",
+      "description": "Activity calendar",
+      "note": null,
+      "class-id": 20,
+      "version": 0,
+      "obis": "0.0.13.0.0.255",
+      "group": "ABSTRACT",
+      "meterTypes": ["SP","PP"],
+      "attributes": [
+        {
+          "id": 2,
+          "description": "calendar_name_active",
+          "datatype": "octet-string",
+          "valuetype": "DYNAMIC",
+          "access": "R"
+        },
+        {
+          "id": 3,
+          "description": "season_profile_active",
+          "datatype": "array",
+          "valuetype": "DYNAMIC",
+          "access": "R"
+        },
+        {
+          "id": 4,
+          "description": "week_profile_table_active",
+          "datatype": "array",
+          "valuetype": "DYNAMIC",
+          "access": "R"
+        },
+        {
+          "id": 5,
+          "description": "day_profile_table_active",
+          "datatype": "array",
+          "valuetype": "DYNAMIC",
+          "access": "R"
+        },
+        {
+          "id": 6,
+          "description": "calendar_name_passive",
+          "datatype": "octet-string",
+          "valuetype": "SET_BY_CLIENT",
+          "access": "RW"
+        },
+        {
+          "id": 7,
+          "description": "season_profile_passive",
+          "datatype": "array",
+          "valuetype": "SET_BY_CLIENT",
+          "access": "RW"
+        },
+        {
+          "id": 8,
+          "description": "week_profile_table_passive",
+          "datatype": "array",
+          "valuetype": "SET_BY_CLIENT",
+          "access": "RW"
+        },
+        {
+          "id": 9,
+          "description": "day_profile_table_passive",
+          "datatype": "array",
+          "valuetype": "SET_BY_CLIENT",
+          "access": "RW"
+        },
+        {
+          "id": 10,
+          "description": "activate_passive_calendar_time",
+          "datatype": "octet-string",
+          "valuetype": "SET_BY_CLIENT",
+          "access": "RW"
+        }
+      ]
     }
   ]
 }

osgp/protocol-adapter-dlms/osgp-dlms/src/main/resources/dlmsprofiles/dlmsprofile-dsmr422.json

@@ -2036,6 +2036,81 @@
           "access": "R"
         }
       ]
+    },
+    {
+      "tag": "ACTIVITY_CALENDAR",
+      "description": "Activity calendar",
+      "note": null,
+      "class-id": 20,
+      "version": 0,
+      "obis": "0.0.13.0.0.255",
+      "group": "ABSTRACT",
+      "meterTypes": ["SP","PP"],
+      "attributes": [
+        {
+          "id": 2,
+          "description": "calendar_name_active",
+          "datatype": "octet-string",
+          "valuetype": "DYNAMIC",
+          "access": "R"
+        },
+        {
+          "id": 3,
+          "description": "season_profile_active",
+          "datatype": "array",
+          "valuetype": "DYNAMIC",
+          "access": "R"
+        },
+        {
+          "id": 4,
+          "description": "week_profile_table_active",
+          "datatype": "array",
+          "valuetype": "DYNAMIC",
+          "access": "R"
+        },
+        {
+          "id": 5,
+          "description": "day_profile_table_active",
+          "datatype": "array",
+          "valuetype": "DYNAMIC",
+          "access": "R"
+        },
+        {
+          "id": 6,
+          "description": "calendar_name_passive",
+          "datatype": "octet-string",
+          "valuetype": "SET_BY_CLIENT",
+          "access": "RW"
+        },
+        {
+          "id": 7,
+          "description": "season_profile_passive",
+          "datatype": "array",
+          "valuetype": "SET_BY_CLIENT",
+          "access": "RW"
+        },
+        {
+          "id": 8,
+          "description": "week_profile_table_passive",
+          "datatype": "array",
+          "valuetype": "SET_BY_CLIENT",
+          "access": "RW"
+        },
+        {
+          "id": 9,
+          "description": "day_profile_table_passive",
+          "datatype": "array",
+          "valuetype": "SET_BY_CLIENT",
+          "access": "RW"
+        },
+        {
+          "id": 10,
+          "description": "activate_passive_calendar_time",
+          "datatype": "octet-string",
+          "valuetype": "SET_BY_CLIENT",
+          "access": "RW"
+        }
+      ]
     }
   ]
 }

osgp/protocol-adapter-dlms/osgp-dlms/src/main/resources/dlmsprofiles/dlmsprofile-smr500.json

@@ -2216,6 +2216,81 @@
           "access": "R"
         }
       ]
+    },
+    {
+      "tag": "ACTIVITY_CALENDAR",
+      "description": "Activity calendar",
+      "note": null,
+      "class-id": 20,
+      "version": 0,
+      "obis": "0.0.13.0.0.255",
+      "group": "ABSTRACT",
+      "meterTypes": ["SP","PP"],
+      "attributes": [
+        {
+          "id": 2,
+          "description": "calendar_name_active",
+          "datatype": "octet-string",
+          "valuetype": "DYNAMIC",
+          "access": "R"
+        },
+        {
+          "id": 3,
+          "description": "season_profile_active",
+          "datatype": "array",
+          "valuetype": "DYNAMIC",
+          "access": "R"
+        },
+        {
+          "id": 4,
+          "description": "week_profile_table_active",
+          "datatype": "array",
+          "valuetype": "DYNAMIC",
+          "access": "R"
+        },
+        {
+          "id": 5,
+          "description": "day_profile_table_active",
+          "datatype": "array",
+          "valuetype": "DYNAMIC",
+          "access": "R"
+        },
+        {
+          "id": 6,
+          "description": "calendar_name_passive",
+          "datatype": "octet-string",
+          "valuetype": "SET_BY_CLIENT",
+          "access": "RW"
+        },
+        {
+          "id": 7,
+          "description": "season_profile_passive",
+          "datatype": "array",
+          "valuetype": "SET_BY_CLIENT",
+          "access": "RW"
+        },
+        {
+          "id": 8,
+          "description": "week_profile_table_passive",
+          "datatype": "array",
+          "valuetype": "SET_BY_CLIENT",
+          "access": "RW"
+        },
+        {
+          "id": 9,
+          "description": "day_profile_table_passive",
+          "datatype": "array",
+          "valuetype": "SET_BY_CLIENT",
+          "access": "RW"
+        },
+        {
+          "id": 10,
+          "description": "activate_passive_calendar_time",
+          "datatype": "octet-string",
+          "valuetype": "SET_BY_CLIENT",
+          "access": "RW"
+        }
+      ]
     }
   ]
 }

osgp/protocol-adapter-dlms/osgp-dlms/src/test/java/org/opensmartgridplatform/dlms/services/Protocol.java

@@ -11,13 +11,13 @@
 
 @Getter
 public enum Protocol {
-  DSMR_2_2("DSMR", "2.2", 31, 2, 4, 6, 14, 0, 0, 0, 0, false, false),
-  DSMR_4_2_2("DSMR", "4.2.2", 55, 11, 27, 6, 14, 6, 13, 5, 6, true, false),
-  SMR_4_3("SMR", "4.3", 56, 11, 27, 6, 14, 6, 13, 6, 7, true, false),
-  SMR_5_0_0("SMR", "5.0.0", 59, 11, 27, 6, 14, 6, 15, 9, 14, true, true),
-  SMR_5_1("SMR", "5.1", 61, 11, 27, 6, 14, 6, 15, 9, 14, true, true),
-  SMR_5_2("SMR", "5.2", 64, 11, 27, 6, 14, 6, 15, 10, 15, true, true),
-  SMR_5_5("SMR", "5.5", 68, 11, 27, 6, 14, 6, 15, 10, 15, true, true);
+  DSMR_2_2("DSMR", "2.2", 32, 2, 4, 6, 14, 0, 0, 0, 0, false, false),
+  DSMR_4_2_2("DSMR", "4.2.2", 56, 11, 27, 6, 14, 6, 13, 5, 6, true, false),
+  SMR_4_3("SMR", "4.3", 57, 11, 27, 6, 14, 6, 13, 6, 7, true, false),
+  SMR_5_0_0("SMR", "5.0.0", 60, 11, 27, 6, 14, 6, 15, 9, 14, true, true),
+  SMR_5_1("SMR", "5.1", 62, 11, 27, 6, 14, 6, 15, 9, 14, true, true),
+  SMR_5_2("SMR", "5.2", 65, 11, 27, 6, 14, 6, 15, 10, 15, true, true),
+  SMR_5_5("SMR", "5.5", 69, 11, 27, 6, 14, 6, 15, 10, 15, true, true);
 
   private final String name;
   private final String version;

osgp/protocol-adapter-dlms/osgp-protocol-adapter-dlms/pom.xml

@@ -303,6 +303,14 @@ SPDX-License-Identifier: Apache-2.0
     </dependency>
 
     <!-- Testing dependencies -->
+    <dependency>
+      <groupId>org.opensmartgridplatform</groupId>
+      <artifactId>osgp-dlms</artifactId>
+      <version>${osgp.dlms.version}</version>
+      <classifier>tests</classifier>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
     <dependency>
       <groupId>org.junit.jupiter</groupId>
       <artifactId>junit-jupiter-api</artifactId>