OpenLEADR / openleadr-python

Python library for OpenADR
https://openleadr.org/docs
Apache License 2.0
133 stars 51 forks source link

Metadata report MUST NOT include eiReportID #82

Closed 00javad00 closed 2 years ago

00javad00 commented 3 years ago

According to OpenADR 2.0b Profile Specification: Payloads containing a Metadata report MUST NOT include the following optional payload elements: • intervals • dtstart • eiReportID so the oadrRegisterReport.xml shall be modifed to:

<oadr:oadrSignedObject xmlns:oadr="http://openadr.org/oadr-2.0b/2012/07" oadr:Id="oadrSignedObject">
  <oadr:oadrRegisterReport ei:schemaVersion="2.0b" xmlns:ei="http://docs.oasis-open.org/ns/energyinterop/201110">
    <requestID xmlns="http://docs.oasis-open.org/ns/energyinterop/201110/payloads">{{ request_id }}</requestID>
{% for report in reports %}
    <oadr:oadrReport xmlns:xcal="urn:ietf:params:xml:ns:icalendar-2.0" xmlns:strm="urn:ietf:params:xml:ns:icalendar-2.0:stream">
      {% if report.dtstart is defined and report.dtstart is not none %}
      <xcal:dtstart>
        <xcal:date-time>{{ report.duration|timedeltaformat }}</xcal:date-time>
      </xcal:dtstart>
      {% endif %}
      {% if report.duration is defined and report.duration is not none %}
      <xcal:duration>
        <xcal:duration>{{ report.duration|timedeltaformat }}</xcal:duration>
      </xcal:duration>
      {% endif %}
      {% if report.report_id is defined and report.report_id is not none %}
      <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>0</ei:reportRequestID>
      {% endif %}
      <ei:reportSpecifierID>{{ report.report_specifier_id }}</ei:reportSpecifierID>
      <ei:reportName>{{ report.report_name }}</ei:reportName>
      <ei:createdDateTime>{{ report.created_date_time|datetimeformat }}</ei:createdDateTime>
    </oadr:oadrReport>
{% endfor %}
    {% if ven_id is defined and ven_id is not none %}
    <ei:venID>{{ ven_id }}</ei:venID>
    {% endif %}
    {% if report_request_id is defined and report_request_id is not none %}
    <ei:reportRequestID>{{ report_request_id }}</ei:reportRequestID>
    {% endif %}
  </oadr:oadrRegisterReport>
</oadr:oadrSignedObject>
stan-janssen commented 2 years ago

Thanks, should be fixed now.