Remove eiReportID from Metadata reports

Reported in #82

Author: stan-janssen

openleadr/templates/oadrRegisterReport.xml

@@ -13,14 +13,16 @@
         <xcal:duration>{{ report.duration|timedeltaformat }}</xcal:duration>
       </xcal:duration>
       {% endif %}
+      {% if report.report_id is defined and report.report_id is not none and not report.report_name.startswith('METADATA') %}
       <ei:eiReportID>{{ report.report_id }}</ei:eiReportID>
+      {% endif %}
   {% for report_description in report.report_descriptions %}
       {% include 'parts/oadrReportDescription.xml' %}
   {% endfor %}
       {% if report.report_request_id is defined and report.report_request_id is not none %}
       <ei:reportRequestID>{{ report.report_request_id }}</ei:reportRequestID>
       {% else %}
-      <ei:reportRequestID></ei:reportRequestID>
+      <ei:reportRequestID>0</ei:reportRequestID>
       {% endif %}
       <ei:reportSpecifierID>{{ report.report_specifier_id }}</ei:reportSpecifierID>
       <ei:reportName>{{ report.report_name }}</ei:reportName>

test/test_message_conversion.py

@@ -73,8 +73,7 @@ def create_dummy_event(ven_id):
              'response_required': 'always'}
     return event
 
-reports = [{'report_id': generate_id(),
-            'duration': timedelta(seconds=3600),
+reports = [{'duration': timedelta(seconds=3600),
             'report_descriptions': [{'r_id': generate_id(),
                                      'report_subject': {'end_device_asset': {'mrid': 'meter001'}},
                                      'report_data_source': {'resource_id': 'resource001'},
@@ -85,7 +84,7 @@ def create_dummy_event(ven_id):
                                      'sampling_rate': {'min_period': timedelta(seconds=10), 'max_period': timedelta(seconds=30), 'on_change': False}} for measurement in enums.MEASUREMENTS.values],
             'report_specifier_id': generate_id(),
             'report_name': 'METADATA_HISTORY_USAGE',
-            'report_request_id': None,
+            'report_request_id': 0,
             'created_date_time': datetime.now(timezone.utc)}]
 
 for report in reports:
@@ -173,8 +172,7 @@ def create_dummy_event(ven_id):
                                                                                                     'reading_type': 'Direct Read'}]}}])),
 ('oadrRequestEvent', dict(request_id=generate_id(), ven_id='123ABC')),
 ('oadrRequestReregistration', dict(ven_id='123ABC')),
-('oadrRegisterReport', dict(request_id=generate_id(), reports=[{'report_id': generate_id(),
-                                                                'report_descriptions': [{
+('oadrRegisterReport', dict(request_id=generate_id(), reports=[{'report_descriptions': [{
                                                                      'r_id': generate_id(),
                                                                      'report_subject': {'end_device_asset': {'mrid': 'meter001'}},
                                                                      'report_data_source': {'resource_id': '123ABC'},
@@ -188,20 +186,18 @@ def create_dummy_event(ven_id):
                                                                 'created_date_time': datetime.now(timezone.utc)}],
                                                         ven_id='123ABC',
                                                         report_request_id=generate_id())),
-('oadrRegisterReport', {'request_id': '8a4f859883', 'reports': [{'report_id': generate_id(),
-                                                                 'duration': timedelta(seconds=7200),
+('oadrRegisterReport', {'request_id': '8a4f859883', 'reports': [{'duration': timedelta(seconds=7200),
                                                                  'report_descriptions': [{'r_id': generate_id(),
                                                                                           'report_data_source': {'resource_id': 'resource1'},
                                                                                           'report_type': 'x-resourceStatus',
                                                                                           'reading_type': 'x-notApplicable',
                                                                                           'market_context': 'http://MarketContext1',
                                                                                           'sampling_rate': {'min_period': timedelta(seconds=60), 'max_period': timedelta(seconds=60), 'on_change': False}}],
-                                                                  'report_request_id': generate_id(),
+                                                                  'report_request_id': 0,
                                                                   'report_specifier_id': '789ed6cd4e_telemetry_status',
                                                                   'report_name': 'METADATA_TELEMETRY_STATUS',
                                                                   'created_date_time': datetime(2019, 11, 20, 15, 4, 52, 638621, tzinfo=timezone.utc)},
-                                                                 {'report_id': generate_id(),
-                                                                  'duration': timedelta(seconds=7200),
+                                                                 {'duration': timedelta(seconds=7200),
                                                                   'report_descriptions': [{'r_id': 'resource1_energy',
                                                                                            'report_data_source': {'resource_id': 'resource1'},
                                                                                            'report_type': 'usage',
@@ -225,12 +221,11 @@ def create_dummy_event(ven_id):
                                                                                             'reading_type': 'Direct Read',
                                                                                             'market_context': 'http://MarketContext1',
                                                                                             'sampling_rate': {'min_period': timedelta(seconds=60), 'max_period': timedelta(seconds=60), 'on_change': False}}],
-                                                                  'report_request_id': generate_id(),
+                                                                  'report_request_id': 0,
                                                                   'report_specifier_id': '789ed6cd4e_telemetry_usage',
                                                                   'report_name': 'METADATA_TELEMETRY_USAGE',
                                                                   'created_date_time': datetime(2019, 11, 20, 15, 4, 52, 638621, tzinfo=timezone.utc)},
-                                                                 {'report_id': generate_id(),
-                                                                  'duration': timedelta(seconds=7200),
+                                                                 {'duration': timedelta(seconds=7200),
                                                                   'report_descriptions': [{'r_id': 'resource1_energy',
                                                                                            'report_data_source': {'resource_id': 'resource1'},
                                                                                            'report_type': 'usage',