Add Dalrymple battery to AU_battery

parsers/lib/AU_battery.py

@@ -5,19 +5,12 @@
 import json
 import requests
 
-# nemlog_url gets generation status in 5 min intervals.
 
+def get_unit_status(unit_code, start, end, session=None):
+    # nemlog_url gets generation status in 5 min intervals.
 
-def fetch_SA_battery(session=None):
-    """
-    Makes a request to the nemlog api for South Australia battery data.
-    Returns a float or None.
-    """
-
-    today = arrow.now('Australia/Adelaide')
-    current = today.format('YYYYMMDD')
-    old = today.shift(days=-2).format('YYYYMMDD')
-    nemlog_url = 'http://nemlog.com.au/api/unit/HPRL1/{}/{}/json'.format(old, current)
+    nemlog_url = 'http://nemlog.com.au/api/unit/{}/{}/{}/json'.format(
+        unit_code, start, end)
 
     s = session or requests.Session()
     req = s.get(nemlog_url)
@@ -38,6 +31,24 @@ def fetch_SA_battery(session=None):
     return battery_status
 
 
+def fetch_SA_battery(session=None):
+    """
+    Makes a request for each battery to the nemlog api for South Australia
+    battery data.
+    Returns a float or None.
+    """
+
+    today = arrow.now('Australia/Adelaide')
+    current = today.format('YYYYMMDD')
+    old = today.shift(days=-2).format('YYYYMMDD')
+
+    dalrymple_status = get_unit_status('DALNTHL1', old, current)
+    hornsdale_status = get_unit_status('HPRL1', old, current)
+
+    return sum(val if val is not None else 0 for val in
+               [dalrymple_status, hornsdale_status])
+
+
 if __name__ == '__main__':
     print('fetch_SA_battery() ->')
     print(fetch_SA_battery())