Merge pull request #16 from tonya1/2020.09

Update alarms tap_changer mrid for 2020.09, add comm outage

Author: tonya1

simulation_config_files/9500-alarm-config.json

@@ -9,7 +9,7 @@
     },
     "simulation_config": {
         "start_time": "1373814000",
-        "duration": "120",
+        "duration": "150",
         "simulator": "GridLAB-D",
         "timestep_frequency": 1000,
         "timestep_increment": 1000,
@@ -97,21 +97,58 @@
                         {
                             "object": "_5D67EBEE-9158-4C56-9E39-12A9AC0D7B8D",
                             "attribute": "TapChanger.step",
-                            "value": 10
+                            "value": 4
                         }
                     ],
                     "reverse_differences": [
                         {
                             "object": "_5D67EBEE-9158-4C56-9E39-12A9AC0D7B8D",
                             "attribute": "TapChanger.step",
-                            "value": 5
+                            "value": 10
                         }
                     ]
                 },
                 "event_type": "ScheduledCommandEvent",
                 "occuredDateTime": 1373814050,
                 "stopDateTime": 1373814100
+            },
+            {
+                "allInputOutage": false,
+                "allOutputOutage": false,
+                "event_type": "CommOutage",
+                "faultMRID": "_f52aa46c-ce43-4aa4-8888-c1f3e4b684ae",
+                "inputOutageList": [
+                    {
+                        "attribute": "TapChanger.step",
+                        "objectMRID": "_5D67EBEE-9158-4C56-9E39-12A9AC0D7B8D"
+                    }
+                ],
+                "occuredDateTime": 1373814140,
+                "outputOutageList": [],
+                "stopDateTime": 1373814150
+            },
+            {
+                "message": {
+                    "forward_differences": [
+                        {
+                            "object": "_5D67EBEE-9158-4C56-9E39-12A9AC0D7B8D",
+                            "attribute": "TapChanger.step",
+                            "value": 10
+                        }
+                    ],
+                    "reverse_differences": [
+                        {
+                            "object": "_5D67EBEE-9158-4C56-9E39-12A9AC0D7B8D",
+                            "attribute": "TapChanger.step",
+                            "value": 5
+                        }
+                    ]
+                },
+                "event_type": "ScheduledCommandEvent",
+                "occuredDateTime": 1373814130,
+                "stopDateTime": 1373814150
             }
+
         ],
         "appId": ""
     },

test_alarm_api.py

@@ -16,10 +16,12 @@
 
 tapchanger_value = []
 alarm_count = 0
+mrid_values = {}
 
 def on_message(headers, message):
     global tapchanger_value
     global alarm_count
+    global mrid_values
 
     if "gridappsd-alarms" in headers["destination"]:
         if "ln1047pvfrm_sw" or "ln5001chp_sw" or "ln0895780_sw" in \
@@ -33,7 +35,16 @@ def on_message(headers, message):
         measurement_values = message["message"]["measurements"]
         for x in measurement_values:
             m = measurement_values[x]
-            if m.get("measurement_mrid") == "_48e11ee1-ea9f-4e0c-a6dd-2807a9dbc032":
+
+            # find the tapchanger mrid after an update
+            # try: 
+            #     if mrid_values[m.get("measurement_mrid")] != m.get("value"):
+            #         LOGGER.info (f'{m.get("measurement_mrid")} value changes from {mrid_values[m.get("measurement_mrid")]} to {m.get("value")}')
+            #         mrid_values[m.get("measurement_mrid")] = m.get("value")
+            # except KeyError:
+            #     mrid_values[m.get("measurement_mrid")] = m.get("value")
+            
+            if m.get("measurement_mrid") == "_9c869e50-c9c6-49bb-b1f3-949841a06ed3":
                if not tapchanger_value:
                     LOGGER.info(f'Tap Changer value is {m.get("value")}')
                     tapchanger_value.append(m.get("value"))
@@ -98,8 +109,14 @@ def onfinishsimulation(sim):
 
 def test_tap_changer():
     global tapchanger_value
-    assert tapchanger_value == [4, 10, 5], f"Expected tap changer values [4, 10, 5] received {tapchanger_value}"
+    # commoutage prevents recording of last tap_changer change
+    # assert tapchanger_value == [4, 10, 5], f"Expected tap changer values [4, 10, 5] received {tapchanger_value}"
+    assert tapchanger_value == [4, 10], f"Expected tap changer values [4, 10] received {tapchanger_value}"
 
+def test_comm_outage():
+    global tapchanger_value
+    # commoutage prevents recording of last tap_changer change
+    assert tapchanger_value == [4, 10], f"Comm outage should prevent last tap change value from being recorded.  Expected values [4, 10] received {tapchanger_value}"
 
 def test_alarm_count():
     global alarm_count