cactus-test-definitions 1.8.1__tar.gz → 1.8.11__tar.gz

{cactus_test_definitions-1.8.1/cactus_test_definitions.egg-info → cactus_test_definitions-1.8.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cactus-test-definitions
-Version: 1.8.1
+Version: 1.8.11
 Summary: CSIP-AUS Client Test Harness Test Definitions
 Author-email: Mike Turner <mike.turner@anu.edu.au>, Josh Vote <joshua.vote@anu.edu.au>
 Maintainer-email: Mike Turner <mike.turner@anu.edu.au>, Josh Vote <joshua.vote@anu.edu.au>
@@ -201,8 +201,8 @@ checks:
 | `all-steps-complete` | `ignored_steps: list[str]/None` | True if every `Step` in a `TestProcedure` has been deactivated (excepting any ignored steps) |
 | `all-notifications-transmitted` | None | True if every transmitted notification (pub/sub) has been received with a HTTP success code response from the subscription notification URI |
 | `end-device-contents` | `has_connection_point_id: bool/None` `deviceCategory_anyset: hex/none` `check_lfdi: bool/None` | True if an `EndDevice` is registered and optionally has the specified contents. `has_connection_point_id` (if True) will check whether the active `EndDevice` has `ConnectionPoint.id` specified. `check_lfdi` will do a deep inspection on the supplied LFDI - checking PEN and derived SFDI. |
-| `der-settings-contents` | `setGradW: int/None` `doeModesEnabled_set: hex/none` `doeModesEnabled_unset: hex/none` `doeModesEnabled: bool/none` `modesEnabled_set: hex/none` `modesEnabled_unset: hex/none` `setMaxVA: bool/none` `setMaxVar: bool/none` `setMaxW: bool/none` `setMaxChargeRateW: bool/none` `setMaxDischargeRateW: bool/none` `setMaxWh: bool/none` `setMinWh: bool/none` `vppModesEnabled_set: hexbinary/none` `vppModesEnabled_unset: hexbinary/none` `setMaxVarNeg: bool/none` `setMinPFOverExcited: bool/none` `setMinPFUnderExcited: bool/none` | True if a `DERSettings` has been set for the `EndDevice` under test (and if certain elements have been set to certain values) |
-| `der-capability-contents` | `doeModesSupported_set: hex/none` `doeModesSupported_unset: hex/none` `doeModesSupported: bool/none` `modesSupported_set: hex/none` `modesSupported_unset: hex/none` `rtgMaxVA: bool/none` `rtgMaxVar: bool/none` `rtgMaxW: bool/none` `rtgMaxChargeRateW: bool/none` `rtgMaxDischargeRateW: bool/none` `rtgMaxWh: bool/none` `vppModesSupported_set: hexbinary/none` `vppModesSupported_unset: hexbinary/none` `rtgMaxVarNeg: bool/none` `rtgMinPFOverExcited: bool/none` `rtgMinPFUnderExcited: bool/none` | True if a `DERCapability` has been set for the `EndDevice` under test (and if certain elements have been set to certain values) |
+| `der-settings-contents` | `setGradW: int/None` `doeModesEnabled_set: hex/none` `doeModesEnabled_unset: hex/none` `doeModesEnabled: bool/none` `modesEnabled_set: hex/none` `modesEnabled_unset: hex/none` `setMaxVA: bool/none` `setMaxVar: bool/none` `setMaxW: bool/none` `setMaxChargeRateW: bool/none` `setMaxDischargeRateW: bool/none` `setMaxWh: bool/none` `setMinWh: bool/none` `vppModesEnabled_set: hexbinary/none` `vppModesEnabled_unset: hexbinary/none` `vppModesEnabled: bool/none` `setMaxVarNeg: bool/none` `setMinPFOverExcited: bool/none` `setMinPFUnderExcited: bool/none` | True if a `DERSettings` has been set for the `EndDevice` under test (and if certain elements have been set to certain values) |
+| `der-capability-contents` | `doeModesSupported_set: hex/none` `doeModesSupported_unset: hex/none` `doeModesSupported: bool/none` `modesSupported_set: hex/none` `modesSupported_unset: hex/none` `rtgMaxVA: bool/none` `rtgMaxVar: bool/none` `rtgMaxW: bool/none` `rtgMaxChargeRateW: bool/none` `rtgMaxDischargeRateW: bool/none` `rtgMaxWh: bool/none` `vppModesSupported_set: hexbinary/none` `vppModesSupported_unset: hexbinary/none` `vppModesSupported: bool/none` `rtgMaxVarNeg: bool/none` `rtgMinPFOverExcited: bool/none` `rtgMinPFUnderExcited: bool/none` | True if a `DERCapability` has been set for the `EndDevice` under test (and if certain elements have been set to certain values) |
 | `der-status-contents` | `genConnectStatus: int/None` `operationalModeStatus: int/None` `alarmStatus: int/None` | True if a `DERStatus` has been set for the `EndDevice` under test (and if certain elements have been set to certain values) |
 | `readings-site-active-power` | `minimum_count: int/none` `minimum_level: float/none` `maximum_level: float/none` `window_seconds: uint/none` | True if any MirrorUsagePoint has a MirrorMeterReading for site wide active power with `minimum_count` entries and/or readings all above and/or below `minimum_level`/`maximum_level` respectively; optionally for `window_seconds` |
 | `readings-site-reactive-power` | `minimum_count: int/none` `minimum_level: float/none` `maximum_level: float/none` `window_seconds: uint/none` | True if any MirrorUsagePoint has a MirrorMeterReading for site wide reactive power with `minimum_count` entries and/or readings all above and/or below `minimum_level`/`maximum_level` respectively; optionally for `window_seconds` |
@@ -256,14 +256,20 @@ The following are all the `NamedVariable` types currently implemented
 | `$setMaxW` | Resolves to the last supplied value to `DERSetting.setMaxW` as a number. Can raise exceptions if this value hasn't been set (which will trigger a test evaluation to fail) |
 | `$setMaxVA` | Resolves to the last supplied value to `DERSetting.setMaxVA` as a number. Can raise exceptions if this value hasn't been set (which will trigger a test evaluation to fail) |
 | `$setMaxVar` | Resolves to the last supplied value to `DERSetting.setMaxVar` as a number. Can raise exceptions if this value hasn't been set (which will trigger a test evaluation to fail) |
+| `$setMaxVarNeg` | Resolves to the last supplied value to `DERSetting.setMaxVarNeg` as a number. Can raise exceptions if this value hasn't been set (which will trigger a test evaluation to fail) |
 | `$setMaxChargeRateW` | Resolves to the last supplied value to `DERSetting.setMaxChargeRateW` as a number. Can raise exceptions if this value hasn't been set (which will trigger a test evaluation to fail) |
 | `$setMaxDischargeRateW` | Resolves to the last supplied value to `DERSetting.setMaxDischargeRateW` as a number. Can raise exceptions if this value hasn't been set (which will trigger a test evaluation to fail) |
+| `$setMinPFOverExcited` | Resolves to the last supplied value to `DERSetting.setMinPFOverExcited` as a number. Can raise exceptions if this value hasn't been set (which will trigger a test evaluation to fail) |
+| `$setMinPFUnderExcited` | Resolves to the last supplied value to `DERSetting.setMinPFUnderExcited` as a number. Can raise exceptions if this value hasn't been set (which will trigger a test evaluation to fail) |
 | `$setMaxWh` | Resolves to the last supplied value to `DERSetting.setMaxWh` as a number. Can raise exceptions if this value hasn't been set (which will trigger a test evaluation to fail) |
 | `$rtgMaxVA` | Resolves to last supplied `DERCapability.rtgMaxVA` as a number. Raises exceptions if value hasn't been set, causing test to fail.
 | `$rtgMaxVar` | Resolves to last supplied `DERCapability.rtgMaxVar` as a number. Raises exceptions if value hasn't been set, causing test to fail.
+| `$rtgMaxVarNeg` | Resolves to last supplied `DERCapability.rtgMaxVarNeg` as a number. Raises exceptions if value hasn't been set, causing test to fail.
 | `$rtgMaxW` | Resolves to last supplied `DERCapability.rtgMaxW` as a number. Raises exceptions if value hasn't been set, causing test to fail.
 | `$rtgMaxChargeRateW` | Resolves to last supplied `DERCapability.rtgMaxChargeRateW` as a number. Raises exceptions if value hasn't been set, causing test to fail.
 | `$rtgMaxDischargeRateW` | Resolves to last supplied `DERCapability.rtgMaxDischargeRateW` as a number. Raises exceptions if value hasn't been set, causing test to fail.
+| `$rtgMinPFOverExcited` | Resolves to last supplied `DERCapability.rtgMinPFOverExcited` as a number. Raises exceptions if value hasn't been set, causing test to fail.
+| `$rtgMinPFUnderExcited` | Resolves to last supplied `DERCapability.rtgMinPFUnderExcited` as a number. Raises exceptions if value hasn't been set, causing test to fail.
 | `$rtgMaxWh` | Resolves to last supplied `DERCapability.rtgMaxWh` as a number. Raises exceptions if value hasn't been set, causing test to fail.
 
 The following are csipaus.org/ns/v1.3-beta/storage extension specific `NamedVariable` types implemented

{cactus_test_definitions-1.8.1 → cactus_test_definitions-1.8.11}/README.md

@@ -159,8 +159,8 @@ checks:
 | `all-steps-complete` | `ignored_steps: list[str]/None` | True if every `Step` in a `TestProcedure` has been deactivated (excepting any ignored steps) |
 | `all-notifications-transmitted` | None | True if every transmitted notification (pub/sub) has been received with a HTTP success code response from the subscription notification URI |
 | `end-device-contents` | `has_connection_point_id: bool/None` `deviceCategory_anyset: hex/none` `check_lfdi: bool/None` | True if an `EndDevice` is registered and optionally has the specified contents. `has_connection_point_id` (if True) will check whether the active `EndDevice` has `ConnectionPoint.id` specified. `check_lfdi` will do a deep inspection on the supplied LFDI - checking PEN and derived SFDI. |
-| `der-settings-contents` | `setGradW: int/None` `doeModesEnabled_set: hex/none` `doeModesEnabled_unset: hex/none` `doeModesEnabled: bool/none` `modesEnabled_set: hex/none` `modesEnabled_unset: hex/none` `setMaxVA: bool/none` `setMaxVar: bool/none` `setMaxW: bool/none` `setMaxChargeRateW: bool/none` `setMaxDischargeRateW: bool/none` `setMaxWh: bool/none` `setMinWh: bool/none` `vppModesEnabled_set: hexbinary/none` `vppModesEnabled_unset: hexbinary/none` `setMaxVarNeg: bool/none` `setMinPFOverExcited: bool/none` `setMinPFUnderExcited: bool/none` | True if a `DERSettings` has been set for the `EndDevice` under test (and if certain elements have been set to certain values) |
-| `der-capability-contents` | `doeModesSupported_set: hex/none` `doeModesSupported_unset: hex/none` `doeModesSupported: bool/none` `modesSupported_set: hex/none` `modesSupported_unset: hex/none` `rtgMaxVA: bool/none` `rtgMaxVar: bool/none` `rtgMaxW: bool/none` `rtgMaxChargeRateW: bool/none` `rtgMaxDischargeRateW: bool/none` `rtgMaxWh: bool/none` `vppModesSupported_set: hexbinary/none` `vppModesSupported_unset: hexbinary/none` `rtgMaxVarNeg: bool/none` `rtgMinPFOverExcited: bool/none` `rtgMinPFUnderExcited: bool/none` | True if a `DERCapability` has been set for the `EndDevice` under test (and if certain elements have been set to certain values) |
+| `der-settings-contents` | `setGradW: int/None` `doeModesEnabled_set: hex/none` `doeModesEnabled_unset: hex/none` `doeModesEnabled: bool/none` `modesEnabled_set: hex/none` `modesEnabled_unset: hex/none` `setMaxVA: bool/none` `setMaxVar: bool/none` `setMaxW: bool/none` `setMaxChargeRateW: bool/none` `setMaxDischargeRateW: bool/none` `setMaxWh: bool/none` `setMinWh: bool/none` `vppModesEnabled_set: hexbinary/none` `vppModesEnabled_unset: hexbinary/none` `vppModesEnabled: bool/none` `setMaxVarNeg: bool/none` `setMinPFOverExcited: bool/none` `setMinPFUnderExcited: bool/none` | True if a `DERSettings` has been set for the `EndDevice` under test (and if certain elements have been set to certain values) |
+| `der-capability-contents` | `doeModesSupported_set: hex/none` `doeModesSupported_unset: hex/none` `doeModesSupported: bool/none` `modesSupported_set: hex/none` `modesSupported_unset: hex/none` `rtgMaxVA: bool/none` `rtgMaxVar: bool/none` `rtgMaxW: bool/none` `rtgMaxChargeRateW: bool/none` `rtgMaxDischargeRateW: bool/none` `rtgMaxWh: bool/none` `vppModesSupported_set: hexbinary/none` `vppModesSupported_unset: hexbinary/none` `vppModesSupported: bool/none` `rtgMaxVarNeg: bool/none` `rtgMinPFOverExcited: bool/none` `rtgMinPFUnderExcited: bool/none` | True if a `DERCapability` has been set for the `EndDevice` under test (and if certain elements have been set to certain values) |
 | `der-status-contents` | `genConnectStatus: int/None` `operationalModeStatus: int/None` `alarmStatus: int/None` | True if a `DERStatus` has been set for the `EndDevice` under test (and if certain elements have been set to certain values) |
 | `readings-site-active-power` | `minimum_count: int/none` `minimum_level: float/none` `maximum_level: float/none` `window_seconds: uint/none` | True if any MirrorUsagePoint has a MirrorMeterReading for site wide active power with `minimum_count` entries and/or readings all above and/or below `minimum_level`/`maximum_level` respectively; optionally for `window_seconds` |
 | `readings-site-reactive-power` | `minimum_count: int/none` `minimum_level: float/none` `maximum_level: float/none` `window_seconds: uint/none` | True if any MirrorUsagePoint has a MirrorMeterReading for site wide reactive power with `minimum_count` entries and/or readings all above and/or below `minimum_level`/`maximum_level` respectively; optionally for `window_seconds` |
@@ -214,14 +214,20 @@ The following are all the `NamedVariable` types currently implemented
 | `$setMaxW` | Resolves to the last supplied value to `DERSetting.setMaxW` as a number. Can raise exceptions if this value hasn't been set (which will trigger a test evaluation to fail) |
 | `$setMaxVA` | Resolves to the last supplied value to `DERSetting.setMaxVA` as a number. Can raise exceptions if this value hasn't been set (which will trigger a test evaluation to fail) |
 | `$setMaxVar` | Resolves to the last supplied value to `DERSetting.setMaxVar` as a number. Can raise exceptions if this value hasn't been set (which will trigger a test evaluation to fail) |
+| `$setMaxVarNeg` | Resolves to the last supplied value to `DERSetting.setMaxVarNeg` as a number. Can raise exceptions if this value hasn't been set (which will trigger a test evaluation to fail) |
 | `$setMaxChargeRateW` | Resolves to the last supplied value to `DERSetting.setMaxChargeRateW` as a number. Can raise exceptions if this value hasn't been set (which will trigger a test evaluation to fail) |
 | `$setMaxDischargeRateW` | Resolves to the last supplied value to `DERSetting.setMaxDischargeRateW` as a number. Can raise exceptions if this value hasn't been set (which will trigger a test evaluation to fail) |
+| `$setMinPFOverExcited` | Resolves to the last supplied value to `DERSetting.setMinPFOverExcited` as a number. Can raise exceptions if this value hasn't been set (which will trigger a test evaluation to fail) |
+| `$setMinPFUnderExcited` | Resolves to the last supplied value to `DERSetting.setMinPFUnderExcited` as a number. Can raise exceptions if this value hasn't been set (which will trigger a test evaluation to fail) |
 | `$setMaxWh` | Resolves to the last supplied value to `DERSetting.setMaxWh` as a number. Can raise exceptions if this value hasn't been set (which will trigger a test evaluation to fail) |
 | `$rtgMaxVA` | Resolves to last supplied `DERCapability.rtgMaxVA` as a number. Raises exceptions if value hasn't been set, causing test to fail.
 | `$rtgMaxVar` | Resolves to last supplied `DERCapability.rtgMaxVar` as a number. Raises exceptions if value hasn't been set, causing test to fail.
+| `$rtgMaxVarNeg` | Resolves to last supplied `DERCapability.rtgMaxVarNeg` as a number. Raises exceptions if value hasn't been set, causing test to fail.
 | `$rtgMaxW` | Resolves to last supplied `DERCapability.rtgMaxW` as a number. Raises exceptions if value hasn't been set, causing test to fail.
 | `$rtgMaxChargeRateW` | Resolves to last supplied `DERCapability.rtgMaxChargeRateW` as a number. Raises exceptions if value hasn't been set, causing test to fail.
 | `$rtgMaxDischargeRateW` | Resolves to last supplied `DERCapability.rtgMaxDischargeRateW` as a number. Raises exceptions if value hasn't been set, causing test to fail.
+| `$rtgMinPFOverExcited` | Resolves to last supplied `DERCapability.rtgMinPFOverExcited` as a number. Raises exceptions if value hasn't been set, causing test to fail.
+| `$rtgMinPFUnderExcited` | Resolves to last supplied `DERCapability.rtgMinPFUnderExcited` as a number. Raises exceptions if value hasn't been set, causing test to fail.
 | `$rtgMaxWh` | Resolves to last supplied `DERCapability.rtgMaxWh` as a number. Raises exceptions if value hasn't been set, causing test to fail.
 
 The following are csipaus.org/ns/v1.3-beta/storage extension specific `NamedVariable` types implemented

{cactus_test_definitions-1.8.1 → cactus_test_definitions-1.8.11}/cactus_test_definitions/__init__.py

@@ -18,7 +18,7 @@ from cactus_test_definitions.variable_expressions import (
     try_extract_variable_expression,
 )
 
-__version__ = "1.8.1"
+__version__ = "1.8.11"
 
 __all__ = [
     "TestProcedureDefinitionError",

{cactus_test_definitions-1.8.1 → cactus_test_definitions-1.8.11}/cactus_test_definitions/client/checks.py

@@ -59,6 +59,7 @@ CHECK_PARAMETER_SCHEMA: dict[str, dict[str, ParameterSchema]] = {
         "doeModesEnabled_unset": ParameterSchema(False, ParameterType.HexBinary),  # Minimum bits set to zero
         "modesEnabled_set": ParameterSchema(False, ParameterType.HexBinary),  # Minimum bits set to one
         "modesEnabled_unset": ParameterSchema(False, ParameterType.HexBinary),  # Minimum bits set to zero
+        "vppModesEnabled": ParameterSchema(False, ParameterType.Boolean),  # Is ANY value set?
         "vppModesEnabled_set": ParameterSchema(False, ParameterType.HexBinary),  # Minimum bits set to one
         "vppModesEnabled_unset": ParameterSchema(False, ParameterType.HexBinary),  # Minimum bits set to zero
         "setMaxVA": ParameterSchema(False, ParameterType.Boolean),  # Is ANY value set?
@@ -78,6 +79,7 @@ CHECK_PARAMETER_SCHEMA: dict[str, dict[str, ParameterSchema]] = {
         "doeModesSupported_unset": ParameterSchema(False, ParameterType.HexBinary),  # Minimum bits set to zero
         "modesSupported_set": ParameterSchema(False, ParameterType.HexBinary),  # Minimum bits set to one
         "modesSupported_unset": ParameterSchema(False, ParameterType.HexBinary),  # Minimum bits set to zero
+        "vppModesSupported": ParameterSchema(False, ParameterType.Boolean),  # Is ANY value set?
         "vppModesSupported_set": ParameterSchema(False, ParameterType.HexBinary),  # Minimum bits set to one
         "vppModesSupported_unset": ParameterSchema(False, ParameterType.HexBinary),  # Minimum bits set to zero
         "rtgMaxVA": ParameterSchema(False, ParameterType.Boolean),  # Is ANY value set?

{cactus_test_definitions-1.8.1 → cactus_test_definitions-1.8.11}/cactus_test_definitions/client/procedures/ALL-13.yaml

@@ -25,6 +25,8 @@ Preconditions:
     - type: create-der-program
       parameters:
         primacy: 0
+    - type: set-default-der-control
+      parameters: {}
   checks:
     - type: end-device-contents
       parameters: {}

{cactus_test_definitions-1.8.1 → cactus_test_definitions-1.8.11}/cactus_test_definitions/client/procedures/ALL-14.yaml

@@ -30,6 +30,8 @@ Preconditions:
     - type: create-der-program
       parameters:
         primacy: 0
+    - type: set-default-der-control
+      parameters: {}
     # Start by enabling everything at the beginning as each step is (mostly) independent of the others
     - type: enable-steps
       parameters:

{cactus_test_definitions-1.8.1 → cactus_test_definitions-1.8.11}/cactus_test_definitions/client/procedures/ALL-17.yaml

@@ -28,6 +28,8 @@ Preconditions:
     - type: create-der-program
       parameters:
         primacy: 0
+    - type: set-default-der-control
+      parameters: {}
 
   checks:
     - type: end-device-contents

{cactus_test_definitions-1.8.1 → cactus_test_definitions-1.8.11}/cactus_test_definitions/client/procedures/ALL-25.yaml

@@ -25,6 +25,8 @@ Preconditions:
     - type: create-der-program
       parameters:
         primacy: 0
+    - type: set-default-der-control
+      parameters: {}
 
   checks:
     - type: end-device-contents

{cactus_test_definitions-1.8.1 → cactus_test_definitions-1.8.11}/cactus_test_definitions/client/procedures/ALL-28.yaml

@@ -97,12 +97,29 @@ Steps:
       - type: enable-steps
         parameters:
           steps:
-            - GET-DERC-2
+            - OBSERVE-30-PERCENT
       - type: remove-steps
         parameters:
           steps:
             - GET-DERC-1
 
+  OBSERVE-30-PERCENT:
+    instructions:
+      - Observe that DER ramps to 30% limit.
+    event:
+      type: wait
+      parameters:
+        duration_seconds: 120
+    actions:
+      - type: enable-steps
+        parameters:
+          steps:
+            - GET-DERC-2
+      - type: remove-steps
+        parameters:
+          steps:
+            - OBSERVE-30-PERCENT
+
   # (a, b)
   GET-DERC-2:
     event:
@@ -119,12 +136,29 @@ Steps:
       - type: enable-steps
         parameters:
           steps:
-            - GET-DERC-3
+            - OBSERVE-10-PERCENT
       - type: remove-steps
         parameters:
           steps:
             - GET-DERC-2
 
+  OBSERVE-10-PERCENT:
+    instructions:
+      - Observe that DER ramps to 10% limit within 15s as per step (b).
+    event:
+      type: wait
+      parameters:
+        duration_seconds: 120
+    actions:
+      - type: enable-steps
+        parameters:
+          steps:
+            - GET-DERC-3
+      - type: remove-steps
+        parameters:
+          steps:
+            - OBSERVE-10-PERCENT
+
   # (c, d)
   GET-DERC-3:
     event:
@@ -135,19 +169,54 @@ Steps:
       - type: create-der-control
         parameters:
           start: $(now)
-          duration_seconds: 600 # Extra long but will be cancelled (give clients enough time to see cancellation)
+          duration_seconds: 900 # Extra long but will be cancelled (give clients enough time to see cancellation)
           opModExpLimW: $(setMaxW * 0.5)
           opModImpLimW: $(setMaxW * 0.5)
           ramp_time_seconds: 60
       - type: enable-steps
         parameters:
           steps:
-            - GET-DEFAULT-DERC
+            - WAIT-RAMP-DERC-3
       - type: remove-steps
         parameters:
           steps:
             - GET-DERC-3
 
+  # (d)
+  WAIT-RAMP-DERC-3:
+    event:
+      type: wait
+      parameters:
+        duration_seconds: 60
+    actions:
+      - type: enable-steps
+        parameters:
+          steps:
+            - OBSERVE-50-PERCENT
+      - type: remove-steps
+        parameters:
+          steps:
+            - WAIT-RAMP-DERC-3
+    instructions:
+      - The DER shall ramp export/import to 50% in 60 seconds (due to rampTms being 60s).
+
+  OBSERVE-50-PERCENT:
+    instructions:
+      - Observe that DER completes ramp to 50% limit.
+    event:
+      type: wait
+      parameters:
+        duration_seconds: 180
+    actions:
+      - type: enable-steps
+        parameters:
+          steps:
+            - GET-DEFAULT-DERC
+      - type: remove-steps
+        parameters:
+          steps:
+            - OBSERVE-50-PERCENT
+
   # (e)
   GET-DEFAULT-DERC:
     event:
@@ -208,14 +277,14 @@ Steps:
       - type: enable-steps
         parameters:
           steps:
-            - WAIT-RAMP
+            - WAIT-RAMP-DEFAULT
       - type: remove-steps
         parameters:
           steps:
             - POST-RESPONSE-CANCELLED
 
   # (i)
-  WAIT-RAMP:
+  WAIT-RAMP-DEFAULT:
     event:
       type: wait
       parameters:
@@ -224,14 +293,31 @@ Steps:
       - type: enable-steps
         parameters:
           steps:
-            - GET-DERC-4
+            - OBSERVE-ZERO-POWER
       - type: remove-steps
         parameters:
           steps:
-            - WAIT-RAMP
+            - WAIT-RAMP-DEFAULT
     instructions:
       - The DER shall reduce export/import to the current DefaultDERControl limit of 0W at the new ramp rate of 1 %/s.
 
+  OBSERVE-ZERO-POWER:
+    instructions:
+      - Observe that DER has ramped down to 0W per DefaultDERControl.
+    event:
+      type: wait
+      parameters:
+        duration_seconds: 180
+    actions:
+      - type: enable-steps
+        parameters:
+          steps:
+            - GET-DERC-4
+      - type: remove-steps
+        parameters:
+          steps:
+            - OBSERVE-ZERO-POWER
+
   # (j)
   GET-DERC-4:
     event:
@@ -248,12 +334,29 @@ Steps:
       - type: enable-steps
         parameters:
           steps:
-            - POST-RESPONSE-STARTED
+            - OBSERVE-30-PERCENT-FINAL
       - type: remove-steps
         parameters:
           steps:
             - GET-DERC-4
 
+  OBSERVE-30-PERCENT-FINAL:
+    instructions:
+      - Observe that DER ramps to 30% at new ramp rate of 1% per step (l).
+    event:
+      type: wait
+      parameters:
+        duration_seconds: 180
+    actions:
+      - type: enable-steps
+        parameters:
+          steps:
+            - POST-RESPONSE-STARTED
+      - type: remove-steps
+        parameters:
+          steps:
+            - OBSERVE-30-PERCENT-FINAL
+
   # (k)
   POST-RESPONSE-STARTED:
     event:

{cactus_test_definitions-1.8.1 → cactus_test_definitions-1.8.11}/cactus_test_definitions/client/procedures/ALL-30.yaml

@@ -134,7 +134,7 @@ Steps:
     event:
       type: wait
       parameters:
-        duration_seconds: 180 
+        duration_seconds: 300 
     actions:
       - type: communications-status
         parameters:

{cactus_test_definitions-1.8.1 → cactus_test_definitions-1.8.11}/cactus_test_definitions/client/procedures/DRA-02.yaml

@@ -14,6 +14,10 @@ Criteria:
       parameters: {}
 
 Preconditions:
+  init_actions:
+    - type: create-der-program
+      parameters:
+        primacy: 0
   checks:
     - type: end-device-contents
       parameters: {}

{cactus_test_definitions-1.8.1 → cactus_test_definitions-1.8.11}/cactus_test_definitions/client/procedures/DRD-01.yaml

@@ -8,6 +8,10 @@ TargetVersions:
   - v1.3-beta/storage
 
 Preconditions:
+  init_actions:
+      - type: create-der-program
+        parameters:
+          primacy: 0
   checks:
     - type: end-device-contents
       parameters: {}

cactus_test_definitions-1.8.11/cactus_test_definitions/client/procedures/DRG-01.yaml

@@ -0,0 +1,168 @@
+Description: Generation operational instructions
+Category: Demand Response
+Classes:
+  - DR-G
+
+TargetVersions:
+  - v1.2
+  - v1.3-beta/storage
+
+Preconditions:
+  init_actions:
+      - type: create-der-program
+        parameters:
+          primacy: 0
+  checks:
+    - type: end-device-contents
+      parameters: {}
+    - type: der-settings-contents
+      parameters: {}
+  actions:
+    - type: set-comms-rate
+      parameters:
+        der_list_poll_seconds: 60
+        derp_list_poll_seconds: 60
+  instructions:
+    - The controlled device should be connected to the grid and generating 90% (+/- 5%) of its nameplate rating maximum.
+
+Criteria:
+  checks:
+    - type: all-steps-complete
+      parameters: {}
+    
+Steps:
+
+  # (a, b)
+  GET-DERC-1:
+    event:
+      type: GET-request-received
+      parameters:
+        endpoint: /edev/1/derp/1/derc
+    actions:
+      - type: create-der-control
+        parameters:
+          start: $(now + '60 seconds')
+          duration_seconds: 60
+          opModFixedW: 75
+      - type: enable-steps
+        parameters:
+          steps:
+            - PUT-DERSTATUS-1
+            - PUT-DERSETTINGS-1
+            - WAIT-DERC-1
+      - type: remove-steps
+        parameters:
+          steps:
+            - GET-DERC-1
+
+  # (c)
+  PUT-DERSTATUS-1:
+    event:
+      type: PUT-request-received
+      parameters:
+        endpoint: /edev/1/der/1/ders
+        serve_request_first: true # Run this AFTER server receives the request
+      checks:
+        - type: der-status-contents
+          parameters:
+            alarmStatus: 0
+            operationalModeStatus: 107
+    actions:
+      - type: remove-steps
+        parameters:
+          steps:
+            - PUT-DERSTATUS-1
+
+  # (c)
+  PUT-DERSETTINGS-1:
+    event:
+      type: PUT-request-received
+      parameters:
+        endpoint: /edev/1/der/1/derg
+        serve_request_first: true # Run this AFTER server receives the request
+      checks:
+        - type: der-settings-contents
+          parameters:
+            modesEnabled_set: "80" # bit 7
+    actions:
+      - type: remove-steps
+        parameters:
+          steps:
+            - PUT-DERSETTINGS-1
+
+
+  # (d) After the end of the previous control...
+  WAIT-DERC-1:
+    event:
+      type: wait
+      parameters:
+        duration_seconds: 120 # Wait for DERControls to fully complete
+    actions:
+      - type: enable-steps
+        parameters:
+          steps:
+            - GET-DERC-2
+      - type: remove-steps
+        parameters:
+          steps:
+            - WAIT-DERC-1
+
+  # (d) ... create a new DERControl
+  GET-DERC-2:
+    event:
+      type: GET-request-received
+      parameters:
+        endpoint: /edev/1/derp/1/derc
+    actions:
+      - type: create-der-control
+        parameters:
+          start: $(now + '60 seconds')
+          duration_seconds: 60
+          opModFixedW: 50
+      - type: enable-steps
+        parameters:
+          steps:
+            - PUT-DERSTATUS-2
+            - PUT-DERSETTINGS-2
+      - type: remove-steps
+        parameters:
+          steps:
+            - GET-DERC-2
+
+
+  # (e, f)
+  PUT-DERSTATUS-2:
+    event:
+      type: PUT-request-received
+      parameters:
+        endpoint: /edev/1/der/1/ders
+        serve_request_first: true # Run this AFTER server receives the request
+      checks:
+        - type: der-status-contents
+          parameters:
+            alarmStatus: 0
+            operationalModeStatus: 106
+    actions:
+      - type: remove-steps
+        parameters:
+          steps:
+            - PUT-DERSTATUS-2
+
+  # (e, f)
+  PUT-DERSETTINGS-2:
+    event:
+      type: PUT-request-received
+      parameters:
+        endpoint: /edev/1/der/1/derg
+        serve_request_first: true # Run this AFTER server receives the request
+      checks:
+        - type: der-settings-contents
+          parameters:
+            modesEnabled_set: "80" # bit 7
+    actions:
+      - type: remove-steps
+        parameters:
+          steps:
+            - PUT-DERSETTINGS-2
+      - type: finish-test
+        parameters: {}

{cactus_test_definitions-1.8.1 → cactus_test_definitions-1.8.11}/cactus_test_definitions/client/procedures/DRL-01.yaml

@@ -8,6 +8,10 @@ TargetVersions:
   - v1.3-beta/storage
 
 Preconditions:
+  init_actions:
+      - type: create-der-program
+        parameters:
+          primacy: 0
   checks:
     - type: end-device-contents
       parameters: {}

{cactus_test_definitions-1.8.1 → cactus_test_definitions-1.8.11}/cactus_test_definitions/client/procedures/GEN-03.yaml

@@ -33,6 +33,8 @@ Preconditions:
         start: $(now)
         duration_seconds: 900
         opModExpLimW: $(setMaxW * 2)
+    - type: set-default-der-control
+      parameters: {}
   instructions:
     - DER shall be exporting at the connection point at least 50% of its active power rating.
     

{cactus_test_definitions-1.8.1 → cactus_test_definitions-1.8.11}/cactus_test_definitions/client/procedures/GEN-04.yaml

@@ -34,6 +34,8 @@ Preconditions:
         start: $(now)
         duration_seconds: 900
         opModGenLimW: $(setMaxW * 2)
+    - type: set-default-der-control
+      parameters: {}
   instructions:
     - DER shall be generating at least 50% of its active power rating.