From b959553733926182c9d45e36affebcb38244dfb0 Mon Sep 17 00:00:00 2001
From: Ankit Kukreja <ankit.kukreja@chargepoint.com>
Date: Wed, 8 Feb 2017 18:07:54 -0800
Subject: [PATCH] Some fixes which I discovered on course of testing the Open
 ADR VEN client with Test Harness as provided by Quality Logic. Also, on
 debugging confirmed that Test harness is testing again correct OpenADR 2.0b
 standard.

---
 oadrlib/lib/oadr2b/RegisterReport.cs | 9 +++++++++
 oadrlib/lib/oadr2b/ReportWrapper.cs  | 4 +++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/oadrlib/lib/oadr2b/RegisterReport.cs b/oadrlib/lib/oadr2b/RegisterReport.cs
index 89fe51f..4acdde4 100644
--- a/oadrlib/lib/oadr2b/RegisterReport.cs
+++ b/oadrlib/lib/oadr2b/RegisterReport.cs
@@ -83,6 +83,15 @@ public string createRegisterReport(string requestID, string venID, Dictionary<st
             request.requestID = requestID;
             request.venID = venID;
 
+            // Test case R1_3170_TH_VTN_1 (test-harness for OpenADR certification
+            // as provided by Quality logic) fails if reportRequestID is not set. 
+            // Report request ID is mandatory in OpenADR for any subsquent request 
+            // when sent for same report.
+            if (reportRequestID != null)
+            {
+                request.reportRequestID = reportRequestID;
+            }
+
             request.oadrReport = new oadrReportType[reports.Count];
 
             int index = 0;
diff --git a/oadrlib/lib/oadr2b/ReportWrapper.cs b/oadrlib/lib/oadr2b/ReportWrapper.cs
index c1a4ed3..1cc7bac 100644
--- a/oadrlib/lib/oadr2b/ReportWrapper.cs
+++ b/oadrlib/lib/oadr2b/ReportWrapper.cs
@@ -261,7 +261,9 @@ public oadrReportType generateReport(string reportRequestID)
                 return report;
 
             List<IntervalType> reportIntervals = m_reportIntervals.Values.ToList().OrderBy(o => o.dtstart.datetime).ToList();
-            reportIntervals.Reverse();
+            // Test Case R1_3160_TH_VTN_1: Based on OpenADR specifications, intervals have to be              
+            // in ascending order. Reversing it here converts it into descending order.
+            //reportIntervals.Reverse();
 
             // the dtstart of the report must match the dtstart of the first interval
             report.dtstart = new dtstart();